From a390d6a9ad62019c7ca3d3689184fd3ce6afd57c Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 12 Aug 2019 18:51:01 +0200
Subject: Incorrect NCName in docbook citations

In a bibtex reference it is possible to have a colon as the id, but in docbook this will result in:
```
docbook/citelist.xml:5: validity error : xml:id : attribute value _citelist_1CITEREF_pre:post is not an NCName
<varlistentry><term><anchor xml:id="_citelist_1CITEREF_pre:post"/>[1]</term>
```

So the id has to be translated. A colon in an id can only happen in case the names is provided from the outside.
---
 src/docbookvisitor.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index ce3a845..83c34e7 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -36,6 +36,7 @@
 #include "htmlentity.h"
 #include "emoji.h"
 #include "plantuml.h"
+#include "growbuf.h"
 
 #if 0
 #define DB_VIS_C DB_VIS_C1(m_t)
@@ -49,6 +50,25 @@
 #define DB_VIS_C2a(x,y)
 #endif
 
+static QCString filterId(const char *s)
+{
+  static GrowBuf growBuf;
+  growBuf.clear();
+  if (s==0) return "";
+  const unsigned char *p=(const unsigned char *)s;
+  char c;
+  while ((c=*p++))
+  {
+    switch (c)
+    {
+      case ':':  growBuf.addStr("_1");   break;
+      default:   growBuf.addChar(c);       break;
+    }
+  }
+  growBuf.addChar(0);
+  return growBuf.get();
+}
+
 void DocbookDocVisitor::visitCaption(const QList<DocNode> &children)
 {
   QListIterator<DocNode> cli(children);
@@ -374,7 +394,7 @@ void DocbookDocVisitor::visit(DocAnchor *anc)
 {
 DB_VIS_C
   if (m_hide) return;
-  m_t << "<anchor xml:id=\"_" <<  stripPath(anc->file()) << "_1" << anc->anchor() << "\"/>";
+  m_t << "<anchor xml:id=\"_" <<  stripPath(anc->file()) << "_1" << filterId(anc->anchor()) << "\"/>";
 }
 
 void DocbookDocVisitor::visit(DocInclude *inc)
@@ -550,7 +570,7 @@ void DocbookDocVisitor::visit(DocCite *cite)
 {
 DB_VIS_C
   if (m_hide) return;
-  if (!cite->file().isEmpty()) startLink(cite->file(),cite->anchor());
+  if (!cite->file().isEmpty()) startLink(cite->file(),filterId(cite->anchor()));
   filter(cite->text());
   if (!cite->file().isEmpty()) endLink();
 }
-- 
cgit v0.12


From def222ab7fa1ad9e51dff1b11b610c9e1e4af067 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 27 Aug 2019 19:06:59 +0200
Subject: issue #7228 Using markdown causes wrong error and warning line
 numbers - v. 1.8.16

Sacrificing some readability of the debug `-d markdown` output for a better approximation of the line numbers by keeping the rows of a markdown table on one line when translating to a HTML table.
---
 src/markdown.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/markdown.cpp b/src/markdown.cpp
index 2cbdcb5..888f161 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -1828,7 +1828,7 @@ static int writeTableBlock(GrowBuf &out,const char *data,int size)
   }
 
 
-  out.addStr("<table class=\"markdownTable\">\n");
+  out.addStr("<table class=\"markdownTable\">");
   QCString cellTag("th"), cellClass("class=\"markdownTableHead");
   for (unsigned row = 0; row < tableContents.size(); row++)
   {
@@ -1836,16 +1836,16 @@ static int writeTableBlock(GrowBuf &out,const char *data,int size)
     {
       if (row % 2)
       {
-        out.addStr("<tr class=\"markdownTableRowOdd\">\n");
+        out.addStr("<tr class=\"markdownTableRowOdd\">");
       }
       else
       {
-        out.addStr("<tr class=\"markdownTableRowEven\">\n");
+        out.addStr("<tr class=\"markdownTableRowEven\">");
       }
     }
     else
     {
-      out.addStr("  <tr class=\"markdownTableHead\">\n");
+      out.addStr("  <tr class=\"markdownTableHead\">");
     }
     for (int c = 0; c < columns; c++)
     {
@@ -1900,7 +1900,7 @@ static int writeTableBlock(GrowBuf &out,const char *data,int size)
       }
       // need at least one space on either side of the cell text in
       // order for doxygen to do other formatting
-      out.addStr("> " + cellText + "\n</" + cellTag + ">\n");
+      out.addStr("> " + cellText + "</" + cellTag + ">");
     }
     cellTag = "td";
     cellClass = "class=\"markdownTableBody";
-- 
cgit v0.12


From a3093ff24ec75b70d6d7dc37ca2c7e68f36161fe Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 29 Aug 2019 16:42:44 +0200
Subject: Problem with  `<hr>` in LaTeX multicolumn cell

In case we have a `<hr>` in a table cell then it is displayed as a horizontal line (in LaTeX) unless it is in a multicolumn cell. In the later case it throws an error:
```
! You can't use `\hrule' here except with leaders.
\DoxyHorRuler ... }{0ex plus 0ex minus 0ex}\hrule
```

We have to use use `\hrulefill` in a table but in combination with the table option of xcolor this gives some problems so a new command has to be defined for this.

See also:
- horizontal rule / line inside a multicolumn field (https://tex.stackexchange.com/questions/506211/horizontal-rule-line-inside-a-multicolumn-field)
- interaction between \usepackage[table]{xcolor} and \hrulefill (https://tex.stackexchange.com/questions/506221/interaction-between-usepackagetablexcolor-and-hrulefill)
---
 src/latexdocvisitor.cpp     |  5 ++++-
 templates/latex/doxygen.sty | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index a0bbf73..5e424b0 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -280,7 +280,10 @@ void LatexDocVisitor::visit(DocLineBreak *)
 void LatexDocVisitor::visit(DocHorRuler *)
 {
   if (m_hide) return;
-  m_t << "\\DoxyHorRuler\n";
+  if (insideTable())
+    m_t << "\\DoxyHorRuler{1}\n";
+  else
+    m_t << "\\DoxyHorRuler{0}\n";
 }
 
 void LatexDocVisitor::visit(DocStyleChange *s)
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index bf19901..d28554b 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -35,9 +35,19 @@
   \endgroup%
 }
 
-\newcommand{\DoxyHorRuler}{%
+\makeatletter
+\newcommand\hrulefilll{\leavevmode\leaders\hrule\hskip 0pt plus 1filll\kern\z@}
+\makeatother
+
+\newcommand{\DoxyHorRuler}[1]{%
   \setlength{\parskip}{0ex plus 0ex minus 0ex}%
-  \hrule%
+  \ifthenelse{#1=0}%
+  {%
+    \hrule%
+  }%
+  {%
+    \hrulefilll%
+  }%
 }
 \newcommand{\DoxyLabelFont}{}
 \newcommand{\entrylabel}[1]{%
-- 
cgit v0.12


From 416ee572ba35b4d0cf30ccca66f0691c658f2e53 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 29 Aug 2019 18:06:51 +0200
Subject: Problem with  `<hr>` in LaTeX multicolumn cell

Small problem with defining `\hrulefilll`, moved code.
---
 doc/doxygen_manual.tex      | 5 +++++
 src/latexgen.cpp            | 5 +++++
 templates/latex/doxygen.sty | 4 ----
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/doxygen_manual.tex b/doc/doxygen_manual.tex
index 8ff3c66..e350013 100644
--- a/doc/doxygen_manual.tex
+++ b/doc/doxygen_manual.tex
@@ -66,6 +66,11 @@
 \usepackage{doxygen}
 \usepackage{manual}
 %%
+%gave problems when in doxygen.sty
+\makeatletter
+\newcommand\hrulefilll{\leavevmode\leaders\hrule\hskip 0pt plus 1filll\kern\z@}
+\makeatother
+%%
 % unfortunately constructs like: 
 %   \renewcommand{\doxysection}[1]{\doxysubsection{##1}}
 % using values from book.cls (see also doxygen.sty) and redefining sections to correct level.
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index e6c6861..1792f15 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -623,6 +623,11 @@ static void writeDefaultHeaderPart1(FTextStream &t)
        "}\n"
        "\\makeatother\n"
        "\n";
+  // 
+  t << "\\makeatletter\n"
+       "\\newcommand\\hrulefilll{\\leavevmode\\leaders\\hrule\\hskip 0pt plus 1filll\\kern\\z@}\n"
+       "\\makeatother\n"
+       "\n";
 
   // Headers & footers
   QGString genString;
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index d28554b..83891a5 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -35,10 +35,6 @@
   \endgroup%
 }
 
-\makeatletter
-\newcommand\hrulefilll{\leavevmode\leaders\hrule\hskip 0pt plus 1filll\kern\z@}
-\makeatother
-
 \newcommand{\DoxyHorRuler}[1]{%
   \setlength{\parskip}{0ex plus 0ex minus 0ex}%
   \ifthenelse{#1=0}%
-- 
cgit v0.12


From 4a72a9b07e805b4ba27560e8e921bcee0002ef4c Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 9 Sep 2019 13:28:28 +0200
Subject: issue #7248: Including external tag files with TOC produces a broken
 index.qhp

Ignore automatically generated anchor names when importing a tag file.
---
 src/tagreader.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 56dbe7d..d79d9b5 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -494,6 +494,23 @@ class TagFileParser : public QXmlDefaultHandler
 
     void endDocAnchor()
     {
+      // Check whether or not the tag is automatically generate, in that case ignore the tag.
+      switch(m_state)
+      {
+        case InClass:
+        case InFile:
+        case InNamespace:
+        case InGroup:
+        case InPage:
+        case InMember:
+        case InPackage:
+        case InDir:
+          if (QString(m_curString).startsWith("autotoc_md")) return;
+          break;
+        default:
+          warn("Unexpected tag 'docanchor' found");
+          return;
+      }
       switch(m_state)
       {
         case InClass:     m_curClass->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
@@ -504,7 +521,7 @@ class TagFileParser : public QXmlDefaultHandler
         case InMember:    m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
         case InPackage:   m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
         case InDir:       m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-        default:   warn("Unexpected tag 'docanchor' found"); break; 
+        default:   warn("Unexpected tag 'docanchor' found"); break;  // Not really necessary anymore
       }
     }
 
-- 
cgit v0.12


From 9b9c2c6101be61baefb73b0c414e93381070e21b Mon Sep 17 00:00:00 2001
From: "luz.paz" <luzpaz@users.noreply.github.com>
Date: Sat, 28 Sep 2019 11:14:28 -0400
Subject: Fix typos

Found via
```
codespell -q 3 -S *.js,*.po,./src/translator*,*.eps,./doc/changelog.doc -L ang,ans,attribs,ba,behaviour,classe,colour,german,iff,initialise,nam,nd,que,russian,statics,te,tim,uint
```
---
 src/context.cpp                  |  2 +-
 src/dotgraph.cpp                 |  2 +-
 src/doxygen.cpp                  |  2 +-
 src/fortrancode.l                |  2 +-
 src/fortranscanner.l             |  2 +-
 src/memberdef.h                  |  2 +-
 src/portable.cpp                 |  2 +-
 src/pycode.l                     |  4 ++--
 src/pyscanner.l                  |  6 +++---
 src/scanner.l                    |  2 +-
 src/sortdict.h                   | 12 ++++++------
 src/vhdljjparser.cpp             |  4 ++--
 templates/latex/tabu_doxygen.sty | 10 +++++-----
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/context.cpp b/src/context.cpp
index 1933d43..8b7643a 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -8446,7 +8446,7 @@ TemplateVariant NamespaceMembersIndexContext::get(const char *name) const
 
 //------------------------------------------------------------------------
 
-//%% struct InheritanceGraph: a connected graph reprenting part of the overall interitance tree
+//%% struct InheritanceGraph: a connected graph reprenting part of the overall inheritance tree
 //%% {
 class InheritanceGraphContext::Private
 {
diff --git a/src/dotgraph.cpp b/src/dotgraph.cpp
index df64d66..bbffaf0 100644
--- a/src/dotgraph.cpp
+++ b/src/dotgraph.cpp
@@ -289,7 +289,7 @@ void DotGraph::writeGraphHeader(FTextStream &t,const QCString &title)
   {
     t << " // INTERACTIVE_SVG=YES\n";
   }
-  t << " // LATEX_PDF_SIZE\n"; // write placeholder for LaTeX PDF bounding box size repacement
+  t << " // LATEX_PDF_SIZE\n"; // write placeholder for LaTeX PDF bounding box size replacement
   if (Config_getBool(DOT_TRANSPARENT))
   {
     t << "  bgcolor=\"transparent\";" << endl;
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 953a5de..7fec2b6 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -2588,7 +2588,7 @@ static MemberDef *addVariableToFile(
           addMemberDocs(root,md,def,0,FALSE);
           md->setRefItems(root->sli);
           // if md is a variable forward declaration and root is the definition that
-          // turn md into the defintion
+          // turn md into the definition
           if (!root->explicitExternal && md->isExternal())
           {
             md->setDeclFile(md->getDefFileName(),md->getDefLine(),md->getDefColumn());
diff --git a/src/fortrancode.l b/src/fortrancode.l
index d372299..303bbfb 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -521,7 +521,7 @@ static bool getGenericProcedureLink(const ClassDef *cd,
   return FALSE;
 }
 
-static bool getLink(UseSDict *usedict, // dictonary with used modules
+static bool getLink(UseSDict *usedict, // dictionary with used modules
                     const char *memberText,  // exact member text
 		    CodeOutputInterface &ol,
 		    const char *text)
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index d75134a..eb798c9 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -1840,7 +1840,7 @@ static QCString extractFromParens(const QCString name)
   return extracted;
 }
 
-/*! remove non usefull spaces from bind statement */
+/*! remove unuseful spaces from bind statement */
 static QCString extractBind(const QCString name)
 {
   QCString parensPart = extractFromParens(name);
diff --git a/src/memberdef.h b/src/memberdef.h
index b200833..97bf819 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -239,7 +239,7 @@ class MemberDef : virtual public Definition
     virtual bool hasCallGraph() const = 0;
     virtual bool hasCallerGraph() const = 0;
     virtual bool visibleMemberGroup(bool hideNoHeader) const = 0;
-    // refrenced related members
+    // referenced related members
     virtual bool hasReferencesRelation() const = 0;
     virtual bool hasReferencedByRelation() const = 0;
 
diff --git a/src/portable.cpp b/src/portable.cpp
index 3d64638..c6e829d 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -457,7 +457,7 @@ bool portable_isAbsolutePath(const char *fileName)
 /**
  * Correct a possible wrong PATH variable
  *
- * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slahes.
+ * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slashes.
  */
 void portable_correct_path(void)
 {
diff --git a/src/pycode.l b/src/pycode.l
index a76129d..8cae0e2 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1316,7 +1316,7 @@ TARGET           ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT
     \\{B}\n                    { // line continuation
   		                 codifyLines(yytext);
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
   		                 codify(yytext);
                                }
     {STRINGPREFIX}?{TRIDOUBLEQUOTE} { // triple double quotes
@@ -1339,7 +1339,7 @@ TARGET           ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT
     \\{B}\n                    { // line continuation
   		                 codifyLines(yytext);
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
   		                 codify(yytext);
                                }
     {STRINGPREFIX}?{TRISINGLEQUOTE} { // triple single quotes
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 2320bca..33e6867 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -1619,7 +1619,7 @@ STARTDOCSYMS      "##"
       			  incLineNr();
 			  docBlock += yytext;
       			}
-    \\.		        { // espaced char
+    \\.		        { // escaped char
 			  docBlock += yytext;
       			}
     .			{
@@ -1654,7 +1654,7 @@ STARTDOCSYMS      "##"
       			         addToString(yytext);
       				 incLineNr();
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
       			         addToString(yytext);
                                }
     "\"\"\""		       { // triple double quotes
@@ -1677,7 +1677,7 @@ STARTDOCSYMS      "##"
       			         addToString(yytext);
       				 incLineNr();
                                }
-    \\.			       { // espaced char
+    \\.			       { // escaped char
       			         addToString(yytext);
                                }
     "'''"		       { // triple single quotes
diff --git a/src/scanner.l b/src/scanner.l
index 07d5c71..1db7320 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2001,7 +2001,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
   					  //printf("PHP: adding use relation: %s\n",current->name.data());
                                           current->fileName = yyFileName; 
-                                          // add a using declaraton
+                                          // add a using declaration
   					  current->section=Entry::USINGDECL_SEC;
 					  current_root->addSubEntry(current);
 					  current = new Entry(*current);
diff --git a/src/sortdict.h b/src/sortdict.h
index 52eccd3..0e0b5c1 100644
--- a/src/sortdict.h
+++ b/src/sortdict.h
@@ -128,7 +128,7 @@ class SDict
 
     /*! Appends an element to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -146,7 +146,7 @@ class SDict
 
     /*! Prepends an element to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -190,7 +190,7 @@ class SDict
       m_list->sort();
     }
     /*! Inserts a compound into the dictionary in a sorted way.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -470,7 +470,7 @@ class SIntDict
 
     /*! Appends a compound to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -488,7 +488,7 @@ class SIntDict
 
     /*! Prepend a compound to the dictionary. The element is owned by the
      *  dictionary.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
@@ -521,7 +521,7 @@ class SIntDict
     }
 
     /*! Inserts a compound into the dictionary in a sorted way.
-     *  \param key The unique key to use to quicky find the item later on.
+     *  \param key The unique key to use to quickly find the item later on.
      *  \param d The compound to add.
      *  \sa find()
      */
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index aeed048..47772f6 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -343,7 +343,7 @@ void VhdlParser::addCompInst(const char *n, const char* instName, const char* co
   {
     current->args=lastCompound->name;             // architecture name
   }
-  current->includeName=comp;                    // component/enity/configuration
+  current->includeName=comp;                    // component/entity/configuration
   int u=genLabels.find("|",1);
   if (u>0)
   {
@@ -584,7 +584,7 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
  * .....
  * library
  * package
- * enity zzz
+ * entity zzz
  * .....
  * and so on..
  */
diff --git a/templates/latex/tabu_doxygen.sty b/templates/latex/tabu_doxygen.sty
index 3efcaf3..a5ab3dc 100755
--- a/templates/latex/tabu_doxygen.sty
+++ b/templates/latex/tabu_doxygen.sty
@@ -78,7 +78,7 @@
 \TMP@EnsureCode 58 = 12 % : (for siunitx)
 \TMP@EnsureCode124 = 12 % |
 \TMP@EnsureCode 36 =  3 % $ = math shift
-\TMP@EnsureCode 38 =  4 % & = tab alignmment character
+\TMP@EnsureCode 38 =  4 % & = tab alignment character
 \TMP@EnsureCode 32 = 10 % space
 \TMP@EnsureCode 94 =  7 % ^
 \TMP@EnsureCode 95 =  8 % _
@@ -840,7 +840,7 @@
 }% \tabu@reset
 \def\tabu@setsave #1{\expandafter\tabu@sets@ve #1\@nil{#1}}
 \long\def\tabu@sets@ve #1\@nil #2{\@temptokena\expandafter{\the\@temptokena \def#2{#1}}}
-%% The Rewritting Process -------------------------------------------
+%% The Rewriting Process -------------------------------------------
 \def\tabu@newcolumntype #1{%
     \expandafter\tabu@new@columntype
         \csname NC@find@\string#1\expandafter\endcsname
@@ -1056,7 +1056,7 @@
    \else #2\tabucolX
    \fi
 }% \tabu@hsize
-%% \usetabu  and  \preamble: rewritting process ---------------------
+%% \usetabu  and  \preamble: rewriting process ---------------------
 \tabu@privatecolumntype \usetabu [1]{%
     \ifx\\#1\\\tabu@saveerr{}\else
         \@ifundefined{tabu@saved@\string#1}
@@ -1072,7 +1072,7 @@
             {\csname tabu@saved@\string#1\expandafter\endcsname\expandafter\z@}%
     \fi
 }% \NC@rewrite@\preamble
-%% Controlling the rewritting process -------------------------------
+%% Controlling the rewriting process -------------------------------
 \tabu@newcolumntype \tabu@rewritefirst{%
     \iftabu@long    \aftergroup \tabu@longpream  % <the whole implementation is here !>
     \else           \aftergroup \tabu@pream
@@ -2388,7 +2388,7 @@
         \PackageWarning{tabu}
         {\string\@arrayright\space is missing from the
         \MessageBreak definition of \string\endarray.
-        \MessageBreak Comptability with delarray.sty is broken.}%
+        \MessageBreak Compatibility with delarray.sty is broken.}%
     \fi\fi
 }% \tabu@fix@arrayright
 \def\tabu@adl@xarraydashrule #1#2#3{%
-- 
cgit v0.12


From 23d8bd36a5b8eb1f4d913b50db31a567a63ad994 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 30 Sep 2019 19:13:58 +0200
Subject: Nicer warning for missing parameter

In case of just 1 missing parameter use the singular form (checking was already done, now we just count).
---
 src/docparser.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index da4cfb2..8f7c2d2 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -508,7 +508,7 @@ static void checkUnOrMultipleDocumentedParams()
     {
       ArgumentListIterator ali(*al);
       const Argument *a;
-      bool found=FALSE;
+      int notArgCnt=0;
       for (ali.toFirst();(a=ali.current());++ali)
       {
         int count = 0;
@@ -523,7 +523,7 @@ static void checkUnOrMultipleDocumentedParams()
         }
         else if (!argName.isEmpty() && g_paramsFound.find(argName)==0 && a->docs.isEmpty()) 
         {
-          found = TRUE;
+          notArgCnt++;
         }
         else
         {
@@ -544,14 +544,16 @@ static void checkUnOrMultipleDocumentedParams()
                          " has multiple @param documentation sections");
         }
       }
-      if (found)
+      if (notArgCnt>0)
       {
         bool first=TRUE;
         QCString errMsg=
-            "The following parameters of "+
+            "The following parameter";
+        errMsg+= (notArgCnt>1 ? "s" : "");
+	errMsg+=" of "+
             QCString(g_memberDef->qualifiedName()) + 
             QCString(argListToString(al)) +
-            " are not documented:\n";
+            (notArgCnt>1 ? " are" : " is") + " not documented:\n";
         for (ali.toFirst();(a=ali.current());++ali)
         {
           QCString argName = g_memberDef->isDefine() ? a->type : a->name;
-- 
cgit v0.12


From a872ee137c88b98c4d5ce2391c60e304d68faccb Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 2 Oct 2019 17:44:32 +0200
Subject: issue #7285 git executable required

Test showed that the REQUIRED is not necessary for the doxygen build process. The git version available will not be available.
---
 cmake/git_watcher.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/git_watcher.cmake b/cmake/git_watcher.cmake
index 6447b86..6a50476 100644
--- a/cmake/git_watcher.cmake
+++ b/cmake/git_watcher.cmake
@@ -69,7 +69,7 @@ CHECK_OPTIONAL_VARIABLE(GIT_WORKING_DIR "${CMAKE_SOURCE_DIR}")
 # Check the optional git variable.
 # If it's not set, we'll try to find it using the CMake packaging system.
 if(NOT DEFINED GIT_EXECUTABLE)
-    find_package(Git QUIET REQUIRED)
+    find_package(Git QUIET)
 endif()
 CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE)
 
-- 
cgit v0.12


From d269f239d7af8d3bd762abfd6a8557cd2d898eab Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sat, 5 Oct 2019 13:08:50 +0200
Subject: Incorrect warning for ALIASES

In case we have an alias in the form: `mine_err(1)=\1` we get the warning:
```
error: Illegal alias format 'mine_err(1)=\1'. Use "name=value" or "name(n)=value", where n is the number of arguments
```
Note the round brackets in the explanation., these have to be curly brackets.
---
 src/configimpl.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/configimpl.l b/src/configimpl.l
index e657745..0cc5c88 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -1495,7 +1495,7 @@ void Config::checkAndCorrect()
     alias=alias.stripWhiteSpace();
     if (alias.find(re1)!=0 && alias.find(re2)!=0)
     {
-      err("Illegal alias format '%s'. Use \"name=value\" or \"name(n)=value\", where n is the number of arguments\n",
+      err("Illegal alias format '%s'. Use \"name=value\" or \"name{n}=value\", where n is the number of arguments\n",
 	  alias.data());
     }
     s=aliasList.next();
-- 
cgit v0.12


From 4ab73bb872b443ad798be384171c5ff222cb2ba2 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sun, 6 Oct 2019 13:40:14 +0200
Subject: Textual error

Correcting textual error
---
 doc/commands.doc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/commands.doc b/doc/commands.doc
index 4e0a6f9..5c6d067 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -2277,8 +2277,8 @@ Commands for displaying examples
   The `option` `lineno` can be used to enable line numbers for the included code if desired.
   The `option` `doc` can be used to treat the file as documentation rather than code.
 
-  \note Some that when using the `{doc}` option,
-       commands like \ref cmdcond "\\cond" and \ref cmdif "\\if" don't work with
+  \note When using the `{doc}` option,
+       some commands like \ref cmdcond "\\cond" and \ref cmdif "\\if" don't work with
        this command due to the moment of parsing.
 
   \note The included documentation should not have comment signs in it as they will appear
@@ -2409,8 +2409,8 @@ Commands for displaying examples
  The `option` `lineno` can be used to enable line numbers for the included code if desired.
  The `option` `doc` can be used to treat the file as documentation rather than code.
 
- \note Some that when using the `{doc}` option,
-       commands like \ref cmdcond "\\cond" and \ref cmdif "\\if" don't work with
+ \note When using the `{doc}` option,
+       some commands like \ref cmdcond "\\cond" and \ref cmdif "\\if" don't work with
        this command due to the moment of parsing.
 
  \note The included documentation should not have comment signs in it as they will appear
-- 
cgit v0.12


From 2734b80f2dcaac9dc6be842969d42414c7a37447 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sun, 6 Oct 2019 17:53:40 +0200
Subject: issue #7295 Doxygen documentation of C++17 nested namespace erroneous

documentation has to be added to the "last" entry not to the "first" / "top"
---
 src/scanner.l | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/scanner.l b/src/scanner.l
index 07d5c71..2a54121 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -3989,6 +3989,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace")
                                             {
                                               int split_point;
+                                              Entry *first_current = current;
                                               while ((split_point = current->name.find("::")) != -1)
                                               {
                                                 Entry *new_current = new Entry(*current);
@@ -4007,6 +4008,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                                 current_root = current;
                                                 current = new_current;
                                               }
+                                              // put documentation in the right entity
+                                              if (first_current!=current)
+                                              {
+                                                current->doc = first_current->doc;
+                                                current->docLine = first_current->docLine;
+                                                current->docFile = first_current->docFile;
+                                                current->brief = first_current->brief;
+                                                current->briefLine = first_current->briefLine;
+                                                current->briefFile = first_current->briefFile;
+                                                first_current->doc = "";
+                                                first_current->docLine = 0;
+                                                first_current->docFile = "";
+                                                first_current->brief = "";
+                                                first_current->briefLine = 0;
+                                                first_current->briefFile = "";
+                                              }
                                             }
 					    QCString &cn = current->name;
 					    QCString rn = current_root->name.copy();
-- 
cgit v0.12


From 3367058c49f85c3d8a86377db08e90ec9e601c60 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sun, 6 Oct 2019 18:02:00 +0200
Subject: Bug 570798 - \\\< does not work for php constants

Handle comment for define analogous to a normal php variable, the closing part is automatically done when the comment is finished (rule: `<DefinePHPEnd>";"`).
---
 src/scanner.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scanner.l b/src/scanner.l
index 07d5c71..316bb81 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2770,7 +2770,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           current->name += yytext ;  
   					  addType( current );
 					}
-<FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
+<FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs,DefinePHPEnd>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
 					  if (current->bodyLine==-1)
 					  {
 					    current->bodyLine=yyLineNr;
-- 
cgit v0.12


From ae0a5ec2a10371adbcdb0df4f3ce536ed6b43840 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 7 Oct 2019 21:01:10 +0200
Subject: Use smartpointers to manage the lifetime of Entry objects

---
 src/commentscan.l        |  18 +-
 src/docgroup.cpp         |  15 +
 src/doxygen.cpp          | 969 +++++++++++++++++++++++------------------------
 src/entry.cpp            |  82 ++--
 src/entry.h              |  38 +-
 src/fileparser.h         |   2 +-
 src/fortranscanner.h     |   2 +-
 src/fortranscanner.l     | 240 +++++-------
 src/groupdef.cpp         |  12 +-
 src/groupdef.h           |  16 +-
 src/markdown.cpp         |  11 +-
 src/markdown.h           |   2 +-
 src/parserintf.h         |   4 +-
 src/pyscanner.h          |   2 +-
 src/pyscanner.l          | 108 ++----
 src/scanner.h            |   2 +-
 src/scanner.l            | 317 +++++++---------
 src/sqlscanner.h         |   2 +-
 src/tagreader.cpp        |  63 +--
 src/tagreader.h          |   4 +-
 src/tclscanner.h         |   2 +-
 src/tclscanner.l         |  38 +-
 src/vhdldocgen.cpp       |  24 +-
 src/vhdljjparser.cpp     | 105 +++--
 src/vhdljjparser.h       |   9 +-
 src/xmlscanner.h         |   2 +-
 vhdlparser/VhdlParser.cc |  22 +-
 vhdlparser/VhdlParser.h  |   2 +-
 vhdlparser/vhdlparser.jj |  22 +-
 29 files changed, 1021 insertions(+), 1114 deletions(-)

diff --git a/src/commentscan.l b/src/commentscan.l
index 7c9929c..23a1fc2 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -415,11 +415,8 @@ static GuardType        guardType;           // kind of guard for conditional se
 static bool             enabledSectionFound;
 static QCString         functionProto;       // function prototype
 static QStack<GuardedSection> guards;        // tracks nested conditional sections (if,ifnot,..)
-static Entry*		current      = 0 ;   // working entry
-//static Entry*		current_root = 0 ;   // parent of working entry
+static Entry           *current = 0;         // working entry
 
-
-//static Entry*		previous     = 0 ;   // TODO: remove need for this
 static bool             needNewEntry;
 
 static QCString         g_sectionLabel;
@@ -533,7 +530,6 @@ static QCString stripQuotes(const char *s)
 static void addXRefItem(const char *listName,const char *itemTitle,
                         const char *listTitle,bool append)
 {
-  Entry *docEntry = current; // inBody && previous ? previous : current;
   if (listName==0) return;
   //printf("addXRefItem(%s,%s,%s,%d)\n",listName,itemTitle,listTitle,append);
 
@@ -545,9 +541,9 @@ static void addXRefItem(const char *listName,const char *itemTitle,
     Doxygen::xrefLists->insert(listName,refList);
     //printf("new list!\n");
   }
-  if (docEntry->sli)
+  if (current->sli)
   {
-    QListIterator<ListItemInfo> slii(*docEntry->sli);
+    QListIterator<ListItemInfo> slii(*current->sli);
     for (slii.toLast();(lii=slii.current());--slii)
     {
       if (qstrcmp(lii->type,listName)==0) 
@@ -580,16 +576,16 @@ static void addXRefItem(const char *listName,const char *itemTitle,
     ASSERT(item!=0);
     item->text = outputXRef;
     item->listAnchor = anchorLabel;
-    docEntry->addSpecialListItem(listName,itemId);
+    current->addSpecialListItem(listName,itemId);
     QCString cmdString;
     cmdString.sprintf(" \\xrefitem %s %d.",listName,itemId);
     if (inBody)
     {
-      docEntry->inbodyDocs += cmdString;
+      current->inbodyDocs += cmdString;
     }
     else
     {
-      docEntry->doc += cmdString;
+      current->doc += cmdString;
     }
     SectionInfo *si = Doxygen::sectionDict->find(anchorLabel);
     if (si)
@@ -609,7 +605,7 @@ static void addXRefItem(const char *listName,const char *itemTitle,
                          g_sectionTitle,SectionInfo::Anchor,
                          g_sectionLevel);
       Doxygen::sectionDict->append(anchorLabel,si);
-      docEntry->anchors->append(si);
+      current->anchors->append(si);
     }
   }
   outputXRef.resize(0);
diff --git a/src/docgroup.cpp b/src/docgroup.cpp
index 1f4fb6d..ecaa1af 100644
--- a/src/docgroup.cpp
+++ b/src/docgroup.cpp
@@ -1,3 +1,18 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
 #include "doxygen.h"
 #include "util.h"
 #include "entry.h"
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 953a5de..798418f 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -33,6 +33,9 @@
 #include <qptrdict.h>
 #include <qtextstream.h>
 
+#include <unordered_map>
+#include <memory>
+
 #include "version.h"
 #include "doxygen.h"
 #include "scanner.h"
@@ -105,13 +108,6 @@
 // provided by the generated file resources.cpp
 extern void initResources();
 
-#define RECURSE_ENTRYTREE(func,var) \
-  do { if (var->children()) { \
-    EntryListIterator eli(*var->children()); \
-    for (;eli.current();++eli) func(eli.current()); \
-  } } while(0)
-
-
 #if !defined(_WIN32) || defined(__CYGWIN__)
 #include <signal.h>
 #define HAS_SIGNALS
@@ -177,7 +173,7 @@ GenericsSDict   *Doxygen::genericsDict;
 DocGroup         Doxygen::docGroup;
 
 // locally accessible globals
-static QDict<Entry>     g_classEntries(1009);
+static std::unordered_map< std::string, const Entry* > g_classEntries;
 static StringList       g_inputFiles;
 static QDict<void>      g_compoundKeywordDict(7);  // keywords recognised as compounds
 static OutputList      *g_outputList = 0;          // list of output generating objects
@@ -297,9 +293,12 @@ void statistics()
 
 
 
-static void addMemberDocs(Entry *root,MemberDef *md, const char *funcDecl,
-                   ArgumentList *al,bool over_load,NamespaceSDict *nl=0);
-static void findMember(Entry *root,
+static void addMemberDocs(const Entry *root,MemberDef *md, const char *funcDecl,
+                   ArgumentList *al,bool over_load,uint64 spec);
+static void findMember(const Entry *root,
+                       const QCString &relates,
+                       const QCString &type,
+                       const QCString &args,
                        QCString funcDecl,
                        bool overloaded,
                        bool isFunc
@@ -313,7 +312,7 @@ enum FindBaseClassRelation_Mode
 };
 
 static bool findClassRelation(
-                           Entry *root,
+                           const Entry *root,
                            Definition *context,
                            ClassDef *cd,
                            BaseInfo *bi,
@@ -420,9 +419,9 @@ static STLInfo g_stlinfo[] =
   { 0,                      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }
 };
 
-static void addSTLMember(Entry *root,const char *type,const char *name)
+static void addSTLMember(const std::unique_ptr<Entry> &root,const char *type,const char *name)
 {
-  Entry *memEntry = new Entry;
+  std::unique_ptr<Entry> memEntry = std::make_unique<Entry>();
   memEntry->name       = name;
   memEntry->type       = type;
   memEntry->protection = Public;
@@ -430,16 +429,12 @@ static void addSTLMember(Entry *root,const char *type,const char *name)
   memEntry->brief      = "STL member";
   memEntry->hidden     = FALSE;
   memEntry->artificial = TRUE;
-  //memEntry->parent     = root;
-  root->addSubEntry(memEntry);
-  //EntryNav *memEntryNav = new EntryNav(root,memEntry);
-  //memEntryNav->setEntry(memEntry);
-  //rootNav->addChild(memEntryNav);
+  root->moveToSubEntryAndKeep(memEntry);
 }
 
-static void addSTLIterator(Entry *classEntry,const char *name)
+static void addSTLIterator(const std::unique_ptr<Entry> &classEntry,const char *name)
 {
-  Entry *iteratorClassEntry = new Entry;
+  std::unique_ptr<Entry> iteratorClassEntry = std::make_unique<Entry>();
   iteratorClassEntry->fileName  = "[STL]";
   iteratorClassEntry->startLine = 1;
   iteratorClassEntry->name      = name;
@@ -447,113 +442,106 @@ static void addSTLIterator(Entry *classEntry,const char *name)
   iteratorClassEntry->brief     = "STL iterator class";
   iteratorClassEntry->hidden    = FALSE;
   iteratorClassEntry->artificial= TRUE;
-  classEntry->addSubEntry(iteratorClassEntry);
-  //EntryNav *iteratorClassEntryNav = new EntryNav(classEntryNav,iteratorClassEntry);
-  //iteratorClassEntryNav->setEntry(iteratorClassEntry);
-  //classEntryNav->addChild(iteratorClassEntryNav);
+  classEntry->moveToSubEntryAndKeep(iteratorClassEntry);
+}
+
+static void addSTLClass(const std::unique_ptr<Entry> &root,const STLInfo *info)
+{
+  //printf("Adding STL class %s\n",info->className);
+  QCString fullName = info->className;
+  fullName.prepend("std::");
+
+  // add fake Entry for the class
+  std::unique_ptr<Entry> classEntry = std::make_unique<Entry>();
+  classEntry->fileName  = "[STL]";
+  classEntry->startLine = 1;
+  classEntry->name      = fullName;
+  classEntry->section   = Entry::CLASS_SEC;
+  classEntry->brief     = "STL class";
+  classEntry->hidden    = FALSE;
+  classEntry->artificial= TRUE;
+
+  // add template arguments to class
+  if (info->templType1)
+  {
+    ArgumentList *al = new ArgumentList;
+    Argument *a=new Argument;
+    a->type="typename";
+    a->name=info->templType1;
+    al->append(a);
+    if (info->templType2) // another template argument
+    {
+      a=new Argument;
+      a->type="typename";
+      a->name=info->templType2;
+      al->append(a);
+    }
+    classEntry->tArgLists = new QList<ArgumentList>;
+    classEntry->tArgLists->setAutoDelete(TRUE);
+    classEntry->tArgLists->append(al);
+  }
+  // add member variables
+  if (info->templName1)
+  {
+    addSTLMember(classEntry,info->templType1,info->templName1);
+  }
+  if (info->templName2)
+  {
+    addSTLMember(classEntry,info->templType2,info->templName2);
+  }
+  if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || fullName=="std::shared_ptr" ||
+      fullName=="std::unique_ptr" || fullName=="std::weak_ptr")
+  {
+    std::unique_ptr<Entry> memEntry = std::make_unique<Entry>();
+    memEntry->name       = "operator->";
+    memEntry->args       = "()";
+    memEntry->type       = "T*";
+    memEntry->protection = Public;
+    memEntry->section    = Entry::FUNCTION_SEC;
+    memEntry->brief      = "STL member";
+    memEntry->hidden     = FALSE;
+    memEntry->artificial = FALSE;
+    classEntry->moveToSubEntryAndKeep(memEntry);
+  }
+  if (info->baseClass1)
+  {
+    classEntry->extends->append(new BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal));
+  }
+  if (info->baseClass2)
+  {
+    classEntry->extends->append(new BaseInfo(info->baseClass2,Public,info->virtualInheritance?Virtual:Normal));
+  }
+  if (info->iterators)
+  {
+    // add iterator class
+    addSTLIterator(classEntry,fullName+"::iterator");
+    addSTLIterator(classEntry,fullName+"::const_iterator");
+    addSTLIterator(classEntry,fullName+"::reverse_iterator");
+    addSTLIterator(classEntry,fullName+"::const_reverse_iterator");
+  }
+  root->moveToSubEntryAndKeep(classEntry);
 }
 
 
-static void addSTLClasses(Entry *root)
+static void addSTLClasses(const std::unique_ptr<Entry> &root)
 {
-  Entry *namespaceEntry = new Entry;
+  std::unique_ptr<Entry> namespaceEntry = std::make_unique<Entry>();
   namespaceEntry->fileName  = "[STL]";
   namespaceEntry->startLine = 1;
-  //namespaceEntry->parent    = rootNav->entry();
   namespaceEntry->name      = "std";
   namespaceEntry->section   = Entry::NAMESPACE_SEC;
   namespaceEntry->brief     = "STL namespace";
   namespaceEntry->hidden    = FALSE;
   namespaceEntry->artificial= TRUE;
-  root->addSubEntry(namespaceEntry);
-  //EntryNav *namespaceEntryNav = new EntryNav(rootNav,namespaceEntry);
-  //namespaceEntryNav->setEntry(namespaceEntry);
-  //rootNav->addChild(namespaceEntryNav);
 
   STLInfo *info = g_stlinfo;
   while (info->className)
   {
-    //printf("Adding STL class %s\n",info->className);
-    QCString fullName = info->className;
-    fullName.prepend("std::");
-
-    // add fake Entry for the class
-    Entry *classEntry = new Entry;
-    classEntry->fileName  = "[STL]";
-    classEntry->startLine = 1;
-    classEntry->name      = fullName;
-    classEntry->section   = Entry::CLASS_SEC;
-    classEntry->brief     = "STL class";
-    classEntry->hidden    = FALSE;
-    classEntry->artificial= TRUE;
-    namespaceEntry->addSubEntry(classEntry);
-    //EntryNav *classEntryNav = new EntryNav(namespaceEntryNav,classEntry);
-    //classEntryNav->setEntry(classEntry);
-    //namespaceEntryNav->addChild(classEntryNav);
-
-    // add template arguments to class
-    if (info->templType1)
-    {
-      ArgumentList *al = new ArgumentList;
-      Argument *a=new Argument;
-      a->type="typename";
-      a->name=info->templType1;
-      al->append(a);
-      if (info->templType2) // another template argument
-      {
-        a=new Argument;
-        a->type="typename";
-        a->name=info->templType2;
-        al->append(a);
-      }
-      classEntry->tArgLists = new QList<ArgumentList>;
-      classEntry->tArgLists->setAutoDelete(TRUE);
-      classEntry->tArgLists->append(al);
-    }
-    // add member variables
-    if (info->templName1)
-    {
-      addSTLMember(classEntry,info->templType1,info->templName1);
-    }
-    if (info->templName2)
-    {
-      addSTLMember(classEntry,info->templType2,info->templName2);
-    }
-    if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || fullName=="std::shared_ptr" ||
-        fullName=="std::unique_ptr" || fullName=="std::weak_ptr")
-    {
-      Entry *memEntry = new Entry;
-      memEntry->name       = "operator->";
-      memEntry->args       = "()";
-      memEntry->type       = "T*";
-      memEntry->protection = Public;
-      memEntry->section    = Entry::FUNCTION_SEC;
-      memEntry->brief      = "STL member";
-      memEntry->hidden     = FALSE;
-      memEntry->artificial = FALSE;
-      classEntry->addSubEntry(memEntry);
-      //EntryNav *memEntryNav = new EntryNav(classEntryNav,memEntry);
-      //memEntryNav->setEntry(memEntry);
-      //classEntryNav->addChild(memEntryNav);
-    }
-    if (info->baseClass1)
-    {
-      classEntry->extends->append(new BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal));
-    }
-    if (info->baseClass2)
-    {
-      classEntry->extends->append(new BaseInfo(info->baseClass2,Public,info->virtualInheritance?Virtual:Normal));
-    }
-    if (info->iterators)
-    {
-      // add iterator class
-      addSTLIterator(classEntry,fullName+"::iterator");
-      addSTLIterator(classEntry,fullName+"::const_iterator");
-      addSTLIterator(classEntry,fullName+"::reverse_iterator");
-      addSTLIterator(classEntry,fullName+"::const_reverse_iterator");
-    }
+    addSTLClass(namespaceEntry,info);
     info++;
   }
+
+  root->moveToSubEntryAndKeep(namespaceEntry);
 }
 
 //----------------------------------------------------------------------------
@@ -616,7 +604,7 @@ static void addRelatedPage(Entry *root)
   }
 }
 
-static void buildGroupListFiltered(Entry *root,bool additional, bool includeExternal)
+static void buildGroupListFiltered(const Entry *root,bool additional, bool includeExternal)
 {
   if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty() &&
         ((!includeExternal && root->tagInfo==0) ||
@@ -671,18 +659,10 @@ static void buildGroupListFiltered(Entry *root,bool additional, bool includeExte
       }
     }
   }
-  if (root->children())
-  {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
-    {
-      buildGroupListFiltered(e,additional,includeExternal);
-    }
-  }
+  for (const auto &e : root->children()) buildGroupListFiltered(e.get(),additional,includeExternal);
 }
 
-static void buildGroupList(Entry *root)
+static void buildGroupList(const Entry *root)
 {
   // --- first process only local groups
   // first process the @defgroups blocks
@@ -697,7 +677,7 @@ static void buildGroupList(Entry *root)
   buildGroupListFiltered(root,TRUE,TRUE);
 }
 
-static void findGroupScope(Entry *root)
+static void findGroupScope(const Entry *root)
 {
   if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty() &&
       root->parent() && !root->parent()->name.isEmpty())
@@ -719,10 +699,10 @@ static void findGroupScope(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(findGroupScope,root);
+  for (const auto &e : root->children()) findGroupScope(e.get());
 }
 
-static void organizeSubGroupsFiltered(Entry *root,bool additional)
+static void organizeSubGroupsFiltered(const Entry *root,bool additional)
 {
   if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty())
   {
@@ -737,18 +717,10 @@ static void organizeSubGroupsFiltered(Entry *root,bool additional)
       }
     }
   }
-  if (root->children())
-  {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
-    {
-      organizeSubGroupsFiltered(e,additional);
-    }
-  }
+  for (const auto &e : root->children()) organizeSubGroupsFiltered(e.get(),additional);
 }
 
-static void organizeSubGroups(Entry *root)
+static void organizeSubGroups(const Entry *root)
 {
   //printf("Defining groups\n");
   // first process the @defgroups blocks
@@ -760,7 +732,7 @@ static void organizeSubGroups(Entry *root)
 
 //----------------------------------------------------------------------
 
-static void buildFileList(Entry *root)
+static void buildFileList(const Entry *root)
 {
   if (((root->section==Entry::FILEDOC_SEC) ||
         ((root->section & Entry::FILE_MASK) && Config_getBool(EXTRACT_ALL))) &&
@@ -824,10 +796,10 @@ static void buildFileList(Entry *root)
       warn(fn,root->startLine,text);
     }
   }
-  RECURSE_ENTRYTREE(buildFileList,root);
+  for (const auto &e : root->children()) buildFileList(e.get());
 }
 
-static void addIncludeFile(ClassDef *cd,FileDef *ifd,Entry *root)
+static void addIncludeFile(ClassDef *cd,FileDef *ifd,const Entry *root)
 {
   if (
       (!root->doc.stripWhiteSpace().isEmpty() ||
@@ -1220,7 +1192,7 @@ ClassDef::CompoundType convertToCompoundType(int section,uint64 specifier)
 }
 
 
-static void addClassToContext(Entry *root)
+static void addClassToContext(const Entry *root)
 {
   FileDef *fd = root->fileDef();
 
@@ -1386,7 +1358,7 @@ static void addClassToContext(Entry *root)
 //----------------------------------------------------------------------
 // build a list of all classes mentioned in the documentation
 // and all classes that have a documentation block before their definition.
-static void buildClassList(Entry *root)
+static void buildClassList(const Entry *root)
 {
   if (
         ((root->section & Entry::COMPOUND_MASK) ||
@@ -1395,10 +1367,10 @@ static void buildClassList(Entry *root)
   {
     addClassToContext(root);
   }
-  RECURSE_ENTRYTREE(buildClassList,root);
+  for (const auto &e : root->children()) buildClassList(e.get());
 }
 
-static void buildClassDocList(Entry *root)
+static void buildClassDocList(const Entry *root)
 {
   if (
        (root->section & Entry::COMPOUNDDOC_MASK) && !root->name.isEmpty()
@@ -1406,7 +1378,7 @@ static void buildClassDocList(Entry *root)
   {
     addClassToContext(root);
   }
-  RECURSE_ENTRYTREE(buildClassDocList,root);
+  for (const auto &e : root->children()) buildClassDocList(e.get());
 }
 
 static void resolveClassNestingRelations()
@@ -1717,7 +1689,7 @@ static void findTagLessClasses()
 //----------------------------------------------------------------------
 // build a list of all namespaces mentioned in the documentation
 // and all namespaces that have a documentation block before their definition.
-static void buildNamespaceList(Entry *root)
+static void buildNamespaceList(const Entry *root)
 {
   if (
        (root->section==Entry::NAMESPACE_SEC ||
@@ -1847,7 +1819,7 @@ static void buildNamespaceList(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(buildNamespaceList,root);
+  for (const auto &e : root->children()) buildNamespaceList(e.get());
 }
 
 //----------------------------------------------------------------------
@@ -1871,7 +1843,7 @@ static const NamespaceDef *findUsedNamespace(const NamespaceSDict *unl,
   return usingNd;
 }
 
-static void findUsingDirectives(Entry *root)
+static void findUsingDirectives(const Entry *root)
 {
   if (root->section==Entry::USINGDIR_SEC)
   {
@@ -2007,12 +1979,12 @@ static void findUsingDirectives(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(findUsingDirectives,root);
+  for (const auto &e : root->children()) findUsingDirectives(e.get());
 }
 
 //----------------------------------------------------------------------
 
-static void buildListOfUsingDecls(Entry *root)
+static void buildListOfUsingDecls(const Entry *root)
 {
   if (root->section==Entry::USINGDECL_SEC &&
       !(root->parent()->section&Entry::COMPOUND_MASK) // not a class/struct member
@@ -2029,11 +2001,11 @@ static void buildListOfUsingDecls(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(buildListOfUsingDecls,root);
+  for (const auto &e : root->children()) buildListOfUsingDecls(e.get());
 }
 
 
-static void findUsingDeclarations(Entry *root)
+static void findUsingDeclarations(const Entry *root)
 {
   if (root->section==Entry::USINGDECL_SEC &&
       !(root->parent()->section&Entry::COMPOUND_MASK) // not a class/struct member
@@ -2113,12 +2085,12 @@ static void findUsingDeclarations(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(findUsingDeclarations,root);
+  for (const auto &e : root->children()) findUsingDeclarations(e.get());
 }
 
 //----------------------------------------------------------------------
 
-static void findUsingDeclImports(Entry *root)
+static void findUsingDeclImports(const Entry *root)
 {
   if (root->section==Entry::USINGDECL_SEC &&
       (root->parent()->section&Entry::COMPOUND_MASK) // in a class/struct member
@@ -2211,7 +2183,7 @@ static void findUsingDeclImports(Entry *root)
     }
 
   }
-  RECURSE_ENTRYTREE(findUsingDeclImports,root);
+  for (const auto &e : root->children()) findUsingDeclImports(e.get());
 }
 
 //----------------------------------------------------------------------
@@ -2250,10 +2222,12 @@ static void findIncludedUsingDirectives()
 //----------------------------------------------------------------------
 
 static MemberDef *addVariableToClass(
-    Entry *root,
+    const Entry *root,
     ClassDef *cd,
     MemberType mtype,
+    const QCString &type,
     const QCString &name,
+    const QCString &args,
     bool fromAnnScope,
     MemberDef *fromAnnMemb,
     Protection prot,
@@ -2270,38 +2244,38 @@ static MemberDef *addVariableToClass(
   Debug::print(Debug::Variables,0,
       "  class variable:\n"
       "    '%s' '%s'::'%s' '%s' prot=%d ann=%d init='%s'\n",
-      qPrint(root->type),
+      qPrint(type),
       qPrint(qualScope),
       qPrint(name),
-      qPrint(root->args),
+      qPrint(args),
       root->protection,
       fromAnnScope,
       qPrint(root->initializer)
               );
 
   QCString def;
-  if (!root->type.isEmpty())
+  if (!type.isEmpty())
   {
     if (related || mtype==MemberType_Friend || Config_getBool(HIDE_SCOPE_NAMES))
     {
       if (root->spec&Entry::Alias) // turn 'typedef B A' into 'using A = B'
       {
-        def="using "+name+" = "+root->type.mid(7);
+        def="using "+name+" = "+type.mid(7);
       }
       else
       {
-        def=root->type+" "+name+root->args;
+        def=type+" "+name+root->args;
       }
     }
     else
     {
       if (root->spec&Entry::Alias) // turn 'typedef B C::A' into 'using C::A = B'
       {
-        def="using "+qualScope+scopeSeparator+name+" = "+root->type.mid(7);
+        def="using "+qualScope+scopeSeparator+name+" = "+type.mid(7);
       }
       else
       {
-        def=root->type+" "+qualScope+scopeSeparator+name+root->args;
+        def=type+" "+qualScope+scopeSeparator+name+args;
       }
     }
   }
@@ -2309,11 +2283,11 @@ static MemberDef *addVariableToClass(
   {
     if (Config_getBool(HIDE_SCOPE_NAMES))
     {
-      def=name+root->args;
+      def=name+args;
     }
     else
     {
-      def=qualScope+scopeSeparator+name+root->args;
+      def=qualScope+scopeSeparator+name+args;
     }
   }
   def.stripPrefix("static ");
@@ -2329,10 +2303,10 @@ static MemberDef *addVariableToClass(
     for (mni.toFirst();(md=mni.current());++mni)
     {
       //printf("md->getClassDef()=%p cd=%p type=[%s] md->typeString()=[%s]\n",
-      //    md->getClassDef(),cd,root->type.data(),md->typeString());
+      //    md->getClassDef(),cd,type.data(),md->typeString());
       if (!md->isAlias() &&
           md->getClassDef()==cd &&
-          removeRedundantWhiteSpace(root->type)==md->typeString())
+          removeRedundantWhiteSpace(type)==md->typeString())
         // member already in the scope
       {
 
@@ -2344,7 +2318,7 @@ static MemberDef *addVariableToClass(
           md->setProtection(root->protection);
           cd->reclassifyMember(md,MemberType_Property);
         }
-        addMemberDocs(root,md,def,0,FALSE);
+        addMemberDocs(root,md,def,0,FALSE,root->spec);
         //printf("    Member already found!\n");
         return md;
       }
@@ -2360,7 +2334,7 @@ static MemberDef *addVariableToClass(
   // new member variable, typedef or enum value
   MemberDef *md=createMemberDef(
       fileName,root->startLine,root->startColumn,
-      root->type,name,root->args,root->exception,
+      type,name,args,root->exception,
       prot,Normal,root->stat,related,
       mtype,root->tArgLists ? root->tArgLists->getLast() : 0,0, root->metaData);
   md->setTagInfo(root->tagInfo);
@@ -2421,17 +2395,19 @@ static MemberDef *addVariableToClass(
 
   //TODO: insert FileDef instead of filename strings.
   cd->insertUsedFile(root->fileDef());
-  root->changeSection(Entry::EMPTY_SEC);
+  root->markAsProcessed();
   return md;
 }
 
 //----------------------------------------------------------------------
 
 static MemberDef *addVariableToFile(
-    Entry *root,
+    const Entry *root,
     MemberType mtype,
     const QCString &scope,
+    const QCString &type,
     const QCString &name,
+    const QCString &args,
     bool fromAnnScope,
     /*int indentDepth,*/
     MemberDef *fromAnnMemb)
@@ -2440,10 +2416,10 @@ static MemberDef *addVariableToFile(
       "  global variable:\n"
       "    file='%s' type='%s' scope='%s' name='%s' args='%s' prot=`%d mtype=%d lang=%d\n",
       qPrint(root->fileName),
-      qPrint(root->type),
+      qPrint(type),
       qPrint(scope),
       qPrint(name),
-      qPrint(root->args),
+      qPrint(args),
       root->protection,
       mtype,
       root->lang
@@ -2454,18 +2430,18 @@ static MemberDef *addVariableToFile(
   // see if we have a typedef that should hide a struct or union
   if (mtype==MemberType_Typedef && Config_getBool(TYPEDEF_HIDES_STRUCT))
   {
-    QCString type = root->type;
-    type.stripPrefix("typedef ");
-    if (type.left(7)=="struct " || type.left(6)=="union ")
+    QCString ttype = type;
+    ttype.stripPrefix("typedef ");
+    if (ttype.left(7)=="struct " || ttype.left(6)=="union ")
     {
-      type.stripPrefix("struct ");
-      type.stripPrefix("union ");
+      ttype.stripPrefix("struct ");
+      ttype.stripPrefix("union ");
       static QRegExp re("[a-z_A-Z][a-z_A-Z0-9]*");
       int l,s;
-      s = re.match(type,0,&l);
+      s = re.match(ttype,0,&l);
       if (s>=0)
       {
-        QCString typeValue = type.mid(s,l);
+        QCString typeValue = ttype.mid(s,l);
         ClassDef *cd = getClass(typeValue);
         if (cd)
         {
@@ -2502,45 +2478,45 @@ static MemberDef *addVariableToFile(
     SrcLangExt lang = nd->getLanguage();
     QCString sep=getLanguageSpecificSeparator(lang);
 
-    if (!root->type.isEmpty())
+    if (!type.isEmpty())
     {
       if (root->spec&Entry::Alias) // turn 'typedef B NS::A' into 'using NS::A = B'
       {
-        def="using "+nd->name()+sep+name+" = "+root->type;
+        def="using "+nd->name()+sep+name+" = "+type;
       }
       else // normal member
       {
-        def=root->type+" "+nd->name()+sep+name+root->args;
+        def=type+" "+nd->name()+sep+name+args;
       }
     }
     else
     {
-      def=nd->name()+sep+name+root->args;
+      def=nd->name()+sep+name+args;
     }
   }
   else
   {
-    if (!root->type.isEmpty() && !root->name.isEmpty())
+    if (!type.isEmpty() && !root->name.isEmpty())
     {
       if (name.at(0)=='@') // dummy variable representing anonymous union
       {
-        def=root->type;
+        def=type;
       }
       else
       {
         if (root->spec&Entry::Alias) // turn 'typedef B A' into 'using A = B'
         {
-          def="using "+root->name+" = "+root->type.mid(7);
+          def="using "+root->name+" = "+type.mid(7);
         }
         else // normal member
         {
-          def=root->type+" "+name+root->args;
+          def=type+" "+name+args;
         }
       }
     }
     else
     {
-      def=name+root->args;
+      def=name+args;
     }
   }
   def.stripPrefix("static ");
@@ -2571,8 +2547,8 @@ static MemberDef *addVariableToFile(
         // variable already in the scope
       {
         bool isPHPArray = md->getLanguage()==SrcLangExt_PHP &&
-                          md->argsString()!=root->args &&
-                          root->args.find('[')!=-1;
+                          md->argsString()!=args &&
+                          args.find('[')!=-1;
         bool staticsInDifferentFiles =
                           root->stat && md->isStatic() &&
                           root->fileName!=md->getDefFileName();
@@ -2585,7 +2561,7 @@ static MemberDef *addVariableToFile(
         {
           Debug::print(Debug::Variables,0,
               "    variable already found: scope=%s\n",qPrint(md->getOuterScope()->name()));
-          addMemberDocs(root,md,def,0,FALSE);
+          addMemberDocs(root,md,def,0,FALSE,root->spec);
           md->setRefItems(root->sli);
           // if md is a variable forward declaration and root is the definition that
           // turn md into the defintion
@@ -2617,7 +2593,7 @@ static MemberDef *addVariableToFile(
   // new global variable, enum value or typedef
   MemberDef *md=createMemberDef(
       fileName,root->startLine,root->startColumn,
-      root->type,name,root->args,0,
+      type,name,args,0,
       root->protection, Normal,root->stat,Member,
       mtype,root->tArgLists ? root->tArgLists->getLast() : 0,0, root->metaData);
   md->setTagInfo(root->tagInfo);
@@ -2673,7 +2649,7 @@ static MemberDef *addVariableToFile(
     mn->append(md);
     Doxygen::functionNameSDict->append(name,mn);
   }
-  root->changeSection(Entry::EMPTY_SEC);
+  root->markAsProcessed();
   return md;
 }
 
@@ -2714,7 +2690,7 @@ static int findFunctionPtr(const QCString &type,int lang, int *pLength=0)
 /*! Returns TRUE iff \a type is a class within scope \a context.
  *  Used to detect variable declarations that look like function prototypes.
  */
-static bool isVarWithConstructor(Entry *root)
+static bool isVarWithConstructor(const Entry *root)
 {
   static QRegExp initChars("[0-9\"'&*!^]+");
   static QRegExp idChars("[a-z_A-Z][a-z_A-Z0-9]*");
@@ -2833,7 +2809,7 @@ done:
   return result;
 }
 
-static void addVariable(Entry *root,int isFuncPtr=-1)
+static void addVariable(const Entry *root,int isFuncPtr=-1)
 {
     static bool sliceOpt = Config_getBool(OPTIMIZE_OUTPUT_SLICE);
 
@@ -2849,48 +2825,52 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
                 );
     //printf("root->parent->name=%s\n",root->parent->name.data());
 
-    if (root->type.isEmpty() && root->name.find("operator")==-1 &&
-        (root->name.find('*')!=-1 || root->name.find('&')!=-1))
+    QCString type = root->type;
+    QCString name = root->name;
+    QCString args = root->args;
+    if (type.isEmpty() && name.find("operator")==-1 &&
+        (name.find('*')!=-1 || name.find('&')!=-1))
     {
       // recover from parse error caused by redundant braces
       // like in "int *(var[10]);", which is parsed as
       // type="" name="int *" args="(var[10])"
 
-      root->type=root->name;
+      type=name;
       static const QRegExp reName("[a-z_A-Z][a-z_A-Z0-9]*");
       int l=0;
-      int i=root->args.isEmpty() ? -1 : reName.match(root->args,0,&l);
+      int i=args.isEmpty() ? -1 : reName.match(args,0,&l);
       if (i!=-1)
       {
-        root->name=root->args.mid(i,l);
-        root->args=root->args.mid(i+l,root->args.find(')',i+l)-i-l);
+        name=args.mid(i,l);
+        args=args.mid(i+l,args.find(')',i+l)-i-l);
       }
       //printf("new: type='%s' name='%s' args='%s'\n",
-      //    root->type.data(),root->name.data(),root->args.data());
+      //    type.data(),name.data(),args.data());
     }
     else
     {
       int i=isFuncPtr;
-      if (i==-1 && (root->spec&Entry::Alias)==0) i=findFunctionPtr(root->type,root->lang); // for typedefs isFuncPtr is not yet set
+      if (i==-1 && (root->spec&Entry::Alias)==0) i=findFunctionPtr(type,root->lang); // for typedefs isFuncPtr is not yet set
       Debug::print(Debug::Variables,0,"  functionPtr? %s\n",i!=-1?"yes":"no");
       if (i!=-1) // function pointer
       {
-        int ai = root->type.find('[',i);
+        int ai = type.find('[',i);
         if (ai>i) // function pointer array
         {
-          root->args.prepend(root->type.right(root->type.length()-ai));
-          root->type=root->type.left(ai);
+          args.prepend(type.right(type.length()-ai));
+          type=type.left(ai);
         }
-        else if (root->type.find(')',i)!=-1) // function ptr, not variable like "int (*bla)[10]"
+        else if (type.find(')',i)!=-1) // function ptr, not variable like "int (*bla)[10]"
         {
-          root->type=root->type.left(root->type.length()-1);
-          root->args.prepend(") ");
-          //printf("root->type=%s root->args=%s\n",root->type.data(),root->args.data());
+          type=type.left(type.length()-1);
+          args.prepend(") ");
+          //printf("type=%s args=%s\n",type.data(),args.data());
         }
       }
     }
 
-    QCString scope,name=removeRedundantWhiteSpace(root->name);
+    QCString scope;
+    name=removeRedundantWhiteSpace(name);
 
     // find the scope of this variable
     Entry *p = root->parent();
@@ -2906,7 +2886,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
     }
 
     MemberType mtype;
-    QCString type=root->type.stripWhiteSpace();
+    type=type.stripWhiteSpace();
     ClassDef *cd=0;
     bool isRelated=FALSE;
     bool isMemberOf=FALSE;
@@ -2915,10 +2895,10 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
     classScope=stripTemplateSpecifiersFromScope(classScope,FALSE);
     QCString annScopePrefix=scope.left(scope.length()-classScope.length());
 
-    if (root->name.findRev("::")!=-1)
+    if (name.findRev("::")!=-1)
     {
-      if (root->type=="friend class" || root->type=="friend struct" ||
-          root->type=="friend union")
+      if (type=="friend class" || type=="friend struct" ||
+          type=="friend union")
       {
          cd=getClass(scope);
          if (cd)
@@ -2926,7 +2906,9 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
            addVariableToClass(root,  // entry
                               cd,    // class to add member to
                               MemberType_Friend, // type of member
-                              name, // name of the member
+                              type,   // type value as string
+                              name,   // name of the member
+                              args,   // arguments as string
                               FALSE,  // from Anonymous scope
                               0,      // anonymous member
                               Public, // protection
@@ -3001,7 +2983,9 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
             md=addVariableToClass(root,  // entry
                                   pcd,   // class to add member to
                                   mtype, // member type
+                                  type,  // type value as string
                                   name,  // member name
+                                  args,  // arguments as string
                                   TRUE,  // from anonymous scope
                                   0,     // from anonymous member
                                   root->protection,
@@ -3013,7 +2997,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
           {
             if (mtype==MemberType_Variable)
             {
-              md=addVariableToFile(root,mtype,pScope,name,TRUE,0);
+              md=addVariableToFile(root,mtype,pScope,type,name,args,TRUE,0);
             }
             //added=TRUE;
           }
@@ -3026,7 +3010,9 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
       addVariableToClass(root,   // entry
                          cd,     // class to add member to
                          mtype,  // member type
+                         type,   // type value as string
                          name,   // name of the member
+                         args,   // arguments as string
                          FALSE,  // from anonymous scope
                          md,     // from anonymous member
                          root->protection,
@@ -3035,7 +3021,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
     else if (!name.isEmpty()) // global variable
     {
       //printf("Inserting member in global scope %s!\n",scope.data());
-      addVariableToFile(root,mtype,scope,name,FALSE,/*0,*/0);
+      addVariableToFile(root,mtype,scope,type,name,args,FALSE,/*0,*/0);
     }
 
 }
@@ -3043,7 +3029,7 @@ static void addVariable(Entry *root,int isFuncPtr=-1)
 //----------------------------------------------------------------------
 // Searches the Entry tree for typedef documentation sections.
 // If found they are stored in their class or in the global list.
-static void buildTypedefList(Entry *root)
+static void buildTypedefList(const Entry *root)
 {
   //printf("buildVarList(%s)\n",rootNav->name().data());
   if (!root->name.isEmpty() &&
@@ -3053,24 +3039,15 @@ static void buildTypedefList(Entry *root)
   {
     addVariable(root);
   }
-  if (root->children())
-  {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
-    {
-      if (e->section!=Entry::ENUM_SEC)
-      {
-        buildTypedefList(e);
-      }
-    }
-  }
+  for (const auto &e : root->children())
+    if (e->section!=Entry::ENUM_SEC)
+      buildTypedefList(e.get());
 }
 
 //----------------------------------------------------------------------
 // Searches the Entry tree for sequence documentation sections.
 // If found they are stored in the global list.
-static void buildSequenceList(Entry *root)
+static void buildSequenceList(const Entry *root)
 {
   if (!root->name.isEmpty() &&
       root->section==Entry::VARIABLE_SEC &&
@@ -3079,24 +3056,15 @@ static void buildSequenceList(Entry *root)
   {
     addVariable(root);
   }
-  if (root->children())
-  {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
-    {
-      if (e->section!=Entry::ENUM_SEC)
-      {
-        buildSequenceList(e);
-      }
-    }
-  }
+  for (const auto &e : root->children())
+    if (e->section!=Entry::ENUM_SEC)
+      buildSequenceList(e.get());
 }
 
 //----------------------------------------------------------------------
 // Searches the Entry tree for dictionary documentation sections.
 // If found they are stored in the global list.
-static void buildDictionaryList(Entry *root)
+static void buildDictionaryList(const Entry *root)
 {
   if (!root->name.isEmpty() &&
       root->section==Entry::VARIABLE_SEC &&
@@ -3105,25 +3073,16 @@ static void buildDictionaryList(Entry *root)
   {
     addVariable(root);
   }
-  if (root->children())
-  {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
-    {
-      if (e->section!=Entry::ENUM_SEC)
-      {
-        buildDictionaryList(e);
-      }
-    }
-  }
+  for (const auto &e : root->children())
+    if (e->section!=Entry::ENUM_SEC)
+      buildDictionaryList(e.get());
 }
 
 //----------------------------------------------------------------------
 // Searches the Entry tree for Variable documentation sections.
 // If found they are stored in their class or in the global list.
 
-static void buildVarList(Entry *root)
+static void buildVarList(const Entry *root)
 {
   //printf("buildVarList(%s) section=%08x\n",rootNav->name().data(),rootNav->section());
   int isFuncPtr=-1;
@@ -3143,18 +3102,9 @@ static void buildVarList(Entry *root)
   {
     addVariable(root,isFuncPtr);
   }
-  if (root->children())
-  {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
-    {
-      if (e->section!=Entry::ENUM_SEC)
-      {
-        buildVarList(e);
-      }
-    }
-  }
+  for (const auto &e : root->children())
+    if (e->section!=Entry::ENUM_SEC)
+      buildVarList(e.get());
 }
 
 //----------------------------------------------------------------------
@@ -3163,7 +3113,7 @@ static void buildVarList(Entry *root)
 //
 
 static void addInterfaceOrServiceToServiceOrSingleton(
-        Entry *const root,
+        const Entry *root,
         ClassDef *const cd,
         QCString const& rname)
 {
@@ -3235,11 +3185,11 @@ static void addInterfaceOrServiceToServiceOrSingleton(
   cd->insertUsedFile(fd);
 
   addMemberToGroups(root,md);
-  root->changeSection(Entry::EMPTY_SEC);
+  root->markAsProcessed();
   md->setRefItems(root->sli);
 }
 
-static void buildInterfaceAndServiceList(Entry *root)
+static void buildInterfaceAndServiceList(const Entry *root)
 {
   if (root->section==Entry::EXPORTED_INTERFACE_SEC ||
       root->section==Entry::INCLUDED_SERVICE_SEC)
@@ -3292,7 +3242,7 @@ static void buildInterfaceAndServiceList(Entry *root)
   {
     case SrcLangExt_Unknown: // fall through (root node always is Unknown)
     case SrcLangExt_IDL:
-        RECURSE_ENTRYTREE(buildInterfaceAndServiceList,root);
+        for (const auto &e : root->children()) buildInterfaceAndServiceList(e.get());
         break;
     default:
         return; // nothing to do here
@@ -3304,26 +3254,32 @@ static void buildInterfaceAndServiceList(Entry *root)
 // Searches the Entry tree for Function sections.
 // If found they are stored in their class or in the global list.
 
-static void addMethodToClass(Entry *root,ClassDef *cd,
-                  const QCString &rname,bool isFriend)
+static void addMethodToClass(const Entry *root,ClassDef *cd,
+                  const QCString &rtype,const QCString &rname,const QCString &rargs,
+                  bool isFriend,
+                  Protection protection,bool stat,Specifier virt,uint64 spec,
+                  const QCString &relates
+                  )
 {
   FileDef *fd=root->fileDef();
 
   int l;
   static QRegExp re("([a-z_A-Z0-9: ]*[ &*]+[ ]*");
-  int ts=root->type.find('<');
-  int te=root->type.findRev('>');
-  int i=re.match(root->type,0,&l);
+  QCString type = rtype;
+  QCString args = rargs;
+  int ts=type.find('<');
+  int te=type.findRev('>');
+  int i=re.match(type,0,&l);
   if (i!=-1 && ts!=-1 && ts<te && ts<i && i<te) // avoid changing A<int(int*)>, see bug 677315
   {
     i=-1;
   }
 
   if (cd->getLanguage()==SrcLangExt_Cpp && // only C has pointers
-      !root->type.isEmpty() && (root->spec&Entry::Alias)==0 && i!=-1) // function variable
+      !type.isEmpty() && (root->spec&Entry::Alias)==0 && i!=-1) // function variable
   {
-    root->args+=root->type.right(root->type.length()-i-l);
-    root->type=root->type.left(i+l);
+    args+=type.right(type.length()-i-l);
+    type=type.left(i+l);
   }
 
   QCString name=removeRedundantWhiteSpace(rname);
@@ -3349,17 +3305,17 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
     fileName = root->tagInfo->tagName;
   }
 
-  //printf("root->name='%s; root->args='%s' root->argList='%s'\n",
-  //    root->name.data(),root->args.data(),argListToString(root->argList).data()
+  //printf("root->name='%s; args='%s' root->argList='%s'\n",
+  //    root->name.data(),args.data(),argListToString(root->argList).data()
   //   );
 
   // adding class member
   MemberDef *md=createMemberDef(
       fileName,root->startLine,root->startColumn,
-      root->type,name,root->args,root->exception,
-      root->protection,root->virt,
-      root->stat && root->relatesType != MemberOf,
-      root->relates.isEmpty() ? Member :
+      type,name,args,root->exception,
+      protection,virt,
+      stat && root->relatesType != MemberOf,
+      relates.isEmpty() ? Member :
           root->relatesType == MemberOf ? Foreign : Related,
       mtype,root->tArgLists ? root->tArgLists->getLast() : 0,root->argList, root->metaData);
   md->setTagInfo(root->tagInfo);
@@ -3369,7 +3325,7 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
   md->setBriefDescription(root->brief,root->briefFile,root->briefLine);
   md->setInbodyDocumentation(root->inbodyDocs,root->inbodyFile,root->inbodyLine);
   md->setBodySegment(root->bodyLine,root->endBodyLine);
-  md->setMemberSpecifiers(root->spec);
+  md->setMemberSpecifiers(spec);
   md->setMemberGroupId(root->mGrpId);
   md->setTypeConstraints(root->typeConstr);
   md->setLanguage(root->lang);
@@ -3391,17 +3347,17 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
     // for PHP we use Class::method and Namespace\method
     scopeSeparator="::";
   }
-  if (!root->relates.isEmpty() || isFriend || Config_getBool(HIDE_SCOPE_NAMES))
+  if (!relates.isEmpty() || isFriend || Config_getBool(HIDE_SCOPE_NAMES))
   {
-    if (!root->type.isEmpty())
+    if (!type.isEmpty())
     {
       if (root->argList)
       {
-        def=root->type+" "+name;
+        def=type+" "+name;
       }
       else
       {
-        def=root->type+" "+name+root->args;
+        def=type+" "+name+args;
       }
     }
     else
@@ -3412,21 +3368,21 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
       }
       else
       {
-        def=name+root->args;
+        def=name+args;
       }
     }
   }
   else
   {
-    if (!root->type.isEmpty())
+    if (!type.isEmpty())
     {
       if (root->argList)
       {
-        def=root->type+" "+qualScope+scopeSeparator+name;
+        def=type+" "+qualScope+scopeSeparator+name;
       }
       else
       {
-        def=root->type+" "+qualScope+scopeSeparator+name+root->args;
+        def=type+" "+qualScope+scopeSeparator+name+args;
       }
     }
     else
@@ -3437,7 +3393,7 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
       }
       else
       {
-        def=qualScope+scopeSeparator+name+root->args;
+        def=qualScope+scopeSeparator+name+args;
       }
     }
   }
@@ -3452,10 +3408,10 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
       "  Func Member:\n"
       "    '%s' '%s'::'%s' '%s' proto=%d\n"
       "    def='%s'\n",
-      qPrint(root->type),
+      qPrint(type),
       qPrint(qualScope),
       qPrint(rname),
-      qPrint(root->args),
+      qPrint(args),
       root->proto,
       qPrint(def)
               );
@@ -3480,12 +3436,12 @@ static void addMethodToClass(Entry *root,ClassDef *cd,
   cd->insertUsedFile(fd);
 
   addMemberToGroups(root,md);
-  root->changeSection(Entry::EMPTY_SEC);
+  root->markAsProcessed();
   md->setRefItems(root->sli);
 }
 
 
-static void buildFunctionList(Entry *root)
+static void buildFunctionList(const Entry *root)
 {
   if (root->section==Entry::FUNCTION_SEC)
   {
@@ -3576,7 +3532,8 @@ static void buildFunctionList(Entry *root)
       {
         Debug::print(Debug::Functions,0,"  --> member %s of class %s!\n",
             qPrint(rname),qPrint(cd->name()));
-        addMethodToClass(root,cd,rname,isFriend);
+        addMethodToClass(root,cd,root->type,rname,root->args,isFriend,
+                         root->protection,root->stat,root->virt,root->spec,root->relates);
       }
       else if (!((root->parent()->section & Entry::COMPOUND_MASK)
                  || root->parent()->section==Entry::OBJCIMPL_SEC
@@ -3880,9 +3837,7 @@ static void buildFunctionList(Entry *root)
           if (root->relatesType == Simple) // if this is a relatesalso command,
                                            // allow find Member to pick it up
           {
-            root->changeSection(Entry::EMPTY_SEC); // Otherwise we have finished
-                                                   // with this entry.
-
+            root->markAsProcessed(); // Otherwise we have finished with this entry.
           }
         }
         else
@@ -3911,7 +3866,7 @@ static void buildFunctionList(Entry *root)
             );
     }
   }
-  RECURSE_ENTRYTREE(buildFunctionList,root);
+  for (const auto &e : root->children()) buildFunctionList(e.get());
 }
 
 //----------------------------------------------------------------------
@@ -4259,7 +4214,7 @@ static ClassDef *findClassWithinClassContext(Definition *context,ClassDef *cd,co
 }
 
 
-static void findUsedClassesForClass(Entry *root,
+static void findUsedClassesForClass(const Entry *root,
                            Definition *context,
                            ClassDef *masterCd,
                            ClassDef *instanceCd,
@@ -4429,7 +4384,7 @@ static void findUsedClassesForClass(Entry *root,
 }
 
 static void findBaseClassesForClass(
-      Entry *root,
+      const Entry *root,
       Definition *context,
       ClassDef *masterCd,
       ClassDef *instanceCd,
@@ -4491,7 +4446,7 @@ static void findBaseClassesForClass(
 
 //----------------------------------------------------------------------
 
-static bool findTemplateInstanceRelation(Entry *root,
+static bool findTemplateInstanceRelation(const Entry *root,
             Definition *context,
             ClassDef *templateClass,const QCString &templSpec,
             QDict<int> *templateNames,
@@ -4531,9 +4486,10 @@ static bool findTemplateInstanceRelation(Entry *root,
 
     // search for new template instances caused by base classes of
     // instanceClass
-    Entry *templateRoot = g_classEntries.find(templateClass->name());
-    if (templateRoot)
+    auto it = g_classEntries.find(templateClass->name().data());
+    if (it!=g_classEntries.end())
     {
+      const Entry *templateRoot = it->second;
       Debug::print(Debug::Classes,0,"        template root found %s templSpec=%s!\n",
           qPrint(templateRoot->name),qPrint(templSpec));
       ArgumentList *templArgs = new ArgumentList;
@@ -4653,7 +4609,7 @@ static int findEndOfTemplate(const QCString &s,int startPos)
 }
 
 static bool findClassRelation(
-                           Entry *root,
+                           const Entry *root,
                            Definition *context,
                            ClassDef *cd,
                            BaseInfo *bi,
@@ -5010,7 +4966,7 @@ static bool findClassRelation(
 //----------------------------------------------------------------------
 // Computes the base and super classes for each class in the tree
 
-static bool isClassSection(Entry *root)
+static bool isClassSection(const Entry *root)
 {
   if ( !root->name.isEmpty() )
   {
@@ -5032,16 +4988,16 @@ static bool isClassSection(Entry *root)
 
 /*! Builds a dictionary of all entry nodes in the tree starting with \a root
  */
-static void findClassEntries(Entry *root)
+static void findClassEntries(const Entry *root)
 {
   if (isClassSection(root))
   {
-    g_classEntries.insert(root->name,root);
+    g_classEntries.insert({root->name.data(),root});
   }
-  RECURSE_ENTRYTREE(findClassEntries,root);
+  for (const auto &e : root->children()) findClassEntries(e.get());
 }
 
-static QCString extractClassName(Entry *root)
+static QCString extractClassName(const Entry *root)
 {
   // strip any anonymous scopes first
   QCString bName=stripAnonymousNamespaceScope(root->name);
@@ -5066,10 +5022,9 @@ static void findInheritedTemplateInstances()
 {
   ClassSDict::Iterator cli(*Doxygen::classSDict);
   for (cli.toFirst();cli.current();++cli) cli.current()->setVisited(FALSE);
-  QDictIterator<Entry> edi(g_classEntries);
-  Entry *root;
-  for (;(root=edi.current());++edi)
+  for (const auto &kv : g_classEntries)
   {
+    const Entry *root = kv.second;
     ClassDef *cd;
     QCString bName = extractClassName(root);
     Debug::print(Debug::Classes,0,"  Inheritance: Class %s : \n",qPrint(bName));
@@ -5085,10 +5040,9 @@ static void findUsedTemplateInstances()
 {
   ClassSDict::Iterator cli(*Doxygen::classSDict);
   for (cli.toFirst();cli.current();++cli) cli.current()->setVisited(FALSE);
-  QDictIterator<Entry> edi(g_classEntries);
-  Entry *root;
-  for (;(root=edi.current());++edi)
+  for (const auto &kv : g_classEntries)
   {
+    const Entry *root = kv.second;
     ClassDef *cd;
     QCString bName = extractClassName(root);
     Debug::print(Debug::Classes,0,"  Usage: Class %s : \n",qPrint(bName));
@@ -5104,10 +5058,9 @@ static void computeClassRelations()
 {
   ClassSDict::Iterator cli(*Doxygen::classSDict);
   for (cli.toFirst();cli.current();++cli) cli.current()->setVisited(FALSE);
-  QDictIterator<Entry> edi(g_classEntries);
-  Entry *root;
-  for (;(root=edi.current());++edi)
+  for (const auto &kv : g_classEntries)
   {
+    const Entry *root = kv.second;
     ClassDef *cd;
 
     QCString bName = extractClassName(root);
@@ -5137,10 +5090,9 @@ static void computeClassRelations()
 
 static void computeTemplateClassRelations()
 {
-  QDictIterator<Entry> edi(g_classEntries);
-  Entry *root;
-  for (;(root=edi.current());++edi)
+  for (const auto &kv : g_classEntries)
   {
+    const Entry *root = kv.second;
     QCString bName=stripAnonymousNamespaceScope(root->name);
     bName=stripTemplateSpecifiersFromScope(bName);
     ClassDef *cd=getClass(bName);
@@ -5340,15 +5292,15 @@ static void generateXRefPages()
 // set the function declaration of the member to 'funcDecl'. If the boolean
 // over_load is set the standard overload text is added.
 
-static void addMemberDocs(Entry *root,
+static void addMemberDocs(const Entry *root,
                    MemberDef *md, const char *funcDecl,
                    ArgumentList *al,
                    bool over_load,
-                   NamespaceSDict *
+                   uint64 spec
                   )
 {
   //printf("addMemberDocs: '%s'::'%s' '%s' funcDecl='%s' mSpec=%d\n",
-  //     root->parent->name.data(),md->name().data(),md->argsString(),funcDecl,root->spec);
+  //     root->parent->name.data(),md->name().data(),md->argsString(),funcDecl,spec);
   QCString fDecl=funcDecl;
   // strip extern specifier
   fDecl.stripPrefix("extern ");
@@ -5452,7 +5404,7 @@ static void addMemberDocs(Entry *root,
   md->enableReferencedByRelation(md->hasReferencedByRelation() || root->referencedByRelation);
   md->enableReferencesRelation(md->hasReferencesRelation() || root->referencesRelation);
 
-  md->mergeMemberSpecifiers(root->spec);
+  md->mergeMemberSpecifiers(spec);
   md->addSectionsToDefinition(root->anchors);
   addMemberToGroups(root,md);
   if (cd) cd->insertUsedFile(rfd);
@@ -5496,13 +5448,14 @@ static const ClassDef *findClassDefinition(FileDef *fd,NamespaceDef *nd,
 // with name 'name' and argument list 'args' (for overloading) and
 // function declaration 'decl' to the corresponding member definition.
 
-static bool findGlobalMember(Entry *root,
+static bool findGlobalMember(const Entry *root,
                            const QCString &namespaceName,
                            const char *type,
                            const char *name,
                            const char *tempArg,
                            const char *,
-                           const char *decl)
+                           const char *decl,
+                           uint64 spec)
 {
   Debug::print(Debug::FindMembers,0,
        "2. findGlobalMember(namespace=%s,type=%s,name=%s,tempArg=%s,decl=%s)\n",
@@ -5612,7 +5565,7 @@ static bool findGlobalMember(Entry *root,
         if (matching) // add docs to the member
         {
           Debug::print(Debug::FindMembers,0,"5. Match found\n");
-          addMemberDocs(root,md->resolveAlias(),decl,root->argList,FALSE);
+          addMemberDocs(root,md->resolveAlias(),decl,root->argList,FALSE,root->spec);
           found=TRUE;
         }
       }
@@ -5822,7 +5775,10 @@ static void substituteTemplatesInArgList(
  * The boolean \a isFunc is a hint that indicates that this is a function
  * instead of a variable or typedef.
  */
-static void findMember(Entry *root,
+static void findMember(const Entry *root,
+                       const QCString &relates,
+                       const QCString &type,
+                       const QCString &args,
                        QCString funcDecl,
                        bool overloaded,
                        bool isFunc
@@ -5832,7 +5788,7 @@ static void findMember(Entry *root,
                "findMember(root=%p,funcDecl='%s',related='%s',overload=%d,"
                "isFunc=%d mGrpId=%d tArgList=%p (#=%d) "
                "spec=%lld lang=%x\n",
-               root,qPrint(funcDecl),qPrint(root->relates),overloaded,isFunc,root->mGrpId,
+               root,qPrint(funcDecl),qPrint(relates),overloaded,isFunc,root->mGrpId,
                root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0,
                root->spec,root->lang
               );
@@ -5850,6 +5806,7 @@ static void findMember(Entry *root,
   bool isMemberOf=FALSE;
   bool isFriend=FALSE;
   bool done;
+  uint64 spec = root->spec;
   do
   {
     done=TRUE;
@@ -5860,17 +5817,17 @@ static void findMember(Entry *root,
     }
     if (funcDecl.stripPrefix("inline "))
     {
-      root->spec|=Entry::Inline;
+      spec|=Entry::Inline;
       done=FALSE;
     }
     if (funcDecl.stripPrefix("explicit "))
     {
-      root->spec|=Entry::Explicit;
+      spec|=Entry::Explicit;
       done=FALSE;
     }
     if (funcDecl.stripPrefix("mutable "))
     {
-      root->spec|=Entry::Mutable;
+      spec|=Entry::Mutable;
       done=FALSE;
     }
     if (funcDecl.stripPrefix("virtual "))
@@ -5926,21 +5883,21 @@ static void findMember(Entry *root,
   // related field.
   //printf("scopeName='%s' className='%s' namespaceName='%s'\n",
   //    scopeName.data(),className.data(),namespaceName.data());
-  if (!root->relates.isEmpty())
+  if (!relates.isEmpty())
   {                             // related member, prefix user specified scope
     isRelated=TRUE;
     isMemberOf=(root->relatesType == MemberOf);
-    if (getClass(root->relates)==0 && !scopeName.isEmpty())
+    if (getClass(relates)==0 && !scopeName.isEmpty())
     {
-      scopeName= mergeScopes(scopeName,root->relates);
+      scopeName= mergeScopes(scopeName,relates);
     }
     else
     {
-      scopeName = root->relates;
+      scopeName = relates;
     }
   }
 
-  if (root->relates.isEmpty() && root->parent() &&
+  if (relates.isEmpty() && root->parent() &&
       ((root->parent()->section&Entry::SCOPE_MASK) ||
        (root->parent()->section==Entry::OBJCIMPL_SEC)
       ) &&
@@ -6015,7 +5972,7 @@ static void findMember(Entry *root,
     {
       scopeName=namespaceName;
     }
-    else if (!root->relates.isEmpty() || // relates command with explicit scope
+    else if (!relates.isEmpty() || // relates command with explicit scope
              !getClass(className)) // class name only exists in a namespace
     {
       scopeName=namespaceName+"::"+className;
@@ -6122,7 +6079,7 @@ static void findMember(Entry *root,
            "  isFunc=%d\n\n",
            qPrint(namespaceName),qPrint(className),
            qPrint(funcType),qPrint(funcSpec),qPrint(funcName),qPrint(funcArgs),qPrint(funcTempList),
-           qPrint(funcDecl),qPrint(root->relates),qPrint(exceptions),isRelated,isMemberOf,isFriend,
+           qPrint(funcDecl),qPrint(relates),qPrint(exceptions),isRelated,isMemberOf,isFriend,
            isFunc
           );
 
@@ -6306,11 +6263,8 @@ static void findMember(Entry *root,
                     // specialization. In this case we add it to the class
                     // even though the member arguments do not match.
 
-                    // TODO: copy other aspects?
-                    root->protection=md->protection(); // copy protection level
-                    root->stat=md->isStatic();
-                    root->virt=md->virtualness();
-                    addMethodToClass(root,cd,md->name(),isFriend);
+                    addMethodToClass(root,cd,type,md->name(),args,isFriend,
+                        md->protection(),md->isStatic(),md->virtualness(),spec,relates);
                     return;
                   }
                   delete argList;
@@ -6318,7 +6272,7 @@ static void findMember(Entry *root,
               }
               if (matching)
               {
-                addMemberDocs(root,md,funcDecl,0,overloaded,0/* TODO */);
+                addMemberDocs(root,md,funcDecl,0,overloaded,spec);
                 count++;
                 memFound=TRUE;
               }
@@ -6354,10 +6308,8 @@ static void findMember(Entry *root,
                       root->tArgLists->getLast()->count()<=templAl->count())
                   {
                     Debug::print(Debug::FindMembers,0,"7. add template specialization\n");
-                    root->protection=md->protection();
-                    root->stat=md->isStatic();
-                    root->virt=md->virtualness();
-                    addMethodToClass(root,ccd,md->name(),isFriend);
+                    addMethodToClass(root,ccd,type,md->name(),args,isFriend,
+                        root->protection,root->stat,root->virt,spec,relates);
                     return;
                   }
                   if (md->argsString()==argListToString(root->argList,TRUE,FALSE))
@@ -6387,7 +6339,7 @@ static void findMember(Entry *root,
               {
                 // we didn't find an actual match on argument lists, but there is only 1 member with this
                 // name in the same scope, so that has to be the one.
-                addMemberDocs(root,umd,funcDecl,0,overloaded,0);
+                addMemberDocs(root,umd,funcDecl,0,overloaded,spec);
                 return;
               }
               else if (candidates>1 && ecd && emd)
@@ -6395,7 +6347,7 @@ static void findMember(Entry *root,
                 // we didn't find a unique match using type resolution,
                 // but one of the matches has the exact same signature so
                 // we take that one.
-                addMemberDocs(root,emd,funcDecl,0,overloaded,0);
+                addMemberDocs(root,emd,funcDecl,0,overloaded,spec);
                 return;
               }
             }
@@ -6505,7 +6457,7 @@ static void findMember(Entry *root,
           md->setBodySegment(root->bodyLine,root->endBodyLine);
           FileDef *fd=root->fileDef();
           md->setBodyDef(fd);
-          md->setMemberSpecifiers(root->spec);
+          md->setMemberSpecifiers(spec);
           md->setMemberGroupId(root->mGrpId);
           mn->append(md);
           cd->insertMember(md);
@@ -6575,7 +6527,7 @@ static void findMember(Entry *root,
           md->setBodySegment(root->bodyLine,root->endBodyLine);
           FileDef *fd=root->fileDef();
           md->setBodyDef(fd);
-          md->setMemberSpecifiers(root->spec);
+          md->setMemberSpecifiers(spec);
           md->setMemberGroupId(root->mGrpId);
           mn->append(md);
           cd->insertMember(md);
@@ -6585,7 +6537,7 @@ static void findMember(Entry *root,
       }
       else // unrelated function with the same name as a member
       {
-        if (!findGlobalMember(root,namespaceName,funcType,funcName,funcTempList,funcArgs,funcDecl))
+        if (!findGlobalMember(root,namespaceName,funcType,funcName,funcTempList,funcArgs,funcDecl,spec))
         {
           QCString fullFuncDecl=funcDecl.copy();
           if (isFunc) fullFuncDecl+=argListToString(root->argList,TRUE);
@@ -6596,11 +6548,11 @@ static void findMember(Entry *root,
         }
       }
     }
-    else if (isRelated && !root->relates.isEmpty())
+    else if (isRelated && !relates.isEmpty())
     {
       Debug::print(Debug::FindMembers,0,"2. related function\n"
               "  scopeName=%s className=%s\n",qPrint(scopeName),qPrint(className));
-      if (className.isEmpty()) className=root->relates;
+      if (className.isEmpty()) className=relates;
       ClassDef *cd;
       //printf("scopeName='%s' className='%s'\n",scopeName.data(),className.data());
       if ((cd=getClass(scopeName)))
@@ -6649,7 +6601,7 @@ static void findMember(Entry *root,
           {
             //printf("addMemberDocs for related member %s\n",root->name.data());
             //rmd->setMemberDefTemplateArguments(root->mtArgList);
-            addMemberDocs(root,rmd,funcDecl,0,overloaded);
+            addMemberDocs(root,rmd,funcDecl,0,overloaded,spec);
           }
         }
 
@@ -6763,7 +6715,7 @@ static void findMember(Entry *root,
           //  md->setMemberGroup(memberGroupDict[root->mGrpId]);
           //}
           md->setMemberClass(cd);
-          md->setMemberSpecifiers(root->spec);
+          md->setMemberSpecifiers(spec);
           md->setDefinition(funcDecl);
           md->enableCallGraph(root->callGraph);
           md->enableCallerGraph(root->callerGraph);
@@ -6798,7 +6750,7 @@ static void findMember(Entry *root,
         }
         if (root->relatesType == Duplicate)
         {
-          if (!findGlobalMember(root,namespaceName,funcType,funcName,funcTempList,funcArgs,funcDecl))
+          if (!findGlobalMember(root,namespaceName,funcType,funcName,funcTempList,funcArgs,funcDecl,spec))
           {
             QCString fullFuncDecl=funcDecl.copy();
             if (isFunc) fullFuncDecl+=argListToString(root->argList,TRUE);
@@ -6852,7 +6804,7 @@ localObjCMethod:
         md->setBodySegment(root->bodyLine,root->endBodyLine);
         FileDef *fd=root->fileDef();
         md->setBodyDef(fd);
-        md->setMemberSpecifiers(root->spec);
+        md->setMemberSpecifiers(spec);
         md->setMemberGroupId(root->mGrpId);
         cd->insertMember(md);
         cd->insertUsedFile(fd);
@@ -6875,7 +6827,7 @@ localObjCMethod:
     }
     else // unrelated not overloaded member found
     {
-      bool globMem = findGlobalMember(root,namespaceName,funcType,funcName,funcTempList,funcArgs,funcDecl);
+      bool globMem = findGlobalMember(root,namespaceName,funcType,funcName,funcTempList,funcArgs,funcDecl,spec);
       if (className.isEmpty() && !globMem)
       {
         warn(root->fileName,root->startLine,
@@ -6904,7 +6856,7 @@ localObjCMethod:
 // find the members corresponding to the different documentation blocks
 // that are extracted from the sources.
 
-static void filterMemberDocumentation(Entry *root)
+static void filterMemberDocumentation(const Entry *root,const QCString relates)
 {
   int i=-1,l;
   Debug::print(Debug::FindMembers,0,
@@ -6914,26 +6866,20 @@ static void filterMemberDocumentation(Entry *root)
   //printf("root->parent()->name=%s\n",root->parent()->name.data());
   bool isFunc=TRUE;
 
-  if (root->relatesType == Duplicate && !root->relates.isEmpty())
-  {
-    QCString tmp = root->relates;
-    root->relates.resize(0);
-    filterMemberDocumentation(root);
-    root->relates = tmp;
-  }
-
+  QCString type = root->type;
+  QCString args = root->args;
   if ( // detect func variable/typedef to func ptr
-      (i=findFunctionPtr(root->type,root->lang,&l))!=-1
+      (i=findFunctionPtr(type,root->lang,&l))!=-1
      )
   {
     //printf("Fixing function pointer!\n");
     // fix type and argument
-    root->args.prepend(root->type.right(root->type.length()-i-l));
-    root->type=root->type.left(i+l);
-    //printf("Results type=%s,name=%s,args=%s\n",root->type.data(),root->name.data(),root->args.data());
+    args.prepend(type.right(type.length()-i-l));
+    type=type.left(i+l);
+    //printf("Results type=%s,name=%s,args=%s\n",type.data(),root->name.data(),args.data());
     isFunc=FALSE;
   }
-  else if ((root->type.left(8)=="typedef " && root->args.find('(')!=-1))
+  else if ((type.left(8)=="typedef " && args.find('(')!=-1))
     // detect function types marked as functions
   {
     isFunc=FALSE;
@@ -6943,80 +6889,117 @@ static void filterMemberDocumentation(Entry *root)
   if (root->section==Entry::MEMBERDOC_SEC)
   {
     //printf("Documentation for inline member '%s' found args='%s'\n",
-    //    root->name.data(),root->args.data());
-    //if (root->relates.length()) printf("  Relates %s\n",root->relates.data());
-    if (root->type.isEmpty())
-    {
-      findMember(root,root->name+root->args+root->exception,FALSE,isFunc);
+    //    root->name.data(),args.data());
+    //if (relates.length()) printf("  Relates %s\n",relates.data());
+    if (type.isEmpty())
+    {
+      findMember(root,
+                 relates,
+                 type,
+                 args,
+                 root->name + args + root->exception,
+                 FALSE,
+                 isFunc);
     }
     else
     {
-      findMember(root,root->type+" "+root->name+root->args+root->exception,FALSE,isFunc);
+      findMember(root,
+                 relates,
+                 type,
+                 args,
+                 type + " " + root->name + args + root->exception,
+                 FALSE,
+                 isFunc);
     }
   }
   else if (root->section==Entry::OVERLOADDOC_SEC)
   {
     //printf("Overloaded member %s found\n",root->name.data());
-    findMember(root,root->name,TRUE,isFunc);
+    findMember(root,
+               relates,
+               type,
+               args,
+               root->name,
+               TRUE,
+               isFunc);
   }
   else if
     ((root->section==Entry::FUNCTION_SEC      // function
       ||
       (root->section==Entry::VARIABLE_SEC &&  // variable
-       !root->type.isEmpty() &&                // with a type
-       g_compoundKeywordDict.find(root->type)==0 // that is not a keyword
+       !type.isEmpty() &&                // with a type
+       g_compoundKeywordDict.find(type)==0 // that is not a keyword
        // (to skip forward declaration of class etc.)
       )
      )
     )
     {
       //printf("Documentation for member '%s' found args='%s' excp='%s'\n",
-      //    root->name.data(),root->args.data(),root->exception.data());
-      //if (root->relates.length()) printf("  Relates %s\n",root->relates.data());
-      //printf("Inside=%s\n Relates=%s\n",root->inside.data(),root->relates.data());
-      if (root->type=="friend class" || root->type=="friend struct" ||
-          root->type=="friend union")
+      //    root->name.data(),args.data(),root->exception.data());
+      //if (relates.length()) printf("  Relates %s\n",relates.data());
+      //printf("Inside=%s\n Relates=%s\n",root->inside.data(),relates.data());
+      if (type=="friend class" || type=="friend struct" ||
+          type=="friend union")
       {
         findMember(root,
-            root->type+" "+
-            root->name,
+            relates,
+            type,
+            args,
+            type+" "+root->name,
             FALSE,FALSE);
 
       }
-      else if (!root->type.isEmpty())
+      else if (!type.isEmpty())
       {
         findMember(root,
-            root->type+" "+
-            root->inside+
-            root->name+
-            root->args+
-            root->exception,
+            relates,
+            type,
+            args,
+            type+" "+ root->inside + root->name + args + root->exception,
             FALSE,isFunc);
       }
       else
       {
         findMember(root,
-            root->inside+
-            root->name+
-            root->args+
-            root->exception,
+            relates,
+            type,
+            args,
+            root->inside + root->name + args + root->exception,
             FALSE,isFunc);
       }
     }
-  else if (root->section==Entry::DEFINE_SEC && !root->relates.isEmpty())
+  else if (root->section==Entry::DEFINE_SEC && !relates.isEmpty())
   {
-    findMember(root,root->name+root->args,FALSE,!root->args.isEmpty());
+    findMember(root,
+               relates,
+               type,
+               args,
+               root->name + args,
+               FALSE,
+               !args.isEmpty());
   }
   else if (root->section==Entry::VARIABLEDOC_SEC)
   {
     //printf("Documentation for variable %s found\n",root->name.data());
-    //if (!root->relates.isEmpty()) printf("  Relates %s\n",root->relates.data());
-    findMember(root,root->name,FALSE,FALSE);
+    //if (!relates.isEmpty()) printf("  Relates %s\n",relates.data());
+    findMember(root,
+               relates,
+               type,
+               args,
+               root->name,
+               FALSE,
+               FALSE);
   }
   else if (root->section==Entry::EXPORTED_INTERFACE_SEC ||
            root->section==Entry::INCLUDED_SERVICE_SEC)
   {
-    findMember(root,root->type + " " + root->name,FALSE,FALSE);
+    findMember(root,
+               relates,
+               type,
+               args,
+               type + " " + root->name,
+               FALSE,
+               FALSE);
   }
   else
   {
@@ -7025,7 +7008,7 @@ static void filterMemberDocumentation(Entry *root)
   }
 }
 
-static void findMemberDocumentation(Entry *root)
+static void findMemberDocumentation(const Entry *root)
 {
   if (root->section==Entry::MEMBERDOC_SEC ||
       root->section==Entry::OVERLOADDOC_SEC ||
@@ -7037,42 +7020,41 @@ static void findMemberDocumentation(Entry *root)
       root->section==Entry::EXPORTED_INTERFACE_SEC
      )
   {
-    filterMemberDocumentation(root);
+    if (root->relatesType == Duplicate && !root->relates.isEmpty())
+    {
+      filterMemberDocumentation(root,"");
+    }
+    filterMemberDocumentation(root,root->relates);
   }
-  if (root->children())
+  for (const auto &e : root->children())
   {
-    EntryListIterator eli(*root->children());
-    Entry *e;
-    for (;(e=eli.current());++eli)
+    if (e->section!=Entry::ENUM_SEC)
     {
-      if (e->section!=Entry::ENUM_SEC) findMemberDocumentation(e);
+      findMemberDocumentation(e.get());
     }
   }
 }
 
 //----------------------------------------------------------------------
 
-static void findObjCMethodDefinitions(Entry *root)
+static void findObjCMethodDefinitions(const Entry *root)
 {
-  if (root->children())
+  for (const auto &objCImpl : root->children())
   {
-    EntryListIterator eli(*root->children());
-    Entry *objCImpl;
-    for (;(objCImpl=eli.current());++eli)
+    if (objCImpl->section==Entry::OBJCIMPL_SEC)
     {
-      if (objCImpl->section==Entry::OBJCIMPL_SEC && objCImpl->children())
+      for (const auto &objCMethod : objCImpl->children())
       {
-        EntryListIterator seli(*objCImpl->children());
-        Entry *objCMethod;
-        for (;(objCMethod=seli.current());++seli)
+        if (objCMethod->section==Entry::FUNCTION_SEC)
         {
-          if (objCMethod->section==Entry::FUNCTION_SEC)
-          {
-            //Printf("  Found ObjC method definition %s\n",objCMethod->name.data());
-            findMember(objCMethod, objCMethod->type+" "+objCImpl->name+"::"+
-                       objCMethod->name+" "+objCMethod->args, FALSE,TRUE);
-            objCMethod->section=Entry::EMPTY_SEC;
-          }
+          //Printf("  Found ObjC method definition %s\n",objCMethod->name.data());
+          findMember(objCMethod.get(),
+                     objCMethod->relates,
+                     objCMethod->type,
+                     objCMethod->args,
+                     objCMethod->type+" "+objCImpl->name+"::"+objCMethod->name+" "+objCMethod->args,
+                     FALSE,TRUE);
+          objCMethod->section=Entry::EMPTY_SEC;
         }
       }
     }
@@ -7082,7 +7064,7 @@ static void findObjCMethodDefinitions(Entry *root)
 //----------------------------------------------------------------------
 // find and add the enumeration to their classes, namespaces or files
 
-static void findEnums(Entry *root)
+static void findEnums(const Entry *root)
 {
   if (root->section==Entry::ENUM_SEC)
   {
@@ -7255,13 +7237,13 @@ static void findEnums(Entry *root)
   }
   else
   {
-    RECURSE_ENTRYTREE(findEnums,root);
+    for (const auto &e : root->children()) findEnums(e.get());
   }
 }
 
 //----------------------------------------------------------------------
 
-static void addEnumValuesToEnums(Entry *root)
+static void addEnumValuesToEnums(const Entry *root)
 {
   if (root->section==Entry::ENUM_SEC)
     // non anonymous enumeration
@@ -7337,12 +7319,10 @@ static void addEnumValuesToEnums(Entry *root)
         MemberDef *md;
         for (mni.toFirst(); (md=mni.current()) ; ++mni)  // for each enum in this list
         {
-          if (!md->isAlias() && md->isEnumerate() && root->children())
+          if (!md->isAlias() && md->isEnumerate() && !root->children().empty())
           {
             //printf("   enum with %d children\n",root->children()->count());
-            EntryListIterator eli(*root->children()); // for each enum value
-            Entry *e;
-            for (;(e=eli.current());++eli)
+            for (const auto &e : root->children())
             {
               SrcLangExt sle;
               if (
@@ -7474,7 +7454,7 @@ static void addEnumValuesToEnums(Entry *root)
   }
   else
   {
-    RECURSE_ENTRYTREE(addEnumValuesToEnums,root);
+    for (const auto &e : root->children()) addEnumValuesToEnums(e.get());
   }
 }
 
@@ -7482,7 +7462,7 @@ static void addEnumValuesToEnums(Entry *root)
 //----------------------------------------------------------------------
 // find the documentation blocks for the enumerations
 
-static void findEnumDocumentation(Entry *root)
+static void findEnumDocumentation(const Entry *root)
 {
   if (root->section==Entry::ENUMDOC_SEC
       && !root->name.isEmpty()
@@ -7615,7 +7595,7 @@ static void findEnumDocumentation(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(findEnumDocumentation,root);
+  for (const auto &e : root->children()) findEnumDocumentation(e.get());
 }
 
 // search for each enum (member or function) in mnl if it has documented
@@ -8730,12 +8710,12 @@ static void findDefineDocumentation(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(findDefineDocumentation,root);
+  for (const auto &e : root->children()) findDefineDocumentation(e.get());
 }
 
 //----------------------------------------------------------------------------
 
-static void findDirDocumentation(Entry *root)
+static void findDirDocumentation(const Entry *root)
 {
   if (root->section == Entry::DIRDOC_SEC)
   {
@@ -8791,7 +8771,7 @@ static void findDirDocumentation(Entry *root)
           "directory found for command \\dir %s\n",normalizedName.data());
     }
   }
-  RECURSE_ENTRYTREE(findDirDocumentation,root);
+  for (const auto &e : root->children()) findDirDocumentation(e.get());
 }
 
 
@@ -8821,7 +8801,7 @@ static void buildPageList(Entry *root)
                0,0
                );
   }
-  RECURSE_ENTRYTREE(buildPageList,root);
+  for (const auto &e : root->children()) buildPageList(e.get());
 }
 
 // search for the main page defined in this project
@@ -8875,7 +8855,7 @@ static void findMainPage(Entry *root)
            Doxygen::mainPage->docFile().data(),Doxygen::mainPage->docLine());
     }
   }
-  RECURSE_ENTRYTREE(findMainPage,root);
+  for (const auto &e : root->children()) findMainPage(e.get());
 }
 
 // search for the main page imported via tag files and add only the section labels
@@ -8888,7 +8868,7 @@ static void findMainPageTagFiles(Entry *root)
       Doxygen::mainPage->addSectionsToDefinition(root->anchors);
     }
   }
-  RECURSE_ENTRYTREE(findMainPageTagFiles,root);
+  for (const auto &e : root->children()) findMainPageTagFiles(e.get());
 }
 
 static void computePageRelations(Entry *root)
@@ -8925,7 +8905,7 @@ static void computePageRelations(Entry *root)
       }
     }
   }
-  RECURSE_ENTRYTREE(computePageRelations,root);
+  for (const auto &e : root->children()) computePageRelations(e.get());
 }
 
 static void checkPageRelations()
@@ -9071,7 +9051,7 @@ static void buildExampleList(Entry *root)
       //addExampleToGroups(root,pd);
     }
   }
-  RECURSE_ENTRYTREE(buildExampleList,root);
+  for (const auto &e : root->children()) buildExampleList(e.get());
 }
 
 //----------------------------------------------------------------------------
@@ -9085,10 +9065,9 @@ void printNavTree(Entry *root,int indent)
       indentStr.isEmpty()?"":indentStr.data(),
       root->name.isEmpty()?"<empty>":root->name.data(),
       root->section);
-  if (root->children())
+  for (const auto &e : root->children())
   {
-    EntryListIterator eli(*root->children());
-    for (;eli.current();++eli) printNavTree(eli.current(),indent+2);
+    printNavTree(e.get(),indent+2);
   }
 }
 
@@ -9310,7 +9289,7 @@ static void compareDoxyfile()
 
 //----------------------------------------------------------------------------
 
-static void readTagFile(Entry *root,const char *tl)
+static void readTagFile(const std::unique_ptr<Entry> &root,const char *tl)
 {
   QCString tagLine = tl;
   QCString fileName;
@@ -9479,7 +9458,7 @@ static ParserInterface *getParserForFile(const char *fn)
 }
 
 static void parseFile(ParserInterface *parser,
-                      Entry *root,FileDef *fd,const char *fn,
+                      const std::unique_ptr<Entry> &root,FileDef *fd,const char *fn,
                       bool sameTu,QStrList &filesInSameTu)
 {
 #if USE_LIBCLANG
@@ -9532,15 +9511,15 @@ static void parseFile(ParserInterface *parser,
     fd->getAllIncludeFilesRecursively(filesInSameTu);
   }
 
-  Entry *fileRoot = new Entry;
+  std::unique_ptr<Entry> fileRoot = std::make_unique<Entry>();
   // use language parse to parse the file
   parser->parseInput(fileName,convBuf.data(),fileRoot,sameTu,filesInSameTu);
   fileRoot->setFileDef(fd);
-  root->addSubEntry(fileRoot);
+  root->moveToSubEntryAndKeep(fileRoot);
 }
 
 //! parse the list of input files
-static void parseFiles(Entry *root)
+static void parseFiles(const std::unique_ptr<Entry> &root)
 {
 #if USE_LIBCLANG
   static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING);
@@ -11346,7 +11325,7 @@ void parseInput()
    *             Handle Tag Files                                           *
    **************************************************************************/
 
-  Entry *root=new Entry;
+  std::unique_ptr<Entry> root = std::make_unique<Entry>();
   msg("Reading and parsing tag files\n");
 
   QStrList &tagFileList = Config_getList(TAGFILES);
@@ -11381,31 +11360,31 @@ void parseInput()
    **************************************************************************/
 
   g_s.begin("Building group list...\n");
-  buildGroupList(root);
-  organizeSubGroups(root);
+  buildGroupList(root.get());
+  organizeSubGroups(root.get());
   g_s.end();
 
   g_s.begin("Building directory list...\n");
   buildDirectories();
-  findDirDocumentation(root);
+  findDirDocumentation(root.get());
   g_s.end();
 
   g_s.begin("Building namespace list...\n");
-  buildNamespaceList(root);
-  findUsingDirectives(root);
+  buildNamespaceList(root.get());
+  findUsingDirectives(root.get());
   g_s.end();
 
   g_s.begin("Building file list...\n");
-  buildFileList(root);
+  buildFileList(root.get());
   g_s.end();
   //generateFileTree();
 
   g_s.begin("Building class list...\n");
-  buildClassList(root);
+  buildClassList(root.get());
   g_s.end();
 
   // build list of using declarations here (global list)
-  buildListOfUsingDecls(root);
+  buildListOfUsingDecls(root.get());
   g_s.end();
 
   g_s.begin("Computing nesting relations for classes...\n");
@@ -11422,14 +11401,14 @@ void parseInput()
   g_usingDeclarations.clear();
 
   g_s.begin("Associating documentation with classes...\n");
-  buildClassDocList(root);
+  buildClassDocList(root.get());
 
   g_s.begin("Building example list...\n");
-  buildExampleList(root);
+  buildExampleList(root.get());
   g_s.end();
 
   g_s.begin("Searching for enumerations...\n");
-  findEnums(root);
+  findEnums(root.get());
   g_s.end();
 
   // Since buildVarList calls isVarWithConstructor
@@ -11437,24 +11416,24 @@ void parseInput()
   // typedefs first so the relations between classes via typedefs
   // are properly resolved. See bug 536385 for an example.
   g_s.begin("Searching for documented typedefs...\n");
-  buildTypedefList(root);
+  buildTypedefList(root.get());
   g_s.end();
 
   if (Config_getBool(OPTIMIZE_OUTPUT_SLICE))
   {
     g_s.begin("Searching for documented sequences...\n");
-    buildSequenceList(root);
+    buildSequenceList(root.get());
     g_s.end();
 
     g_s.begin("Searching for documented dictionaries...\n");
-    buildDictionaryList(root);
+    buildDictionaryList(root.get());
     g_s.end();
   }
 
   g_s.begin("Searching for members imported via using declarations...\n");
   // this should be after buildTypedefList in order to properly import
   // used typedefs
-  findUsingDeclarations(root);
+  findUsingDeclarations(root.get());
   g_s.end();
 
   g_s.begin("Searching for included using directives...\n");
@@ -11462,14 +11441,14 @@ void parseInput()
   g_s.end();
 
   g_s.begin("Searching for documented variables...\n");
-  buildVarList(root);
+  buildVarList(root.get());
   g_s.end();
 
   g_s.begin("Building interface member list...\n");
-  buildInterfaceAndServiceList(root); // UNO IDL
+  buildInterfaceAndServiceList(root.get()); // UNO IDL
 
   g_s.begin("Building member list...\n"); // using class info only !
-  buildFunctionList(root);
+  buildFunctionList(root.get());
   g_s.end();
 
   g_s.begin("Searching for friends...\n");
@@ -11477,11 +11456,11 @@ void parseInput()
   g_s.end();
 
   g_s.begin("Searching for documented defines...\n");
-  findDefineDocumentation(root);
+  findDefineDocumentation(root.get());
   g_s.end();
 
   g_s.begin("Computing class inheritance relations...\n");
-  findClassEntries(root);
+  findClassEntries(root.get());
   findInheritedTemplateInstances();
   g_s.end();
 
@@ -11512,14 +11491,14 @@ void parseInput()
   g_s.end();
 
   g_s.begin("Add enum values to enums...\n");
-  addEnumValuesToEnums(root);
-  findEnumDocumentation(root);
+  addEnumValuesToEnums(root.get());
+  findEnumDocumentation(root.get());
   g_s.end();
 
   g_s.begin("Searching for member function documentation...\n");
-  findObjCMethodDefinitions(root);
-  findMemberDocumentation(root); // may introduce new members !
-  findUsingDeclImports(root); // may introduce new members !
+  findObjCMethodDefinitions(root.get());
+  findMemberDocumentation(root.get()); // may introduce new members !
+  findUsingDeclImports(root.get()); // may introduce new members !
 
   transferRelatedFunctionDocumentation();
   transferFunctionDocumentation();
@@ -11532,21 +11511,21 @@ void parseInput()
   g_s.end();
 
   g_s.begin("Building page list...\n");
-  buildPageList(root);
+  buildPageList(root.get());
   g_s.end();
 
   g_s.begin("Search for main page...\n");
-  findMainPage(root);
-  findMainPageTagFiles(root);
+  findMainPage(root.get());
+  findMainPageTagFiles(root.get());
   g_s.end();
 
   g_s.begin("Computing page relations...\n");
-  computePageRelations(root);
+  computePageRelations(root.get());
   checkPageRelations();
   g_s.end();
 
   g_s.begin("Determining the scope of groups...\n");
-  findGroupScope(root);
+  findGroupScope(root.get());
   g_s.end();
 
   g_s.begin("Sorting lists...\n");
diff --git a/src/entry.cpp b/src/entry.cpp
index e2a21c6..ec3c736 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+#include <algorithm>
 #include <stdlib.h>
 #include <qfile.h>
 #include "entry.h"
@@ -37,8 +38,6 @@ Entry::Entry()
   num++;
   m_parent=0;
   section = EMPTY_SEC;
-  m_sublist = new QList<Entry>;
-  m_sublist->setAutoDelete(TRUE);
   extends = new QList<BaseInfo>;
   extends->setAutoDelete(TRUE);
   groups = new QList<Grouping>;
@@ -137,17 +136,14 @@ Entry::Entry(const Entry &e)
   id          = e.id;
 
   m_parent    = e.m_parent;
-  m_sublist   = new QList<Entry>;
-  m_sublist->setAutoDelete(TRUE);
 
-  // deep copy of the child entry list
-  QListIterator<Entry> eli(*e.m_sublist);
-  Entry *cur;
-  for (;(cur=eli.current());++eli)
+  // deep copy child entries
+  m_sublist.reserve(e.m_sublist.size());
+  for (const auto &cur : e.m_sublist)
   {
-    m_sublist->append(new Entry(*cur));
+    m_sublist.push_back(std::make_unique<Entry>(*cur));
   }
-  
+
   // deep copy base class list
   QListIterator<BaseInfo> bli(*e.extends);
   BaseInfo *bi;
@@ -192,9 +188,7 @@ Entry::~Entry()
   //printf("Entry::~Entry(%p) num=%d\n",this,num);
   //printf("Deleting entry %d name %s type %x children %d\n",
   //       num,name.data(),section,sublist->count());
-  
-  delete m_sublist; // each element is now own by a EntryNav so we do no longer own
-                  // our children.
+
   delete extends;
   delete groups;
   delete anchors;
@@ -206,15 +200,44 @@ Entry::~Entry()
   num--;
 }
 
-void Entry::addSubEntry(Entry *current)
+void Entry::moveToSubEntryAndRefresh(Entry *&current)
+{
+  current->m_parent=this;
+  m_sublist.emplace_back(current);
+  current = new Entry;
+}
+
+void Entry::moveToSubEntryAndRefresh(std::unique_ptr<Entry> &current)
+{
+  current->m_parent=this;
+  m_sublist.push_back(std::move(current));
+  current = std::make_unique<Entry>();
+}
+
+void Entry::moveToSubEntryAndKeep(Entry *current)
+{
+  current->m_parent=this;
+  m_sublist.emplace_back(current);
+}
+
+void Entry::moveToSubEntryAndKeep(std::unique_ptr<Entry> &current)
 {
-  //printf("Entry %d with name %s type 0x%x added to %s type 0x%x\n",
-  //    current->num,current->name.data(),current->section,
-  //    name.data(),section);
-  //printf("Entry::addSubEntry(%s:%p) to %s\n",current->name.data(),
-  //    current,name.data());
   current->m_parent=this;
-  m_sublist->append(current);  
+  m_sublist.push_back(std::move(current));
+}
+
+void Entry::copyToSubEntry(Entry *current)
+{
+  Entry *copy = new Entry(*current);
+  copy->m_parent=this;
+  m_sublist.emplace_back(copy);
+}
+
+void Entry::copyToSubEntry(const std::unique_ptr<Entry> &current)
+{
+  std::unique_ptr<Entry> copy = std::make_unique<Entry>(*current);
+  copy->m_parent=this;
+  m_sublist.push_back(std::move(copy));
 }
 
 void Entry::reset()
@@ -271,7 +294,7 @@ void Entry::reset()
   groupDocType = GROUPDOC_NORMAL;
   id.resize(0);
   metaData.resize(0);
-  m_sublist->clear();
+  m_sublist.clear();
   extends->clear();
   groups->clear();
   anchors->clear();
@@ -293,14 +316,9 @@ int Entry::getSize()
 void Entry::setFileDef(FileDef *fd)
 {
   m_fileDef = fd;
-  if (m_sublist)
+  for (const auto &childNode : m_sublist)
   {
-    QListIterator<Entry> eli(*m_sublist);
-    Entry *childNode;
-    for (eli.toFirst();(childNode=eli.current());++eli)
-    {
       childNode->setFileDef(fd);
-    }
   }
 }
 
@@ -317,10 +335,14 @@ void Entry::addSpecialListItem(const char *listName,int itemId)
   sli->append(ili);
 }
 
-Entry *Entry::removeSubEntry(Entry *e)
+void Entry::removeSubEntry(Entry *e)
 {
- int i = m_sublist->find(e);
- return i!=-1 ? m_sublist->take(i) : 0;
+  auto it = std::find_if(m_sublist.begin(),m_sublist.end(),
+      [e](const std::unique_ptr<Entry>&elem) { return elem.get()==e; });
+  if (it!=m_sublist.end())
+  {
+    m_sublist.erase(it);
+  }
 }
 
 //------------------------------------------------------------------
diff --git a/src/entry.h b/src/entry.h
index 6dfa0c6..091e81b 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -23,6 +23,9 @@
 #include <qlist.h>
 #include <qgstring.h>
 
+#include <vector>
+#include <memory>
+
 struct SectionInfo;
 class QFile;
 class FileDef;
@@ -199,32 +202,42 @@ class Entry
 
     void addSpecialListItem(const char *listName,int index);
 
-    // while parsing a file these function can be used to navigate/build the tree
-    void setParent(Entry *parent) { m_parent = parent; }
-
     /*! Returns the parent for this Entry or 0 if this entry has no parent. */
     Entry *parent() const { return m_parent; }
 
     /*! Returns the list of children for this Entry
      *  @see addSubEntry() and removeSubEntry()
      */
-    const QList<Entry> *children() const { return m_sublist; }
+    //const QList<Entry> *children() const { return m_sublist; }
+    const std::vector< std::unique_ptr<Entry> > &children() const { return m_sublist; }
+
+    /*! @name add entry as a child and pass ownership.
+     *  @note This makes the entry passed invalid! (TODO: tclscanner.l still has use after move!)
+     *  @{
+     */
+    void moveToSubEntryAndKeep(Entry* e);
+    void moveToSubEntryAndKeep(std::unique_ptr<Entry> &e);
+    /*! @} */
+
+    /*! @name add entry as a child, pass ownership and reinitialize entry */
+    void moveToSubEntryAndRefresh(Entry* &e);
+    void moveToSubEntryAndRefresh(std::unique_ptr<Entry> &e);
 
-    /*! Adds entry \a e as a child to this entry */
-    void addSubEntry (Entry* e) ;
+    /*! make a copy of \a e and add it as a child to this entry */
+    void copyToSubEntry (Entry* e);
+    void copyToSubEntry (const std::unique_ptr<Entry> &e);
 
     /*! Removes entry \a e from the list of children.
-     *  Returns a pointer to the entry or 0 if the entry was not a child.
-     *  Note the entry will not be deleted.
+     *  The entry will be deleted if found.
      */
-    Entry *removeSubEntry(Entry *e);
+    void removeSubEntry(Entry *e);
 
     /*! Restore the state of this Entry to the default value it has
      *  at construction time.
      */
     void reset();
 
-    void changeSection(int sec) { section = sec; }
+    void markAsProcessed() const { ((Entry*)(this))->section = Entry::EMPTY_SEC; }
     void setFileDef(FileDef *fd);
     FileDef *fileDef() const { return m_fileDef; }
 
@@ -323,12 +336,9 @@ class Entry
 
   private:
     Entry         *m_parent;    //!< parent node in the tree
-    QList<Entry>  *m_sublist;   //!< entries that are children of this one
+    std::vector< std::unique_ptr<Entry> > m_sublist;
     Entry &operator=(const Entry &);
     FileDef       *m_fileDef;
 };
 
-typedef QList<Entry> EntryList;
-typedef QListIterator<Entry> EntryListIterator;
-
 #endif
diff --git a/src/fileparser.h b/src/fileparser.h
index 4b311e6..7c3f40c 100644
--- a/src/fileparser.h
+++ b/src/fileparser.h
@@ -25,7 +25,7 @@ class FileParser : public ParserInterface
     virtual ~FileParser() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
-    void parseInput(const char *, const char *,Entry *, bool, QStrList &) {}
+    void parseInput(const char *, const char *,const std::unique_ptr<Entry> &, bool, QStrList &) {}
     bool needsPreprocessing(const QCString &) { return FALSE; }
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
diff --git a/src/fortranscanner.h b/src/fortranscanner.h
index 15a9bf0..7490cde 100644
--- a/src/fortranscanner.h
+++ b/src/fortranscanner.h
@@ -33,7 +33,7 @@ class FortranLanguageScanner : public ParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char *fileName,
                     const char *fileBuf,
-                    Entry *root,
+                    const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension);
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index d75134a..9ff89e7 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -165,11 +165,11 @@ static int		yyColNr     = 0 ;
 static Entry*		current_root = 0 ;
 static Entry*		global_root  = 0 ;
 static Entry*		file_root    = 0 ;
-static Entry*		current      = 0 ;
 static Entry*		last_entry   = 0 ;
 static Entry*		last_enum    = 0 ;
+static std::unique_ptr<Entry> current;
 static ScanVar          v_type       = V_IGNORE; // type of parsed variable
-static QList<Entry>     moduleProcedures; // list of all interfaces which contain unresolved 
+static std::vector<Entry*>  moduleProcedures; // list of all interfaces which contain unresolved 
                                           // module procedures
 static QCString         docBlock;
 static bool             docBlockInBody = FALSE;
@@ -202,7 +202,7 @@ static SymbolModifiers currentModifiers;
 //! Holds program scope->symbol name->symbol modifiers.
 static QMap<Entry*,QMap<QCString,SymbolModifiers> > modifiers;
 
-static Entry           *global_scope = NULL;
+static Entry           *global_scope = 0;
 static int              anonCount    = 0 ;
 //-----------------------------------------------------------------------------
 
@@ -211,7 +211,7 @@ static void startCommentBlock(bool);
 static void handleCommentBlock(const QCString &doc,bool brief);
 static void subrHandleCommentBlock(const QCString &doc,bool brief);
 static void subrHandleCommentBlockResult(const QCString &doc,bool brief);
-static void addCurrentEntry(int case_insens);
+static void addCurrentEntry(bool case_insens);
 static void addModule(const char *name, bool isModule=FALSE);
 static void addSubprogram(const char *text);
 static void addInterface(QCString name, InterfaceType type);
@@ -221,7 +221,7 @@ static void scanner_abort();
 static void startScope(Entry *scope);
 static bool endScope(Entry *scope, bool isGlobalRoot=FALSE);
 //static bool isTypeName(QCString name);
-static void resolveModuleProcedures(QList<Entry> &moduleProcedures, Entry *current_root);
+static void resolveModuleProcedures(Entry *current_root);
 static int getAmpersandAtTheStart(const char *buf, int length);
 static int getAmpOrExclAtTheEnd(const char *buf, int length, char ch);
 static void truncatePrepass(int index);
@@ -241,6 +241,7 @@ static const char *stateToString(int state);
 #undef	YY_INPUT
 #define	YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
 #define YY_USER_ACTION yyColNr+=(int)yyleng;
+#define INVALID_ENTRY ((Entry*)0x8)
 //-----------------------------------------------------------------------------
 
 %}
@@ -444,8 +445,7 @@ SCOPENAME ({ID}{BS}"::"{BS})*
                                           current->name=yytext;
                                           current->fileName = yyFileName; 
   					  current->section=Entry::USINGDIR_SEC;
-					  current_root->addSubEntry(current);
-					  current = new Entry;
+					  current_root->moveToSubEntryAndRefresh(current);
                                           current->lang = SrcLangExt_Fortran; 
                                           yy_pop_state();
                                         }
@@ -459,8 +459,7 @@ SCOPENAME ({ID}{BS}"::"{BS})*
   					  current->name= useModuleName+"::"+yytext;
                                           current->fileName = yyFileName; 
   					  current->section=Entry::USINGDECL_SEC;
-					  current_root->addSubEntry(current);
-					  current = new Entry ;
+					  current_root->moveToSubEntryAndRefresh(current);
                                           current->lang = SrcLangExt_Fortran; 
   					}
 <Use,UseOnly>"\n"                       {
@@ -516,8 +515,8 @@ SCOPENAME ({ID}{BS}"::"{BS})*
 
                                           current->section = Entry::FUNCTION_SEC ;
                                           current->name = yytext; 
-                                          moduleProcedures.append(current);
-                                          addCurrentEntry(1);
+                                          moduleProcedures.push_back(current.get());
+                                          addCurrentEntry(true);
                                         }
 <ModuleProcedure>"\n"                   { yyColNr -= 1;
 					  unput(*yytext); 
@@ -558,13 +557,13 @@ SCOPENAME ({ID}{BS}"::"{BS})*
 					    yy_pop_state();
                                        }
 <Start,ModuleBody,ModuleBodyContains>"end"({BS}(module|program)({BS_}{ID})?)?{BS}/(\n|!|;) { // end module
-					    resolveModuleProcedures(moduleProcedures, current_root);
+					    resolveModuleProcedures(current_root);
 					    if (!endScope(current_root))
 					      yyterminate();
                                             defaultProtection = Public;
 					    if (global_scope)
                                             {
-                                              if (global_scope != (Entry *) -1)
+                                              if (global_scope != INVALID_ENTRY)
                                                 yy_push_state(Start);
                                               else
                                                 yy_pop_state(); // cannot pop artrificial entry
@@ -572,7 +571,7 @@ SCOPENAME ({ID}{BS}"::"{BS})*
                                             else
                                             {
                                               yy_push_state(Start);
-                                              global_scope = (Entry *)-1; // signal that the global_scope has already been used.
+                                              global_scope = INVALID_ENTRY; // signal that the global_scope has already been used.
                                             }
                                        }
 <Module>{ID}                           {  
@@ -647,7 +646,7 @@ private                                 {
                                             current->name = current_root->name + "::" + current->name;
                                           }
 
-                                          addCurrentEntry(1);
+                                          addCurrentEntry(true);
                                           startScope(last_entry); 
                                           BEGIN(TypedefBody);
                                         }
@@ -679,7 +678,7 @@ private                                 {
                                           current->fileName = yyFileName;
                                           current->bodyLine = yyLineNr;
                                           current->startLine  = yyLineNr;
-                                          addCurrentEntry(1);
+                                          addCurrentEntry(true);
                                         }
 {BS}"=>"[^(\n|\!)]*                     { /* Specific bindings come after the ID. */
                                           QCString args = yytext;
@@ -866,17 +865,15 @@ private                                 {
                                             current->startLine  = yyLineNr;
                                             if (argType == "@")
                                             {
-                                              current_root->addSubEntry(current);
-                                              current = new Entry(*current);
+                                              current_root->copyToSubEntry(current);
                                               // add to the scope surrounding the enum (copy!)
-                                              current_root->parent()->addSubEntry(current);
-                                              last_enum = current;
-                                              current = new Entry ;
+                                              last_enum = current.get();
+                                              current_root->parent()->moveToSubEntryAndRefresh(current);
                                               initEntry();
                                             }
                                             else
                                             {
-                                              addCurrentEntry(1);
+                                              addCurrentEntry(true);
                                             }
                                           } 
 					  else if (!argType.isEmpty())
@@ -889,7 +886,7 @@ private                                 {
 					      if (!docBlock.isNull()) 
 					      {
   					        subrHandleCommentBlock(docBlock,TRUE);
-					      }					    
+					      }
 					    }
 					    // save, it may be function return type
 					    if (parameter)
@@ -1068,7 +1065,7 @@ private                                 {
                                             current->name = current_root->name + "::" + current->name;
                                           }
 
-                                          addCurrentEntry(1);
+                                          addCurrentEntry(true);
                                           startScope(last_entry); 
 					  BEGIN( Enum ) ;
                                         }
@@ -1138,7 +1135,7 @@ private                                 {
 <Parameterlist>")"                     {
 				         current->args += ")";
 				         current->args = removeRedundantWhiteSpace(current->args);
-                                         addCurrentEntry(1);
+                                         addCurrentEntry(true);
 					 startScope(last_entry);
 					 BEGIN(SubprogBody);
 				       }
@@ -1164,7 +1161,7 @@ private                                 {
 				           newLine();
 					   //printf("3=========> without parameterlist \n");
  					   //current->argList = ;
-                                           addCurrentEntry(1);
+                                           addCurrentEntry(true);
 					   startScope(last_entry);
 					   BEGIN(SubprogBody);				           
 }
@@ -1217,11 +1214,20 @@ private                                 {
 					  unput(*yytext);                                        
 					  if (v_type == V_VARIABLE) 
 					  {
-					    Entry *tmp_entry = current; 
-					    current = last_entry; // temporarily switch to the previous entry
-                                            if (last_enum) current = last_enum;
+                                            std::unique_ptr<Entry> tmp_entry;
+                                            current.swap(tmp_entry);
+                                            // temporarily switch to the previous entry
+                                            if (last_enum)
+                                            {
+                                              current.reset(last_enum);
+                                            }
+                                            else
+                                            {
+					      current.reset(last_entry);
+                                            }
   					    handleCommentBlock(docBlock,TRUE);
- 					    current=tmp_entry;
+                                            // switch back
+ 					    tmp_entry.swap(current);
                                           }
 					  else if (v_type == V_PARAMETER) 
 					  {
@@ -1773,34 +1779,30 @@ static void popBuffer() {
 }
 
 /** used to copy entry to an interface module procedure */
-static void copyEntry(Entry *dest, Entry *src) 
+static void copyEntry(Entry *dest, const std::unique_ptr<Entry> &src) 
 {
-   dest->type     = src->type;
-   dest->fileName = src->fileName;
-   dest->startLine = src->startLine;
-   dest->bodyLine = src->bodyLine;
+   dest->type        = src->type;
+   dest->fileName    = src->fileName;
+   dest->startLine   = src->startLine;
+   dest->bodyLine    = src->bodyLine;
    dest->endBodyLine = src->endBodyLine;
-   dest->args     = src->args;
-   dest->argList  = new ArgumentList(*src->argList);
-   dest->doc      = src->doc;
-   dest->brief    = src->brief;
+   dest->args        = src->args;
+   delete dest->argList;
+   dest->argList     = new ArgumentList(*src->argList);
+   dest->doc         = src->doc;
+   dest->brief       = src->brief;
 }
 
 /** fill empty interface module procedures with info from 
     corresponding module subprogs 
     @TODO: handle procedures in used modules
 */
-void resolveModuleProcedures(QList<Entry> &moduleProcedures, Entry *current_root)
+void resolveModuleProcedures(Entry *current_root)
 {
-  if (moduleProcedures.isEmpty()) return;
- 
-  EntryListIterator eli1(moduleProcedures);
-  // for all module procedures
-  for (Entry *ce1; (ce1=eli1.current()); ++eli1) 
+  for (const auto &ce1 : moduleProcedures)
   {
     // check all entries in this module
-    EntryListIterator eli2(*current_root->children());
-    for (Entry *ce2; (ce2=eli2.current()); ++eli2) 
+    for (const auto &ce2 : current_root->children())
     {
       if (ce1->name == ce2->name) 
       {
@@ -2022,26 +2024,6 @@ static Argument *findArgument(Entry* subprog, QCString name, bool byTypeName = F
   return 0;
 }
 
-/*! Find function with given name in \a entry. */
-#if 0
-static Entry *findFunction(Entry* entry, QCString name)
-{
-  QCString cname(name.lower());
-
-  EntryListIterator eli(*entry->children());
-  Entry *ce;
-  for (;(ce=eli.current());++eli) 
-  {
-    if (ce->section != Entry::FUNCTION_SEC)
-      continue;
-
-    if (ce->name.lower() == cname)
-      return ce;
-  }
-
-  return 0;
-}
-#endif
 
 /*! Apply modifiers stored in \a mdfs to the \a typeName string. */
 static QCString applyModifiers(QCString typeName, SymbolModifiers& mdfs) 
@@ -2199,10 +2181,10 @@ static bool endScope(Entry *scope, bool isGlobalRoot)
 {
   if (global_scope == scope)
   {
-    global_scope = NULL;
+    global_scope = 0;
     return TRUE;
   }
-  if (global_scope == (Entry *) -1)
+  if (global_scope == INVALID_ENTRY)
   {
     return TRUE;
   }
@@ -2250,11 +2232,9 @@ static bool endScope(Entry *scope, bool isGlobalRoot)
       // iterate functions of interface and 
       // try to find types for dummy(ie. argument) procedures.
       //cout<<"Search in "<<scope->name<<endl;
-      EntryListIterator eli(*scope->children());
-      Entry *ce;
       int count = 0;
       int found = FALSE;
-      for (;(ce=eli.current());++eli) 
+      for (const auto &ce : scope->children())
       {
         count++;
         if (ce->section != Entry::FUNCTION_SEC)
@@ -2273,7 +2253,7 @@ static bool endScope(Entry *scope, bool isGlobalRoot)
       {
         // clear all modifiers of the scope
         modifiers.remove(scope);
-        delete scope->parent()->removeSubEntry(scope);
+        scope->parent()->removeSubEntry(scope);
         scope = 0;
         return TRUE;
       }
@@ -2282,16 +2262,14 @@ static bool endScope(Entry *scope, bool isGlobalRoot)
   if (scope->section!=Entry::FUNCTION_SEC) 
   { // not function section 
     // iterate variables: get and apply modifiers
-    EntryListIterator eli(*scope->children());
-    Entry *ce;
-    for (;(ce=eli.current());++eli) 
+    for (const auto &ce : scope->children())
     {
       if (ce->section != Entry::VARIABLE_SEC && ce->section != Entry::FUNCTION_SEC)
         continue;
 
       //cout<<ce->name<<", "<<mdfsMap.contains(ce->name.lower())<<mdfsMap.count()<<endl;
       if (mdfsMap.contains(ce->name.lower()))
-        applyModifiers(ce, mdfsMap[ce->name.lower()]);
+        applyModifiers(ce.get(), mdfsMap[ce->name.lower()]);
     }
   }
 
@@ -2345,19 +2323,18 @@ static void initEntry()
   current->virt       = virt;
   current->stat       = gstat;
   current->lang       = SrcLangExt_Fortran; 
-  Doxygen::docGroup.initGroupInfo(current);
+  Doxygen::docGroup.initGroupInfo(current.get());
 }
 
 /**
   adds current entry to current_root and creates new current
 */
-static void addCurrentEntry(int case_insens)
+static void addCurrentEntry(bool case_insens)
 {
   if (case_insens) current->name = current->name.lower();
   //printf("===Adding entry %s to %s\n", current->name.data(), current_root->name.data());
-  current_root->addSubEntry(current);
-  last_entry = current;
-  current = new Entry ;
+  last_entry = current.get();
+  current_root->moveToSubEntryAndRefresh(current);
   initEntry();
 }
 
@@ -2375,7 +2352,7 @@ static void addModule(const char *name, bool isModule)
   if (name!=NULL)
   {
     current->name = name;
-  } 
+  }
   else
   {
     QCString fname = yyFileName;
@@ -2389,7 +2366,7 @@ static void addModule(const char *name, bool isModule)
   current->bodyLine  = yyLineNr; // used for source reference
   current->startLine  = yyLineNr;
   current->protection = Public ;
-  addCurrentEntry(1);
+  addCurrentEntry(true);
   startScope(last_entry);
 }
 
@@ -2397,7 +2374,7 @@ static void addModule(const char *name, bool isModule)
 static void addSubprogram(const char *text)
 {
   DBG_CTX((stderr,"1=========> got subprog, type: %s\n",text)); 
-  subrCurrent.prepend(current);
+  subrCurrent.prepend(current.get());
   current->section = Entry::FUNCTION_SEC ;
   QCString subtype = text; subtype=subtype.lower().stripWhiteSpace();
   functionLine = (subtype.find("function") != -1);
@@ -2454,7 +2431,7 @@ static void addInterface(QCString name, InterfaceType type)
   current->fileName = yyFileName;
   current->bodyLine  = yyLineNr; 
   current->startLine  = yyLineNr;
-  addCurrentEntry(1);
+  addCurrentEntry(true);
 }
 
 
@@ -2513,7 +2490,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   QCString processedDoc = preprocessCommentBlock(doc,yyFileName,lineNr);
   while (parseCommentBlock(
 	g_thisParser,
-	docBlockInBody ? subrCurrent.getFirst() : current,
+	docBlockInBody ? subrCurrent.getFirst() : current.get(),
 	processedDoc, // text
 	yyFileName, // file
 	lineNr,
@@ -2526,11 +2503,11 @@ static void handleCommentBlock(const QCString &doc,bool brief)
         )) 
   {
 	   DBG_CTX((stderr,"parseCommentBlock position=%d [%s]  needsEntry=%d\n",position,doc.data()+position,needsEntry));
-   if (needsEntry) addCurrentEntry(0);
+   if (needsEntry) addCurrentEntry(false);
   }
   DBG_CTX((stderr,"parseCommentBlock position=%d [%s]  needsEntry=%d\n",position,doc.data()+position,needsEntry));
 
-  if (needsEntry) addCurrentEntry(0);
+  if (needsEntry) addCurrentEntry(false);
   docBlockInBody = FALSE;
 }
 
@@ -2541,8 +2518,9 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
   QCString loc_doc;
   loc_doc = doc.stripWhiteSpace();
 
-  Entry *tmp_entry = current; 
-  current = subrCurrent.getFirst(); // temporarily switch to the entry of the subroutine / function
+  std::unique_ptr<Entry> tmp_entry;
+  current.swap(tmp_entry);
+  current.reset(subrCurrent.getFirst()); // temporarily switch to the entry of the subroutine / function
 
   // Still in the specification section so no inbodyDocs yet, but parameter documentation
   current->inbodyDocs = "";
@@ -2566,14 +2544,11 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
       loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::IN]));
       loc_doc.stripWhiteSpace();
       // in case of empty documentation or (now) just name, consider it as no documemntation
-      if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
+      if (!loc_doc.isEmpty() && (loc_doc.lower() != argName.lower()))
       {
-        // reset current back to the part inside the routine
-        current=tmp_entry;
-        return;
-      }
-      handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::IN] + " " + 
+        handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::IN] + " " + 
                          argName + " " + loc_doc,brief);
+      }
     }
     else
     {
@@ -2594,7 +2569,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
       loc_doc.stripWhiteSpace();
       if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
       {
-        current=tmp_entry;
+        tmp_entry.swap(current);
         return;
       }
       handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::OUT] + " " + 
@@ -2616,13 +2591,11 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
     {
       loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::INOUT]));
       loc_doc.stripWhiteSpace();
-      if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
+      if (!loc_doc.isEmpty() && (loc_doc.lower() != argName.lower()))
       {
-        current=tmp_entry;
-        return;
+        handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::INOUT] + " " + 
+                           argName + " " + loc_doc,brief);
       }
-      handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::INOUT] + " " + 
-                         argName + " " + loc_doc,brief);
     }
     else
     {
@@ -2633,19 +2606,14 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
     }
   }
   // analogous to the [in] case; here no direction specified
-  else
+  else if (!loc_doc.isEmpty() && (loc_doc.lower() != argName.lower()))
   {
-    if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
-    {
-      current=tmp_entry;
-      return;
-    }
     handleCommentBlock(QCString("\n\n@param ") + directionParam[dir1] + " " + 
                        argName + " " + loc_doc,brief);
   }
 
   // reset current back to the part inside the routine
-  current=tmp_entry;
+  tmp_entry.swap(current);
 }
 //----------------------------------------------------------------------------
 /// Handle result description as defined after the declaration of the parameter
@@ -2654,8 +2622,9 @@ static void subrHandleCommentBlockResult(const QCString &doc,bool brief)
   QCString loc_doc;
   loc_doc = doc.stripWhiteSpace();
 
-  Entry *tmp_entry = current; 
-  current = subrCurrent.getFirst(); // temporarily switch to the entry of the subroutine / function
+  std::unique_ptr<Entry> tmp_entry;
+  current.swap(tmp_entry);
+  current.reset(subrCurrent.getFirst()); // temporarily switch to the entry of the subroutine / function
 
   // Still in the specification section so no inbodyDocs yet, but parameter documentation
   current->inbodyDocs = "";
@@ -2668,15 +2637,13 @@ static void subrHandleCommentBlockResult(const QCString &doc,bool brief)
      ) (void)loc_doc; // Do nothing work has been done by stripPrefix; (void)loc_doc: to overcome 'empty controlled statement' warning
   loc_doc.stripWhiteSpace();
 
-  if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
+  if (!loc_doc.isEmpty() && (loc_doc.lower() != argName.lower()))
   {
-    current=tmp_entry;
-    return;
+    handleCommentBlock(QCString("\n\n@returns ") + loc_doc,brief);
   }
-  handleCommentBlock(QCString("\n\n@returns ") + loc_doc,brief);
 
   // reset current back to the part inside the routine
-  current=tmp_entry;
+  tmp_entry.swap(current);
 }
 
 //----------------------------------------------------------------------------
@@ -2687,18 +2654,17 @@ static void debugCompounds(Entry *rt)  // print Entry structure (for debugging)
 {
  level++;
   printf("%d) debugCompounds(%s) line %d\n",level, rt->name.data(), rt->bodyLine);
-  EntryListIterator eli(*rt->children());
-  Entry *ce;
-  for (;(ce=eli.current());++eli)
+  for (const auto &ce : rt->children())
   {
-     debugCompounds(ce); 
-  } 
+     debugCompounds(ce.get());
+  }
 level--;
 }
 #endif
 
 
-static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, FortranFormat format)
+static void parseMain(const char *fileName,const char *fileBuf,
+                      const std::unique_ptr<Entry> &rt, FortranFormat format)
 {
   char *tmpBuf = NULL;
   initParser();
@@ -2713,8 +2679,8 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, Fortra
   mtype         = Method;
   gstat         = FALSE;
   virt          = Normal;
-  current_root  = rt;
-  global_root   = rt;
+  current_root  = rt.get();
+  global_root   = rt.get();
   inputFile.setName(fileName);
   if (inputFile.open(IO_ReadOnly))
   {
@@ -2750,18 +2716,18 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, Fortra
     yyFileName = fileName;
     msg("Parsing file %s...\n",yyFileName.data());
 
-    global_scope = rt;
-    startScope(rt); // implies current_root = rt
+    global_scope = rt.get();
+    startScope(rt.get()); // implies current_root = rt
     initParser();
     Doxygen::docGroup.enterFile(yyFileName,yyLineNr);
 
-    current          = new Entry;
+    // add entry for the file
+    current          = std::make_unique<Entry>();
     current->lang    = SrcLangExt_Fortran; 
     current->name    = yyFileName;
     current->section = Entry::SOURCE_SEC;
-    current_root->addSubEntry(current);
-    file_root        = current;
-    current          = new Entry;
+    file_root        = current.get();
+    current_root->moveToSubEntryAndRefresh(current);
     current->lang    = SrcLangExt_Fortran; 
 
     fortranscannerYYrestart( fortranscannerYYin );
@@ -2772,12 +2738,12 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, Fortra
     fortranscannerYYlex();
     Doxygen::docGroup.leaveFile(yyFileName,yyLineNr);
 
-    if (global_scope && global_scope != (Entry *) -1) endScope(current_root, TRUE); // TRUE - global root
+    if (global_scope && global_scope != INVALID_ENTRY) endScope(current_root, TRUE); // TRUE - global root
 
     //debugCompounds(rt); //debug 
 
     rt->program.resize(0);
-    delete current; current=0;
+    //delete current; current=0;
     moduleProcedures.clear();
     if (tmpBuf) {
       free((char*)tmpBuf);
@@ -2796,7 +2762,7 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, Fortra
 
 void FortranLanguageScanner::parseInput(const char *fileName,
                                         const char *fileBuf,
-                                        Entry *root,
+                                        const std::unique_ptr<Entry> &root,
                                         bool /*sameTranslationUnit*/,
                                         QStrList & /*filesInSameTranslationUnit*/)
 {
@@ -2856,13 +2822,11 @@ static void scanner_abort()
   fprintf(stderr,"Error in file %s line: %d, state: %d(%s)\n",yyFileName.data(),yyLineNr,YY_START,stateToString(YY_START));
   fprintf(stderr,"********************************************************************\n");
    
-  EntryListIterator eli(*global_root->children());
-  Entry *ce;
   bool start=FALSE;
 
-  for (;(ce=eli.current());++eli)
+  for (const auto &ce : global_root->children())
   {
-     if (ce == file_root) start=TRUE;
+     if (ce.get() == file_root) start=TRUE;
      if (start) ce->reset(); 
   } 
 
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index e1fab11..00e42d7 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -1460,7 +1460,7 @@ void GroupDefImpl::writeQuickMemberLinks(OutputList &ol,const MemberDef *current
 
 //---- helper functions ------------------------------------------------------
 
-void addClassToGroups(Entry *root,ClassDef *cd)
+void addClassToGroups(const Entry *root,ClassDef *cd)
 {
   QListIterator<Grouping> gli(*root->groups);
   Grouping *g;
@@ -1478,7 +1478,7 @@ void addClassToGroups(Entry *root,ClassDef *cd)
   }
 }
 
-void addNamespaceToGroups(Entry *root,NamespaceDef *nd)
+void addNamespaceToGroups(const Entry *root,NamespaceDef *nd)
 {
   //printf("root->groups->count()=%d\n",root->groups->count());
   QListIterator<Grouping> gli(*root->groups);
@@ -1495,7 +1495,7 @@ void addNamespaceToGroups(Entry *root,NamespaceDef *nd)
   }
 }
 
-void addDirToGroups(Entry *root,DirDef *dd)
+void addDirToGroups(const Entry *root,DirDef *dd)
 {
   //printf("*** root->groups->count()=%d\n",root->groups->count());
   QListIterator<Grouping> gli(*root->groups);
@@ -1513,7 +1513,7 @@ void addDirToGroups(Entry *root,DirDef *dd)
   }
 }
 
-void addGroupToGroups(Entry *root,GroupDef *subGroup)
+void addGroupToGroups(const Entry *root,GroupDef *subGroup)
 {
   //printf("addGroupToGroups for %s groups=%d\n",root->name.data(),
   //    root->groups?root->groups->count():-1);
@@ -1544,7 +1544,7 @@ void addGroupToGroups(Entry *root,GroupDef *subGroup)
 }
 
 /*! Add a member to the group with the highest priority */
-void addMemberToGroups(Entry *root,MemberDef *md)
+void addMemberToGroups(const Entry *root,MemberDef *md)
 {
   //printf("addMemberToGroups:  Root %p = %s, md %p=%s groups=%d\n", 
   //    root, root->name.data(), md, md->name().data(), root->groups->count() );
@@ -1650,7 +1650,7 @@ void addMemberToGroups(Entry *root,MemberDef *md)
 }
 
 
-void addExampleToGroups(Entry *root,PageDef *eg)
+void addExampleToGroups(const Entry *root,PageDef *eg)
 {
   QListIterator<Grouping> gli(*root->groups);
   Grouping *g;
diff --git a/src/groupdef.h b/src/groupdef.h
index 92d524f..8a84a98 100644
--- a/src/groupdef.h
+++ b/src/groupdef.h
@@ -18,6 +18,8 @@
 #ifndef GROUPDEF_H
 #define GROUPDEF_H
 
+#include <memory>
+
 #include "sortdict.h"
 #include "definition.h"
 
@@ -138,13 +140,13 @@ class GroupListIterator : public QListIterator<GroupDef>
     virtual ~GroupListIterator() {}
 };
 
-void addClassToGroups(Entry *root,ClassDef *cd);
-void addNamespaceToGroups(Entry *root,NamespaceDef *nd);
-void addGroupToGroups(Entry *root,GroupDef *subGroup);
-void addMemberToGroups(Entry *root,MemberDef *md);
-void addPageToGroups(Entry *root,PageDef *pd);
-void addExampleToGroups(Entry *root,PageDef *eg);
-void addDirToGroups(Entry *root,DirDef *dd);
+void addClassToGroups    (const Entry *root,ClassDef *cd);
+void addNamespaceToGroups(const Entry *root,NamespaceDef *nd);
+void addGroupToGroups    (const Entry *root,GroupDef *subGroup);
+void addMemberToGroups   (const Entry *root,MemberDef *md);
+void addPageToGroups     (const Entry *root,PageDef *pd);
+void addExampleToGroups  (const Entry *root,PageDef *eg);
+void addDirToGroups      (const Entry *root,DirDef *dd);
 
 #endif
 
diff --git a/src/markdown.cpp b/src/markdown.cpp
index ce28540..d1a6a63 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2578,11 +2578,11 @@ QCString markdownFileNameToId(const QCString &fileName)
 
 void MarkdownFileParser::parseInput(const char *fileName, 
                 const char *fileBuf, 
-                Entry *root,
+                const std::unique_ptr<Entry> &root,
                 bool /*sameTranslationUnit*/,
                 QStrList & /*filesInSameTranslationUnit*/)
 {
-  Entry *current = new Entry;
+  std::unique_ptr<Entry> current = std::make_unique<Entry>();
   current->lang = SrcLangExt_Markdown;
   current->fileName = fileName;
   current->docFile  = fileName;
@@ -2630,7 +2630,7 @@ void MarkdownFileParser::parseInput(const char *fileName,
   QCString processedDocs = preprocessCommentBlock(docs,fileName,lineNr);
   while (parseCommentBlock(
         this,
-        current,
+        current.get(),
         processedDocs,
         fileName,
         lineNr,
@@ -2644,8 +2644,7 @@ void MarkdownFileParser::parseInput(const char *fileName,
     if (needsEntry)
     {
       QCString docFile = current->docFile;
-      root->addSubEntry(current);
-      current = new Entry;
+      root->moveToSubEntryAndRefresh(current);
       current->lang = SrcLangExt_Markdown;
       current->docFile = docFile;
       current->docLine = lineNr;
@@ -2653,7 +2652,7 @@ void MarkdownFileParser::parseInput(const char *fileName,
   }
   if (needsEntry)
   {
-    root->addSubEntry(current);
+    root->moveToSubEntryAndKeep(current);
   }
 
   // restore setting
diff --git a/src/markdown.h b/src/markdown.h
index 1a3895e..f101e5a 100644
--- a/src/markdown.h
+++ b/src/markdown.h
@@ -33,7 +33,7 @@ class MarkdownFileParser : public ParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char *fileName, 
                     const char *fileBuf, 
-                    Entry *root,
+                    const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &) { return FALSE; }
diff --git a/src/parserintf.h b/src/parserintf.h
index f03aac7..a269bfb 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -21,6 +21,8 @@
 #include <qdict.h>
 #include <qstrlist.h>
 
+#include <memory>
+
 #include "types.h"
 
 class Entry;
@@ -67,7 +69,7 @@ class ParserInterface
      */
     virtual void parseInput(const char *fileName,
                             const char *fileBuf,
-                            Entry *root,
+                            const std::unique_ptr<Entry> &root,
                             bool sameTranslationUnit,
                             QStrList &filesInSameTranslationUnit) = 0;
 
diff --git a/src/pyscanner.h b/src/pyscanner.h
index 01235ee..13b10b9 100644
--- a/src/pyscanner.h
+++ b/src/pyscanner.h
@@ -39,7 +39,7 @@ class PythonLanguageScanner : public ParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char * fileName, 
                     const char *fileBuf, 
-                    Entry *root,
+                    const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension);
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 2320bca..c6120fb 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -73,7 +73,7 @@ static QFile            inputFile;
 static Protection	protection;
 
 static Entry*		current_root = 0 ;
-static Entry*		current      = 0 ;
+static std::unique_ptr<Entry> current;
 static Entry*		previous     = 0 ;
 static Entry*		bodyEntry    = 0 ;
 static int		yyLineNr     = 1 ;
@@ -145,16 +145,14 @@ static void initEntry()
   current->virt       = virt;
   current->stat       = gstat;
   current->lang       = SrcLangExt_Python; 
-  current->setParent(current_root);
-  Doxygen::docGroup.initGroupInfo(current);
+  Doxygen::docGroup.initGroupInfo(current.get());
   gstat = FALSE;
 }
 
 static void newEntry()
 {
-  previous = current;
-  current_root->addSubEntry(current);
-  current = new Entry ;
+  previous = current.get();
+  current_root->moveToSubEntryAndRefresh(current);
   initEntry();
 }
 
@@ -240,8 +238,7 @@ static void addFrom(bool all)
   current->fileName = yyFileName; 
   //printf("Adding using declaration: found:%s:%d name=%s\n",yyFileName.data(),yyLineNr,current->name.data());
   current->section=all ? Entry::USINGDIR_SEC : Entry::USINGDECL_SEC;
-  current_root->addSubEntry(current);
-  current = new Entry ;
+  current_root->moveToSubEntryAndRefresh(current);
   initEntry();
 }
 //-----------------------------------------------------------------------------
@@ -261,43 +258,6 @@ static void incLineNr()
   yyLineNr++;
 }
 
-#if 0
-// Appends the current-name to current-type;
-// Destroys current-name.
-// Destroys current->args and current->argList
-static void addType( Entry* current )
-{
-    uint tl=current->type.length();
-    if ( tl>0 && !current->name.isEmpty() && current->type.at(tl-1)!='.') 
-    {
-      current->type += ' ' ;
-    }
-    current->type += current->name ;
-    current->name.resize(0) ;
-    tl=current->type.length();
-    if ( tl>0 && !current->args.isEmpty() && current->type.at(tl-1)!='.') 
-    {
-      current->type += ' ' ;
-    }
-    current->type += current->args ;
-    current->args.resize(0) ;
-    current->argList->clear();
-}
-
-static QCString stripQuotes(const char *s)
-{
-  QCString name;
-  if (s==0 || *s==0) return name;
-  name=s;
-  if (name.at(0)=='"' && name.at(name.length()-1)=='"')
-  {
-    name=name.mid(1,name.length()-2);
-  }
-  return name;
-}
-#endif
-//-----------------------------------------------------------------
-
 //-----------------------------------------------------------------
 static void startCommentBlock(bool brief)
 {
@@ -313,15 +273,6 @@ static void startCommentBlock(bool brief)
   }
 }
 
-/*
-static void appendDocBlock() {
-  previous = current;
-  current_root->addSubEntry(current);
-  current = new Entry;
-  initEntry();
-}
-*/
-
 static void handleCommentBlock(const QCString &doc,bool brief)
 {
   //printf("handleCommentBlock(doc=[%s] brief=%d docBlockInBody=%d docBlockJavaStyle=%d\n",
@@ -341,7 +292,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   QCString processedDoc = preprocessCommentBlock(doc,yyFileName,lineNr);
   while (parseCommentBlock(
 	g_thisParser,
-	(docBlockInBody && previous) ? previous : current,
+	(docBlockInBody && previous) ? previous : current.get(),
 	processedDoc, // text
 	yyFileName,   // file
 	lineNr,
@@ -765,8 +716,7 @@ STARTDOCSYMS      "##"
 			current->fileName = yyFileName; 
 			//printf("Adding using declaration: found:%s:%d name=%s\n",yyFileName.data(),yyLineNr,current->name.data());
 			current->section=Entry::USINGDECL_SEC;
-			current_root->addSubEntry(current);
-			current = new Entry ;
+			current_root->moveToSubEntryAndRefresh(current);
 			initEntry();
 			BEGIN(Search);
                       }
@@ -963,7 +913,7 @@ STARTDOCSYMS      "##"
                             }
     {B}":"{B}		    { // function without arguments
 			      g_specialBlock = TRUE; // expecting a docstring
-			      bodyEntry = current;
+			      bodyEntry = current.get();
                               BEGIN(FunctionBody);
 			    }
 
@@ -1346,7 +1296,7 @@ STARTDOCSYMS      "##"
       				 current->program+=yytext;
 			         //current->startLine = yyLineNr;
 				 g_curIndent=computeIndent(yytext);
-				 bodyEntry = current;
+				 bodyEntry = current.get();
 				 DBG_CTX((stderr,"setting indent %d\n",g_curIndent));
 				 //printf("current->program=[%s]\n",current->program.data());
 				 //g_hideClassDocs = TRUE;
@@ -1452,9 +1402,10 @@ STARTDOCSYMS      "##"
 			// do something based on the type of the IDENTIFIER
 			if (current->type.isEmpty())
                         {
-                          QListIterator<Entry> eli(*(current_root->children()));
-                          Entry *child;
-                          for (eli.toFirst();(child=eli.current());++eli)
+                          //QListIterator<Entry> eli(*(current_root->children()));
+                          //Entry *child;
+                          //for (eli.toFirst();(child=eli.current());++eli)
+                          for (const auto &child : current_root->children())
                           {
                             if (child->name == QCString(yytext))
                             {
@@ -1754,10 +1705,9 @@ STARTDOCSYMS      "##"
 static void parseCompounds(Entry *rt)
 {
   //printf("parseCompounds(%s)\n",rt->name.data());
-  EntryListIterator eli(*rt->children());
-  Entry *ce;
-  for (;(ce=eli.current());++eli)
+  for (int i=0; i<rt->children().size(); ++i)
   {
+    Entry *ce = rt->children()[i].get();
     if (!ce->program.isEmpty())
     {
       //printf("-- %s ---------\n%s\n---------------\n",
@@ -1768,7 +1718,7 @@ static void parseCompounds(Entry *rt)
       pyscannerYYrestart( pyscannerYYin ) ;
       if (ce->section&Entry::COMPOUND_MASK)
       {
-        current_root = ce ;
+        current_root = ce;
         BEGIN( Search );
       }
       else if (ce->parent())
@@ -1780,18 +1730,17 @@ static void parseCompounds(Entry *rt)
       }
       yyFileName = ce->fileName;
       yyLineNr   = ce->bodyLine ;
-      if (current) delete current;
-      current = new Entry;
+      current = std::make_unique<Entry>();
       initEntry();
 
-      Doxygen::docGroup.enterCompound(yyFileName,yyLineNr,ce->name);
-      
+      QCString name = ce->name;
+      Doxygen::docGroup.enterCompound(yyFileName,yyLineNr,name);
+
       pyscannerYYlex() ;
       g_lexInit=TRUE;
-      delete current; current=0;
       ce->program.resize(0);
 
-      Doxygen::docGroup.leaveCompound(yyFileName,yyLineNr,ce->name);
+      Doxygen::docGroup.leaveCompound(yyFileName,yyLineNr,name);
 
     }
     parseCompounds(ce);
@@ -1801,7 +1750,7 @@ static void parseCompounds(Entry *rt)
 //----------------------------------------------------------------------------
 
 
-static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
+static void parseMain(const char *fileName,const char *fileBuf,const std::unique_ptr<Entry> &rt)
 {
   initParser();
 
@@ -1812,7 +1761,7 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
   mtype         = Method;
   gstat         = FALSE;
   virt          = Normal;
-  current_root  = rt;
+  current_root  = rt.get();
   g_specialBlock = FALSE;
 
 
@@ -1836,7 +1785,7 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
       g_moduleScope+=baseName;
     }
 
-    current            = new Entry;
+    current            = std::make_unique<Entry>();
     initEntry();
     current->name      = g_moduleScope;
     current->section   = Entry::NAMESPACE_SEC;
@@ -1845,11 +1794,11 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
     current->startLine = yyLineNr;
     current->bodyLine  = yyLineNr;
 
-    rt->addSubEntry(current);
+    current_root  = current.get();
+
+    rt->moveToSubEntryAndRefresh(current);
 
-    current_root  = current ;
     initParser();
-    current       = new Entry;
 
     Doxygen::docGroup.enterFile(yyFileName,yyLineNr);
     
@@ -1863,7 +1812,6 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt)
     Doxygen::docGroup.leaveFile(yyFileName,yyLineNr);
 
     current_root->program.resize(0);
-    delete current; current=0;
 
     parseCompounds(current_root);
 
@@ -1936,7 +1884,7 @@ void pyscanFreeScanner()
 
 void PythonLanguageScanner::parseInput(const char *fileName,
                                        const char *fileBuf,
-                                       Entry *root,
+                                       const std::unique_ptr<Entry> &root,
                                        bool /*sameTranslationUnit*/,
                                        QStrList & /*filesInSameTranslationUnit*/)
 {
diff --git a/src/scanner.h b/src/scanner.h
index c0d3dff..7103cb0 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -34,7 +34,7 @@ class CLanguageScanner : public ParserInterface
     void finishTranslationUnit();
     void parseInput(const char *fileName,
                     const char *fileBuf,
-                    Entry *root,
+                    const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension);
diff --git a/src/scanner.l b/src/scanner.l
index 07d5c71..fe20543 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -22,6 +22,11 @@
 /*
  *	includes
  */
+
+#include <algorithm>
+#include <vector>
+#include <utility>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -86,11 +91,11 @@ static int		roundCount   = 0 ;
 static int		curlyCount   = 0 ;
 static int		squareCount  = 0 ;
 static int              padCount     = 0 ;
+static std::unique_ptr<Entry> current;
 static Entry*		current_root = 0 ;
 static Entry*		global_root  = 0 ;
-static Entry*		current      = 0 ;
 static Entry*		previous     = 0 ;
-static Entry*		tempEntry    = 0 ;
+static std::unique_ptr<Entry> tempEntry;
 static Entry*		firstTypedefEntry = 0 ;
 static Entry*		memspecEntry = 0 ;
 static int		yyLineNr     = 1 ;
@@ -194,6 +199,8 @@ static int              g_column;
 static int              g_fencedSize=0;
 static bool             g_nestedComment=0;
 
+static std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > g_outerScopeEntries;
+
 static const char *stateToString(int state);
 //-----------------------------------------------------------------------------
 
@@ -205,6 +212,7 @@ static const char *stateToString(int state);
 
 static void initParser()
 {
+  g_outerScopeEntries.clear();
   sectionLabel.resize(0);
   sectionTitle.resize(0);
   baseName.resize(0);
@@ -228,7 +236,6 @@ static void initParser()
   sliceOpt=Config_getBool(OPTIMIZE_OUTPUT_SLICE);
   previous = 0;
   firstTypedefEntry = 0;
-  tempEntry = 0;
   memspecEntry =0;
 }
 
@@ -249,7 +256,7 @@ static void initEntry()
   //  //printf("Appending group %s\n",autoGroupStack.top()->groupname.data());
   //  current->groups->append(new Grouping(*autoGroupStack.top()));
   //}
-  Doxygen::docGroup.initGroupInfo(current);
+  Doxygen::docGroup.initGroupInfo(current.get());
   isTypedef=FALSE;
 }
 
@@ -329,7 +336,7 @@ static inline int computeIndent(const char *s,int startIndent)
   return col;
 }
 
-static void addType( Entry* current )
+static void addType()
 {
     uint tl=current->type.length();
     if( tl>0 && !current->name.isEmpty() && current->type.at(tl-1)!='.') 
@@ -1027,7 +1034,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					   }
 					}
 <CliPropertyType>{ID}			{
-  					  addType( current );
+  					  addType();
   					  current->name = yytext;
   					}
 <CliPropertyType>"["		        { // C++/CLI indexed property
@@ -1049,7 +1056,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <CliPropertyType>{B}*			{
   					}
 <CliPropertyType>.			{
-  					  addType( current );
+  					  addType();
   					  current->type += yytext;
   					}
 <CliPropertyIndex>"]"			{
@@ -1371,9 +1378,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  lineCount();
   					}
 <PackageName>";"			{
-					  current_root->addSubEntry(current);
-                                          current_root = current ;
-					  current = new Entry ;
+                                          Entry *tmp = current.get();
+					  current_root->moveToSubEntryAndRefresh(current);
+                                          current_root = tmp;
 					  initEntry();
   					  BEGIN(FindMembers);
   					}
@@ -1509,7 +1516,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    addType( current ) ;
+					    addType();
 					    current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
@@ -1528,7 +1535,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    addType( current ) ;
+					    addType();
 					    current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
@@ -1547,7 +1554,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    addType( current ) ;
+					    addType();
 					    current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
@@ -1560,7 +1567,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->spec = Entry::Service |
 					      // preserve UNO IDL [optional] or published
 					      (current->spec & (Entry::Optional|Entry::Published));
-					    addType( current ) ;
+					    addType();
 					    current->type += " service " ;
 					    current->fileName  = yyFileName;
 					    current->startLine = yyLineNr;
@@ -1569,7 +1576,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else // TODO is addType right? just copy/pasted
 					  {
-					    addType( current ) ;
+					    addType();
 					    current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
@@ -1581,7 +1588,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->section = Entry::CLASS_SEC;
 					    current->spec = Entry::Singleton |
 					      (current->spec & Entry::Published); // preserve
-					    addType( current ) ;
+					    addType();
 					    current->type += " singleton " ;
 					    current->fileName  = yyFileName;
 					    current->startLine = yyLineNr;
@@ -1590,7 +1597,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else // TODO is addType right? just copy/pasted
 					  {
-					    addType( current ) ;
+					    addType();
 					    current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
@@ -1603,7 +1610,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                         		    current->spec = Entry::Interface |
                                                 // preserve UNO IDL [optional], published, Slice local
                                                 (current->spec & (Entry::Optional|Entry::Published|Entry::Local));
-					    addType( current ) ;
+					    addType();
 					    current->type += " interface" ;
 					    current->fileName  = yyFileName;
 					    current->startLine = yyLineNr;
@@ -1613,7 +1620,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    addType( current ) ;
+					    addType();
 					    current->name = QCString(yytext).stripWhiteSpace();
 					  }
   					}
@@ -1624,7 +1631,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  language = current->lang = SrcLangExt_ObjC;
 					  insideObjC = TRUE;
 					  current->protection = protection = Public ;
-					  addType( current ) ;
+					  addType();
 					  current->type += " implementation" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1642,7 +1649,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    insideObjC = TRUE;
 					  }
 					  current->protection = protection = Public ;
-					  addType( current ) ;
+					  addType();
 					  current->type += " interface" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1658,7 +1665,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  language = current->lang = SrcLangExt_ObjC;
 					  insideObjC = TRUE;
 					  current->protection = protection = Public ;
-					  addType( current ) ;
+					  addType();
 					  current->type += " protocol" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1673,7 +1680,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->spec    = Entry::Exception |
 					    (current->spec & Entry::Published) |
 					    (current->spec & Entry::Local);
-					  addType( current ) ;
+					  addType();
 					  current->type += " exception" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1690,7 +1697,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
   					  current->section = Entry::CLASS_SEC;
-					  addType( current ) ;
+					  addType();
                                           uint64 spec = current->spec;
 					  if (insidePHP && current->spec&Entry::Abstract)
 					  {
@@ -1728,7 +1735,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  isTypedef=FALSE;
   					  current->section = Entry::CLASS_SEC;
                                           current->spec = Entry::Value;
-					  addType( current ) ;
+					  addType();
 					  current->type += " value class" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1743,7 +1750,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  isTypedef=FALSE;
   					  current->section = Entry::CLASS_SEC;
                                           current->spec = Entry::Ref;
-					  addType( current ) ;
+					  addType();
 					  current->type += " ref class" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1758,7 +1765,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  isTypedef=FALSE;
   					  current->section = Entry::CLASS_SEC;
                                           current->spec = Entry::Interface;
-					  addType( current ) ;
+					  addType();
 					  current->type += " interface class" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1773,7 +1780,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    isTypedef=FALSE;
 					    current->section = Entry::CLASS_SEC;
-					    addType( current ) ;
+					    addType();
 					    current->type += " coclass" ;
 					    current->fileName  = yyFileName;
 					    current->startLine = yyLineNr;
@@ -1784,7 +1791,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-  					    addType(current);
+  					    addType();
 					    current->name = yytext;
 					    current->name = current->name.stripWhiteSpace();
 					    lineCount();
@@ -1805,7 +1812,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             (current->spec & Entry::Local); 
 					  // bug 582676: can be a struct nested in an interface so keep insideObjC state
 					  //current->objc    = insideObjC = FALSE;
-					  addType( current ) ;
+					  addType();
                                           if (isConst)
                                           {
                                             current->type += " const";
@@ -1828,7 +1835,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  isTypedef=FALSE;
   					  current->section = Entry::CLASS_SEC;
                                           current->spec    = Entry::Struct | Entry::Value;
-					  addType( current ) ;
+					  addType();
 					  current->type += " value struct" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1843,7 +1850,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  isTypedef=FALSE;
   					  current->section = Entry::CLASS_SEC;
                                           current->spec    = Entry::Struct | Entry::Ref;
-					  addType( current ) ;
+					  addType();
 					  current->type += " ref struct" ;
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1858,7 +1865,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  isTypedef=FALSE;
   					  current->section = Entry::CLASS_SEC;
                                           current->spec    = Entry::Struct | Entry::Interface;
-					  addType( current ) ;
+					  addType();
 					  current->type += " interface struct";
 					  current->fileName  = yyFileName;
 					  current->startLine = yyLineNr;
@@ -1878,7 +1885,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           current->spec    = Entry::Union;
 					  // bug 582676: can be a struct nested in an interface so keep insideObjC state
 					  //current->objc    = insideObjC = FALSE;
-					  addType( current ) ;
+					  addType();
                                           if (isConst)
                                           {
                                             current->type += " const";
@@ -1910,7 +1917,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
   					    current->section = Entry::ENUM_SEC ;
 					  }
-					  addType( current ) ;
+					  addType();
 					  current->type += " enum";
                                           if (isStrongEnum)
                                           {
@@ -2003,12 +2010,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           current->fileName = yyFileName; 
                                           // add a using declaraton
   					  current->section=Entry::USINGDECL_SEC;
-					  current_root->addSubEntry(current);
-					  current = new Entry(*current);
+					  current_root->copyToSubEntry(current);
                                           // also add it as a using directive
 					  current->section=Entry::USINGDIR_SEC;
-					  current_root->addSubEntry(current);
-					  current = new Entry ;
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  aliasName.resize(0);
 					}
@@ -2043,8 +2048,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
                                           current->fileName = yyFileName; 
   					  current->section=Entry::USINGDIR_SEC;
-					  current_root->addSubEntry(current);
-					  current = new Entry;
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  BEGIN(Using);
   					}
@@ -2062,9 +2066,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    //printf("import name = %s -> %s\n",yytext,current->name.data());
 					    current->section=Entry::USINGDECL_SEC;
 					  }
-					  current_root->addSubEntry(current);
-                                          previous = current;
-					  current = new Entry ;
+                                          previous = current.get();
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  BEGIN(Using);
   					}
@@ -2081,9 +2084,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           current->fileName = yyFileName; 
   					  current->section=Entry::USINGDECL_SEC;
                                           current->startLine = yyLineNr;
-					  current_root->addSubEntry(current);
-                                          previous = current;
-					  current             = new Entry ;
+                                          previous = current.get();
+					  current_root->moveToSubEntryAndRefresh(current);
+					  initEntry();
 					  if (insideCS) /* Hack: in C# a using declaration and 
 							   directive have the same syntax, so we
 							   also add it as a using directive here
@@ -2094,10 +2097,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->startLine = yyLineNr;
 					    current->startColumn = yyColNr;
 					    current->section=Entry::USINGDIR_SEC;
-					    current_root->addSubEntry(current);
-					    current             = new Entry ;
+					    current_root->moveToSubEntryAndRefresh(current);
+					    initEntry();
 					  }
-					  initEntry();
 					  BEGIN(Using);
   					}
 <Using>"="                              { // C++11 style template alias?
@@ -2156,22 +2158,21 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <UsingDirective>{SCOPENAME}		{ current->name=removeRedundantWhiteSpace(yytext);
                                           current->fileName = yyFileName; 
   					  current->section=Entry::USINGDIR_SEC;
-					  current_root->addSubEntry(current);
-					  current             = new Entry ;
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  BEGIN(Using);
   					}
 <Using>";"				{ BEGIN(FindMembers); }
 <FindMembers>{SCOPENAME}{BN}*"<>"	{ // guided template decl
 					  QCString n=yytext;
-					  addType( current );
+					  addType();
 					  current->name=n.left(n.length()-2);
 					}
 <FindMembers>{SCOPENAME}{BN}*/"<"	{ // Note: this could be a return type!
                                           roundCount=0;
   					  sharpCount=0;
 					  lineCount();
-					  addType( current );
+					  addType();
   					  current->name=yytext;
 					  current->name=current->name.stripWhiteSpace();
 					  //current->scopeSpec.resize(0);
@@ -2437,7 +2438,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else if (insideCS && qstrcmp(yytext,"this")==0)
 					  {
 					    // C# indexer
-					    addType( current ) ;
+					    addType();
 					    current->name="this";
 					    BEGIN(CSIndexer);
 					  }
@@ -2469,7 +2470,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    if (YY_START==FindMembers)
 					    {
-					      addType( current ) ;
+					      addType();
 					    }
 					    bool javaLike = insideJava || insideCS || insideD || insidePHP || insideJS;
 					    if (javaLike && qstrcmp(yytext,"public")==0)
@@ -2704,8 +2705,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  current->args       = current->args.simplifyWhiteSpace();
   					  current->name       = current->name.stripWhiteSpace();
 					  current->section    = Entry::DEFINE_SEC;
-					  current_root->addSubEntry(current);
-					  current             = new Entry ;
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  BEGIN(lastDefineContext);
   					}
@@ -2722,8 +2722,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           current->initializer = init;
   					  current->name       = current->name.stripWhiteSpace();
 					  current->section    = Entry::VARIABLE_SEC; 
-					  current_root->addSubEntry(current);
-					  current             = new Entry ;
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  BEGIN(FindMembers);
   					}
@@ -2758,7 +2757,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers>[\^%]			{  // ^ and % are C++/CLI extensions
   					  if (insideCli)
 					  {
-  					    addType( current );
+  					    addType();
                                             current->name = yytext ; 
 					  }
 					  else
@@ -2768,7 +2767,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <FindMembers>[*&]+			{ 
                                           current->name += yytext ;  
-  					  addType( current );
+  					  addType();
 					}
 <FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
 					  if (current->bodyLine==-1)
@@ -2870,7 +2869,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
 					    // link open command to the current entry
-					    Doxygen::docGroup.open(current,yyFileName,yyLineNr);
+					    Doxygen::docGroup.open(current.get(),yyFileName,yyLineNr);
 					  }
 					  //current = tmp;
 					  initEntry();
@@ -2914,7 +2913,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <FindMembers,FindFields,ReadInitializer>"//"([!/]){B}*{CMD}"}".*|"/*"([!*]){B}*{CMD}"}"[^*]*"*/"	{
                                           bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && lastInitializerContext==FindFields); // see bug746226
-  					  Doxygen::docGroup.close(current,yyFileName,yyLineNr,insideEnum);
+  					  Doxygen::docGroup.close(current.get(),yyFileName,yyLineNr,insideEnum);
   					}
 <FindMembers>"="			{ // in PHP code this could also be due to "<?="
   					  current->bodyLine = yyLineNr;
@@ -2965,8 +2964,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					    current->args       = current->args.simplifyWhiteSpace();
   					    current->name       = current->name.stripWhiteSpace();
 					    current->section    = Entry::VARIABLE_SEC;
-					    current_root->addSubEntry(current);
-					    current = new Entry;
+					    current_root->moveToSubEntryAndRefresh(current);
 					    initEntry();
 					    BEGIN(FindMembers);
 					  }
@@ -3468,7 +3466,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           {
                                             if (current->type.isEmpty()) // anonymous padding field, e.g. "int :7;"
 					    {
-					       addType(current);
+					      addType();
 					      current->name.sprintf("__pad%d__",padCount++);
 					    }
   					    BEGIN(BitFields);
@@ -3499,7 +3497,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    current->type.prepend("typedef ");
 					  }
-					  bool needNewCurrent=FALSE;
+					  bool stat = current->stat;
 					  if (!current->name.isEmpty() && current->section!=Entry::ENUM_SEC)
 					  {
 					    current->type=current->type.simplifyWhiteSpace();
@@ -3513,17 +3511,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->fileName = yyFileName;
 					    current->startLine = yyBegLineNr;
 					    current->startColumn = yyBegColNr;
-					    current_root->addSubEntry( current ) ;
-					    needNewCurrent=TRUE;
+					    current_root->moveToSubEntryAndRefresh( current ) ;
+                                            initEntry();
 					  }
 					  if ( *yytext == ',')
 					  {
-					    bool stat = current->stat;
-					    if (needNewCurrent)
-					    {
-					      current = new Entry(*current);
-					      initEntry();
-					    }
 					    current->stat = stat; // the static attribute holds for all variables
 					    current->name.resize(0);
 					    current->args.resize(0);
@@ -3539,11 +3531,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
                                             mtype = Method;
                                             virt = Normal;
-					    if (needNewCurrent)
-					    {
-					      current = new Entry ;
-					    }
-					    else if (current->groups)
+					    if (current->groups)
 					    {
 					      current->groups->clear();
 					    }
@@ -3764,8 +3752,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					    current->args += ")";
   					  current->name       = current->name.stripWhiteSpace();
 					  current->section    = Entry::VARIABLE_SEC;
-					  current_root->addSubEntry(current);
-					  current             = new Entry;
+					  current_root->moveToSubEntryAndRefresh(current);
 					  initEntry();
 					  BEGIN( FindMembers );
 					}
@@ -3794,7 +3781,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   				          BEGIN( SkipString ); 
 					}
 <SkipSquare>[^\n\[\]\"]+
-<FindMembers>"<"			{ addType( current ) ;
+<FindMembers>"<"			{ addType();
 					  current->type += yytext ;
 					  BEGIN( Sharp ) ;
 					}
@@ -3847,8 +3834,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      current->args       = current->args.simplifyWhiteSpace();
 					      current->name       = current->name.stripWhiteSpace();
 					      current->section    = Entry::VARIABLE_SEC;
-					      current_root->addSubEntry(current);
-					      current             = new Entry ;
+					      current_root->moveToSubEntryAndRefresh(current);
 					      initEntry();
 					    }
 
@@ -3880,17 +3866,17 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					    current->name       = current->name.stripWhiteSpace();
 					    current->section    = Entry::VARIABLE_SEC;
 					    // add to the scope of the enum
-					    current_root->addSubEntry(current);
 					    if (!insideCS && !insideJava &&
                                                 !(current_root->spec&Entry::Strong)) 
                                                 // for C# and Java 1.5+ enum values always have to be explicitly qualified,
                                                 // same for C++11 style enums (enum class Name {})
 					    {
-					      current             = new Entry(*current);
 					      // add to the scope surrounding the enum (copy!)
-					      current_root->parent()->addSubEntry(current);
+                                              // we cannot during it directly as that would invalidate the iterator in parseCompounds.
+                                              //printf("*** adding outer scope entry for %s\n",current->name.data());
+                                              g_outerScopeEntries.emplace_back(current_root->parent(), std::make_unique<Entry>(*current));
 					    }
-					    current             = new Entry ;
+					    current_root->moveToSubEntryAndRefresh(current);
 					    initEntry();
 					  }
 					  else // probably a redundant , 
@@ -3985,13 +3971,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
 					    current->endBodyLine = yyLineNr;
-                        Entry * original_root = current_root; // save root this namespace is in
+                                            Entry * original_root = current_root; // save root this namespace is in
                                             if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace")
                                             {
                                               int split_point;
                                               while ((split_point = current->name.find("::")) != -1)
                                               {
-                                                Entry *new_current = new Entry(*current);
+                                                std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*current);
                                                 current->program = "";
                                                 new_current->doc = "";
                                                 new_current->docLine = 0;
@@ -4003,9 +3989,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                                 current->name  = current->name.left(split_point);
                                                 if (!current_root->name.isEmpty()) current->name.prepend(current_root->name+"::");
 
-                                                current_root->addSubEntry(current);
-                                                current_root = current;
-                                                current = new_current;
+                                                Entry *tmp = current.get();
+                                                current_root->moveToSubEntryAndKeep(current);
+                                                current_root = tmp;
+                                                current.swap(new_current);
                                               }
                                             }
 					    QCString &cn = current->name;
@@ -4040,17 +4027,16 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      }
 					      else
 					      {
-					        current_root->addSubEntry( current ) ;
-					        memspecEntry = current;
-						current = new Entry(*current);
-						if (current->section==Entry::NAMESPACE_SEC || 
+					        memspecEntry = current.get();
+					        current_root->copyToSubEntry( current ) ;
+						if (current->section==Entry::NAMESPACE_SEC ||
 						    (current->spec==Entry::Interface) ||
 						    insideJava || insidePHP || insideCS || insideD || insideJS ||
                                                     insideSlice
 						   )
 						{ // namespaces and interfaces and java classes ends with a closing bracket without semicolon
-						  current->reset();
-                          current_root = original_root; // restore scope from before namespace descent
+                                                  current->reset();
+                                                  current_root = original_root; // restore scope from before namespace descent
 						  initEntry();
 						  memspecEntry = 0;
 						  BEGIN( FindMembers ) ;
@@ -4105,12 +4091,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  current->args = current->args.simplifyWhiteSpace();
   					  current->type = current->type.simplifyWhiteSpace();
 					  //printf("Adding compound %s %s %s\n",current->type.data(),current->name.data(),current->args.data());
-					  current_root->addSubEntry( current ) ;
 					  if (!firstTypedefEntry)
 					  {
-					    firstTypedefEntry = current;
+					    firstTypedefEntry = current.get();
 					  }
-					  current = new Entry;
+					  current_root->moveToSubEntryAndRefresh( current ) ;
 					  initEntry();
 					  isTypedef=TRUE; // to undo reset by initEntry()
   					  BEGIN(MemberSpecSkip); 
@@ -4124,9 +4109,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  // add compound definition to the tree
   					  current->args = current->args.simplifyWhiteSpace();
   					  current->type = current->type.simplifyWhiteSpace();
-					  current_root->addSubEntry( current ) ;
-					  memspecEntry = current;
-					  current = new Entry(*current);
+					  memspecEntry = current.get();
+					  current_root->moveToSubEntryAndRefresh( current ) ;
 					  initEntry();
 					  unput(';');
 					  BEGIN( MemberSpec ) ;
@@ -4166,7 +4150,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <MemberSpec>"("				{ // function with struct return type
-  					  addType(current);
+  					  addType();
   					  current->name = msName;
 					  current->spec = 0;
   					  unput('(');
@@ -4179,7 +4163,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    // anonymous compound. If so we insert a 
 					    // special 'anonymous' variable.
 					    //Entry *p=current_root;
-					    Entry *p=current;
+					    const Entry *p=current.get();
 					    while (p)
 					    {
 					      // only look for class scopes, not namespace scopes
@@ -4197,7 +4181,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 						}
 					      }
 					      //p=p->parent;
-					      if (p==current) p=current_root; else p=p->parent();
+					      if (p==current.get()) p=current_root; else p=p->parent();
 					    }
 					  }
 					  //printf("msName=%s current->name=%s\n",msName.data(),current->name.data());
@@ -4218,7 +4202,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    }
 					    else // case 2: create a typedef field
 					    {
-					      Entry *varEntry=new Entry;
+                                              std::unique_ptr<Entry> varEntry=std::make_unique<Entry>();
 					      varEntry->lang = language;
 					      varEntry->protection = current->protection ;
 					      varEntry->mtype = current->mtype;
@@ -4273,7 +4257,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n",
 					      //      varEntry->type.data(),varEntry->name.data(),
 					      //      varEntry->args.data(),varEntry->brief.data(),varEntry->doc.data());
-					      current_root->addSubEntry(varEntry);
+					      current_root->moveToSubEntryAndKeep(varEntry);
 					    }
 					  }
 					  if (*yytext==';') // end of a struct/class ...
@@ -4327,8 +4311,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  lineCount() ;
 					}
 <ReadBodyIntf>"@end"/[^a-z_A-Z0-9]	{ // end of Objective C block
-					  current_root->addSubEntry( current ) ;
-  					  current=new Entry;
+					  current_root->moveToSubEntryAndRefresh( current ) ;
 					  initEntry();
 					  language = current->lang = SrcLangExt_Cpp; // see bug746361
 					  insideObjC=FALSE;
@@ -4346,7 +4329,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    current->bodyLine = yyLineNr;
 					    lineCount();
-					    addType(current);
+					    addType();
 					    funcPtrType=yytext;
 					    roundCount=0;
 					    //current->type += yytext;
@@ -4491,7 +4474,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <GetCallType>{BN}*{ID}{BN}*"*"		{
   					  lineCount();
-  					  addType(current);
+  					  addType();
 					  funcPtrType="(";
 					  funcPtrType+=yytext;
 					  roundCount=0;
@@ -5223,9 +5206,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      findAndRemoveWord(current->type,"function");
 					    }
-					    previous = current;
-					    current_root->addSubEntry(current);
-					    current = new Entry ;
+					    previous = current.get();
+					    current_root->moveToSubEntryAndRefresh(current);
 					    initEntry();
 					    // Objective C 2.0: Required/Optional section
 					    if (previous->spec & (Entry::Optional | Entry::Required))
@@ -5324,8 +5306,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    current->endBodyLine=yyLineNr;
 
-					    tempEntry = current; // temporarily switch to the previous entry
-					    current = previous;
+					    current.swap(tempEntry); // remember current
+					    current.reset(previous); // and temporarily switch to the previous entry
 					    previous = 0;
 
 					    docBlockContext   = SkipCurlyEndDoc;
@@ -5368,8 +5350,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   				          //addToBody("}");
                                           if (tempEntry) // we can only switch back to current if no new item was created
 					  {
-					    current = tempEntry;
-					    tempEntry = 0;
+					    tempEntry.swap(current);
+					    tempEntry.reset();
 					  }
   					  BEGIN( lastCurlyContext );
   					}
@@ -5516,8 +5498,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					        new BaseInfo(baseName,Public,Normal));
 					      baseName.resize(0);
 					    }
-					    current_root->addSubEntry( current ) ;
-					    current = new Entry;
+					    current_root->moveToSubEntryAndRefresh( current ) ;
+                                            initEntry();
 					  }
 					  else
 					  {
@@ -5615,8 +5597,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      prependScope();
 					    }
                                             current->spec|=Entry::ForwardDecl;
-                                            current_root->addSubEntry(current);
-                                            current = new Entry;
+                                            current_root->moveToSubEntryAndRefresh(current);
                                           }
 					  else if (insideIDL &&
 					           (((current_root->spec & (Entry::Interface |
@@ -5637,8 +5618,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					        : Entry::INCLUDED_SERVICE_SEC;
 //					    current->section = Entry::MEMBERDOC_SEC;
 					    current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
-					    current_root->addSubEntry(current);
-					    current = new Entry;
+					    current_root->moveToSubEntryAndRefresh(current);
 					  }
 
     					  unput(';');
@@ -5722,7 +5702,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-  					    addType(current);
+  					    addType();
 					    current->name = yytext;
 					    current->name = current->name.stripWhiteSpace();
 					    lineCount();
@@ -6546,8 +6526,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
 <SliceSequenceName>";"                  {
                                           current->section = Entry::VARIABLE_SEC;
-                                          current_root->addSubEntry(current);
-                                          current = new Entry;
+                                          current_root->moveToSubEntryAndRefresh(current);
                                           initEntry();
                                           BEGIN(FindMembers);
                                         }
@@ -6577,8 +6556,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
 <SliceDictionaryName>";"                {
                                           current->section = Entry::VARIABLE_SEC;
-                                          current_root->addSubEntry(current);
-                                          current = new Entry;
+                                          current_root->moveToSubEntryAndRefresh(current);
                                           initEntry();
                                           BEGIN(FindMembers);
                                         }
@@ -7009,11 +6987,15 @@ static void newEntry()
                     // already added to current_root, so we should not add it again 
                     // (see bug723314)
   {
-    current_root->addSubEntry(current);
+    previous = current.get();
+    current_root->moveToSubEntryAndRefresh(current);
+  }
+  else
+  {
+    previous = current.get();
+    tempEntry.swap(current);
+    tempEntry.reset();
   }
-  tempEntry = 0;
-  previous = current;
-  current = new Entry ;
   initEntry();
 }
 
@@ -7025,7 +7007,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   int lineNr = brief ? current->briefLine : current->docLine;   // line of block start
 
   // fill in inbodyFile && inbodyLine the first time, see bug 633891
-  Entry *docEntry = docBlockInBody && previous ? previous : current;
+  Entry *docEntry = docBlockInBody && previous ? previous : current.get();
   if (docBlockInBody && docEntry && docEntry->inbodyLine==-1)
   {
     docEntry->inbodyFile = yyFileName;
@@ -7037,7 +7019,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   QCString processedDoc = preprocessCommentBlock(stripIndentation(doc),yyFileName,lineNr);
   while (parseCommentBlock(
 	g_thisParser,
-	docBlockInBody && previous ? previous : current,
+	docBlockInBody && previous ? previous : current.get(),
 	processedDoc, // text
 	yyFileName,   // file
 	lineNr,       // line of block start
@@ -7097,7 +7079,7 @@ static void handleParametersCommentBlocks(ArgumentList *al)
       //printf("handleParametersCommentBlock [%s]\n",doc.data());
       while (parseCommentBlock(
 	     g_thisParser,
-	     current,
+	     current.get(),
 	     a->docs,            // text
 	     yyFileName,         // file
 	     current->docLine,   // line of block start
@@ -7131,12 +7113,10 @@ static void handleParametersCommentBlocks(ArgumentList *al)
 
 //----------------------------------------------------------------------------
 
-static void parseCompounds(Entry *rt)
+static void parseCompounds(const std::unique_ptr<Entry> &rt)
 {
   //printf("parseCompounds(%s)\n",rt->name.data());
-  EntryListIterator eli(*rt->children());
-  Entry *ce;
-  for (;(ce=eli.current());++eli)
+  for (const auto &ce : rt->children())
   {
     if (!ce->program.isEmpty())
     {
@@ -7153,16 +7133,14 @@ static void parseCompounds(Entry *rt)
 	BEGIN( FindFields ) ;
       else
 	BEGIN( FindMembers ) ;
-      current_root = ce ;
+      current_root = ce.get() ;
       yyFileName = ce->fileName;
       //setContext();
       yyLineNr = ce->startLine ;
       yyColNr = ce->startColumn ;
       insideObjC = ce->lang==SrcLangExt_ObjC;
       //printf("---> Inner block starts at line %d objC=%d\n",yyLineNr,insideObjC);
-      //current->reset();
-      if (current) delete current;
-      current = new Entry;
+      current = std::make_unique<Entry>();
       gstat = FALSE;
       initEntry();
 
@@ -7229,15 +7207,15 @@ static void parseCompounds(Entry *rt)
       //memberGroupId = DOX_NOGROUP;
       //memberGroupRelates.resize(0);
       //memberGroupInside.resize(0);
-      Doxygen::docGroup.enterCompound(yyFileName,yyLineNr,ce->name);
+      QCString name = ce->name;
+      Doxygen::docGroup.enterCompound(yyFileName,yyLineNr,name);
       
       scannerYYlex() ;
       g_lexInit=TRUE;
       //forceEndGroup();
 
-      Doxygen::docGroup.leaveCompound(yyFileName,yyLineNr,ce->name);
+      Doxygen::docGroup.leaveCompound(yyFileName,yyLineNr,name);
       
-      delete current; current=0;
       ce->program.resize(0);
 
 
@@ -7254,7 +7232,7 @@ static void parseCompounds(Entry *rt)
 
 static void parseMain(const char *fileName,
                       const char *fileBuf,
-                      Entry *rt,
+                      const std::unique_ptr<Entry> &rt,
                       bool sameTranslationUnit,
                       QStrList & filesInSameTranslationUnit)
 {
@@ -7270,8 +7248,8 @@ static void parseMain(const char *fileName,
   mtype         = Method;
   gstat         = FALSE;
   virt          = Normal;
-  current_root  = rt;
-  global_root   = rt;
+  current_root  = rt.get();
+  global_root   = rt.get();
   inputFile.setName(fileName);
   if (inputFile.open(IO_ReadOnly))
   {
@@ -7293,18 +7271,17 @@ static void parseMain(const char *fileName,
     rt->lang = language;
     msg("Parsing file %s...\n",yyFileName.data());
 
-    current_root  = rt ;
+    current_root  = rt.get() ;
     initParser();
     Doxygen::docGroup.enterFile(yyFileName,yyLineNr);
-    current       = new Entry;
+    current = std::make_unique<Entry>();
     //printf("current=%p current_root=%p\n",current,current_root);
     int sec=guessSection(yyFileName);
     if (sec)
     {
       current->name    = yyFileName;
       current->section = sec;
-      current_root->addSubEntry(current);
-      current          = new Entry;
+      current_root->moveToSubEntryAndRefresh(current);
     }
     current->reset();
     initEntry();
@@ -7329,18 +7306,7 @@ static void parseMain(const char *fileName,
     //forceEndGroup();
     Doxygen::docGroup.leaveFile(yyFileName,yyLineNr);
 
-    //if (depthIf>0)
-    //{
-    //  warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
-    //}
-
     rt->program.resize(0);
-    if (rt->children()->contains(current)==0) 
-      // it could be that current is already added as a child to rt, so we
-      // only delete it if this is not the case. See bug 635317.
-    {
-      delete current; current=0;
-    }
 
     parseCompounds(rt);
 
@@ -7348,6 +7314,14 @@ static void parseMain(const char *fileName,
 
     anonNSCount++;
 
+    // add additional entries that were created during processing
+    for (auto &kv: g_outerScopeEntries)
+    {
+      //printf(">>> adding '%s' to scope '%s'\n",kv.second->name.data(),kv.first->name.data());
+      kv.first->moveToSubEntryAndKeep(kv.second);
+    }
+    g_outerScopeEntries.clear();
+
   }
 }
 
@@ -7396,6 +7370,7 @@ static void parsePrototype(const QCString &text)
   inputString = orgInputString; 
   inputPosition = orgInputPosition;
 
+
   //printf("**** parsePrototype end\n");
 }
 
@@ -7438,7 +7413,7 @@ void CLanguageScanner::finishTranslationUnit()
 
 void CLanguageScanner::parseInput(const char *fileName,
                                   const char *fileBuf,
-                                  Entry *root,
+                                  const std::unique_ptr<Entry> &root,
                                   bool sameTranslationUnit,
                                   QStrList & filesInSameTranslationUnit)
 {
diff --git a/src/sqlscanner.h b/src/sqlscanner.h
index 3ca6fe3..b981b5b 100644
--- a/src/sqlscanner.h
+++ b/src/sqlscanner.h
@@ -28,7 +28,7 @@ public:
     virtual ~SQLScanner() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
-    void parseInput(const char *, const char *, Entry *, bool , QStrList &) {}
+    void parseInput(const char *, const char *, const std::unique_ptr<Entry> &, bool , QStrList &) {}
     bool needsPreprocessing(const QCString &) { return FALSE; }
 
     void parseCode(CodeOutputInterface &codeOutIntf,
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 56dbe7d..18f6161 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -21,6 +21,8 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <algorithm>
+
 
 #include <qxml.h>
 #include <qstack.h>
@@ -912,12 +914,12 @@ class TagFileParser : public QXmlDefaultHandler
     }
 
     void dump();
-    void buildLists(Entry *root);
+    void buildLists(const std::unique_ptr<Entry> &root);
     void addIncludes();
     
   private:
-    void buildMemberList(Entry *ce,QList<TagMemberInfo> &members);
-    void addDocAnchors(Entry *e,const TagAnchorInfoList &l);
+    void buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMemberInfo> &members);
+    void addDocAnchors(const std::unique_ptr<Entry> &e,const TagAnchorInfoList &l);
     QList<TagClassInfo>        m_tagFileClasses;
     QList<TagFileInfo>         m_tagFileFiles;
     QList<TagNamespaceInfo>    m_tagFileNamespaces;
@@ -1147,7 +1149,7 @@ void TagFileParser::dump()
   }
 }
 
-void TagFileParser::addDocAnchors(Entry *e,const TagAnchorInfoList &l)
+void TagFileParser::addDocAnchors(const std::unique_ptr<Entry> &e,const TagAnchorInfoList &l)
 {
   QListIterator<TagAnchorInfo> tli(l);
   TagAnchorInfo *ta;
@@ -1169,13 +1171,13 @@ void TagFileParser::addDocAnchors(Entry *e,const TagAnchorInfoList &l)
   }
 }
 
-void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
+void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMemberInfo> &members)
 {
   QListIterator<TagMemberInfo> mii(members);
   TagMemberInfo *tmi;
   for (;(tmi=mii.current());++mii)
   {
-    Entry *me      = new Entry;
+    std::unique_ptr<Entry> me = std::make_unique<Entry>();
     me->type       = tmi->type;
     me->name       = tmi->name;
     me->args       = tmi->arglist;
@@ -1192,7 +1194,7 @@ void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
       TagEnumValueInfo *evi;
       for (evii.toFirst();(evi=evii.current());++evii)
       {
-        Entry *ev      = new Entry;
+        std::unique_ptr<Entry> ev = std::make_unique<Entry>();
         ev->type       = "@";
         ev->name       = evi->name;
         ev->id         = evi->clangid;
@@ -1202,7 +1204,7 @@ void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
         ti->anchor     = evi->anchor;
         ti->fileName   = evi->file;
         ev->tagInfo    = ti;
-        me->addSubEntry(ev);
+        me->moveToSubEntryAndKeep(ev);
       }
     }
     me->protection = tmi->prot;
@@ -1287,7 +1289,7 @@ void TagFileParser::buildMemberList(Entry *ce,QList<TagMemberInfo> &members)
       me->section = Entry::FUNCTION_SEC;
       me->mtype = Slot;
     }
-    ce->addSubEntry(me);
+    ce->moveToSubEntryAndKeep(me);
   }
 }
 
@@ -1308,14 +1310,14 @@ static QCString stripPath(const QCString &s)
  *  This tree contains the information extracted from the input in a 
  *  "unrelated" form.
  */
-void TagFileParser::buildLists(Entry *root)
+void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
 {
   // build class list
   QListIterator<TagClassInfo> cit(m_tagFileClasses);
   TagClassInfo *tci;
   for (cit.toFirst();(tci=cit.current());++cit)
   {
-    Entry *ce = new Entry;
+    std::unique_ptr<Entry> ce = std::make_unique<Entry>();
     ce->section = Entry::CLASS_SEC;
     switch (tci->kind)
     {
@@ -1374,7 +1376,7 @@ void TagFileParser::buildLists(Entry *root)
     }
 
     buildMemberList(ce,tci->members);
-    root->addSubEntry(ce);
+    root->moveToSubEntryAndKeep(ce);
   }
 
   // build file list
@@ -1382,7 +1384,7 @@ void TagFileParser::buildLists(Entry *root)
   TagFileInfo *tfi;
   for (fit.toFirst();(tfi=fit.current());++fit)
   {
-    Entry *fe = new Entry;
+    std::unique_ptr<Entry> fe = std::make_unique<Entry>();
     fe->section = guessSection(tfi->name);
     fe->name     = tfi->name;
     addDocAnchors(fe,tfi->docAnchors);
@@ -1390,7 +1392,7 @@ void TagFileParser::buildLists(Entry *root)
     ti->tagName  = m_tagName;
     ti->fileName = tfi->filename;
     fe->tagInfo  = ti;
-    
+
     QCString fullName = m_tagName+":"+tfi->path+stripPath(tfi->name);
     fe->fileName = fullName;
     //printf("createFileDef() filename=%s\n",tfi->filename.data());
@@ -1411,7 +1413,7 @@ void TagFileParser::buildLists(Entry *root)
       Doxygen::inputNameDict->insert(tfi->name,mn);
     }
     buildMemberList(fe,tfi->members);
-    root->addSubEntry(fe);
+    root->moveToSubEntryAndKeep(fe);
   }
 
   // build namespace list
@@ -1419,7 +1421,7 @@ void TagFileParser::buildLists(Entry *root)
   TagNamespaceInfo *tni;
   for (nit.toFirst();(tni=nit.current());++nit)
   {
-    Entry *ne    = new Entry;
+    std::unique_ptr<Entry> ne = std::make_unique<Entry>();
     ne->section  = Entry::NAMESPACE_SEC;
     ne->name     = tni->name;
     addDocAnchors(ne,tni->docAnchors);
@@ -1430,7 +1432,7 @@ void TagFileParser::buildLists(Entry *root)
     ne->tagInfo  = ti;
 
     buildMemberList(ne,tni->members);
-    root->addSubEntry(ne);
+    root->moveToSubEntryAndKeep(ne);
   }
 
   // build package list
@@ -1438,7 +1440,7 @@ void TagFileParser::buildLists(Entry *root)
   TagPackageInfo *tpgi;
   for (pit.toFirst();(tpgi=pit.current());++pit)
   {
-    Entry *pe    = new Entry;
+    std::unique_ptr<Entry> pe = std::make_unique<Entry>();
     pe->section  = Entry::PACKAGE_SEC;
     pe->name     = tpgi->name;
     addDocAnchors(pe,tpgi->docAnchors);
@@ -1448,7 +1450,7 @@ void TagFileParser::buildLists(Entry *root)
     pe->tagInfo  = ti;
 
     buildMemberList(pe,tpgi->members);
-    root->addSubEntry(pe);
+    root->moveToSubEntryAndKeep(pe);
   }
 
   // build group list
@@ -1456,7 +1458,7 @@ void TagFileParser::buildLists(Entry *root)
   TagGroupInfo *tgi;
   for (git.toFirst();(tgi=git.current());++git)
   {
-    Entry *ge    = new Entry;
+    std::unique_ptr<Entry> ge = std::make_unique<Entry>();
     ge->section  = Entry::GROUPDOC_SEC;
     ge->name     = tgi->name;
     ge->type     = tgi->title;
@@ -1467,7 +1469,7 @@ void TagFileParser::buildLists(Entry *root)
     ge->tagInfo  = ti;
 
     buildMemberList(ge,tgi->members);
-    root->addSubEntry(ge);
+    root->moveToSubEntryAndKeep(ge);
   }
 
   // set subgroup relations bug_774118
@@ -1476,13 +1478,16 @@ void TagFileParser::buildLists(Entry *root)
     QCStringList::Iterator it;
     for ( it = tgi->subgroupList.begin(); it != tgi->subgroupList.end(); ++it )
     {
-      QListIterator<Entry> eli(*(root->children()));
-      Entry *childNode;
-      for (eli.toFirst();(childNode=eli.current());++eli)
+      //QListIterator<Entry> eli(*(root->children()));
+      //Entry *childNode;
+      //for (eli.toFirst();(childNode=eli.current());++eli)
+      const auto &children = root->children();
+      auto i = std::find_if(children.begin(),children.end(),
+          [&](const std::unique_ptr<Entry> &e) { return e->name = *it; });
+      if (i!=children.end())
       {
-        if (childNode->name == (*it)) break;
+        (*i)->groups->append(new Grouping(tgi->name,Grouping::GROUPING_INGROUP));
       }
-      childNode->groups->append(new Grouping(tgi->name,Grouping::GROUPING_INGROUP));
     }
   }
 
@@ -1491,7 +1496,7 @@ void TagFileParser::buildLists(Entry *root)
   TagPageInfo *tpi;
   for (pgit.toFirst();(tpi=pgit.current());++pgit)
   {
-    Entry *pe    = new Entry;
+    std::unique_ptr<Entry> pe = std::make_unique<Entry>();
     pe->section  = tpi->filename=="index" ? Entry::MAINPAGEDOC_SEC : Entry::PAGEDOC_SEC;
     pe->name     = tpi->name;
     pe->args     = tpi->title;
@@ -1500,7 +1505,7 @@ void TagFileParser::buildLists(Entry *root)
     ti->tagName  = m_tagName;
     ti->fileName = tpi->filename;
     pe->tagInfo  = ti;
-    root->addSubEntry(pe);
+    root->moveToSubEntryAndKeep(pe);
   }
 }
 
@@ -1551,7 +1556,7 @@ void TagFileParser::addIncludes()
   }
 }
 
-void parseTagFile(Entry *root,const char *fullName)
+void parseTagFile(const std::unique_ptr<Entry> &root,const char *fullName)
 {
   QFileInfo fi(fullName);
   if (!fi.exists()) return;
diff --git a/src/tagreader.h b/src/tagreader.h
index 6ea2d81..4c09a04 100644
--- a/src/tagreader.h
+++ b/src/tagreader.h
@@ -21,6 +21,8 @@
 
 class Entry;
 
-void parseTagFile(Entry *root,const char *fullPathName);
+#include <memory>
+
+void parseTagFile(const std::unique_ptr<Entry> &root,const char *fullPathName);
 
 #endif
diff --git a/src/tclscanner.h b/src/tclscanner.h
index 0e56bdd..482fb1f 100644
--- a/src/tclscanner.h
+++ b/src/tclscanner.h
@@ -33,7 +33,7 @@ class TclLanguageScanner : public ParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char *fileName,
                     const char *fileBuf,
-                    Entry *root,
+                    const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension);
diff --git a/src/tclscanner.l b/src/tclscanner.l
index e763575..3b939ce 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -578,7 +578,7 @@ Entry* tcl_entry_namespace(const QCString ns)
     myEntry = tcl_entry_new();
     myEntry->section    = Entry::NAMESPACE_SEC;
     myEntry->name       = ns;
-    tcl.entry_main->addSubEntry(myEntry);
+    tcl.entry_main->moveToSubEntryAndKeep(myEntry);
     tcl.ns.insert(ns,myEntry);
   }
   return myEntry;
@@ -597,7 +597,7 @@ Entry* tcl_entry_class(const QCString cl)
     myEntry = tcl_entry_new();
     myEntry->section    = Entry::CLASS_SEC;
     myEntry->name       = cl;
-    tcl.entry_main->addSubEntry(myEntry);
+    tcl.entry_main->moveToSubEntryAndKeep(myEntry);
     tcl.cl.insert(cl,myEntry);
   }
   return myEntry;
@@ -1540,7 +1540,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
             processedDoc = preprocessCommentBlock(myDoc,tcl.file_name,myLine0);
             parseCommentBlock(tcl.this_parser, myEntry, processedDoc, tcl.file_name,
               myLine0, FALSE, tcl.config_autobrief, FALSE, myProt, myPos0, myNew);
-            tcl.entry_inside->addSubEntry(myEntry);
+            tcl.entry_inside->moveToSubEntryAndRefresh(myEntry);
           }
           else
           { // we can add to current entry in this case
@@ -1562,7 +1562,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
           processedDoc = preprocessCommentBlock(myDoc,tcl.file_name,myLine0);
           parseCommentBlock(tcl.this_parser, myEntry, processedDoc, tcl.file_name,
             myLine0, FALSE, tcl.config_autobrief, FALSE, myProt, myPos0, myNew);
-          tcl.entry_inside->addSubEntry(myEntry);
+          tcl.entry_inside->moveToSubEntryAndKeep(myEntry);
         }
         else
         { // we can add to current entry
@@ -1585,7 +1585,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
         {
           if (myNew)
           {
-            tcl.entry_inside->addSubEntry(tcl.entry_current);
+            tcl.entry_inside->moveToSubEntryAndKeep(tcl.entry_current);
             tcl.entry_current = tcl_entry_new();
           }
           else
@@ -1596,7 +1596,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
         }
         if (myNew)
         {
-          tcl.entry_inside->addSubEntry(tcl.entry_current);
+          tcl.entry_inside->moveToSubEntryAndKeep(tcl.entry_current);
           tcl.entry_current = tcl_entry_new();
         }
         else
@@ -2155,7 +2155,7 @@ D
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
   tcl_command_ARGLIST(*tcl.list_commandwords.at(4));
-  myEntryNs->addSubEntry(tcl.entry_current);
+  myEntryNs->moveToSubEntryAndKeep(tcl.entry_current);
   myEntry = tcl.entry_current;
   tcl.fn.insert(myName,myEntry);
   myScan = tcl_scan_start(tcl.word_is,*tcl.list_commandwords.at(6),
@@ -2197,7 +2197,7 @@ D
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
   tcl_command_ARGLIST(*tcl.list_commandwords.at(4));
-  myEntryCl->addSubEntry(tcl.entry_current);
+  myEntryCl->moveToSubEntryAndKeep(tcl.entry_current);
   tcl.fn.insert(myName,tcl.entry_current);
   myEntry = tcl.entry_current;
   myScan = tcl_scan_start(tcl.word_is,*tcl.list_commandwords.at(6),
@@ -2234,7 +2234,7 @@ D
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
   tcl_command_ARGLIST(*tcl.list_commandwords.at(2));
-  if (myEntryCl) myEntryCl->addSubEntry(tcl.entry_current);
+  if (myEntryCl) myEntryCl->moveToSubEntryAndKeep(tcl.entry_current);
   myEntry = tcl.entry_current;
   tcl.fn.insert(myName,myEntry);
   myScan = tcl_scan_start(tcl.word_is,*tcl.list_commandwords.at(4),
@@ -2268,7 +2268,7 @@ D
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
-  myEntryCl->addSubEntry(tcl.entry_current);
+  myEntryCl->moveToSubEntryAndKeep(tcl.entry_current);
   myEntry = tcl.entry_current;
   tcl.fn.insert(myName,myEntry);
   myScan = tcl_scan_start(tcl.word_is,*tcl.list_commandwords.at(2),
@@ -2300,7 +2300,7 @@ D
   tcl.entry_current->startLine = tcl.line_command;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
-  tcl.entry_main->addSubEntry(tcl.entry_current);
+  tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
   tcl.ns.insert(myName,tcl.entry_current);
   //myEntryNs = tcl.entry_current;
   myStr = (*tcl.list_commandwords.at(6));
@@ -2338,7 +2338,7 @@ D
   tcl.entry_current->startLine = tcl.line_command;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
-  tcl.entry_main->addSubEntry(tcl.entry_current);
+  tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
   tcl.cl.insert(myName,tcl.entry_current);
   myEntryCl = tcl.entry_current;
   myScan = tcl_scan_start(tcl.word_is,*tcl.list_commandwords.at(4),
@@ -2370,7 +2370,7 @@ D
   tcl.entry_current->startLine = tcl.line_command;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
-  tcl.entry_main->addSubEntry(tcl.entry_current);
+  tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
   //myEntryNs = tcl_entry_namespace(myName);
   tcl.cl.insert(myName,tcl.entry_current);
   myEntryCl = tcl.entry_current;
@@ -2431,7 +2431,7 @@ D
     {
       tcl_command_ARGLIST(*tcl.list_commandwords.at(6));
     }
-    if (myEntryCl) myEntryCl->addSubEntry(tcl.entry_current);
+    if (myEntryCl) myEntryCl->moveToSubEntryAndKeep(tcl.entry_current);
     tcl.fn.insert(myMethod,tcl.entry_current);
     myEntry = tcl.entry_current;
     myScan = tcl_scan_start('?',*tcl.list_commandwords.at(n-1),
@@ -2493,7 +2493,7 @@ D
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
-  myEntry->addSubEntry(tcl.entry_current);
+  myEntry->moveToSubEntryAndKeep(tcl.entry_current);
   tcl.entry_current = tcl_entry_new();
 }
 
@@ -2911,10 +2911,10 @@ static void tcl_parse(const QCString ns, const QCString cls)
   tcl.entry_file->name    = tcl.file_name;
   tcl.entry_file->section = Entry::SOURCE_SEC;
   tcl.entry_file->protection = Public;
-  tcl.entry_main->addSubEntry(tcl.entry_file);
+  tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_file);
   Entry *myEntry=tcl_entry_new();
   myEntry->name="";
-  tcl.entry_main->addSubEntry(myEntry);
+  tcl.entry_main->moveToSubEntryAndKeep(myEntry);
   tcl.ns.insert("::",myEntry);
   tcl.entry_current = tcl_entry_new();
 
@@ -2944,7 +2944,7 @@ static void tcl_parse(const QCString ns, const QCString cls)
 //! Parse text file and build up entry tree.
 void TclLanguageScanner::parseInput(const char *fileName,
                                     const char *input,
-                                    Entry *root,
+                                    const std::unique_ptr<Entry> &root,
                                     bool /*sameTranslationUnit*/,
                                     QStrList & /*filesInSameTranslationUnit*/)
 {
@@ -2965,7 +2965,7 @@ tcl_inf("%s\n",fileName);
   tcl.code = NULL;
   tcl.file_name = fileName;
   tcl.this_parser = this;
-  tcl.entry_main          = root; /* toplevel entry */
+  tcl.entry_main          = root.get(); /* toplevel entry */
   tcl_parse("","");
   Doxygen::docGroup.leaveFile(tcl.file_name,yylineno);
   root->program.resize(0);
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 38a80ef..fca010e 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -71,7 +71,8 @@ static QDict<QCString> g_vhdlKeyDict3(17,FALSE);
 static void initUCF(Entry* root,const char* type,QCString &  qcs,int line,QCString & fileName,QCString & brief);
 static void writeUCFLink(const MemberDef* mdef,OutputList &ol);
 static void assignBinding(VhdlConfNode* conf);
-static void addInstance(ClassDef* entity, ClassDef* arch, ClassDef *inst,Entry *cur,ClassDef* archBind=NULL);
+static void addInstance(ClassDef* entity, ClassDef* arch, ClassDef *inst,
+                        const std::unique_ptr<Entry> &cur);
 
 //---------- create svg -------------------------------------------------------------
 static void createSVG();
@@ -2577,7 +2578,7 @@ static void initUCF(Entry* root,const char*  type,QCString &  qcs,int line,QCStr
 
   qcs.stripPrefix("=");
 
-  Entry* current=new Entry;
+  std::unique_ptr<Entry> current = std::make_unique<Entry>();
   current->spec=VhdlDocGen::UCF_CONST;
   current->section=Entry::VARIABLE_SEC;
   current->bodyLine=line;
@@ -2604,7 +2605,7 @@ static void initUCF(Entry* root,const char*  type,QCString &  qcs,int line,QCStr
     brief.resize(0);
   }
 
-  root->addSubEntry(current);
+  root->moveToSubEntryAndKeep(current);
 }
 
 
@@ -2761,9 +2762,6 @@ QCString  VhdlDocGen::parseForBinding(QCString & entity,QCString & arch)
 
 void assignBinding(VhdlConfNode * conf)
 {
-  QList<Entry> instList=getVhdlInstList();
-  QListIterator<Entry> eli(instList);
-  Entry *cur=0;
   ClassDef *archClass=0,*entClass=0;
   QCString archName;
   QCString arcBind,entBind;
@@ -2826,7 +2824,7 @@ void assignBinding(VhdlConfNode * conf)
   all=allOt.lower()=="all" ;
   others= allOt.lower()=="others";
 
-  for (;(cur=eli.current());++eli)
+  for (const auto &cur : getVhdlInstList())
   {
     if (cur->exception.lower()==label || conf->isInlineConf)
     {
@@ -2909,11 +2907,7 @@ void VhdlDocGen::computeVhdlComponentRelations()
     assignBinding(conf);
   }
 
-  QList<Entry> qsl= getVhdlInstList();
-  QListIterator<Entry> eli(qsl);
-  Entry *cur;
-
-  for (eli.toFirst();(cur=eli.current());++eli)
+  for (const auto &cur : getVhdlInstList())
   {
     if (cur->stat ) //  was bind
     {
@@ -2949,7 +2943,7 @@ void VhdlDocGen::computeVhdlComponentRelations()
 }
 
 static void addInstance(ClassDef* classEntity, ClassDef* ar,
-                        ClassDef *cd , Entry *cur,ClassDef* /*archBind*/)
+                        ClassDef *cd , const std::unique_ptr<Entry> &cur)
 {
 
   QCString bName,n1;
@@ -3185,10 +3179,10 @@ void VhdlDocGen::createFlowChart(const MemberDef *mdef)
 
   VHDLLanguageScanner *pIntf =(VHDLLanguageScanner*) Doxygen::parserManager->getParser(".vhd");
   VhdlDocGen::setFlowMember(mdef);
-  Entry root;
+  std::unique_ptr<Entry> root = std::make_unique<Entry>();
   QStrList filesInSameTu;
   pIntf->startTranslationUnit("");
-  pIntf->parseInput("",codeFragment.data(),&root,FALSE,filesInSameTu);
+  pIntf->parseInput("",codeFragment.data(),root,FALSE,filesInSameTu);
   pIntf->finishTranslationUnit();
 }
 
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index aeed048..9a817dc 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -48,16 +48,16 @@ static Entry* oldEntry;
 static bool varr=FALSE;
 static QCString varName;
 
-static QList<Entry> instFiles;
-static QList<Entry> libUse;
-static QList<Entry> lineEntry;
+static std::vector< std::unique_ptr<Entry> > instFiles;
+static std::vector< std::unique_ptr<Entry> > libUse;
+static std::vector<Entry*> lineEntry;
 
 Entry*   VhdlParser::currentCompound=0;
 Entry*   VhdlParser::tempEntry=0;
 Entry*   VhdlParser::lastEntity=0  ;
 Entry*   VhdlParser::lastCompound=0  ;
-Entry*   VhdlParser::current=0;
 Entry*   VhdlParser::current_root  = 0;
+std::unique_ptr<Entry> VhdlParser::current=0;
 QCString VhdlParser::compSpec;
 QCString VhdlParser::currName;
 QCString VhdlParser::confName;
@@ -84,13 +84,13 @@ static QCString strComment;
 static int iCodeLen;
 static const char *vhdlFileName = 0;
 
-bool  checkMultiComment(QCString& qcs,int line);
-QList<Entry>* getEntryAtLine(const Entry* ce,int line);
+static bool checkMultiComment(QCString& qcs,int line);
+static void insertEntryAtLine(const Entry* ce,int line);
 
 //-------------------------------------
 
-QList<VhdlConfNode>& getVhdlConfiguration() { return  configL; }
-QList<Entry>& getVhdlInstList() { return  instFiles; }
+const QList<VhdlConfNode>& getVhdlConfiguration() { return  configL; }
+const std::vector<std::unique_ptr<Entry> > &getVhdlInstList() { return  instFiles; }
 
 Entry* getVhdlCompound()
 {
@@ -105,8 +105,8 @@ bool isConstraintFile(const QCString &fileName,const QCString &ext)
 }
 
 
-void VHDLLanguageScanner::parseInput(const char *fileName,const char *fileBuf,Entry *root,
-                          bool ,QStrList&)
+void VHDLLanguageScanner::parseInput(const char *fileName,const char *fileBuf,
+                          const std::unique_ptr<Entry> &root, bool ,QStrList&)
 {
   g_thisParser=this;
   bool inLine=false;
@@ -128,34 +128,32 @@ void VHDLLanguageScanner::parseInput(const char *fileName,const char *fileBuf,En
 
   if (xilinx_ucf)
   {
-    VhdlDocGen::parseUCF(fileBuf,root,yyFileName,FALSE);
+    VhdlDocGen::parseUCF(fileBuf,root.get(),yyFileName,FALSE);
     return;
   }
   if (altera_qsf)
   {
-    VhdlDocGen::parseUCF(fileBuf,root,yyFileName,TRUE);
+    VhdlDocGen::parseUCF(fileBuf,root.get(),yyFileName,TRUE);
     return;
   }
-  libUse.setAutoDelete(true);
   yyLineNr=1;
-  VhdlParser::current_root=root;
+  VhdlParser::current_root=root.get();
   VhdlParser::lastCompound=0;
   VhdlParser::lastEntity=0;
   VhdlParser::currentCompound=0;
   VhdlParser::lastEntity=0;
   oldEntry = 0;
-  VhdlParser::current=new Entry();
-  VhdlParser::initEntry(VhdlParser::current);
+  VhdlParser::current=std::make_unique<Entry>();
+  VhdlParser::initEntry(VhdlParser::current.get());
   Doxygen::docGroup.enterFile(fileName,yyLineNr);
   vhdlFileName = fileName;
   lineParse=new int[200]; // Dimitri: dangerous constant: should be bigger than largest token id in VhdlParserConstants.h
   VhdlParserIF::parseVhdlfile(fileBuf,inLine);
 
-  delete VhdlParser::current;
-  VhdlParser::current=0;
+  VhdlParser::current.reset();
 
   if (!inLine)
-  VhdlParser::mapLibPackage(root);
+  VhdlParser::mapLibPackage(root.get());
 
   delete[] lineParse;
   yyFileName.resize(0);
@@ -198,34 +196,33 @@ void VhdlParser::initEntry(Entry *e)
 
 void VhdlParser::newEntry()
 {
+  previous = current.get();
   if (current->spec==VhdlDocGen::ENTITY ||
       current->spec==VhdlDocGen::PACKAGE ||
       current->spec==VhdlDocGen::ARCHITECTURE ||
       current->spec==VhdlDocGen::PACKAGE_BODY)
   {
-    current_root->addSubEntry(current);
+    current_root->moveToSubEntryAndRefresh(current);
   }
   else
   {
     if (lastCompound)
     {
-      lastCompound->addSubEntry(current);
+      lastCompound->moveToSubEntryAndRefresh(current);
     }
     else
     {
       if (lastEntity)
       {
-	lastEntity->addSubEntry(current);
+	lastEntity->moveToSubEntryAndRefresh(current);
       }
       else
       {
-	current_root->addSubEntry(current);
+	current_root->moveToSubEntryAndRefresh(current);
       }
     }
   }
-  previous = current;
-  current = new Entry ;
-  initEntry(current);
+  initEntry(current.get());
 }
 
 void VhdlParser::handleFlowComment(const char* doc)
@@ -259,7 +256,7 @@ void VhdlParser::handleCommentBlock(const char* doc1,bool brief)
 
   Protection protection=Public;
 
-  if (oldEntry==current)
+  if (oldEntry==current.get())
   {
     //printf("\n find pending message  < %s > at line: %d \n ",doc.data(),iDocLine);
     str_doc.doc=doc;
@@ -269,7 +266,7 @@ void VhdlParser::handleCommentBlock(const char* doc1,bool brief)
     return;
   }
 
-  oldEntry=current;
+  oldEntry=current.get();
 
   if (brief)
   {
@@ -293,7 +290,7 @@ void VhdlParser::handleCommentBlock(const char* doc1,bool brief)
   QCString processedDoc = preprocessCommentBlock(doc,yyFileName,iDocLine);
   while (parseCommentBlock(
         g_thisParser,
-        current,
+        current.get(),
         processedDoc, // text
         yyFileName, // file
         iDocLine,   // line of block start
@@ -357,13 +354,11 @@ void VhdlParser::addCompInst(const char *n, const char* instName, const char* co
     current->args=lastCompound->name;
     if (true) // !findInstant(current->type))
     {
-      initEntry(current);
-      instFiles.append(new Entry(*current));
+      initEntry(current.get());
+      instFiles.emplace_back(std::make_unique<Entry>(*current));
     }
 
-    Entry *temp=current;  // hold  current pointer  (temp=oldEntry)
-    current=new Entry;     // (oldEntry != current)
-    delete  temp;
+    current=std::make_unique<Entry>();
   }
   else
   {
@@ -401,7 +396,7 @@ void VhdlParser::addVhdlType(const char *n,int startLine,int section,
 
     if (!lastCompound && (section==Entry::VARIABLE_SEC) &&  (spec == VhdlDocGen::USE || spec == VhdlDocGen::LIBRARY) )
     {
-      libUse.append(new Entry(*current));
+      libUse.emplace_back(std::make_unique<Entry>(*current));
       current->reset();
     }
     newEntry();
@@ -590,31 +585,30 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
  */
 void VhdlParser::mapLibPackage( Entry* root)
 {
-  QList<Entry> epp=libUse;
-  EntryListIterator eli(epp);
-  Entry *rt;
-  for (;(rt=eli.current());++eli)
+  //QList<Entry> epp=libUse;
+  //EntryListIterator eli(epp);
+  //Entry *rt;
+  //for (;(rt=eli.current());++eli)
+  for (const auto &rt : libUse)
   {
     if (addLibUseClause(rt->name))
     {
-      Entry *current;
-      EntryListIterator eLib(*root->children());
       bool bFound=FALSE;
-      for (eLib.toFirst();(current=eLib.current());++eLib)
+      for (const auto &current : root->children())
       {
-        if (VhdlDocGen::isVhdlClass(current))
+        if (VhdlDocGen::isVhdlClass(current.get()))
         {
           if (current->startLine > rt->startLine)
           {
             bFound=TRUE;
-            current->addSubEntry(new Entry(*rt));
+            current->copyToSubEntry(rt);
             break;
           }
         }
       }//for
       if (!bFound)
       {
-        root->addSubEntry(new Entry(*rt));
+        root->copyToSubEntry(rt);
       }
     } //if
   }// for
@@ -718,37 +712,34 @@ void VhdlParser::oneLineComment(QCString qcs)
 
 bool  checkMultiComment(QCString& qcs,int line)
 {
-  QList<Entry> *pTemp=getEntryAtLine(VhdlParser::current_root,line);
+  insertEntryAtLine(VhdlParser::current_root,line);
 
-  if (pTemp->isEmpty()) return false;
+  if (lineEntry.empty()) return false;
 
   VhdlDocGen::prepareComment(qcs);
-  while (!pTemp->isEmpty())
+  while (!lineEntry.empty())
   {
-    Entry *e=(Entry*)pTemp->getFirst();
+    Entry *e=lineEntry.back();
     e->briefLine=line;
     e->brief+=qcs;
 
-    pTemp->removeFirst();
+    lineEntry.pop_back();
   }
   return true;
 }
 
 // returns the vhdl parsed types at line xxx
-QList<Entry>* getEntryAtLine(const Entry* ce,int line)
+void insertEntryAtLine(const Entry* ce,int line)
 {
-  EntryListIterator eli(*ce->children());
-  Entry *rt;
-  for (;(rt=eli.current());++eli)
+  for (const auto &rt : ce->children())
   {
     if (rt->bodyLine==line)
     {
-      lineEntry.insert(0,rt);
+      lineEntry.push_back(rt.get());
     }
 
-    getEntryAtLine(rt,line);
+    insertEntryAtLine(rt.get(),line);
   }
-  return &lineEntry;
 }
 
 const char *getVhdlFileName(void)
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index fffea47..a179630 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -1,6 +1,9 @@
 #ifndef VHDLJJPARSER_H
 #define VHDLJJPARSER_H
 
+#include <vector>
+#include <memory>
+
 #include "parserintf.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,7 +48,7 @@ class VHDLLanguageScanner : public ParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char * fileName,
                     const char *fileBuf,
-                    Entry *root,
+                    const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
   
@@ -95,7 +98,7 @@ struct VhdlConfNode
 
 void vhdlscanFreeScanner();
 
-QList<VhdlConfNode>& getVhdlConfiguration();
-QList<Entry>& getVhdlInstList();
+const QList<VhdlConfNode>& getVhdlConfiguration();
+const std::vector<std::unique_ptr<Entry> >&getVhdlInstList();
 
 #endif
diff --git a/src/xmlscanner.h b/src/xmlscanner.h
index cb9792c..b54d416 100644
--- a/src/xmlscanner.h
+++ b/src/xmlscanner.h
@@ -28,7 +28,7 @@ public:
     virtual ~XMLScanner() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
-    void parseInput(const char *, const char *, Entry *, bool , QStrList &) {}
+    void parseInput(const char *, const char *, const std::unique_ptr<Entry> &, bool , QStrList &) {}
     bool needsPreprocessing(const QCString &) { return FALSE; }
 
     void parseCode(CodeOutputInterface &codeOutIntf,
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 4cf8ec0..aa0847a 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -462,7 +462,7 @@ void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) {
 QCString t=s1+"::"+s;
                   genLabels.resize(0);
                   pushLabel(genLabels,s1);
-                  lastCompound=current;
+                  lastCompound=current.get();
                   addVhdlType(t,getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
     }
     if (!hasError) {
@@ -3336,7 +3336,7 @@ void VhdlParser::entity_declaration() {QCString s;if (!hasError) {
     }
     if (!hasError) {
     
-lastEntity=current;
+lastEntity=current.get();
                 lastCompound=0;
                 addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public);
     }
@@ -4432,7 +4432,7 @@ QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;i
     }
     if (!hasError) {
     
-tmpEntry=current;
+tmpEntry=current.get();
   addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
     }
     if (!hasError) {
@@ -6680,7 +6680,7 @@ void VhdlParser::package_body() {QCString s;if (!hasError) {
     }
     if (!hasError) {
     
-lastCompound=current;
+lastCompound=current.get();
                         s.prepend("_");
                         addVhdlType(s,getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
     }
@@ -6875,15 +6875,15 @@ void VhdlParser::package_declaration() {QCString s;if (!hasError) {
     }
     if (!hasError) {
     
-lastCompound=current;
-                          Entry *clone=new Entry(*current);
+lastCompound=current.get();
+                          std::unique_ptr<Entry> clone=std::make_unique<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
                           clone->spec=VhdlDocGen::PACKAGE;
                           clone->name=s;
                           clone->startLine=getLine(PACKAGE_T);
                           clone->bodyLine=getLine(PACKAGE_T);
                           clone->protection=Package;
-                          current_root->addSubEntry(clone);
+                          current_root->moveToSubEntryAndKeep(clone);
                           addVhdlType(s,getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
     }
     if (!hasError) {
@@ -7913,7 +7913,7 @@ if(s.isEmpty())
    currName=s;
 
    current->name=currName;
-   tempEntry=current;
+   tempEntry=current.get();
    current->endBodyLine=getLine();
    currP=0;
  if(tok)
@@ -9735,7 +9735,7 @@ void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t;
       
 currP=VhdlDocGen::PROCEDURE;
               createFunction(s.data(),currP,0);
-              tempEntry=current;
+              tempEntry=current.get();
                current->startLine=getLine(PROCEDURE_T);
                current->bodyLine=getLine(PROCEDURE_T);
       }
@@ -9855,7 +9855,7 @@ currP=VhdlDocGen::FUNCTION;
      createFunction(tok->image.c_str(),currP,s.data());
      else
      createFunction(0,currP,s.data());
-      tempEntry=current;
+      tempEntry=current.get();
       current->startLine=getLine(FUNCTION_T);
       current->bodyLine=getLine(FUNCTION_T);
       }
@@ -9900,7 +9900,7 @@ param_sec=0;
       }
       if (!hasError) {
       
-tempEntry=current;
+tempEntry=current.get();
                 current->type=s;
                 newEntry();
       }
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 3e32daa..3cd383a 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -8933,7 +8933,7 @@ static Entry* current_root;
 static Entry* tempEntry;
 static Entry*  lastEntity  ;
 static Entry*  lastCompound  ;
-static Entry*  current;
+static std::unique_ptr<Entry> current;
 static QCString compSpec;
 static QCString currName;
 static int levelCounter;
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index af1bd34..6eb95b4 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -31,7 +31,7 @@ static Entry* current_root;
 static Entry* tempEntry;
 static Entry*  lastEntity  ;
 static Entry*  lastCompound  ;
-static Entry*  current;
+static std::unique_ptr<Entry> current;
 static QCString compSpec;
 static QCString currName;
 static int levelCounter;
@@ -409,7 +409,7 @@ void architecture_body() : {QCString s,s1;}
                   QCString t=s1+"::"+s;
                   genLabels.resize(0);
                   pushLabel(genLabels,s1);
-                  lastCompound=current;
+                  lastCompound=current.get();
                   addVhdlType(t,getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
     }
    try{
@@ -1012,7 +1012,7 @@ void entity_declaration() :  {QCString s;}
    // try{
     <ENTITY_T> s=identifier()  <IS_T>
              {
-                lastEntity=current;
+                lastEntity=current.get();
                 lastCompound=0;
                 addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public);
                }
@@ -1209,7 +1209,7 @@ QCString full_type_declaration() :  {Entry *tmpEntry;QCString s,s1,s2;}
 {
 <TYPE_T> s=identifier() <IS_T>
 {
-  tmpEntry=current;
+  tmpEntry=current.get();
   addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
 }
  try{
@@ -1693,7 +1693,7 @@ void package_body() :  {QCString s;}
 {
 <PACKAGE_T> <BODY_T> s=name() <IS_T>
  {
-                        lastCompound=current;
+                        lastCompound=current.get();
                         s.prepend("_");
                         addVhdlType(s,getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
                       }
@@ -1729,15 +1729,15 @@ void package_declaration():  {QCString s;}
 
  <PACKAGE_T> s=identifier() <IS_T>
                           {
-                          lastCompound=current;
-                          Entry *clone=new Entry(*current);
+                          lastCompound=current.get();
+                          std::unique_ptr<Entry> clone=std::make_unique_ptr<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
                           clone->spec=VhdlDocGen::PACKAGE;
                           clone->name=s;
                           clone->startLine=getLine(PACKAGE_T);
                           clone->bodyLine=getLine(PACKAGE_T);
                           clone->protection=Package;
-                          current_root->addSubEntry(clone);
+                          current_root->moveToSubEntryAndKeep(clone);
                           addVhdlType(s,getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
                           }
     package_declarative_part()
@@ -2292,7 +2292,7 @@ void subprogram_specification() : {QCString s;Token *tok=0;Token *t;}
  {
               currP=VhdlDocGen::PROCEDURE;
               createFunction(s.data(),currP,0);
-              tempEntry=current;
+              tempEntry=current.get();
                current->startLine=getLine(PROCEDURE_T);
                current->bodyLine=getLine(PROCEDURE_T);
 
@@ -2309,14 +2309,14 @@ void subprogram_specification() : {QCString s;Token *tok=0;Token *t;}
      createFunction(tok->image.c_str(),currP,s.data());
      else
      createFunction(0,currP,s.data());
-      tempEntry=current;
+      tempEntry=current.get();
       current->startLine=getLine(FUNCTION_T);
       current->bodyLine=getLine(FUNCTION_T);
   }
  [{ param_sec=PARAM_SEC; } <LPAREN_T> formal_parameter_list() <RPAREN_T> { param_sec=0; }]
     <RETURN_T> s=type_mark()
              {
-                tempEntry=current;
+                tempEntry=current.get();
                 current->type=s;
                 newEntry();
               }
-- 
cgit v0.12


From 148162e48b8337fafffc61e5a1b5cdf86077d6ac Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 8 Oct 2019 18:50:53 +0200
Subject: issue 7302: Parsing of template args in single-quotes is incorrect.

In case we encounter an unescaped single or double quote during specialization we search for the closing quote.
We are cionnsidering potential escape sequences in the strings as well.
---
 src/scanner.l | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/scanner.l b/src/scanner.l
index fe20543..242a106 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -751,6 +751,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 %x	GCopyCurly
 %x	SkipUnionSwitch
 %x	Specialization
+%x	SpecializationSingleQuote
+%x	SpecializationDoubleQuote
 %x	FuncPtrInit
 %x	FuncFunc
 %x	FuncFuncEnd
@@ -6145,6 +6147,19 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <Specialization>"typename"{BN}+		{ lineCount(); }
 <Specialization>"("			{ *specName += *yytext; roundCount++; }
 <Specialization>")"			{ *specName += *yytext; roundCount--; }
+
+<Specialization>"\\\\"			{ *specName += *yytext;}
+<Specialization>"\\'"			{ *specName += *yytext;}
+<Specialization>"\\\""			{ *specName += *yytext;}
+<Specialization>"'"			{ *specName += *yytext;BEGIN(SpecializationSingleQuote);}
+<Specialization>"\""			{ *specName += *yytext;BEGIN(SpecializationDoubleQuote);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\"       { *specName += *yytext;}
+<SpecializationSingleQuote>"\\'"        { *specName += *yytext;}
+<SpecializationSingleQuote>"'"          { *specName += *yytext; BEGIN(Specialization);}
+<SpecializationDoubleQuote>"\\\""       { *specName += *yytext;}
+<SpecializationDoubleQuote>"\""         { *specName += *yytext; BEGIN(Specialization);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>.          { *specName += *yytext;}
+
 <Specialization>.			{
   					  *specName += *yytext;
   					}
-- 
cgit v0.12


From f23e59f2543f592bcbc2358c1d51825ab71f88bd Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 9 Oct 2019 13:32:31 +0200
Subject: Problem with round brackets in PS output

In case we use the doxygen inheritance diagrams in doxygen (i.e. `HAVE_DOT=NO`) for a construct like (based on #7302):
```
template <char C>
struct one { };
/// The struct str_040
struct str_040 : one<'('> { };
```
this will lead to a postscript error (epstopdf) as the `(` (and analogous the `)`) have to be escaped.
---
 src/diagram.cpp |  6 +++---
 src/util.cpp    | 20 ++++++++++++++++++++
 src/util.h      |  2 ++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/diagram.cpp b/src/diagram.cpp
index 08b49ca..2dadc12 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -247,7 +247,7 @@ static void writeVectorBox(FTextStream &t,DiagramItem *di,
                            float x,float y,bool children=FALSE)
 {
   if (di->virtualness()==Virtual) t << "dashed\n";
-  t << " (" << di->label() << ") " << x << " " << y << " box\n";
+  t << " (" << convertToPSString(di->label()) << ") " << x << " " << y << " box\n";
   if (children) t << x << " " << y << " mark\n";
   if (di->virtualness()==Virtual) t << "solid\n";
 }
@@ -1297,7 +1297,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     for (;(di=rit.current());++rit)
     {
       done=di->isInList();
-      t << "(" << di->label() << ") cw\n";
+      t << "(" << convertToPSString(di->label()) << ") cw\n";
     }
   }
   QListIterator<DiagramRow> sit(*super);
@@ -1310,7 +1310,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     for (;(di=rit.current());++rit)
     {
       done=di->isInList();
-      t << "(" << di->label() << ") cw\n";
+      t << "(" << convertToPSString(di->label()) << ") cw\n";
     }
   }
 
diff --git a/src/util.cpp b/src/util.cpp
index 85536ca..e1e9fb5 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6183,6 +6183,26 @@ QCString convertToJSString(const char *s, bool applyTextDir)
   return convertCharEntitiesToUTF8(growBuf.get());
 }
 
+QCString convertToPSString(const char *s)
+{
+  static GrowBuf growBuf;
+  growBuf.clear();
+  if (s==0) return "";
+  const char *p=s;
+  char c;
+  while ((c=*p++))
+  {
+    switch (c)
+    {
+      case '(':  growBuf.addStr("\\("); break;
+      case ')': growBuf.addStr("\\)"); break;
+      default:   growBuf.addChar(c);   break;
+    }
+  }
+  growBuf.addChar(0);
+  return growBuf.get();
+}
+
 QCString convertToLaTeX(const QCString &s,bool insideTabbing,bool keepSpaces)
 {
   QGString result;
diff --git a/src/util.h b/src/util.h
index 4e6f622..cb2b957 100644
--- a/src/util.h
+++ b/src/util.h
@@ -291,6 +291,8 @@ QCString convertToDocBook(const char *s);
 
 QCString convertToJSString(const char *s, bool applyTextDir = true);
 
+QCString convertToPSString(const char *s);
+
 QCString getOverloadDocs();
 
 void addMembersToMemberGroup(/* in,out */ MemberList *ml,
-- 
cgit v0.12


From 5e8da21d56dc821f27e1c8cded754bbf2594181e Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 10 Oct 2019 11:08:39 +0200
Subject: Code highlighting.

In case we have an example like (based on issue #7302):
```
/// @file
/// Something

template <char C>
struct one { };

/// The struct single_009 the char
struct single_009 : one<'       '> { };
/// The struct single_010 the char

struct single_039 : one<'\''> { };
/// The struct single_040 the char (
struct single_040 : one<'('> { };
/// The struct single_041 the char )
struct single_041 : one<')'> { };
/// The struct single_042 the char *
struct single_042 : one<'*'> { };

struct single_058 : one<':'> { };
/// The struct single_059 the char ;
struct single_059 : one<';'> { };
/// The struct single_060 the char <
struct single_060 : one<'<'> { };
/// The struct single_061 the char =
struct single_061 : one<'='> { };
/// The struct single_062 the char >
struct single_062 : one<'>'> { };
/// The struct single_063 the char ?
struct single_063 : one<'?'> { };
```
The result is that in the code section there are no links to the structs 41, 61, 62 as the `(` and `<` block it till the corresponding `)` and `>` is found.
Analogous problem for the double quote version.
---
 src/code.l | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/code.l b/src/code.l
index 9428432..35efcd9 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2357,6 +2357,12 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  g_code->codify(yytext);
 					  g_insideProtocolList=FALSE;
   					}
+<SkipSharp>"\""((\\0[Xx0-9]+)|(\\.)|(.))*"\""	{
+  					  g_code->codify(yytext);
+  					}
+<SkipSharp>"'"((\\0[Xx0-9]+)|(\\.)|(.))"'"	{
+  					  g_code->codify(yytext);
+  					}
 <SkipSharp>"<"                          {
   					  g_code->codify(yytext);
   					  ++g_sharpCount; 
-- 
cgit v0.12


From 44695af0c77cff4099bc8a53c5f3270cc6a6e33c Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 10 Oct 2019 15:47:58 +0200
Subject: Also span entire line in case of a memTemplItemRight

Based on the CGAL issue https://github.com/CGAL/cgal/issues/2095 (and pull request https://github.com/CGAL/cgal/pull/4282) to see to it that all relevant table span the page.
---
 templates/html/doxygen.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 09b7aad..ffba793 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -535,7 +535,7 @@ table.memberdecls {
         white-space: nowrap;
 }
 
-.memItemRight {
+.memItemRight, .memTemplItemRight {
 	width: 100%;
 }
 
-- 
cgit v0.12


From 78b5c447d516d64237f73e08a7ba2ad488201aa7 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 10 Oct 2019 16:17:36 +0200
Subject: Properly close quotes in warning

Found warning like:
```
Possible candidates:
  'template < T >
  gmic::gmic(const T &pixel_type=(T) 0)
  'template < T >
  gmic::gmic(const char *const commands_line, const char *const custom_commands=0, const bool include_stdlib=true, float *const p_progress=0, bool *const p_is_abort=0, const T &pixel_type=(T) 0)
  'template < T >
  gmic::gmic(const char *const commands_line, cimg_library::CImgList< T > &images, cimg_library::CImgList< char > &images_names, const char *const custom_commands=0, const bool include_stdlib=true, float *const p_progress=0, bool *const p_is_abort=0)
```
Note the starting quote `'` but there is no closing quote (in case of a file and line the closing quote is present.
---
 src/doxygen.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 184220c..7b3c7d9 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6405,6 +6405,8 @@ static void findMember(const Entry *root,
                     warnMsg+="' at line "+QCString().setNum(md->getDefLine()) +
                              " of file "+md->getDefFileName();
                   }
+		  else
+                    warnMsg += "'";
 
                   warnMsg+='\n';
                 }
-- 
cgit v0.12


From 056a6ba3de9b9a558ffa9c908bed28ae3494e121 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sat, 12 Oct 2019 18:47:29 +0200
Subject: Warning when using empty p HTML tag

When we use the construct:
```
<p/>
```
we get the warning:
```
warning: HTML tags may not use the 'empty tag' XHTML syntax.
```
tough the construct is handled properly, so we can omit the warning.
---
 src/docparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index da4cfb2..1b6dbca 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -5892,7 +5892,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
   int retval=RetVal_OK;
   int tagId = Mappers::htmlTagMapper->map(tagName);
   if (g_token->emptyTag && !(tagId&XML_CmdMask) && 
-      tagId!=HTML_UNKNOWN && tagId!=HTML_IMG && tagId!=HTML_BR)
+      tagId!=HTML_UNKNOWN && tagId!=HTML_IMG && tagId!=HTML_BR && tagId!=HTML_P)
   {
       warn_doc_error(g_fileName,doctokenizerYYlineno,"HTML tags may not use the 'empty tag' XHTML syntax.");
   }
-- 
cgit v0.12


From 79f6a43c5fbd1f28f2fbdaa642cf42a0079b5be6 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 13 Oct 2019 23:53:12 +0200
Subject: Fix lifetime issue for Entry objects.

---
 src/entry.cpp | 35 ++++++++++++++++++++++++++---------
 src/entry.h   |  5 ++++-
 src/scanner.l |  4 ++--
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/entry.cpp b/src/entry.cpp
index ec3c736..8ec7846 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -240,6 +240,32 @@ void Entry::copyToSubEntry(const std::unique_ptr<Entry> &current)
   m_sublist.push_back(std::move(copy));
 }
 
+void Entry::moveFromSubEntry(const Entry *child,std::unique_ptr<Entry> &moveTo)
+{
+  auto it = std::find_if(m_sublist.begin(),m_sublist.end(),
+      [child](const std::unique_ptr<Entry>&elem) { return elem.get()==child; });
+  if (it!=m_sublist.end())
+  {
+    moveTo = std::move(*it);
+    m_sublist.erase(it);
+  }
+  else
+  {
+    moveTo.reset();
+  }
+}
+
+void Entry::removeSubEntry(const Entry *e)
+{
+  auto it = std::find_if(m_sublist.begin(),m_sublist.end(),
+      [e](const std::unique_ptr<Entry>&elem) { return elem.get()==e; });
+  if (it!=m_sublist.end())
+  {
+    m_sublist.erase(it);
+  }
+}
+
+
 void Entry::reset()
 {
   static bool entryCallGraph   = Config_getBool(CALL_GRAPH);
@@ -335,14 +361,5 @@ void Entry::addSpecialListItem(const char *listName,int itemId)
   sli->append(ili);
 }
 
-void Entry::removeSubEntry(Entry *e)
-{
-  auto it = std::find_if(m_sublist.begin(),m_sublist.end(),
-      [e](const std::unique_ptr<Entry>&elem) { return elem.get()==e; });
-  if (it!=m_sublist.end())
-  {
-    m_sublist.erase(it);
-  }
-}
 
 //------------------------------------------------------------------
diff --git a/src/entry.h b/src/entry.h
index 091e81b..c078936 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -223,6 +223,9 @@ class Entry
     void moveToSubEntryAndRefresh(Entry* &e);
     void moveToSubEntryAndRefresh(std::unique_ptr<Entry> &e);
 
+    /*! take \a child of of to list of children and move it into \a moveTo */
+    void moveFromSubEntry(const Entry *child,std::unique_ptr<Entry> &moveTo);
+
     /*! make a copy of \a e and add it as a child to this entry */
     void copyToSubEntry (Entry* e);
     void copyToSubEntry (const std::unique_ptr<Entry> &e);
@@ -230,7 +233,7 @@ class Entry
     /*! Removes entry \a e from the list of children.
      *  The entry will be deleted if found.
      */
-    void removeSubEntry(Entry *e);
+    void removeSubEntry(const Entry *e);
 
     /*! Restore the state of this Entry to the default value it has
      *  at construction time.
diff --git a/src/scanner.l b/src/scanner.l
index fe20543..4ed4a62 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -5305,9 +5305,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
 					    current->endBodyLine=yyLineNr;
-
+                                            // take previous out of current_root and move it into current
 					    current.swap(tempEntry); // remember current
-					    current.reset(previous); // and temporarily switch to the previous entry
+                                            current_root->moveFromSubEntry(previous,current);
 					    previous = 0;
 
 					    docBlockContext   = SkipCurlyEndDoc;
-- 
cgit v0.12


From ef3063ef59cb1f41f02d7658490b0e554bb7a288 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 14 Oct 2019 12:37:34 +0200
Subject: Warning when using empty HTML tag

- the HR tag has in xhtml the form <HR/>. Supporting empty tag
- better warning (with tag name, for empty tag.
- `</hr>` does not exist, correcting warning (analogous to `</br>`)
---
 src/docparser.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 1b6dbca..5253b04 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -5892,9 +5892,10 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
   int retval=RetVal_OK;
   int tagId = Mappers::htmlTagMapper->map(tagName);
   if (g_token->emptyTag && !(tagId&XML_CmdMask) && 
-      tagId!=HTML_UNKNOWN && tagId!=HTML_IMG && tagId!=HTML_BR && tagId!=HTML_P)
+      tagId!=HTML_UNKNOWN && tagId!=HTML_IMG && tagId!=HTML_BR && tagId!=HTML_HR && tagId!=HTML_P)
   {
-      warn_doc_error(g_fileName,doctokenizerYYlineno,"HTML tags may not use the 'empty tag' XHTML syntax.");
+      warn_doc_error(g_fileName,doctokenizerYYlineno,"HTML tag ('<%s/>') may not use the 'empty tag' XHTML syntax.",
+                     tagName.data());
   }
   switch (tagId)
   {
@@ -6439,7 +6440,7 @@ int DocPara::handleHtmlEndTag(const QCString &tagName)
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected tag </img> found");
       break;
     case HTML_HR:
-      warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected tag </hr> found");
+      warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal </hr> tag found\n");
       break;
     case HTML_A:
       //warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected tag </a> found");
-- 
cgit v0.12


From b0c0fc0b741f3c51ff9f891a0725d68bca6ecda5 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 15 Oct 2019 18:54:54 +0200
Subject: Skip empty HTML tag

Due to the fact that an empty HTML tag (like `<strike/>` is seen as a start tag the rest of a documentation block is handled with the strikethrough. Same problem occurs for other tags as well, in most cases empty HTML tags should be left out of the output (and just give the warning about the empty tag).

Mentioned example:
```
/**
Before a strike:
<strike/>
after strike
*/
void fie_b_strike(void);
```
---
 src/docparser.cpp | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 5253b04..1f7e460 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -5900,6 +5900,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
   switch (tagId)
   {
     case HTML_UL: 
+      if (!g_token->emptyTag)
       {
         DocHtmlList *list = new DocHtmlList(this,tagHtmlAttribs,DocHtmlList::Unordered);
         m_children.append(list);
@@ -5907,6 +5908,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       }
       break;
     case HTML_OL: 
+      if (!g_token->emptyTag)
       {
         DocHtmlList *list = new DocHtmlList(this,tagHtmlAttribs,DocHtmlList::Ordered);
         m_children.append(list);
@@ -5914,6 +5916,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       }
       break;
     case HTML_LI:
+      if (g_token->emptyTag) break;
       if (!insideUL(this) && !insideOL(this))
       {
         warn_doc_error(g_fileName,doctokenizerYYlineno,"lonely <li> tag found");
@@ -5924,21 +5927,22 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       }
       break;
     case HTML_BOLD:
-      handleStyleEnter(this,m_children,DocStyleChange::Bold,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Bold,&g_token->attribs);
       break;
     case HTML_STRIKE:
-      handleStyleEnter(this,m_children,DocStyleChange::Strike,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Strike,&g_token->attribs);
       break;
     case HTML_DEL:
-      handleStyleEnter(this,m_children,DocStyleChange::Del,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Del,&g_token->attribs);
       break;
     case HTML_UNDERLINE:
-      handleStyleEnter(this,m_children,DocStyleChange::Underline,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Underline,&g_token->attribs);
       break;
     case HTML_INS:
-      handleStyleEnter(this,m_children,DocStyleChange::Ins,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Ins,&g_token->attribs);
       break;
     case HTML_CODE:
+      if (g_token->emptyTag) break;
       if (/*getLanguageFromFileName(g_fileName)==SrcLangExt_CSharp ||*/ g_xmlComment) 
         // for C# source or inside a <summary> or <remark> section we 
         // treat <code> as an XML tag (so similar to @code)
@@ -5952,27 +5956,28 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       }
       break;
     case HTML_EMPHASIS:
-      handleStyleEnter(this,m_children,DocStyleChange::Italic,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Italic,&g_token->attribs);
       break;
     case HTML_DIV:
-      handleStyleEnter(this,m_children,DocStyleChange::Div,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Div,&g_token->attribs);
       break;
     case HTML_SPAN:
-      handleStyleEnter(this,m_children,DocStyleChange::Span,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Span,&g_token->attribs);
       break;
     case HTML_SUB:
-      handleStyleEnter(this,m_children,DocStyleChange::Subscript,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Subscript,&g_token->attribs);
       break;
     case HTML_SUP:
-      handleStyleEnter(this,m_children,DocStyleChange::Superscript,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Superscript,&g_token->attribs);
       break;
     case HTML_CENTER:
-      handleStyleEnter(this,m_children,DocStyleChange::Center,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Center,&g_token->attribs);
       break;
     case HTML_SMALL:
-      handleStyleEnter(this,m_children,DocStyleChange::Small,&g_token->attribs);
+      if (!g_token->emptyTag) handleStyleEnter(this,m_children,DocStyleChange::Small,&g_token->attribs);
       break;
     case HTML_PRE:
+      if (g_token->emptyTag) break;
       handleStyleEnter(this,m_children,DocStyleChange::Preformatted,&g_token->attribs);
       setInsidePreformatted(TRUE);
       doctokenizerYYsetInsidePre(TRUE);
@@ -5981,6 +5986,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       retval=TK_NEWPARA;
       break;
     case HTML_DL:
+      if (!g_token->emptyTag)
       {
         DocHtmlDescList *list = new DocHtmlDescList(this,tagHtmlAttribs);
         m_children.append(list);
@@ -5994,6 +6000,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected tag <dd> found");
       break;
     case HTML_TABLE:
+      if (!g_token->emptyTag)
       {
         DocHtmlTable *table = new DocHtmlTable(this,tagHtmlAttribs);
         m_children.append(table);
@@ -6028,22 +6035,22 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       retval=handleAHref(this,m_children,tagHtmlAttribs);
       break;
     case HTML_H1:
-      retval=handleHtmlHeader(tagHtmlAttribs,1);
+      if (!g_token->emptyTag) retval=handleHtmlHeader(tagHtmlAttribs,1);
       break;
     case HTML_H2:
-      retval=handleHtmlHeader(tagHtmlAttribs,2);
+      if (!g_token->emptyTag) retval=handleHtmlHeader(tagHtmlAttribs,2);
       break;
     case HTML_H3:
-      retval=handleHtmlHeader(tagHtmlAttribs,3);
+      if (!g_token->emptyTag) retval=handleHtmlHeader(tagHtmlAttribs,3);
       break;
     case HTML_H4:
-      retval=handleHtmlHeader(tagHtmlAttribs,4);
+      if (!g_token->emptyTag) retval=handleHtmlHeader(tagHtmlAttribs,4);
       break;
     case HTML_H5:
-      retval=handleHtmlHeader(tagHtmlAttribs,5);
+      if (!g_token->emptyTag) retval=handleHtmlHeader(tagHtmlAttribs,5);
       break;
     case HTML_H6:
-      retval=handleHtmlHeader(tagHtmlAttribs,6);
+      if (!g_token->emptyTag) retval=handleHtmlHeader(tagHtmlAttribs,6);
       break;
     case HTML_IMG:
       {
@@ -6051,6 +6058,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       }
       break;
     case HTML_BLOCKQUOTE:
+      if (!g_token->emptyTag)
       {
         DocHtmlBlockQuote *block = new DocHtmlBlockQuote(this,tagHtmlAttribs);
         m_children.append(block);
-- 
cgit v0.12


From 1734f1a16f828013171bb67bb4dcb61be57fad04 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 16 Oct 2019 15:54:33 +0200
Subject: Support for <a id="label">

Support besides `<a name="label">` also `<a id="label">` as `id=` is the HTML attribute to define an ad for an HTML element.
---
 doc/htmlcmds.doc  | 2 ++
 src/docparser.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/htmlcmds.doc b/doc/htmlcmds.doc
index 12347ab..605bf5a 100644
--- a/doc/htmlcmds.doc
+++ b/doc/htmlcmds.doc
@@ -25,6 +25,8 @@ of a HTML tag are passed on to the HTML output only
 <ul>
 <li><tt>\<A HREF="..."\></tt> Starts a hyperlink 
                        (if supported by the output format). 
+<li><tt>\<A ID="..."\></tt> Starts a named anchor 
+                       (if supported by the output format).
 <li><tt>\<A NAME="..."\></tt> Starts a named anchor 
                        (if supported by the output format).
 <li><tt>\</A\></tt>    Ends a link or anchor 
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 5253b04..f655475 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -966,7 +966,7 @@ static int handleAHref(DocNode *parent,QList<DocNode> &children,const HtmlAttrib
   int retval = RetVal_OK;
   for (li.toFirst();(opt=li.current());++li,++index)
   {
-    if (opt->name=="name") // <a name=label> tag
+    if (opt->name=="name" || opt->name=="id") // <a name=label> or <a id=label> tag
     {
       if (!opt->value.isEmpty())
       {
-- 
cgit v0.12


From 3bd04d0d99b4fbc36167ee6981ce3bfb4c0eb3b2 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Wed, 16 Oct 2019 21:36:55 +0200
Subject: Revert "Minor code cleanup for layout files"

This reverts commit ed4515149fd0839dba1f59858aec37b73c0ac805.
---
 src/doxygen.cpp | 2 +-
 src/layout.cpp  | 7 ++++++-
 src/layout.h    | 7 +++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 7b3c7d9..e1d7967 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10368,7 +10368,7 @@ void readConfiguration(int argc, char **argv)
         layoutName=getArg(argc,argv,optind);
         if (!layoutName)
         { layoutName="DoxygenLayout.xml"; }
-        LayoutDocManager::instance().writeDefault(layoutName);
+        writeDefaultLayoutFile(layoutName);
         cleanUpDoxygen();
         exit(0);
         break;
diff --git a/src/layout.cpp b/src/layout.cpp
index c560147..38a55f4 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -265,6 +265,9 @@ class LayoutParser : public QXmlDefaultHandler
       m_part = -1; // invalid
       m_rootNav = 0;
 
+      //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
+      //bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);  
+      //bool javaOpt    = Config_getBool(OPTIMIZE_OUTPUT_JAVA);
       bool sliceOpt    = Config_getBool(OPTIMIZE_OUTPUT_SLICE);
 
       // start & end handlers
@@ -1546,7 +1549,9 @@ void LayoutDocManager::parse(const char *fileName)
   reader.parse( source );
 }
 
-void LayoutDocManager::writeDefault(const char *fileName) const
+//---------------------------------------------------------------------------------
+
+void writeDefaultLayoutFile(const char *fileName)
 {
   QFile f(fileName);
   bool ok = openOutputFile(fileName,f);
diff --git a/src/layout.h b/src/layout.h
index 3260a28..b1facf5 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -162,7 +162,8 @@ struct LayoutNavEntry
     QCString title() const           { return m_title; }
     QCString intro() const           { return m_intro; }
     QCString url() const;
-    bool visible() const             { return m_visible; }
+    bool visible()                   { return m_visible; }
+    void clear()                     { m_children.clear(); }
     void addChild(LayoutNavEntry *e) { m_children.append(e); }
     void prependChild(LayoutNavEntry *e) { m_children.prepend(e); }
     const QList<LayoutNavEntry> &children() const { return m_children; }
@@ -171,7 +172,6 @@ struct LayoutNavEntry
   private:
     LayoutNavEntry() : m_parent(0), m_kind(None), m_visible(FALSE) {}
     LayoutNavEntry *m_parent;
-    void clear()                     { m_children.clear(); }
     Kind m_kind;
     bool m_visible;
     QCString m_baseFile;
@@ -179,7 +179,6 @@ struct LayoutNavEntry
     QCString m_intro;
     QList<LayoutNavEntry> m_children;
     friend class LayoutDocManager;
-    friend class LayoutParser;
 };
 
 /** @brief Singleton providing access to the (user configurable) layout of the documentation */
@@ -204,7 +203,6 @@ class LayoutDocManager
     /** Parses a user provided layout */
     void parse(const char *fileName);
     void init();
-    void writeDefault(const char *fileName) const;
   private:
     void addEntry(LayoutPart p,LayoutDocEntry*e);
     void clear(LayoutPart p);
@@ -214,6 +212,7 @@ class LayoutDocManager
     friend class LayoutParser;
 };
 
+void writeDefaultLayoutFile(const char *fileName);
 
 #endif
 
-- 
cgit v0.12


From 237f5cfe759a9e0abc9514824f02581f84058d50 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 17 Oct 2019 10:57:13 +0200
Subject: Discrepancy between vhdl input and generated sources

The generated vhdl code files (.cc and .h) and didn't match the vhdl input source (vhdlpardser.jj).
When regenerating with javacc the vhdl code file they didn't compile.
vhdlparser.jj has been corrected.
---
 vhdlparser/vhdlparser.jj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index 6eb95b4..126118c 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -1730,7 +1730,7 @@ void package_declaration():  {QCString s;}
  <PACKAGE_T> s=identifier() <IS_T>
                           {
                           lastCompound=current.get();
-                          std::unique_ptr<Entry> clone=std::make_unique_ptr<Entry>(*current);
+                          std::unique_ptr<Entry> clone=std::make_unique<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
                           clone->spec=VhdlDocGen::PACKAGE;
                           clone->name=s;
@@ -1932,7 +1932,7 @@ void process_statement() : {QCString s,s1,s2;Token *tok=0;}
    currName=s;
 
    current->name=currName;
-   tempEntry=current;
+   tempEntry=current.get();
    current->endBodyLine=getLine();
    currP=0;
  if(tok)
-- 
cgit v0.12


From 2a333e5703b32451811c7de2b43e4825863add89 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 17 Oct 2019 13:50:06 +0200
Subject: issue #7328 Cannot generate DoxygenLayout.xml

Problems with generating the DoxygenLayout.xml on a system the language set to Russian, set encoding for file.
---
 src/layout.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layout.cpp b/src/layout.cpp
index 38a55f4..946b612 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -1561,6 +1561,7 @@ void writeDefaultLayoutFile(const char *fileName)
     return;
   }
   QTextStream t(&f);
+  t.setEncoding(QTextStream::UnicodeUTF8);
   t << substitute(layout_default,"$doxygenversion",getVersion());
 }
 
-- 
cgit v0.12


From 54516c3c66dc1b736b9ef3140e83495292766992 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 17 Oct 2019 14:53:21 +0200
Subject: RTF extension file to standard output, make according documentation
 consistent.

Create possibility to write rtf extension file to standard output as well, see to it that same technique is used on different places
Update documentation and make it consistent
---
 doc/doxygen.1   | 28 ++++++++++++++++++----------
 src/doxygen.cpp | 21 ++++++++++++++-------
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/doc/doxygen.1 b/doc/doxygen.1
index fa0edae..0b02cb2 100644
--- a/doc/doxygen.1
+++ b/doc/doxygen.1
@@ -10,8 +10,6 @@ You can use doxygen in a number of ways:
 1) Use doxygen to generate a template configuration file:
 .IP
 doxygen [-s] \fB\-g\fR [configName]
-.IP
-If - is used for configName doxygen will write to standard output.
 .TP 
 2) Use doxygen to update an old configuration file:
 .IP
@@ -20,34 +18,44 @@ doxygen [-s] \fB\-u\fR [configName]
 3) Use doxygen to generate documentation using an existing configuration file:
 .IP
 doxygen [configName]
-.IP
-If - is used for configName doxygen will read from standard input.
 .TP
 4) Use doxygen to generate a template file controlling the layout of the generated documentation:
 .IP
-doxygen -l [layoutFileName.xml]
+doxygen -l [layoutFileName]
+.IP
+In case layoutFileName is omitted layoutFileName.xml will be used as filename.
+If - is used for layoutFileName doxygen will write to standard output.
 .TP
 5) Use doxygen to generate a template style sheet file for RTF, HTML or Latex.
-.TP
+.IP
 RTF:
 doxygen \fB\-w\fR rtf styleSheetFile
-.TP
+.IP
 HTML:
 doxygen \fB\-w\fR html headerFile footerFile styleSheetFile [configFile]
-.TP
+.IP
 LaTeX: doxygen \fB\-w\fR latex headerFile footerFile styleSheetFile [configFile]
 .TP
 6) Use doxygen to generate an rtf extensions file
-.TP
+.IP
 RTF:
 doxygen \fB\-e\fR rtf extensionsFile
+.IP
+If - is used for extensionsFile doxygen will write to standard output.
 .TP
 7) Use doxygen to compare the used configuration file with the template configuration file
-.TP
+.IP
 doxygen \fB\-x\fR [configFile]
+.TP
+8) Use doxygen to show a list of built-in emojis.
+.IP
+doxygen \fB\-f\fR emoji outputFileName
+.IP
+If - is used for outputFileName doxygen will write to standard output.
 .PP
 If \fB\-s\fR is specified the comments in the config file will be omitted.
 If configName is omitted `Doxyfile' will be used as a default.
+If - is used for configFile doxygen will write / read the configuration to /from standard output / input.
 .SH AUTHOR
 Doxygen version @VERSION@, Copyright Dimitri van Heesch 1997-2019
 .SH SEE ALSO
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index e1d7967..9ab263a 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10116,29 +10116,31 @@ static void usage(const char *name,const char *versionString)
   msg("You can use doxygen in a number of ways:\n\n");
   msg("1) Use doxygen to generate a template configuration file:\n");
   msg("    %s [-s] -g [configName]\n\n",name);
-  msg("    If - is used for configName doxygen will write to standard output.\n\n");
   msg("2) Use doxygen to update an old configuration file:\n");
   msg("    %s [-s] -u [configName]\n\n",name);
   msg("3) Use doxygen to generate documentation using an existing ");
   msg("configuration file:\n");
   msg("    %s [configName]\n\n",name);
-  msg("    If - is used for configName doxygen will read from standard input.\n\n");
   msg("4) Use doxygen to generate a template file controlling the layout of the\n");
   msg("   generated documentation:\n");
-  msg("    %s -l [layoutFileName.xml]\n\n",name);
+  msg("    %s -l [layoutFileName]\n\n",name);
+  msg("    In case layoutFileName is omitted layoutFileName.xml will be used as filename.\n");
+  msg("    If - is used for layoutFileName doxygen will write to standard output.\n\n");
   msg("5) Use doxygen to generate a template style sheet file for RTF, HTML or Latex.\n");
   msg("    RTF:        %s -w rtf styleSheetFile\n",name);
   msg("    HTML:       %s -w html headerFile footerFile styleSheetFile [configFile]\n",name);
   msg("    LaTeX:      %s -w latex headerFile footerFile styleSheetFile [configFile]\n\n",name);
   msg("6) Use doxygen to generate a rtf extensions file\n");
   msg("    RTF:   %s -e rtf extensionsFile\n\n",name);
+  msg("    If - is used for extensionsFile doxygen will write to standard output.\n\n");
   msg("7) Use doxygen to compare the used configuration file with the template configuration file\n");
   msg("    %s -x [configFile]\n\n",name);
   msg("8) Use doxygen to show a list of built-in emojis.\n");
   msg("    %s -f emoji outputFileName\n\n",name);
   msg("    If - is used for outputFileName doxygen will write to standard output.\n\n");
   msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n");
-  msg("If configName is omitted 'Doxyfile' will be used as a default.\n\n");
+  msg("If configName is omitted 'Doxyfile' will be used as a default.\n");
+  msg("If - is used for configFile doxygen will write / read the configuration to /from standard output / input.\n\n");
   msg("-v print version string\n");
 }
 
@@ -10365,9 +10367,14 @@ void readConfiguration(int argc, char **argv)
         genConfig=TRUE;
         break;
       case 'l':
-        layoutName=getArg(argc,argv,optind);
-        if (!layoutName)
-        { layoutName="DoxygenLayout.xml"; }
+        if (optind+1>=argc)
+        {
+          layoutName="DoxygenLayout.xml";
+        }
+        else
+        {
+          layoutName=argv[optind+1];
+        }
         writeDefaultLayoutFile(layoutName);
         cleanUpDoxygen();
         exit(0);
-- 
cgit v0.12


From f17438620e08b245bcf133c422bed433fb46bc13 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 18 Oct 2019 10:20:27 +0200
Subject: issue #7313 VHDL attribute 'subtype is not supported and breaks
 parser

Add the `'subtype` construct for variables etc.
---
 vhdlparser/vhdlparser.jj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index 126118c..2f0c466 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -1614,6 +1614,9 @@ QCString name_ext1() : {QCString s,s1,s2;}
  {
 
   (
+ LOOKAHEAD(<APOSTROPHE_T><SUBTYPE_T>)
+ <APOSTROPHE_T><SUBTYPE_T>{s+="'subtype";}
+|
  LOOKAHEAD(<DOT_T> suffix())
  <DOT_T> s1=suffix(){s+=".";s+=s1;}
 |
-- 
cgit v0.12


From 3789f8b4a07f43be96360d04bfb247cfa75a2cb0 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 18 Oct 2019 18:29:08 +0200
Subject: Adding possibility to automatically build vhdlparser from
 vhdlparser.jj file

- possibility to find the javacc program / script
- creating command to compile javaparser.jj with javacc and place files in the right directory when javacc is present.
---
 cmake/FindJavacc.cmake    | 11 +++++++++++
 vhdlparser/CMakeLists.txt | 10 ++++++++++
 2 files changed, 21 insertions(+)
 create mode 100755 cmake/FindJavacc.cmake

diff --git a/cmake/FindJavacc.cmake b/cmake/FindJavacc.cmake
new file mode 100755
index 0000000..9f476ba
--- /dev/null
+++ b/cmake/FindJavacc.cmake
@@ -0,0 +1,11 @@
+
+find_program(JAVACC_EXECUTABLE NAMES javacc javaCC Javacc JavaCC javacc.bat DOC "path to the javacc executable")
+message("The path: $ENV{PATH}\n")
+mark_as_advanced(JAVACC_EXECUTABLE)
+if(JAVACC_EXECUTABLE)
+  set(JAVACC_FOUND 1)
+  message(STATUS "The javacc executable: ${JAVACC_EXECUTABLE}")
+else()
+  set(JAVACC_FOUND 0)
+  message(STATUS "The javacc executable not found, using existing files")
+endif()
diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt
index f89008c..ad5af28 100644
--- a/vhdlparser/CMakeLists.txt
+++ b/vhdlparser/CMakeLists.txt
@@ -1,3 +1,13 @@
+find_package(Javacc)
+if (JAVACC_FOUND)
+    add_custom_command(
+        COMMAND ${JAVACC_EXECUTABLE} -OUTPUT_DIRECTORY=${CMAKE_SOURCE_DIR}/vhdlparser ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj
+        DEPENDS ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj
+        OUTPUT ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.cc ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.h ${CMAKE_SOURCE_DIR}/vhdlparser/ErrorHandler.h ${CMAKE_SOURCE_DIR}/vhdlparser/JavaCC.h ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.cc ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.h ${CMAKE_SOURCE_DIR}/vhdlparser/Token.cc ${CMAKE_SOURCE_DIR}/vhdlparser/Token.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenManager.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.cc ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserConstants.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.h
+    )
+
+endif()
+
 include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
 add_library(vhdlparser STATIC
 CharStream.cc
-- 
cgit v0.12


From cda147996c774c7d35c8b2a942f1457cdd38d4f4 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 18 Oct 2019 18:38:11 +0200
Subject: Adding possibility to automatically build vhdlparser from
 vhdlparser.jj file

Removed debug statement
---
 cmake/FindJavacc.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/FindJavacc.cmake b/cmake/FindJavacc.cmake
index 9f476ba..c7de776 100755
--- a/cmake/FindJavacc.cmake
+++ b/cmake/FindJavacc.cmake
@@ -1,6 +1,5 @@
 
 find_program(JAVACC_EXECUTABLE NAMES javacc javaCC Javacc JavaCC javacc.bat DOC "path to the javacc executable")
-message("The path: $ENV{PATH}\n")
 mark_as_advanced(JAVACC_EXECUTABLE)
 if(JAVACC_EXECUTABLE)
   set(JAVACC_FOUND 1)
-- 
cgit v0.12


From c993785c8cae4712cd6fd34004c02041a128d7c7 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Sat, 19 Oct 2019 18:28:11 +0200
Subject: Let $year support SOURCE_DATE_EPOCH

---
 src/util.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index e1e9fb5..770c834 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2590,7 +2590,7 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode)
   return "";
 }
 
-QCString dateToString(bool includeTime)
+static QDateTime getCurrentDateTime()
 {
   QDateTime current = QDateTime::currentDateTime();
   QCString sourceDateEpoch = portable_getenv("SOURCE_DATE_EPOCH");
@@ -2622,6 +2622,12 @@ QCString dateToString(bool includeTime)
       current.setTimeUtc_t((ulong)epoch); // TODO: add support for 64bit epoch value
     }
   }
+  return current;
+}
+
+QCString dateToString(bool includeTime)
+{
+  const QDateTime current = getCurrentDateTime();
   return theTranslator->trDateTime(current.date().year(),
                                    current.date().month(),
                                    current.date().day(),
@@ -2634,9 +2640,9 @@ QCString dateToString(bool includeTime)
 
 QCString yearToString()
 {
-  const QDate &d=QDate::currentDate();
+  const QDateTime current = getCurrentDateTime();
   QCString result;
-  result.sprintf("%d", d.year());
+  result.sprintf("%d", current.date().year());
   return result;
 }
 
-- 
cgit v0.12


From 640ef05f26882c8abbba174d4758aa6c38d9862b Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 21 Oct 2019 13:41:52 +0200
Subject: Small improvements of TCL output

- handling of the used filename, sometimes the filename was not set resulting in case of a warning with file `<unknown>`, also improving, slightly, the line reference.
- in case of `##` comment blocks the last line was not always show
- in case of multiple comment blocks, properly separate them
- correct handling tab character in source code output (*gen)
---
 src/docbookgen.cpp |  2 +-
 src/htmlgen.cpp    |  1 +
 src/latexgen.cpp   |  1 +
 src/mangen.h       |  2 +-
 src/rtfgen.cpp     |  1 +
 src/tclscanner.l   | 35 +++++++++++++++++++++++++++--------
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index 7fe849a..083aac3 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -233,7 +233,7 @@ void DocbookCodeGenerator::writeLineNumber(const char *ref,const char *fileName,
   {
     m_t << l << " ";
   }
-
+  m_col=0;
 }
 void DocbookCodeGenerator::setCurrentDoc(const Definition *,const char *,bool)
 {
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 402b4e4..df39d32 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -548,6 +548,7 @@ void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename,
   }
   m_t << "</span>";
   m_t << "&#160;";
+  m_col=0;
 }
 
 void HtmlCodeGenerator::writeCodeLink(const char *ref,const char *f,
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index e6c6861..d74cda1 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -223,6 +223,7 @@ void LatexCodeGenerator::writeLineNumber(const char *ref,const char *fileName,co
   {
     m_t << l << " ";
   }
+  m_col=0;
 }
 
 
diff --git a/src/mangen.h b/src/mangen.h
index d912923..192be6d 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -132,7 +132,7 @@ class ManGenerator : public OutputGenerator
     void writeAnchor(const char *,const char *) {}
     void startCodeFragment();
     void endCodeFragment();
-    void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; }
+    void writeLineNumber(const char *,const char *,const char *,int l) { t << l << " "; col=0; }
     void startCodeLine(bool) {}
     void endCodeLine() { codify("\n"); col=0; }
     void startEmphasis() { t << "\\fI"; firstCol=FALSE; }
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index f32936e..7a427e4 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -3052,6 +3052,7 @@ void RTFGenerator::writeLineNumber(const char *,const char *,const char *,int l)
   QCString lineNumber;
   lineNumber.sprintf("%05d",l);
   t << lineNumber << " ";
+  col=0;
 }
 void RTFGenerator::startCodeLine(bool)
 {
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 3b939ce..f09c481 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -486,6 +486,8 @@ Entry* tcl_entry_new()
 //  myEntry->mtype      = Method;
 //  myEntry->virt       = Normal;
 //  myEntry->stat       = FALSE;
+  myEntry->docFile    = tcl.file_name;
+  myEntry->inbodyFile = tcl.file_name;
   myEntry->fileName   = tcl.file_name;
   myEntry->lang       = SrcLangExt_Tcl;
   Doxygen::docGroup.initGroupInfo(myEntry);
@@ -1458,19 +1460,16 @@ tcl_inf("<- %s\n",text);
   }
   else if (what==1)
   { // start new comment
-    if (tcl.comment)
-    {
-      tcl_comment(99,""); // inbody
-    }
     tcl.string_comment=text;
+    tcl_comment(99,"");
+    tcl.string_comment="";
     tcl.comment=1;
   }
   else if (what==2)
   { // add to comment
-    if (tcl.comment)
-    {
-      tcl.string_comment+=text;
-    }
+    tcl.string_comment=text;
+    tcl_comment(99,"");
+    tcl.string_comment="";
   }
   else if (what==-1 || what == -2)
   { // end of comment without/with command
@@ -1549,6 +1548,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
               myEntry1=tcl_entry_namespace(tcl.scan.at(0)->ns);
             }
             processedDoc = preprocessCommentBlock(myDoc,tcl.file_name,myLine0);
+            if (!myEntry1->doc.isEmpty() && tcl.comment==0) processedDoc = "<BR>" + processedDoc; // to separate comment blocks
             parseCommentBlock(tcl.this_parser, myEntry1, processedDoc, tcl.file_name,
               myLine0, FALSE, tcl.config_autobrief, FALSE, myProt, myPos0, myNew);
           }
@@ -1571,6 +1571,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
             myEntry1=tcl_entry_namespace(tcl.scan.at(0)->ns);
           }
           processedDoc = preprocessCommentBlock(myDoc,tcl.file_name,myLine0);
+          if (!myEntry1->doc.isEmpty() && tcl.comment==0) processedDoc = "<BR>" + processedDoc; // to separate comment blocks
           parseCommentBlock(tcl.this_parser, myEntry1, processedDoc, tcl.file_name,
             myLine0, FALSE, tcl.config_autobrief, FALSE, myProt, myPos0, myNew);
         }
@@ -2151,6 +2152,8 @@ D
   tcl.entry_current->mtype = Method;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
@@ -2193,6 +2196,8 @@ D
   tcl.entry_current->mtype = Method;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
@@ -2230,6 +2235,8 @@ D
   tcl.entry_current->mtype = Method;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
@@ -2265,6 +2272,8 @@ D
   tcl.entry_current->mtype = Method;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
@@ -2298,6 +2307,8 @@ D
   tcl.entry_current->section = Entry::NAMESPACE_SEC;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
@@ -2336,6 +2347,8 @@ D
   tcl.entry_current->section = Entry::CLASS_SEC;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
@@ -2368,6 +2381,8 @@ D
   tcl.entry_current->section = Entry::CLASS_SEC;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl.entry_main->moveToSubEntryAndKeep(tcl.entry_current);
@@ -2420,6 +2435,8 @@ D
     tcl.entry_current->mtype = Method;
     tcl.entry_current->name = myMethod;
     tcl.entry_current->startLine = tcl.line_command;
+    tcl.entry_current->docLine = tcl.line_comment;
+    tcl.entry_current->inbodyLine = tcl.line_comment;
     tcl.entry_current->bodyLine = tcl.line_body0;
     tcl.entry_current->endBodyLine = tcl.line_body1;
     tcl_protection(tcl.entry_current);
@@ -2490,6 +2507,8 @@ D
   tcl.entry_current->section = Entry::VARIABLE_SEC;
   tcl.entry_current->name = myName;
   tcl.entry_current->startLine = tcl.line_command;
+  tcl.entry_current->docLine = tcl.line_comment;
+  tcl.entry_current->inbodyLine = tcl.line_comment;
   tcl.entry_current->bodyLine = tcl.line_body0;
   tcl.entry_current->endBodyLine = tcl.line_body1;
   tcl_protection(tcl.entry_current);
-- 
cgit v0.12


From 7cd998a90790d4678d7a59f6774c60dc6aff4b98 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 21 Oct 2019 15:27:01 +0200
Subject: Small improvements of TCL output

Undoing changes for (due to problems with doxygen tests):
- in case of `##` comment blocks the last line was not always show
- in case of multiple comment blocks, properly separate them
---
 src/tclscanner.l | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/tclscanner.l b/src/tclscanner.l
index f09c481..60ba6d4 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -1460,16 +1460,19 @@ tcl_inf("<- %s\n",text);
   }
   else if (what==1)
   { // start new comment
+    if (tcl.comment)
+    {
+      tcl_comment(99,""); // inbody
+    }
     tcl.string_comment=text;
-    tcl_comment(99,"");
-    tcl.string_comment="";
     tcl.comment=1;
   }
   else if (what==2)
   { // add to comment
-    tcl.string_comment=text;
-    tcl_comment(99,"");
-    tcl.string_comment="";
+    if (tcl.comment)
+    {
+      tcl.string_comment+=text;
+    }
   }
   else if (what==-1 || what == -2)
   { // end of comment without/with command
@@ -1548,7 +1551,6 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
               myEntry1=tcl_entry_namespace(tcl.scan.at(0)->ns);
             }
             processedDoc = preprocessCommentBlock(myDoc,tcl.file_name,myLine0);
-            if (!myEntry1->doc.isEmpty() && tcl.comment==0) processedDoc = "<BR>" + processedDoc; // to separate comment blocks
             parseCommentBlock(tcl.this_parser, myEntry1, processedDoc, tcl.file_name,
               myLine0, FALSE, tcl.config_autobrief, FALSE, myProt, myPos0, myNew);
           }
@@ -1571,7 +1573,6 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
             myEntry1=tcl_entry_namespace(tcl.scan.at(0)->ns);
           }
           processedDoc = preprocessCommentBlock(myDoc,tcl.file_name,myLine0);
-          if (!myEntry1->doc.isEmpty() && tcl.comment==0) processedDoc = "<BR>" + processedDoc; // to separate comment blocks
           parseCommentBlock(tcl.this_parser, myEntry1, processedDoc, tcl.file_name,
             myLine0, FALSE, tcl.config_autobrief, FALSE, myProt, myPos0, myNew);
         }
-- 
cgit v0.12


From 4952c20194ab1b59e914cabdbe44d609a138b393 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Sun, 27 Oct 2019 12:02:21 +0100
Subject: issue #7119 Doxygen does not link to C# snippets - regression

Looks like the `isLinkableIeInProject` is a bit to strict and `isLinkable` has to be used (also the original pull request #6489 still works OK).
---
 src/code.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/code.l b/src/code.l
index 9428432..482dda6 100644
--- a/src/code.l
+++ b/src/code.l
@@ -986,7 +986,7 @@ static void generateClassOrGlobalLink(CodeOutputInterface &ol,const char *clName
       }
     }
     const NamespaceDef *nd = getResolvedNamespace(className);
-    if (nd && nd->isLinkableInProject())
+    if (nd && nd->isLinkable())
     {
       g_theCallContext.setScope(nd);
       addToSearchIndex(className);
-- 
cgit v0.12


From c38a6fe88ceb3658ae4c09fa9550c770195d9401 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 27 Oct 2019 12:55:16 +0100
Subject: Changed ArgumentList to be an STL container

---
 addon/doxyparse/doxyparse.cpp |  60 ++--
 src/arguments.cpp             |  48 ++--
 src/arguments.h               |  81 ++----
 src/classdef.cpp              | 408 +++++---------------------
 src/classdef.h                |  17 +-
 src/classlist.cpp             |   8 +-
 src/code.l                    |  14 +-
 src/context.cpp               | 103 +++----
 src/context.h                 |   8 +-
 src/defargs.h                 |   2 +-
 src/defargs.l                 |  79 ++---
 src/defgen.cpp                |  97 +++----
 src/definition.cpp            |   2 +-
 src/docparser.cpp             |  33 +--
 src/doxygen.cpp               | 582 ++++++++++++++++---------------------
 src/entry.cpp                 |  33 +--
 src/entry.h                   |  12 +-
 src/fortranscanner.l          |  51 ++--
 src/groupdef.cpp              |  14 +-
 src/memberdef.cpp             | 504 ++++++++++++++------------------
 src/memberdef.h               |  30 +-
 src/perlmodgen.cpp            |  76 +++--
 src/pre.l                     |   4 +-
 src/pyscanner.l               |  24 +-
 src/scanner.l                 | 257 ++++++++---------
 src/sqlite3gen.cpp            | 135 +++++----
 src/tagreader.cpp             |  20 +-
 src/tclscanner.l              |  23 +-
 src/util.cpp                  | 650 ++++++++++++++++--------------------------
 src/util.h                    |  22 +-
 src/vhdlcode.l                |  15 +-
 src/vhdldocgen.cpp            | 171 ++++-------
 src/vhdldocgen.h              |  22 +-
 src/vhdljjparser.cpp          |  28 +-
 src/xmlgen.cpp                |  97 +++----
 35 files changed, 1459 insertions(+), 2271 deletions(-)

diff --git a/addon/doxyparse/doxyparse.cpp b/addon/doxyparse/doxyparse.cpp
index 592ac42..415354d 100644
--- a/addon/doxyparse/doxyparse.cpp
+++ b/addon/doxyparse/doxyparse.cpp
@@ -183,28 +183,25 @@ std::string sanitizeString(std::string data) {
   return !new_data.isEmpty() ? new_data.data() : "";
 }
 
-std::string argumentData(Argument *argument) {
+std::string argumentData(const Argument &argument) {
   std::string data = "";
-  if (argument->type != NULL && argument->type.size() > 1)
-    data = sanitizeString(argument->type.data());
-  else if (argument->name != NULL)
-    data = sanitizeString(argument->name.data());
+  if (argument.type.size() > 1)
+    data = sanitizeString(argument.type.data());
+  else if (!argument.name.isEmpty())
+    data = sanitizeString(argument.name.data());
   return data;
 }
 
 std::string functionSignature(MemberDef* md) {
   std::string signature = sanitizeString(md->name().data());
   if(md->isFunction()){
-    ArgumentList *argList = md->argumentList();
+    const ArgumentList &argList = md->argumentList();
     signature += "(";
-    if (argList) {
-      ArgumentListIterator iterator(*argList);
-      Argument * argument = iterator.toFirst();
-      if(argument != NULL) {
-        signature += argumentData(argument);
-        for(++iterator; (argument = iterator.current()); ++iterator) {
-          signature += std::string(",") + argumentData(argument);
-        }
+    auto it = argList.begin();
+    if(it!=argList.end()) {
+      signature += argumentData(*it);
+      for(++it; it!=argList.end(); ++it) {
+        signature += std::string(",") + argumentData(*it);
       }
     }
     signature += ")";
@@ -255,19 +252,14 @@ void cModule(ClassDef* cd) {
   }
 }
 
-static bool checkOverrideArg(ArgumentList *argList, MemberDef *md) {
-  ArgumentListIterator iterator(*argList);
-  Argument * argument = iterator.toFirst();
-
-  if(!md->isFunction() || argList->count() == 0){
-      return false;
+static bool checkOverrideArg(const ArgumentList &argList, MemberDef *md) {
+  if(!md->isFunction() || argList.empty()){
+    return false;
   }
 
-  if(argument != NULL) {
-    for(; (argument = iterator.current()); ++iterator){
-        if(md->name() == argument->name) {
-            return true;
-        }
+  for (const Argument &argument : argList) {
+    if(md->name() == argument.name) {
+      return true;
     }
   }
 
@@ -278,17 +270,15 @@ void functionInformation(MemberDef* md) {
   std::string temp = "";
   int size = md->getEndBodyLine() - md->getStartBodyLine() + 1;
   printNumberOfLines(size);
-  ArgumentList *argList = md->argumentList();
-  if (argList) {
-      ArgumentListIterator iterator(*argList);
-      Argument * argument = iterator.toFirst();
-      if(argument != NULL) {
-        temp = argumentData(argument);
+  const ArgumentList &argList = md->argumentList();
+  if (!argList.empty())
+  {
+    temp = argumentData(argList.front());
 // TODO: This is a workaround; better not include "void" in argList, in the first place. 
-          if(temp != "void") {
-              printNumberOfArguments(argList->count());
-          }
-      }
+    if (temp!="void")
+    {
+      printNumberOfArguments(argList.size());
+    }
   }
 
   printNumberOfConditionalPaths(md);
diff --git a/src/arguments.cpp b/src/arguments.cpp
index 6d3e13b..69636f5 100644
--- a/src/arguments.cpp
+++ b/src/arguments.cpp
@@ -1,39 +1,25 @@
+/*****************************************************************************
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ */
+
+#include <algorithm>
+
 #include "arguments.h"
-#include <assert.h>
 
 /*! the argument list is documented if one of its
- *  arguments is documented 
+ *  arguments is documented
  */
 bool ArgumentList::hasDocumentation() const
 {
-  bool hasDocs=FALSE;
-  ArgumentListIterator ali(*this);
-  Argument *a;
-  for (ali.toFirst();!hasDocs && (a=ali.current());++ali)
-  {
-    hasDocs = a->hasDocumentation(); 
-  }
-  return hasDocs;
-}
-
-ArgumentList *ArgumentList::deepCopy() const
-{
-  ArgumentList *argList = new ArgumentList;
-  argList->setAutoDelete(TRUE);
-
-  QListIterator<Argument> ali(*this);
-  Argument *a;
-  for (;(a=ali.current());++ali)
-  {
-    argList->append(new Argument(*a));
-  }
-  argList->constSpecifier     = constSpecifier;
-  argList->volatileSpecifier  = volatileSpecifier;
-  argList->pureSpecifier      = pureSpecifier;
-  argList->trailingReturnType = trailingReturnType;
-  argList->isDeleted          = isDeleted;
-  argList->refQualifier       = refQualifier;
-
-  return argList;
+  return std::any_of(begin(),end(),[](const Argument &a){ return a.hasDocumentation(); });
 }
 
diff --git a/src/arguments.h b/src/arguments.h
index 7ef9642..58aaa4f 100644
--- a/src/arguments.h
+++ b/src/arguments.h
@@ -16,7 +16,7 @@
 #ifndef ARGUMENTS_H
 #define ARGUMENTS_H
 
-#include <qlist.h>
+#include <vector>
 #include <qcstring.h>
 
 class StorageIntf;
@@ -27,34 +27,6 @@ class StorageIntf;
  */
 struct Argument
 {
-  /*! Construct a new argument. */
-  Argument() {}
-  /*! Copy an argument (does a deep copy of all strings). */
-  Argument(const Argument &a)
-  {
-    attrib=a.attrib;
-    type=a.type;
-    name=a.name;
-    array=a.array;
-    defval=a.defval;
-    docs=a.docs;
-    typeConstraint=a.typeConstraint;
-  }
-  /*! Assignment of an argument (does a deep copy of all strings). */
-  Argument &operator=(const Argument &a)
-  {
-    if (this!=&a)
-    {
-      attrib=a.attrib;
-      type=a.type;
-      name=a.name;
-      array=a.array;
-      defval=a.defval;
-      docs=a.docs;
-      typeConstraint=a.typeConstraint;
-    }
-    return *this;
-  }
   /*! return TRUE if this argument is documentation and the argument has a
    *  non empty name.
    */
@@ -86,37 +58,42 @@ enum RefQualifierType
  *  put after the argument list, such as whether the member is const, 
  *  volatile or pure virtual.
  */
-class ArgumentList : public QList<Argument> 
+class ArgumentList : public std::vector<Argument>
 {
   public:
-    /*! Creates an empty argument list */
-    ArgumentList() : QList<Argument>(), 
-                     constSpecifier(FALSE),
-                     volatileSpecifier(FALSE),
-                     pureSpecifier(FALSE),
-                     isDeleted(FALSE),
-                     refQualifier(RefQualifierNone)
-                     { setAutoDelete(TRUE); }
-    /*! Destroys the argument list */
-   ~ArgumentList() {}
-    /*! Makes a deep copy of this object */
-    ArgumentList *deepCopy() const;
     /*! Does any argument of this list have documentation? */
     bool hasDocumentation() const;
-    /*! Does the member modify the state of the class? default: FALSE. */
-    bool constSpecifier;
-    /*! Is the member volatile? default: FALSE. */
-    bool volatileSpecifier;
-    /*! Is this a pure virtual member? default: FALSE */
-    bool pureSpecifier;
+    /*! Does this list have zero or more parameters */
+    bool hasParameters() const
+    {
+      return !empty() || noParameters;
+    }
+    void reset()
+    {
+      clear();
+      constSpecifier = FALSE;
+      volatileSpecifier = FALSE;
+      pureSpecifier = FALSE;
+      trailingReturnType.resize(0);
+      isDeleted = FALSE;
+      refQualifier = RefQualifierNone;
+      noParameters = FALSE;
+    }
+
+    /*! Does the member modify the state of the class? */
+    bool constSpecifier = FALSE;
+    /*! Is the member volatile? */
+    bool volatileSpecifier = FALSE;
+    /*! Is this a pure virtual member? */
+    bool pureSpecifier = FALSE;
     /*! C++11 style Trailing return type? */
     QCString trailingReturnType;
     /*! method with =delete */
-    bool isDeleted;
+    bool isDeleted = FALSE;
     /*! C++11 ref qualifier */
-    RefQualifierType refQualifier;
+    RefQualifierType refQualifier = RefQualifierNone;
+    /*! is it an explicit empty list */
+    bool noParameters = FALSE;
 };
 
-typedef QListIterator<Argument> ArgumentListIterator;
-
 #endif
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 7548c6c..88bec11 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -87,7 +87,7 @@ class ClassDefImpl : public DefinitionImpl, public ClassDef
     virtual bool isLinkable() const;
     virtual bool isVisibleInHierarchy() const;
     virtual bool visibleInParentsDeclList() const;
-    virtual ArgumentList *templateArguments() const;
+    virtual const ArgumentList &templateArguments() const;
     virtual NamespaceDef *getNamespaceDef() const;
     virtual FileDef      *getFileDef() const;
     virtual MemberDef    *getMemberByName(const QCString &) const;
@@ -104,9 +104,9 @@ class ClassDefImpl : public DefinitionImpl, public ClassDef
     virtual ConstraintClassDict *templateTypeConstraints() const;
     virtual bool isTemplateArgument() const;
     virtual Definition *findInnerCompound(const char *name) const;
-    virtual void getTemplateParameterLists(QList<ArgumentList> &lists) const;
+    virtual std::vector<ArgumentList> getTemplateParameterLists() const;
     virtual QCString qualifiedNameWithTemplateParameters(
-        QList<ArgumentList> *actualParams=0,int *actualParamIndex=0) const;
+        const std::vector<ArgumentList> *actualParams=0,int *actualParamIndex=0) const;
     virtual bool isAbstract() const;
     virtual bool isObjectiveC() const;
     virtual bool isFortran() const;
@@ -138,7 +138,7 @@ class ClassDefImpl : public DefinitionImpl, public ClassDef
     virtual QCString title() const;
     virtual QCString generatedFromFiles() const;
     virtual const FileList &usedFiles() const;
-    virtual const ArgumentList *typeConstraints() const;
+    virtual const ArgumentList &typeConstraints() const;
     virtual const ExampleSDict *exampleList() const;
     virtual bool hasExamples() const;
     virtual QCString getMemberListFileName() const;
@@ -167,10 +167,10 @@ class ClassDefImpl : public DefinitionImpl, public ClassDef
     virtual void setCompoundType(CompoundType t);
     virtual void setClassName(const char *name);
     virtual void setClassSpecifier(uint64 spec);
-    virtual void setTemplateArguments(ArgumentList *al);
+    virtual void setTemplateArguments(const ArgumentList &al);
     virtual void setTemplateBaseClassNames(QDict<int> *templateNames);
     virtual void setTemplateMaster(const ClassDef *tm);
-    virtual void setTypeConstraints(ArgumentList *al);
+    virtual void setTypeConstraints(const ArgumentList &al);
     virtual void addMembersToTemplateInstance(const ClassDef *cd,const char *templSpec);
     virtual void makeTemplateArgument(bool b=TRUE);
     virtual void setCategoryOf(ClassDef *cd);
@@ -332,7 +332,7 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef
     { return getCdAlias()->isVisibleInHierarchy(); }
     virtual bool visibleInParentsDeclList() const
     { return getCdAlias()->visibleInParentsDeclList(); }
-    virtual ArgumentList *templateArguments() const
+    virtual const ArgumentList &templateArguments() const
     { return getCdAlias()->templateArguments(); }
     virtual NamespaceDef *getNamespaceDef() const
     { return getCdAlias()->getNamespaceDef(); }
@@ -366,10 +366,10 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef
     { return getCdAlias()->isTemplateArgument(); }
     virtual Definition *findInnerCompound(const char *name) const
     { return getCdAlias()->findInnerCompound(name); }
-    virtual void getTemplateParameterLists(QList<ArgumentList> &lists) const
-    { return getCdAlias()->getTemplateParameterLists(lists); }
+    virtual std::vector<ArgumentList> getTemplateParameterLists() const
+    { return getCdAlias()->getTemplateParameterLists(); }
     virtual QCString qualifiedNameWithTemplateParameters(
-        QList<ArgumentList> *actualParams=0,int *actualParamIndex=0) const
+        const std::vector<ArgumentList> *actualParams=0,int *actualParamIndex=0) const
     { return getCdAlias()->qualifiedNameWithTemplateParameters(actualParams,actualParamIndex); }
     virtual bool isAbstract() const
     { return getCdAlias()->isAbstract(); }
@@ -433,7 +433,7 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef
     { return getCdAlias()->generatedFromFiles(); }
     virtual const FileList &usedFiles() const
     { return getCdAlias()->usedFiles(); }
-    virtual const ArgumentList *typeConstraints() const
+    virtual const ArgumentList &typeConstraints() const
     { return getCdAlias()->typeConstraints(); }
     virtual const ExampleSDict *exampleList() const
     { return getCdAlias()->exampleList(); }
@@ -470,10 +470,10 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef
     virtual void setCompoundType(CompoundType t) {}
     virtual void setClassName(const char *name) {}
     virtual void setClassSpecifier(uint64 spec) {}
-    virtual void setTemplateArguments(ArgumentList *al) {}
+    virtual void setTemplateArguments(const ArgumentList &al) {}
     virtual void setTemplateBaseClassNames(QDict<int> *templateNames) {}
     virtual void setTemplateMaster(const ClassDef *tm) {}
-    virtual void setTypeConstraints(ArgumentList *al) {}
+    virtual void setTypeConstraints(const ArgumentList &al) {}
     virtual void addMembersToTemplateInstance(const ClassDef *cd,const char *templSpec) {}
     virtual void makeTemplateArgument(bool b=TRUE) {}
     virtual void setCategoryOf(ClassDef *cd) {}
@@ -586,10 +586,10 @@ class ClassDefImpl::IMPL
     MemberNameInfoSDict *allMemberNameInfoSDict;
 
     /*! Template arguments of this class */
-    ArgumentList *tempArgs;
+    ArgumentList tempArgs;
 
     /*! Type constraints for template parameters */
-    ArgumentList *typeConstraints;
+    ArgumentList typeConstraints;
 
     /*! Files that were used for generating the class documentation. */
     FileList files;
@@ -710,8 +710,6 @@ void ClassDefImpl::IMPL::init(const char *defFileName, const char *name,
   inheritedBy = 0;
   allMemberNameInfoSDict = 0;
   incInfo=0;
-  tempArgs=0;
-  typeConstraints=0;
   prot=Public;
   nspace=0;
   fileDef=0;
@@ -777,8 +775,6 @@ ClassDefImpl::IMPL::~IMPL()
   delete templateInstances;
   delete variableInstances;
   delete templBaseClassNames;
-  delete tempArgs;
-  delete typeConstraints;
   delete taggedInnerClasses;
 }
 
@@ -1376,7 +1372,7 @@ void ClassDefImpl::setIncludeFile(FileDef *fd,
 //}
 
 static void searchTemplateSpecs(/*in*/  const Definition *d,
-                                /*out*/ QList<ArgumentList> &result,
+                                /*out*/ std::vector<ArgumentList> &result,
                                 /*out*/ QCString &name,
                                 /*in*/  SrcLangExt lang)
 {
@@ -1395,9 +1391,9 @@ static void searchTemplateSpecs(/*in*/  const Definition *d,
     }
     name+=clName;
     bool isSpecialization = d->localName().find('<')!=-1;
-    if (cd->templateArguments())
+    if (!cd->templateArguments().empty())
     {
-      result.append(cd->templateArguments());
+      result.push_back(cd->templateArguments());
       if (!isSpecialization)
       {
         name+=tempArgListToString(cd->templateArguments(),lang);
@@ -1413,35 +1409,32 @@ static void searchTemplateSpecs(/*in*/  const Definition *d,
 static void writeTemplateSpec(OutputList &ol,const Definition *d,
             const QCString &type,SrcLangExt lang)
 {
-  QList<ArgumentList> specs;
+  std::vector<ArgumentList> specs;
   QCString name;
   searchTemplateSpecs(d,specs,name,lang);
-  if (specs.count()>0) // class has template scope specifiers
+  if (!specs.empty()) // class has template scope specifiers
   {
     ol.startSubsubsection();
-    QListIterator<ArgumentList> spi(specs);
-    ArgumentList *al;
-    for (spi.toFirst();(al=spi.current());++spi)
+    for (const ArgumentList &al : specs)
     {
       ol.docify("template<");
-      QListIterator<Argument> ali(*al);
-      Argument *a;
-      while ((a=ali.current()))
+      auto it = al.begin();
+      while (it!=al.end())
       {
-        ol.docify(a->type);
-        if (!a->name.isEmpty())
+        Argument a = *it;
+        ol.docify(a.type);
+        if (!a.name.isEmpty())
         {
           ol.docify(" ");
-          ol.docify(a->name);
+          ol.docify(a.name);
         }
-        if (a->defval.length()!=0)
+        if (a.defval.length()!=0)
         {
           ol.docify(" = ");
-          ol.docify(a->defval);
+          ol.docify(a.defval);
         }
-        ++ali;
-        a=ali.current();
-        if (a) ol.docify(", ");
+        ++it;
+        if (it!=al.end()) ol.docify(", ");
       }
       ol.docify(">");
       ol.lineBreak();
@@ -2268,14 +2261,9 @@ void ClassDefImpl::writeTagFile(FTextStream &tagFile)
   {
     tagFile << "    <clangid>" << convertToXML(idStr) << "</clangid>" << endl;
   }
-  if (m_impl->tempArgs)
+  for (const Argument &a : m_impl->tempArgs)
   {
-    ArgumentListIterator ali(*m_impl->tempArgs);
-    Argument *a;
-    for (;(a=ali.current());++ali)
-    {
-      tagFile << "    <templarg>" << convertToXML(a->name) << "</templarg>" << endl;
-    }
+    tagFile << "    <templarg>" << convertToXML(a.name) << "</templarg>" << endl;
   }
   if (m_impl->inherits)
   {
@@ -2816,7 +2804,7 @@ QCString ClassDefImpl::title() const
   {
     pageTitle = theTranslator->trCompoundReferenceFortran(displayName(),
               m_impl->compType,
-              m_impl->tempArgs != 0);
+              !m_impl->tempArgs.empty());
   }
   else if (lang==SrcLangExt_Slice)
   {
@@ -2850,7 +2838,7 @@ QCString ClassDefImpl::title() const
     {
       pageTitle = theTranslator->trCompoundReference(displayName(),
                 m_impl->compType == Interface && getLanguage()==SrcLangExt_ObjC ? Class : m_impl->compType,
-                m_impl->tempArgs != 0);
+                !m_impl->tempArgs.empty());
     }
   }
   return pageTitle;
@@ -3362,55 +3350,33 @@ void ClassDefImpl::addTypeConstraint(const QCString &typeConstraint,const QCStri
 // Java Type Constrains: A<T extends C & I>
 void ClassDefImpl::addTypeConstraints()
 {
-  if (m_impl->tempArgs)
+  for (const Argument &a : m_impl->tempArgs)
   {
-    ArgumentListIterator ali(*m_impl->tempArgs);
-    Argument *a;
-    for (;(a=ali.current());++ali)
+    if (!a.typeConstraint.isEmpty())
     {
-      if (!a->typeConstraint.isEmpty())
+      QCString typeConstraint;
+      int i=0,p=0;
+      while ((i=a.typeConstraint.find('&',p))!=-1) // typeConstraint="A &I" for C<T extends A & I>
       {
-        QCString typeConstraint;
-        int i=0,p=0;
-        while ((i=a->typeConstraint.find('&',p))!=-1) // typeConstraint="A &I" for C<T extends A & I>
-        {
-          typeConstraint = a->typeConstraint.mid(p,i-p).stripWhiteSpace();
-          addTypeConstraint(typeConstraint,a->type);
-          p=i+1;
-        }
-        typeConstraint = a->typeConstraint.right(a->typeConstraint.length()-p).stripWhiteSpace();
-        addTypeConstraint(typeConstraint,a->type);
+        typeConstraint = a.typeConstraint.mid(p,i-p).stripWhiteSpace();
+        addTypeConstraint(typeConstraint,a.type);
+        p=i+1;
       }
+      typeConstraint = a.typeConstraint.right(a.typeConstraint.length()-p).stripWhiteSpace();
+      addTypeConstraint(typeConstraint,a.type);
     }
   }
 }
 
 // C# Type Constraints: D<T> where T : C, I
-void ClassDefImpl::setTypeConstraints(ArgumentList *al)
+void ClassDefImpl::setTypeConstraints(const ArgumentList &al)
 {
-  if (al==0) return;
-  if (!m_impl->typeConstraints) delete m_impl->typeConstraints;
-  m_impl->typeConstraints = new ArgumentList;
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (;(a=ali.current());++ali)
-  {
-    m_impl->typeConstraints->append(new Argument(*a));
-  }
+  m_impl->typeConstraints = al;
 }
 
-void ClassDefImpl::setTemplateArguments(ArgumentList *al)
+void ClassDefImpl::setTemplateArguments(const ArgumentList &al)
 {
-  if (al==0) return;
-  if (m_impl->tempArgs) delete m_impl->tempArgs; // delete old list if needed
-  //printf("setting template args '%s' for '%s'\n",tempArgListToString(al,getLanguage()).data(),name().data());
-  m_impl->tempArgs=new ArgumentList;
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (;(a=ali.current());++ali)
-  {
-    m_impl->tempArgs->append(new Argument(*a));
-  }
+  m_impl->tempArgs = al;
 }
 
 /*! Returns \c TRUE iff this class or a class inheriting from this class
@@ -3704,8 +3670,8 @@ void ClassDefImpl::mergeMembers()
                   if (srcCd==dstCd || dstCd->isBaseClass(srcCd,TRUE))
                     // member is in the same or a base class
                   {
-                    const ArgumentList *srcAl = srcMd->argumentList();
-                    const ArgumentList *dstAl = dstMd->argumentList();
+                    ArgumentList &srcAl = srcMd->argumentList();
+                    ArgumentList &dstAl = dstMd->argumentList();
                     found=matchArguments2(
                         srcMd->getOuterScope(),srcMd->getFileDef(),srcAl,
                         dstMd->getOuterScope(),dstMd->getFileDef(),dstAl,
@@ -4099,203 +4065,6 @@ void ClassDefImpl::addUsedByClass(ClassDef *cd,const char *accessName,
 }
 
 
-#if 0
-/*! Builds up a dictionary of all classes that are used by the state of this
- *  class (the "implementation").
- *  Must be called before mergeMembers() is called!
- */
-
-void ClassDefImpl::determineImplUsageRelation()
-{
-  MemberNameInfoSDict::Iterator mnili(*m_impl->allMemberNameInfoSDict);
-  MemberNameInfo *mni;
-  for (;(mni=mnili.current());++mnili)
-  {
-    MemberNameInfoIterator mnii(*mni);
-    MemberInfo *mi;
-    for (mnii.toFirst();(mi=mnii.current());++mnii)
-    {
-      MemberDef *md=mi->memberDef;
-      if (md->isVariable()) // for each member variable in this class
-      {
-        QCString type=removeRedundantWhiteSpace(md->typeString());
-        //printf("in class %s found var type='%s' name='%s'\n",
-        //            name().data(),type.data(),md->name().data());
-        int pos=0;
-        QCString usedClassName;
-        QCString templSpec;
-        bool found=FALSE;
-        while (extractClassNameFromType(type,pos,usedClassName,templSpec)!=-1 && !found)
-        {
-          //printf("usedClassName='%s' templSpec=%s\n",usedClassName.data(),templSpec.data());
-          // check if usedClassName is a template argument of its class
-          ClassDef *cd=md->getClassDef();
-          if (cd && cd->templateArguments())
-          {
-            ArgumentListIterator ali(*cd->templateArguments());
-            Argument *arg;
-            int count=0;
-            for (ali.toFirst();(arg=ali.current());++ali,++count)
-            {
-              if (arg->name==usedClassName) // type is a template argument
-              {
-                found=TRUE;
-                if (m_impl->usesImplClassDict==0) m_impl->usesImplClassDict = new UsesClassDict(257);
-                cd = new ClassDef(cd->getDefFileName(),cd->getDefLine(),
-                    usedClassName,ClassDef::Class);
-                cd->setIsTemplateBaseClass(count);
-                UsesClassDef *ucd = new UsesClassDef(cd);
-                m_impl->usesImplClassDict->insert(cd->name(),ucd);
-                ucd->templSpecifiers = templSpec;
-                ucd->addAccessor(md->name());
-                Doxygen::hiddenClasses.append(cd);
-                //printf("Adding used template argument %s to class %s\n",
-                //    cd->name().data(),name().data());
-                //printf("Adding accessor %s to class %s\n",
-                //    md->name().data(),ucd->classDef->name().data());
-              }
-            }
-          }
-
-          if (!found)
-          {
-            cd=0;
-            if (getNamespaceDef()!=0)
-            {
-              cd=getResolvedClass(getNamespaceDef()->name()+"::"+usedClassName,0,&templSpec);
-            }
-            if (cd==0) cd=getResolvedClass(name()+"::"+usedClassName,0,&templSpec);
-            if (cd==0) cd=getResolvedClass(usedClassName,0,&templSpec); // TODO: also try in-between scopes!
-            //printf("Search for class %s result=%p\n",usedClassName.data(),cd);
-            if (cd) // class exists
-            {
-              found=TRUE;
-              if (m_impl->usesImplClassDict==0)
-              {
-                m_impl->usesImplClassDict = new UsesClassDict(257);
-                m_impl->usesImplClassDict->setAutoDelete(TRUE);
-              }
-              UsesClassDef *ucd=m_impl->usesImplClassDict->find(cd->name());
-              if (ucd==0 || ucd->templSpecifiers!=templSpec)
-              {
-                ucd = new UsesClassDef(cd);
-                m_impl->usesImplClassDict->insert(cd->name(),ucd);
-                ucd->templSpecifiers = templSpec;
-                //printf("Adding used class %s to class %s\n",
-                //    cd->name().data(),name().data());
-              }
-              ucd->addAccessor(md->name());
-              //printf("Adding accessor %s to class %s\n",
-              //    md->name().data(),ucd->classDef->name().data());
-            }
-          }
-        }
-      }
-    }
-  }
-#ifdef DUMP
-  if (m_impl->usesClassDict)
-  {
-    msg("Class %s uses the following classes:\n",name().data());
-    UsesClassDictIterator ucdi(*m_impl->usesClassDict);
-    UsesClassDef *ucd;
-    for (;(ucd=ucdi.current());++ucdi)
-    {
-      msg("  %s via ",ucd->classDef->name().data());
-      QDictIterator<void> dvi(*ucd->accessors);
-      const char *s;
-      for (;(s=dvi.currentKey());++dvi)
-      {
-        msg("%s ",s);
-      }
-      msg("\n");
-    }
-  }
-#endif
-}
-
-//----------------------------------------------------------------------------
-
-// I have disabled this code because the graphs it renders quickly become
-// too large to be of practical use.
-
-void ClassDefImpl::addUsedInterfaceClasses(MemberDef *md,const char *typeStr)
-{
-  QCString type = typeStr;
-  static const QRegExp re("[a-z_A-Z][a-z_A-Z0-9:]*");
-  int p=0,i,l;
-  while ((i=re.match(type,p,&l))!=-1) // for each class name in the type
-  {
-    ClassDef *cd=getClass(name()+"::"+type.mid(i,l));
-    if (cd==0) cd=getClass(type.mid(i,l)); // TODO: also try in-between scopes!
-    if (cd && cd!=this && !isBaseClass(cd))
-    {
-      if (m_impl->usesIntfClassDict==0)
-      {
-        m_impl->usesIntfClassDict = new UsesClassDict(257);
-      }
-      UsesClassDef *ucd=m_impl->usesIntfClassDict->find(cd->name());
-      if (ucd==0)
-      {
-        ucd = new UsesClassDef(cd);
-        m_impl->usesIntfClassDict->insert(cd->name(),ucd);
-        //printf("in class '%s' adding used intf class '%s'\n",
-        //  name().data(),cd->name().data());
-      }
-      ucd->addAccessor(md->name());
-      //printf("in class '%s' adding accessor '%s' to class '%s'\n",
-      //    name().data(),md->name().data(),ucd->classDef->name().data());
-    }
-    p=i+l;
-  }
-}
-
-void ClassDefImpl::determineIntfUsageRelation()
-{
-  MemberNameInfoSDict::Iterator mnili(*m_impl->allMemberNameInfoList);
-  MemberNameInfo *mni;
-  for (;(mni=mnili.current());++mnili)
-  {
-    MemberNameInfoIterator mnii(*mni);
-    MemberInfo *mi;
-    for (mnii.toFirst();(mi=mnii.current());++mnii)
-    {
-      MemberDef *md=mi->memberDef;
-
-      // compute the protection level for this member
-      Protection protect=md->protection();
-      if (mi->prot==Protected) // inherited protection
-      {
-        if (protect==Public) protect=Protected;
-        else if (protect==Protected) protect=Private;
-      }
-
-      if (!md->name().isEmpty() && md->name()[0]!='@' &&
-          (mi->prot!=Private && protect!=Private)
-         )
-      {
-        // add classes found in the return type
-        addUsedInterfaceClasses(md,md->typeString());
-        ArgumentList *al = md->argumentList();
-        if (al) // member has arguments
-        {
-          // add classes found in the types of the argument list
-          ArgumentListIterator ali(*al);
-          Argument *a;
-          for (;(a=ali.current());++ali)
-          {
-            if (!a->type.isEmpty() && a->type.at(0)!='@')
-            {
-              addUsedInterfaceClasses(md,a->type);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-#endif
-
 QCString ClassDefImpl::compoundTypeString() const
 {
   if (getLanguage()==SrcLangExt_Fortran)
@@ -4431,46 +4200,6 @@ Definition *ClassDefImpl::findInnerCompound(const char *name) const
   return result;
 }
 
-//void ClassDefImpl::initTemplateMapping()
-//{
-//  m_impl->templateMapping->clear();
-//  ArgumentList *al = templateArguments();
-//  if (al)
-//  {
-//    ArgumentListIterator ali(*al);
-//    Argument *arg;
-//    for (ali.toFirst();(arg=ali.current());++ali)
-//    {
-//      setTemplateArgumentMapping(arg->name,arg->defval);
-//    }
-//  }
-//}
-//void ClassDefImpl::setTemplateArgumentMapping(const char *formal,const char *actual)
-//{
-//  //printf("ClassDefImpl::setTemplateArgumentMapping(%s,%s)\n",formal,actual);
-//  if (m_impl->templateMapping && formal)
-//  {
-//    if (m_impl->templateMapping->find(formal))
-//    {
-//      m_impl->templateMapping->remove(formal);
-//    }
-//    m_impl->templateMapping->insert(formal,new QCString(actual));
-//  }
-//}
-//
-//QCString ClassDefImpl::getTemplateArgumentMapping(const char *formal) const
-//{
-//  if (m_impl->templateMapping && formal)
-//  {
-//    QCString *s = m_impl->templateMapping->find(formal);
-//    if (s)
-//    {
-//      return *s;
-//    }
-//  }
-//  return "";
-//}
-
 ClassDef *ClassDefImpl::insertTemplateInstance(const QCString &fileName,
     int startLine, int startColumn, const QCString &templSpec,bool &freshInstance) const
 {
@@ -4552,12 +4281,11 @@ void ClassDefImpl::addMembersToTemplateInstance(const ClassDef *cd,const char *t
     MemberInfo *mi;
     for (mnii.toFirst();(mi=mnii.current());++mnii)
     {
-      ArgumentList *actualArguments = new ArgumentList;
+      ArgumentList actualArguments;
       stringToArgumentList(templSpec,actualArguments);
       MemberDef *md = mi->memberDef;
       MemberDef *imd = md->createTemplateInstanceMember(
                           cd->templateArguments(),actualArguments);
-      delete actualArguments;
       //printf("%s->setMemberClass(%p)\n",imd->name().data(),this);
       imd->setMemberClass(this);
       imd->setTemplateMaster(md);
@@ -4607,25 +4335,24 @@ bool ClassDefImpl::isReference() const
   }
 }
 
-void ClassDefImpl::getTemplateParameterLists(QList<ArgumentList> &lists) const
+std::vector<ArgumentList> ClassDefImpl::getTemplateParameterLists() const
 {
+  std::vector<ArgumentList> result;
   Definition *d=getOuterScope();
-  if (d)
+  while (d && d->definitionType()==Definition::TypeClass)
   {
-    if (d->definitionType()==Definition::TypeClass)
-    {
-      ClassDef *cd=dynamic_cast<ClassDef *>(d);
-      cd->getTemplateParameterLists(lists);
-    }
+    result.insert(result.begin(),dynamic_cast<ClassDef*>(d)->templateArguments());
+    d = d->getOuterScope();
   }
-  if (templateArguments())
+  if (!templateArguments().empty())
   {
-    lists.append(templateArguments());
+    result.push_back(templateArguments());
   }
+  return result;
 }
 
 QCString ClassDefImpl::qualifiedNameWithTemplateParameters(
-    QList<ArgumentList> *actualParams,int *actualParamIndex) const
+    const std::vector<ArgumentList> *actualParams,int *actualParamIndex) const
 {
   //static bool optimizeOutputJava = Config_getBool(OPTIMIZE_OUTPUT_JAVA);
   static bool hideScopeNames = Config_getBool(HIDE_SCOPE_NAMES);
@@ -4659,12 +4386,11 @@ QCString ClassDefImpl::qualifiedNameWithTemplateParameters(
   //}
   //printf("m_impl->lang=%d clName=%s isSpecialization=%d\n",getLanguage(),clName.data(),isSpecialization);
   scName+=clName;
-  ArgumentList *al=0;
-  if (templateArguments())
+  if (!templateArguments().empty())
   {
-    if (actualParams && *actualParamIndex<(int)actualParams->count())
+    if (actualParams && *actualParamIndex<(int)actualParams->size())
     {
-      al = actualParams->at(*actualParamIndex);
+      const ArgumentList &al = actualParams->at(*actualParamIndex);
       if (!isSpecialization)
       {
         scName+=tempArgListToString(al,lang);
@@ -5238,7 +4964,7 @@ Protection ClassDefImpl::protection() const
   return m_impl->prot;
 }
 
-ArgumentList *ClassDefImpl::templateArguments() const
+const ArgumentList &ClassDefImpl::templateArguments() const
 {
   return m_impl->tempArgs;
 }
@@ -5265,7 +4991,7 @@ const ClassDef *ClassDefImpl::templateMaster() const
 
 bool ClassDefImpl::isTemplate() const
 {
-  return m_impl->tempArgs!=0;
+  return !m_impl->tempArgs.empty();
 }
 
 IncludeInfo *ClassDefImpl::includeInfo() const
@@ -5551,7 +5277,7 @@ const FileList &ClassDefImpl::usedFiles() const
   return m_impl->files;
 }
 
-const ArgumentList *ClassDefImpl::typeConstraints() const
+const ArgumentList &ClassDefImpl::typeConstraints() const
 {
   return m_impl->typeConstraints;
 }
diff --git a/src/classdef.h b/src/classdef.h
index e64f0eb..c9cc806 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -18,6 +18,8 @@
 #ifndef CLASSDEF_H
 #define CLASSDEF_H
 
+#include <vector>
+
 #include <qlist.h>
 #include <qdict.h>
 #include <qptrdict.h>
@@ -154,10 +156,9 @@ class ClassDef : virtual public Definition
     /** show this class in the declaration section of its parent? */
     virtual bool visibleInParentsDeclList() const = 0;
 
-    /** Returns the template arguments of this class 
-     *  Will return 0 if not applicable.
+    /** Returns the template arguments of this class
      */
-    virtual ArgumentList *templateArguments() const = 0;
+    virtual const ArgumentList &templateArguments() const = 0;
 
     /** Returns the namespace this compound is in, or 0 if it has a global
      *  scope.
@@ -228,10 +229,10 @@ class ClassDef : virtual public Definition
      *  will return a list with one ArgumentList containing one argument
      *  with type="class" and name="T".
      */
-    virtual void getTemplateParameterLists(QList<ArgumentList> &lists) const = 0;
+    virtual std::vector<ArgumentList> getTemplateParameterLists() const = 0;
 
     virtual QCString qualifiedNameWithTemplateParameters(
-        QList<ArgumentList> *actualParams=0,int *actualParamIndex=0) const = 0;
+        const std::vector<ArgumentList> *actualParams=0,int *actualParamIndex=0) const = 0;
 
     /** Returns TRUE if there is at least one pure virtual member in this
      *  class.
@@ -308,7 +309,7 @@ class ClassDef : virtual public Definition
     virtual QCString generatedFromFiles() const = 0;
     virtual const FileList &usedFiles() const = 0;
 
-    virtual const ArgumentList *typeConstraints() const = 0;
+    virtual const ArgumentList &typeConstraints() const = 0;
     virtual const ExampleSDict *exampleList() const = 0;
     virtual bool hasExamples() const = 0;
     virtual QCString getMemberListFileName() const = 0;
@@ -331,10 +332,10 @@ class ClassDef : virtual public Definition
     virtual void setCompoundType(CompoundType t) = 0;
     virtual void setClassName(const char *name) = 0;
     virtual void setClassSpecifier(uint64 spec) = 0;
-    virtual void setTemplateArguments(ArgumentList *al) = 0;
+    virtual void setTemplateArguments(const ArgumentList &al) = 0;
     virtual void setTemplateBaseClassNames(QDict<int> *templateNames) = 0;
     virtual void setTemplateMaster(const ClassDef *tm) = 0;
-    virtual void setTypeConstraints(ArgumentList *al) = 0;
+    virtual void setTypeConstraints(const ArgumentList &al) = 0;
     virtual void setCategoryOf(ClassDef *cd) = 0;
     virtual void setUsedOnly(bool b) = 0;
     virtual void setTagLessReference(ClassDef *cd) = 0;
diff --git a/src/classlist.cpp b/src/classlist.cpp
index 93ae8aa..6928c52 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -167,8 +167,8 @@ void GenericsSDict::insert(const QCString &key,ClassDef *cd)
   int i=key.find('<');
   if (i==-1) return;
   ArgumentList argList;
-  stringToArgumentList(key.mid(i),&argList);
-  int c = argList.count();
+  stringToArgumentList(key.mid(i),argList);
+  int c = argList.size();
   if (c==0) return;
   GenericsCollection *collection = m_dict.find(key.left(i));
   if (collection==0) // new name
@@ -200,8 +200,8 @@ ClassDef *GenericsSDict::find(const QCString &key)
     if (collection)
     {
       ArgumentList argList;
-      stringToArgumentList(key.mid(i),&argList);
-      int c = argList.count();
+      stringToArgumentList(key.mid(i),argList);
+      int c = argList.size();
       return collection->find(c);
     }
   }
diff --git a/src/code.l b/src/code.l
index 9428432..46de92c 100644
--- a/src/code.l
+++ b/src/code.l
@@ -276,7 +276,7 @@ void VariableContext::addVariable(const QCString &type,const QCString &name)
            // otherwise look for global class definitions
            (varType=getResolvedClass(g_currentDefinition,g_sourceFileDef,typeName,0,0,TRUE,TRUE))
 	 ) && // and it must be a template
-         varType->templateArguments())
+         !varType->templateArguments().empty())
     {
       newDef = varType->getVariableInstance( templateArgs );
     }
@@ -679,14 +679,10 @@ static void addUsingDirective(const char *name)
 static void setParameterList(const MemberDef *md)
 {
   g_classScope = md->getClassDef() ? md->getClassDef()->name().data() : "";
-  const ArgumentList *al = md->argumentList();
-  if (al==0) return;
-  ArgumentListIterator it(*al);
-  const Argument *a;
-  for (;(a=it.current());++it)
-  {
-    g_parmName = a->name.copy();
-    g_parmType = a->type.copy();
+  for (const Argument &a : md->argumentList())
+  {
+    g_parmName = a.name;
+    g_parmType = a.type;
     int i = g_parmType.find('*');
     if (i!=-1) g_parmType = g_parmType.left(i);
     i = g_parmType.find('&');
diff --git a/src/context.cpp b/src/context.cpp
index 8b7643a..361bfa2 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -2381,7 +2381,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
           addTemplateDecls(parent,tl);
         }
         const ClassDef *cd=dynamic_cast<const ClassDef *>(d);
-        if (cd->templateArguments())
+        if (!cd->templateArguments().empty())
         {
           ArgumentListContext *al = ArgumentListContext::alloc(cd->templateArguments(),cd,relPathAsString());
           // since a TemplateVariant does take ownership of the object, we add it
@@ -2422,10 +2422,10 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
     }
     TemplateVariant typeConstraints() const
     {
-      if (m_classDef->typeConstraints())
+      if (!m_classDef->typeConstraints().empty())
       {
         Cachable &cache = getCache();
-        if (!cache.typeConstraints && m_classDef->typeConstraints())
+        if (!cache.typeConstraints && !m_classDef->typeConstraints().empty())
         {
           cache.typeConstraints.reset(ArgumentListContext::alloc(m_classDef->typeConstraints(),m_classDef,relPathAsString()));
         }
@@ -4529,7 +4529,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     TemplateVariant templateArgs() const
     {
       Cachable &cache = getCache();
-      if (!cache.templateArgs && m_memberDef->templateArguments())
+      if (!cache.templateArgs && !m_memberDef->templateArguments().empty())
       {
         cache.templateArgs.reset(ArgumentListContext::alloc(m_memberDef->templateArguments(),m_memberDef,relPathAsString()));
       }
@@ -4644,7 +4644,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
       return createLinkedText(m_memberDef,relPathAsString(),
                               m_memberDef->displayDefinition());
     }
-    const ArgumentList *getDefArgList() const
+    const ArgumentList &getDefArgList() const
     {
       return (m_memberDef->isDocsForDefinition()) ?
               m_memberDef->argumentList() : m_memberDef->declArgumentList();
@@ -4654,8 +4654,8 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
       Cachable &cache = getCache();
       if (!cache.arguments)
       {
-        const ArgumentList *defArgList = getDefArgList();
-        if (defArgList && !m_memberDef->isProperty())
+        const ArgumentList &defArgList = getDefArgList();
+        if (!m_memberDef->isProperty())
         {
           cache.arguments.reset(ArgumentListContext::alloc(defArgList,m_memberDef,relPathAsString()));
         }
@@ -4668,35 +4668,31 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     }
     TemplateVariant hasParameters() const
     {
-      return getDefArgList()!=0;
+      return !getDefArgList().empty();
     }
     TemplateVariant hasConstQualifier() const
     {
-      const ArgumentList *al = getDefArgList();
-      return al ? al->constSpecifier : FALSE;
+      return getDefArgList().constSpecifier;
     }
     TemplateVariant hasVolatileQualifier() const
     {
-      const ArgumentList *al = getDefArgList();
-      return al ? al->volatileSpecifier : FALSE;
+      return getDefArgList().volatileSpecifier;
     }
     TemplateVariant hasRefQualifierLValue() const
     {
-      const ArgumentList *al = getDefArgList();
-      return al ? al->refQualifier==RefQualifierLValue : FALSE;
+      return getDefArgList().refQualifier==RefQualifierLValue;
     }
     TemplateVariant hasRefQualifierRValue() const
     {
-      const ArgumentList *al = getDefArgList();
-      return al ? al->refQualifier==RefQualifierRValue : FALSE;
+      return getDefArgList().refQualifier==RefQualifierRValue;
     }
     TemplateVariant trailingReturnType() const
     {
-      const ArgumentList *al = getDefArgList();
-      if (al && !al->trailingReturnType.isEmpty())
+      const ArgumentList &al = getDefArgList();
+      if (!al.trailingReturnType.isEmpty())
       {
         return createLinkedText(m_memberDef,relPathAsString(),
-                                al->trailingReturnType);
+                                al.trailingReturnType);
       }
       else
       {
@@ -4710,13 +4706,11 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     void addTemplateDecls(TemplateList *tl) const
     {
       const ClassDef *cd=m_memberDef->getClassDef();
-      if (m_memberDef->definitionTemplateParameterLists())
+      if (!m_memberDef->definitionTemplateParameterLists().empty())
       {
-        QListIterator<ArgumentList> ali(*m_memberDef->definitionTemplateParameterLists());
-        ArgumentList *tal;
-        for (ali.toFirst();(tal=ali.current());++ali)
+        for (const ArgumentList &tal : m_memberDef->definitionTemplateParameterLists())
         {
-          if (tal->count()>0)
+          if (!tal.empty())
           {
             ArgumentListContext *al = ArgumentListContext::alloc(tal,m_memberDef,relPathAsString());
             tl->append(al);
@@ -4727,21 +4721,16 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
       {
         if (cd && !m_memberDef->isRelated() && !m_memberDef->isTemplateSpecialization())
         {
-          QList<ArgumentList> tempParamLists;
-          cd->getTemplateParameterLists(tempParamLists);
-          //printf("#tempParamLists=%d\n",tempParamLists.count());
-          QListIterator<ArgumentList> ali(tempParamLists);
-          ArgumentList *tal;
-          for (ali.toFirst();(tal=ali.current());++ali)
+          for (const ArgumentList &tal : cd->getTemplateParameterLists())
           {
-            if (tal->count()>0)
+            if (!tal.empty())
             {
               ArgumentListContext *al = ArgumentListContext::alloc(tal,m_memberDef,relPathAsString());
               tl->append(al);
             }
           }
         }
-        if (m_memberDef->templateArguments()) // function template prefix
+        if (!m_memberDef->templateArguments().empty()) // function template prefix
         {
           ArgumentListContext *al = ArgumentListContext::alloc(
               m_memberDef->templateArguments(),m_memberDef,relPathAsString());
@@ -4785,18 +4774,15 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
       Cachable &cache = getCache();
       if (!cache.paramDocs)
       {
-        if (m_memberDef->argumentList() && m_memberDef->argumentList()->hasDocumentation())
+        if (m_memberDef->argumentList().hasDocumentation())
         {
           QCString paramDocs;
-          ArgumentListIterator ali(*m_memberDef->argumentList());
-          Argument *a;
-          // convert the parameter documentation into a list of @param commands
-          for (ali.toFirst();(a=ali.current());++ali)
+          for (Argument &a : m_memberDef->argumentList())
           {
-            if (a->hasDocumentation())
+            if (a.hasDocumentation())
             {
-              QCString direction = extractDirection(a->docs);
-              paramDocs+="@param"+direction+" "+a->name+" "+a->docs;
+              QCString direction = extractDirection(a.docs);
+              paramDocs+="@param"+direction+" "+a.name+" "+a.docs;
             }
           }
           cache.paramDocs.reset(new TemplateVariant(parseDoc(m_memberDef,
@@ -4929,7 +4915,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     TemplateVariant typeConstraints() const
     {
       Cachable &cache = getCache();
-      if (!cache.typeConstraints && m_memberDef->typeConstraints())
+      if (cache.typeConstraints && !m_memberDef->typeConstraints().empty())
       {
         cache.typeConstraints.reset(ArgumentListContext::alloc(m_memberDef->typeConstraints(),m_memberDef,relPathAsString()));
       }
@@ -9413,7 +9399,7 @@ TemplateListIntf::ConstIterator *InheritedMemberInfoListContext::createIterator(
 class ArgumentContext::Private
 {
   public:
-    Private(const Argument *arg,const Definition *def,const QCString &relPath) :
+    Private(const Argument &arg,const Definition *def,const QCString &relPath) :
       m_argument(arg), m_def(def), m_relPath(relPath)
     {
       static bool init=FALSE;
@@ -9435,33 +9421,33 @@ class ArgumentContext::Private
     }
     TemplateVariant type() const
     {
-      return createLinkedText(m_def,m_relPath,m_argument->type);
+      return createLinkedText(m_def,m_relPath,m_argument.type);
     }
     TemplateVariant attrib() const
     {
-      return m_argument->attrib;
+      return m_argument.attrib;
     }
     TemplateVariant name() const
     {
-      return m_argument->name;
+      return m_argument.name;
     }
     TemplateVariant defVal() const
     {
-      return createLinkedText(m_def,m_relPath,m_argument->defval);
+      return createLinkedText(m_def,m_relPath,m_argument.defval);
     }
     TemplateVariant array() const
     {
-      return m_argument->array;
+      return m_argument.array;
     }
     TemplateVariant docs() const
     {
       if (!m_cache.docs && m_def)
       {
-        if (!m_argument->docs.isEmpty())
+        if (!m_argument.docs.isEmpty())
         {
           m_cache.docs.reset(new TemplateVariant(
                              parseDoc(m_def,m_def->docFile(),m_def->docLine(),
-                             m_relPath,m_argument->docs,TRUE)));
+                             m_relPath,m_argument.docs,TRUE)));
         }
         else
         {
@@ -9472,7 +9458,7 @@ class ArgumentContext::Private
     }
     TemplateVariant namePart() const
     {
-      QCString result = m_argument->attrib;
+      QCString result = m_argument.attrib;
       int l = result.length();
       if (l>2 && result.at(0)=='[' && result.at(l-1)==']')
       {
@@ -9482,7 +9468,7 @@ class ArgumentContext::Private
       return result;
     }
   private:
-    const Argument *m_argument;
+    const Argument &m_argument;
     const Definition *m_def;
     QCString m_relPath;
     struct Cachable
@@ -9496,7 +9482,7 @@ class ArgumentContext::Private
 
 PropertyMapper<ArgumentContext::Private> ArgumentContext::Private::s_inst;
 
-ArgumentContext::ArgumentContext(const Argument *al,const Definition *def,const QCString &relPath) : RefCountedContext("ArgumentContext")
+ArgumentContext::ArgumentContext(const Argument &al,const Definition *def,const QCString &relPath) : RefCountedContext("ArgumentContext")
 {
   p = new Private(al,def,relPath);
 }
@@ -9517,7 +9503,7 @@ TemplateVariant ArgumentContext::get(const char *name) const
 class ArgumentListContext::Private : public GenericNodeListContext
 {
   public:
-    void addArgument(const Argument *arg,const Definition *def,const QCString &relPath)
+    void addArgument(const Argument &arg,const Definition *def,const QCString &relPath)
     {
       append(ArgumentContext::alloc(arg,def,relPath));
     }
@@ -9528,18 +9514,13 @@ ArgumentListContext::ArgumentListContext() : RefCountedContext("ArgumentListCont
   p = new Private;
 }
 
-ArgumentListContext::ArgumentListContext(const ArgumentList *list,
+ArgumentListContext::ArgumentListContext(const ArgumentList &list,
                         const Definition *def,const QCString &relPath) : RefCountedContext("ArgumentListContext")
 {
   p = new Private;
-  if (list)
+  for (const Argument &arg : list)
   {
-    ArgumentListIterator ali(*list);
-    const Argument *arg;
-    for (ali.toFirst();(arg=ali.current());++ali)
-    {
-      p->addArgument(arg,def,relPath);
-    }
+    p->addArgument(arg,def,relPath);
   }
 }
 
diff --git a/src/context.h b/src/context.h
index ecd1227..fc1278b 100644
--- a/src/context.h
+++ b/src/context.h
@@ -1138,7 +1138,7 @@ class AllMembersListContext : public RefCountedContext, public TemplateListIntf
 class ArgumentContext : public RefCountedContext, public TemplateStructIntf
 {
   public:
-    static ArgumentContext *alloc(const Argument *arg,const Definition *def,const QCString &relPath)
+    static ArgumentContext *alloc(const Argument &arg,const Definition *def,const QCString &relPath)
     { return new ArgumentContext(arg,def,relPath); }
 
     // TemplateStructIntf methods
@@ -1147,7 +1147,7 @@ class ArgumentContext : public RefCountedContext, public TemplateStructIntf
     virtual int release() { return RefCountedContext::release(); }
 
   private:
-    ArgumentContext(const Argument *arg,const Definition *def,const QCString &relPath);
+    ArgumentContext(const Argument &arg,const Definition *def,const QCString &relPath);
    ~ArgumentContext();
     class Private;
     Private *p;
@@ -1159,7 +1159,7 @@ class ArgumentListContext : public RefCountedContext, public TemplateListIntf
 {
   public:
     static ArgumentListContext *alloc() { return new ArgumentListContext; }
-    static ArgumentListContext *alloc(const ArgumentList *al,const Definition *def,const QCString &relPath)
+    static ArgumentListContext *alloc(const ArgumentList &al,const Definition *def,const QCString &relPath)
     { return new ArgumentListContext(al,def,relPath); }
 
     // TemplateListIntf
@@ -1171,7 +1171,7 @@ class ArgumentListContext : public RefCountedContext, public TemplateListIntf
 
   private:
     ArgumentListContext();
-    ArgumentListContext(const ArgumentList *al,const Definition *def,const QCString &relPath);
+    ArgumentListContext(const ArgumentList &al,const Definition *def,const QCString &relPath);
    ~ArgumentListContext();
     class Private;
     Private *p;
diff --git a/src/defargs.h b/src/defargs.h
index 34a19a2..1b08671 100644
--- a/src/defargs.h
+++ b/src/defargs.h
@@ -21,7 +21,7 @@
 class ArgumentList;
 class QCString;
 
-extern void stringToArgumentList(const char *argsString,ArgumentList* argList,
+extern void stringToArgumentList(const char *argsString,ArgumentList& argList,
                                  QCString *extraTypeChars=0);
 
 #endif
diff --git a/src/defargs.l b/src/defargs.l
index 070103a..a213688 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -387,12 +387,12 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					      int i=l-1;
 					      while (i>=0 && (isspace((uchar)g_curArgTypeName.at(i)) || g_curArgTypeName.at(i)=='.')) i--;
 					      while (i>=0 && (isId(g_curArgTypeName.at(i)) || g_curArgTypeName.at(i)=='$')) i--;
-					      Argument *a = new Argument;
-					      a->attrib  = g_curArgAttrib.copy();
-                                              a->typeConstraint = g_curTypeConstraint.stripWhiteSpace();
+					      Argument a;
+					      a.attrib  = g_curArgAttrib.copy();
+                                              a.typeConstraint = g_curTypeConstraint.stripWhiteSpace();
 					      //printf("a->type=%s a->name=%s i=%d l=%d\n",
 					      //        a->type.data(),a->name.data(),i,l);
-					      a->array.resize(0);
+					      a.array.resize(0);
 					      if (i==l-1 && g_curArgTypeName.at(i)==')') // function argument
 					      {
 						int bi=g_curArgTypeName.find('(');
@@ -401,67 +401,67 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 						while (fi>=0 && (isId(g_curArgTypeName.at(fi)) || g_curArgTypeName.at(fi)==':')) fi--;
 						if (fi>=0)
 						{
-						  a->type  = g_curArgTypeName.left(fi+1);
-						  a->name  = g_curArgTypeName.mid(fi+1,bi-fi-1).stripWhiteSpace();
-						  a->array = g_curArgTypeName.right(l-bi);
+						  a.type  = g_curArgTypeName.left(fi+1);
+						  a.name  = g_curArgTypeName.mid(fi+1,bi-fi-1).stripWhiteSpace();
+						  a.array = g_curArgTypeName.right(l-bi);
 						}
 						else
 						{
-						  a->type = g_curArgTypeName;
+						  a.type = g_curArgTypeName;
 						}
 					      }
 					      else if (i>=0 && g_curArgTypeName.at(i)!=':')
 					      { // type contains a name
-						a->type = removeRedundantWhiteSpace(g_curArgTypeName.left(i+1)).stripWhiteSpace();
-						a->name = g_curArgTypeName.right(l-i-1).stripWhiteSpace();
+						a.type = removeRedundantWhiteSpace(g_curArgTypeName.left(i+1)).stripWhiteSpace();
+						a.name = g_curArgTypeName.right(l-i-1).stripWhiteSpace();
 
 						// if the type becomes a type specifier only then we make a mistake
 						// and need to correct it to avoid seeing a nameless parameter
 						// "struct A" as a parameter with type "struct" and name "A".
 						int sv=0;
-						if      (a->type.left(6)=="const ")    sv=6;
-						else if (a->type.left(9)=="volatile ") sv=9;
+						if      (a.type.left(6)=="const ")    sv=6;
+						else if (a.type.left(9)=="volatile ") sv=9;
 
-						if (a->type.mid(sv)=="struct"    ||
-						    a->type.mid(sv)=="union"     ||
-						    a->type.mid(sv)=="class"     ||
-						    a->type.mid(sv)=="typename"  ||
-						    nameIsActuallyPartOfType(a->name)
+						if (a.type.mid(sv)=="struct"    ||
+						    a.type.mid(sv)=="union"     ||
+						    a.type.mid(sv)=="class"     ||
+						    a.type.mid(sv)=="typename"  ||
+						    nameIsActuallyPartOfType(a.name)
 						   )
 						{
-						  a->type = a->type + " " + a->name;
-						  a->name.resize(0);
+						  a.type = a.type + " " + a.name;
+						  a.name.resize(0);
 						}
 						//printf(" --> a->type='%s' a->name='%s'\n",a->type.data(),a->name.data());
 					      }
 					      else // assume only the type was specified, try to determine name later 
 					      {
-						a->type = removeRedundantWhiteSpace(g_curArgTypeName);  
+						a.type = removeRedundantWhiteSpace(g_curArgTypeName);  
 					      }
-                                              if (!a->type.isEmpty() && a->type.at(0)=='$') // typeless PHP name?
+                                              if (!a.type.isEmpty() && a.type.at(0)=='$') // typeless PHP name?
                                               {
-                                                a->name = a->type;
-                                                a->type = "";
+                                                a.name = a.type;
+                                                a.type = "";
                                               }
-					      a->array  += removeRedundantWhiteSpace(g_curArgArray);
+					      a.array  += removeRedundantWhiteSpace(g_curArgArray);
 					      //printf("array=%s\n",a->array.data());
-					      int alen = a->array.length();
-					      if (alen>2 && a->array.at(0)=='(' && 
-						            a->array.at(alen-1)==')') // fix-up for int *(a[10])
+					      int alen = a.array.length();
+					      if (alen>2 && a.array.at(0)=='(' && 
+						            a.array.at(alen-1)==')') // fix-up for int *(a[10])
 					      {
-						int i=a->array.find('[')-1;
-						a->array = a->array.mid(1,alen-2);
-						if (i>0 && a->name.isEmpty())
+						int i=a.array.find('[')-1;
+						a.array = a.array.mid(1,alen-2);
+						if (i>0 && a.name.isEmpty())
 						{
-						  a->name  = a->array.left(i).stripWhiteSpace();
-						  a->array = a->array.mid(i);
+						  a.name  = a.array.left(i).stripWhiteSpace();
+						  a.array = a.array.mid(i);
 						}
 					      }
-					      a->defval = g_curArgDefValue.copy();
+					      a.defval = g_curArgDefValue.copy();
 					      //printf("a->type=%s a->name=%s a->defval=\"%s\"\n",a->type.data(),a->name.data(),a->defval.data());
-					      a->docs   = g_curArgDocs.stripWhiteSpace();
+					      a.docs   = g_curArgDocs.stripWhiteSpace();
 					      //printf("Argument '%s' '%s' adding docs='%s'\n",a->type.data(),a->name.data(),a->docs.data());
-					      g_argList->append(a);
+					      g_argList->push_back(a);
 					    }
 					    g_curArgAttrib.resize(0);
 					    g_curArgTypeName.resize(0);
@@ -601,9 +601,8 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
  *              for complex types are written to
  */
  
-void stringToArgumentList(const char *argsString,ArgumentList* al,QCString *extraTypeChars)
+void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extraTypeChars)
 {
-  if (al==0) return; 
   if (argsString==0) return;
   printlex(yy_flex_debug, TRUE, __FILE__, NULL);
 
@@ -623,10 +622,14 @@ void stringToArgumentList(const char *argsString,ArgumentList* al,QCString *extr
   g_curArgTypeName.resize(0);
   g_curArgDefValue.resize(0);
   g_curArgName.resize(0);
-  g_argList = al;
+  g_argList = &al;
   defargsYYrestart( defargsYYin );
   BEGIN( Start );
   defargsYYlex();
+  if (g_argList->empty())
+  {
+    g_argList->noParameters = TRUE;
+  }
   if (extraTypeChars) *extraTypeChars=g_extraTypeChars;
   //printf("stringToArgumentList(%s) result=%s\n",argsString,argListToString(al).data());
   printlex(yy_flex_debug, FALSE, __FILE__, NULL);
diff --git a/src/defgen.cpp b/src/defgen.cpp
index aa9a1da..f5e12aa 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -144,71 +144,66 @@ void generateDEFForMember(MemberDef *md,
 
   if (isFunc) //function
   {
-    ArgumentList *declAl = new ArgumentList;
-    const ArgumentList *defAl = md->argumentList();
+    const ArgumentList &defAl = md->argumentList();
+    ArgumentList declAl;
     stringToArgumentList(md->argsString(),declAl);
     QCString fcnPrefix = "  " + memPrefix + "param-";
 
-    if (defAl && declAl->count()>0)
+    auto defIt = defAl.begin();
+    for (const Argument &a : declAl)
     {
-      ArgumentListIterator declAli(*declAl);
-      ArgumentListIterator defAli(*defAl);
-      Argument *a;
-      for (declAli.toFirst();(a=declAli.current());++declAli)
+      const Argument *defArg = 0;
+      if (defIt!=defAl.end())
       {
-        Argument *defArg = defAli.current();
-        t << memPrefix << "param = {" << endl;
-        if (!a->attrib.isEmpty())
-        {
-          t << fcnPrefix << "attributes = ";
-          writeDEFString(t,a->attrib);
-          t << ';' << endl;
-        }
-        if (!a->type.isEmpty())
-        {
-          t << fcnPrefix << "type = <<_EnD_oF_dEf_TeXt_" << endl
-            << a->type << endl << "_EnD_oF_dEf_TeXt_;" << endl;
-        }
-        if (!a->name.isEmpty())
-        {
-          t << fcnPrefix << "declname = ";
-          writeDEFString(t,a->name);
-          t << ';' << endl;
-        }
-        if (defArg && !defArg->name.isEmpty() && defArg->name!=a->name)
-        {
-          t << fcnPrefix << "defname = ";
-          writeDEFString(t,defArg->name);
-          t << ';' << endl;
-        }
-        if (!a->array.isEmpty())
-        {
-          t << fcnPrefix << "array = ";
-          writeDEFString(t,a->array); 
-          t << ';' << endl;
-        }
-        if (!a->defval.isEmpty())
-        {
-          t << fcnPrefix << "defval = <<_EnD_oF_dEf_TeXt_" << endl
-            << a->defval << endl << "_EnD_oF_dEf_TeXt_;" << endl;
-        }
-        if (defArg) ++defAli;
-        t << "      }; /*" << fcnPrefix << "-param */" << endl;
+        defArg = &(*defIt);
+        ++defIt;
       }
+      t << memPrefix << "param = {" << endl;
+      if (!a.attrib.isEmpty())
+      {
+        t << fcnPrefix << "attributes = ";
+        writeDEFString(t,a.attrib);
+        t << ';' << endl;
+      }
+      if (!a.type.isEmpty())
+      {
+        t << fcnPrefix << "type = <<_EnD_oF_dEf_TeXt_" << endl
+          << a.type << endl << "_EnD_oF_dEf_TeXt_;" << endl;
+      }
+      if (!a.name.isEmpty())
+      {
+        t << fcnPrefix << "declname = ";
+        writeDEFString(t,a.name);
+        t << ';' << endl;
+      }
+      if (defArg && !defArg->name.isEmpty() && defArg->name!=a.name)
+      {
+        t << fcnPrefix << "defname = ";
+        writeDEFString(t,defArg->name);
+        t << ';' << endl;
+      }
+      if (!a.array.isEmpty())
+      {
+        t << fcnPrefix << "array = ";
+        writeDEFString(t,a.array); 
+        t << ';' << endl;
+      }
+      if (!a.defval.isEmpty())
+      {
+        t << fcnPrefix << "defval = <<_EnD_oF_dEf_TeXt_" << endl
+          << a.defval << endl << "_EnD_oF_dEf_TeXt_;" << endl;
+      }
+      t << "      }; /*" << fcnPrefix << "-param */" << endl;
     }
-    delete declAl;
   }
   else if (  md->memberType()==MemberType_Define
       && md->argsString()!=0)
   {
-    ArgumentListIterator ali(*md->argumentList());
-    Argument *a;
     QCString defPrefix = "  " + memPrefix + "def-";
-
-    for (ali.toFirst();(a=ali.current());++ali)
+    for (const Argument &a : md->argumentList())
     {
       t << memPrefix << "param  = {" << endl;
-      t << defPrefix << "name = '" << a->type << "';" << endl;
+      t << defPrefix << "name = '" << a.type << "';" << endl;
       t << "      }; /*" << defPrefix << "-param */" << endl;
     }
   }
diff --git a/src/definition.cpp b/src/definition.cpp
index 3b5fea1..b44f2d1 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -420,7 +420,7 @@ void DefinitionImpl::setId(const char *id)
   m_impl->id = id;
   if (Doxygen::clangUsrMap) 
   {
-    //printf("DefinitionImpl::setId '%s'->'%s'\n",id,m_name.data());
+    //printf("DefinitionImpl::setId '%s'->'%s'\n",id,m_impl->name.data());
     Doxygen::clangUsrMap->insert(id,this);
   }
 }
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 5253b04..4c6d2f8 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -413,12 +413,12 @@ static void checkArgumentName(const QCString &name)
 {                
   if (!Config_getBool(WARN_IF_DOC_ERROR)) return;
   if (g_memberDef==0) return; // not a member
-  const ArgumentList *al=g_memberDef->isDocsForDefinition() ?
+  const ArgumentList &al=g_memberDef->isDocsForDefinition() ?
 	                 g_memberDef->argumentList() :
                          g_memberDef->declArgumentList();
   SrcLangExt lang = g_memberDef->getLanguage();
   //printf("isDocsForDefinition()=%d\n",g_memberDef->isDocsForDefinition());
-  if (al==0) return; // no argument list
+  if (al.empty()) return; // no argument list
 
   static QRegExp re("$?[a-zA-Z0-9_\\x80-\\xFF]+\\.*");
   int p=0,i=0,l;
@@ -427,12 +427,10 @@ static void checkArgumentName(const QCString &name)
     QCString aName=name.mid(i,l);
     if (lang==SrcLangExt_Fortran) aName=aName.lower();
     //printf("aName='%s'\n",aName.data());
-    ArgumentListIterator ali(*al);
-    const Argument *a;
     bool found=FALSE;
-    for (ali.toFirst();(a=ali.current());++ali)
+    for (const Argument &a : al)
     {
-      QCString argName = g_memberDef->isDefine() ? a->type : a->name;
+      QCString argName = g_memberDef->isDefine() ? a.type : a.name;
       if (lang==SrcLangExt_Fortran) argName=argName.lower();
       argName=argName.stripWhiteSpace();
       //printf("argName='%s' aName=%s\n",argName.data(),aName.data());
@@ -460,7 +458,6 @@ static void checkArgumentName(const QCString &name)
             inheritedMd->docLine(),qPrint(inheritedMd->docFile()));
         docFile = g_memberDef->getDefFileName();
         docLine = g_memberDef->getDefLine();
-        
       }
       QCString alStr = argListToString(al);
       warn_doc_error(docFile,docLine,
@@ -500,28 +497,26 @@ static void checkUnOrMultipleDocumentedParams()
 {
   if (g_memberDef && g_hasParamCommand && Config_getBool(WARN_IF_DOC_ERROR))
   {
-    const ArgumentList *al=g_memberDef->isDocsForDefinition() ? 
+    const ArgumentList &al=g_memberDef->isDocsForDefinition() ?
       g_memberDef->argumentList() :
       g_memberDef->declArgumentList();
     SrcLangExt lang = g_memberDef->getLanguage();
-    if (al!=0)
+    if (!al.empty())
     {
-      ArgumentListIterator ali(*al);
-      const Argument *a;
       bool found=FALSE;
-      for (ali.toFirst();(a=ali.current());++ali)
+      for (const Argument &a: al)
       {
         int count = 0;
-        QCString argName = g_memberDef->isDefine() ? a->type : a->name;
+        QCString argName = g_memberDef->isDefine() ? a.type : a.name;
         if (lang==SrcLangExt_Fortran) argName = argName.lower();
         argName=argName.stripWhiteSpace();
         QCString aName = argName;
         if (argName.right(3)=="...") argName=argName.left(argName.length()-3);
         if (lang==SrcLangExt_Python && (argName=="self" || argName=="cls"))
-        { 
+        {
           // allow undocumented self / cls parameter for Python
         }
-        else if (!argName.isEmpty() && g_paramsFound.find(argName)==0 && a->docs.isEmpty()) 
+        else if (!argName.isEmpty() && g_paramsFound.find(argName)==0 && a.docs.isEmpty()) 
         {
           found = TRUE;
         }
@@ -552,16 +547,16 @@ static void checkUnOrMultipleDocumentedParams()
             QCString(g_memberDef->qualifiedName()) + 
             QCString(argListToString(al)) +
             " are not documented:\n";
-        for (ali.toFirst();(a=ali.current());++ali)
+        for (const Argument &a : al)
         {
-          QCString argName = g_memberDef->isDefine() ? a->type : a->name;
+          QCString argName = g_memberDef->isDefine() ? a.type : a.name;
           if (lang==SrcLangExt_Fortran) argName = argName.lower();
           argName=argName.stripWhiteSpace();
           if (lang==SrcLangExt_Python && (argName=="self" || argName=="cls"))
-          { 
+          {
             // allow undocumented self / cls parameter for Python
           }
-          else if (!argName.isEmpty() && g_paramsFound.find(argName)==0) 
+          else if (!argName.isEmpty() && g_paramsFound.find(argName)==0)
           {
             if (!first)
             {
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 7b3c7d9..8ef124e 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -294,7 +294,7 @@ void statistics()
 
 
 static void addMemberDocs(const Entry *root,MemberDef *md, const char *funcDecl,
-                   ArgumentList *al,bool over_load,uint64 spec);
+                   const ArgumentList *al,bool over_load,uint64 spec);
 static void findMember(const Entry *root,
                        const QCString &relates,
                        const QCString &type,
@@ -464,21 +464,18 @@ static void addSTLClass(const std::unique_ptr<Entry> &root,const STLInfo *info)
   // add template arguments to class
   if (info->templType1)
   {
-    ArgumentList *al = new ArgumentList;
-    Argument *a=new Argument;
-    a->type="typename";
-    a->name=info->templType1;
-    al->append(a);
+    ArgumentList al;
+    Argument a;
+    a.type="typename";
+    a.name=info->templType1;
+    al.push_back(a);
     if (info->templType2) // another template argument
     {
-      a=new Argument;
-      a->type="typename";
-      a->name=info->templType2;
-      al->append(a);
+      a.type="typename";
+      a.name=info->templType2;
+      al.push_back(a);
     }
-    classEntry->tArgLists = new QList<ArgumentList>;
-    classEntry->tArgLists->setAutoDelete(TRUE);
-    classEntry->tArgLists->append(al);
+    classEntry->tArgLists.push_back(al);
   }
   // add member variables
   if (info->templName1)
@@ -1105,17 +1102,15 @@ static Definition *findScopeFromQualifiedName(Definition *startScope,const QCStr
   return resultScope;
 }
 
-ArgumentList *getTemplateArgumentsFromName(
+ArgumentList getTemplateArgumentsFromName(
                   const QCString &name,
-                  const QList<ArgumentList> *tArgLists)
+                  const std::vector<ArgumentList> &tArgLists)
 {
-  if (tArgLists==0) return 0;
-
-  QListIterator<ArgumentList> ali(*tArgLists);
   // for each scope fragment, check if it is a template and advance through
   // the list if so.
   int i,p=0;
-  while ((i=name.find("::",p))!=-1)
+  auto alIt = tArgLists.begin();
+  while ((i=name.find("::",p))!=-1 && alIt!=tArgLists.end())
   {
     NamespaceDef *nd = Doxygen::namespaceSDict->find(name.left(i));
     if (nd==0)
@@ -1123,15 +1118,15 @@ ArgumentList *getTemplateArgumentsFromName(
       ClassDef *cd = getClass(name.left(i));
       if (cd)
       {
-        if (cd->templateArguments())
+        if (!cd->templateArguments().empty())
         {
-          ++ali;
+          ++alIt;
         }
       }
     }
     p=i+2;
   }
-  return ali.current();
+  return alIt!=tArgLists.end() ? *alIt : ArgumentList();
 }
 
 static
@@ -1240,13 +1235,12 @@ static void addClassToContext(const Entry *root)
     }
     //cd->setName(fullName); // change name to match docs
 
-    if (cd->templateArguments()==0 || (cd->isForwardDeclared() && (root->spec&Entry::ForwardDecl)==0))
+    if (cd->templateArguments().empty() || (cd->isForwardDeclared() && (root->spec&Entry::ForwardDecl)==0))
     {
       // this happens if a template class declared with @class is found
       // before the actual definition or if a forward declaration has different template
       // parameter names.
-      ArgumentList *tArgList =
-        getTemplateArgumentsFromName(cd->name(),root->tArgLists);
+      ArgumentList tArgList = getTemplateArgumentsFromName(cd->name(),root->tArgLists);
       cd->setTemplateArguments(tArgList);
     }
 
@@ -1280,12 +1274,11 @@ static void addClassToContext(const Entry *root)
         buildScopeFromQualifiedName(fullName,fullName.contains("::"),root->lang,tagInfo);
       }
     }
-    ArgumentList *tArgList = 0;
+    ArgumentList tArgList;
     if ((root->lang==SrcLangExt_CSharp || root->lang==SrcLangExt_Java) && (i=fullName.find('<'))!=-1)
     {
       // a Java/C# generic class looks like a C++ specialization, so we need to split the
       // name and template arguments here
-      tArgList = new ArgumentList;
       stringToArgumentList(fullName.mid(i),tArgList);
       fullName=fullName.left(i);
     }
@@ -1296,7 +1289,7 @@ static void addClassToContext(const Entry *root)
     cd=createClassDef(tagInfo?tagName:root->fileName,root->startLine,root->startColumn,
         fullName,sec,tagName,refFileName,TRUE,root->spec&Entry::Enum);
     Debug::print(Debug::Classes,0,"  New class '%s' (sec=0x%08x)! #tArgLists=%d tagInfo=%p\n",
-        qPrint(fullName),sec,root->tArgLists ? (int)root->tArgLists->count() : -1, tagInfo);
+        qPrint(fullName),sec,root->tArgLists.size(), tagInfo);
     cd->setDocumentation(root->doc,root->docFile,root->docLine); // copy docs to definition
     cd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
     cd->setLanguage(root->lang);
@@ -1561,7 +1554,7 @@ static ClassDef *createTagLessInstance(ClassDef *rootCd,ClassDef *templ,const QC
                                      md->typeString(),md->name(),md->argsString(),md->excpString(),
                                      md->protection(),md->virtualness(),md->isStatic(),Member,
                                      md->memberType(),
-                                     0,0,"");
+                                     ArgumentList(),ArgumentList(),"");
       imd->setMemberClass(cd);
       imd->setDocumentation(md->documentation(),md->docFile(),md->docLine());
       imd->setBriefDescription(md->briefDescription(),md->briefFile(),md->briefLine());
@@ -2055,7 +2048,7 @@ static void findUsingDeclarations(const Entry *root)
       if (usingCd==0) // definition not in the input => add an artificial class
       {
         Debug::print(Debug::Classes,0,"  New using class '%s' (sec=0x%08x)! #tArgLists=%d\n",
-             qPrint(name),root->section,root->tArgLists ? (int)root->tArgLists->count() : -1);
+             qPrint(name),root->section,root->tArgLists.size());
         usingCd = createClassDef(
                      "<using>",1,1,
                      name,
@@ -2135,8 +2128,8 @@ static void findUsingDeclImports(const Entry *root)
                     {
                       fileName = root->tagInfo->tagName;
                     }
-                    const ArgumentList *templAl = md->templateArguments();
-                    const ArgumentList *al = md->templateArguments();
+                    const ArgumentList &templAl = md->templateArguments();
+                    const ArgumentList &al = md->templateArguments();
                     newMd = createMemberDef(
                       fileName,root->startLine,root->startColumn,
                       md->typeString(),memName,md->argsString(),
@@ -2336,7 +2329,8 @@ static MemberDef *addVariableToClass(
       fileName,root->startLine,root->startColumn,
       type,name,args,root->exception,
       prot,Normal,root->stat,related,
-      mtype,root->tArgLists ? root->tArgLists->getLast() : 0,0, root->metaData);
+      mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
+      ArgumentList(), root->metaData);
   md->setTagInfo(root->tagInfo);
   md->setMemberClass(cd); // also sets outer scope (i.e. getOuterScope())
   //md->setDefFile(root->fileName);
@@ -2595,7 +2589,8 @@ static MemberDef *addVariableToFile(
       fileName,root->startLine,root->startColumn,
       type,name,args,0,
       root->protection, Normal,root->stat,Member,
-      mtype,root->tArgLists ? root->tArgLists->getLast() : 0,0, root->metaData);
+      mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
+      ArgumentList(), root->metaData);
   md->setTagInfo(root->tagInfo);
   md->setMemberSpecifiers(root->spec);
   md->setDocumentation(root->doc,root->docFile,root->docLine);
@@ -2739,19 +2734,16 @@ static bool isVarWithConstructor(const Entry *root)
                    // we need to rely on heuristics :-(
   {
     //printf("typeIsClass\n");
-    ArgumentList *al = root->argList;
-    if (al==0 || al->isEmpty())
+    if (root->argList.empty())
     {
       result=FALSE; // empty arg list -> function prototype.
       goto done;
     }
-    ArgumentListIterator ali(*al);
-    Argument *a;
-    for (ali.toFirst();(a=ali.current());++ali)
+    for (const Argument &a : root->argList)
     {
-      if (!a->name.isEmpty() || !a->defval.isEmpty())
+      if (!a.name.isEmpty() || !a.defval.isEmpty())
       {
-        if (a->name.find(initChars)==0)
+        if (a.name.find(initChars)==0)
         {
           result=TRUE;
         }
@@ -2761,31 +2753,31 @@ static bool isVarWithConstructor(const Entry *root)
         }
         goto done;
       }
-      if (a->type.isEmpty() || getResolvedClass(ctx,fd,a->type)!=0)
+      if (a.type.isEmpty() || getResolvedClass(ctx,fd,a.type)!=0)
       {
         result=FALSE; // arg type is a known type
         goto done;
       }
-      if (checkIfTypedef(ctx,fd,a->type))
+      if (checkIfTypedef(ctx,fd,a.type))
       {
          //printf("%s:%d: false (arg is typedef)\n",__FILE__,__LINE__);
          result=FALSE; // argument is a typedef
          goto done;
       }
-      if (a->type.at(a->type.length()-1)=='*' ||
-          a->type.at(a->type.length()-1)=='&')
+      if (a.type.at(a.type.length()-1)=='*' ||
+          a.type.at(a.type.length()-1)=='&')
                      // type ends with * or & => pointer or reference
       {
         result=FALSE;
         goto done;
       }
-      if (a->type.find(initChars)==0)
+      if (a.type.find(initChars)==0)
       {
         result=TRUE; // argument type starts with typical initializer char
         goto done;
       }
-      QCString resType=resolveTypeDef(ctx,a->type);
-      if (resType.isEmpty()) resType=a->type;
+      QCString resType=resolveTypeDef(ctx,a.type);
+      if (resType.isEmpty()) resType=a.type;
       int len;
       if (idChars.match(resType,0,&len)==0) // resType starts with identifier
       {
@@ -3129,7 +3121,7 @@ static void addInterfaceOrServiceToServiceOrSingleton(
   MemberDef *const md = createMemberDef(
       fileName, root->startLine, root->startColumn, root->type, rname,
       "", "", root->protection, root->virt, root->stat, Member,
-      type, 0, root->argList, root->metaData);
+      type, ArgumentList(), root->argList, root->metaData);
   md->setTagInfo(root->tagInfo);
   md->setMemberClass(cd);
   md->setDocumentation(root->doc,root->docFile,root->docLine);
@@ -3206,7 +3198,7 @@ static void buildInterfaceAndServiceList(const Entry *root)
                  qPrint(root->fileName),
                  root->startLine,
                  root->bodyLine,
-                 root->tArgLists ? (int)root->tArgLists->count() : -1,
+                 root->tArgLists.size(),
                  root->mGrpId,
                  root->spec,
                  root->proto,
@@ -3317,7 +3309,8 @@ static void addMethodToClass(const Entry *root,ClassDef *cd,
       stat && root->relatesType != MemberOf,
       relates.isEmpty() ? Member :
           root->relatesType == MemberOf ? Foreign : Related,
-      mtype,root->tArgLists ? root->tArgLists->getLast() : 0,root->argList, root->metaData);
+      mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
+      root->argList, root->metaData);
   md->setTagInfo(root->tagInfo);
   md->setMemberClass(cd);
   md->setDocumentation(root->doc,root->docFile,root->docLine);
@@ -3347,54 +3340,27 @@ static void addMethodToClass(const Entry *root,ClassDef *cd,
     // for PHP we use Class::method and Namespace\method
     scopeSeparator="::";
   }
+//  QCString optArgs = root->argList.empty() ? args : QCString();
   if (!relates.isEmpty() || isFriend || Config_getBool(HIDE_SCOPE_NAMES))
   {
     if (!type.isEmpty())
     {
-      if (root->argList)
-      {
-        def=type+" "+name;
-      }
-      else
-      {
-        def=type+" "+name+args;
-      }
+      def=type+" "+name; //+optArgs;
     }
     else
     {
-      if (root->argList)
-      {
-        def=name;
-      }
-      else
-      {
-        def=name+args;
-      }
+      def=name; //+optArgs;
     }
   }
   else
   {
     if (!type.isEmpty())
     {
-      if (root->argList)
-      {
-        def=type+" "+qualScope+scopeSeparator+name;
-      }
-      else
-      {
-        def=type+" "+qualScope+scopeSeparator+name+args;
-      }
+      def=type+" "+qualScope+scopeSeparator+name; //+optArgs;
     }
     else
     {
-      if (root->argList)
-      {
-        def=qualScope+scopeSeparator+name;
-      }
-      else
-      {
-        def=qualScope+scopeSeparator+name+args;
-      }
+      def=qualScope+scopeSeparator+name; //+optArgs;
     }
   }
   if (def.left(7)=="friend ") def=def.right(def.length()-7);
@@ -3457,7 +3423,7 @@ static void buildFunctionList(const Entry *root)
                  qPrint(root->fileName),
                  root->startLine,
                  root->bodyLine,
-                 root->tArgLists ? (int)root->tArgLists->count() : -1,
+                 root->tArgLists.size(),
                  root->mGrpId,
                  root->spec,
                  root->proto,
@@ -3577,16 +3543,16 @@ static void buildFunctionList(const Entry *root)
               if (rnd) rnsName = rnd->name().copy();
               //printf("matching arguments for %s%s %s%s\n",
               //    md->name().data(),md->argsString(),rname.data(),argListToString(root->argList).data());
-              ArgumentList *mdAl = md->argumentList();
-              const ArgumentList *mdTempl = md->templateArguments();
+              ArgumentList &mdAl = md->argumentList();
+              const ArgumentList &mdTempl = md->templateArguments();
 
               // in case of template functions, we need to check if the
               // functions have the same number of template parameters
               bool sameNumTemplateArgs = TRUE;
               bool matchingReturnTypes = TRUE;
-              if (mdTempl!=0 && root->tArgLists)
+              if (!mdTempl.empty() && !root->tArgLists.empty())
               {
-                if (mdTempl->count()!=root->tArgLists->getLast()->count())
+                if (mdTempl.size()!=root->tArgLists.back().size())
                 {
                   sameNumTemplateArgs = FALSE;
                 }
@@ -3634,11 +3600,12 @@ static void buildFunctionList(const Entry *root)
                 if (found)
                 {
                   // merge argument lists
-                  mergeArguments(mdAl,root->argList,!root->doc.isEmpty());
+                  ArgumentList mergedArgList = root->argList;
+                  mergeArguments(mdAl,mergedArgList,!root->doc.isEmpty());
                   // merge documentation
                   if (md->documentation().isEmpty() && !root->doc.isEmpty())
                   {
-                    ArgumentList *argList = new ArgumentList;
+                    ArgumentList argList;
                     stringToArgumentList(root->args,argList);
                     if (root->proto)
                     {
@@ -3712,13 +3679,14 @@ static void buildFunctionList(const Entry *root)
           //       root->type.data(),rname.data(),root->args.data(),root->bodyLine);
 
           // new global function
-          ArgumentList *tArgList = root->tArgLists ? root->tArgLists->getLast() : 0;
           QCString name=removeRedundantWhiteSpace(rname);
           md=createMemberDef(
               root->fileName,root->startLine,root->startColumn,
               root->type,name,root->args,root->exception,
               root->protection,root->virt,root->stat,Member,
-              MemberType_Function,tArgList,root->argList,root->metaData);
+              MemberType_Function,
+              !root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
+              root->argList,root->metaData);
 
           md->setTagInfo(root->tagInfo);
           md->setLanguage(root->lang);
@@ -3762,27 +3730,14 @@ static void buildFunctionList(const Entry *root)
           }
 
           QCString def;
+          //QCString optArgs = root->argList.empty() ? QCString() : root->args;
           if (!root->type.isEmpty())
           {
-            if (root->argList)
-            {
-              def=root->type+" "+scope+name;
-            }
-            else
-            {
-              def=root->type+" "+scope+name+root->args;
-            }
+            def=root->type+" "+scope+name; //+optArgs;
           }
           else
           {
-            if (root->argList)
-            {
-              def=scope+name.copy();
-            }
-            else
-            {
-              def=scope+name+root->args;
-            }
+            def=scope+name; //+optArgs;
           }
           Debug::print(Debug::Functions,0,
                      "  Global Function:\n"
@@ -3906,8 +3861,8 @@ static void findFriends()
              ) // if the member is related and the arguments match then the
                // function is actually a friend.
           {
-            ArgumentList *mmdAl = mmd->argumentList();
-            ArgumentList *fmdAl = fmd->argumentList();
+            ArgumentList &mmdAl = mmd->argumentList();
+            ArgumentList &fmdAl = fmd->argumentList();
             mergeArguments(mmdAl,fmdAl);
             if (!fmd->documentation().isEmpty())
             {
@@ -4023,8 +3978,8 @@ static void transferFunctionReferences()
     }
     if (mdef && mdec)
     {
-      ArgumentList *mdefAl = mdef->argumentList();
-      ArgumentList *mdecAl = mdec->argumentList();
+      ArgumentList &mdefAl = mdef->argumentList();
+      ArgumentList &mdecAl = mdec->argumentList();
       if (
           matchArguments2(mdef->getOuterScope(),mdef->getFileDef(),mdefAl,
                           mdec->getOuterScope(),mdec->getFileDef(),mdecAl,
@@ -4144,31 +4099,26 @@ static void transferRelatedFunctionDocumentation()
  * Example: A template class A with template arguments <R,S,T>
  * that inherits from B<T,T,S> will have T and S in the dictionary.
  */
-static QDict<int> *getTemplateArgumentsInName(ArgumentList *templateArguments,const QCString &name)
+static QDict<int> *getTemplateArgumentsInName(const ArgumentList &templateArguments,const QCString &name)
 {
   QDict<int> *templateNames = new QDict<int>(17);
   templateNames->setAutoDelete(TRUE);
   static QRegExp re("[a-z_A-Z][a-z_A-Z0-9:]*");
-  if (templateArguments)
+  int count=0;
+  for (const Argument &arg : templateArguments)
   {
-    ArgumentListIterator ali(*templateArguments);
-    Argument *arg;
-    int count=0;
-    for (ali.toFirst();(arg=ali.current());++ali,count++)
+    int i,p=0,l;
+    while ((i=re.match(name,p,&l))!=-1)
     {
-      int i,p=0,l;
-      while ((i=re.match(name,p,&l))!=-1)
+      QCString n = name.mid(i,l);
+      if (n==arg.name)
       {
-        QCString n = name.mid(i,l);
-        if (n==arg->name)
+        if (templateNames->find(n)==0)
         {
-          if (templateNames->find(n)==0)
-          {
-            templateNames->insert(n,new int(count));
-          }
+          templateNames->insert(n,new int(count));
         }
-        p=i+l;
       }
+      p=i+l;
     }
   }
   return templateNames;
@@ -4219,12 +4169,12 @@ static void findUsedClassesForClass(const Entry *root,
                            ClassDef *masterCd,
                            ClassDef *instanceCd,
                            bool isArtificial,
-                           ArgumentList *actualArgs=0,
+                           const ArgumentList &actualArgs=ArgumentList(),
                            QDict<int> *templateNames=0
                            )
 {
   masterCd->setVisited(TRUE);
-  ArgumentList *formalArgs = masterCd->templateArguments();
+  const ArgumentList &formalArgs = masterCd->templateArguments();
   if (masterCd->memberNameInfoSDict())
   {
     MemberNameInfoSDict::Iterator mnili(*masterCd->memberNameInfoSDict());
@@ -4250,10 +4200,7 @@ static void findUsedClassesForClass(const Entry *root,
           QCString templSpec;
           bool found=FALSE;
           // the type can contain template variables, replace them if present
-          if (actualArgs)
-          {
-            type = substituteTemplateArgumentsInString(type,formalArgs,actualArgs);
-          }
+          type = substituteTemplateArgumentsInString(type,formalArgs,actualArgs);
 
           //printf("      template substitution gives=%s\n",type.data());
           while (!found && extractClassNameFromType(type,pos,usedClassName,templSpec,root->lang)!=-1)
@@ -4293,37 +4240,32 @@ static void findUsedClassesForClass(const Entry *root,
             BaseInfo bi(usedName,Public,Normal);
             findClassRelation(root,context,instanceCd,&bi,templateNames,TemplateInstances,isArtificial);
 
-            if (masterCd->templateArguments())
+            int count=0;
+            for (const Argument &arg : masterCd->templateArguments())
             {
-              ArgumentListIterator ali(*masterCd->templateArguments());
-              Argument *arg;
-              int count=0;
-              for (ali.toFirst();(arg=ali.current());++ali,++count)
+              if (arg.name==usedName) // type is a template argument
               {
-                if (arg->name==usedName) // type is a template argument
-                {
-                  found=TRUE;
-                  Debug::print(Debug::Classes,0,"    New used class '%s'\n", qPrint(usedName));
+                found=TRUE;
+                Debug::print(Debug::Classes,0,"    New used class '%s'\n", qPrint(usedName));
 
-                  ClassDef *usedCd = Doxygen::hiddenClasses->find(usedName);
-                  if (usedCd==0)
-                  {
-                    usedCd = createClassDef(
-                        masterCd->getDefFileName(),masterCd->getDefLine(),
-                        masterCd->getDefColumn(),
-                        usedName,
-                        ClassDef::Class);
-                    //printf("making %s a template argument!!!\n",usedCd->name().data());
-                    usedCd->makeTemplateArgument();
-                    usedCd->setUsedOnly(TRUE);
-                    usedCd->setLanguage(masterCd->getLanguage());
-                    Doxygen::hiddenClasses->append(usedName,usedCd);
-                  }
-                  if (isArtificial) usedCd->setArtificial(TRUE);
-                  Debug::print(Debug::Classes,0,"      Adding used class '%s' (1)\n", qPrint(usedCd->name()));
-                  instanceCd->addUsedClass(usedCd,md->name(),md->protection());
-                  usedCd->addUsedByClass(instanceCd,md->name(),md->protection());
+                ClassDef *usedCd = Doxygen::hiddenClasses->find(usedName);
+                if (usedCd==0)
+                {
+                  usedCd = createClassDef(
+                      masterCd->getDefFileName(),masterCd->getDefLine(),
+                      masterCd->getDefColumn(),
+                      usedName,
+                      ClassDef::Class);
+                  //printf("making %s a template argument!!!\n",usedCd->name().data());
+                  usedCd->makeTemplateArgument();
+                  usedCd->setUsedOnly(TRUE);
+                  usedCd->setLanguage(masterCd->getLanguage());
+                  Doxygen::hiddenClasses->append(usedName,usedCd);
                 }
+                if (isArtificial) usedCd->setArtificial(TRUE);
+                Debug::print(Debug::Classes,0,"      Adding used class '%s' (1)\n", qPrint(usedCd->name()));
+                instanceCd->addUsedClass(usedCd,md->name(),md->protection());
+                usedCd->addUsedByClass(instanceCd,md->name(),md->protection());
               }
             }
 
@@ -4390,14 +4332,14 @@ static void findBaseClassesForClass(
       ClassDef *instanceCd,
       FindBaseClassRelation_Mode mode,
       bool isArtificial,
-      ArgumentList *actualArgs=0,
+      const ArgumentList &actualArgs=ArgumentList(),
       QDict<int> *templateNames=0
     )
 {
   //if (masterCd->visited) return;
   masterCd->setVisited(TRUE);
   // The base class could ofcouse also be a non-nested class
-  ArgumentList *formalArgs = masterCd->templateArguments();
+  const ArgumentList &formalArgs = masterCd->templateArguments();
   QListIterator<BaseInfo> bii(*root->extends);
   BaseInfo *bi=0;
   for (bii.toFirst();(bi=bii.current());++bii)
@@ -4411,10 +4353,7 @@ static void findBaseClassesForClass(
       delTempNames=TRUE;
     }
     BaseInfo tbi(bi->name,bi->prot,bi->virt);
-    if (actualArgs) // substitute the formal template arguments of the base class
-    {
-      tbi.name = substituteTemplateArgumentsInString(bi->name,formalArgs,actualArgs);
-    }
+    tbi.name = substituteTemplateArgumentsInString(bi->name,formalArgs,actualArgs);
     //printf("bi->name=%s tbi.name=%s\n",bi->name.data(),tbi.name.data());
 
     if (mode==DocumentedOnly)
@@ -4492,14 +4431,13 @@ static bool findTemplateInstanceRelation(const Entry *root,
       const Entry *templateRoot = it->second;
       Debug::print(Debug::Classes,0,"        template root found %s templSpec=%s!\n",
           qPrint(templateRoot->name),qPrint(templSpec));
-      ArgumentList *templArgs = new ArgumentList;
+      ArgumentList templArgs;
       stringToArgumentList(templSpec,templArgs);
       findBaseClassesForClass(templateRoot,context,templateClass,instanceClass,
           TemplateInstances,isArtificial,templArgs,templateNames);
 
       findUsedClassesForClass(templateRoot,context,templateClass,instanceClass,
           isArtificial,templArgs,templateNames);
-      delete templArgs;
     }
     else
     {
@@ -5107,7 +5045,7 @@ static void computeTemplateClassRelations()
       {
         Debug::print(Debug::Classes,0,"    Template instance %s : \n",qPrint(tcd->name()));
         QCString templSpec = tdi.currentKey();
-        ArgumentList *templArgs = new ArgumentList;
+        ArgumentList templArgs;
         stringToArgumentList(templSpec,templArgs);
         QList<BaseInfo> *baseList=root->extends;
         QListIterator<BaseInfo> it(*baseList);
@@ -5116,8 +5054,8 @@ static void computeTemplateClassRelations()
         {
           // check if the base class is a template argument
           BaseInfo tbi(bi->name,bi->prot,bi->virt);
-          ArgumentList *tl = cd->templateArguments();
-          if (tl)
+          const ArgumentList &tl = cd->templateArguments();
+          if (!tl.empty())
           {
             QDict<int> *baseClassNames = tcd->getTemplateBaseClassNames();
             QDict<int> *templateNames = getTemplateArgumentsInName(tl,bi->name);
@@ -5129,18 +5067,20 @@ static void computeTemplateClassRelations()
             for (qdi.toFirst();qdi.current();++qdi)
             {
               int templIndex = *qdi.current();
-              Argument *actArg = 0;
-              if (templIndex<(int)templArgs->count())
+              Argument actArg;
+              bool hasActArg=FALSE;
+              if (templIndex<(int)templArgs.size())
               {
-                actArg=templArgs->at(templIndex);
+                actArg=templArgs.at(templIndex);
+                hasActArg=TRUE;
               }
-              if (actArg!=0 &&
+              if (hasActArg &&
                   baseClassNames!=0 &&
-                  baseClassNames->find(actArg->type)!=0 &&
-                  actualTemplateNames->find(actArg->type)==0
+                  baseClassNames->find(actArg.type)!=0 &&
+                  actualTemplateNames->find(actArg.type)==0
                  )
               {
-                actualTemplateNames->insert(actArg->type,new int(templIndex));
+                actualTemplateNames->insert(actArg.type,new int(templIndex));
               }
             }
             delete templateNames;
@@ -5155,7 +5095,6 @@ static void computeTemplateClassRelations()
             delete actualTemplateNames;
           }
         }
-        delete templArgs;
       } // class has no base classes
     }
   }
@@ -5294,13 +5233,13 @@ static void generateXRefPages()
 
 static void addMemberDocs(const Entry *root,
                    MemberDef *md, const char *funcDecl,
-                   ArgumentList *al,
+                   const ArgumentList *al,
                    bool over_load,
                    uint64 spec
                   )
 {
-  //printf("addMemberDocs: '%s'::'%s' '%s' funcDecl='%s' mSpec=%d\n",
-  //     root->parent->name.data(),md->name().data(),md->argsString(),funcDecl,spec);
+  //printf("addMemberDocs: '%s'::'%s' '%s' funcDecl='%s' mSpec=%lld\n",
+  //     root->parent()->name.data(),md->name().data(),md->argsString(),funcDecl,spec);
   QCString fDecl=funcDecl;
   // strip extern specifier
   fDecl.stripPrefix("extern ");
@@ -5324,11 +5263,12 @@ static void addMemberDocs(const Entry *root,
   // TODO determine scope based on root not md
   Definition *rscope = md->getOuterScope();
 
-  ArgumentList *mdAl = md->argumentList();
+  ArgumentList &mdAl = md->argumentList();
   if (al)
   {
+    ArgumentList mergedAl = *al;
     //printf("merging arguments (1) docs=%d\n",root->doc.isEmpty());
-    mergeArguments(mdAl,al,!root->doc.isEmpty());
+    mergeArguments(mdAl,mergedAl,!root->doc.isEmpty());
   }
   else
   {
@@ -5340,7 +5280,8 @@ static void addMemberDocs(const Entry *root,
        )
     {
       //printf("merging arguments (2)\n");
-      mergeArguments(mdAl,root->argList,!root->doc.isEmpty());
+      ArgumentList mergedArgList = root->argList;
+      mergeArguments(mdAl,mergedArgList,!root->doc.isEmpty());
     }
   }
   if (over_load)  // the \overload keyword was used
@@ -5511,9 +5452,9 @@ static bool findGlobalMember(const Entry *root,
         NamespaceDef *rnd = 0;
         if (!namespaceName.isEmpty()) rnd = Doxygen::namespaceSDict->find(namespaceName);
 
-        const ArgumentList *mdAl = const_cast<const MemberDef *>(md)->argumentList();
+        const ArgumentList &mdAl = const_cast<const MemberDef *>(md)->argumentList();
         bool matching=
-          (mdAl==0 && root->argList->count()==0) ||
+          (mdAl.empty() && root->argList.empty()) ||
           md->isVariable() || md->isTypedef() || /* in case of function pointers */
           matchArguments2(md->getOuterScope(),const_cast<const MemberDef *>(md)->getFileDef(),mdAl,
                           rnd ? rnd : Doxygen::globalScope,fd,root->argList,
@@ -5522,15 +5463,12 @@ static bool findGlobalMember(const Entry *root,
         // for template members we need to check if the number of
         // template arguments is the same, otherwise we are dealing with
         // different functions.
-        if (matching && root->tArgLists)
+        if (matching && !root->tArgLists.empty())
         {
-          const ArgumentList *mdTempl = md->templateArguments();
-          if (mdTempl)
+          const ArgumentList &mdTempl = md->templateArguments();
+          if (root->tArgLists.back().size()!=mdTempl.size())
           {
-            if (root->tArgLists->getLast()->count()!=mdTempl->count())
-            {
-              matching=FALSE;
-            }
+            matching=FALSE;
           }
         }
 
@@ -5550,11 +5488,11 @@ static bool findGlobalMember(const Entry *root,
         }
 
         // for template member we also need to check the return type
-        if (md->templateArguments()!=0 && root->tArgLists!=0)
+        if (!md->templateArguments().empty() && !root->tArgLists.empty())
         {
           //printf("Comparing return types '%s'<->'%s'\n",
           //    md->typeString(),type);
-          if (md->templateArguments()->count()!=root->tArgLists->getLast()->count() ||
+          if (md->templateArguments().size()!=root->tArgLists.back().size() ||
               qstrcmp(md->typeString(),type)!=0)
           {
             //printf(" ---> no matching\n");
@@ -5565,7 +5503,7 @@ static bool findGlobalMember(const Entry *root,
         if (matching) // add docs to the member
         {
           Debug::print(Debug::FindMembers,0,"5. Match found\n");
-          addMemberDocs(root,md->resolveAlias(),decl,root->argList,FALSE,root->spec);
+          addMemberDocs(root,md->resolveAlias(),decl,&root->argList,FALSE,root->spec);
           found=TRUE;
         }
       }
@@ -5573,7 +5511,7 @@ static bool findGlobalMember(const Entry *root,
     if (!found && root->relatesType != Duplicate && root->section==Entry::FUNCTION_SEC) // no match
     {
       QCString fullFuncDecl=decl;
-      if (root->argList) fullFuncDecl+=argListToString(root->argList,TRUE);
+      if (!root->argList.empty()) fullFuncDecl+=argListToString(root->argList,TRUE);
       QCString warnMsg =
          QCString("no matching file member found for \n")+substitute(fullFuncDecl,"%","%%");
       if (mn->count()>0)
@@ -5609,17 +5547,17 @@ static bool findGlobalMember(const Entry *root,
 }
 
 static bool isSpecialization(
-                  const QList<ArgumentList> &srcTempArgLists,
-                  const QList<ArgumentList> &dstTempArgLists
+                  const std::vector<ArgumentList> &srcTempArgLists,
+                  const std::vector<ArgumentList> &dstTempArgLists
     )
 {
-    QListIterator<ArgumentList> srclali(srcTempArgLists);
-    QListIterator<ArgumentList> dstlali(dstTempArgLists);
-    for (;srclali.current();++srclali,++dstlali)
+    auto srcIt = srcTempArgLists.begin();
+    auto dstIt = dstTempArgLists.begin();
+    while (srcIt!=srcTempArgLists.end() && dstIt!=dstTempArgLists.end())
     {
-      ArgumentList *sal = srclali.current();
-      ArgumentList *dal = dstlali.current();
-      if (!(sal && dal && sal->count()==dal->count())) return TRUE;
+      if ((*srcIt).size()!=(*dstIt).size()) return TRUE;
+      ++srcIt;
+      ++dstIt;
     }
     return FALSE;
 }
@@ -5629,15 +5567,15 @@ static bool scopeIsTemplate(const Definition *d)
   bool result=FALSE;
   if (d && d->definitionType()==Definition::TypeClass)
   {
-    result = (dynamic_cast<const ClassDef*>(d))->templateArguments() || scopeIsTemplate(d->getOuterScope());
+    result = !(dynamic_cast<const ClassDef*>(d))->templateArguments().empty() ||
+             scopeIsTemplate(d->getOuterScope());
   }
   return result;
 }
 
 static QCString substituteTemplatesInString(
-    const QList<ArgumentList> &srcTempArgLists,
-    const QList<ArgumentList> &dstTempArgLists,
-    ArgumentList *funcTempArgList, // can be used to match template specializations
+    const std::vector<ArgumentList> &srcTempArgLists,
+    const std::vector<ArgumentList> &dstTempArgLists,
     const QCString &src
     )
 {
@@ -5651,61 +5589,59 @@ static QCString substituteTemplatesInString(
     dst+=src.mid(p,i-p);
     QCString name=src.mid(i,l);
 
-    QListIterator<ArgumentList> srclali(srcTempArgLists);
-    QListIterator<ArgumentList> dstlali(dstTempArgLists);
-    for (;srclali.current() && !found;++srclali,++dstlali)
+    auto srcIt = srcTempArgLists.begin();
+    auto dstIt = dstTempArgLists.begin();
+    while (srcIt!=srcTempArgLists.end() && !found)
     {
-      ArgumentListIterator tsali(*srclali.current());
-      ArgumentListIterator tdali(*dstlali.current());
-      ArgumentListIterator *fali=0;
-      Argument *tsa =0,*tda=0, *fa=0;
-      if (funcTempArgList)
+      const ArgumentList *tdAli = 0;
+      std::vector<Argument>::const_iterator tdaIt;
+      if (dstIt!=dstTempArgLists.end())
       {
-        fali = new ArgumentListIterator(*funcTempArgList);
-        fa = fali->current();
+        tdAli = &(*dstIt);
+        tdaIt = tdAli->begin();
+        ++dstIt;
       }
 
-      for (tsali.toFirst();(tsa=tsali.current()) && !found;++tsali)
+      const ArgumentList &tsaLi = *srcIt;
+      for (auto tsaIt = tsaLi.begin(); tsaIt!=tsaLi.end() && !found; ++tsaIt)
       {
-        tda = tdali.current();
+        Argument tsa = *tsaIt;
+        const Argument *tda = 0;
+        if (tdAli && tdaIt!=tdAli->end())
+        {
+          tda = &(*tdaIt);
+          ++tdaIt;
+        }
         //if (tda) printf("tsa=%s|%s tda=%s|%s\n",
-        //    tsa->type.data(),tsa->name.data(),
+        //    tsa.type.data(),tsa.name.data(),
         //    tda->type.data(),tda->name.data());
-        if (name==tsa->name)
+        if (name==tsa.name)
         {
           if (tda && tda->name.isEmpty())
           {
+            QCString tdaName = tda->name;
+            QCString tdaType = tda->type;
             int vc=0;
-            if (tda->type.left(6)=="class ") vc=6;
-            else if (tda->type.left(9)=="typename ") vc=9;
+            if (tdaType.left(6)=="class ") vc=6;
+            else if (tdaType.left(9)=="typename ") vc=9;
             if (vc>0) // convert type=="class T" to type=="class" name=="T"
             {
-              tda->name = tda->type.mid(vc);
-              tda->type = tda->type.left(vc-1);
+              tdaName = tdaType.mid(vc);
+            }
+            if (!tdaName.isEmpty())
+            {
+              name=tdaName; // substitute
+              found=TRUE;
             }
-          }
-          if (tda && !tda->name.isEmpty())
-          {
-            name=tda->name; // substitute
-            found=TRUE;
-          }
-          else if (fa)
-          {
-            name=fa->type;
-            found=TRUE;
           }
         }
-        if (tda)
-          ++tdali;
-        else if (fali)
-        { ++(*fali); fa=fali->current(); }
       }
 
-      delete fali;
       //printf("   srcList='%s' dstList='%s faList='%s'\n",
       //  argListToString(srclali.current()).data(),
       //  argListToString(dstlali.current()).data(),
       //  funcTempArgList ? argListToString(funcTempArgList).data() : "<none>");
+      ++srcIt;
     }
     dst+=name;
     p=i+l;
@@ -5717,48 +5653,39 @@ static QCString substituteTemplatesInString(
 }
 
 static void substituteTemplatesInArgList(
-                  const QList<ArgumentList> &srcTempArgLists,
-                  const QList<ArgumentList> &dstTempArgLists,
-                  ArgumentList *src,
-                  ArgumentList *dst,
-                  ArgumentList *funcTempArgs = 0
+                  const std::vector<ArgumentList> &srcTempArgLists,
+                  const std::vector<ArgumentList> &dstTempArgLists,
+                  const ArgumentList &src,
+                  ArgumentList &dst
                  )
 {
-  ArgumentListIterator sali(*src);
-  ArgumentListIterator dali(*dst);
-  Argument *sa=0;
-  Argument *da=dali.current();
-
-  for (sali.toFirst();(sa=sali.current());++sali) // for each member argument
+  auto dstIt = dst.begin();
+  for (const Argument &sa : src)
   {
-    QCString dstType = substituteTemplatesInString(
-                                  srcTempArgLists,dstTempArgLists,funcTempArgs,
-                                  sa->type);
-    QCString dstArray = substituteTemplatesInString(
-                                  srcTempArgLists,dstTempArgLists,funcTempArgs,
-                                  sa->array);
-    if (da==0)
+    QCString dstType =  substituteTemplatesInString(srcTempArgLists,dstTempArgLists,sa.type);
+    QCString dstArray = substituteTemplatesInString(srcTempArgLists,dstTempArgLists,sa.array);
+    if (dstIt == dst.end())
     {
-      da=new Argument(*sa);
-      dst->append(da);
-      da->type=dstType;
-      da->array=dstArray;
-      da=0;
+      Argument da = sa;
+      da.type  = dstType;
+      da.array = dstArray;
+      dst.push_back(da);
+      dstIt = dst.end();
     }
     else
     {
-      da->type=dstType;
-      da->type=dstArray;
-      ++dali;
-      da=dali.current();
+      Argument da = *dstIt;
+      da.type  = dstType;
+      da.array = dstArray;
+      ++dstIt;
     }
   }
-  dst->constSpecifier     = src->constSpecifier;
-  dst->volatileSpecifier  = src->volatileSpecifier;
-  dst->pureSpecifier      = src->pureSpecifier;
-  dst->trailingReturnType = substituteTemplatesInString(
+  dst.constSpecifier     = src.constSpecifier;
+  dst.volatileSpecifier  = src.volatileSpecifier;
+  dst.pureSpecifier      = src.pureSpecifier;
+  dst.trailingReturnType = substituteTemplatesInString(
                              srcTempArgLists,dstTempArgLists,
-                             funcTempArgs,src->trailingReturnType);
+                             src.trailingReturnType);
   //printf("substituteTemplatesInArgList: replacing %s with %s\n",
   //    argListToString(src).data(),argListToString(dst).data()
   //    );
@@ -5786,10 +5713,10 @@ static void findMember(const Entry *root,
 {
   Debug::print(Debug::FindMembers,0,
                "findMember(root=%p,funcDecl='%s',related='%s',overload=%d,"
-               "isFunc=%d mGrpId=%d tArgList=%p (#=%d) "
+               "isFunc=%d mGrpId=%d #tArgList=%d "
                "spec=%lld lang=%x\n",
                root,qPrint(funcDecl),qPrint(relates),overloaded,isFunc,root->mGrpId,
-               root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0,
+               root->tArgLists.size(),
                root->spec,root->lang
               );
 
@@ -5946,9 +5873,8 @@ static void findMember(const Entry *root,
   // empty while funcSpec is not empty we assume this is a
   // specialization of a method. If not, we clear the funcSpec and treat
   // this as a normal method of a template class.
-  if (!(root->tArgLists &&
-        root->tArgLists->count()>0 &&
-        root->tArgLists->getFirst()->count()==0
+  if (!(root->tArgLists.size()>0 &&
+        root->tArgLists.front().size()==0
        )
      )
   {
@@ -5995,7 +5921,7 @@ static void findMember(const Entry *root,
     if (funcSpec.isEmpty())
     {
       int argListIndex=0;
-      tempScopeName=cd->qualifiedNameWithTemplateParameters(root->tArgLists,&argListIndex);
+      tempScopeName=cd->qualifiedNameWithTemplateParameters(&root->tArgLists,&argListIndex);
     }
     else
     {
@@ -6145,39 +6071,33 @@ static void findMember(const Entry *root,
                   "4. class definition %s found\n",cd->name().data());
 
               // get the template parameter lists found at the member declaration
-              QList<ArgumentList> declTemplArgs;
-              cd->getTemplateParameterLists(declTemplArgs);
-              const ArgumentList *templAl = md->templateArguments();
-              if (templAl)
+              std::vector<ArgumentList> declTemplArgs = cd->getTemplateParameterLists();
+              const ArgumentList &templAl = md->templateArguments();
+              if (!templAl.empty())
               {
-                declTemplArgs.append(templAl);
+                declTemplArgs.push_back(templAl);
               }
 
               // get the template parameter lists found at the member definition
-              QList<ArgumentList> *defTemplArgs = root->tArgLists;
+              const std::vector<ArgumentList> &defTemplArgs = root->tArgLists;
               //printf("defTemplArgs=%p\n",defTemplArgs);
 
               // do we replace the decl argument lists with the def argument lists?
               bool substDone=FALSE;
-              ArgumentList *argList=0;
+              ArgumentList argList;
 
               /* substitute the occurrences of class template names in the
                * argument list before matching
                */
-              ArgumentList *mdAl = md->argumentList();
-              if (declTemplArgs.count()>0 && defTemplArgs &&
-                  declTemplArgs.count()==defTemplArgs->count() &&
-                  mdAl
-                 )
+              const ArgumentList &mdAl = md->argumentList();
+              if (declTemplArgs.size()>0 && declTemplArgs.size()==defTemplArgs.size())
               {
                 /* the function definition has template arguments
                  * and the class definition also has template arguments, so
                  * we must substitute the template names of the class by that
                  * of the function definition before matching.
                  */
-                argList = new ArgumentList;
-                substituteTemplatesInArgList(declTemplArgs,*defTemplArgs,
-                    mdAl,argList);
+                substituteTemplatesInArgList(declTemplArgs,defTemplArgs,mdAl,argList);
 
                 substDone=TRUE;
               }
@@ -6194,7 +6114,7 @@ static void findMember(const Entry *root,
 
               bool matching=
                 md->isVariable() || md->isTypedef() || // needed for function pointers
-                (mdAl==0 && root->argList->count()==0) ||
+                (mdAl.empty() && root->argList.empty()) ||
                 matchArguments2(
                     md->getClassDef(),md->getFileDef(),argList,
                     cd,fd,root->argList,
@@ -6206,7 +6126,7 @@ static void findMember(const Entry *root,
               }
 
               // for template member we also need to check the return type
-              if (md->templateArguments()!=0 && root->tArgLists!=0)
+              if (!md->templateArguments().empty() && !root->tArgLists.empty())
               {
                 QCString memType = md->typeString();
                 memType.stripPrefix("static "); // see bug700696
@@ -6217,8 +6137,8 @@ static void findMember(const Entry *root,
                 Debug::print(Debug::FindMembers,0,
                    "5b. Comparing return types '%s'<->'%s' #args %d<->%d\n",
                     qPrint(md->typeString()),qPrint(funcType),
-                    md->templateArguments()->count(),root->tArgLists->getLast()->count());
-                if (md->templateArguments()->count()!=root->tArgLists->getLast()->count() ||
+                    md->templateArguments().size(),root->tArgLists.back().size());
+                if (md->templateArguments().size()!=root->tArgLists.back().size() ||
                     qstrcmp(memType,funcType))
                 {
                   //printf(" ---> no matching\n");
@@ -6227,9 +6147,9 @@ static void findMember(const Entry *root,
               }
               bool rootIsUserDoc = (root->section&Entry::MEMBERDOC_SEC)!=0;
               bool classIsTemplate = scopeIsTemplate(md->getClassDef());
-              bool mdIsTemplate    = md->templateArguments()!=0;
+              bool mdIsTemplate    = md->templateArguments().hasParameters();
               bool classOrMdIsTemplate = mdIsTemplate || classIsTemplate;
-              bool rootIsTemplate  = root->tArgLists!=0;
+              bool rootIsTemplate  = !root->tArgLists.empty();
               //printf("classIsTemplate=%d mdIsTemplate=%d rootIsTemplate=%d\n",classIsTemplate,mdIsTemplate,rootIsTemplate);
               if (!rootIsUserDoc && // don't check out-of-line @fn references, see bug722457
                   (mdIsTemplate || rootIsTemplate) && // either md or root is a template
@@ -6245,19 +6165,19 @@ static void findMember(const Entry *root,
 
 
               Debug::print(Debug::FindMembers,0,
-                  "6. match results of matchArguments2 = %d\n",matching);
+                  "6. match results of matchArguments2 = %d substDone=%d\n",matching,substDone);
 
               if (substDone) // found a new argument list
               {
                 if (matching) // replace member's argument list
                 {
                   md->setDefinitionTemplateParameterLists(root->tArgLists);
-                  md->setArgumentList(argList); // new owner of the list => no delete
+                  md->setArgumentList(argList);
                 }
                 else // no match
                 {
                   if (!funcTempList.isEmpty() &&
-                      isSpecialization(declTemplArgs,*defTemplArgs))
+                      isSpecialization(declTemplArgs,defTemplArgs))
                   {
                     // check if we are dealing with a partial template
                     // specialization. In this case we add it to the class
@@ -6267,7 +6187,6 @@ static void findMember(const Entry *root,
                         md->protection(),md->isStatic(),md->virtualness(),spec,relates);
                     return;
                   }
-                  delete argList;
                 }
               }
               if (matching)
@@ -6303,9 +6222,9 @@ static void findMember(const Entry *root,
                 //printf("ccd->name()==%s className=%s\n",ccd->name().data(),className.data());
                 if (ccd!=0 && rightScopeMatch(ccd->name(),className))
                 {
-                  const ArgumentList *templAl = md->templateArguments();
-                  if (root->tArgLists && templAl!=0 &&
-                      root->tArgLists->getLast()->count()<=templAl->count())
+                  const ArgumentList &templAl = md->templateArguments();
+                  if (!root->tArgLists.empty() && !templAl.empty() &&
+                      root->tArgLists.back().size()<=templAl.size())
                   {
                     Debug::print(Debug::FindMembers,0,"7. add template specialization\n");
                     addMethodToClass(root,ccd,type,md->name(),args,isFriend,
@@ -6356,17 +6275,13 @@ static void findMember(const Entry *root,
             if (noMatchCount>1) warnMsg+="uniquely ";
             warnMsg+="matching class member found for \n";
 
-            if (root->tArgLists)
+            for (const ArgumentList &al : root->tArgLists)
             {
-              QListIterator<ArgumentList> alli(*root->tArgLists);
-              ArgumentList *al;
-              for (;(al=alli.current());++alli)
-              {
-                warnMsg+="  template ";
-                warnMsg+=tempArgListToString(al,root->lang);
-                warnMsg+='\n';
-              }
+              warnMsg+="  template ";
+              warnMsg+=tempArgListToString(al,root->lang);
+              warnMsg+='\n';
             }
+
             QCString fullFuncDecl=funcDecl.copy();
             if (isFunc) fullFuncDecl+=argListToString(root->argList,TRUE);
 
@@ -6382,8 +6297,8 @@ static void findMember(const Entry *root,
                 const ClassDef *cd=md->getClassDef();
                 if (cd!=0 && rightScopeMatch(cd->name(),className))
                 {
-                  const ArgumentList *templAl = md->templateArguments();
-                  if (templAl!=0)
+                  const ArgumentList &templAl = md->templateArguments();
+                  if (templAl.hasParameters())
                   {
                     warnMsg+="  'template ";
                     warnMsg+=tempArgListToString(templAl,root->lang);
@@ -6430,7 +6345,7 @@ static void findMember(const Entry *root,
             }
           }
           MemberType mtype=MemberType_Function;
-          ArgumentList *tArgList = new ArgumentList;
+          ArgumentList tArgList;
           //  getTemplateArgumentsFromName(cd->name()+"::"+funcName,root->tArgLists);
           md=createMemberDef(
               root->fileName,root->startLine,root->startColumn,
@@ -6464,7 +6379,6 @@ static void findMember(const Entry *root,
           mn->append(md);
           cd->insertMember(md);
           md->setRefItems(root->sli);
-          delete tArgList;
         }
         else
         {
@@ -6499,7 +6413,7 @@ static void findMember(const Entry *root,
           else                           mtype=MemberType_Function;
 
           // new overloaded member function
-          ArgumentList *tArgList =
+          ArgumentList tArgList =
             getTemplateArgumentsFromName(cd->name()+"::"+funcName,root->tArgLists);
           //printf("new related member %s args='%s'\n",md->name().data(),funcArgs.data());
           MemberDef *md=createMemberDef(
@@ -6590,7 +6504,7 @@ static void findMember(const Entry *root,
           MemberDef *rmd;
           while ((rmd=mni.current()) && newMember) // see if we got another member with matching arguments
           {
-            ArgumentList *rmdAl = rmd->argumentList();
+            const ArgumentList &rmdAl = rmd->argumentList();
 
             newMember=
               className!=rmd->getOuterScope()->name() ||
@@ -6645,8 +6559,9 @@ static void findMember(const Entry *root,
               root->stat && !isMemberOf,
               isMemberOf ? Foreign : Related,
               mtype,
-              (root->tArgLists ? root->tArgLists->getLast() : 0),
-              funcArgs.isEmpty() ? 0 : root->argList,root->metaData);
+              (!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList()),
+              funcArgs.isEmpty() ? ArgumentList() : root->argList,
+              root->metaData);
 
           if (isDefine && mdDefine)
           {
@@ -6685,7 +6600,7 @@ static void findMember(const Entry *root,
               const MemberDef *rmd;
               while ((rmd=rmni.current()) && !found) // see if we got another member with matching arguments
               {
-                const ArgumentList *rmdAl = rmd->argumentList();
+                const ArgumentList &rmdAl = rmd->argumentList();
                 // check for matching argument lists
                 if (
                     matchArguments2(rmd->getOuterScope(),rmd->getFileDef(),rmdAl,
@@ -6786,7 +6701,7 @@ localObjCMethod:
             root->fileName,root->startLine,root->startColumn,
             funcType,funcName,funcArgs,exceptions,
             root->protection,root->virt,root->stat,Member,
-            MemberType_Function,0,root->argList,root->metaData);
+            MemberType_Function,ArgumentList(),root->argList,root->metaData);
         md->setTagInfo(root->tagInfo);
         md->setLanguage(root->lang);
         md->setId(root->id);
@@ -7141,7 +7056,7 @@ static void findEnums(const Entry *root)
           root->protection,Normal,FALSE,
           isMemberOf ? Foreign : isRelated ? Related : Member,
           MemberType_Enumeration,
-          0,0,root->metaData);
+          ArgumentList(),ArgumentList(),root->metaData);
       md->setTagInfo(root->tagInfo);
       md->setLanguage(root->lang);
       md->setId(root->id);
@@ -7357,7 +7272,7 @@ static void addEnumValuesToEnums(const Entry *root)
                       fileName,e->startLine,e->startColumn,
                       e->type,e->name,e->args,0,
                       e->protection, Normal,e->stat,Member,
-                      MemberType_EnumValue,0,0,e->metaData);
+                      MemberType_EnumValue,ArgumentList(),ArgumentList(),e->metaData);
                   if      (md->getClassDef())     fmd->setMemberClass(md->getClassDef());
                   else if (md->getNamespaceDef()) fmd->setNamespace(md->getNamespaceDef());
                   else if (md->getFileDef())      fmd->setFileDef(md->getFileDef());
@@ -7755,8 +7670,8 @@ static void computeMemberRelations()
               mcd->isBaseClass(bmcd,TRUE))
           {
             //printf("  derived scope\n");
-            ArgumentList *bmdAl = bmd->argumentList();
-            ArgumentList *mdAl =  md->argumentList();
+            const ArgumentList &bmdAl = bmd->argumentList();
+            const ArgumentList &mdAl =  md->argumentList();
             //printf(" Base argList='%s'\n Super argList='%s'\n",
             //        argListToString(bmdAl.pointer()).data(),
             //        argListToString(mdAl.pointer()).data()
@@ -8591,7 +8506,8 @@ static void findDefineDocumentation(Entry *root)
     {
       MemberDef *md=createMemberDef(root->tagInfo->tagName,1,1,
                     "#define",root->name,root->args,0,
-                    Public,Normal,FALSE,Member,MemberType_Define,0,0,"");
+                    Public,Normal,FALSE,Member,MemberType_Define,
+                    ArgumentList(),ArgumentList(),"");
       md->setTagInfo(root->tagInfo);
       md->setLanguage(root->lang);
       //printf("Searching for '%s' fd=%p\n",filePathName.data(),fd);
diff --git a/src/entry.cpp b/src/entry.cpp
index 8ec7846..e700fab 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -43,11 +43,7 @@ Entry::Entry()
   groups = new QList<Grouping>;
   groups->setAutoDelete(TRUE);
   anchors = new QList<SectionInfo>; // Doxygen::sectionDict takes ownership of the items!
-  argList = new ArgumentList;
-  argList->setAutoDelete(TRUE);
   //printf("Entry::Entry() tArgList=0\n");
-  tArgLists = 0;
-  typeConstr = 0;
   mGrpId = -1;
   tagInfo = 0;
   sli = 0;
@@ -81,8 +77,8 @@ Entry::Entry(const Entry &e)
   virt        = e.virt;
   args        = e.args;
   bitfields   = e.bitfields;
-  argList     = e.argList->deepCopy();
-  tArgLists = 0;
+  argList     = e.argList;
+  tArgLists   = e.tArgLists;
   program     = e.program;
   initializer = e.initializer;
   includeFile = e.includeFile;
@@ -102,7 +98,7 @@ Entry::Entry(const Entry &e)
   write       = e.write;
   inside      = e.inside;
   exception   = e.exception;
-  typeConstr  = 0;
+  typeConstr  = e.typeConstr;
   bodyLine    = e.bodyLine;
   endBodyLine = e.endBodyLine;
   mGrpId      = e.mGrpId;
@@ -167,18 +163,6 @@ Entry::Entry(const Entry &e)
     anchors->append(s); // shallow copy, object are owned by Doxygen::sectionDict
   }
 
-  // deep copy type constraint list
-  if (e.typeConstr)
-  {
-    typeConstr  = e.typeConstr->deepCopy();
-  }
-
-  // deep copy template argument lists
-  if (e.tArgLists)
-  {
-    tArgLists = copyArgumentLists(e.tArgLists);
-  }
-
   m_fileDef = e.m_fileDef;
 
 }
@@ -192,10 +176,7 @@ Entry::~Entry()
   delete extends;
   delete groups;
   delete anchors;
-  delete argList;
-  delete tArgLists;
   delete tagInfo;
-  delete typeConstr;
   delete sli;
   num--;
 }
@@ -324,12 +305,12 @@ void Entry::reset()
   extends->clear();
   groups->clear();
   anchors->clear();
-  argList->clear();
+  argList.clear();
+  tArgLists.clear();
+  argList.reset();
+  typeConstr.reset();
   if (tagInfo)    { delete tagInfo; tagInfo=0; }
-  if (tArgLists)  { delete tArgLists; tArgLists=0; }
   if (sli)        { delete sli; sli=0; }
-  if (typeConstr) { delete typeConstr; typeConstr=0; }
-  //if (mtArgList) { delete mtArgList; mtArgList=0; }
   m_fileDef = 0;
 }
 
diff --git a/src/entry.h b/src/entry.h
index c078936..12bd897 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -18,20 +18,20 @@
 #ifndef ENTRY_H
 #define ENTRY_H
 
-#include "types.h"
-
 #include <qlist.h>
 #include <qgstring.h>
 
 #include <vector>
 #include <memory>
 
+#include "types.h"
+#include "arguments.h"
+
 struct SectionInfo;
 class QFile;
 class FileDef;
 class FileStorage;
 class StorageIntf;
-class ArgumentList;
 struct ListItemInfo;
 
 /** This class stores information about an inheritance relation
@@ -268,8 +268,8 @@ class Entry
     Specifier    virt;        //!< virtualness of the entry
     QCString     args;        //!< member argument string
     QCString     bitfields;   //!< member's bit fields
-    ArgumentList *argList;    //!< member arguments as a list
-    QList<ArgumentList> *tArgLists; //!< template argument declarations
+    ArgumentList argList;     //!< member arguments as a list
+    std::vector<ArgumentList> tArgLists; //!< template argument declarations
     QGString	 program;     //!< the program text
     QGString     initializer; //!< initial value (for variables)
     QCString     includeFile; //!< include file (2 arg of \\class, must be unique)
@@ -289,7 +289,7 @@ class Entry
     QCString     write;       //!< property write accessor
     QCString     inside;      //!< name of the class in which documents are found
     QCString     exception;   //!< throw specification
-    ArgumentList *typeConstr; //!< where clause (C#) for type constraints
+    ArgumentList typeConstr;  //!< where clause (C#) for type constraints
     int          bodyLine;    //!< line number of the definition in the source
     int          endBodyLine; //!< line number where the definition ends
     int          mGrpId;      //!< member group id
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index d7eefd6..7fa9426 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -181,7 +181,7 @@ static Specifier 	virt;
 
 static QCString          debugStr;
 static QCString          result; // function result
-static Argument          *parameter; // element of parameter list
+static Argument         *parameter; // element of parameter list
 static QCString          argType;  // fortran type of an argument of a parameter list
 static QCString          argName;  // last identifier name in variable list
 static QCString          initializer;  // initial value of a variable
@@ -1141,9 +1141,11 @@ private                                 {
 				       }
 <Parameterlist>{COMMA}|{BS}            { current->args += yytext;
 					 CommentInPrepass *c = locatePrepassComment(yyColNr-(int)yyleng, yyColNr);
-					 if (c!=NULL) {
-                                           if(current->argList->count()>0) {
-					     current->argList->at(current->argList->count()-1)->docs = c->str;
+					 if (c!=NULL)
+                                         {
+                                           if (!current->argList.empty())
+                                           {
+					     current->argList.back().docs = c->str;
 					   }
 					 }		         
 				       }
@@ -1152,15 +1154,13 @@ private                                 {
                                            QCString param = yytext;
 					   // std::cout << "3=========> got parameter " << param << std::endl;
 					   current->args += param;
-					   Argument *arg = new Argument;
-					   arg->name = param;
-					   arg->type = "";
-					   current->argList->append(arg);
+					   Argument arg;
+					   arg.name = param;
+					   current->argList.push_back(arg);
  				       } 
 <Parameterlist>{NOARGS}                {   
 				           newLine();
 					   //printf("3=========> without parameterlist \n");
- 					   //current->argList = ;
                                            addCurrentEntry(true);
 					   startScope(last_entry);
 					   BEGIN(SubprogBody);				           
@@ -1280,9 +1280,9 @@ private                                 {
 <PrototypeArgs>{
 "("|")"|","|{BS_}			{ current->args += yytext; }
 {ID}					{ current->args += yytext; 
-					  Argument *a = new Argument;
-					  a->name = QCString(yytext).lower();
-					  current->argList->append(a);
+					  Argument a;
+					  a.name = QCString(yytext).lower();
+					  current->argList.push_back(a);
 					}
 }
 
@@ -1787,8 +1787,7 @@ static void copyEntry(Entry *dest, const std::unique_ptr<Entry> &src)
    dest->bodyLine    = src->bodyLine;
    dest->endBodyLine = src->endBodyLine;
    dest->args        = src->args;
-   delete dest->argList;
-   dest->argList     = new ArgumentList(*src->argList);
+   dest->argList     = src->argList;
    dest->doc         = src->doc;
    dest->brief       = src->brief;
 }
@@ -2011,14 +2010,13 @@ SymbolModifiers& SymbolModifiers::operator|=(QCString mdfStringArg)
 static Argument *findArgument(Entry* subprog, QCString name, bool byTypeName = FALSE)
 {
   QCString cname(name.lower());
-  for (unsigned int i=0; i<subprog->argList->count(); i++) 
+  for (Argument &arg : subprog->argList)
   {
-    Argument *arg = subprog->argList->at(i);
-    if ((!byTypeName && arg->name.lower() == cname) ||
-	(byTypeName && arg->type.lower() == cname)
+    if ((!byTypeName && arg.name.lower() == cname) ||
+ 	 (byTypeName && arg.type.lower() == cname)
        )
     {
-      return arg;
+      return &arg;
     }
   }
   return 0;
@@ -2212,7 +2210,9 @@ static bool endScope(Entry *scope, bool isGlobalRoot)
       Argument *arg = findArgument(scope, it.key());
 
       if (arg)
+      {
         applyModifiers(arg, it.data());
+      }
     }
 
     // find return type for function
@@ -2384,7 +2384,7 @@ static void addSubprogram(const char *text)
   current->bodyLine  = yyLineNr; // used for source reference start of body of routine
   current->startLine  = yyLineNr; // used for source reference start of definition
   current->args.resize(0);
-  current->argList->clear();
+  current->argList.clear();
   docBlock.resize(0);
 }
 
@@ -2439,18 +2439,15 @@ static void addInterface(QCString name, InterfaceType type)
 
 /*! Get the argument \a name.
  */
-static Argument* getParameter(const QCString &name)
+static Argument *getParameter(const QCString &name)
 {
   // std::cout<<"addFortranParameter(): "<<name<<" DOCS:"<<(docs.isNull()?QCString("null"):docs)<<std::endl;
   Argument *ret = 0;
-  if (current_root->argList==0) return 0;
-  ArgumentListIterator ali(*current_root->argList);
-  Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  for (Argument &a:current_root->argList)
   {
-    if (a->name.lower()==name.lower())
+    if (a.name.lower()==name.lower())
     {
-      ret=a;
+      ret=&a;
       //printf("parameter found: %s\n",(const char*)name);
       break;
     }
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 00e42d7..bcdb3d0 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -396,15 +396,13 @@ bool GroupDefImpl::insertMember(MemberDef *md,bool docOnly)
            (srcMd->getOuterScope()->definitionType()==Definition::TypeFile &&
                md->getOuterScope()->definitionType()==Definition::TypeFile); 
 
-      const ArgumentList *srcMdAl  = srcMd->argumentList();
-      const ArgumentList *mdAl     = md->argumentList();
-      const ArgumentList *tSrcMdAl = srcMd->templateArguments();
-      const ArgumentList *tMdAl    = md->templateArguments();
-      
+      const ArgumentList &srcMdAl  = srcMd->argumentList();
+      const ArgumentList &mdAl     = md->argumentList();
+      const ArgumentList &tSrcMdAl = srcMd->templateArguments();
+      const ArgumentList &tMdAl    = md->templateArguments();
+
       if (srcMd->isFunction() && md->isFunction() && // both are a function
-          ((tSrcMdAl==0 && tMdAl==0) || 
-           (tSrcMdAl!=0 && tMdAl!=0 && tSrcMdAl->count()==tMdAl->count())
-          ) &&       // same number of template arguments
+          (tSrcMdAl.size()==tMdAl.size()) &&       // same number of template arguments
           matchArguments2(srcMd->getOuterScope(),srcMd->getFileDef(),srcMdAl,
                           md->getOuterScope(),md->getFileDef(),mdAl,
                           TRUE
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 4f44baa..28c0abb 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -54,8 +54,8 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
     MemberDefImpl(const char *defFileName,int defLine,int defColumn,
               const char *type,const char *name,const char *args,
               const char *excp,Protection prot,Specifier virt,bool stat,
-              Relationship related,MemberType t,const ArgumentList *tal,
-              const ArgumentList *al,const char *metaData);
+              Relationship related,MemberType t,const ArgumentList &tal,
+              const ArgumentList &al,const char *metaData);
     virtual ~MemberDefImpl();
 
     virtual DefType definitionType() const        { return TypeMember; }
@@ -202,11 +202,11 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
     virtual bool hasExamples() const;
     virtual ExampleSDict *getExamples() const;
     virtual bool isPrototype() const;
-    virtual const ArgumentList *argumentList() const;
-    virtual ArgumentList *argumentList();
-    virtual const ArgumentList *declArgumentList() const;
-    virtual const ArgumentList *templateArguments() const;
-    virtual const QList<ArgumentList> *definitionTemplateParameterLists() const;
+    virtual const ArgumentList &argumentList() const;
+    virtual ArgumentList &argumentList();
+    virtual const ArgumentList &declArgumentList() const;
+    virtual const ArgumentList &templateArguments() const;
+    virtual const std::vector<ArgumentList> &definitionTemplateParameterLists() const;
     virtual int getMemberGroupId() const;
     virtual MemberGroup *getMemberGroup() const;
     virtual bool fromAnonymousScope() const;
@@ -233,7 +233,7 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
     virtual QCString displayName(bool=TRUE) const;
     virtual QCString getDeclType() const;
     virtual void getLabels(QStrList &sl,const Definition *container) const;
-    virtual const ArgumentList *typeConstraints() const;
+    virtual const ArgumentList &typeConstraints() const;
     virtual QCString documentation() const;
     virtual QCString briefDescription(bool abbr=FALSE) const;
     virtual QCString fieldType() const;
@@ -276,10 +276,10 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
     virtual void setPrototype(bool p,const QCString &df,int line, int column);
     virtual void setExplicitExternal(bool b,const QCString &df,int line,int column);
     virtual void setDeclFile(const QCString &df,int line,int column);
-    virtual void setArgumentList(ArgumentList *al);
-    virtual void setDeclArgumentList(ArgumentList *al);
-    virtual void setDefinitionTemplateParameterLists(QList<ArgumentList> *lists);
-    virtual void setTypeConstraints(ArgumentList *al);
+    virtual void setArgumentList(const ArgumentList &al);
+    virtual void setDeclArgumentList(const ArgumentList &al);
+    virtual void setDefinitionTemplateParameterLists(const std::vector<ArgumentList> &lists);
+    virtual void setTypeConstraints(const ArgumentList &al);
     virtual void setType(const char *t);
     virtual void setAccessorType(ClassDef *cd,const char *t);
     virtual void setNamespace(NamespaceDef *nd);
@@ -324,8 +324,8 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
     virtual void warnIfUndocumented() const;
     virtual void warnIfUndocumentedParams() const;
     virtual void detectUndocumentedParams(bool hasParamCommand,bool hasReturnCommand) const;
-    virtual MemberDef *createTemplateInstanceMember(ArgumentList *formalArgs,
-               ArgumentList *actualArgs) const;
+    virtual MemberDef *createTemplateInstanceMember(const ArgumentList &formalArgs,
+               const ArgumentList &actualArgs) const;
     virtual void findSectionsInDocumentation();
     virtual void writeLink(OutputList &ol,
                    const ClassDef *cd,const NamespaceDef *nd,const FileDef *fd,const GroupDef *gd,
@@ -367,8 +367,8 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
 MemberDef *createMemberDef(const char *defFileName,int defLine,int defColumn,
               const char *type,const char *name,const char *args,
               const char *excp,Protection prot,Specifier virt,bool stat,
-              Relationship related,MemberType t,const ArgumentList *tal,
-              const ArgumentList *al,const char *metaData)
+              Relationship related,MemberType t,const ArgumentList &tal,
+              const ArgumentList &al,const char *metaData)
 {
   return new MemberDefImpl(defFileName,defLine,defColumn,type,name,args,excp,prot,virt,
                            stat,related,t,tal,al,metaData);
@@ -661,13 +661,13 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef
     { return getMdAlias()->getExamples(); }
     virtual bool isPrototype() const
     { return getMdAlias()->isPrototype(); }
-    virtual const ArgumentList *argumentList() const
+    virtual const ArgumentList &argumentList() const
     { return getMdAlias()->argumentList(); }
-    virtual const ArgumentList *declArgumentList() const
+    virtual const ArgumentList &declArgumentList() const
     { return getMdAlias()->declArgumentList(); }
-    virtual const ArgumentList *templateArguments() const
+    virtual const ArgumentList &templateArguments() const
     { return getMdAlias()->templateArguments(); }
-    virtual const QList<ArgumentList> *definitionTemplateParameterLists() const
+    virtual const std::vector<ArgumentList> &definitionTemplateParameterLists() const
     { return getMdAlias()->definitionTemplateParameterLists(); }
     virtual int getMemberGroupId() const
     { return getMdAlias()->getMemberGroupId(); }
@@ -721,7 +721,7 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef
     { return getMdAlias()->getDeclType(); }
     virtual void getLabels(QStrList &sl,const Definition *container) const
     { return getMdAlias()->getLabels(sl,container); }
-    virtual const ArgumentList *typeConstraints() const
+    virtual const ArgumentList &typeConstraints() const
     { return getMdAlias()->typeConstraints(); }
     virtual QCString documentation() const
     { return getMdAlias()->documentation(); }
@@ -747,8 +747,10 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef
     { err("non-const getNamespaceDef() called on aliased member. Please report as a bug.\n"); return 0; }
     virtual GroupDef *getGroupDef()
     { err("non-const getGroupDef() called on aliased member. Please report as a bug.\n"); return 0; }
-    virtual ArgumentList *argumentList()
-    { err("non-const argumentList() called on aliased member. Please report as bug.\n"); return 0; }
+    virtual ArgumentList &argumentList()
+    { err("non-const argumentList() called on aliased member. Please report as bug.\n");
+      static ArgumentList dummy; return dummy;
+    }
 
     virtual void setEnumBaseType(const QCString &type) {}
     virtual void setMemberType(MemberType t) {}
@@ -786,10 +788,10 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef
     virtual void setPrototype(bool p,const QCString &df,int line, int column) {}
     virtual void setExplicitExternal(bool b,const QCString &df,int line,int column) {}
     virtual void setDeclFile(const QCString &df,int line,int column) {}
-    virtual void setArgumentList(ArgumentList *al) {}
-    virtual void setDeclArgumentList(ArgumentList *al) {}
-    virtual void setDefinitionTemplateParameterLists(QList<ArgumentList> *lists) {}
-    virtual void setTypeConstraints(ArgumentList *al) {}
+    virtual void setArgumentList(const ArgumentList &al) {}
+    virtual void setDeclArgumentList(const ArgumentList &al) {}
+    virtual void setDefinitionTemplateParameterLists(const std::vector<ArgumentList> &lists) {}
+    virtual void setTypeConstraints(const ArgumentList &al) {}
     virtual void setType(const char *t) {}
     virtual void setAccessorType(ClassDef *cd,const char *t) {}
     virtual void setNamespace(NamespaceDef *nd) {}
@@ -821,8 +823,8 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef
     virtual void setHidden(bool b) {}
     virtual void addToSearchIndex() const {}
     virtual void findSectionsInDocumentation() {}
-    virtual MemberDef *createTemplateInstanceMember(ArgumentList *formalArgs,
-               ArgumentList *actualArgs) const
+    virtual MemberDef *createTemplateInstanceMember(const ArgumentList &formalArgs,
+               const ArgumentList &actualArgs) const
     { return getMdAlias()->createTemplateInstanceMember(formalArgs,actualArgs); }
     virtual void incrementFlowKeyWordCount() {}
 
@@ -934,10 +936,10 @@ static QCString addTemplateNames(const QCString &s,const QCString &n,const QCStr
 
 static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const MemberDef *md)
 {
-  const ArgumentList *defArgList=(md->isDocsForDefinition()) ?
+  const ArgumentList &defArgList=(md->isDocsForDefinition()) ?
                              md->argumentList() : md->declArgumentList();
   //printf("writeDefArgumentList '%s' isDocsForDefinition()=%d\n",md->name().data(),md->isDocsForDefinition());
-  if (defArgList==0 || md->isProperty())
+  if (!defArgList.hasParameters() || md->isProperty())
   {
     return FALSE; // member has no function like argument list
   }
@@ -945,23 +947,21 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
   // simple argument list for tcl
   if (md->getLanguage()==SrcLangExt_Tcl)
   {
-    if (defArgList->count()==0) return FALSE;
-    ArgumentListIterator ali(*defArgList);
-    Argument *a;
+    if (defArgList.empty()) return FALSE;
     ol.endMemberDocName();
     ol.startParameterList(FALSE);
     ol.startParameterType(TRUE,0);
     ol.endParameterType();
     ol.startParameterName(FALSE);
-    for (;(a=ali.current());++ali)
+    for (const Argument &a : defArgList)
     {
-      if (a->defval.isEmpty())
+      if (a.defval.isEmpty())
       {
-        ol.docify(a->name+" ");
+        ol.docify(a.name+" ");
       }
       else
       {
-        ol.docify("?"+a->name+"? ");
+        ol.docify("?"+a.name+"? ");
       }
     }
     ol.endParameterName(TRUE,FALSE,FALSE);
@@ -1008,9 +1008,10 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
       cName=cName.mid(il,ir-il+1);
       //printf("1. cName=%s\n",cName.data());
     }
-    else if (scope->definitionType()==Definition::TypeClass && (dynamic_cast<const ClassDef*>(scope))->templateArguments())
+    else if (scope->definitionType()==Definition::TypeClass)
     {
-      cName=tempArgListToString((dynamic_cast<const ClassDef*>(scope))->templateArguments(),scope->getLanguage());
+      cName=tempArgListToString((dynamic_cast<const ClassDef*>(scope))->templateArguments(),
+                             scope->getLanguage());
       //printf("2. cName=%s\n",cName.data());
     }
     else // no template specifier
@@ -1023,10 +1024,10 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
   bool first=TRUE;
   bool paramTypeStarted=FALSE;
   bool isDefine = md->isDefine();
-  ArgumentListIterator ali(*defArgList);
-  Argument *a=ali.current();
-  while (a)
+  auto alIt = defArgList.begin();
+  while (alIt!=defArgList.end())
   {
+    Argument a = *alIt;
     if (isDefine || first)
     {
       ol.startParameterType(first,0);
@@ -1038,30 +1039,30 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
       }
     }
     QRegExp re(")("),res("(.*\\*");
-    int vp=a->type.find(re);
-    int wp=a->type.find(res);
+    int vp=a.type.find(re);
+    int wp=a.type.find(res);
 
     // use the following to put the function pointer type before the name
     bool hasFuncPtrType=FALSE;
 
-    if (!a->attrib.isEmpty() && !md->isObjCMethod()) // argument has an IDL attribute
+    if (!a.attrib.isEmpty() && !md->isObjCMethod()) // argument has an IDL attribute
     {
-      ol.docify(a->attrib+" ");
+      ol.docify(a.attrib+" ");
     }
     if (hasFuncPtrType) // argument type is a function pointer
     {
-      //printf("a->type='%s' a->name='%s'\n",a->type.data(),a->name.data());
-      QCString n=a->type.left(vp);
-      if (hasFuncPtrType) n=a->type.left(wp);
+      //printf("a.type='%s' a.name='%s'\n",a.type.data(),a.name.data());
+      QCString n=a.type.left(vp);
+      if (hasFuncPtrType) n=a.type.left(wp);
       if (md->isObjCMethod()) { n.prepend("("); n.append(")"); }
       if (!cName.isEmpty()) n=addTemplateNames(n,scope->name(),cName);
       linkifyText(TextGeneratorOLImpl(ol),scope,md->getBodyDef(),md,n);
     }
     else // non-function pointer type
     {
-      QCString n=a->type;
+      QCString n=a.type;
       if (md->isObjCMethod()) { n.prepend("("); n.append(")"); }
-      if (a->type!="...")
+      if (a.type!="...")
       {
         if (!cName.isEmpty()) n=addTemplateNames(n,scope->name(),cName);
         linkifyText(TextGeneratorOLImpl(ol),scope,md->getBodyDef(),md,n);
@@ -1074,13 +1075,13 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
         ol.endParameterType();
         paramTypeStarted=FALSE;
       }
-      ol.startParameterName(defArgList->count()<2);
+      ol.startParameterName(defArgList.size()<2);
     }
     if (hasFuncPtrType)
     {
-      ol.docify(a->type.mid(wp,vp-wp));
+      ol.docify(a.type.mid(wp,vp-wp));
     }
-    if (!a->name.isEmpty() || a->type=="...") // argument has a name
+    if (!a.name.isEmpty() || a.type=="...") // argument has a name
     {
       //if (!hasFuncPtrType)
       //{
@@ -1096,7 +1097,7 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
       ol.enable(OutputGenerator::Man);
       if (latexOn) ol.enable(OutputGenerator::Latex);
       if (docbookOn) ol.enable(OutputGenerator::Docbook);
-      if (a->name.isEmpty()) ol.docify(a->type); else ol.docify(a->name);
+      if (a.name.isEmpty()) ol.docify(a.type); else ol.docify(a.name);
       ol.disable(OutputGenerator::Man);
       ol.disable(OutputGenerator::Latex);
       ol.disable(OutputGenerator::Docbook);
@@ -1105,19 +1106,19 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
       if (latexOn) ol.enable(OutputGenerator::Latex);
       if (docbookOn) ol.enable(OutputGenerator::Docbook);
     }
-    if (!a->array.isEmpty())
+    if (!a.array.isEmpty())
     {
-      ol.docify(a->array);
+      ol.docify(a.array);
     }
     if (hasFuncPtrType) // write the part of the argument type
                         // that comes after the name
     {
       linkifyText(TextGeneratorOLImpl(ol),scope,md->getBodyDef(),
-                  md,a->type.right(a->type.length()-vp));
+                  md,a.type.right(a.type.length()-vp));
     }
-    if (!a->defval.isEmpty()) // write the default value
+    if (!a.defval.isEmpty()) // write the default value
     {
-      QCString n=a->defval;
+      QCString n=a.defval;
       if (!cName.isEmpty()) n=addTemplateNames(n,scope->name(),cName);
       ol.docify(" = ");
 
@@ -1126,19 +1127,19 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
       ol.endTypewriter();
 
     }
-    ++ali;
-    a=ali.current();
-    if (a)
+    ++alIt;
+    if (alIt!=defArgList.end())
     {
+      a = *alIt;
       if (!md->isObjCMethod()) ol.docify(", "); // there are more arguments
       if (!isDefine)
       {
         QCString key;
-        if (md->isObjCMethod() && a->attrib.length()>=2)
+        if (md->isObjCMethod() && a.attrib.length()>=2)
         {
-          //printf("Found parameter keyword %s\n",a->attrib.data());
+          //printf("Found parameter keyword %s\n",a.attrib.data());
           // strip [ and ]
-          key=a->attrib.mid(1,a->attrib.length()-2);
+          key=a.attrib.mid(1,a.attrib.length()-2);
           if (key!=",") key+=":"; // for normal keywords add colon
         }
         ol.endParameterName(FALSE,FALSE,!md->isObjCMethod());
@@ -1165,36 +1166,36 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
   if (htmlOn) ol.enable(OutputGenerator::Html);
   if (latexOn) ol.enable(OutputGenerator::Latex);
   if (docbookOn) ol.enable(OutputGenerator::Docbook);
-  if (first) ol.startParameterName(defArgList->count()<2);
-  ol.endParameterName(TRUE,defArgList->count()<2,!md->isObjCMethod());
+  if (first) ol.startParameterName(defArgList.size()<2);
+  ol.endParameterName(TRUE,defArgList.size()<2,!md->isObjCMethod());
   ol.popGeneratorState();
   if (md->extraTypeChars())
   {
     ol.docify(md->extraTypeChars());
   }
-  if (defArgList->constSpecifier)
+  if (defArgList.constSpecifier)
   {
     ol.docify(" const");
   }
-  if (defArgList->volatileSpecifier)
+  if (defArgList.volatileSpecifier)
   {
     ol.docify(" volatile");
   }
-  if (defArgList->refQualifier==RefQualifierLValue)
+  if (defArgList.refQualifier==RefQualifierLValue)
   {
     ol.docify(" &");
   }
-  else if (defArgList->refQualifier==RefQualifierRValue)
+  else if (defArgList.refQualifier==RefQualifierRValue)
   {
     ol.docify(" &&");
   }
-  if (!defArgList->trailingReturnType.isEmpty())
+  if (!defArgList.trailingReturnType.isEmpty())
   {
     linkifyText(TextGeneratorOLImpl(ol), // out
                 scope,                   // scope
                 md->getBodyDef(),        // fileScope
                 md,                      // self
-                defArgList->trailingReturnType, // text
+                defArgList.trailingReturnType, // text
                 FALSE                    // autoBreak
                );
 
@@ -1264,24 +1265,22 @@ static void writeExceptionList(OutputList &ol, const ClassDef *cd, const MemberD
   }
 }
 
-static void writeTemplatePrefix(OutputList &ol,const ArgumentList *al)
+static void writeTemplatePrefix(OutputList &ol,const ArgumentList &al)
 {
   ol.docify("template<");
-  ArgumentListIterator ali(*al);
-  Argument *a = ali.current();
-  while (a)
+  for (auto it = al.begin(); it!=al.end();)
   {
-    ol.docify(a->type);
+    Argument a = *it;
+    ol.docify(a.type);
     ol.docify(" ");
-    ol.docify(a->name);
-    if (a->defval.length()!=0)
+    ol.docify(a.name);
+    if (a.defval.length()!=0)
     {
       ol.docify(" = ");
-      ol.docify(a->defval);
+      ol.docify(a.defval);
     }
-    ++ali;
-    a=ali.current();
-    if (a) ol.docify(", ");
+    ++it;
+    if (it!=al.end()) ol.docify(", ");
   }
   ol.docify("> ");
 }
@@ -1297,8 +1296,8 @@ class MemberDefImpl::IMPL
    ~IMPL();
     void init(Definition *def,const char *t,const char *a,const char *e,
               Protection p,Specifier v,bool s,Relationship r,
-              MemberType mt,const ArgumentList *tal,
-              const ArgumentList *al,const char *meta
+              MemberType mt,const ArgumentList &tal,
+              const ArgumentList &al,const char *meta
              );
 
     ClassDef     *classDef;   // member of or related to
@@ -1344,13 +1343,13 @@ class MemberDefImpl::IMPL
     int userInitLines;        // result of explicit \hideinitializer or \showinitializer
     MemberDef  *annMemb;
 
-    ArgumentList *defArgList;    // argument list of this member definition
-    ArgumentList *declArgList;   // argument list of this member declaration
+    ArgumentList defArgList;    // argument list of this member definition
+    ArgumentList declArgList;   // argument list of this member declaration
 
-    ArgumentList *tArgList;      // template argument list of function template
-    ArgumentList *typeConstraints; // type constraints for template parameters
+    ArgumentList tArgList;      // template argument list of function template
+    ArgumentList typeConstraints; // type constraints for template parameters
     MemberDef *templateMaster;
-    QList<ArgumentList> *defTmpArgLists; // lists of template argument lists
+    std::vector<ArgumentList> defTmpArgLists; // lists of template argument lists
                                          // (for template functions in nested template classes)
 
     QCString metaData;        // Slice metadata.
@@ -1422,11 +1421,6 @@ MemberDefImpl::IMPL::IMPL() :
     enumFields(0),
     redefinedBy(0),
     exampleSDict(0),
-    defArgList(0),
-    declArgList(0),
-    tArgList(0),
-    typeConstraints(0),
-    defTmpArgLists(0),
     classSectionSDict(0),
     category(0),
     categoryRelation(0),
@@ -1441,19 +1435,14 @@ MemberDefImpl::IMPL::~IMPL()
   delete redefinedBy;
   delete exampleSDict;
   delete enumFields;
-  delete defArgList;
-  delete tArgList;
-  delete typeConstraints;
-  delete defTmpArgLists;
   delete classSectionSDict;
-  delete declArgList;
 }
 
 void MemberDefImpl::IMPL::init(Definition *def,
                      const char *t,const char *a,const char *e,
                      Protection p,Specifier v,bool s,Relationship r,
-                     MemberType mt,const ArgumentList *tal,
-                     const ArgumentList *al,const char *meta
+                     MemberType mt,const ArgumentList &tal,
+                     const ArgumentList &al,const char *meta
                     )
 {
   classDef=0;
@@ -1471,7 +1460,6 @@ void MemberDefImpl::IMPL::init(Definition *def,
   enumFields=0;
   enumScope=0;
   livesInsideEnum=FALSE;
-  defTmpArgLists=0;
   hasCallGraph = FALSE;
   hasCallerGraph = FALSE;
   hasReferencedByRelation = FALSE;
@@ -1508,36 +1496,17 @@ void MemberDefImpl::IMPL::init(Definition *def,
   userInitLines=-1;
   docEnumValues=FALSE;
   // copy function template arguments (if any)
-  if (tal)
-  {
-    tArgList = tal->deepCopy();
-  }
-  else
-  {
-    tArgList=0;
-  }
+  tArgList = tal;
   //printf("new member al=%p\n",al);
   // copy function definition arguments (if any)
-  if (al)
-  {
-    defArgList = al->deepCopy();
-  }
-  else
-  {
-    defArgList=0;
-  }
+  defArgList = al;
   // convert function declaration arguments (if any)
   if (!args.isEmpty())
   {
-    declArgList = new ArgumentList;
     stringToArgumentList(args,declArgList,&extraTypeChars);
     //printf("setDeclArgList %s to %s const=%d\n",args.data(),
     //    argListToString(declArgList).data(),declArgList->constSpecifier);
   }
-  else
-  {
-    declArgList = 0;
-  }
   metaData = meta;
   templateMaster = 0;
   classSectionSDict = 0;
@@ -1584,7 +1553,7 @@ void MemberDefImpl::IMPL::init(Definition *def,
 MemberDefImpl::MemberDefImpl(const char *df,int dl,int dc,
                      const char *t,const char *na,const char *a,const char *e,
                      Protection p,Specifier v,bool s,Relationship r,MemberType mt,
-                     const ArgumentList *tal,const ArgumentList *al,const char *meta
+                     const ArgumentList &tal,const ArgumentList &al,const char *meta
                     ) : DefinitionImpl(df,dl,dc,removeRedundantWhiteSpace(na))
 {
   //printf("MemberDefImpl::MemberDef(%s)\n",na);
@@ -1613,12 +1582,7 @@ MemberDef *MemberDefImpl::deepCopy() const
   result->m_impl->redefinedBy= 0;
   result->m_impl->exampleSDict=0;
   result->m_impl->enumFields=0;
-  result->m_impl->defArgList=0;
-  result->m_impl->tArgList=0;
-  result->m_impl->typeConstraints=0;
-  result->m_impl->defTmpArgLists=0;
   result->m_impl->classSectionSDict=0;
-  result->m_impl->declArgList=0;
   // replace pointers owned by the object by deep copies
   if (m_impl->redefinedBy)
   {
@@ -1647,18 +1611,9 @@ MemberDef *MemberDefImpl::deepCopy() const
       result->insertEnumField(md);
     }
   }
-  if (m_impl->defArgList)
-  {
-    result->m_impl->defArgList = m_impl->defArgList->deepCopy();
-  }
-  if (m_impl->tArgList)
-  {
-    result->m_impl->tArgList = m_impl->tArgList->deepCopy();
-  }
-  if (m_impl->typeConstraints)
-  {
-    result->m_impl->typeConstraints = m_impl->typeConstraints->deepCopy();
-  }
+  result->m_impl->defArgList = m_impl->defArgList;
+  result->m_impl->tArgList = m_impl->tArgList;
+  result->m_impl->typeConstraints = m_impl->typeConstraints;
   result->setDefinitionTemplateParameterLists(m_impl->defTmpArgLists);
   if (m_impl->classSectionSDict)
   {
@@ -1670,10 +1625,7 @@ MemberDef *MemberDefImpl::deepCopy() const
       result->m_impl->classSectionSDict->append(it.currentKey(),ml);
     }
   }
-  if (m_impl->declArgList)
-  {
-    result->m_impl->declArgList = m_impl->declArgList->deepCopy();
-  }
+  result->m_impl->declArgList = m_impl->declArgList;
   return result;
 }
 
@@ -2033,13 +1985,9 @@ bool MemberDefImpl::isLinkable() const
 }
 
 
-void MemberDefImpl::setDefinitionTemplateParameterLists(QList<ArgumentList> *lists)
+void MemberDefImpl::setDefinitionTemplateParameterLists(const std::vector<ArgumentList> &lists)
 {
-  if (lists)
-  {
-    if (m_impl->defTmpArgLists) delete m_impl->defTmpArgLists;
-    m_impl->defTmpArgLists = copyArgumentLists(lists);
-  }
+  m_impl->defTmpArgLists = lists;
 }
 
 void MemberDefImpl::writeLink(OutputList &ol,
@@ -2225,9 +2173,8 @@ bool MemberDefImpl::isBriefSectionVisible() const
   // hide default constructors or destructors (no args) without
   // documentation
   bool visibleIfNotDefaultCDTor = !(cOrDTor &&
-                                   m_impl->defArgList &&
-                                   (m_impl->defArgList->isEmpty() ||
-                                    m_impl->defArgList->getFirst()->type == "void"
+                                   (m_impl->defArgList.empty() ||
+                                    m_impl->defArgList.front().type == "void"
                                    ) &&
                                    !hasDocs
                                   );
@@ -2313,7 +2260,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   bool isAnonymous = annoClassDef || m_impl->annMemb || m_impl->annEnumType;
   ///printf("startMemberItem for %s\n",name().data());
   ol.startMemberItem(anchor(),
-                     isAnonymous ? 1 : m_impl->tArgList ? 3 : 0,
+                     isAnonymous ? 1 : !m_impl->tArgList.empty() ? 3 : 0,
                      inheritId
                     );
 
@@ -2352,7 +2299,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   }
 
   // *** write template lists
-  if (m_impl->tArgList && getLanguage()==SrcLangExt_Cpp)
+  if (m_impl->tArgList.hasParameters() && getLanguage()==SrcLangExt_Cpp)
   {
     if (!isAnonymous) ol.startMemberTemplateParams();
     writeTemplatePrefix(ol,m_impl->tArgList);
@@ -2474,7 +2421,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   }
   else
   {
-    ol.insertMemberAlign(m_impl->tArgList!=0);
+    ol.insertMemberAlign(m_impl->tArgList.hasParameters());
   }
 
   // *** write name
@@ -2754,7 +2701,7 @@ bool MemberDefImpl::isDetailedSectionLinkable() const
          //(initLines>0 && initLines<maxInitLines) ||
          (hasMultiLineInitializer() && !hideUndocMembers) ||
          // has one or more documented arguments
-         (m_impl->defArgList!=0 && m_impl->defArgList->hasDocumentation()) ||
+         (m_impl->defArgList.hasDocumentation()) ||
          // is an attribute or property - need to display that tag
          (m_impl->memSpec & (Entry::Attribute|Entry::Property)) ||
          // has user comments
@@ -3169,7 +3116,7 @@ void MemberDefImpl::_writeExamples(OutputList &ol) const
 
 void MemberDefImpl::_writeTypeConstraints(OutputList &ol) const
 {
-  if (m_impl->typeConstraints)
+  if (m_impl->typeConstraints.hasParameters())
   {
     writeTypeConstraints(ol,this,m_impl->typeConstraints);
   }
@@ -3460,7 +3407,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
       ldef=ldef.mid(2);
     }
   }
-  else if (isFunction())
+  else if (isFunction() && !isObjCMethod())
   {
     title += "()";
   }
@@ -3546,14 +3493,12 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
     {
       bool first=TRUE;
       SrcLangExt lang = getLanguage();
-      if (m_impl->defTmpArgLists && lang==SrcLangExt_Cpp)
+      if (!m_impl->defTmpArgLists.empty() && lang==SrcLangExt_Cpp)
         // definition has explicit template parameter declarations
       {
-        QListIterator<ArgumentList> ali(*m_impl->defTmpArgLists);
-        ArgumentList *tal;
-        for (ali.toFirst();(tal=ali.current());++ali)
+        for (const ArgumentList &tal : m_impl->defTmpArgLists)
         {
-          if (tal->count()>0)
+          if (!tal.empty())
           {
             if (!first) ol.docify(" ");
             ol.startMemberDocPrefixItem();
@@ -3567,14 +3512,9 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
       {
         if (cd && lang==SrcLangExt_Cpp && !isTemplateSpecialization())
         {
-          QList<ArgumentList> tempParamLists;
-          cd->getTemplateParameterLists(tempParamLists);
-          //printf("#tempParamLists=%d\n",tempParamLists.count());
-          QListIterator<ArgumentList> ali(tempParamLists);
-          ArgumentList *tal;
-          for (ali.toFirst();(tal=ali.current());++ali)
+          for (const ArgumentList &tal : cd->getTemplateParameterLists())
           {
-            if (tal->count()>0)
+            if (!tal.empty())
             {
               if (!first) ol.docify(" ");
               ol.startMemberDocPrefixItem();
@@ -3583,7 +3523,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
             }
           }
         }
-        if (m_impl->tArgList && lang==SrcLangExt_Cpp) // function template prefix
+        if (m_impl->tArgList.hasParameters() && lang==SrcLangExt_Cpp) // function template prefix
         {
           ol.startMemberDocPrefixItem();
           writeTemplatePrefix(ol,m_impl->tArgList);
@@ -3775,7 +3715,7 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
 
   QCString brief           = briefDescription();
   QCString detailed        = documentation();
-  ArgumentList *docArgList = m_impl->defArgList;
+  ArgumentList &docArgList = m_impl->defArgList;
   if (m_impl->templateMaster)
   {
     brief      = m_impl->templateMaster->briefDescription();
@@ -3832,18 +3772,16 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
   //printf("***** defArgList=%p name=%s docs=%s hasDocs=%d\n",
   //     defArgList,
   //     defArgList?defArgList->hasDocumentation():-1);
-  if (docArgList!=0 && docArgList->hasDocumentation())
+  if (docArgList.hasDocumentation())
   {
     QCString paramDocs;
-    ArgumentListIterator ali(*docArgList);
-    Argument *a;
-    // convert the parameter documentation into a list of @param commands
-    for (ali.toFirst();(a=ali.current());++ali)
+    for (const Argument &a : docArgList)
     {
-      if (a->hasDocumentation())
+      if (a.hasDocumentation())
       {
-        QCString direction = extractDirection(a->docs);
-        paramDocs+="@param"+direction+" "+a->name+" "+a->docs;
+        QCString docsWithoutDir = a.docs;
+        QCString direction = extractDirection(docsWithoutDir);
+        paramDocs+="@param"+direction+" "+a.name+" "+a.docs;
       }
     }
     // feed the result to the documentation parser
@@ -4146,41 +4084,37 @@ void MemberDefImpl::detectUndocumentedParams(bool hasParamCommand,bool hasReturn
   }
   else if (!m_impl->hasDocumentedParams)
   {
-    const ArgumentList *al     = argumentList();
-    const ArgumentList *declAl = declArgumentList();
+    const ArgumentList &al     = argumentList();
+    const ArgumentList &declAl = declArgumentList();
     bool allDoc=TRUE; // no parameter => all parameters are documented
     if ( // member has parameters
-        al!=0 &&       // but the member has a parameter list
-        al->count()>0  // with at least one parameter (that is not void)
+        al.hasParameters()  // with at least one parameter (that is not void)
        )
     {
-      ArgumentListIterator ali(*al);
-      Argument *a;
-
       // see if all parameters have documentation
-      for (ali.toFirst();(a=ali.current()) && allDoc;++ali)
+      for (auto it = al.begin(); it!=al.end() && allDoc; ++it)
       {
-        if (!a->name.isEmpty() && a->type!="void" &&
-            !(isPython && (a->name=="self" || a->name=="cls"))
+        Argument a = *it;
+        if (!a.name.isEmpty() && a.type!="void" &&
+            !(isPython && (a.name=="self" || a.name=="cls"))
            )
         {
-          allDoc = !a->docs.isEmpty();
+          allDoc = !a.docs.isEmpty();
         }
         //printf("a->type=%s a->name=%s doc=%s\n",
         //        a->type.data(),a->name.data(),a->docs.data());
       }
-      if (!allDoc && declAl!=0) // try declaration arguments as well
+      if (!allDoc && declAl.empty()) // try declaration arguments as well
       {
         allDoc=TRUE;
-        ArgumentListIterator ali(*declAl);
-        Argument *a;
-        for (ali.toFirst();(a=ali.current()) && allDoc;++ali)
+        for (auto it = al.begin(); it!=al.end() && allDoc; ++it)
         {
-          if (!a->name.isEmpty() && a->type!="void" &&
-              !(isPython && (a->name=="self" || a->name=="cls"))
+          Argument a = *it;
+          if (!a.name.isEmpty() && a.type!="void" &&
+              !(isPython && (a.name=="self" || a.name=="cls"))
              )
           {
-            allDoc = !a->docs.isEmpty();
+            allDoc = !a.docs.isEmpty();
           }
           //printf("a->name=%s doc=%s\n",a->name.data(),a->docs.data());
         }
@@ -4269,14 +4203,14 @@ bool MemberDefImpl::isDocumentedFriendClass() const
 
 bool MemberDefImpl::isDeleted() const
 {
-  return m_impl->defArgList && m_impl->defArgList->isDeleted;
+  return m_impl->defArgList.isDeleted;
 }
 
 bool MemberDefImpl::hasDocumentation() const
 {
   return DefinitionImpl::hasDocumentation() ||
          (m_impl->mtype==MemberType_Enumeration && m_impl->docEnumValues) ||  // has enum values
-         (m_impl->defArgList!=0 && m_impl->defArgList->hasDocumentation());   // has doc arguments
+         (m_impl->defArgList.hasDocumentation());   // has doc arguments
 }
 
 #if 0
@@ -4344,10 +4278,10 @@ void MemberDefImpl::setAnchor()
   // include number of template arguments as well,
   // to distinguish between two template
   // specializations that only differ in the template parameters.
-  if (m_impl->tArgList)
+  if (m_impl->tArgList.hasParameters())
   {
     char buf[20];
-    qsnprintf(buf,20,"%d:",m_impl->tArgList->count());
+    qsnprintf(buf,20,"%d:",(int)m_impl->tArgList.size());
     buf[19]='\0';
     memAnchor.prepend(buf);
   }
@@ -4356,7 +4290,6 @@ void MemberDefImpl::setAnchor()
   uchar md5_sig[16];
   QCString sigStr(33);
   MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
-  //printf("memAnchor=%s\n",memAnchor.data());
   MD5SigToString(md5_sig,sigStr.rawData(),33);
   m_impl->anc = "a"+sigStr;
 }
@@ -4405,23 +4338,21 @@ void MemberDefImpl::setNamespace(NamespaceDef *nd)
 }
 
 MemberDef *MemberDefImpl::createTemplateInstanceMember(
-        ArgumentList *formalArgs,ArgumentList *actualArgs) const
+        const ArgumentList &formalArgs,const ArgumentList &actualArgs) const
 {
   //printf("  Member %s %s %s\n",typeString(),name().data(),argsString());
-  ArgumentList *actualArgList = 0;
-  if (m_impl->defArgList)
+  ArgumentList actualArgList;
+  if (!m_impl->defArgList.empty())
   {
-    actualArgList = m_impl->defArgList->deepCopy();
+    actualArgList = m_impl->defArgList;
 
     // replace formal arguments with actuals
-    ArgumentListIterator ali(*actualArgList);
-    Argument *arg;
-    for (;(arg=ali.current());++ali)
+    for (Argument &arg : actualArgList)
     {
-      arg->type = substituteTemplateArgumentsInString(arg->type,formalArgs,actualArgs);
+      arg.type = substituteTemplateArgumentsInString(arg.type,formalArgs,actualArgs);
     }
-    actualArgList->trailingReturnType =
-       substituteTemplateArgumentsInString(actualArgList->trailingReturnType,formalArgs,actualArgs);
+    actualArgList.trailingReturnType =
+       substituteTemplateArgumentsInString(actualArgList.trailingReturnType,formalArgs,actualArgs);
   }
 
   QCString methodName=name();
@@ -4436,7 +4367,8 @@ MemberDef *MemberDefImpl::createTemplateInstanceMember(
                        methodName,
                        substituteTemplateArgumentsInString(m_impl->args,formalArgs,actualArgs),
                        m_impl->exception, m_impl->prot,
-                       m_impl->virt, m_impl->stat, m_impl->related, m_impl->mtype, 0, 0, ""
+                       m_impl->virt, m_impl->stat, m_impl->related, m_impl->mtype, 
+                       ArgumentList(), ArgumentList(), ""
                    );
   imd->setArgumentList(actualArgList);
   imd->setDefinition(substituteTemplateArgumentsInString(m_impl->def,formalArgs,actualArgs));
@@ -4879,30 +4811,19 @@ void MemberDefImpl::writeEnumDeclaration(OutputList &typeDecl,
   }
 }
 
-void MemberDefImpl::setArgumentList(ArgumentList *al)
+void MemberDefImpl::setArgumentList(const ArgumentList &al)
 {
-  if (m_impl->defArgList) delete m_impl->defArgList;
   m_impl->defArgList = al;
 }
 
-void MemberDefImpl::setDeclArgumentList(ArgumentList *al)
+void MemberDefImpl::setDeclArgumentList(const ArgumentList &al)
 {
-  if (m_impl->declArgList) delete m_impl->declArgList;
   m_impl->declArgList = al;
 }
 
-void MemberDefImpl::setTypeConstraints(ArgumentList *al)
+void MemberDefImpl::setTypeConstraints(const ArgumentList &al)
 {
-  if (al==0) return;
-  if (m_impl->typeConstraints) delete m_impl->typeConstraints;
-  m_impl->typeConstraints = new ArgumentList;
-  m_impl->typeConstraints->setAutoDelete(TRUE);
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (;(a=ali.current());++ali)
-  {
-    m_impl->typeConstraints->append(new Argument(*a));
-  }
+  m_impl->typeConstraints = al;
 }
 
 void MemberDefImpl::setType(const char *t)
@@ -5557,27 +5478,27 @@ bool MemberDefImpl::isPrototype() const
   return m_impl->proto;
 }
 
-const ArgumentList *MemberDefImpl::argumentList() const
+const ArgumentList &MemberDefImpl::argumentList() const
 {
   return m_impl->defArgList;
 }
 
-ArgumentList *MemberDefImpl::argumentList()
+ArgumentList &MemberDefImpl::argumentList()
 {
   return m_impl->defArgList;
 }
 
-const ArgumentList *MemberDefImpl::declArgumentList() const
+const ArgumentList &MemberDefImpl::declArgumentList() const
 {
   return m_impl->declArgList;
 }
 
-const ArgumentList *MemberDefImpl::templateArguments() const
+const ArgumentList &MemberDefImpl::templateArguments() const
 {
   return m_impl->tArgList;
 }
 
-const QList<ArgumentList> *MemberDefImpl::definitionTemplateParameterLists() const
+const std::vector<ArgumentList> &MemberDefImpl::definitionTemplateParameterLists() const
 {
   return m_impl->defTmpArgLists;
 }
@@ -5931,47 +5852,44 @@ void MemberDefImpl::cacheTypedefVal(const ClassDef*val, const QCString & templSp
 void MemberDefImpl::copyArgumentNames(MemberDef *bmd)
 {
   {
-    const ArgumentList *arguments = bmd->argumentList();
-    if (m_impl->defArgList && arguments)
+    const ArgumentList &srcAl = bmd->argumentList();
+    ArgumentList &dstAl = m_impl->defArgList;
+    auto srcIt = srcAl.begin();
+    auto dstIt = dstAl.begin();
+    while ( srcIt!=srcAl.end() && dstIt!=dstAl.end())
     {
-      ArgumentListIterator aliDst(*m_impl->defArgList);
-      ArgumentListIterator aliSrc(*arguments);
-      Argument *argDst;
-      const Argument *argSrc;
-      for (;(argDst=aliDst.current()) && (argSrc=aliSrc.current());++aliDst,++aliSrc)
-      {
-        argDst->name = argSrc->name;
-        argDst->docs = argSrc->docs;
-      }
+      Argument &argDst       = *dstIt;
+      const Argument &argSrc = *srcIt;
+      argDst.name = argSrc.name;
+      argDst.docs = argSrc.docs;
+      ++srcIt;
+      ++dstIt;
     }
   }
+
   {
-    const ArgumentList *arguments = bmd->declArgumentList();
-    if (m_impl->declArgList && arguments)
+    const ArgumentList &srcAl = bmd->declArgumentList();
+    ArgumentList &dstAl = m_impl->declArgList;
+    auto srcIt = srcAl.begin();
+    auto dstIt = dstAl.begin();
+
+    while ( srcIt!=srcAl.end() && dstIt!=dstAl.end())
     {
-      ArgumentListIterator aliDst(*m_impl->declArgList);
-      ArgumentListIterator aliSrc(*arguments);
-      Argument *argDst;
-      const Argument *argSrc;
-      for (;(argDst=aliDst.current()) && (argSrc=aliSrc.current());++aliDst,++aliSrc)
-      {
-        argDst->name = argSrc->name;
-        argDst->docs = argSrc->docs;
-      }
+      Argument &argDst       = *dstIt;
+      const Argument &argSrc = *srcIt;
+      argDst.name = argSrc.name;
+      argDst.docs = argSrc.docs;
+      ++srcIt;
+      ++dstIt;
     }
   }
 }
 
-static void invalidateCachedTypesInArgumentList(ArgumentList *al)
+static void invalidateCachedTypesInArgumentList(ArgumentList &al)
 {
-  if (al)
+  for (Argument &a : al)
   {
-    ArgumentListIterator ali(*al);
-    Argument *a;
-    for (ali.toFirst();(a=ali.current());++ali)
-    {
-      a->canType.resize(0);
-    }
+    a.canType.resize(0);
   }
 }
 
@@ -6025,29 +5943,21 @@ void MemberDefImpl::addToSearchIndex() const
 
 //----------------
 
-static void transferArgumentDocumentation(ArgumentList *decAl,ArgumentList *defAl)
+static void transferArgumentDocumentation(ArgumentList &decAl,ArgumentList &defAl)
 {
-  if (decAl && defAl)
+  for (auto decIt = decAl.begin(), defIt = defAl.begin();
+            decIt!= decAl.end() && defIt!= defAl.end();
+          ++decIt,               ++defIt)
   {
-    ArgumentListIterator decAli(*decAl);
-    ArgumentListIterator defAli(*defAl);
-    Argument *decA,*defA;
-    for (decAli.toFirst(),defAli.toFirst();
-        (decA=decAli.current()) && (defA=defAli.current());
-        ++decAli,++defAli)
+    Argument decA = *decIt;
+    Argument defA = *defIt;
+    if (decA.docs.isEmpty() && !defA.docs.isEmpty())
     {
-      //printf("Argument decA->name=%s (doc=%s) defA->name=%s (doc=%s)\n",
-      //    decA->name.data(),decA->docs.data(),
-      //    defA->name.data(),defA->docs.data()
-      //      );
-      if (decA->docs.isEmpty() && !defA->docs.isEmpty())
-      {
-        decA->docs = defA->docs.copy();
-      }
-      else if (defA->docs.isEmpty() && !decA->docs.isEmpty())
-      {
-        defA->docs = decA->docs.copy();
-      }
+      decA.docs = defA.docs;
+    }
+    else if (defA.docs.isEmpty() && !decA.docs.isEmpty())
+    {
+      defA.docs = decA.docs;
     }
   }
 }
@@ -6066,8 +5976,8 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
 
     const MemberDef *cmdec = const_cast<const MemberDef*>(mdec);
     const MemberDef *cmdef = const_cast<const MemberDef*>(mdef);
-    ArgumentList *mdefAl = mdef->argumentList();
-    ArgumentList *mdecAl = mdec->argumentList();
+    ArgumentList &mdefAl = mdef->argumentList();
+    ArgumentList &mdecAl = mdec->argumentList();
     if (matchArguments2(cmdef->getOuterScope(),cmdef->getFileDef(),mdefAl,
                         cmdec->getOuterScope(),cmdec->getFileDef(),mdecAl,
                         TRUE
@@ -6097,9 +6007,9 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
         //printf("transferring docs mdef->mdec (%s->%s)\n",mdef->argsString(),mdec->argsString());
         mdec->setDocumentation(mdef->documentation(),mdef->docFile(),mdef->docLine());
         mdec->setDocsForDefinition(mdef->isDocsForDefinition());
-        if (mdefAl!=0)
+        if (mdefAl.hasParameters())
         {
-          ArgumentList *mdefAlComb = new ArgumentList;
+          ArgumentList mdefAlComb;
           stringToArgumentList(mdef->argsString(),mdefAlComb);
           transferArgumentDocumentation(mdefAl,mdefAlComb);
           mdec->setArgumentList(mdefAlComb);
@@ -6110,9 +6020,9 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
         //printf("transferring docs mdec->mdef (%s->%s)\n",mdec->argsString(),mdef->argsString());
         mdef->setDocumentation(mdec->documentation(),mdec->docFile(),mdec->docLine());
         mdef->setDocsForDefinition(mdec->isDocsForDefinition());
-        if (mdecAl!=0)
+        if (mdecAl.hasParameters())
         {
-          ArgumentList *mdecAlComb = new ArgumentList;
+          ArgumentList mdecAlComb;
           stringToArgumentList(mdec->argsString(),mdecAlComb);
           transferArgumentDocumentation(mdecAl,mdecAlComb);
           mdef->setDeclArgumentList(mdecAlComb);
@@ -6210,7 +6120,7 @@ QCString MemberDefImpl::documentation() const
   }
 }
 
-const ArgumentList *MemberDefImpl::typeConstraints() const
+const ArgumentList &MemberDefImpl::typeConstraints() const
 {
   return m_impl->typeConstraints;
 }
diff --git a/src/memberdef.h b/src/memberdef.h
index 97bf819..986ceca 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -18,6 +18,8 @@
 #ifndef MEMBERDEF_H
 #define MEMBERDEF_H
 
+#include <vector>
+
 #include <qlist.h>
 #include <sys/types.h>
 
@@ -221,11 +223,11 @@ class MemberDef : virtual public Definition
     virtual bool isPrototype() const = 0;
 
     // argument related members
-    virtual const ArgumentList *argumentList() const = 0;
-    virtual ArgumentList *argumentList() = 0;
-    virtual const ArgumentList *declArgumentList() const = 0;
-    virtual const ArgumentList *templateArguments() const = 0;
-    virtual const QList<ArgumentList> *definitionTemplateParameterLists() const = 0;
+    virtual const ArgumentList &argumentList() const = 0;
+    virtual ArgumentList &argumentList() = 0;
+    virtual const ArgumentList &declArgumentList() const = 0;
+    virtual const ArgumentList &templateArguments() const = 0;
+    virtual const std::vector<ArgumentList> &definitionTemplateParameterLists() const = 0;
 
     // member group related members
     virtual int getMemberGroupId() const = 0;
@@ -265,7 +267,7 @@ class MemberDef : virtual public Definition
     virtual QCString getDeclType() const = 0;
     virtual void getLabels(QStrList &sl,const Definition *container) const = 0;
 
-    virtual const ArgumentList *typeConstraints() const = 0;
+    virtual const ArgumentList &typeConstraints() const = 0;
 
     // overrules
     virtual QCString documentation() const = 0;
@@ -331,10 +333,10 @@ class MemberDef : virtual public Definition
     virtual void setDeclFile(const QCString &df,int line,int column) = 0;
 
     // argument related members
-    virtual void setArgumentList(ArgumentList *al) = 0;
-    virtual void setDeclArgumentList(ArgumentList *al) = 0;
-    virtual void setDefinitionTemplateParameterLists(QList<ArgumentList> *lists) = 0;
-    virtual void setTypeConstraints(ArgumentList *al) = 0;
+    virtual void setArgumentList(const ArgumentList &al) = 0;
+    virtual void setDeclArgumentList(const ArgumentList &al) = 0;
+    virtual void setDefinitionTemplateParameterLists(const std::vector<ArgumentList> &lists) = 0;
+    virtual void setTypeConstraints(const ArgumentList &al) = 0;
     virtual void setType(const char *t) = 0;
     virtual void setAccessorType(ClassDef *cd,const char *t) = 0;
 
@@ -384,8 +386,8 @@ class MemberDef : virtual public Definition
     // --- actions ----
     //-----------------------------------------------------------------------------------
 
-    virtual MemberDef *createTemplateInstanceMember(ArgumentList *formalArgs,
-               ArgumentList *actualArgs) const = 0;
+    virtual MemberDef *createTemplateInstanceMember(const ArgumentList &formalArgs,
+               const ArgumentList &actualArgs) const = 0;
     virtual void findSectionsInDocumentation() = 0;
     virtual void addToSearchIndex() const = 0;
 
@@ -421,8 +423,8 @@ class MemberDef : virtual public Definition
 MemberDef *createMemberDef(const char *defFileName,int defLine,int defColumn,
               const char *type,const char *name,const char *args,
               const char *excp,Protection prot,Specifier virt,bool stat,
-              Relationship related,MemberType t,const ArgumentList *tal,
-              const ArgumentList *al,const char *metaData);
+              Relationship related,MemberType t,const ArgumentList &tal,
+              const ArgumentList &al,const char *metaData);
 
 MemberDef *createMemberDefAlias(const Definition *newScope,const MemberDef *aliasMd);
 
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index a288e0e..c8f9273 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -1422,23 +1422,20 @@ void PerlModDocVisitor::visitPost(DocParBlock *)
 }
 
 
-static void addTemplateArgumentList(ArgumentList *al,PerlModOutput &output,const char *)
+static void addTemplateArgumentList(const ArgumentList &al,PerlModOutput &output,const char *)
 {
-  if (!al)
-    return;
+  if (!al.hasParameters()) return;
   output.openList("template_parameters");
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  for (const Argument &a : al)
   {
     output.openHash();
-    if (!a->type.isEmpty())
-      output.addFieldQuotedString("type", a->type);
-    if (!a->name.isEmpty())
-      output.addFieldQuotedString("declaration_name", a->name)
-	.addFieldQuotedString("definition_name", a->name);
-    if (!a->defval.isEmpty())
-      output.addFieldQuotedString("default", a->defval);
+    if (!a.type.isEmpty())
+      output.addFieldQuotedString("type", a.type);
+    if (!a.name.isEmpty())
+      output.addFieldQuotedString("declaration_name", a.name)
+	.addFieldQuotedString("definition_name", a.name);
+    if (!a.defval.isEmpty())
+      output.addFieldQuotedString("default", a.defval);
     output.closeHash();
   }
   output.closeList();
@@ -1609,45 +1606,46 @@ void PerlModGenerator::generatePerlModForMember(const MemberDef *md,const Defini
       md->memberType()!=MemberType_Enumeration)
     m_output.addFieldQuotedString("type", md->typeString());
   
-  const ArgumentList *al = md->argumentList();
+  const ArgumentList &al = md->argumentList();
   if (isFunc) //function
   {
-    m_output.addFieldBoolean("const", al!=0 && al->constSpecifier)
-      .addFieldBoolean("volatile", al!=0 && al->volatileSpecifier);
+    m_output.addFieldBoolean("const",    al.constSpecifier)
+            .addFieldBoolean("volatile", al.volatileSpecifier);
 
     m_output.openList("parameters");
-    const ArgumentList *declAl = md->declArgumentList();
-    const ArgumentList *defAl  = md->argumentList();
-    if (declAl && defAl && declAl->count()>0)
+    const ArgumentList &declAl = md->declArgumentList();
+    if (!declAl.empty())
     {
-      ArgumentListIterator declAli(*declAl);
-      ArgumentListIterator defAli(*defAl);
-      const Argument *a;
-      for (declAli.toFirst();(a=declAli.current());++declAli)
+      auto defIt = al.begin();
+      for (const Argument &a : declAl)
       {
-	const Argument *defArg = defAli.current();
+	const Argument *defArg = 0;
+        if (defIt!=al.end())
+        {
+          defArg = &(*defIt);
+          ++defIt;
+        }
 	m_output.openHash();
 
-	if (!a->name.isEmpty())
-	  m_output.addFieldQuotedString("declaration_name", a->name);
+	if (!a.name.isEmpty())
+	  m_output.addFieldQuotedString("declaration_name", a.name);
 
-	if (defArg && !defArg->name.isEmpty() && defArg->name!=a->name)
+	if (defArg && !defArg->name.isEmpty() && defArg->name!=a.name)
 	  m_output.addFieldQuotedString("definition_name", defArg->name);
 
-	if (!a->type.isEmpty())
-	  m_output.addFieldQuotedString("type", a->type);
+	if (!a.type.isEmpty())
+	  m_output.addFieldQuotedString("type", a.type);
 
-	if (!a->array.isEmpty())
-	  m_output.addFieldQuotedString("array", a->array);
+	if (!a.array.isEmpty())
+	  m_output.addFieldQuotedString("array", a.array);
 
-	if (!a->defval.isEmpty())
-	  m_output.addFieldQuotedString("default_value", a->defval);
+	if (!a.defval.isEmpty())
+	  m_output.addFieldQuotedString("default_value", a.defval);
 
-	if (!a->attrib.isEmpty())
-	  m_output.addFieldQuotedString("attributes", a->attrib);
+	if (!a.attrib.isEmpty())
+	  m_output.addFieldQuotedString("attributes", a.attrib);
 	
 	m_output.closeHash();
-	if (defArg) ++defAli;
       }
     }
     m_output.closeList();
@@ -1656,12 +1654,10 @@ void PerlModGenerator::generatePerlModForMember(const MemberDef *md,const Defini
 	   md->argsString()!=0) // define
   {
     m_output.openList("parameters");
-    ArgumentListIterator ali(*al);
-    const Argument *a;
-    for (ali.toFirst();(a=ali.current());++ali)
+    for (const Argument &a : al)
     {
       m_output.openHash()
-	.addFieldQuotedString("name", a->type)
+	.addFieldQuotedString("name", a.type)
 	.closeHash();
     }
     m_output.closeList();
diff --git a/src/pre.l b/src/pre.l
index cebc98f..5e46110 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1444,10 +1444,10 @@ void addDefine()
   MemberDef *md=createMemberDef(
       g_yyFileName,g_yyLineNr-g_yyMLines,g_yyColNr,
       "#define",g_defName,g_defArgsStr,0,
-      Public,Normal,FALSE,Member,MemberType_Define,0,0,"");
+      Public,Normal,FALSE,Member,MemberType_Define,ArgumentList(),ArgumentList(),"");
   if (!g_defArgsStr.isEmpty())
   {
-    ArgumentList *argList = new ArgumentList;
+    ArgumentList argList;
     //printf("addDefine() g_defName='%s' g_defArgsStr='%s'\n",g_defName.data(),g_defArgsStr.data());
     stringToArgumentList(g_defArgsStr,argList);
     md->setArgumentList(argList);
diff --git a/src/pyscanner.l b/src/pyscanner.l
index ee72c7c..1a3f052 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -378,7 +378,7 @@ static void searchFoundDef()
   current->type.resize(0);
   current->name.resize(0);
   current->args.resize(0);
-  current->argList->clear();
+  current->argList.clear();
   g_packageCommentAllowed = FALSE;
   gstat=FALSE;
   //printf("searchFoundDef at=%d\n",yyLineNr);
@@ -387,7 +387,7 @@ static void searchFoundDef()
 static void searchFoundClass()
 {
   current->section = Entry::CLASS_SEC;
-  current->argList->clear();
+  current->argList.clear();
   current->type += "class" ;
   current->fileName  = yyFileName;
   current->startLine  = yyLineNr;
@@ -928,6 +928,10 @@ STARTDOCSYMS      "##"
 			      BEGIN(FunctionParams);
 		            }
     ")"                     { // end of parameter list
+                              if (current->argList.empty())
+                              {
+                                current->argList.noParameters=TRUE;
+                              }
         		      current->args = argListToString(current->argList);
         		      g_funcParamsEnd = TRUE;
                             }
@@ -942,10 +946,10 @@ STARTDOCSYMS      "##"
                         }
     {IDENTIFIER}        { // Name of parameter
 			  lineCount();
-			  Argument *a = new Argument;
-			  current->argList->append(a);
-			  current->argList->getLast()->name = QCString(yytext).stripWhiteSpace();
-			  current->argList->getLast()->type = g_argType;
+			  Argument a;
+			  a.name = QCString(yytext).stripWhiteSpace();
+			  a.type = g_argType;
+			  current->argList.push_back(a);
                           g_argType = "";
                         }
     "="		        { // default value
@@ -1032,8 +1036,8 @@ STARTDOCSYMS      "##"
      ","		{
 			  if (g_braceCount == 0)
 			  {
-			    if (current->argList->getLast())
-			      current->argList->getLast()->type += g_defVal.data();
+			    if (!current->argList.empty())
+			      current->argList.back().type += g_defVal;
 			    if (*yytext != ',')
 			      unput(*yytext);
 			    BEGIN(FunctionParams);
@@ -1082,8 +1086,8 @@ STARTDOCSYMS      "##"
      ","		{
 			  if (g_braceCount == 0)
 			  {
-			    if (current->argList->getLast())
-			      current->argList->getLast()->defval=QCString(g_defVal.data()).stripWhiteSpace();
+			    if (!current->argList.empty())
+			      current->argList.back().defval=QCString(g_defVal).stripWhiteSpace();
 			    if (*yytext == ')')
 			      unput(*yytext);
 			    BEGIN(FunctionParams);
diff --git a/src/scanner.l b/src/scanner.l
index 50ebe5e..61b51cb 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -352,7 +352,7 @@ static void addType()
     }
     current->type += current->args ;
     current->args.resize(0) ;
-    current->argList->clear();
+    current->argList.clear();
 }
 
 
@@ -372,7 +372,7 @@ static QCString stripQuotes(const char *s)
 
 static void startCommentBlock(bool);
 static void handleCommentBlock(const QCString &doc,bool brief);
-static void handleParametersCommentBlocks(ArgumentList *al);
+static void handleParametersCommentBlocks(ArgumentList &al);
 
 //-----------------------------------------------------------------
 
@@ -418,28 +418,10 @@ static void prependScope()
   {
     //printf("--- prependScope %s to %s\n",current_root->name.data(),current->name.data());
     current->name.prepend(current_root->name+"::");
-    if (current_root->tArgLists)
+    //printf("prependScope #=%d #current=%d\n",current_root->tArgLists->count(),current->tArgLists->count());
+    for (const ArgumentList &srcAl : current_root->tArgLists)
     {
-      if (current->tArgLists==0)
-      {
-	current->tArgLists = new QList<ArgumentList>;
-	current->tArgLists->setAutoDelete(TRUE);
-      }
-      //printf("prependScope #=%d #current=%d\n",current_root->tArgLists->count(),current->tArgLists->count());
-      QListIterator<ArgumentList> talsi(*current_root->tArgLists);
-      ArgumentList *srcAl=0;
-      for (talsi.toLast();(srcAl=talsi.current());--talsi)
-      {
-        ArgumentList *dstAl = new ArgumentList;
-	QListIterator<Argument> tali(*srcAl);
-        Argument *a;
-        for (;(a=tali.current());++tali)
-        {
-          dstAl->append(new Argument(*a));
-        //printf("appending argument %s %s\n",a->type.data(),a->name.data());
-        }	  
-        current->tArgLists->insert(0,dstAl);	
-      }
+      current->tArgLists.insert(current->tArgLists.begin(),srcAl);
     }
   }
 }
@@ -450,14 +432,12 @@ static void prependScope()
 static bool checkForKnRstyleC()
 {
   if (((QCString)yyFileName).right(2).lower()!=".c") return FALSE; // must be a C file
-  if (!current->argList) return FALSE; // must have arguments
-  ArgumentListIterator ali(*current->argList);
-  Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  if (current->argList.empty()) return FALSE; // must have arguments
+  for (const Argument &a : current->argList)
   {
     // in K&R style argument do not have a type, but doxygen expects a type
     // so it will think the argument has no name
-    if (a->type.isEmpty() || !a->name.isEmpty()) return FALSE;
+    if (a.type.isEmpty() || !a.name.isEmpty()) return FALSE;
   }
   return TRUE;
 }
@@ -545,30 +525,27 @@ static void splitKnRArg(QCString &oldStyleArgPtr,QCString &oldStyleArgName)
 static void addKnRArgInfo(const QCString &type,const QCString &name,
                           const QCString &brief,const QCString &docs)
 {
-  if (current->argList==0) return;
-  ArgumentListIterator ali(*current->argList);
-  Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  for (Argument &a : current->argList)
   {
-    if (a->type==name)
+    if (a.type==name)
     {
-      a->type=type.stripWhiteSpace();
-      if (a->type.left(9)=="register ") // strip keyword
+      a.type=type.stripWhiteSpace();
+      if (a.type.left(9)=="register ") // strip keyword
       {
-	a->type=a->type.mid(9);
+	a.type=a.type.mid(9);
       }
-      a->name=name.stripWhiteSpace();
+      a.name=name.stripWhiteSpace();
       if (!brief.isEmpty() && !docs.isEmpty())
       {
-        a->docs=brief+"\n\n"+docs;
+        a.docs=brief+"\n\n"+docs;
       }
       else if (!brief.isEmpty())
       {
-        a->docs=brief;
+        a.docs=brief;
       }
       else
       {
-	a->docs=docs;
+	a.docs=docs;
       }
     }
   }
@@ -577,17 +554,14 @@ static void addKnRArgInfo(const QCString &type,const QCString &name,
 //-----------------------------------------------------------------------------
 
 
-void fixArgumentListForJavaScript(ArgumentList *al)
+void fixArgumentListForJavaScript(ArgumentList &al)
 {
-  if (al==0) return;
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  for (Argument &a : al)
   {
-    if (!a->type.isEmpty() && a->name.isEmpty())
+    if (!a.type.isEmpty() && a.name.isEmpty())
     { // a->type is actually the (typeless) parameter name, so move it
-      a->name=a->type;
-      a->type.resize(0);
+      a.name=a.type;
+      a.type.resize(0);
     }
   }
 }
@@ -904,7 +878,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
 					}
 
@@ -913,7 +887,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
 					}
 
@@ -923,7 +897,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
 					}
 
@@ -933,7 +907,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount();
 					}
 
@@ -943,7 +917,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount();
 					}
 
@@ -953,7 +927,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount();
 					}
 <FindMembers>{B}*("public"|"methods"|"__published"){BN}*":"{BN}* { 
@@ -962,7 +936,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
 					}
 <FindMembers>{B}*"internal"{BN}*":"{BN}* {  // for now treat C++/CLI's internal as package...
@@ -973,7 +947,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->type.resize(0); 
 					    current->name.resize(0); 
 					    current->args.resize(0);
-					    current->argList->clear();
+					    current->argList.clear();
 					    lineCount() ;
 					  }
 					  else
@@ -987,7 +961,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
 					}
 <FindMembers>{B}*"private"{BN}*":"{BN}*	{ 
@@ -996,7 +970,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
 					}
 <FindMembers>{B}*"event"{BN}+           { 
@@ -1087,7 +1061,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
   					}
 <FindMembers>{B}*"@protected"{BN}+	{
@@ -1096,7 +1070,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
   					}
 <FindMembers>{B}*"@public"{BN}+	{
@@ -1105,7 +1079,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0); 
 					  current->name.resize(0); 
 					  current->args.resize(0);
-					  current->argList->clear();
+					  current->argList.clear();
 					  lineCount() ;
   					}
 <FindMembers>[\-+]{BN}*			{
@@ -1130,7 +1104,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->type.resize(0); 
 					    current->name.resize(0); 
 					    current->args.resize(0);
-					    current->argList->clear();
+					    current->argList.clear();
 					    BEGIN( ObjCMethod );
 					  }
   					}
@@ -1150,8 +1124,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <ObjCMethod>":"{B}*			{ // start of parameter list
   					  current->name += ':';
-  					  Argument *a = new Argument;
-					  current->argList->append(a);
+  					  Argument a;
+					  current->argList.push_back(a);
   					  BEGIN( ObjCParams );
   					}
 <ObjCReturnType>[^)]*			{ // TODO: check if nested braches are possible.
@@ -1171,26 +1145,26 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    current->name += keyw+":";
 					  }
-					  if (current->argList->getLast()->type.isEmpty())
+					  if (current->argList.back().type.isEmpty())
 					  {
-					    current->argList->getLast()->type="id";
+					    current->argList.back().type="id";
 					  }
-  					  Argument *a = new Argument;
-  					  a->attrib=(QCString)"["+keyw+"]";
-					  current->argList->append(a);
+  					  Argument a;
+  					  a.attrib=(QCString)"["+keyw+"]";
+					  current->argList.push_back(a);
   					}
 <ObjCParams>{ID}{BN}*			{ // name of parameter
   					  lineCount();
-  					  current->argList->getLast()->name=QCString(yytext).stripWhiteSpace();
+  					  current->argList.back().name=QCString(yytext).stripWhiteSpace();
   					}
 <ObjCParams>","{BN}*"..."		{ // name of parameter
   					  lineCount();
 					  // do we want the comma as part of the name?
   					  //current->name += ",";
-  					  Argument *a = new Argument;
-  					  a->attrib="[,]";
-  					  a->type="...";
-					  current->argList->append(a);
+  					  Argument a;
+  					  a.attrib="[,]";
+  					  a.type="...";
+					  current->argList.push_back(a);
   					}
    /*
 <ObjCParams>":"				{ 
@@ -1199,12 +1173,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
    */
 <ObjCParams>"("				{
 				 	  roundCount=0;
-					  current->argList->getLast()->type.resize(0);
+					  current->argList.back().type.resize(0);
 					  BEGIN( ObjCParamType );
 					}
 <ObjCParamType>"("                      {
                                           roundCount++;
-  					  current->argList->getLast()->type+=yytext;
+  					  current->argList.back().type+=yytext;
                                         }
 <ObjCParamType>")"/{B}*			{
                                           if (roundCount<=0)
@@ -1213,18 +1187,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           }
                                           else
                                           {
-                                            current->argList->getLast()->type+=yytext;
+                                            current->argList.back().type+=yytext;
                                             roundCount--;
                                           }
 					}
 <ObjCParamType>[^()]*			{
-        				  current->argList->getLast()->type+=QCString(yytext).stripWhiteSpace();
+        				  current->argList.back().type+=QCString(yytext).stripWhiteSpace();
   					}
 <ObjCMethod,ObjCParams>";"		{ // end of method declaration
-					  if (current->argList->getLast() && current->argList->getLast()->type.isEmpty())
+					  if (!current->argList.empty() && current->argList.back().type.isEmpty())
 					  {
-					    current->argList->getLast()->type="id";
+					    current->argList.back().type="id";
 					  }
+                                          if (current->argList.empty()) // method without parameters
+                                          {
+                                            current->argList.noParameters = TRUE;
+                                          }
   					  current->args = argListToString(current->argList);
 					  //printf("argList=%s\n",current->args.data());
   					  unput(';');
@@ -1235,10 +1213,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           //printf("Type=%s Name=%s args=%s\n",
 					  //    current->type.data(),current->name.data(),argListToString(current->argList).data()
 					  //    );
-					  if (current->argList->getLast() && current->argList->getLast()->type.isEmpty())
+					  if (!current->argList.empty() && current->argList.back().type.isEmpty())
 					  {
-					    current->argList->getLast()->type="id";
+					    current->argList.back().type="id";
 					  }
+                                          if (current->argList.empty()) // method without parameters
+                                          {
+                                            current->argList.noParameters = TRUE;
+                                          }
   					  current->args = argListToString(current->argList);
                                           unput('{');
   					  BEGIN( Function );
@@ -1960,15 +1942,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <FindMembers>("template"|"generic")({BN}*)"<"/[>]?	{  // generic is a C++/CLI extension
   					  lineCount();
-					  if (current->tArgLists==0)
-					  {
-					    current->tArgLists = new QList<ArgumentList>;
-					    current->tArgLists->setAutoDelete(TRUE);
-					  }
-					  ArgumentList *al = new ArgumentList;
+					  ArgumentList al;
 					  //current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
-					  current->tArgLists->append(al);
-					  currentArgumentList = al;
+					  current->tArgLists.push_back(al);
+					  currentArgumentList = &current->tArgLists.back();
 					  templateStr="<";
 					  fullArgString = templateStr;
 					  copyArgString = &templateStr;
@@ -4491,7 +4468,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    fullArgString=current->args.copy();
 					    copyArgString=&current->args;
 					    BEGIN( ReadFuncArgType ) ;
-					    //printf(">>> Read function arguments current->argList->count()=%d\n",current->argList->count());
+					    //printf(">>> Read function arguments current->argList.size()=%d\n",current->argList.size());
 					  }
 					}
   /*
@@ -4704,8 +4681,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <ReadTempArgs>">"			{
 					  *copyArgString+=*yytext;
 					  fullArgString+=*yytext;
-					  //printf("end template list %s\n",copyArgString->data());
-					  stringToArgumentList(fullArgString,currentArgumentList);
+					  //printf("end template list '%s'\n",copyArgString->data());
+					  stringToArgumentList(fullArgString,*currentArgumentList);
 					  BEGIN( currentArgumentContext );
 					}
 <CopyArgRound>"("			{
@@ -4857,12 +4834,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FuncQual>{BN}*"const"{BN}*       	{ // const member function
   					  lineCount() ; 
   					  current->args += " const "; 
-					  current->argList->constSpecifier=TRUE;
+					  current->argList.constSpecifier=TRUE;
 					}
 <FuncQual>{BN}*"volatile"{BN}*    	{ // volatile member function
   					  lineCount() ; 
   					  current->args += " volatile "; 
-					  current->argList->volatileSpecifier=TRUE;
+					  current->argList.volatileSpecifier=TRUE;
 					}
 <FuncQual>{BN}*"noexcept"{BN}*    	{ // noexcept qualifier
   					  lineCount() ; 
@@ -4880,25 +4857,25 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                         }
 <FuncQual>{BN}*"&"                      {
                                           current->args += " &";
-                                          current->argList->refQualifier=RefQualifierLValue;
+                                          current->argList.refQualifier=RefQualifierLValue;
                                         }
 <FuncQual>{BN}*"&&"                     {
                                           current->args += " &&";
-                                          current->argList->refQualifier=RefQualifierRValue;
+                                          current->argList.refQualifier=RefQualifierRValue;
                                         }
 
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"0"{BN}*  	{ // pure virtual member function
   					  lineCount() ; 
 					  current->args += " = 0"; 
 					  current->virt = Pure; 
-					  current->argList->pureSpecifier=TRUE;
+					  current->argList.pureSpecifier=TRUE;
                                           BEGIN(FuncQual);
 					}
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"delete"{BN}*     { // C++11 explicitly delete member
                                           lineCount();
                                           current->args += " = delete";
 					  current->spec |= Entry::Delete;
-					  current->argList->isDeleted=TRUE;
+					  current->argList.isDeleted=TRUE;
                                           BEGIN(FuncQual);
                                         }
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"default"{BN}*     { // C++11 explicitly defaulted constructor/assignment operator
@@ -4909,7 +4886,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                         }
 <FuncQual>{BN}*"->"{BN}*                {
                                           lineCount();
-                                          current->argList->trailingReturnType = " -> ";
+                                          current->argList.trailingReturnType = " -> ";
                                           current->args += " -> ";
                                           BEGIN(TrailingReturn);
                                         }
@@ -4918,12 +4895,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(FuncQual);
                                         }
 <TrailingReturn>.                       {
-                                          current->argList->trailingReturnType+=yytext;
+                                          current->argList.trailingReturnType+=yytext;
                                           current->args+=yytext;
                                         }
 <TrailingReturn>\n                      {
                                           lineCount();
-                                          current->argList->trailingReturnType+=yytext;
+                                          current->argList.trailingReturnType+=yytext;
                                           current->args+=' ';
                                         }
 <FuncRound,FuncFunc>{BN}*","{BN}*	{ 
@@ -5009,9 +4986,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           if (insideCS && qstrcmp(yytext,"where")==0)
 					  { 
 					    // type constraint for a method
-                                            delete current->typeConstr;
-                                            current->typeConstr = new ArgumentList;
-					    current->typeConstr->append(new Argument);
+					    current->typeConstr.clear();
+					    current->typeConstr.push_back(Argument());
 					    lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
@@ -5048,6 +5024,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <OldStyleArgs>{ID} 			{ current->args += yytext; }
 <OldStyleArgs>"{"			{
+                                          if (current->argList.empty())
+                                          {
+                                            current->argList.noParameters=TRUE;
+                                          }
   					  current->args = argListToString(current->argList);
   					  unput('{');
 					  BEGIN(FuncQual);
@@ -5479,7 +5459,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->type.resize(0) ;
 					  current->name.resize(0) ;
 					  current->args.resize(0) ;
-					  current->argList->clear();
+					  current->argList.clear();
 					  BEGIN( FindMembers ) ;
 					}
 <Bases>";"			{
@@ -5509,7 +5489,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    current->type.resize(0) ;
 					    current->name.resize(0) ;
 					    current->args.resize(0) ;
-					    current->argList->clear();
+					    current->argList.clear();
 					  }
 					  BEGIN( FindMembers ) ;
 					}
@@ -5538,16 +5518,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <CSGeneric>"<"				{
-					  if (current->tArgLists==0)
-					  {
-					    current->tArgLists = new QList<ArgumentList>;
-					    current->tArgLists->setAutoDelete(TRUE);
-					  }
-					  ArgumentList *al = new ArgumentList;
+					  ArgumentList al;
 					  // check bug 612858 before enabling the next line
 					  //current->spec |= Entry::Template;
-					  current->tArgLists->append(al);
-					  currentArgumentList = al;
+					  current->tArgLists.push_back(al);
+					  currentArgumentList = &current->tArgLists.back();
 					  templateStr="<";
 					  current->name += "<";
 					  fullArgString = templateStr;
@@ -5585,7 +5560,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  current->name += yytext;
 					}
 <CompoundName>{SCOPENAME}{BN}*";"	{ // forward declaration
-                                          if (current->tArgLists && current->tArgLists->count()>0)
+                                          if (!current->tArgLists.empty())
                                           {
                                             // found a forward template declaration, this has
                                             // a purpose of its own
@@ -5759,9 +5734,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else if (insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
 					  {
-                                            delete current->typeConstr;
-                                            current->typeConstr = new ArgumentList;
-					    current->typeConstr->append(new Argument);
+                                            current->typeConstr.clear();
+					    current->typeConstr.push_back(Argument());
 					    lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
@@ -5821,7 +5795,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    BEGIN( CopyArgComment );
 					}
 <CSConstraintType,CSConstraintName>"#"	{ // artificially inserted token to signal end of comment block
-                                          current->typeConstr->getLast()->docs = fullArgString;
+                                          current->typeConstr.back().docs = fullArgString;
   					}
 <CSConstraintType>"{"			{ // end of type constraint reached
                                           // parse documentation of the constraints
@@ -5839,24 +5813,24 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                         }
 <CSConstraintName>{ID}                  {
                                           // parameter name
-                                          current->typeConstr->getLast()->name=yytext;
+                                          current->typeConstr.back().name=yytext;
                                         }
 <CSConstraintType>"where"		{ // another constraint for a different param
-					  current->typeConstr->append(new Argument);
+					  current->typeConstr.push_back(Argument());
                                           BEGIN( CSConstraintName );
   					}
 <CSConstraintType>({ID}".")*{ID}("<"{ID}">")?("()")?  {
-                                          if (current->typeConstr->getLast()->type.isEmpty())
+                                          if (current->typeConstr.back().type.isEmpty())
                                               // first type constraint for this parameter
                                           {
-                                            current->typeConstr->getLast()->type=yytext;
+                                            current->typeConstr.back().type=yytext;
                                           }
                                           else // new type constraint for same parameter
                                           {
-                                            QCString name = current->typeConstr->getLast()->name;
-                                            current->typeConstr->append(new Argument);
-                                            current->typeConstr->getLast()->name=name;
-                                            current->typeConstr->getLast()->type=yytext;
+                                            QCString name = current->typeConstr.back().name;
+                                            current->typeConstr.push_back(Argument());
+                                            current->typeConstr.back().name=name;
+                                            current->typeConstr.back().type=yytext;
                                           }
                                         }
 <CSConstraintName,CSConstraintType>\n	{
@@ -6038,9 +6012,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           if (insideCS && baseScope.stripWhiteSpace()=="where")
 					  { 
 					    // type constraint for a class
-                                            delete current->typeConstr;
-                                            current->typeConstr = new ArgumentList;
-					    current->typeConstr->append(new Argument);
+                                            current->typeConstr.clear();
+					    current->typeConstr.push_back(Argument());
 					    lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
@@ -6461,7 +6434,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      //current->type.resize(0);
 					      //current->name.resize(0);
 					      //current->args.resize(0);
-					      //current->argList->clear();
+					      //current->argList.clear();
 					      //curlyCount=0;
 					      //BEGIN( SkipCurlyBlock );
 
@@ -6864,16 +6837,16 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <PrototypeQual>{B}*"const"{B}*    	{ 
   					  current->args += " const "; 
-					  current->argList->constSpecifier=TRUE;
+					  current->argList.constSpecifier=TRUE;
 					}
 <PrototypeQual>{B}*"volatile"{B}* 	{ 
   					  current->args += " volatile "; 
-					  current->argList->volatileSpecifier=TRUE;
+					  current->argList.volatileSpecifier=TRUE;
 					}
 <PrototypeQual>{B}*"="{B}*"0"{B}*	{ 
 					  current->args += " = 0"; 
 					  current->virt = Pure; 
-					  current->argList->pureSpecifier=TRUE;
+					  current->argList.pureSpecifier=TRUE;
 					}
 <PrototypeQual>"throw"{B}*"("	        {
   					  current->exception = "throw(";
@@ -7068,17 +7041,15 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   }
 }
 
-static void handleParametersCommentBlocks(ArgumentList *al)
+static void handleParametersCommentBlocks(ArgumentList &al)
 {
   //printf(">>>>>>> handleParametersCommentBlocks()\n");
-  ArgumentListIterator ali(*al);
-  Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  for (Argument &a : al)
   {
     //printf("    Param %s docs=%s\n",a->name.data(),a->docs.data());
-    if (!a->docs.isEmpty())
+    if (!a.docs.isEmpty())
     {
-      if  (!a->name && a->type == "...") a->name= "...";
+      if  (!a.name && a.type == "...") a.name= "...";
       int position=0;
       bool needsEntry;
 
@@ -7095,7 +7066,7 @@ static void handleParametersCommentBlocks(ArgumentList *al)
       while (parseCommentBlock(
 	     g_thisParser,
 	     current.get(),
-	     a->docs,            // text
+	     a.docs,             // text
 	     yyFileName,         // file
 	     current->docLine,   // line of block start
 	     FALSE, 
@@ -7114,7 +7085,7 @@ static void handleParametersCommentBlocks(ArgumentList *al)
       {
 	newEntry();
       }
-      a->docs = current->doc;
+      a.docs = current->doc;
 
       // restore context
       current->doc       = orgDoc;
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index 49818b2..dc0cc85 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -1015,26 +1015,34 @@ static void insertMemberReference(const MemberDef *src, const MemberDef *dst, co
 
 static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, const Definition *def)
 {
-  const ArgumentList *declAl = md->declArgumentList();
-  const ArgumentList *defAl = md->argumentList();
-  if (declAl!=0 && defAl!=0 && declAl->count()>0)
-  {
-    ArgumentListIterator declAli(*declAl);
-    ArgumentListIterator defAli(*defAl);
-    const Argument *a;
-    for (declAli.toFirst();(a=declAli.current());++declAli)
+  const ArgumentList &declAl = md->declArgumentList();
+  const ArgumentList &defAl = md->argumentList();
+  if (declAl.size()>0)
+  {
+//    ArgumentListIterator declAli(*declAl);
+//    ArgumentListIterator defAli(*defAl);
+//    const Argument *a;
+//    for (declAli.toFirst();(a=declAli.current());++declAli)
+    auto defIt = defAl.begin();
+    for (const Argument &a : declAl)
     {
-      const Argument *defArg = defAli.current();
+      //const Argument *defArg = defAli.current();
+      const Argument *defArg = 0;
+      if (defIt!=defAl.end())
+      {
+        defArg = &(*defIt);
+        ++defIt;
+      }
 
-      if (!a->attrib.isEmpty())
+      if (!a.attrib.isEmpty())
       {
-        bindTextParameter(param_select,":attributes",a->attrib);
-        bindTextParameter(param_insert,":attributes",a->attrib);
+        bindTextParameter(param_select,":attributes",a.attrib);
+        bindTextParameter(param_insert,":attributes",a.attrib);
       }
-      if (!a->type.isEmpty())
+      if (!a.type.isEmpty())
       {
         StringList l;
-        linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,a->type);
+        linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,a.type);
 
         StringListIterator li(l);
         QCString *s;
@@ -1046,32 +1054,31 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co
           insertMemberReference(src_refid,dst_refid, "argument");
           ++li;
         }
-        bindTextParameter(param_select,":type",a->type);
-        bindTextParameter(param_insert,":type",a->type);
+        bindTextParameter(param_select,":type",a.type);
+        bindTextParameter(param_insert,":type",a.type);
       }
-      if (!a->name.isEmpty())
+      if (!a.name.isEmpty())
       {
-        bindTextParameter(param_select,":declname",a->name);
-        bindTextParameter(param_insert,":declname",a->name);
+        bindTextParameter(param_select,":declname",a.name);
+        bindTextParameter(param_insert,":declname",a.name);
       }
-      if (defArg && !defArg->name.isEmpty() && defArg->name!=a->name)
+      if (defArg && !defArg->name.isEmpty() && defArg->name!=a.name)
       {
         bindTextParameter(param_select,":defname",defArg->name);
         bindTextParameter(param_insert,":defname",defArg->name);
       }
-      if (!a->array.isEmpty())
+      if (!a.array.isEmpty())
       {
-        bindTextParameter(param_select,":array",a->array);
-        bindTextParameter(param_insert,":array",a->array);
+        bindTextParameter(param_select,":array",a.array);
+        bindTextParameter(param_insert,":array",a.array);
       }
-      if (!a->defval.isEmpty())
+      if (!a.defval.isEmpty())
       {
         StringList l;
-        linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,a->defval);
-        bindTextParameter(param_select,":defval",a->defval);
-        bindTextParameter(param_insert,":defval",a->defval);
+        linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,a.defval);
+        bindTextParameter(param_select,":defval",a.defval);
+        bindTextParameter(param_insert,":defval",a.defval);
       }
-      if (defArg) ++defAli;
 
       int param_id=step(param_select,TRUE,TRUE);
       if (param_id==0) {
@@ -1091,18 +1098,16 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co
 
 static void insertMemberDefineParams(int memberdef_id,const MemberDef *md, const Definition *def)
 {
-    if (md->argumentList()->count()==0) // special case for "foo()" to
-                                        // disguish it from "foo".
+    if (md->argumentList().empty()) // special case for "foo()" to
+                                    // disguish it from "foo".
     {
       DBG_CTX(("no params\n"));
     }
     else
     {
-      ArgumentListIterator ali(*md->argumentList());
-      Argument *a;
-      for (ali.toFirst();(a=ali.current());++ali)
+      for (const Argument &a : md->argumentList())
       {
-        bindTextParameter(param_insert,":defname",a->type);
+        bindTextParameter(param_insert,":defname",a.type);
         int param_id=step(param_insert,TRUE);
         if (param_id==-1) {
           continue;
@@ -1373,48 +1378,39 @@ static void writeInnerNamespaces(const NamespaceSDict *nl, struct Refid outer_re
 }
 
 
-static void writeTemplateArgumentList(const ArgumentList * al,
+static void writeTemplateArgumentList(const ArgumentList &al,
                                       const Definition * scope,
                                       const FileDef * fileScope)
 {
-  if (al)
+  for (const Argument &a : al)
   {
-    ArgumentListIterator ali(*al);
-    Argument *a;
-    for (ali.toFirst();(a=ali.current());++ali)
+    if (!a.type.isEmpty())
     {
-      if (!a->type.isEmpty())
-      {
-        #warning linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->type);
-        bindTextParameter(param_select,":type",a->type);
-        bindTextParameter(param_insert,":type",a->type);
-      }
-      if (!a->name.isEmpty())
-      {
-        bindTextParameter(param_select,":declname",a->name);
-        bindTextParameter(param_insert,":declname",a->name);
-        bindTextParameter(param_select,":defname",a->name);
-        bindTextParameter(param_insert,":defname",a->name);
-      }
-      if (!a->defval.isEmpty())
-      {
-        #warning linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->defval);
-        bindTextParameter(param_select,":defval",a->defval);
-        bindTextParameter(param_insert,":defval",a->defval);
-      }
-      if (!step(param_select,TRUE,TRUE))
-        step(param_insert);
+//#warning linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.type);
+      bindTextParameter(param_select,":type",a.type);
+      bindTextParameter(param_insert,":type",a.type);
     }
+    if (!a.name.isEmpty())
+    {
+      bindTextParameter(param_select,":declname",a.name);
+      bindTextParameter(param_insert,":declname",a.name);
+      bindTextParameter(param_select,":defname",a.name);
+      bindTextParameter(param_insert,":defname",a.name);
+    }
+    if (!a.defval.isEmpty())
+    {
+//#warning linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.defval);
+      bindTextParameter(param_select,":defval",a.defval);
+      bindTextParameter(param_insert,":defval",a.defval);
+    }
+    if (!step(param_select,TRUE,TRUE))
+      step(param_insert);
   }
 }
 
 static void writeMemberTemplateLists(const MemberDef *md)
 {
-  const ArgumentList *templMd = md->templateArguments();
-  if (templMd) // function template prefix
-  {
-    writeTemplateArgumentList(templMd,md->getClassDef(),md->getFileDef());
-  }
+  writeTemplateArgumentList(md->templateArguments(),md->getClassDef(),md->getFileDef());
 }
 static void writeTemplateList(const ClassDef *cd)
 {
@@ -1675,12 +1671,9 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref
 
   if (isFunc)
   {
-    const ArgumentList *al = md->argumentList();
-    if (al!=0)
-    {
-      bindIntParameter(memberdef_insert,":const",al->constSpecifier);
-      bindIntParameter(memberdef_insert,":volatile",al->volatileSpecifier);
-    }
+    const ArgumentList &al = md->argumentList();
+    bindIntParameter(memberdef_insert,":const",al.constSpecifier);
+    bindIntParameter(memberdef_insert,":volatile",al.volatileSpecifier);
     bindIntParameter(memberdef_insert,":explicit",md->isExplicit());
     bindIntParameter(memberdef_insert,":inline",md->isInline());
     bindIntParameter(memberdef_insert,":final",md->isFinal());
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 18f6161..f498c5f 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -1183,8 +1183,6 @@ void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMe
     me->args       = tmi->arglist;
     if (!me->args.isEmpty())
     {
-      delete me->argList;
-      me->argList = new ArgumentList;
       stringToArgumentList(me->args,me->argList);
     }
     if (tmi->enumValues.count()>0)
@@ -1356,23 +1354,17 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     }
     if (tci->templateArguments)
     {
-      if (ce->tArgLists==0)
-      {
-        ce->tArgLists = new QList<ArgumentList>;
-        ce->tArgLists->setAutoDelete(TRUE);
-      }
-      ArgumentList *al = new ArgumentList;
-      ce->tArgLists->append(al);
-
+      ArgumentList al;
       QListIterator<QCString> sli(*tci->templateArguments);
       QCString *argName;
       for (;(argName=sli.current());++sli)
       {
-        Argument *a = new Argument;
-        a->type = "class";
-        a->name = *argName;
-        al->append(a);
+        Argument a;
+        a.type = "class";
+        a.name = *argName;
+        al.push_back(a);
       }
+      ce->tArgLists.push_back(al);
     }
 
     buildMemberList(ce,tci->members);
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 3b939ce..d0fb564 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -1622,37 +1622,32 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
 static void tcl_command_ARGLIST(QCString &arglist)
 {
 D
-  Argument *myArg;
   QCStringList myArgs;
   QCString myArglist="";
 
-  if (!tcl.entry_current->argList)
-  {
-    tcl.entry_current->argList=new ArgumentList;
-  }
   tcl_split_list(arglist,myArgs);
   for (uint i=0;i<myArgs.count();i++)
   {
     QCStringList myArgs1;
-    myArg=new Argument;
+    Argument myArg;
 
     tcl_split_list(*myArgs.at(i),myArgs1);
     if (myArgs1.count()==2)
     {
-      myArg->name= (*myArgs1.at(0));
-      myArg->defval= (*myArgs1.at(1));
-      if (myArg->defval.isEmpty())
+      myArg.name= (*myArgs1.at(0));
+      myArg.defval= (*myArgs1.at(1));
+      if (myArg.defval.isEmpty())
       {
-        myArg->defval = " ";
+        myArg.defval = " ";
       }
-      myArglist += "?" + QCString(myArg->name) + "? ";
+      myArglist += "?" + QCString(myArg.name) + "? ";
     }
     else
     {
-      myArg->name= (*myArgs.at(i));
-      myArglist += myArg->name + " ";
+      myArg.name= (*myArgs.at(i));
+      myArglist += myArg.name + " ";
     }
-    tcl.entry_current->argList->append(myArg);
+    tcl.entry_current->argList.push_back(myArg);
   }
   arglist = myArglist;
   tcl.entry_current->args = arglist;
diff --git a/src/util.cpp b/src/util.cpp
index e1e9fb5..1aba32b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -540,7 +540,7 @@ const ClassDef *newResolveTypedef(const FileDef *fileScope,
                                   const MemberDef **pMemType,
                                   QCString *pTemplSpec,
                                   QCString *pResolvedType,
-                                  ArgumentList *actTemplParams)
+                                  const ArgumentList *actTemplParams)
 {
   //printf("newResolveTypedef(md=%p,cachedVal=%p)\n",md,md->getCachedTypedefVal());
   bool isCached = md->isTypedefValCached(); // value already cached
@@ -563,11 +563,11 @@ const ClassDef *newResolveTypedef(const FileDef *fileScope,
   
   const ClassDef *typeClass = md->getClassDef();
   QCString type = md->typeString(); // get the "value" of the typedef
-  if (typeClass && typeClass->isTemplate() && 
-      actTemplParams && actTemplParams->count()>0)
+  if (typeClass && typeClass->isTemplate() &&
+      actTemplParams && !actTemplParams->empty())
   {
     type = substituteTemplateArgumentsInString(type,
-            typeClass->templateArguments(),actTemplParams);
+            typeClass->templateArguments(),*actTemplParams);
   }
   QCString typedefValue = type;
   int tl=type.length();
@@ -1397,7 +1397,7 @@ static const ClassDef *getResolvedClassRec(const Definition *scope,
   ArgumentList actTemplParams;
   if (!strippedTemplateParams.isEmpty()) // template part that was stripped
   {
-    stringToArgumentList(strippedTemplateParams,&actTemplParams);
+    stringToArgumentList(strippedTemplateParams,actTemplParams);
   }
 
   int qualifierIndex = computeQualifiedIndex(name);
@@ -2260,17 +2260,15 @@ void writeExample(OutputList &ol,ExampleSDict *ed)
 }
 
 
-QCString argListToString(const ArgumentList *al,bool useCanonicalType,bool showDefVals)
+QCString argListToString(const ArgumentList &al,bool useCanonicalType,bool showDefVals)
 {
   QCString result;
-  if (al==0) return result;
-  ArgumentListIterator ali(*al);
-  const Argument *a=ali.current();
+  if (!al.hasParameters()) return result;
   result+="(";
-  while (a)
+  for (auto it = al.begin() ; it!=al.end() ;)
   {
-    QCString type1 = useCanonicalType && !a->canType.isEmpty() ?
-      a->canType : a->type;
+    Argument a = *it;
+    QCString type1 = useCanonicalType && !a.canType.isEmpty() ? a.canType : a.type;
     QCString type2;
     int i=type1.find(")("); // hack to deal with function pointers
     if (i!=-1)
@@ -2278,86 +2276,84 @@ QCString argListToString(const ArgumentList *al,bool useCanonicalType,bool showD
       type2=type1.mid(i);
       type1=type1.left(i);
     }
-    if (!a->attrib.isEmpty())
+    if (!a.attrib.isEmpty())
     {
-      result+=a->attrib+" ";
+      result+=a.attrib+" ";
     }
-    if (!a->name.isEmpty() || !a->array.isEmpty())
+    if (!a.name.isEmpty() || !a.array.isEmpty())
     {
-      result+= type1+" "+a->name+type2+a->array;
+      result+= type1+" "+a.name+type2+a.array;
     }
     else
     {
       result+= type1+type2;
     }
-    if (!a->defval.isEmpty() && showDefVals)
+    if (!a.defval.isEmpty() && showDefVals)
     {
-      result+="="+a->defval;
+      result+="="+a.defval;
     }
-    ++ali;
-    a = ali.current();
-    if (a) result+=", ";
+    ++it;
+    if (it!=al.end()) result+=", ";
   }
   result+=")";
-  if (al->constSpecifier) result+=" const";
-  if (al->volatileSpecifier) result+=" volatile";
-  if (al->refQualifier==RefQualifierLValue) result+=" &";
-  else if (al->refQualifier==RefQualifierRValue) result+=" &&";
-  if (!al->trailingReturnType.isEmpty()) result+=" -> "+al->trailingReturnType;
-  if (al->pureSpecifier) result+=" =0";
+  if (al.constSpecifier) result+=" const";
+  if (al.volatileSpecifier) result+=" volatile";
+  if (al.refQualifier==RefQualifierLValue) result+=" &";
+  else if (al.refQualifier==RefQualifierRValue) result+=" &&";
+  if (!al.trailingReturnType.isEmpty()) result+=" -> "+al.trailingReturnType;
+  if (al.pureSpecifier) result+=" =0";
   return removeRedundantWhiteSpace(result);
 }
 
-QCString tempArgListToString(const ArgumentList *al,SrcLangExt lang)
+QCString tempArgListToString(const ArgumentList &al,SrcLangExt lang)
 {
   QCString result;
-  if (al==0) return result;
+  if (al.empty()) return result;
   result="<";
-  ArgumentListIterator ali(*al);
-  const Argument *a=ali.current();
-  while (a)
+  auto it = al.begin();
+  while (it!=al.end())
   {
-    if (!a->name.isEmpty()) // add template argument name
+    Argument a = *it;
+    if (!a.name.isEmpty()) // add template argument name
     {
-      if (a->type.left(4)=="out") // C# covariance
+      if (a.type.left(4)=="out") // C# covariance
       {
         result+="out ";
       }
-      else if (a->type.left(3)=="in") // C# contravariance
+      else if (a.type.left(3)=="in") // C# contravariance
       {
         result+="in ";
       }
       if (lang==SrcLangExt_Java || lang==SrcLangExt_CSharp)
       {
-        result+=a->type+" ";
+        result+=a.type+" ";
       }
-      result+=a->name;
+      result+=a.name;
     }
     else // extract name from type
     {
-      int i=a->type.length()-1;
-      while (i>=0 && isId(a->type.at(i))) i--;
+      int i=a.type.length()-1;
+      while (i>=0 && isId(a.type.at(i))) i--;
       if (i>0)
       {
-        result+=a->type.right(a->type.length()-i-1);
-        if (a->type.find("...")!=-1)
+        result+=a.type.right(a.type.length()-i-1);
+        if (a.type.find("...")!=-1)
         {
           result+="...";
         }
       }
       else // nothing found -> take whole name
       {
-        result+=a->type;
+        result+=a.type;
       }
     }
-    if (!a->typeConstraint.isEmpty() && lang==SrcLangExt_Java)
+    if (!a.typeConstraint.isEmpty() && lang==SrcLangExt_Java)
     {
       result+=" extends "; // TODO: now Java specific, C# has where...
-      result+=a->typeConstraint;
+      result+=a.typeConstraint;
     }
-    ++ali;
-    a=ali.current();
-    if (a) result+=", ";
+    ++it;
+    if (it!=al.end()) result+=", ";
   }
   result+=">";
   return removeRedundantWhiteSpace(result);
@@ -2705,19 +2701,6 @@ exit:
   return prot;
 }
 
-//static void printArgList(ArgumentList *al)
-//{
-//  if (al==0) return;
-//  ArgumentListIterator ali(*al);
-//  Argument *a;
-//  printf("(");
-//  for (;(a=ali.current());++ali)
-//  {
-//    printf("t='%s' n='%s' v='%s' ",a->type.data(),!a->name.isEmpty()>0?a->name.data():"",!a->defval.isEmpty()>0?a->defval.data():""); 
-//  }
-//  printf(")");
-//}
-
 #ifndef NEWMATCH
 // strip any template specifiers that follow className in string s
 static QCString trimTemplateSpecifiers(
@@ -3311,138 +3294,6 @@ static bool matchArgument(const Argument *srcA,const Argument *dstA,
   return TRUE;
 }
 
-
-/*!
- * Matches the arguments list srcAl with the argument list dstAl
- * Returns TRUE if the argument lists are equal. Two argument list are 
- * considered equal if the number of arguments is equal and the types of all 
- * arguments are equal. Furthermore the const and volatile specifiers 
- * stored in the list should be equal.
- */
-bool matchArguments(ArgumentList *srcAl,ArgumentList *dstAl,
-    const char *cl,const char *ns,bool checkCV,
-    NamespaceSDict *usingNamespaces,
-    SDict<Definition> *usingClasses)
-{
-  QCString className=cl;
-  QCString namespaceName=ns;
-
-  // strip template specialization from class name if present
-  //int til=className.find('<'),tir=className.find('>');
-  //if (til!=-1 && tir!=-1 && tir>til) 
-  //{
-  //  className=className.left(til)+className.right(className.length()-tir-1);
-  //}
-
-  //printf("matchArguments(%s,%s) className=%s namespaceName=%s checkCV=%d usingNamespaces=%d usingClasses=%d\n",
-  //    srcAl ? argListToString(srcAl).data() : "",
-  //    dstAl ? argListToString(dstAl).data() : "",
-  //    cl,ns,checkCV,
-  //    usingNamespaces?usingNamespaces->count():0,
-  //    usingClasses?usingClasses->count():0
-  //    );
-
-  if (srcAl==0 || dstAl==0)
-  {
-    bool match = srcAl==dstAl; // at least one of the members is not a function
-    if (match)
-    {
-      MATCH
-      return TRUE;
-    }
-    else
-    {
-      NOMATCH
-      return FALSE;
-    }
-  }
-
-  // handle special case with void argument
-  if ( srcAl->count()==0 && dstAl->count()==1 && 
-      dstAl->getFirst()->type=="void" )
-  { // special case for finding match between func() and func(void)
-    Argument *a=new Argument;
-    a->type = "void";
-    srcAl->append(a);
-    MATCH
-    return TRUE;
-  }
-  if ( dstAl->count()==0 && srcAl->count()==1 &&
-      srcAl->getFirst()->type=="void" )
-  { // special case for finding match between func(void) and func()
-    Argument *a=new Argument;
-    a->type = "void";
-    dstAl->append(a);
-    MATCH
-    return TRUE;
-  }
-
-  if (srcAl->count() != dstAl->count())
-  {
-    NOMATCH
-    return FALSE; // different number of arguments -> no match
-  }
-
-  if (checkCV)
-  {
-    if (srcAl->constSpecifier != dstAl->constSpecifier) 
-    {
-      NOMATCH
-      return FALSE; // one member is const, the other not -> no match
-    }
-    if (srcAl->volatileSpecifier != dstAl->volatileSpecifier)
-    {
-      NOMATCH
-      return FALSE; // one member is volatile, the other not -> no match
-    }
-  }
-
-  if (srcAl->refQualifier != dstAl->refQualifier)
-  {
-    NOMATCH
-    return FALSE; // one member is has a different ref-qualifier than the other
-  }
-
-  // so far the argument list could match, so we need to compare the types of
-  // all arguments.
-  ArgumentListIterator srcAli(*srcAl),dstAli(*dstAl);
-  Argument *srcA,*dstA;
-  for (;(srcA=srcAli.current()) && (dstA=dstAli.current());++srcAli,++dstAli)
-  { 
-    if (!matchArgument(srcA,dstA,className,namespaceName,
-          usingNamespaces,usingClasses))
-    {
-      NOMATCH
-      return FALSE;
-    }
-  }
-  MATCH
-  return TRUE; // all arguments match 
-}
-
-#endif
-
-#if 0
-static QCString resolveSymbolName(FileDef *fs,Definition *symbol,QCString &templSpec)
-{
-  ASSERT(symbol!=0);
-  if (symbol->definitionType()==Definition::TypeMember && 
-      ((MemberDef*)symbol)->isTypedef()) // if symbol is a typedef then try
-    // to resolve it
-  {
-    MemberDef *md = 0;
-    ClassDef *cd = newResolveTypedef(fs,(MemberDef*)symbol,&md,&templSpec);
-    if (cd)
-    {
-      return cd->qualifiedName()+templSpec;
-    }
-    else if (md)
-    {
-      return md->qualifiedName();
-    }
-  }
-  return symbol->qualifiedName();
-}
 #endif
 
 static QCString stripDeclKeywords(const QCString &s)
@@ -3688,10 +3539,10 @@ static QCString extractCanonicalType(const Definition *d,const FileDef *fs,QCStr
   return removeRedundantWhiteSpace(canType);
 }
 
-static QCString extractCanonicalArgType(const Definition *d,const FileDef *fs,const Argument *arg)
+static QCString extractCanonicalArgType(const Definition *d,const FileDef *fs,const Argument &arg)
 {
-  QCString type = arg->type.stripWhiteSpace();
-  QCString name = arg->name;
+  QCString type = arg.type.stripWhiteSpace();
+  QCString name = arg.name;
   //printf("----- extractCanonicalArgType(type=%s,name=%s)\n",type.data(),name.data());
   if ((type=="const" || type=="volatile") && !name.isEmpty()) 
   { // name is part of type => correct
@@ -3703,17 +3554,17 @@ static QCString extractCanonicalArgType(const Definition *d,const FileDef *fs,co
     if (!type.isEmpty()) type+=" ";
     type+=name;
   }
-  if (!arg->array.isEmpty())
+  if (!arg.array.isEmpty())
   {
-    type+=arg->array;
+    type+=arg.array;
   }
 
   return extractCanonicalType(d,fs,type);
 }
 
 static bool matchArgument2(
-    const Definition *srcScope,const FileDef *srcFileScope,Argument *srcA,
-    const Definition *dstScope,const FileDef *dstFileScope,Argument *dstA
+    const Definition *srcScope,const FileDef *srcFileScope,Argument &srcA,
+    const Definition *dstScope,const FileDef *dstFileScope,Argument &dstA
     )
 {
   //printf(">> match argument: %s::'%s|%s' (%s) <-> %s::'%s|%s' (%s)\n",
@@ -3727,37 +3578,37 @@ static bool matchArgument2(
   //  NOMATCH
   //  return FALSE;
   //}
-  QCString sSrcName = " "+srcA->name;
-  QCString sDstName = " "+dstA->name;
-  QCString srcType  = srcA->type;
-  QCString dstType  = dstA->type;
+  QCString sSrcName = " "+srcA.name;
+  QCString sDstName = " "+dstA.name;
+  QCString srcType  = srcA.type;
+  QCString dstType  = dstA.type;
   stripIrrelevantConstVolatile(srcType);
   stripIrrelevantConstVolatile(dstType);
   //printf("'%s'<->'%s'\n",sSrcName.data(),dstType.right(sSrcName.length()).data());
   //printf("'%s'<->'%s'\n",sDstName.data(),srcType.right(sDstName.length()).data());
   if (sSrcName==dstType.right(sSrcName.length()))
   { // case "unsigned int" <-> "unsigned int i"
-    srcA->type+=sSrcName;
-    srcA->name="";
-    srcA->canType=""; // invalidate cached type value
+    srcA.type+=sSrcName;
+    srcA.name="";
+    srcA.canType=""; // invalidate cached type value
   }
   else if (sDstName==srcType.right(sDstName.length()))
   { // case "unsigned int i" <-> "unsigned int"
-    dstA->type+=sDstName;
-    dstA->name="";
-    dstA->canType=""; // invalidate cached type value
+    dstA.type+=sDstName;
+    dstA.name="";
+    dstA.canType=""; // invalidate cached type value
   }
 
-  if (srcA->canType.isEmpty())
+  if (srcA.canType.isEmpty())
   {
-    srcA->canType = extractCanonicalArgType(srcScope,srcFileScope,srcA);
+    srcA.canType = extractCanonicalArgType(srcScope,srcFileScope,srcA);
   }
-  if (dstA->canType.isEmpty())
+  if (dstA.canType.isEmpty())
   {
-    dstA->canType = extractCanonicalArgType(dstScope,dstFileScope,dstA);
+    dstA.canType = extractCanonicalArgType(dstScope,dstFileScope,dstA);
   }
 
-  if (srcA->canType==dstA->canType)
+  if (srcA.canType==dstA.canType)
   {
     MATCH
     return TRUE;
@@ -3773,49 +3624,34 @@ static bool matchArgument2(
 
 
 // new algorithm for argument matching
-bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,const ArgumentList *srcAl,
-                     const Definition *dstScope,const FileDef *dstFileScope,const ArgumentList *dstAl,
+bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,const ArgumentList &inSrcAl,
+                     const Definition *dstScope,const FileDef *dstFileScope,const ArgumentList &inDstAl,
                      bool checkCV)
 {
-  //printf("*** matchArguments2\n");
   ASSERT(srcScope!=0 && dstScope!=0);
 
-  if (srcAl==0 || dstAl==0)
-  {
-    bool match = srcAl==dstAl; // at least one of the members is not a function
-    if (match)
-    {
-      MATCH
-      return TRUE;
-    }
-    else
-    {
-      NOMATCH
-      return FALSE;
-    }
-  }
+  ArgumentList srcAl = inSrcAl;
+  ArgumentList dstAl = inDstAl;
 
   // handle special case with void argument
-  if ( srcAl->count()==0 && dstAl->count()==1 && 
-      dstAl->getFirst()->type=="void" )
+  if ( srcAl.empty() && dstAl.size()==1 && dstAl.front().type=="void" )
   { // special case for finding match between func() and func(void)
-    Argument *a=new Argument;
-    a->type = "void";
-    const_cast<ArgumentList*>(srcAl)->append(a);
+    Argument a;
+    a.type = "void";
+    srcAl.push_back(a);
     MATCH
     return TRUE;
   }
-  if ( dstAl->count()==0 && srcAl->count()==1 &&
-      srcAl->getFirst()->type=="void" )
+  if ( dstAl.empty() && srcAl.size()==1 && srcAl.front().type=="void" )
   { // special case for finding match between func(void) and func()
-    Argument *a=new Argument;
-    a->type = "void";
-    const_cast<ArgumentList*>(dstAl)->append(a);
+    Argument a;
+    a.type = "void";
+    dstAl.push_back(a);
     MATCH
     return TRUE;
   }
 
-  if (srcAl->count() != dstAl->count())
+  if (srcAl.size() != dstAl.size())
   {
     NOMATCH
     return FALSE; // different number of arguments -> no match
@@ -3823,19 +3659,19 @@ bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,cons
 
   if (checkCV)
   {
-    if (srcAl->constSpecifier != dstAl->constSpecifier) 
+    if (srcAl.constSpecifier != dstAl.constSpecifier) 
     {
       NOMATCH
       return FALSE; // one member is const, the other not -> no match
     }
-    if (srcAl->volatileSpecifier != dstAl->volatileSpecifier)
+    if (srcAl.volatileSpecifier != dstAl.volatileSpecifier)
     {
       NOMATCH
       return FALSE; // one member is volatile, the other not -> no match
     }
   }
 
-  if (srcAl->refQualifier != dstAl->refQualifier)
+  if (srcAl.refQualifier != dstAl.refQualifier)
   {
     NOMATCH
     return FALSE; // one member is has a different ref-qualifier than the other
@@ -3843,10 +3679,12 @@ bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,cons
 
   // so far the argument list could match, so we need to compare the types of
   // all arguments.
-  ArgumentListIterator srcAli(*srcAl),dstAli(*dstAl);
-  Argument *srcA,*dstA;
-  for (;(srcA=srcAli.current()) && (dstA=dstAli.current());++srcAli,++dstAli)
-  { 
+  auto srcIt = srcAl.begin();
+  auto dstIt = dstAl.begin();
+  for (;srcIt!=srcAl.end() && dstIt!=dstAl.end();++srcIt,++dstIt)
+  {
+    Argument &srcA = *srcIt;
+    Argument &dstA = *dstIt;
     if (!matchArgument2(srcScope,srcFileScope,srcA,
           dstScope,dstFileScope,dstA)
        )
@@ -3863,134 +3701,139 @@ bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,cons
 
 // merges the initializer of two argument lists
 // pre:  the types of the arguments in the list should match.
-void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl,bool forceNameOverwrite)
+void mergeArguments(ArgumentList &srcAl,ArgumentList &dstAl,bool forceNameOverwrite)
 {
   //printf("mergeArguments '%s', '%s'\n",
   //    argListToString(srcAl).data(),argListToString(dstAl).data());
 
-  if (srcAl==0 || dstAl==0 || srcAl->count()!=dstAl->count())
+  if (srcAl.size()!=dstAl.size())
   {
     return; // invalid argument lists -> do not merge
   }
 
-  ArgumentListIterator srcAli(*srcAl),dstAli(*dstAl);
-  Argument *srcA,*dstA;
-  for (;(srcA=srcAli.current()) && (dstA=dstAli.current());++srcAli,++dstAli)
+  auto srcIt=srcAl.begin();
+  auto dstIt=dstAl.begin();
+  while (srcIt!=srcAl.end() && dstIt!=dstAl.end())
   {
-    if (srcA->defval.isEmpty() && !dstA->defval.isEmpty())
+    Argument &srcA = *srcIt;
+    Argument &dstA = *dstIt;
+
+    if (srcA.defval.isEmpty() && !dstA.defval.isEmpty())
     {
-      //printf("Defval changing '%s'->'%s'\n",srcA->defval.data(),dstA->defval.data());
-      srcA->defval=dstA->defval.copy();
+      //printf("Defval changing '%s'->'%s'\n",srcA.defval.data(),dstA.defval.data());
+      srcA.defval=dstA.defval;
     }
-    else if (!srcA->defval.isEmpty() && dstA->defval.isEmpty())
+    else if (!srcA.defval.isEmpty() && dstA.defval.isEmpty())
     {
-      //printf("Defval changing '%s'->'%s'\n",dstA->defval.data(),srcA->defval.data());
-      dstA->defval=srcA->defval.copy();
+      //printf("Defval changing '%s'->'%s'\n",dstA.defval.data(),srcA.defval.data());
+      dstA.defval=srcA.defval;
     }
 
     // fix wrongly detected const or volatile specifiers before merging.
     // example: "const A *const" is detected as type="const A *" name="const"
-    if (srcA->name=="const" || srcA->name=="volatile")
+    if (srcA.name=="const" || srcA.name=="volatile")
     {
-      srcA->type+=" "+srcA->name;
-      srcA->name.resize(0);
+      srcA.type+=" "+srcA.name;
+      srcA.name.resize(0);
     }
-    if (dstA->name=="const" || dstA->name=="volatile")
+    if (dstA.name=="const" || dstA.name=="volatile")
     {
-      dstA->type+=" "+dstA->name;
-      dstA->name.resize(0);
+      dstA.type+=" "+dstA.name;
+      dstA.name.resize(0);
     }
 
-    if (srcA->type==dstA->type)
+    if (srcA.type==dstA.type)
     {
-      //printf("1. merging %s:%s <-> %s:%s\n",srcA->type.data(),srcA->name.data(),dstA->type.data(),dstA->name.data());
-      if (srcA->name.isEmpty() && !dstA->name.isEmpty())
+      //printf("1. merging %s:%s <-> %s:%s\n",srcA.type.data(),srcA.name.data(),dstA.type.data(),dstA.name.data());
+      if (srcA.name.isEmpty() && !dstA.name.isEmpty())
       {
-        //printf("type: '%s':='%s'\n",srcA->type.data(),dstA->type.data());
-        //printf("name: '%s':='%s'\n",srcA->name.data(),dstA->name.data());
-        srcA->type = dstA->type.copy();
-        srcA->name = dstA->name.copy();
+        //printf("type: '%s':='%s'\n",srcA.type.data(),dstA.type.data());
+        //printf("name: '%s':='%s'\n",srcA.name.data(),dstA.name.data());
+        srcA.type = dstA.type;
+        srcA.name = dstA.name;
       }
-      else if (!srcA->name.isEmpty() && dstA->name.isEmpty())
+      else if (!srcA.name.isEmpty() && dstA.name.isEmpty())
       {
-        //printf("type: '%s':='%s'\n",dstA->type.data(),srcA->type.data());
-        //printf("name: '%s':='%s'\n",dstA->name.data(),srcA->name.data());
-        dstA->type = srcA->type.copy();
-        dstA->name = dstA->name.copy();
+        //printf("type: '%s':='%s'\n",dstA.type.data(),srcA.type.data());
+        //printf("name: '%s':='%s'\n",dstA.name.data(),srcA.name.data());
+        dstA.type = srcA.type;
+        dstA.name = dstA.name;
       }
-      else if (!srcA->name.isEmpty() && !dstA->name.isEmpty())
+      else if (!srcA.name.isEmpty() && !dstA.name.isEmpty())
       {
-        //printf("srcA->name=%s dstA->name=%s\n",srcA->name.data(),dstA->name.data());
+        //printf("srcA.name=%s dstA.name=%s\n",srcA.name.data(),dstA.name.data());
         if (forceNameOverwrite)
         {
-          srcA->name = dstA->name;
+          srcA.name = dstA.name;
         }
         else
         {
-          if (srcA->docs.isEmpty() && !dstA->docs.isEmpty())
+          if (srcA.docs.isEmpty() && !dstA.docs.isEmpty())
           {
-            srcA->name = dstA->name;
+            srcA.name = dstA.name;
           }
-          else if (!srcA->docs.isEmpty() && dstA->docs.isEmpty())
+          else if (!srcA.docs.isEmpty() && dstA.docs.isEmpty())
           {
-            dstA->name = srcA->name;
+            dstA.name = srcA.name;
           }
         }
       }
     }
     else
     {
-      //printf("2. merging '%s':'%s' <-> '%s':'%s'\n",srcA->type.data(),srcA->name.data(),dstA->type.data(),dstA->name.data());
-      srcA->type=srcA->type.stripWhiteSpace();
-      dstA->type=dstA->type.stripWhiteSpace();
-      if (srcA->type+" "+srcA->name==dstA->type) // "unsigned long:int" <-> "unsigned long int:bla"
+      //printf("2. merging '%s':'%s' <-> '%s':'%s'\n",srcA.type.data(),srcA.name.data(),dstA.type.data(),dstA.name.data());
+      srcA.type=srcA.type.stripWhiteSpace();
+      dstA.type=dstA.type.stripWhiteSpace();
+      if (srcA.type+" "+srcA.name==dstA.type) // "unsigned long:int" <-> "unsigned long int:bla"
       {
-        srcA->type+=" "+srcA->name;
-        srcA->name=dstA->name;
+        srcA.type+=" "+srcA.name;
+        srcA.name=dstA.name;
       }
-      else if (dstA->type+" "+dstA->name==srcA->type) // "unsigned long int bla" <-> "unsigned long int"
+      else if (dstA.type+" "+dstA.name==srcA.type) // "unsigned long int bla" <-> "unsigned long int"
       {
-        dstA->type+=" "+dstA->name;
-        dstA->name=srcA->name;
+        dstA.type+=" "+dstA.name;
+        dstA.name=srcA.name;
       }
-      else if (srcA->name.isEmpty() && !dstA->name.isEmpty())
+      else if (srcA.name.isEmpty() && !dstA.name.isEmpty())
       {
-        srcA->name = dstA->name;
+        srcA.name = dstA.name;
       }
-      else if (dstA->name.isEmpty() && !srcA->name.isEmpty())
+      else if (dstA.name.isEmpty() && !srcA.name.isEmpty())
       {
-        dstA->name = srcA->name;
+        dstA.name = srcA.name;
       }
     }
-    int i1=srcA->type.find("::"),
-        i2=dstA->type.find("::"),
-        j1=srcA->type.length()-i1-2,
-        j2=dstA->type.length()-i2-2;
-    if (i1!=-1 && i2==-1 && srcA->type.right(j1)==dstA->type)
+    int i1=srcA.type.find("::"),
+        i2=dstA.type.find("::"),
+        j1=srcA.type.length()-i1-2,
+        j2=dstA.type.length()-i2-2;
+    if (i1!=-1 && i2==-1 && srcA.type.right(j1)==dstA.type)
     {
-      //printf("type: '%s':='%s'\n",dstA->type.data(),srcA->type.data());
-      //printf("name: '%s':='%s'\n",dstA->name.data(),srcA->name.data());
-      dstA->type = srcA->type.left(i1+2)+dstA->type;
-      dstA->name = dstA->name.copy();
+      //printf("type: '%s':='%s'\n",dstA.type.data(),srcA.type.data());
+      //printf("name: '%s':='%s'\n",dstA.name.data(),srcA.name.data());
+      dstA.type = srcA.type.left(i1+2)+dstA.type;
+      dstA.name = dstA.name;
     }
-    else if (i1==-1 && i2!=-1 && dstA->type.right(j2)==srcA->type)
+    else if (i1==-1 && i2!=-1 && dstA.type.right(j2)==srcA.type)
     {
-      //printf("type: '%s':='%s'\n",srcA->type.data(),dstA->type.data());
-      //printf("name: '%s':='%s'\n",dstA->name.data(),srcA->name.data());
-      srcA->type = dstA->type.left(i2+2)+srcA->type;
-      srcA->name = dstA->name.copy();
+      //printf("type: '%s':='%s'\n",srcA.type.data(),dstA.type.data());
+      //printf("name: '%s':='%s'\n",dstA.name.data(),srcA.name.data());
+      srcA.type = dstA.type.left(i2+2)+srcA.type;
+      srcA.name = dstA.name;
     }
-    if (srcA->docs.isEmpty() && !dstA->docs.isEmpty())
+    if (srcA.docs.isEmpty() && !dstA.docs.isEmpty())
     {
-      srcA->docs = dstA->docs.copy();
+      srcA.docs = dstA.docs;
     }
-    else if (dstA->docs.isEmpty() && !srcA->docs.isEmpty())
+    else if (dstA.docs.isEmpty() && !srcA.docs.isEmpty())
     {
-      dstA->docs = srcA->docs.copy();
+      dstA.docs = srcA.docs;
     }
     //printf("Merge argument '%s|%s' '%s|%s'\n",
-    //  srcA->type.data(),srcA->name.data(),
-    //  dstA->type.data(),dstA->name.data());
+    //  srcA.type.data(),srcA.name.data(),
+    //  dstA.type.data(),dstA.name.data());
+    ++srcIt;
+    ++dstIt;
   }
 }
 
@@ -4023,14 +3866,13 @@ static void findMembersWithSpecificName(MemberName *mn,
       ArgumentList *argList=0;
       if (args && !md->isDefine() && qstrcmp(args,"()")!=0)
       {
-        argList=new ArgumentList;
-        const ArgumentList *mdAl = md->argumentList();
+        const ArgumentList &mdAl = md->argumentList();
+        ArgumentList argList;
         stringToArgumentList(args,argList);
         match=matchArguments2(
             md->getOuterScope(),fd,mdAl,
             Doxygen::globalScope,fd,argList,
-            checkCV); 
-        delete argList; argList=0;
+            checkCV);
       }
       if (match && (forceTagFile==0 || md->getReference()==forceTagFile)) 
       {
@@ -4154,22 +3996,20 @@ bool getDefs(const QCString &scName,
         MemberNameIterator mmli(*mn);
         MemberDef *mmd;
         int mdist=maxInheritanceDepth; 
-        ArgumentList *argList=0;
+        ArgumentList argList;
         if (args)
         {
-          argList=new ArgumentList;
           stringToArgumentList(args,argList);
         }
         for (mmli.toFirst();(mmd=mmli.current());++mmli)
         {
           if (!mmd->isStrongEnumValue())
           {
-            ArgumentList *mmdAl = mmd->argumentList();
-            bool match=args==0 || 
+            const ArgumentList &mmdAl = mmd->argumentList();
+            bool match=args==0 ||
               matchArguments2(mmd->getOuterScope(),mmd->getFileDef(),mmdAl,
-                  fcd,fcd->getFileDef(),argList,
-                  checkCV
-                  );  
+                             fcd,                  fcd->getFileDef(),argList,
+                             checkCV);
             //printf("match=%d\n",match);
             if (match)
             {
@@ -4187,10 +4027,6 @@ bool getDefs(const QCString &scName,
             }
           }
         }
-        if (argList)
-        {
-          delete argList; argList=0;
-        }
         if (mdist==maxInheritanceDepth && args && qstrcmp(args,"()")==0)
           // no exact match found, but if args="()" an arbitrary member will do
         {
@@ -4277,33 +4113,43 @@ bool getDefs(const QCString &scName,
     //printf("Global symbol\n");
     MemberNameIterator mmli(*mn);
     MemberDef *mmd, *fuzzy_mmd = 0;
-    ArgumentList *argList = 0;
+    ArgumentList argList;
     bool hasEmptyArgs = args && qstrcmp(args, "()") == 0;
 
     if (args)
-      stringToArgumentList(args, argList = new ArgumentList);
+    {
+      stringToArgumentList(args, argList);
+    }
 
     for (mmli.toFirst(); (mmd = mmli.current()); ++mmli)
     {
       if (!mmd->isLinkable() || (!mmd->isRelated() && !mmd->isForeign()) ||
            !mmd->getClassDef())
+      {
         continue;
+      }
 
-      if (!args) break;
+      if (!args)
+      {
+        break;
+      }
 
-      ArgumentList *mmdAl = mmd->argumentList();
+      ArgumentList &mmdAl = mmd->argumentList();
       if (matchArguments2(mmd->getOuterScope(),mmd->getFileDef(),mmdAl,
             Doxygen::globalScope,mmd->getFileDef(),argList,
             checkCV
             )
-         ) break;
+         )
+      {
+        break;
+      }
 
       if (!fuzzy_mmd && hasEmptyArgs)
+      {
         fuzzy_mmd = mmd;
+      }
     }
 
-    if (argList) delete argList, argList = 0;
-
     mmd = mmd ? mmd : fuzzy_mmd;
 
     if (mmd && !mmd->isStrongEnumValue())
@@ -4371,16 +4217,15 @@ bool getDefs(const QCString &scName,
           else if (mmd->getOuterScope()==fnd /* && mmd->isLinkable() */ )
           { // namespace is found
             bool match=TRUE;
-            ArgumentList *argList=0;
+            ArgumentList argList;
             if (args && qstrcmp(args,"()")!=0)
             {
-              argList=new ArgumentList;
-              const ArgumentList *mmdAl = mmd->argumentList();
+              const ArgumentList &mmdAl = mmd->argumentList();
               stringToArgumentList(args,argList);
               match=matchArguments2(
                   mmd->getOuterScope(),mmd->getFileDef(),mmdAl,
                   fnd,mmd->getFileDef(),argList,
-                  checkCV); 
+                  checkCV);
             }
             if (match)
             {
@@ -4388,10 +4233,6 @@ bool getDefs(const QCString &scName,
               md=mmd;
               found=TRUE;
             }
-            if (args)
-            {
-              delete argList; argList=0;
-            }
           }
         }
         if (!found && args && !qstrcmp(args,"()")) 
@@ -5820,10 +5661,10 @@ QCString insertTemplateSpecifierInScope(const QCString &scope,const QCString &te
     int si,pi=0;
     ClassDef *cd=0;
     while (
-        (si=scope.find("::",pi))!=-1 && !getClass(scope.left(si)+templ) && 
-        ((cd=getClass(scope.left(si)))==0 || cd->templateArguments()==0) 
-        ) 
-    { 
+        (si=scope.find("::",pi))!=-1 && !getClass(scope.left(si)+templ) &&
+        ((cd=getClass(scope.left(si)))==0 || cd->templateArguments().empty())
+        )
+    {
       //printf("Tried '%s'\n",(scope.left(si)+templ).data()); 
       pi=si+2; 
     }
@@ -6429,7 +6270,7 @@ int extractClassNameFromType(const QCString &type,int &pos,QCString &name,QCStri
 QCString normalizeNonTemplateArgumentsInString(
        const QCString &name,
        const Definition *context,
-       const ArgumentList * formalArgs)
+       const ArgumentList &formalArgs)
 {
   // skip until <
   int p=name.find('<');
@@ -6445,16 +6286,12 @@ QCString normalizeNonTemplateArgumentsInString(
     result += name.mid(p,i-p);
     QCString n = name.mid(i,l);
     bool found=FALSE;
-    if (formalArgs) // check that n is not a formal template argument
+    for (const Argument formArg : formalArgs)
     {
-      ArgumentListIterator formAli(*formalArgs);
-      const Argument *formArg;
-      for (formAli.toFirst();
-          (formArg=formAli.current()) && !found;
-          ++formAli
-          )
+      if (formArg.name == n)
       {
-        found = formArg->name==n;
+        found=TRUE;
+        break;
       }
     }
     if (!found)
@@ -6490,12 +6327,12 @@ QCString normalizeNonTemplateArgumentsInString(
  */
 QCString substituteTemplateArgumentsInString(
     const QCString &name,
-    ArgumentList *formalArgs,
-    ArgumentList *actualArgs)
+    const ArgumentList &formalArgs,
+    const ArgumentList &actualArgs)
 {
   //printf("substituteTemplateArgumentsInString(name=%s formal=%s actualArg=%s)\n",
   //    name.data(),argListToString(formalArgs).data(),argListToString(actualArgs).data());
-  if (formalArgs==0) return name;
+  if (formalArgs.empty()) return name;
   QCString result;
   static QRegExp re("[a-z_A-Z\\x80-\\xFF][a-z_A-Z0-9\\x80-\\xFF]*");
   int p=0,l,i;
@@ -6504,82 +6341,89 @@ QCString substituteTemplateArgumentsInString(
   {
     result += name.mid(p,i-p);
     QCString n = name.mid(i,l);
-    ArgumentListIterator formAli(*formalArgs);
-    ArgumentListIterator actAli(*actualArgs);
-    Argument *formArg;
-    Argument *actArg;
+    auto formIt = formalArgs.begin();
+    auto actIt  = actualArgs.begin();
 
     // if n is a template argument, then we substitute it
     // for its template instance argument.
     bool found=FALSE;
-    for (formAli.toFirst();
-        (formArg=formAli.current()) && !found;
-        ++formAli,++actAli
+    for (auto formIt = formalArgs.begin();
+        formIt!=formalArgs.end() && !found;
+        ++formIt
         )
     {
-      actArg = actAli.current();
-      if (formArg->type.left(6)=="class " && formArg->name.isEmpty())
+      Argument formArg = *formIt;
+      Argument actArg;
+      if (actIt!=actualArgs.end())
       {
-        formArg->name = formArg->type.mid(6);
-        formArg->type = "class";
+        actArg = *actIt;
       }
-      if (formArg->type.left(9)=="typename " && formArg->name.isEmpty())
+      if (formArg.type.left(6)=="class " && formArg.name.isEmpty())
       {
-        formArg->name = formArg->type.mid(9);
-        formArg->type = "typename";
+        formArg.name = formArg.type.mid(6);
+        formArg.type = "class";
       }
-      if (formArg->type=="class" || formArg->type=="typename" || formArg->type.left(8)=="template")
+      if (formArg.type.left(9)=="typename " && formArg.name.isEmpty())
+      {
+        formArg.name = formArg.type.mid(9);
+        formArg.type = "typename";
+      }
+      if (formArg.type=="class" || formArg.type=="typename" || formArg.type.left(8)=="template")
       {
         //printf("n=%s formArg->type='%s' formArg->name='%s' formArg->defval='%s'\n",
         //  n.data(),formArg->type.data(),formArg->name.data(),formArg->defval.data());
         //printf(">> formArg->name='%s' actArg->type='%s' actArg->name='%s'\n",
         //    formArg->name.data(),actArg ? actArg->type.data() : "",actArg ? actArg->name.data() : ""
         //    );
-        if (formArg->name==n && actArg && !actArg->type.isEmpty()) // base class is a template argument
+        if (formArg.name==n && actIt!=actualArgs.end() && !actArg.type.isEmpty()) // base class is a template argument
         {
           // replace formal argument with the actual argument of the instance
-          if (!leftScopeMatch(actArg->type,n)) 
+          if (!leftScopeMatch(actArg.type,n)) 
             // the scope guard is to prevent recursive lockup for 
             // template<class A> class C : public<A::T>, 
             // where A::T would become A::T::T here, 
             // since n==A and actArg->type==A::T
             // see bug595833 for an example
           {
-            if (actArg->name.isEmpty())
+            if (actArg.name.isEmpty())
             {
-              result += actArg->type+" "; 
+              result += actArg.type+" "; 
               found=TRUE;
             }
             else 
               // for case where the actual arg is something like "unsigned int"
               // the "int" part is in actArg->name.
             {
-              result += actArg->type+" "+actArg->name+" "; 
+              result += actArg.type+" "+actArg.name+" "; 
               found=TRUE;
             }
           }
         }
-        else if (formArg->name==n && 
-                 actArg==0 && 
-                 !formArg->defval.isEmpty() &&
-                 formArg->defval!=name /* to prevent recursion */
+        else if (formArg.name==n &&
+                 actIt==actualArgs.end() &&
+                 !formArg.defval.isEmpty() &&
+                 formArg.defval!=name /* to prevent recursion */
             )
         {
-          result += substituteTemplateArgumentsInString(formArg->defval,formalArgs,actualArgs)+" ";
+          result += substituteTemplateArgumentsInString(formArg.defval,formalArgs,actualArgs)+" ";
           found=TRUE;
         }
       }
-      else if (formArg->name==n && 
-               actArg==0 && 
-               !formArg->defval.isEmpty() &&
-               formArg->defval!=name /* to prevent recursion */
+      else if (formArg.name==n &&
+               actIt==actualArgs.end() &&
+               !formArg.defval.isEmpty() &&
+               formArg.defval!=name /* to prevent recursion */
               )
       {
-        result += substituteTemplateArgumentsInString(formArg->defval,formalArgs,actualArgs)+" ";
+        result += substituteTemplateArgumentsInString(formArg.defval,formalArgs,actualArgs)+" ";
         found=TRUE;
       }
+      if (actIt!=actualArgs.end())
+      {
+        actIt++;
+      }
     }
-    if (!found) 
+    if (!found)
     {
       result += n;
     }
@@ -6591,6 +6435,7 @@ QCString substituteTemplateArgumentsInString(
   return result.stripWhiteSpace();
 }
 
+#if 0
 /*! Makes a deep copy of the list of argument lists \a srcLists. 
  *  Will allocate memory, that is owned by the caller.
  */
@@ -6607,6 +6452,7 @@ QList<ArgumentList> *copyArgumentLists(const QList<ArgumentList> *srcLists)
   }
   return dstLists;
 }
+#endif
 
 /*! Strips template specifiers from scope \a fullName, except those 
  *  that make up specialized classes. The switch \a parentOnly 
@@ -8045,22 +7891,20 @@ QCString expandAlias(const QCString &aliasName,const QCString &aliasValue)
   return result;
 }
 
-void writeTypeConstraints(OutputList &ol,const Definition *d,const ArgumentList *al)
+void writeTypeConstraints(OutputList &ol,const Definition *d,const ArgumentList &al)
 {
-  if (al==0) return;
+  if (al.empty()) return;
   ol.startConstraintList(theTranslator->trTypeConstraints()); 
-  ArgumentListIterator ali(*al);
-  const Argument *a;
-  for (;(a=ali.current());++ali)
+  for (const Argument &a : al)
   {
     ol.startConstraintParam();
-    ol.parseText(a->name);
+    ol.parseText(a.name);
     ol.endConstraintParam();
     ol.startConstraintType();
-    linkifyText(TextGeneratorOLImpl(ol),d,0,0,a->type);
+    linkifyText(TextGeneratorOLImpl(ol),d,0,0,a.type);
     ol.endConstraintType();
     ol.startConstraintDocs();
-    ol.generateDoc(d->docFile(),d->docLine(),d,0,a->docs,TRUE,FALSE);
+    ol.generateDoc(d->docFile(),d->docLine(),d,0,a.docs,TRUE,FALSE);
     ol.endConstraintDocs();
   }
   ol.endConstraintList();
diff --git a/src/util.h b/src/util.h
index cb2b957..dea6b22 100644
--- a/src/util.h
+++ b/src/util.h
@@ -186,12 +186,12 @@ void writePageRef(OutputDocInterface &od,const char *cn,const char *mn);
 
 QCString getCanonicalTemplateSpec(const Definition *d,const FileDef *fs,const QCString& spec);
 
-bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,const ArgumentList *srcAl,
-                     const Definition *dstScope,const FileDef *dstFileScope,const ArgumentList *dstAl,
+bool matchArguments2(const Definition *srcScope,const FileDef *srcFileScope,const ArgumentList &srcAl,
+                     const Definition *dstScope,const FileDef *dstFileScope,const ArgumentList &dstAl,
                      bool checkCV
                     );
 
-void mergeArguments(ArgumentList *,ArgumentList *,bool forceNameOverwrite=FALSE);
+void mergeArguments(ArgumentList &,ArgumentList &,bool forceNameOverwrite=FALSE);
 
 QCString substituteClassNames(const QCString &s);
 
@@ -232,9 +232,9 @@ inline bool isId(int c)
 
 QCString removeRedundantWhiteSpace(const QCString &s);
 
-QCString argListToString(const ArgumentList *al,bool useCanonicalType=FALSE,bool showDefVals=TRUE);
+QCString argListToString(const ArgumentList &al,bool useCanonicalType=FALSE,bool showDefVals=TRUE);
 
-QCString tempArgListToString(const ArgumentList *al,SrcLangExt lang);
+QCString tempArgListToString(const ArgumentList &al,SrcLangExt lang);
 
 QCString generateMarker(int id);
 
@@ -305,14 +305,14 @@ int extractClassNameFromType(const QCString &type,int &pos,
 QCString normalizeNonTemplateArgumentsInString(
        const QCString &name,
        const Definition *context,
-       const ArgumentList *formalArgs);
+       const ArgumentList &formalArgs);
 
 QCString substituteTemplateArgumentsInString(
        const QCString &name,
-       ArgumentList *formalArgs,
-       ArgumentList *actualArgs);
+       const ArgumentList &formalArgs,
+       const ArgumentList &actualArgs);
 
-QList<ArgumentList> *copyArgumentLists(const QList<ArgumentList> *srcLists);
+//QList<ArgumentList> *copyArgumentLists(const QList<ArgumentList> *srcLists);
 
 QCString stripTemplateSpecifiersFromScope(const QCString &fullName,
                                           bool parentOnly=TRUE,
@@ -407,7 +407,7 @@ const ClassDef *newResolveTypedef(const FileDef *fileScope,
                                   const MemberDef **pMemType=0,
                                   QCString *pTemplSpec=0,
                                   QCString *pResolvedType=0,
-                                  ArgumentList *actTemplParams=0);
+                                  const ArgumentList *actTemplParams=0);
 
 QCString parseCommentAsText(const Definition *scope,const MemberDef *member,const QCString &doc,const QCString &fileName,int lineNr);
 
@@ -424,7 +424,7 @@ int countAliasArguments(const QCString argList);
 QCString resolveAliasCmd(const QCString aliasCmd);
 QCString expandAlias(const QCString &aliasName,const QCString &aliasValue);
 
-void writeTypeConstraints(OutputList &ol,const Definition *d,const ArgumentList *al);
+void writeTypeConstraints(OutputList &ol,const Definition *d,const ArgumentList &al);
 
 QCString convertCharEntitiesToUTF8(const QCString &s);
 
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index 03bf883..9f128ea 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -434,14 +434,10 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol,
 static void setParameterList(const MemberDef *md)
 {
   g_classScope = md->getClassDef() ? md->getClassDef()->name().data() : "";
-  const ArgumentList *al = md->argumentList();
-  if (al==0) return;
-  ArgumentListIterator ali(*al);
-  const Argument *a;
-  for (ali.toFirst();(a=ali.current());++ali)
+  for (const Argument &a: md->argumentList())
   {
-    g_parmName = a->name.copy();
-    g_parmType = a->type.copy();
+    g_parmName = a.name.copy();
+    g_parmType = a.type.copy();
     int i = g_parmType.find('*');
     if (i!=-1) g_parmType = g_parmType.left(i);
     i = g_parmType.find('&');
@@ -683,9 +679,8 @@ static void codifyMapLines(const char *text)
 
 static void writeFuncProto()
 {
-  QList<Argument> ql;
   QCString name,ret;
-  VhdlDocGen::parseFuncProto(g_FuncProto,ql,name,ret,FALSE);
+  VhdlDocGen::parseFuncProto(g_FuncProto,name,ret,FALSE);
 
   if (name.isEmpty())
   {
@@ -702,7 +697,7 @@ static void writeFuncProto()
   {
     temp.stripPrefix("_");// _{package body name}
   }
-  MemberDef *mdef=VhdlDocGen::findFunction(ql,name,temp,FALSE);
+  MemberDef *mdef=VhdlDocGen::findFunction(name,temp);
 
   if (mdef)
   {
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index fca010e..7db56c3 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -899,12 +899,9 @@ void VhdlDocGen::findAllPackages( ClassDef *cdef)
  * is called in vhdlcode.l
  */
 
-MemberDef* VhdlDocGen::findFunction(const QList<Argument> &ql,
-    const QCString& funcname,
-    const QCString& package, bool /*type*/)
+MemberDef* VhdlDocGen::findFunction(const QCString& funcname, const QCString& package)
 {
   MemberDef* mdef=0;
-  //int funcType;
   ClassDef *cdef=getClass(package.data());
   if (cdef==0) return 0;
 
@@ -918,40 +915,11 @@ MemberDef* VhdlDocGen::findFunction(const QList<Argument> &ql,
       QCString mname=mdef->name();
       if ((VhdlDocGen::isProcedure(mdef) || VhdlDocGen::isVhdlFunction(mdef)) && (compareString(funcname,mname)==0))
       {
-        ArgumentList *alp = mdef->argumentList();
-
-        //  ArgumentList* arg2=mdef->getArgumentList();
-        if (alp==0) break;
-        ArgumentListIterator ali(*alp);
-        ArgumentListIterator ali1(ql);
-
-        if (ali.count() != ali1.count()) break;
-
-        Argument *arg,*arg1;
-        int equ=0;
-
-        for (;(arg=ali.current()) && (arg1=ali1.current());++ali,++ali1)
-        {
-          equ+=abs(compareString(arg->type,arg1->type));
-
-          QCString s1=arg->type;
-          QCString s2=arg1->type;
-          VhdlDocGen::deleteAllChars(s1,' ');
-          VhdlDocGen::deleteAllChars(s2,' ');
-          equ+=abs(compareString(s1,s2));
-          s1=arg->attrib;
-          s2=arg1->attrib;
-          VhdlDocGen::deleteAllChars(s1,' ');
-          VhdlDocGen::deleteAllChars(s2,' ');
-          equ+=abs(compareString(s1,s2));
-          // printf("\n 1. type [%s] name [%s] attrib [%s]",arg->type,arg->name,arg->attrib);
-          // printf("\n 2. type [%s] name [%s] attrib [%s]",arg1->type,arg1->name,arg1->attrib);
-        } // for
-        if (equ==0) return mdef;
+        return mdef;
       }//if
     }//for
   }//if
-  return mdef;
+  return 0;
 } //findFunction
 
 
@@ -1158,10 +1126,8 @@ void VhdlDocGen::prepareComment(QCString& qcs)
  * @param ret Stores the return type
  * @param doc ???
  */
-void VhdlDocGen::parseFuncProto(const char* text,QList<Argument>& qlist,
-    QCString& name,QCString& ret,bool doc)
+void VhdlDocGen::parseFuncProto(const char* text,QCString& name,QCString& ret,bool doc)
 {
-  (void)qlist; //unused
   int index,end;
   QCString s1(text);
   QCString temp;
@@ -1450,44 +1416,43 @@ void VhdlDocGen::formatString(const QCString &s, OutputList& ol,const MemberDef*
  * writes a procedure prototype to the output
  */
 
-void VhdlDocGen::writeProcedureProto(OutputList& ol,const ArgumentList* al,const MemberDef* mdef)
+void VhdlDocGen::writeProcedureProto(OutputList& ol,const ArgumentList &al,const MemberDef* mdef)
 {
-  ArgumentListIterator ali(*al);
-  Argument *arg;
   bool sem=FALSE;
-  int len=al->count();
+  int len=al.size();
   ol.docify("( ");
   if (len > 2)
   {
     ol.lineBreak();
   }
-  for (;(arg=ali.current());++ali)
+  for (const Argument &arg : al)
   {
     ol.startBold();
     if (sem && len <3)
       ol.writeChar(',');
 
-    QCString nn=arg->name;
+    QCString nn=arg.name;
     nn+=": ";
 
-    QCString *str=VhdlDocGen::findKeyWord(arg->defval);
-    arg->defval+=" ";
+    QCString defval = arg.defval;
+    QCString *str=VhdlDocGen::findKeyWord(defval);
+    defval+=" ";
     if (str)
     {
-      startFonts(arg->defval,str->data(),ol);
+      startFonts(defval,str->data(),ol);
     }
     else
     {
-      startFonts(arg->defval,"vhdlchar",ol); // write type (variable,constant etc.)
+      startFonts(defval,"vhdlchar",ol); // write type (variable,constant etc.)
     }
 
     startFonts(nn,"vhdlchar",ol); // write name
-    if (qstricmp(arg->attrib,arg->type) != 0)
+    if (qstricmp(arg.attrib,arg.type) != 0)
     {
-      startFonts(arg->attrib.lower(),"stringliteral",ol); // write in|out
+      startFonts(arg.attrib.lower(),"stringliteral",ol); // write in|out
     }
     ol.docify(" ");
-    VhdlDocGen::formatString(arg->type,ol,mdef);
+    VhdlDocGen::formatString(arg.type,ol,mdef);
     sem=TRUE;
     ol.endBold();
     if (len > 2)
@@ -1506,13 +1471,11 @@ void VhdlDocGen::writeProcedureProto(OutputList& ol,const ArgumentList* al,const
  * writes a function prototype to the output
  */
 
-void VhdlDocGen::writeFunctionProto(OutputList& ol,const ArgumentList* al,const MemberDef* mdef)
+void VhdlDocGen::writeFunctionProto(OutputList& ol,const ArgumentList &al,const MemberDef* mdef)
 {
-  if (al==0) return;
-  ArgumentListIterator ali(*al);
-  Argument *arg;
+  if (!al.hasParameters()) return;
   bool sem=FALSE;
-  int len=al->count();
+  int len=al.size();
   ol.startBold();
   ol.docify(" ( ");
   ol.endBold();
@@ -1520,10 +1483,10 @@ void VhdlDocGen::writeFunctionProto(OutputList& ol,const ArgumentList* al,const
   {
     ol.lineBreak();
   }
-  for (;(arg=ali.current());++ali)
+  for (const Argument &arg : al)
   {
     ol.startBold();
-    QCString att=arg->defval;
+    QCString att=arg.defval;
     bool bGen=att.stripPrefix("gen!");
 
     if (sem && len < 3)
@@ -1545,9 +1508,9 @@ void VhdlDocGen::writeFunctionProto(OutputList& ol,const ArgumentList* al,const
         startFonts(att,"vhdlchar",ol);
     }
 
-    QCString nn=arg->name;
+    QCString nn=arg.name;
     nn+=": ";
-    QCString ss=arg->type.stripWhiteSpace(); //.lower();
+    QCString ss=arg.type.stripWhiteSpace(); //.lower();
     QCString w=ss.stripWhiteSpace();//.upper();
     startFonts(nn,"vhdlchar",ol);
     startFonts("in ","stringliteral",ol);
@@ -1557,9 +1520,8 @@ void VhdlDocGen::writeFunctionProto(OutputList& ol,const ArgumentList* al,const
     else
       startFonts(w,"vhdlchar",ol);
 
-    if (arg->attrib)
-      startFonts(arg->attrib,"vhdlchar",ol);
-
+    if (arg.attrib)
+      startFonts(arg.attrib,"vhdlchar",ol);
 
     sem=TRUE;
     ol.endBold();
@@ -1587,21 +1549,19 @@ void VhdlDocGen::writeFunctionProto(OutputList& ol,const ArgumentList* al,const
  * writes a process prototype to the output
  */
 
-void VhdlDocGen::writeProcessProto(OutputList& ol,const ArgumentList* al,const MemberDef* mdef)
+void VhdlDocGen::writeProcessProto(OutputList& ol,const ArgumentList &al,const MemberDef* mdef)
 {
-  if (al==0) return;
-  ArgumentListIterator ali(*al);
-  Argument *arg;
+  if (!al.hasParameters()) return;
   bool sem=FALSE;
   ol.startBold();
   ol.docify(" ( ");
-  for (;(arg=ali.current());++ali)
+  for (const Argument &arg : al)
   {
     if (sem)
     {
       ol.docify(" , ");
     }
-    QCString nn=arg->name;
+    QCString nn=arg.name;
     // startFonts(nn,"vhdlchar",ol);
     VhdlDocGen::writeFormatString(nn,ol,mdef);
     sem=TRUE;
@@ -1618,15 +1578,13 @@ void VhdlDocGen::writeProcessProto(OutputList& ol,const ArgumentList* al,const M
 bool VhdlDocGen::writeFuncProcDocu(
     const MemberDef *md,
     OutputList& ol,
-    const ArgumentList* al,
+    const ArgumentList &al,
     bool /*type*/)
 {
-  if (al==0) return FALSE;
   //bool sem=FALSE;
   ol.enableAll();
 
-  ArgumentListIterator ali(*al);
-  int index=ali.count();
+  int index=al.size();
   if (index==0)
   {
     ol.docify(" ( ) ");
@@ -1635,13 +1593,12 @@ bool VhdlDocGen::writeFuncProcDocu(
   ol.endMemberDocName();
   ol.startParameterList(TRUE);
   //ol.startParameterName(FALSE);
-  Argument *arg;
   bool first=TRUE;
-  for (;(arg=ali.current());++ali)
+  for (const Argument &arg : al)
   {
     ol.startParameterType(first,"");
     //   if (first) ol.writeChar('(');
-    QCString attl=arg->defval;
+    QCString attl=arg.defval;
     bool bGen=attl.stripPrefix("gen!");
     if (bGen)
       VhdlDocGen::writeFormatString(QCString("generic "),ol,md);
@@ -1649,17 +1606,17 @@ bool VhdlDocGen::writeFuncProcDocu(
 
     if (VhdlDocGen::isProcedure(md))
     {
-      startFonts(arg->defval,"keywordtype",ol);
+      startFonts(arg.defval,"keywordtype",ol);
       ol.docify(" ");
     }
     ol.endParameterType();
 
     ol.startParameterName(TRUE);
-    VhdlDocGen::writeFormatString(arg->name,ol,md);
+    VhdlDocGen::writeFormatString(arg.name,ol,md);
 
     if (VhdlDocGen::isProcedure(md))
     {
-      startFonts(arg->attrib,"stringliteral",ol);
+      startFonts(arg.attrib,"stringliteral",ol);
     }
     else if (VhdlDocGen::isVhdlFunction(md))
     {
@@ -1672,8 +1629,8 @@ bool VhdlDocGen::writeFuncProcDocu(
     ol.enable(OutputGenerator::Man);
     if (!VhdlDocGen::isProcess(md))
     {
-     // startFonts(arg->type,"vhdlkeyword",ol);
-		VhdlDocGen::writeFormatString(arg->type,ol,md);
+     // startFonts(arg.type,"vhdlkeyword",ol);
+		VhdlDocGen::writeFormatString(arg.type,ol,md);
     }
     ol.disable(OutputGenerator::Man);
     ol.endEmphasis();
@@ -1702,28 +1659,26 @@ bool VhdlDocGen::writeFuncProcDocu(
 
 
 
-QCString VhdlDocGen::convertArgumentListToString(const ArgumentList* al,bool func)
+QCString VhdlDocGen::convertArgumentListToString(const ArgumentList &al,bool func)
 {
   QCString argString;
   bool sem=FALSE;
-  ArgumentListIterator ali(*al);
-  Argument *arg;
 
-  for (;(arg=ali.current());++ali)
+  for (const Argument &arg : al)
   {
     if (sem) argString.append(", ");
     if (func)
     {
-      argString+=arg->name;
+      argString+=arg.name;
       argString+=":";
-      argString+=arg->type;
+      argString+=arg.type;
     }
     else
     {
-      argString+=arg->defval+" ";
-      argString+=arg->name+" :";
-      argString+=arg->attrib+" ";
-      argString+=arg->type;
+      argString+=arg.defval+" ";
+      argString+=arg.name+" :";
+      argString+=arg.attrib+" ";
+      argString+=arg.type;
     }
     sem=TRUE;
   }
@@ -2003,7 +1958,7 @@ void VhdlDocGen::writeVHDLDeclaration(const MemberDef* mdef,OutputList &ol,
   QCString ltype(mdef->typeString());
   QCString largs(mdef->argsString());
   ClassDef *kl=0;
-  const ArgumentList *alp = mdef->argumentList();
+  const ArgumentList &al = mdef->argumentList();
   QCString nn;
   //VhdlDocGen::adjustRecordMember(mdef);
   if (gd) gd=0;
@@ -2021,11 +1976,11 @@ void VhdlDocGen::writeVHDLDeclaration(const MemberDef* mdef,OutputList &ol,
       ol.docify(" ");
 
       writeLink(mdef,ol);
-      if (alp!=0 && mm==VhdlDocGen::FUNCTION)
-        VhdlDocGen::writeFunctionProto(ol,alp,mdef);
+      if (al.hasParameters() && mm==VhdlDocGen::FUNCTION)
+        VhdlDocGen::writeFunctionProto(ol,al,mdef);
 
-      if (alp!=0 && mm==VhdlDocGen::PROCEDURE)
-        VhdlDocGen::writeProcedureProto(ol,alp,mdef);
+      if (al.hasParameters() && mm==VhdlDocGen::PROCEDURE)
+        VhdlDocGen::writeProcedureProto(ol,al,mdef);
 
       break;
     case VhdlDocGen::USE:
@@ -2090,7 +2045,7 @@ void VhdlDocGen::writeVHDLDeclaration(const MemberDef* mdef,OutputList &ol,
     case VhdlDocGen::PROCESS:
       writeLink(mdef,ol);
       ol.insertMemberAlign();
-      VhdlDocGen::writeProcessProto(ol,alp,mdef);
+      VhdlDocGen::writeProcessProto(ol,al,mdef);
       break;
     case VhdlDocGen::PACKAGE:
     case VhdlDocGen::ENTITY:
@@ -2984,8 +2939,8 @@ ferr:
       n1,uu,uu, 0,
       Public, Normal, cur->stat,Member,
       MemberType_Variable,
-      0,
-      0,
+      ArgumentList(),
+      ArgumentList(),
       "");
 
   if (ar->getOutputFileBase())
@@ -4055,34 +4010,30 @@ void FlowChart::writeEdge(FTextStream &t,int fl_from,int fl_to,int i,bool bFrom,
   t << "\n";
 }
 
-void FlowChart::alignFuncProc( QCString & q,const ArgumentList* al,bool isFunc)
+void FlowChart::alignFuncProc( QCString & q,const ArgumentList &al,bool isFunc)
 {
-  if (al==0) return;
-
-  ArgumentListIterator ali(*al);
-  int index=ali.count();
+  int index=al.size();
   if (index==0) return;
 
   int len=q.length()+VhdlDocGen::getFlowMember()->name().length();
   QCString prev,temp;
   prev.fill(' ',len+1);
 
-  Argument *arg;
   q+="\n";
-  for (;(arg=ali.current());++ali)
+  for (const Argument &arg : al)
   {
-    QCString attl=arg->defval+" ";
-    attl+=arg->name+" ";
+    QCString attl=arg.defval+" ";
+    attl+=arg.name+" ";
 
     if (!isFunc)
     {
-      attl+=arg->attrib+" ";
+      attl+=arg.attrib+" ";
     }
     else
     {
       attl+=" in ";
     }
-    attl+=arg->type;
+    attl+=arg.type;
     if (--index) attl+=",\n"; else attl+="\n";
 
     attl.prepend(prev.data());
diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h
index e2c843c..18985ff 100644
--- a/src/vhdldocgen.h
+++ b/src/vhdldocgen.h
@@ -95,7 +95,6 @@ class VhdlDocGen
     static bool     deleteCharRev(QCString &s,char c);
     static void     deleteAllChars(QCString &s,char c);
     static void     parseFuncProto(const char* text,
-                                   QList<Argument>& , 
                                    QCString& name,
                                    QCString& ret,
                                    bool doc=false);
@@ -113,9 +112,8 @@ class VhdlDocGen
                                 const QCString& key,
                                 MemberListType type);
     static ClassDef *getClass(const char *name);
-    static MemberDef* findFunction(const QList<Argument> &ql,
-                                   const QCString& name,
-                                   const QCString& package, bool type);
+    static MemberDef* findFunction(const QCString& name,
+                                   const QCString& package);
     static QCString getClassTitle(const ClassDef*);
     static void writeInlineClassLink(const ClassDef*,
                                      OutputList &ol);
@@ -155,11 +153,11 @@ class VhdlDocGen
     static void formatString(const QCString&,OutputList& ol,const MemberDef*);
 
     static void writeFormatString(const QCString&,OutputList& ol,const MemberDef*);
-    static void writeFunctionProto(OutputList& ol,const ArgumentList *al,const MemberDef*);
-    static void writeProcessProto(OutputList& ol,const ArgumentList *al,const MemberDef*);
-    static void writeProcedureProto(OutputList& ol, const ArgumentList *al,const MemberDef*);
-    static bool writeFuncProcDocu(const MemberDef *mdef, OutputList& ol,const ArgumentList* al,bool type=false);
-    static void writeRecordProto(const MemberDef *mdef, OutputList& ol,const ArgumentList *al);
+    static void writeFunctionProto(OutputList& ol,const ArgumentList &al,const MemberDef*);
+    static void writeProcessProto(OutputList& ol,const ArgumentList &al,const MemberDef*);
+    static void writeProcedureProto(OutputList& ol, const ArgumentList &al,const MemberDef*);
+    static bool writeFuncProcDocu(const MemberDef *mdef, OutputList& ol,const ArgumentList &al,bool type=false);
+    static void writeRecordProto(const MemberDef *mdef, OutputList& ol,const ArgumentList &al);
 
     static bool writeVHDLTypeDocumentation(const MemberDef* mdef, const Definition* d, OutputList &ol);
 
@@ -179,7 +177,7 @@ class VhdlDocGen
 
     static bool writeClassType(const ClassDef *,OutputList &ol ,QCString & cname);
 
-    static QCString convertArgumentListToString(const ArgumentList* al,bool f);
+    static QCString convertArgumentListToString(const ArgumentList &al,bool f);
     static QCString getProcessNumber();
     static QCString getRecordNumber();
    
@@ -225,7 +223,7 @@ class VhdlDocGen
 
   private:
     static void findAllArchitectures(QList<QCString>& ql,const ClassDef *cd);
-    static bool compareArgList(ArgumentList*,ArgumentList*);
+    static bool compareArgList(const ArgumentList &,const ArgumentList &);
     static void writeVhdlLink(const ClassDef* cdd ,OutputList& ol,QCString& type,QCString& name,QCString& beh);
     static void writeStringLink(const MemberDef *mdef,QCString mem,OutputList& ol);
     static void writeRecUnitDocu( const MemberDef *md, OutputList& ol,QCString largs);
@@ -294,7 +292,7 @@ class FlowChart
     static void moveToPrevLevel();
     static int getTimeStamp();
     static void writeFlowChart();
-    static void alignFuncProc(QCString & q,const ArgumentList*  al,bool isFunc);
+    static void alignFuncProc(QCString & q,const ArgumentList &al,bool isFunc);
     static QCString convertNameToFileName();
     static void printNode(const FlowChart* n);
     static void printFlowTree();
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index ae10f4d..39981a0 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -441,9 +441,9 @@ void VhdlParser::createFunction(const char *imp,uint64 spec,const char *fn)
       QCStringList q1=QCStringList::split(",",fname);
       for (uint ii=0;ii<q1.count();ii++)
       {
-        Argument *arg=new Argument;
-        arg->name=q1[ii];
-        current->argList->append(arg);
+        Argument arg;
+        arg.name=q1[ii];
+        current->argList.push_back(arg);
       }
     }
     return;
@@ -532,7 +532,7 @@ void VhdlParser::addConfigureNode(const char* a,const char*b, bool,bool isLeaf,b
 
 
 void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
-    const char *s4,const char *s5,const char *s6)
+                          const char *s4,const char *s5,const char *s6)
 {
   (void)s5; // avoid unused warning
   QCString name=s2;
@@ -540,21 +540,21 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
 
   for (uint u=0;u<ql.count();u++)
   {
-    Argument *arg=new Argument;
-    arg->name=ql[u];
+    Argument arg;
+    arg.name=ql[u];
     if (s3)
     {
-      arg->type=s3;
+      arg.type=s3;
     }
-    arg->type+=" ";
-    arg->type+=s4;
+    arg.type+=" ";
+    arg.type+=s4;
     if (s6)
     {
-      arg->type+=s6;
+      arg.type+=s6;
     }
     if (parse_sec==GEN_SEC && param_sec==0)
     {
-      arg->defval="gen!";
+      arg.defval="gen!";
     }
 
     if (parse_sec==PARAM_SEC)
@@ -562,10 +562,10 @@ void VhdlParser::addProto(const char *s1,const char *s2,const char *s3,
     //  assert(false);
     }
 
-    arg->defval+=s1;
-    arg->attrib="";//s6;
+    arg.defval+=s1;
+    arg.attrib="";//s6;
 
-    current->argList->append(arg);
+    current->argList.push_back(arg);
     current->args+=s2;
     current->args+=",";
   }
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index d05adf0..dfbf630 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -338,43 +338,41 @@ void XMLCodeGenerator::finish()
   if (m_insideCodeLine) endCodeLine();
 }
 
-static void writeTemplateArgumentList(const ArgumentList *al,
-                                      FTextStream &t,
+static void writeTemplateArgumentList(FTextStream &t,
+                                      const ArgumentList &al,
                                       const Definition *scope,
                                       const FileDef *fileScope,
                                       int indent)
 {
   QCString indentStr;
   indentStr.fill(' ',indent);
-  if (al)
+  if (al.hasParameters())
   {
     t << indentStr << "<templateparamlist>" << endl;
-    ArgumentListIterator ali(*al);
-    const Argument *a;
-    for (ali.toFirst();(a=ali.current());++ali)
+    for (const Argument &a : al)
     {
       t << indentStr << "  <param>" << endl;
-      if (!a->type.isEmpty())
+      if (!a.type.isEmpty())
       {
         t << indentStr <<  "    <type>";
-        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->type);
+        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.type);
         t << "</type>" << endl;
       }
-      if (!a->name.isEmpty())
+      if (!a.name.isEmpty())
       {
-        t << indentStr <<  "    <declname>" << convertToXML(a->name) << "</declname>" << endl;
-        t << indentStr <<  "    <defname>" << convertToXML(a->name) << "</defname>" << endl;
+        t << indentStr <<  "    <declname>" << convertToXML(a.name) << "</declname>" << endl;
+        t << indentStr <<  "    <defname>" << convertToXML(a.name) << "</defname>" << endl;
       }
-      if (!a->defval.isEmpty())
+      if (!a.defval.isEmpty())
       {
         t << indentStr << "    <defval>";
-        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->defval);
+        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.defval);
         t << "</defval>" << endl;
       }
-      if (!a->typeConstraint.isEmpty())
+      if (!a.typeConstraint.isEmpty())
       {
         t << indentStr << "    <typeconstraint>";
-        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a->typeConstraint);
+        linkifyText(TextGeneratorXMLImpl(t),scope,fileScope,0,a.typeConstraint);
         t << "</typeconstraint>" << endl;
       }
       t << indentStr << "  </param>" << endl;
@@ -385,16 +383,12 @@ static void writeTemplateArgumentList(const ArgumentList *al,
 
 static void writeMemberTemplateLists(const MemberDef *md,FTextStream &t)
 {
-  const ArgumentList *templMd = md->templateArguments();
-  if (templMd) // function template prefix
-  {
-    writeTemplateArgumentList(templMd,t,md->getClassDef(),md->getFileDef(),8);
-  }
+  writeTemplateArgumentList(t,md->templateArguments(),md->getClassDef(),md->getFileDef(),8);
 }
 
 static void writeTemplateList(const ClassDef *cd,FTextStream &t)
 {
-  writeTemplateArgumentList(cd->templateArguments(),t,cd,0,4);
+  writeTemplateArgumentList(t,cd->templateArguments(),cd,0,4);
 }
 
 static void writeXMLDocBlock(FTextStream &t,
@@ -591,9 +585,9 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
 
   if (isFunc)
   {
-    const ArgumentList *al = md->argumentList();
+    const ArgumentList &al = md->argumentList();
     t << " const=\"";
-    if (al!=0 && al->constSpecifier)    t << "yes"; else t << "no"; 
+    if (al.constSpecifier)    t << "yes"; else t << "no"; 
     t << "\"";
 
     t << " explicit=\"";
@@ -604,10 +598,10 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
     if (md->isInline()) t << "yes"; else t << "no";
     t << "\"";
 
-    if (al!=0 && al->refQualifier!=RefQualifierNone)
+    if (al.refQualifier!=RefQualifierNone)
     {
       t << " refqual=\"";
-      if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
+      if (al.refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
       t << "\"";
     }
 
@@ -641,7 +635,7 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
       t << " noexcept=\"yes\"";
     }
 
-    if (al && al->volatileSpecifier)
+    if (al.volatileSpecifier)
     {
       t << " volatile=\"yes\"";
     }
@@ -840,51 +834,55 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
 
   if (isFunc) //function
   {
-    const ArgumentList *declAl = md->declArgumentList();
-    const ArgumentList *defAl = md->argumentList();
-    if (declAl && defAl && declAl->count()>0)
+    const ArgumentList &declAl = md->declArgumentList();
+    const ArgumentList &defAl = md->argumentList();
+    if (declAl.hasParameters())
     {
-      ArgumentListIterator declAli(*declAl);
-      ArgumentListIterator defAli(*defAl);
-      const Argument *a;
-      for (declAli.toFirst();(a=declAli.current());++declAli)
+      auto defIt = defAl.begin();
+      for (const Argument &a : declAl)
       {
-        Argument *defArg = defAli.current();
+        //const Argument *defArg = defAli.current();
+        const Argument *defArg = 0;
+        if (defIt!=defAl.end())
+        {
+          defArg = &(*defIt);
+          ++defIt;
+        }
         t << "        <param>" << endl;
-        if (!a->attrib.isEmpty())
+        if (!a.attrib.isEmpty())
         {
           t << "          <attributes>";
-          writeXMLString(t,a->attrib);
+          writeXMLString(t,a.attrib);
           t << "</attributes>" << endl;
         }
-        if (!a->type.isEmpty())
+        if (!a.type.isEmpty())
         {
           t << "          <type>";
-          linkifyText(TextGeneratorXMLImpl(t),def,md->getBodyDef(),md,a->type);
+          linkifyText(TextGeneratorXMLImpl(t),def,md->getBodyDef(),md,a.type);
           t << "</type>" << endl;
         }
-        if (!a->name.isEmpty())
+        if (!a.name.isEmpty())
         {
           t << "          <declname>";
-          writeXMLString(t,a->name); 
+          writeXMLString(t,a.name); 
           t << "</declname>" << endl;
         }
-        if (defArg && !defArg->name.isEmpty() && defArg->name!=a->name)
+        if (defArg && !defArg->name.isEmpty() && defArg->name!=a.name)
         {
           t << "          <defname>";
           writeXMLString(t,defArg->name);
           t << "</defname>" << endl;
         }
-        if (!a->array.isEmpty())
+        if (!a.array.isEmpty())
         {
           t << "          <array>"; 
-          writeXMLString(t,a->array); 
+          writeXMLString(t,a.array); 
           t << "</array>" << endl;
         }
-        if (!a->defval.isEmpty())
+        if (!a.defval.isEmpty())
         {
           t << "          <defval>";
-          linkifyText(TextGeneratorXMLImpl(t),def,md->getBodyDef(),md,a->defval);
+          linkifyText(TextGeneratorXMLImpl(t),def,md->getBodyDef(),md,a.defval);
           t << "</defval>" << endl;
         }
         if (defArg && defArg->hasDocumentation())
@@ -895,25 +893,22 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
           t << "</briefdescription>" << endl;
         }
         t << "        </param>" << endl;
-        if (defArg) ++defAli;
       }
     }
   }
   else if (md->memberType()==MemberType_Define && 
           md->argsString()) // define
   {
-    if (md->argumentList()->count()==0) // special case for "foo()" to
+    if (md->argumentList().empty())     // special case for "foo()" to
                                         // disguish it from "foo".
     {
       t << "        <param></param>" << endl;
     }
     else
     {
-      ArgumentListIterator ali(*md->argumentList());
-      const Argument *a;
-      for (ali.toFirst();(a=ali.current());++ali)
+      for (const Argument &a : md->argumentList())
       {
-        t << "        <param><defname>" << a->type << "</defname></param>" << endl;
+        t << "        <param><defname>" << a.type << "</defname></param>" << endl;
       }
     }
   }
-- 
cgit v0.12


From 80a264bf79f60c9ae4446cb93a3a93662779d885 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 28 Oct 2019 19:00:25 +0100
Subject: Properly open quotes in warning

Commit 78b5c44 'Properly close quotes in warning' https://github.com/doxygen/doxygen/pull/7312 handled the case that a closing quote was missing in case of a missing closing quote.

I case the word template is missing it is possible to miss the opening quote, resulting in:
```
wxWidgets-3.1.3/src/x11/brush.cpp:66: warning: no matching class member found for
  wxBrush::wxBrush(const wxColour &col, int style)
Possible candidates:
  wxBrush::wxBrush()'
  wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style=wxBRUSHSTYLE_SOLID)'
```

this is fixed here.
---
 src/doxygen.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index decd574..eb5e569 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6298,13 +6298,14 @@ static void findMember(const Entry *root,
                 if (cd!=0 && rightScopeMatch(cd->name(),className))
                 {
                   const ArgumentList &templAl = md->templateArguments();
+                  warnMsg+="  '";
                   if (templAl.hasParameters())
                   {
-                    warnMsg+="  'template ";
+                    warnMsg+="template ";
                     warnMsg+=tempArgListToString(templAl,root->lang);
                     warnMsg+='\n';
+                    warnMsg+="  ";
                   }
-                  warnMsg+="  ";
                   if (md->typeString())
                   {
                     warnMsg+=md->typeString();
-- 
cgit v0.12


From ad9be5fb2339151f1d75a6c9aba4226e48a81ae1 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 28 Oct 2019 19:50:38 +0100
Subject: Update generated code to javacc 6.2

---
 vhdlparser/CharStream.cc             |   4 +-
 vhdlparser/CharStream.h              | 204 ++++++------
 vhdlparser/ErrorHandler.h            |   7 +-
 vhdlparser/ParseException.cc         |   8 +-
 vhdlparser/ParseException.h          |   6 +-
 vhdlparser/Token.cc                  |   4 +-
 vhdlparser/Token.h                   |   7 +-
 vhdlparser/TokenManager.h            |  14 +-
 vhdlparser/TokenMgrError.cc          |   9 +-
 vhdlparser/TokenMgrError.h           |  23 +-
 vhdlparser/VhdlParser.cc             | 611 ++++++++++++++++++-----------------
 vhdlparser/VhdlParser.h              | 318 +++++++++---------
 vhdlparser/VhdlParserTokenManager.cc |  47 ++-
 vhdlparser/VhdlParserTokenManager.h  |  27 +-
 14 files changed, 672 insertions(+), 617 deletions(-)

diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc
index 8cc17c3..65179f5 100644
--- a/vhdlparser/CharStream.cc
+++ b/vhdlparser/CharStream.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "CharStream.h"
 
@@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
 
 }
 }
-/* JavaCC - OriginalChecksum=e709b9ee1adf0fcb6b1c5e1641f10348 (do not edit this line) */
+/* JavaCC - OriginalChecksum=ade3c1b57a731a003629de593814ffa6 (do not edit this line) */
diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index 784b584..2543ad1 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef CHARSTREAM_H
 #define CHARSTREAM_H
@@ -28,17 +28,33 @@ namespace parser {
 
 
 class CharStream {
+public:
+          void setTabSize(int i) { tabSize = i; }
+          int  getTabSize(int i) { return tabSize; }
+ private:
+  int getBufcolumn(int pos) {
+    if (trackLineColumn && pos>=0) {
+      return bufcolumn[pos];
+    } else {
+      return -1;
+    }
+  }
+  int getBufline(int pos) {
+    if (trackLineColumn && pos>=0) {
+      return bufline[pos];
+    } else {
+      return -1;
+    }
+  }
  public:
-  void setTabSize(int i) { tabSize = i; }
-  int getTabSize(int i) { return tabSize; }
-  virtual int getColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
-  virtual int getLine() { return trackLineColumn ? bufline[bufpos] : -1; }
-  virtual int getEndColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
-  virtual int getEndLine() { return trackLineColumn ? bufline[bufpos] : -1; }
-  virtual int getBeginColumn() { return trackLineColumn ? bufcolumn[tokenBegin] : -1; }
-  virtual int getBeginLine() { return trackLineColumn ? bufline[tokenBegin] : -1; }
-
-  virtual bool getTrackLineColumn() { return trackLineColumn; }
+  virtual int getColumn() { return getBufcolumn(bufpos); }
+  virtual int getLine() { return getBufline(bufpos); }
+  virtual int getEndColumn() { return getBufcolumn(bufpos); }
+  virtual int getEndLine() { return getBufline(bufpos); }
+  virtual int getBeginColumn() { return getBufcolumn(tokenBegin); }
+  virtual int getBeginLine() { return getBufline(tokenBegin); }
+
+  virtual bool getTrackLineColumn()         { return trackLineColumn; }
   virtual void setTrackLineColumn(bool val) { trackLineColumn = val; }
 
 /**
@@ -47,25 +63,25 @@ class CharStream {
  * (longer) token. So, they will be used again as the prefix of the next
  * token and it is the implemetation's responsibility to do this right.
  */
-virtual inline void backup(int amount) {
-  inBuf += amount;
-  bufpos -= amount;
-  if (bufpos < 0) {
-    bufpos += bufsize;
+  virtual inline void backup(int amount) {
+    inBuf += amount;
+    bufpos -= amount;
+    if (bufpos < 0) {
+      bufpos += bufsize;
+    }
   }
-}
 
 /**
  * Returns the next character that marks the beginning of the next token.
  * All characters must remain in the buffer between two successive calls
  * to this method to implement backup correctly.
  */
-virtual inline JAVACC_CHAR_TYPE BeginToken() {
-  tokenBegin = -1;
-  JAVACC_CHAR_TYPE c = readChar();
-  tokenBegin = bufpos;
-  return c;
-}
+  virtual inline JAVACC_CHAR_TYPE BeginToken() {
+    tokenBegin = -1;
+    JAVACC_CHAR_TYPE c = readChar();
+    tokenBegin = bufpos;
+    return c;
+  }
 
 
 /**
@@ -73,31 +89,30 @@ virtual inline JAVACC_CHAR_TYPE BeginToken() {
  * of selecting the input is the responsibility of the class
  * implementing this class.
  */
-virtual inline JAVACC_CHAR_TYPE readChar() {
-  if (inBuf > 0) {
-    --inBuf;
-    ++bufpos;
-    if (bufpos == bufsize) {
-      bufpos = 0;
+  virtual inline JAVACC_CHAR_TYPE readChar() {
+    if (inBuf > 0) {
+      --inBuf;
+      ++bufpos;
+      if (bufpos == bufsize) {
+        bufpos = 0;
+      }
+      return buffer[bufpos];
     }
 
-    return buffer[bufpos];
-  }
+    ++bufpos;
+    if (bufpos >= maxNextCharInd) {
+      FillBuff();
+    }
 
-  ++bufpos;
-  if (bufpos >= maxNextCharInd) {
-    FillBuff();
-  }
+    JAVACC_CHAR_TYPE c = buffer[bufpos];
 
-  JAVACC_CHAR_TYPE c = buffer[bufpos];
+    if (trackLineColumn) {
+      UpdateLineColumn(c);
+    }
 
-  if (trackLineColumn) {
-    UpdateLineColumn(c);
+    return c;
   }
 
-  return c;
-}
-
 
   virtual void ExpandBuff(bool wrapAround);
   virtual void FillBuff();
@@ -112,8 +127,7 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
     if (bufpos >= tokenBegin)
       return JAVACC_STRING_TYPE(buffer + tokenBegin, bufpos - tokenBegin + 1);
     else
-      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin)
-             .append(buffer, bufpos + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
   }
 
   /**
@@ -126,8 +140,7 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
     if ((bufpos + 1) >= len) {
       return JAVACC_STRING_TYPE(buffer + bufpos - len + 1, len);
     }
-    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1)
-           .append(buffer, bufpos + 1);
+    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
   }
 
   /**
@@ -144,74 +157,71 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
   }
 
   bool endOfInput() {
-    return inBuf == 0 && bufpos + 1 >= maxNextCharInd &&
-           inputStream->endOfInput();
+    return inBuf == 0 && bufpos + 1 >= maxNextCharInd && inputStream->endOfInput();
   }
 
   CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(8), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize);
   }
 
   CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(8), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(8), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(str, startline, startcolumn, buffersize);
   }
 
   CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0) ,tabSize(8), trackLineColumn(true){
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline,
              int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(8), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(8), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(8), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn,
-                      int buffersize);
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn, int buffersize);
 
-  virtual void ReInit(ReaderStream *input_stream, int startline,
-                      int startcolumn) {
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
@@ -232,26 +242,26 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
  protected:
   virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c);
 
-  int *bufline;
-  int *bufcolumn;
-  ReaderStream *inputStream;
-  bool deleteStream;
-  JAVACC_CHAR_TYPE * buffer;
-  int bufpos;
-  int bufsize;
-  int tokenBegin;
-  int column;
-  int line;
-  bool prevCharIsCR ;
-  bool prevCharIsLF ;
-  int available;
-  int maxNextCharInd;
-  int inBuf ;
-  int tabSize ;
-  bool trackLineColumn;
+  int*               bufline;
+  int*               bufcolumn;
+  JAVACC_CHAR_TYPE*  buffer;
+  int                bufpos;
+  int                bufsize;
+  int                tokenBegin;
+  int                column;
+  int                line;
+  bool               prevCharIsCR;
+  bool               prevCharIsLF;
+  int                available;
+  int                maxNextCharInd;
+  int                inBuf;
+  int                tabSize;
+  bool               trackLineColumn;
+  ReaderStream*      inputStream;
+  bool               deleteStream;
 };
 
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=5eaf75ef6a2c7859369c80cf6fd037e0 (do not edit this line) */
+/* JavaCC - OriginalChecksum=3f0e693d1617236429891c8c95713d73 (do not edit this line) */
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index 7500a5f..9f7dc07 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */
 #ifndef ERRORHANDLER_H
 #define ERRORHANDLER_H
+#include <stdio.h>
 #include <string>
 #include "JavaCC.h"
 #include "Token.h"
@@ -30,7 +31,7 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
       // Called when the parser cannot continue parsing.
       // last - the last token successfully parsed.
       // unexpected - the token at which the error occurs.
-      // production - the production in which this error occurs.
+      // production - the production in which this error occurrs.
       virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser) {
         error_count++;
         fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str());
@@ -75,4 +76,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
 }
 
 #endif
-/* JavaCC - OriginalChecksum=685d19cb4cd943b60089f599e45f23ad (do not edit this line) */
+/* JavaCC - OriginalChecksum=c18f1105ba178be8e21cc9f279f94496 (do not edit this line) */
diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc
index 99649af..6ef9738 100644
--- a/vhdlparser/ParseException.cc
+++ b/vhdlparser/ParseException.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "ParseException.h"
 
@@ -53,7 +53,7 @@ namespace parser {
   /**
    * This is the last token that has been consumed successfully.  If
    * this object has been created due to a parse error, the token
-   * following this token will (therefore) be the first error token.
+   * followng this token will (therefore) be the first error token.
    */
   Token currentToken;
 
@@ -141,8 +141,6 @@ namespace parser {
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))
         {
-           case 0 :
-              continue;
            case '\b':
               retval.append("\\b");
               continue;
@@ -183,4 +181,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=99d488e13335cf377284c90700f070ed (do not edit this line) */
+/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */
diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h
index b025912..c36613f 100644
--- a/vhdlparser/ParseException.h
+++ b/vhdlparser/ParseException.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef _PARSE_EXCEPTION_H
 #define _PARSE_EXCEPTION_H
@@ -50,7 +50,7 @@ class ParseException {
   /**
    * This is the last token that has been consumed successfully.  If
    * this object has been created due to a parse error, the token
-   * following this token will (therefore) be the first error token.
+   * followng this token will (therefore) be the first error token.
    */
   Token currentToken;
 
@@ -96,4 +96,4 @@ class ParseException {
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=8c47c56fc2030f05b43e20cae6ca5d66 (do not edit this line) */
+/* JavaCC - OriginalChecksum=bd87c2fc11a4306bd2c2482fd1025b7c (do not edit this line) */
diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc
index 62a8169..735091d 100644
--- a/vhdlparser/Token.cc
+++ b/vhdlparser/Token.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #include "Token.h"
 
@@ -89,4 +89,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=9db9ca693072c4c37bb7cc933c0c5e35 (do not edit this line) */
+/* JavaCC - OriginalChecksum=dcb0f64486aa6455ae5af05d6bb539ec (do not edit this line) */
diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h
index 5fce69f..040899e 100644
--- a/vhdlparser/Token.h
+++ b/vhdlparser/Token.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #ifndef TOKEN_H
 #define TOKEN_H
@@ -86,12 +86,13 @@ class Token
    */
   Token(int kind, JAVACC_STRING_TYPE image);
 
+  virtual ~Token();
+
   /**
    * Returns the image.
    */
   JAVACC_STRING_TYPE toString();
 
-  public: virtual ~Token();
 
   /**
    * Returns a new Token void *, by default. However, if you want, you
@@ -113,4 +114,4 @@ class Token
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=2f5eb1c937adc983dfa2008c4fe383a7 (do not edit this line) */
+/* JavaCC - OriginalChecksum=4748c3d6443aa3445d3c95ab54f14c2a (do not edit this line) */
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index df371d9..0c2caa6 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -1,10 +1,12 @@
-/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef TOKENMANAGER_H
 #define TOKENMANAGER_H
+#include <iostream>
 #include "JavaCC.h"
 #include "Token.h"
 
+using namespace std;
 
 namespace vhdl {
 namespace parser {
@@ -19,10 +21,10 @@ public:
   /** This gets the next token from the input stream.
    *  A token of kind 0 (<EOF>) should be returned on EOF.
    */
-  public: virtual Token *getNextToken() = 0;
-  public: virtual ~TokenManager() { }
-  public: virtual void lexicalError() {
-    fprintf(stderr, "Lexical error encountered.\n");
+  virtual       ~TokenManager() { }
+  virtual Token *getNextToken() = 0;
+  virtual void   lexicalError() {
+  	cerr << "Lexical error encountered." << endl;
   }
 
 };
@@ -30,4 +32,4 @@ public:
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=9e6cfa00cefe7e342b80eb59f1a114ff (do not edit this line) */
+/* JavaCC - OriginalChecksum=918e2eba53e028d6c4142283ce3f498f (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index 9093e6e..74908f0 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "TokenMgrError.h"
 
@@ -64,7 +64,7 @@ namespace parser {
 // i < 16 - guaranteed
 char hexChar(int i) {
   if (i < 10) {
-    return i - '0';
+    return i + '0';
   }
   return 'a' + (i - 10);
 }
@@ -79,9 +79,6 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
     JAVACC_CHAR_TYPE ch = str[i];
     switch (ch)
     {
-      case 0 :
-        retval += EMPTY[0];
-        continue;
       case '\b':
         retval.append("\\b");
         continue;
@@ -118,4 +115,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
 
 }
 }
-/* JavaCC - OriginalChecksum=2bf63f131c8e60fd30c70d0b4f660016 (do not edit this line) */
+/* JavaCC - OriginalChecksum=72f292bc267bd0602e63291bf864f942 (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h
index 2702b29..abb305d 100644
--- a/vhdlparser/TokenMgrError.h
+++ b/vhdlparser/TokenMgrError.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef _TOKENMGRERROR_H
 #define _TOKENMGRERROR_H
@@ -8,7 +8,7 @@
 namespace vhdl {
 namespace parser {
 
- enum LexerErrors {
+enum LexerErrors {
   /**
    * Lexical error occurred.
    */
@@ -28,11 +28,10 @@ namespace parser {
    * Detected (and bailed out of) an infinite loop in the token manager.
    */
   LOOP_DETECTED = 3,
-  };
+};
 
-class TokenMgrError
-{
-  public:
+class TokenMgrError {
+public:
   /*
    * Ordinals for various reasons why an Error of this type can be thrown.
    */
@@ -57,7 +56,8 @@ class TokenMgrError
    */
     JAVACC_STRING_TYPE LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar);
 
-  private: JAVACC_STRING_TYPE message;
+private:
+   JAVACC_STRING_TYPE message;
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -68,6 +68,7 @@ class TokenMgrError
    *
    * from this method for such cases in the release version of your parser.
    */
+public:
   JAVACC_STRING_TYPE getMessage() ;
 
   /*
@@ -75,16 +76,16 @@ class TokenMgrError
    */
 
   /** No arg constructor. */
-  public: TokenMgrError() ;
+  TokenMgrError() ;
 
   /** Constructor with message and reason. */
-  public: TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
+  TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
 
   /** Full Constructor. */
-  public: TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
+  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
 };
 
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=c7d825cb4d037b031ae43569d383f738 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c22a1b25630ec91deb47dcba22b6b39d (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index aa0847a..2abe6c6 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -1,5 +1,6 @@
 /* VhdlParser.cc */
-#include "./VhdlParser.h"
+#include "VhdlParser.h"
+#include "TokenMgrError.h"
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
@@ -61,7 +62,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if (!hasError) {
@@ -75,7 +76,7 @@ QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if
     
 str=tok->image.c_str(); return str+str1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::actual_designator() {QCString str;Token *t=0;
@@ -117,7 +118,7 @@ return str;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) {
@@ -127,7 +128,7 @@ QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::actual_part() {QCString s,s1;
@@ -186,7 +187,7 @@ s+="(";s+=s1+")";return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::adding_operator() {
@@ -230,7 +231,7 @@ return "&";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) {
@@ -275,7 +276,7 @@ s+=","+s1;
     
 return "("+s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::alias_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -357,7 +358,7 @@ addVhdlType(s2.data(),getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlDocGen::ALIAS,0,s
 
  return s2+" "+s+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::alias_designator() {Token *tok=0;QCString s;
@@ -402,7 +403,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::allocator() {
@@ -434,7 +435,7 @@ void VhdlParser::allocator() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) {
@@ -527,7 +528,7 @@ error_skipto(BEGIN_T);
     }
     
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::architecture_declarative_part() {if (!hasError) {
@@ -567,7 +568,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) {
     end_label_2: ;
     }
     
-  }
+}
 
 
 void VhdlParser::architecture_statement_part() {if (!hasError) {
@@ -600,7 +601,7 @@ void VhdlParser::architecture_statement_part() {if (!hasError) {
     end_label_3: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::array_type_definition() {QCString s;
@@ -633,7 +634,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
@@ -688,7 +689,7 @@ s.prepend("assert ");
    if(t1) s2.prepend(" report ");
     return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!hasError) {
@@ -723,7 +724,7 @@ QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!has
 if(t) s+=":";
     return s+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
@@ -748,7 +749,7 @@ QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
     
 return s+" => "+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) {
@@ -785,7 +786,7 @@ s+=","+s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) {
@@ -812,7 +813,7 @@ QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) {
 addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public);
     return " attribute "+s+":"+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_designator() {QCString s;Token *tok=0;
@@ -846,7 +847,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_name() {QCString s,s1;if (!hasError) {
@@ -895,7 +896,7 @@ s+"("+s1+")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_specification() {QCString s,s1,s2;if (!hasError) {
@@ -931,7 +932,7 @@ QCString t= s1+" is "+s2;
    addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public);
    return " attribute "+s+" of "+s1+ " is "+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::base() {Token *tok=0;if (!hasError) {
@@ -941,7 +942,7 @@ QCString VhdlParser::base() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) {
@@ -951,7 +952,7 @@ QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) {
@@ -961,7 +962,7 @@ QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) {
@@ -971,7 +972,7 @@ QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) {
@@ -981,7 +982,7 @@ QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) {
@@ -991,7 +992,7 @@ QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::binding_indication() {if (!hasError) {
@@ -1044,7 +1045,7 @@ void VhdlParser::binding_indication() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) {
@@ -1054,7 +1055,7 @@ QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) {
@@ -1064,7 +1065,7 @@ QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::block_configuration() {if (!hasError) {
@@ -1126,7 +1127,7 @@ void VhdlParser::block_configuration() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::block_declarative_item() {
@@ -1260,7 +1261,7 @@ void VhdlParser::block_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::block_declarative_part() {if (!hasError) {
@@ -1300,7 +1301,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) {
     end_label_7: ;
     }
     
-  }
+}
 
 
 void VhdlParser::block_header() {if (!hasError) {
@@ -1368,7 +1369,7 @@ void VhdlParser::block_header() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::block_specification() {if (!hasError) {
@@ -1399,7 +1400,7 @@ void VhdlParser::block_specification() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::block_statement() {QCString s;if (!hasError) {
@@ -1502,7 +1503,7 @@ pushLabel(genLabels,s);
     }
     
 genLabels=popLabel(genLabels);
-  }
+}
 
 
 void VhdlParser::block_statement_part() {if (!hasError) {
@@ -1535,7 +1536,7 @@ void VhdlParser::block_statement_part() {if (!hasError) {
     end_label_8: ;
     }
     
-  }
+}
 
 
 void VhdlParser::case_statement() {QCString s;if (!hasError) {
@@ -1629,7 +1630,7 @@ QCString ca="case "+s;
     
 FlowChart::moveToPrevLevel();
          FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
-  }
+}
 
 
 void VhdlParser::case_statement_alternative() {QCString s;if (!hasError) {
@@ -1656,7 +1657,7 @@ QCString t="when ";
     }
     
 FlowChart::moveToPrevLevel();
-  }
+}
 
 
 QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) {
@@ -1666,7 +1667,7 @@ QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::choice() {QCString s;
@@ -1717,7 +1718,7 @@ return " others ";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::choices() {QCString s,s1;if (!hasError) {
@@ -1754,7 +1755,7 @@ s+="|";s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::component_configuration() {if (!hasError) {
@@ -1815,7 +1816,7 @@ void VhdlParser::component_configuration() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::component_declaration() {QCString s;if (!hasError) {
@@ -1909,7 +1910,7 @@ addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPON
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::component_instantiation_statement() {QCString s,s1;if (!hasError) {
@@ -1965,7 +1966,7 @@ QCString s3;
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::component_specification() {if (!hasError) {
@@ -1981,7 +1982,7 @@ void VhdlParser::component_specification() {if (!hasError) {
     name();
     }
     
-  }
+}
 
 
 QCString VhdlParser::composite_type_definition() {QCString s,s1;
@@ -2014,7 +2015,7 @@ return s+"#";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
@@ -2056,7 +2057,7 @@ void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
@@ -2098,7 +2099,7 @@ void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
@@ -2155,7 +2156,7 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::concurrent_statement() {
@@ -2222,7 +2223,7 @@ void VhdlParser::concurrent_statement() {
         }
       }
     }
-  }
+}
 
 
 QCString VhdlParser::condition() {QCString s;if (!hasError) {
@@ -2232,7 +2233,7 @@ QCString VhdlParser::condition() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::condition_clause() {QCString s;if (!hasError) {
@@ -2246,7 +2247,7 @@ QCString VhdlParser::condition_clause() {QCString s;if (!hasError) {
     
 return " until "+s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::conditional_signal_assignment() {if (!hasError) {
@@ -2270,7 +2271,7 @@ void VhdlParser::conditional_signal_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::conditional_waveforms() {if (!hasError) {
@@ -2324,7 +2325,7 @@ void VhdlParser::conditional_waveforms() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::configuration_declaration() {QCString s,s1;if (!hasError) {
@@ -2403,7 +2404,7 @@ confName=s+"::"+s1;
     }
     
 genLabels.resize(0); confName="";
-  }
+}
 
 
 void VhdlParser::configuration_declarative_item() {
@@ -2434,7 +2435,7 @@ void VhdlParser::configuration_declarative_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::configuration_declarative_part() {if (!hasError) {
@@ -2459,7 +2460,7 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) {
     end_label_12: ;
     }
     
-  }
+}
 
 
 void VhdlParser::configuration_item() {
@@ -2483,7 +2484,7 @@ void VhdlParser::configuration_item() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::configuration_specification() {if (!hasError) {
@@ -2503,7 +2504,7 @@ void VhdlParser::configuration_specification() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!hasError) {
@@ -2553,7 +2554,7 @@ if(t)
      it.prepend("constant ");
      return it;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) {
@@ -2575,7 +2576,7 @@ QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError)
     
 return s+" "+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::context_clause() {if (!hasError) {
@@ -2599,7 +2600,7 @@ void VhdlParser::context_clause() {if (!hasError) {
     end_label_13: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::constraint() {QCString s;
@@ -2626,7 +2627,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::context_item() {
@@ -2650,7 +2651,7 @@ void VhdlParser::context_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) {
@@ -2660,7 +2661,7 @@ QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::delay_mechanism() {QCString s;
@@ -2717,7 +2718,7 @@ return s+" inertial ";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::design_file() {
@@ -2772,7 +2773,7 @@ void VhdlParser::design_file() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::design_unit() {if (!hasError) {
@@ -2784,7 +2785,7 @@ void VhdlParser::design_unit() {if (!hasError) {
     library_unit();
     }
     
-  }
+}
 
 
 QCString VhdlParser::designator() {QCString s;
@@ -2818,7 +2819,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::direction() {Token *tok=0;
@@ -2851,7 +2852,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::disconnection_specification() {if (!hasError) {
@@ -2875,7 +2876,7 @@ void VhdlParser::disconnection_specification() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
@@ -2891,7 +2892,7 @@ void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
     name();
     }
     
-  }
+}
 
 
 QCString VhdlParser::discrete_range() {QCString s;
@@ -2918,7 +2919,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) {
@@ -2945,7 +2946,7 @@ if(!s.isEmpty())
  return s+"=>"+s1;
 return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) {
@@ -2969,7 +2970,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(
   //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
   return s+":"+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_aspect() {Token *tok=0;QCString s,s1;
@@ -3048,7 +3049,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_class() {
@@ -3246,7 +3247,7 @@ return "file";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_class_entry() {QCString s;if (!hasError) {
@@ -3275,7 +3276,7 @@ s+="<>";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;if (!hasError) {
@@ -3319,7 +3320,7 @@ s2+=",";s2+=s;
     
 return s1+s2;
 assert(false);
-  }
+}
 
 
 void VhdlParser::entity_declaration() {QCString s;if (!hasError) {
@@ -3410,7 +3411,7 @@ lastEntity=current.get();
     }
     
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::entity_declarative_item() {
@@ -3555,7 +3556,7 @@ void VhdlParser::entity_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::entity_declarative_part() {if (!hasError) {
@@ -3595,7 +3596,7 @@ void VhdlParser::entity_declarative_part() {if (!hasError) {
     end_label_16: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
@@ -3620,7 +3621,7 @@ QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
     
 return s+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::entity_header() {if (!hasError) {
@@ -3662,7 +3663,7 @@ currP=VhdlDocGen::PORT;
     }
     }
     
-  }
+}
 
 
 QCString VhdlParser::entity_name_list() {QCString s,s1;
@@ -3733,7 +3734,7 @@ return "all";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) {
@@ -3751,7 +3752,7 @@ QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) {
     
 return s+":"+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::entity_statement() {
@@ -3784,7 +3785,7 @@ void VhdlParser::entity_statement() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::entity_statement_part() {if (!hasError) {
@@ -3813,7 +3814,7 @@ void VhdlParser::entity_statement_part() {if (!hasError) {
     end_label_18: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::entity_tag() {QCString s;
@@ -3849,7 +3850,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::enumeration_literal() {QCString s;
@@ -3883,7 +3884,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError) {
@@ -3928,7 +3929,7 @@ s+=",";s+=s1;
     
 return "("+s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
@@ -4002,7 +4003,7 @@ lab.resize(0);
 
   return s+s1+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) {
@@ -4044,7 +4045,7 @@ s+=s1;s+=s2;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::logop() {
@@ -4121,7 +4122,7 @@ return "or" ;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) {
@@ -4131,7 +4132,7 @@ QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) {
     
 return t->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::factor() {QCString s,s1;
@@ -4217,7 +4218,7 @@ s1="not ";return s1+s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) {
@@ -4261,7 +4262,7 @@ QCString t1=s2+" "+s3;
    addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public);
    return " file "+s+":"+s2+" "+s3+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) {
@@ -4271,7 +4272,7 @@ QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
@@ -4304,7 +4305,7 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
     
 s2="open "+s+" is "+s1;  return s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) {
@@ -4322,7 +4323,7 @@ QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) {
     
 s1=" file of "+s; return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) {
@@ -4332,7 +4333,7 @@ QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::formal_designator() {QCString s;Token *tok=0;
@@ -4368,7 +4369,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) {
@@ -4378,7 +4379,7 @@ QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::formal_part() {QCString s,s1;if (!hasError) {
@@ -4415,7 +4416,7 @@ s+"("+s1+")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) {
@@ -4471,7 +4472,7 @@ if (s2.contains("#")) {
       tmpEntry=0;
       return "type "+s+" is "+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) {
@@ -4493,7 +4494,7 @@ QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) {
     
 return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 void VhdlParser::generate_statement() {QCString s;if (!hasError) {
@@ -4557,7 +4558,7 @@ error_skipto(GENERATE_T);
     }
     
 genLabels=popLabel(genLabels);
-  }
+}
 
 
 void VhdlParser::generate_scheme() {
@@ -4589,7 +4590,7 @@ void VhdlParser::generate_scheme() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::generic_clause() {QCString s;if (!hasError) {
@@ -4618,7 +4619,7 @@ parse_sec=GEN_SEC;
     }
     
 parse_sec=0;
-  }
+}
 
 
 QCString VhdlParser::generic_list() {QCString s;if (!hasError) {
@@ -4628,7 +4629,7 @@ QCString VhdlParser::generic_list() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::generic_map_aspect() {if (!hasError) {
@@ -4652,7 +4653,7 @@ void VhdlParser::generic_map_aspect() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 QCString VhdlParser::group_constituent() {QCString s;
@@ -4688,7 +4689,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) {
@@ -4728,7 +4729,7 @@ s2+=",";s2+=s1;
     
 return s+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -4766,7 +4767,7 @@ QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) {
     
 return "group "+s+":"+s1+"("+s2+");";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) {
@@ -4800,7 +4801,7 @@ QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError)
     
 return "group "+s+ "is ("+s1+");";
 assert(false);
-  }
+}
 
 
 void VhdlParser::guarded_signal_specification() {if (!hasError) {
@@ -4816,7 +4817,7 @@ void VhdlParser::guarded_signal_specification() {if (!hasError) {
     type_mark();
     }
     
-  }
+}
 
 
 QCString VhdlParser::identifier() {Token *tok=0;
@@ -4849,7 +4850,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) {
@@ -4886,7 +4887,7 @@ str+=",";str+=str1;
     
 return str;
 assert(false);
-  }
+}
 
 
 void VhdlParser::if_statement() {QCString s,s1;if (!hasError) {
@@ -5020,7 +5021,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     
 FlowChart::moveToPrevLevel();
           FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0);
-  }
+}
 
 
 QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) {
@@ -5038,7 +5039,7 @@ QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) {
     
 return "type "+s+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;if (!hasError) {
@@ -5087,7 +5088,7 @@ s+=",";s+=s1;
     
 return s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::index_specification() {QCString s;
@@ -5135,7 +5136,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) {
@@ -5153,7 +5154,7 @@ QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) {
     
 return s+" range <> ";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
@@ -5268,7 +5269,7 @@ s1="configuration ";return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::instantiation_list() {QCString s;Token *tok=0;
@@ -5313,7 +5314,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::integer() {Token *t;if (!hasError) {
@@ -5323,7 +5324,7 @@ QCString VhdlParser::integer() {Token *t;if (!hasError) {
     
 return t->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) {
@@ -5333,7 +5334,7 @@ QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_declaration() {QCString s,s1;
@@ -5422,7 +5423,7 @@ if (parse_sec==GEN_SEC)
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_element() {QCString s;if (!hasError) {
@@ -5432,7 +5433,7 @@ QCString VhdlParser::interface_element() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) {
@@ -5455,7 +5456,7 @@ QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError)
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
    return " file "+s+":"+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) {
@@ -5492,7 +5493,7 @@ s2+=";";s2+=s1;
     
 return s+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;if (!hasError) {
@@ -5640,7 +5641,7 @@ if(tok)
                     } // if component
               return it;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::iteration_scheme() {QCString s;
@@ -5687,7 +5688,7 @@ QCString q=lab+" for "+s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::label() {QCString s;if (!hasError) {
@@ -5697,7 +5698,7 @@ QCString VhdlParser::label() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::library_clause() {QCString s;if (!hasError) {
@@ -5723,7 +5724,7 @@ if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
                    QCString s1="library "+s;
                    return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::library_unit() {QCString s;
@@ -5764,7 +5765,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::literal() {QCString s;
@@ -5826,7 +5827,7 @@ return "null";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::logical_operator() {QCString s;if (!hasError) {
@@ -5836,7 +5837,7 @@ QCString VhdlParser::logical_operator() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) {
@@ -5927,7 +5928,7 @@ QCString q = s+" loop "+s2+" end loop" +s3;
          FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
         return q;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::miscellaneous_operator() {Token *t=0;
@@ -5971,7 +5972,7 @@ return "not";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::mode() {Token *tok=0;
@@ -6037,7 +6038,7 @@ return "linkage";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::multiplying_operation() {Token *tok=0;
@@ -6092,7 +6093,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::name() {QCString s,s1;if (!hasError) {
@@ -6144,7 +6145,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) {
@@ -6173,7 +6174,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) {
@@ -6273,7 +6274,7 @@ s+=")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) {
@@ -6333,7 +6334,7 @@ s+="(";s+=s1;s+=")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::indexed_name() {QCString s,s1,s2;if (!hasError) {
@@ -6386,7 +6387,7 @@ s+=",";s+=s1;
     
 return s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
@@ -6459,7 +6460,7 @@ if(t) s+=":";
   if(t1) s2.prepend("when ");
   return s+s1+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::null_statement() {QCString s;if (!hasError) {
@@ -6497,7 +6498,7 @@ s+=":";
     
 return s+="null";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::numeric_literal() {QCString s;
@@ -6532,7 +6533,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::object_class() {
@@ -6613,7 +6614,7 @@ return "type";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) {
@@ -6623,7 +6624,7 @@ QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::options() {if (!hasError) {
@@ -6659,7 +6660,7 @@ void VhdlParser::options() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::package_body() {QCString s;if (!hasError) {
@@ -6735,7 +6736,7 @@ lastCompound=current.get();
     }
     
 lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::package_body_declarative_item() {
@@ -6823,7 +6824,7 @@ void VhdlParser::package_body_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::package_body_declarative_part() {if (!hasError) {
@@ -6858,7 +6859,7 @@ void VhdlParser::package_body_declarative_part() {if (!hasError) {
     end_label_29: ;
     }
     
-  }
+}
 
 
 void VhdlParser::package_declaration() {QCString s;if (!hasError) {
@@ -6933,7 +6934,7 @@ lastCompound=current.get();
     }
     
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::geninter() {if (!hasError) {
@@ -6975,7 +6976,7 @@ void VhdlParser::geninter() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::package_declarative_item() {
@@ -7120,7 +7121,7 @@ void VhdlParser::package_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::package_declarative_part() {if (!hasError) {
@@ -7160,7 +7161,7 @@ void VhdlParser::package_declarative_part() {if (!hasError) {
     end_label_30: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) {
@@ -7178,7 +7179,7 @@ QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) {
     
 return s+" in "+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
@@ -7199,7 +7200,7 @@ QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
     
 s+=" ";s+=s1;s.prepend(" "); return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError) {
@@ -7267,7 +7268,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public)
     
 return s+"%";
 assert(false);
-  }
+}
 
 
 void VhdlParser::port_clause() {if (!hasError) {
@@ -7292,7 +7293,7 @@ void VhdlParser::port_clause() {if (!hasError) {
     }
     
 currP=0;
-  }
+}
 
 
 QCString VhdlParser::port_list() {QCString s;if (!hasError) {
@@ -7302,7 +7303,7 @@ QCString VhdlParser::port_list() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::port_map_aspect() {if (!hasError) {
@@ -7326,7 +7327,7 @@ void VhdlParser::port_map_aspect() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 QCString VhdlParser::primary() {QCString s,s1;
@@ -7423,7 +7424,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::primary_unit() {
@@ -7470,7 +7471,7 @@ void VhdlParser::primary_unit() {
         }
       }
     }
-  }
+}
 
 
 QCString VhdlParser::procedure_call() {QCString s,s1;if (!hasError) {
@@ -7507,7 +7508,7 @@ s1.prepend("("); s1.append(")");
     
 return s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) {
@@ -7540,7 +7541,7 @@ s+=":";
     
 return s+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::process_declarative_item() {QCString s;
@@ -7695,7 +7696,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) {
@@ -7737,7 +7738,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasError) {
@@ -7922,7 +7923,7 @@ if(s.isEmpty())
   createFlow();
    currName="";
    newEntry();
-  }
+}
 
 
 void VhdlParser::process_statement_part() {if (!hasError) {
@@ -7962,7 +7963,7 @@ void VhdlParser::process_statement_part() {if (!hasError) {
     end_label_33: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::qualified_expression() {QCString s,s1;if (!hasError) {
@@ -8019,7 +8020,7 @@ s+="(";s+=s1;s+=")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::range() {QCString s,s1,s2;
@@ -8054,7 +8055,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) {
@@ -8068,7 +8069,7 @@ QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) {
     
 return " range "+s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::record_type_definition() {if (!hasError) {
@@ -8122,7 +8123,7 @@ void VhdlParser::record_type_definition() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
@@ -8156,7 +8157,7 @@ QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
     
 return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::relation_operator() {
@@ -8233,7 +8234,7 @@ return "/=";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
@@ -8293,7 +8294,7 @@ if(t) s.append(":");
         if(t1) s2.prepend(" severity ");
         return s+s1+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::return_statement() {QCString s,s1;if (!hasError) {
@@ -8361,7 +8362,7 @@ s+=":";
     
 return s+" return "+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::scalar_type_definition() {QCString s,s1;
@@ -8405,7 +8406,7 @@ return s+" "+s1+"%";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::secondary_unit() {
@@ -8429,7 +8430,7 @@ void VhdlParser::secondary_unit() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) {
@@ -8454,7 +8455,7 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError)
 
   return s+"="+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) {
@@ -8472,7 +8473,7 @@ QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) {
     
 return s+"."+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::selected_signal_assignment() {if (!hasError) {
@@ -8508,7 +8509,7 @@ void VhdlParser::selected_signal_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::selected_waveforms() {if (!hasError) {
@@ -8555,7 +8556,7 @@ void VhdlParser::selected_waveforms() {if (!hasError) {
     end_label_35: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) {
@@ -8570,7 +8571,7 @@ QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) {
 s.prepend(" on ");
   return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) {
@@ -8607,7 +8608,7 @@ s+=",";s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) {
@@ -8632,7 +8633,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sequential_statement() {QCString s;
@@ -8766,7 +8767,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
@@ -8800,7 +8801,7 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
     
 return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::shift_operator() {
@@ -8877,7 +8878,7 @@ return "ror";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sign() {
@@ -8910,7 +8911,7 @@ return "-";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
@@ -9004,7 +9005,7 @@ return s+s1+"<="+s2+s3+";";
       }
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::semi() {if (!hasError) {
@@ -9012,7 +9013,7 @@ void VhdlParser::semi() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) {
@@ -9075,7 +9076,7 @@ if(tok)
       s3.prepend(":=");
      s4=s1+s2+s3;
      addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public);
-  }
+}
 
 
 QCString VhdlParser::signal_kind() {
@@ -9108,7 +9109,7 @@ return "bus";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::signal_list() {QCString s,s1;
@@ -9178,7 +9179,7 @@ return "all";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) {
@@ -9260,7 +9261,7 @@ s+="return ";s+=s1;
     
 s1="["+s+"]";return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) {
@@ -9313,7 +9314,7 @@ s+=s1;s+=s2;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::simple_name() {if (!hasError) {
@@ -9321,7 +9322,7 @@ void VhdlParser::simple_name() {if (!hasError) {
     name();
     }
     
-  }
+}
 
 
 QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) {
@@ -9343,7 +9344,7 @@ QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) {
     
 return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) {
@@ -9353,7 +9354,7 @@ QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::subprogram_body() {QCString s;if (!hasError) {
@@ -9426,7 +9427,7 @@ if (s.data())
 tempEntry->endBodyLine=getLine(END_T);
       createFlow();
       currP=0;
-  }
+}
 
 
 void VhdlParser::subprogram_declaration() {
@@ -9461,7 +9462,7 @@ currP=0;
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::subprogram_1() {
@@ -9485,7 +9486,7 @@ void VhdlParser::subprogram_1() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 QCString VhdlParser::subprogram_declarative_item() {QCString s;
@@ -9651,7 +9652,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError) {
@@ -9694,7 +9695,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::subprogram_kind() {
@@ -9718,7 +9719,7 @@ void VhdlParser::subprogram_kind() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t;
@@ -9912,7 +9913,7 @@ tempEntry=current.get();
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::subprogram_statement_part() {if (!hasError) {
@@ -9952,7 +9953,7 @@ void VhdlParser::subprogram_statement_part() {if (!hasError) {
     end_label_42: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) {
@@ -9979,7 +9980,7 @@ QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) {
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public);
   return " subtype "+s+" is "+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
@@ -10011,7 +10012,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
     
 return s+" "+s1+" "+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::suffix() {QCString s;
@@ -10066,7 +10067,7 @@ return " all ";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::target() {QCString s;
@@ -10102,7 +10103,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) {
@@ -10135,7 +10136,7 @@ s+=s1;s+=s2;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) {
@@ -10149,7 +10150,7 @@ QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) {
     
 return " for "+s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) {
@@ -10171,7 +10172,7 @@ QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) {
     
 return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_declaration() {QCString s;
@@ -10204,7 +10205,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_definition() {QCString s;
@@ -10288,7 +10289,7 @@ return "";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_mark() {QCString s;if (!hasError) {
@@ -10298,7 +10299,7 @@ QCString VhdlParser::type_mark() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!hasError) {
@@ -10355,7 +10356,7 @@ s3+=",";s3+=s1;
     
 return "array("+s+s3+") of "+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) {
@@ -10411,7 +10412,7 @@ QCStringList ql1=QCStringList::split(",",s);
                    s1="use "+s;
                    return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
@@ -10479,7 +10480,7 @@ return "";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
@@ -10558,7 +10559,7 @@ int spec;
     addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public);
     return val;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasError) {
@@ -10638,7 +10639,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
 if(t) s.append(":");
   return s+" wait "+s1+s2+s3+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::waveform() {QCString s,s1;
@@ -10713,7 +10714,7 @@ return " unaffected ";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::waveform_element() {QCString s,s1;if (!hasError) {
@@ -10746,7 +10747,7 @@ s1.prepend(" after ");
     
 return s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::protected_type_body() {if (!hasError) {
@@ -10792,7 +10793,7 @@ QCString VhdlParser::protected_type_body() {if (!hasError) {
     
 return "";
 assert(false);
-  }
+}
 
 
 void VhdlParser::protected_type_body_declarative_item() {
@@ -10905,7 +10906,7 @@ void VhdlParser::protected_type_body_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
@@ -10942,7 +10943,7 @@ void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
     end_label_47: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::protected_type_declaration() {if (!hasError) {
@@ -10987,7 +10988,7 @@ error_skipto(END_T);
     
 return "";
 assert(false);
-  }
+}
 
 
 void VhdlParser::protected_type_declarative_item() {
@@ -11021,7 +11022,7 @@ void VhdlParser::protected_type_declarative_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::protected_type_declarative_part() {if (!hasError) {
@@ -11053,7 +11054,7 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) {
     end_label_48: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::context_ref() {QCString s;if (!hasError) {
@@ -11071,7 +11072,7 @@ QCString VhdlParser::context_ref() {QCString s;if (!hasError) {
     
 return "context "+s ;
 assert(false);
-  }
+}
 
 
 void VhdlParser::context_declaration() {QCString s,s1;if (!hasError) {
@@ -11153,7 +11154,7 @@ parse_sec=CONTEXT_SEC;
     
 parse_sec=0;
                           addVhdlType(s.data(),getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,"context",s1.data(),Public);
-  }
+}
 
 
 QCString VhdlParser::libustcont_stats() {QCString s;
@@ -11197,7 +11198,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -11246,7 +11247,7 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasE
     
 QCString q=" is new "+s1+s2;
       addVhdlType(s.data(),getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"package",q.data(),Public);
-  }
+}
 
 
 QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasError) {
@@ -11288,7 +11289,7 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasErro
 current->name=s;
                             return "package "+s+" is new "+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -11339,7 +11340,7 @@ QCString q= " is new "+s1+s2;
       addVhdlType(s.data(),getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public);
     return q;
 assert(false);
-  }
+}
 
 
 void VhdlParser::gen_assoc_list() {if (!hasError) {
@@ -11363,7 +11364,7 @@ void VhdlParser::gen_assoc_list() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 void VhdlParser::gen_interface_list() {if (!hasError) {
@@ -11393,7 +11394,7 @@ void VhdlParser::gen_interface_list() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 void VhdlParser::case_scheme() {if (!hasError) {
@@ -11440,7 +11441,7 @@ void VhdlParser::case_scheme() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::when_stats() {if (!hasError) {
@@ -11490,7 +11491,7 @@ void VhdlParser::when_stats() {if (!hasError) {
     end_label_50: ;
     }
     
-  }
+}
 
 
 void VhdlParser::ttend() {if (!hasError) {
@@ -11518,7 +11519,7 @@ void VhdlParser::ttend() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::generate_statement_body() {if (!hasError) {
@@ -11530,7 +11531,7 @@ void VhdlParser::generate_statement_body() {if (!hasError) {
     generate_statement_body();
     }
     
-  }
+}
 
 
 void VhdlParser::generate_statement_body1() {if (!hasError) {
@@ -11611,7 +11612,7 @@ void VhdlParser::generate_statement_body1() {if (!hasError) {
     end_label_52: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::external_name() {QCString s,s1,s2;if (!hasError) {
@@ -11643,7 +11644,7 @@ QCString t="<<"+s;
                          QCString t1=s1+":"+s2+">>";
                          return   s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sig_stat() {Token *t;
@@ -11687,7 +11688,7 @@ return t->image.data();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::external_pathname() {QCString s;
@@ -11731,7 +11732,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::absolute_pathname() {QCString s,s1;
@@ -11776,7 +11777,7 @@ return "."+s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
@@ -11801,7 +11802,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
     
 return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::neg_list() {QCString s;if (!hasError) {
@@ -11834,7 +11835,7 @@ s+="^.";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
@@ -11870,7 +11871,7 @@ if(!s1.isEmpty())
 
     return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;if (!hasError) {
@@ -11914,7 +11915,7 @@ s2+=s1;s2+=".";
     
 return s+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::package_path_name() {QCString s;if (!hasError) {
@@ -11928,7 +11929,7 @@ QCString VhdlParser::package_path_name() {QCString s;if (!hasError) {
     
 return "@"+s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::conditional_signal_assignment_wave() {
@@ -11956,7 +11957,7 @@ void VhdlParser::conditional_signal_assignment_wave() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
@@ -12016,7 +12017,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::else_wave_list() {if (!hasError) {
@@ -12047,7 +12048,7 @@ void VhdlParser::else_wave_list() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::conditional_force_assignment() {if (!hasError) {
@@ -12125,7 +12126,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::selected_signal_assignment_wave() {
@@ -12149,7 +12150,7 @@ void VhdlParser::selected_signal_assignment_wave() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::selected_variable_assignment() {if (!hasError) {
@@ -12192,7 +12193,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
     sel_var_list();
     }
     
-  }
+}
 
 
 void VhdlParser::select_name() {
@@ -12219,7 +12220,7 @@ void VhdlParser::select_name() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::selected_waveform_assignment() {if (!hasError) {
@@ -12279,7 +12280,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
     sel_wave_list();
     }
     
-  }
+}
 
 
 void VhdlParser::selected_force_assignment() {if (!hasError) {
@@ -12342,7 +12343,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
     sel_var_list();
     }
     
-  }
+}
 
 
 void VhdlParser::sel_var_list() {if (!hasError) {
@@ -12430,7 +12431,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
     end_label_55: ;
     }
     
-  }
+}
 
 
 void VhdlParser::sel_wave_list() {if (!hasError) {
@@ -12473,7 +12474,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::inout_stat() {
@@ -12497,7 +12498,7 @@ void VhdlParser::inout_stat() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::else_stat() {if (!hasError) {
@@ -12543,7 +12544,7 @@ void VhdlParser::else_stat() {if (!hasError) {
     end_label_57: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::interface_subprogram_declaration() {QCString s;
@@ -12578,7 +12579,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) {
@@ -12597,7 +12598,7 @@ QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) {
 current->name=s;
   return "procedure "+s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;if (!hasError) {
@@ -12711,7 +12712,7 @@ QCString q;
                     }
          currP=0;return "";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
@@ -12765,7 +12766,7 @@ if(tok)
                       param_sec=0;
                       return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 void VhdlParser::parseInline() {
@@ -12795,31 +12796,21 @@ void VhdlParser::parseInline() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
  VhdlParser::VhdlParser(TokenManager *tm){
     head = NULL;
+    errorHandlerCreated = false;
     ReInit(tm);
 }
-   VhdlParser::~VhdlParser()
+VhdlParser::~VhdlParser()
 {
-  if (token_source) delete token_source;
-  if (head) {
-    Token *next, *t = head;
-    while (t) {
-      next = t->next;
-      delete t;
-      t = next;
-    }
-  }
-  if (errorHandlerCreated) {
-    delete errorHandler;
-  }
+  clear();
 }
 
 void VhdlParser::ReInit(TokenManager *tm){
-    if (head) delete head;
+    clear();
     errorHandler = new ErrorHandler();
     errorHandlerCreated = true;
     hasError = false;
@@ -12841,6 +12832,24 @@ void VhdlParser::ReInit(TokenManager *tm){
   }
 
 
+void VhdlParser::clear(){
+  //Since token manager was generate from outside,
+  //parser should not take care of deleting
+  //if (token_source) delete token_source;
+  if (head) {
+    Token *next, *t = head;
+    while (t) {
+      next = t->next;
+      delete t;
+      t = next;
+    }
+  }
+  if (errorHandlerCreated) {
+    delete errorHandler;
+  }
+}
+
+
 Token * VhdlParser::jj_consume_token(int kind)  {
     Token *oldToken;
     if ((oldToken = token)->next != NULL) token = token->next;
@@ -12863,7 +12872,8 @@ Token * VhdlParser::jj_consume_token(int kind)  {
     token = oldToken;
     jj_kind = kind;
     JAVACC_STRING_TYPE image = kind >= 0 ? tokenImage[kind] : tokenImage[0];
-    errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this), hasError = true;
+    errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this);
+    hasError = true;
     return token;
   }
 
@@ -12920,26 +12930,23 @@ int VhdlParser::jj_ntk_f(){
   }
 
 
-void VhdlParser::jj_add_error_token(int kind, int pos)  {
+  void VhdlParser::jj_add_error_token(int kind, int pos)  {
   }
 
-  /** Generate ParseException. */
 
  void  VhdlParser::parseError()   {
       fprintf(stderr, "Parse error at: %d:%d, after token: %s encountered: %s\n", token->beginLine, token->beginColumn, addUnicodeEscapes(token->image).c_str(), addUnicodeEscapes(getToken(1)->image).c_str());
    }
 
 
- void VhdlParser::enable_tracing()  {
+  void VhdlParser::enable_tracing()  {
   }
 
-  /** Disable tracing. */
-
- void VhdlParser::disable_tracing()  {
+  void VhdlParser::disable_tracing()  {
   }
 
 
-void VhdlParser::jj_rescan_token(){
+  void VhdlParser::jj_rescan_token(){
     jj_rescan = true;
     for (int i = 0; i < 115; i++) {
       JJCalls *p = &jj_2_rtns[i];
@@ -13071,7 +13078,7 @@ void VhdlParser::jj_rescan_token(){
   }
 
 
-void VhdlParser::jj_save(int index, int xla){
+  void VhdlParser::jj_save(int index, int xla){
     JJCalls *p = &jj_2_rtns[index];
     while (p->gen > jj_gen) {
       if (p->next == NULL) { p = p->next = new JJCalls(); break; }
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 3cd383a..89dfe71 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -12,12 +12,12 @@
 namespace vhdl {
 namespace parser {
   struct JJCalls {
-    int gen;
-    Token *first;
-    int arg;
-    JJCalls *next;
+    int        gen;
+    int        arg;
+    JJCalls*   next;
+    Token*     first;
     ~JJCalls() { if (next) delete next; }
-    JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
+     JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
   };
 
 class VhdlParser {
@@ -582,7 +582,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_1() || jj_done;
+    return (!jj_3_1() || jj_done);
  { jj_save(0, xla); }
   }
 
@@ -590,7 +590,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_2() || jj_done;
+    return (!jj_3_2() || jj_done);
  { jj_save(1, xla); }
   }
 
@@ -598,7 +598,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_3() || jj_done;
+    return (!jj_3_3() || jj_done);
  { jj_save(2, xla); }
   }
 
@@ -606,7 +606,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_4() || jj_done;
+    return (!jj_3_4() || jj_done);
  { jj_save(3, xla); }
   }
 
@@ -614,7 +614,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_5() || jj_done;
+    return (!jj_3_5() || jj_done);
  { jj_save(4, xla); }
   }
 
@@ -622,7 +622,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_6() || jj_done;
+    return (!jj_3_6() || jj_done);
  { jj_save(5, xla); }
   }
 
@@ -630,7 +630,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_7() || jj_done;
+    return (!jj_3_7() || jj_done);
  { jj_save(6, xla); }
   }
 
@@ -638,7 +638,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_8() || jj_done;
+    return (!jj_3_8() || jj_done);
  { jj_save(7, xla); }
   }
 
@@ -646,7 +646,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_9() || jj_done;
+    return (!jj_3_9() || jj_done);
  { jj_save(8, xla); }
   }
 
@@ -654,7 +654,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_10() || jj_done;
+    return (!jj_3_10() || jj_done);
  { jj_save(9, xla); }
   }
 
@@ -662,7 +662,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_11() || jj_done;
+    return (!jj_3_11() || jj_done);
  { jj_save(10, xla); }
   }
 
@@ -670,7 +670,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_12() || jj_done;
+    return (!jj_3_12() || jj_done);
  { jj_save(11, xla); }
   }
 
@@ -678,7 +678,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_13() || jj_done;
+    return (!jj_3_13() || jj_done);
  { jj_save(12, xla); }
   }
 
@@ -686,7 +686,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_14() || jj_done;
+    return (!jj_3_14() || jj_done);
  { jj_save(13, xla); }
   }
 
@@ -694,7 +694,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_15() || jj_done;
+    return (!jj_3_15() || jj_done);
  { jj_save(14, xla); }
   }
 
@@ -702,7 +702,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_16() || jj_done;
+    return (!jj_3_16() || jj_done);
  { jj_save(15, xla); }
   }
 
@@ -710,7 +710,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_17() || jj_done;
+    return (!jj_3_17() || jj_done);
  { jj_save(16, xla); }
   }
 
@@ -718,7 +718,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_18() || jj_done;
+    return (!jj_3_18() || jj_done);
  { jj_save(17, xla); }
   }
 
@@ -726,7 +726,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_19() || jj_done;
+    return (!jj_3_19() || jj_done);
  { jj_save(18, xla); }
   }
 
@@ -734,7 +734,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_20() || jj_done;
+    return (!jj_3_20() || jj_done);
  { jj_save(19, xla); }
   }
 
@@ -742,7 +742,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_21() || jj_done;
+    return (!jj_3_21() || jj_done);
  { jj_save(20, xla); }
   }
 
@@ -750,7 +750,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_22() || jj_done;
+    return (!jj_3_22() || jj_done);
  { jj_save(21, xla); }
   }
 
@@ -758,7 +758,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_23() || jj_done;
+    return (!jj_3_23() || jj_done);
  { jj_save(22, xla); }
   }
 
@@ -766,7 +766,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_24() || jj_done;
+    return (!jj_3_24() || jj_done);
  { jj_save(23, xla); }
   }
 
@@ -774,7 +774,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_25() || jj_done;
+    return (!jj_3_25() || jj_done);
  { jj_save(24, xla); }
   }
 
@@ -782,7 +782,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_26() || jj_done;
+    return (!jj_3_26() || jj_done);
  { jj_save(25, xla); }
   }
 
@@ -790,7 +790,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_27() || jj_done;
+    return (!jj_3_27() || jj_done);
  { jj_save(26, xla); }
   }
 
@@ -798,7 +798,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_28() || jj_done;
+    return (!jj_3_28() || jj_done);
  { jj_save(27, xla); }
   }
 
@@ -806,7 +806,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_29() || jj_done;
+    return (!jj_3_29() || jj_done);
  { jj_save(28, xla); }
   }
 
@@ -814,7 +814,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_30() || jj_done;
+    return (!jj_3_30() || jj_done);
  { jj_save(29, xla); }
   }
 
@@ -822,7 +822,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_31() || jj_done;
+    return (!jj_3_31() || jj_done);
  { jj_save(30, xla); }
   }
 
@@ -830,7 +830,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_32() || jj_done;
+    return (!jj_3_32() || jj_done);
  { jj_save(31, xla); }
   }
 
@@ -838,7 +838,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_33() || jj_done;
+    return (!jj_3_33() || jj_done);
  { jj_save(32, xla); }
   }
 
@@ -846,7 +846,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_34() || jj_done;
+    return (!jj_3_34() || jj_done);
  { jj_save(33, xla); }
   }
 
@@ -854,7 +854,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_35() || jj_done;
+    return (!jj_3_35() || jj_done);
  { jj_save(34, xla); }
   }
 
@@ -862,7 +862,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_36() || jj_done;
+    return (!jj_3_36() || jj_done);
  { jj_save(35, xla); }
   }
 
@@ -870,7 +870,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_37() || jj_done;
+    return (!jj_3_37() || jj_done);
  { jj_save(36, xla); }
   }
 
@@ -878,7 +878,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_38() || jj_done;
+    return (!jj_3_38() || jj_done);
  { jj_save(37, xla); }
   }
 
@@ -886,7 +886,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_39() || jj_done;
+    return (!jj_3_39() || jj_done);
  { jj_save(38, xla); }
   }
 
@@ -894,7 +894,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_40() || jj_done;
+    return (!jj_3_40() || jj_done);
  { jj_save(39, xla); }
   }
 
@@ -902,7 +902,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_41() || jj_done;
+    return (!jj_3_41() || jj_done);
  { jj_save(40, xla); }
   }
 
@@ -910,7 +910,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_42() || jj_done;
+    return (!jj_3_42() || jj_done);
  { jj_save(41, xla); }
   }
 
@@ -918,7 +918,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_43() || jj_done;
+    return (!jj_3_43() || jj_done);
  { jj_save(42, xla); }
   }
 
@@ -926,7 +926,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_44() || jj_done;
+    return (!jj_3_44() || jj_done);
  { jj_save(43, xla); }
   }
 
@@ -934,7 +934,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_45() || jj_done;
+    return (!jj_3_45() || jj_done);
  { jj_save(44, xla); }
   }
 
@@ -942,7 +942,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_46() || jj_done;
+    return (!jj_3_46() || jj_done);
  { jj_save(45, xla); }
   }
 
@@ -950,7 +950,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_47() || jj_done;
+    return (!jj_3_47() || jj_done);
  { jj_save(46, xla); }
   }
 
@@ -958,7 +958,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_48() || jj_done;
+    return (!jj_3_48() || jj_done);
  { jj_save(47, xla); }
   }
 
@@ -966,7 +966,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_49() || jj_done;
+    return (!jj_3_49() || jj_done);
  { jj_save(48, xla); }
   }
 
@@ -974,7 +974,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_50() || jj_done;
+    return (!jj_3_50() || jj_done);
  { jj_save(49, xla); }
   }
 
@@ -982,7 +982,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_51() || jj_done;
+    return (!jj_3_51() || jj_done);
  { jj_save(50, xla); }
   }
 
@@ -990,7 +990,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_52() || jj_done;
+    return (!jj_3_52() || jj_done);
  { jj_save(51, xla); }
   }
 
@@ -998,7 +998,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_53() || jj_done;
+    return (!jj_3_53() || jj_done);
  { jj_save(52, xla); }
   }
 
@@ -1006,7 +1006,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_54() || jj_done;
+    return (!jj_3_54() || jj_done);
  { jj_save(53, xla); }
   }
 
@@ -1014,7 +1014,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_55() || jj_done;
+    return (!jj_3_55() || jj_done);
  { jj_save(54, xla); }
   }
 
@@ -1022,7 +1022,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_56() || jj_done;
+    return (!jj_3_56() || jj_done);
  { jj_save(55, xla); }
   }
 
@@ -1030,7 +1030,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_57() || jj_done;
+    return (!jj_3_57() || jj_done);
  { jj_save(56, xla); }
   }
 
@@ -1038,7 +1038,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_58() || jj_done;
+    return (!jj_3_58() || jj_done);
  { jj_save(57, xla); }
   }
 
@@ -1046,7 +1046,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_59() || jj_done;
+    return (!jj_3_59() || jj_done);
  { jj_save(58, xla); }
   }
 
@@ -1054,7 +1054,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_60() || jj_done;
+    return (!jj_3_60() || jj_done);
  { jj_save(59, xla); }
   }
 
@@ -1062,7 +1062,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_61() || jj_done;
+    return (!jj_3_61() || jj_done);
  { jj_save(60, xla); }
   }
 
@@ -1070,7 +1070,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_62() || jj_done;
+    return (!jj_3_62() || jj_done);
  { jj_save(61, xla); }
   }
 
@@ -1078,7 +1078,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_63() || jj_done;
+    return (!jj_3_63() || jj_done);
  { jj_save(62, xla); }
   }
 
@@ -1086,7 +1086,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_64() || jj_done;
+    return (!jj_3_64() || jj_done);
  { jj_save(63, xla); }
   }
 
@@ -1094,7 +1094,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_65() || jj_done;
+    return (!jj_3_65() || jj_done);
  { jj_save(64, xla); }
   }
 
@@ -1102,7 +1102,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_66() || jj_done;
+    return (!jj_3_66() || jj_done);
  { jj_save(65, xla); }
   }
 
@@ -1110,7 +1110,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_67() || jj_done;
+    return (!jj_3_67() || jj_done);
  { jj_save(66, xla); }
   }
 
@@ -1118,7 +1118,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_68() || jj_done;
+    return (!jj_3_68() || jj_done);
  { jj_save(67, xla); }
   }
 
@@ -1126,7 +1126,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_69() || jj_done;
+    return (!jj_3_69() || jj_done);
  { jj_save(68, xla); }
   }
 
@@ -1134,7 +1134,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_70() || jj_done;
+    return (!jj_3_70() || jj_done);
  { jj_save(69, xla); }
   }
 
@@ -1142,7 +1142,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_71() || jj_done;
+    return (!jj_3_71() || jj_done);
  { jj_save(70, xla); }
   }
 
@@ -1150,7 +1150,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_72() || jj_done;
+    return (!jj_3_72() || jj_done);
  { jj_save(71, xla); }
   }
 
@@ -1158,7 +1158,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_73() || jj_done;
+    return (!jj_3_73() || jj_done);
  { jj_save(72, xla); }
   }
 
@@ -1166,7 +1166,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_74() || jj_done;
+    return (!jj_3_74() || jj_done);
  { jj_save(73, xla); }
   }
 
@@ -1174,7 +1174,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_75() || jj_done;
+    return (!jj_3_75() || jj_done);
  { jj_save(74, xla); }
   }
 
@@ -1182,7 +1182,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_76() || jj_done;
+    return (!jj_3_76() || jj_done);
  { jj_save(75, xla); }
   }
 
@@ -1190,7 +1190,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_77() || jj_done;
+    return (!jj_3_77() || jj_done);
  { jj_save(76, xla); }
   }
 
@@ -1198,7 +1198,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_78() || jj_done;
+    return (!jj_3_78() || jj_done);
  { jj_save(77, xla); }
   }
 
@@ -1206,7 +1206,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_79() || jj_done;
+    return (!jj_3_79() || jj_done);
  { jj_save(78, xla); }
   }
 
@@ -1214,7 +1214,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_80() || jj_done;
+    return (!jj_3_80() || jj_done);
  { jj_save(79, xla); }
   }
 
@@ -1222,7 +1222,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_81() || jj_done;
+    return (!jj_3_81() || jj_done);
  { jj_save(80, xla); }
   }
 
@@ -1230,7 +1230,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_82() || jj_done;
+    return (!jj_3_82() || jj_done);
  { jj_save(81, xla); }
   }
 
@@ -1238,7 +1238,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_83() || jj_done;
+    return (!jj_3_83() || jj_done);
  { jj_save(82, xla); }
   }
 
@@ -1246,7 +1246,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_84() || jj_done;
+    return (!jj_3_84() || jj_done);
  { jj_save(83, xla); }
   }
 
@@ -1254,7 +1254,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_85() || jj_done;
+    return (!jj_3_85() || jj_done);
  { jj_save(84, xla); }
   }
 
@@ -1262,7 +1262,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_86() || jj_done;
+    return (!jj_3_86() || jj_done);
  { jj_save(85, xla); }
   }
 
@@ -1270,7 +1270,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_87() || jj_done;
+    return (!jj_3_87() || jj_done);
  { jj_save(86, xla); }
   }
 
@@ -1278,7 +1278,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_88() || jj_done;
+    return (!jj_3_88() || jj_done);
  { jj_save(87, xla); }
   }
 
@@ -1286,7 +1286,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_89() || jj_done;
+    return (!jj_3_89() || jj_done);
  { jj_save(88, xla); }
   }
 
@@ -1294,7 +1294,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_90() || jj_done;
+    return (!jj_3_90() || jj_done);
  { jj_save(89, xla); }
   }
 
@@ -1302,7 +1302,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_91() || jj_done;
+    return (!jj_3_91() || jj_done);
  { jj_save(90, xla); }
   }
 
@@ -1310,7 +1310,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_92() || jj_done;
+    return (!jj_3_92() || jj_done);
  { jj_save(91, xla); }
   }
 
@@ -1318,7 +1318,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_93() || jj_done;
+    return (!jj_3_93() || jj_done);
  { jj_save(92, xla); }
   }
 
@@ -1326,7 +1326,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_94() || jj_done;
+    return (!jj_3_94() || jj_done);
  { jj_save(93, xla); }
   }
 
@@ -1334,7 +1334,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_95() || jj_done;
+    return (!jj_3_95() || jj_done);
  { jj_save(94, xla); }
   }
 
@@ -1342,7 +1342,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_96() || jj_done;
+    return (!jj_3_96() || jj_done);
  { jj_save(95, xla); }
   }
 
@@ -1350,7 +1350,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_97() || jj_done;
+    return (!jj_3_97() || jj_done);
  { jj_save(96, xla); }
   }
 
@@ -1358,7 +1358,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_98() || jj_done;
+    return (!jj_3_98() || jj_done);
  { jj_save(97, xla); }
   }
 
@@ -1366,7 +1366,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_99() || jj_done;
+    return (!jj_3_99() || jj_done);
  { jj_save(98, xla); }
   }
 
@@ -1374,7 +1374,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_100() || jj_done;
+    return (!jj_3_100() || jj_done);
  { jj_save(99, xla); }
   }
 
@@ -1382,7 +1382,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_101() || jj_done;
+    return (!jj_3_101() || jj_done);
  { jj_save(100, xla); }
   }
 
@@ -1390,7 +1390,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_102() || jj_done;
+    return (!jj_3_102() || jj_done);
  { jj_save(101, xla); }
   }
 
@@ -1398,7 +1398,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_103() || jj_done;
+    return (!jj_3_103() || jj_done);
  { jj_save(102, xla); }
   }
 
@@ -1406,7 +1406,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_104() || jj_done;
+    return (!jj_3_104() || jj_done);
  { jj_save(103, xla); }
   }
 
@@ -1414,7 +1414,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_105() || jj_done;
+    return (!jj_3_105() || jj_done);
  { jj_save(104, xla); }
   }
 
@@ -1422,7 +1422,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_106() || jj_done;
+    return (!jj_3_106() || jj_done);
  { jj_save(105, xla); }
   }
 
@@ -1430,7 +1430,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_107() || jj_done;
+    return (!jj_3_107() || jj_done);
  { jj_save(106, xla); }
   }
 
@@ -1438,7 +1438,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_108() || jj_done;
+    return (!jj_3_108() || jj_done);
  { jj_save(107, xla); }
   }
 
@@ -1446,7 +1446,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_109() || jj_done;
+    return (!jj_3_109() || jj_done);
  { jj_save(108, xla); }
   }
 
@@ -1454,7 +1454,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_110() || jj_done;
+    return (!jj_3_110() || jj_done);
  { jj_save(109, xla); }
   }
 
@@ -1462,7 +1462,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_111() || jj_done;
+    return (!jj_3_111() || jj_done);
  { jj_save(110, xla); }
   }
 
@@ -1470,7 +1470,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_112() || jj_done;
+    return (!jj_3_112() || jj_done);
  { jj_save(111, xla); }
   }
 
@@ -1478,7 +1478,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_113() || jj_done;
+    return (!jj_3_113() || jj_done);
  { jj_save(112, xla); }
   }
 
@@ -1486,7 +1486,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_114() || jj_done;
+    return (!jj_3_114() || jj_done);
  { jj_save(113, xla); }
   }
 
@@ -1494,7 +1494,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_115() || jj_done;
+    return (!jj_3_115() || jj_done);
  { jj_save(114, xla); }
   }
 
@@ -8867,39 +8867,46 @@ void parseInline();
     return false;
   }
 
-  public: TokenManager *token_source;
-  public: CharStream *jj_input_stream;
+
+public: 
+  TokenManager *token_source;
+  CharStream   *jj_input_stream;
   /** Current token. */
-  public: Token *token;
+  Token        *token;
   /** Next token. */
-  public: Token *jj_nt;
-  private: int jj_ntk;
-  private: JJCalls jj_2_rtns[116];
-  private: bool jj_rescan;
-  private: int jj_gc;
-  private: Token *jj_scanpos, *jj_lastpos;
-  private: int jj_la;
+  Token        *jj_nt;
+private: 
+  int           jj_ntk;
+  JJCalls       jj_2_rtns[116];
+  bool          jj_rescan;
+  int           jj_gc;
+  Token        *jj_scanpos, *jj_lastpos;
+  int           jj_la;
   /** Whether we are looking ahead. */
-  private: bool jj_lookingAhead;
-  private: bool jj_semLA;
-  private: int jj_gen;
-  private: int jj_la1[294];
-  private: ErrorHandler *errorHandler;
-  private: bool errorHandlerCreated;
-  protected: bool hasError;
-  public: void setErrorHandler(ErrorHandler *eh) {
+  bool          jj_lookingAhead;
+  bool          jj_semLA;
+  int           jj_gen;
+  int           jj_la1[294];
+  ErrorHandler *errorHandler;
+  bool          errorHandlerCreated;
+protected: 
+  bool          hasError;
+public: 
+  void setErrorHandler(ErrorHandler *eh) {
     if (errorHandlerCreated) delete errorHandler;
     errorHandler = eh;
     errorHandlerCreated = false;
   }
- Token *head; 
- public: 
+  Token *head; 
+public: 
 
  VhdlParser(TokenManager *tm);
-   public: virtual ~VhdlParser();
+  virtual ~VhdlParser();
 
 void ReInit(TokenManager *tm);
 
+void clear();
+
 Token * jj_consume_token(int kind);
 
 bool  jj_scan_token(int kind);
@@ -8909,24 +8916,29 @@ Token * getNextToken();
 Token * getToken(int index);
 
 int jj_ntk_f();
- private: int jj_kind;
+private:
+  int jj_kind;
   int **jj_expentries;
   int *jj_expentry;
 
-void jj_add_error_token(int kind, int pos);
+  void jj_add_error_token(int kind, int pos);
+protected:
+  /** Generate ParseException. */
+
+  virtual void  parseError();
+private:
+  int  trace_indent;
+  bool trace_enabled;
 
-protected: virtual void  parseError();
-  private: int trace_indent;
-  private: bool trace_enabled;
-  /** Enable tracing. */
+public:
 
-public: void enable_tracing();
+  void enable_tracing();
 
-public: void disable_tracing();
+  void disable_tracing();
 
-void jj_rescan_token();
+  void jj_rescan_token();
 
-void jj_save(int index, int xla);
+  void jj_save(int index, int xla);
 typedef unsigned long long uint64;
 
 static Entry* current_root;
@@ -8970,8 +8982,10 @@ static  void mapLibPackage( Entry* root);
 static void createFlow();
 static void error_skipto(int kind);
 static void oneLineComment(QCString qcs);
-static void setMultCommentLine();private: bool jj_done;
+static void setMultCommentLine();
 
+private:
+  bool jj_done;
 };
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index a696fa6..11e0ced 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -1,5 +1,6 @@
 /* VhdlParserTokenManager.cc */
-#include "./VhdlParserTokenManager.h"
+#include "VhdlParserTokenManager.h"
+#include "TokenMgrError.h"
 namespace vhdl {
 namespace parser {
 static const unsigned long long jjbitVec0[] = {
@@ -3036,7 +3037,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
             }
          } while(i != startsAt);
       }
-      else if ((int)curChar < 128)
+      else if (curChar < 128)
       {
          unsigned long long l = 1ULL << (curChar & 077);
          (void)l;
@@ -3321,10 +3322,10 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo
 Token * VhdlParserTokenManager::jjFillToken(){
    Token *t;
    JAVACC_STRING_TYPE curTokenImage;
-   int beginLine;
-   int endLine;
-   int beginColumn;
-   int endColumn;
+   int beginLine   = -1;
+   int endLine     = -1;
+   int beginColumn = -1;
+   int endColumn   = -1;
    JAVACC_STRING_TYPE im = jjstrLiteralImages[jjmatchedKind];
    curTokenImage = (im.length() == 0) ? input_stream->GetImage() : im;
    if (input_stream->getTrackLineColumn()) {
@@ -3333,7 +3334,9 @@ Token * VhdlParserTokenManager::jjFillToken(){
      endLine = input_stream->getEndLine();
      endColumn = input_stream->getEndColumn();
    }
-   t = Token::newToken(jjmatchedKind, curTokenImage);
+   t = Token::newToken(jjmatchedKind);
+   t->kind = jjmatchedKind;
+   t->image = curTokenImage;
    t->specialToken = NULL;
    t->next = NULL;
 
@@ -3591,7 +3594,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
 }
   /** Reinitialise parser. */
   void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg) {
-    if (input_stream) delete input_stream;
+    clear();
     jjmatchedPos = jjnewStateCnt = 0;
     curLexState = lexState;
     input_stream = stream;
@@ -3612,10 +3615,17 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
 
   /** Switch to specified lex state. */
   void VhdlParserTokenManager::SwitchTo(int lexState) {
-    if (lexState >= 1 || lexState < 0)
-      assert(false);
-      //throw 1;//new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-    else
+    if (lexState >= 1 || lexState < 0) {
+      JAVACC_STRING_TYPE message;
+#ifdef WIDE_CHAR
+      message += L"Error: Ignoring invalid lexical state : ";
+      message += lexState; message += L". State unchanged.";
+#else
+      message += "Error: Ignoring invalid lexical state : ";
+      message += lexState; message += ". State unchanged.";
+#endif
+      throw new TokenMgrError(message, INVALID_LEXICAL_STATE);
+    } else
       curLexState = lexState;
   }
 
@@ -3623,14 +3633,23 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg)
   {
     input_stream = NULL;
+    errorHandlerCreated = false;
     ReInit(stream, lexState, parserArg);
   }
 
   // Destructor
   VhdlParserTokenManager::~VhdlParserTokenManager () {
-    if (input_stream) delete input_stream;
-    if (errorHandlerCreated) delete errorHandler;
+    clear();
+  }
+
+  // clear
+  void VhdlParserTokenManager::clear() {
+    //Since input_stream was generated outside of TokenManager
+    //TokenManager should not take care of deleting it
+    //if (input_stream) delete input_stream;
+    if (errorHandlerCreated) delete errorHandler;    
   }
 
+
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index e6a7245..8109bf0 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -1,5 +1,6 @@
 #ifndef VHDLPARSERTOKENMANAGER_H
 #define VHDLPARSERTOKENMANAGER_H
+#include "stdio.h"
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
@@ -116,23 +117,27 @@ void  TokenLexicalActions(Token *matchedToken);
   public: virtual ~VhdlParserTokenManager();
   void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
   void SwitchTo(int lexState);
+  void clear();
   const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
   const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
-    JAVACC_CHARSTREAM  *input_stream;
-    int jjrounds[77];
-    int jjstateSet[2 * 77];
-    JAVACC_STRING_TYPE jjimage;
-    JAVACC_STRING_TYPE image;
-    int jjimageLen;
-    int lengthOfMatch;
-    JAVACC_CHAR_TYPE curChar;
-    TokenManagerErrorHandler *errorHandler;
-    bool errorHandlerCreated;
-    public: void setErrorHandler(TokenManagerErrorHandler *eh) {
+  JAVACC_CHARSTREAM*        input_stream;
+  int                       jjrounds[77];
+  int                       jjstateSet[2 * 77];
+  JAVACC_STRING_TYPE        jjimage;
+  JAVACC_STRING_TYPE        image;
+  int                       jjimageLen;
+  int                       lengthOfMatch;
+  JAVACC_CHAR_TYPE          curChar;
+  TokenManagerErrorHandler* errorHandler;
+  bool                      errorHandlerCreated;
+
+public: 
+  void setErrorHandler(TokenManagerErrorHandler *eh) {
       if (errorHandlerCreated && errorHandler != NULL) delete errorHandler;
       errorHandler = eh;
       errorHandlerCreated = false;
     }
+    
 };
 }
 }
-- 
cgit v0.12


From d5a41b029fc13c7f07944260af312a7264215808 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 28 Oct 2019 20:18:10 +0100
Subject: Embed TagInfo struct inside Entry

---
 src/doxygen.cpp    | 94 +++++++++++++++++++++++++++---------------------------
 src/entry.cpp      |  7 ++--
 src/entry.h        |  6 ++--
 src/memberdef.cpp  |  6 ++--
 src/memberdef.h    |  2 +-
 src/tagreader.cpp  | 62 ++++++++++++++++-------------------
 src/util.cpp       |  2 +-
 src/util.h         |  2 +-
 src/vhdldocgen.cpp |  1 -
 9 files changed, 86 insertions(+), 96 deletions(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 2a254ff..9846ecd 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -544,7 +544,7 @@ static void addSTLClasses(const std::unique_ptr<Entry> &root)
 //----------------------------------------------------------------------------
 
 static Definition *findScopeFromQualifiedName(Definition *startScope,const QCString &n,
-                                              FileDef *fileScope,TagInfo *tagInfo);
+                                              FileDef *fileScope,const TagInfo *tagInfo);
 
 static void addPageToContext(PageDef *pd,Entry *root)
 {
@@ -557,7 +557,7 @@ static void addPageToContext(PageDef *pd,Entry *root)
     }
     scope = stripAnonymousNamespaceScope(scope);
     scope+="::"+pd->name();
-    Definition *d = findScopeFromQualifiedName(Doxygen::globalScope,scope,0,root->tagInfo);
+    Definition *d = findScopeFromQualifiedName(Doxygen::globalScope,scope,0,root->tagInfo());
     if (d)
     {
       pd->setPageScope(d);
@@ -588,7 +588,7 @@ static void addRelatedPage(Entry *root)
   PageDef *pd = addRelatedPage(root->name,root->args,doc,root->anchors,
       root->docFile,root->docLine,
       root->sli,
-      gd,root->tagInfo,
+      gd,root->tagInfo(),
       FALSE,
       root->lang
      );
@@ -604,8 +604,8 @@ static void addRelatedPage(Entry *root)
 static void buildGroupListFiltered(const Entry *root,bool additional, bool includeExternal)
 {
   if (root->section==Entry::GROUPDOC_SEC && !root->name.isEmpty() &&
-        ((!includeExternal && root->tagInfo==0) ||
-         ( includeExternal && root->tagInfo!=0))
+        ((!includeExternal && root->tagInfo()==0) ||
+         ( includeExternal && root->tagInfo()!=0))
      )
   {
     if ((root->groupDocType==Entry::GROUPDOC_NORMAL && !additional) ||
@@ -636,10 +636,10 @@ static void buildGroupListFiltered(const Entry *root,bool additional, bool inclu
       }
       else
       {
-        if (root->tagInfo)
+        if (root->tagInfo())
         {
-          gd = createGroupDef(root->fileName,root->startLine,root->name,root->type,root->tagInfo->fileName);
-          gd->setReference(root->tagInfo->tagName);
+          gd = createGroupDef(root->fileName,root->startLine,root->name,root->type,root->tagInfo()->fileName);
+          gd->setReference(root->tagInfo()->tagName);
         }
         else
         {
@@ -689,7 +689,7 @@ static void findGroupScope(const Entry *root)
       }
       scope = stripAnonymousNamespaceScope(scope);
       scope+="::"+gd->name();
-      Definition *d = findScopeFromQualifiedName(Doxygen::globalScope,scope,0,root->tagInfo);
+      Definition *d = findScopeFromQualifiedName(Doxygen::globalScope,scope,0,root->tagInfo());
       if (d)
       {
         gd->setGroupScope(d);
@@ -733,7 +733,7 @@ static void buildFileList(const Entry *root)
 {
   if (((root->section==Entry::FILEDOC_SEC) ||
         ((root->section & Entry::FILE_MASK) && Config_getBool(EXTRACT_ALL))) &&
-      !root->name.isEmpty() && !root->tagInfo // skip any file coming from tag files
+      !root->name.isEmpty() && !root->tagInfo() // skip any file coming from tag files
      )
   {
     bool ambig;
@@ -955,7 +955,7 @@ static Definition *findScope(Entry *root,int level=0)
  *  not found and set the parent/child scope relation if the scope is found.
  */
 static Definition *buildScopeFromQualifiedName(const QCString name,
-                                               int level,SrcLangExt lang,TagInfo *tagInfo)
+                                               int level,SrcLangExt lang,const TagInfo *tagInfo)
 {
   //printf("buildScopeFromQualifiedName(%s) level=%d\n",name.data(),level);
   int i=0;
@@ -1014,7 +1014,7 @@ static Definition *buildScopeFromQualifiedName(const QCString name,
 }
 
 static Definition *findScopeFromQualifiedName(Definition *startScope,const QCString &n,
-                                              FileDef *fileScope,TagInfo *tagInfo)
+                                              FileDef *fileScope,const TagInfo *tagInfo)
 {
   //printf("<findScopeFromQualifiedName(%s,%s)\n",startScope ? startScope->name().data() : 0, n.data());
   Definition *resultScope=startScope;
@@ -1261,7 +1261,7 @@ static void addClassToContext(const Entry *root)
 
     QCString tagName;
     QCString refFileName;
-    TagInfo *tagInfo = root->tagInfo;
+    const TagInfo *tagInfo = root->tagInfo();
     int i;
     if (tagInfo)
     {
@@ -1716,7 +1716,7 @@ static void buildNamespaceList(const Entry *root)
         {
           nd->setLanguage(root->lang);
         }
-        if (root->tagInfo==0) // if we found the namespace in a tag file
+        if (root->tagInfo()==0) // if we found the namespace in a tag file
                                    // and also in a project file, then remove
                                    // the tag file reference
         {
@@ -1736,7 +1736,7 @@ static void buildNamespaceList(const Entry *root)
       {
         QCString tagName;
         QCString tagFileName;
-        TagInfo *tagInfo = root->tagInfo;
+        const TagInfo *tagInfo = root->tagInfo();
         if (tagInfo)
         {
           tagName     = tagInfo->tagName;
@@ -2124,9 +2124,9 @@ static void findUsingDeclImports(const Entry *root)
                   MemberDef *newMd = 0;
                   {
                     QCString fileName = root->fileName;
-                    if (fileName.isEmpty() && root->tagInfo)
+                    if (fileName.isEmpty() && root->tagInfo())
                     {
-                      fileName = root->tagInfo->tagName;
+                      fileName = root->tagInfo()->tagName;
                     }
                     const ArgumentList &templAl = md->templateArguments();
                     const ArgumentList &al = md->templateArguments();
@@ -2319,9 +2319,9 @@ static MemberDef *addVariableToClass(
   }
 
   QCString fileName = root->fileName;
-  if (fileName.isEmpty() && root->tagInfo)
+  if (fileName.isEmpty() && root->tagInfo())
   {
-    fileName = root->tagInfo->tagName;
+    fileName = root->tagInfo()->tagName;
   }
 
   // new member variable, typedef or enum value
@@ -2331,7 +2331,7 @@ static MemberDef *addVariableToClass(
       prot,Normal,root->stat,related,
       mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
       ArgumentList(), root->metaData);
-  md->setTagInfo(root->tagInfo);
+  md->setTagInfo(root->tagInfo());
   md->setMemberClass(cd); // also sets outer scope (i.e. getOuterScope())
   //md->setDefFile(root->fileName);
   //md->setDefLine(root->startLine);
@@ -2577,13 +2577,13 @@ static MemberDef *addVariableToFile(
   }
 
   QCString fileName = root->fileName;
-  if (fileName.isEmpty() && root->tagInfo)
+  if (fileName.isEmpty() && root->tagInfo())
   {
-    fileName = root->tagInfo->tagName;
+    fileName = root->tagInfo()->tagName;
   }
 
   Debug::print(Debug::Variables,0,
-    "    new variable, nd=%s tagInfo=%p!\n",nd?qPrint(nd->name()):"<global>",root->tagInfo);
+    "    new variable, nd=%s tagInfo=%p!\n",nd?qPrint(nd->name()):"<global>",root->tagInfo());
   // new global variable, enum value or typedef
   MemberDef *md=createMemberDef(
       fileName,root->startLine,root->startColumn,
@@ -2591,7 +2591,7 @@ static MemberDef *addVariableToFile(
       root->protection, Normal,root->stat,Member,
       mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
       ArgumentList(), root->metaData);
-  md->setTagInfo(root->tagInfo);
+  md->setTagInfo(root->tagInfo());
   md->setMemberSpecifiers(root->spec);
   md->setDocumentation(root->doc,root->docFile,root->docLine);
   md->setBriefDescription(root->brief,root->briefFile,root->briefLine);
@@ -3114,15 +3114,15 @@ static void addInterfaceOrServiceToServiceOrSingleton(
       ? MemberType_Interface
       : MemberType_Service;
   QCString fileName = root->fileName;
-  if (fileName.isEmpty() && root->tagInfo)
+  if (fileName.isEmpty() && root->tagInfo())
   {
-    fileName = root->tagInfo->tagName;
+    fileName = root->tagInfo()->tagName;
   }
   MemberDef *const md = createMemberDef(
       fileName, root->startLine, root->startColumn, root->type, rname,
       "", "", root->protection, root->virt, root->stat, Member,
       type, ArgumentList(), root->argList, root->metaData);
-  md->setTagInfo(root->tagInfo);
+  md->setTagInfo(root->tagInfo());
   md->setMemberClass(cd);
   md->setDocumentation(root->doc,root->docFile,root->docLine);
   md->setDocsForDefinition(false);
@@ -3292,9 +3292,9 @@ static void addMethodToClass(const Entry *root,ClassDef *cd,
   }
 
   QCString fileName = root->fileName;
-  if (fileName.isEmpty() && root->tagInfo)
+  if (fileName.isEmpty() && root->tagInfo())
   {
-    fileName = root->tagInfo->tagName;
+    fileName = root->tagInfo()->tagName;
   }
 
   //printf("root->name='%s; args='%s' root->argList='%s'\n",
@@ -3311,7 +3311,7 @@ static void addMethodToClass(const Entry *root,ClassDef *cd,
           root->relatesType == MemberOf ? Foreign : Related,
       mtype,!root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
       root->argList, root->metaData);
-  md->setTagInfo(root->tagInfo);
+  md->setTagInfo(root->tagInfo());
   md->setMemberClass(cd);
   md->setDocumentation(root->doc,root->docFile,root->docLine);
   md->setDocsForDefinition(!root->proto);
@@ -3688,7 +3688,7 @@ static void buildFunctionList(const Entry *root)
               !root->tArgLists.empty() ? root->tArgLists.back() : ArgumentList(),
               root->argList,root->metaData);
 
-          md->setTagInfo(root->tagInfo);
+          md->setTagInfo(root->tagInfo());
           md->setLanguage(root->lang);
           md->setId(root->id);
           //md->setDefFile(root->fileName);
@@ -4833,7 +4833,7 @@ static bool findClassRelation(
               int si = baseClassName.findRev("::");
               if (si!=-1) // class is nested
               {
-                Definition *sd = findScopeFromQualifiedName(Doxygen::globalScope,baseClassName.left(si),0,root->tagInfo);
+                Definition *sd = findScopeFromQualifiedName(Doxygen::globalScope,baseClassName.left(si),0,root->tagInfo());
                 if (sd==0 || sd==Doxygen::globalScope) // outer scope not found
                 {
                   baseClass->setArtificial(TRUE); // see bug678139
@@ -6355,7 +6355,7 @@ static void findMember(const Entry *root,
               root->virt,root->stat,Member,
               mtype,tArgList,root->argList,root->metaData);
           //printf("new specialized member %s args='%s'\n",md->name().data(),funcArgs.data());
-          md->setTagInfo(root->tagInfo);
+          md->setTagInfo(root->tagInfo());
           md->setLanguage(root->lang);
           md->setId(root->id);
           md->setMemberClass(cd);
@@ -6422,7 +6422,7 @@ static void findMember(const Entry *root,
               funcType,funcName,funcArgs,exceptions,
               root->protection,root->virt,root->stat,Related,
               mtype,tArgList,root->argList,root->metaData);
-          md->setTagInfo(root->tagInfo);
+          md->setTagInfo(root->tagInfo());
           md->setLanguage(root->lang);
           md->setId(root->id);
           md->setTypeConstraints(root->typeConstr);
@@ -6582,7 +6582,7 @@ static void findMember(const Entry *root,
           //
           md->setDefinitionTemplateParameterLists(root->tArgLists);
 
-          md->setTagInfo(root->tagInfo);
+          md->setTagInfo(root->tagInfo());
 
 
 
@@ -6703,7 +6703,7 @@ localObjCMethod:
             funcType,funcName,funcArgs,exceptions,
             root->protection,root->virt,root->stat,Member,
             MemberType_Function,ArgumentList(),root->argList,root->metaData);
-        md->setTagInfo(root->tagInfo);
+        md->setTagInfo(root->tagInfo());
         md->setLanguage(root->lang);
         md->setId(root->id);
         md->makeImplementationDetail();
@@ -7058,7 +7058,7 @@ static void findEnums(const Entry *root)
           isMemberOf ? Foreign : isRelated ? Related : Member,
           MemberType_Enumeration,
           ArgumentList(),ArgumentList(),root->metaData);
-      md->setTagInfo(root->tagInfo);
+      md->setTagInfo(root->tagInfo());
       md->setLanguage(root->lang);
       md->setId(root->id);
       if (!isGlobal) md->setMemberClass(cd); else md->setFileDef(fd);
@@ -7256,7 +7256,7 @@ static void addEnumValuesToEnums(const Entry *root)
                 //printf("md->qualifiedName()=%s e->name=%s tagInfo=%p name=%s\n",
                 //    md->qualifiedName().data(),e->name.data(),e->tagInfo,e->name.data());
                 QCString qualifiedName = substitute(root->name,"::",".");
-                if (!scope.isEmpty() && root->tagInfo)
+                if (!scope.isEmpty() && root->tagInfo())
                 {
                   qualifiedName=substitute(scope,"::",".")+"."+qualifiedName;
                 }
@@ -7265,9 +7265,9 @@ static void addEnumValuesToEnums(const Entry *root)
                    )
                 {
                   QCString fileName = e->fileName;
-                  if (fileName.isEmpty() && e->tagInfo)
+                  if (fileName.isEmpty() && e->tagInfo())
                   {
-                    fileName = e->tagInfo->tagName;
+                    fileName = e->tagInfo()->tagName;
                   }
                   MemberDef *fmd=createMemberDef(
                       fileName,e->startLine,e->startColumn,
@@ -7278,7 +7278,7 @@ static void addEnumValuesToEnums(const Entry *root)
                   else if (md->getNamespaceDef()) fmd->setNamespace(md->getNamespaceDef());
                   else if (md->getFileDef())      fmd->setFileDef(md->getFileDef());
                   fmd->setOuterScope(md->getOuterScope());
-                  fmd->setTagInfo(e->tagInfo);
+                  fmd->setTagInfo(e->tagInfo());
                   fmd->setLanguage(e->lang);
                   fmd->setId(e->id);
                   fmd->setDocumentation(e->doc,e->docFile,e->docLine);
@@ -8503,13 +8503,13 @@ static void findDefineDocumentation(Entry *root)
     //printf("found define '%s' '%s' brief='%s' doc='%s'\n",
     //       root->name.data(),root->args.data(),root->brief.data(),root->doc.data());
 
-    if (root->tagInfo && !root->name.isEmpty()) // define read from a tag file
+    if (root->tagInfo() && !root->name.isEmpty()) // define read from a tag file
     {
-      MemberDef *md=createMemberDef(root->tagInfo->tagName,1,1,
+      MemberDef *md=createMemberDef(root->tagInfo()->tagName,1,1,
                     "#define",root->name,root->args,0,
                     Public,Normal,FALSE,Member,MemberType_Define,
                     ArgumentList(),ArgumentList(),"");
-      md->setTagInfo(root->tagInfo);
+      md->setTagInfo(root->tagInfo());
       md->setLanguage(root->lang);
       //printf("Searching for '%s' fd=%p\n",filePathName.data(),fd);
       md->setFileDef(root->parent()->fileDef());
@@ -8728,7 +8728,7 @@ static void findMainPage(Entry *root)
 {
   if (root->section == Entry::MAINPAGEDOC_SEC)
   {
-    if (Doxygen::mainPage==0 && root->tagInfo==0)
+    if (Doxygen::mainPage==0 && root->tagInfo()==0)
     {
       //printf("Found main page! \n======\n%s\n=======\n",root->doc.data());
       QCString title=root->args.stripWhiteSpace();
@@ -8767,7 +8767,7 @@ static void findMainPage(Entry *root)
         Doxygen::mainPage->addSectionsToDefinition(root->anchors);
       }
     }
-    else if (root->tagInfo==0)
+    else if (root->tagInfo()==0)
     {
       warn(root->fileName,root->startLine,
            "found more than one \\mainpage comment block! (first occurrence: %s, line %d), Skipping current block!",
@@ -8782,7 +8782,7 @@ static void findMainPageTagFiles(Entry *root)
 {
   if (root->section == Entry::MAINPAGEDOC_SEC)
   {
-    if (Doxygen::mainPage && root->tagInfo)
+    if (Doxygen::mainPage && root->tagInfo())
     {
       Doxygen::mainPage->addSectionsToDefinition(root->anchors);
     }
diff --git a/src/entry.cpp b/src/entry.cpp
index e700fab..22ff858 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -45,7 +45,7 @@ Entry::Entry()
   anchors = new QList<SectionInfo>; // Doxygen::sectionDict takes ownership of the items!
   //printf("Entry::Entry() tArgList=0\n");
   mGrpId = -1;
-  tagInfo = 0;
+  hasTagInfo = FALSE;
   sli = 0;
   relatesType = Simple;
   hidden = FALSE;
@@ -60,7 +60,8 @@ Entry::Entry(const Entry &e)
   section     = e.section;
   type        = e.type;
   name        = e.name;
-  tagInfo     = e.tagInfo;
+  hasTagInfo  = e.hasTagInfo;
+  tagInfoData = e.tagInfoData;
   protection  = e.protection;
   mtype       = e.mtype;
   spec        = e.spec;
@@ -176,7 +177,6 @@ Entry::~Entry()
   delete extends;
   delete groups;
   delete anchors;
-  delete tagInfo;
   delete sli;
   num--;
 }
@@ -309,7 +309,6 @@ void Entry::reset()
   tArgLists.clear();
   argList.reset();
   typeConstr.reset();
-  if (tagInfo)    { delete tagInfo; tagInfo=0; }
   if (sli)        { delete sli; sli=0; }
   m_fileDef = 0;
 }
diff --git a/src/entry.h b/src/entry.h
index 12bd897..1cca6f8 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -244,13 +244,13 @@ class Entry
     void setFileDef(FileDef *fd);
     FileDef *fileDef() const { return m_fileDef; }
 
-  public:
-
     // identification
     int          section;     //!< entry type (see Sections);
     QCString	 type;        //!< member type
     QCString	 name;        //!< member name
-    TagInfo     *tagInfo;     //!< tag file info
+    bool         hasTagInfo;  //!< is tag info valid
+    TagInfo      tagInfoData; //!< tag file info data
+    const TagInfo *tagInfo() const { return hasTagInfo ? &tagInfoData : 0; }
 
     // content
     Protection protection;    //!< class protection
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 28c0abb..6fed840 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -262,7 +262,7 @@ class MemberDefImpl : public DefinitionImpl, public MemberDef
     virtual void makeRelated();
     virtual void makeForeign();
     virtual void setInheritsDocsFrom(MemberDef *md);
-    virtual void setTagInfo(TagInfo *i);
+    virtual void setTagInfo(const TagInfo *i);
     virtual void setArgsString(const char *as);
     virtual void setReimplements(MemberDef *md);
     virtual void insertReimplementedBy(MemberDef *md);
@@ -774,7 +774,7 @@ class MemberDefAliasImpl : public DefinitionAliasImpl, public MemberDef
     virtual void makeRelated() {}
     virtual void makeForeign() {}
     virtual void setInheritsDocsFrom(MemberDef *md) {}
-    virtual void setTagInfo(TagInfo *i) {}
+    virtual void setTagInfo(const TagInfo *i) {}
     virtual void setArgsString(const char *as) {}
     virtual void setReimplements(MemberDef *md) {}
     virtual void insertReimplementedBy(MemberDef *md) {}
@@ -4928,7 +4928,7 @@ QCString MemberDefImpl::qualifiedName() const
   }
 }
 
-void MemberDefImpl::setTagInfo(TagInfo *ti)
+void MemberDefImpl::setTagInfo(const TagInfo *ti)
 {
   if (ti)
   {
diff --git a/src/memberdef.h b/src/memberdef.h
index 986ceca..a9103e1 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -307,7 +307,7 @@ class MemberDef : virtual public Definition
     virtual void makeRelated() = 0;
     virtual void makeForeign() = 0;
     virtual void setInheritsDocsFrom(MemberDef *md) = 0;
-    virtual void setTagInfo(TagInfo *i) = 0;
+    virtual void setTagInfo(const TagInfo *i) = 0;
     virtual void setArgsString(const char *as) = 0;
     virtual void incrementFlowKeyWordCount() = 0;
 
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index f498c5f..851a581 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -1197,11 +1197,10 @@ void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMe
         ev->name       = evi->name;
         ev->id         = evi->clangid;
         ev->section    = Entry::VARIABLE_SEC;
-        TagInfo *ti    = new TagInfo;
-        ti->tagName    = m_tagName;
-        ti->anchor     = evi->anchor;
-        ti->fileName   = evi->file;
-        ev->tagInfo    = ti;
+        ev->tagInfoData.tagName    = m_tagName;
+        ev->tagInfoData.anchor     = evi->anchor;
+        ev->tagInfoData.fileName   = evi->file;
+        ev->hasTagInfo    = TRUE;
         me->moveToSubEntryAndKeep(ev);
       }
     }
@@ -1215,11 +1214,10 @@ void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMe
       me->groups->append(new Grouping(ce->name,Grouping::GROUPING_INGROUP));
     }
     addDocAnchors(me,tmi->docAnchors);
-    TagInfo *ti    = new TagInfo;
-    ti->tagName    = m_tagName;
-    ti->anchor     = tmi->anchor;
-    ti->fileName   = tmi->anchorFile;
-    me->tagInfo    = ti;
+    me->tagInfoData.tagName    = m_tagName;
+    me->tagInfoData.anchor     = tmi->anchor;
+    me->tagInfoData.fileName   = tmi->anchorFile;
+    me->hasTagInfo    = TRUE;
     if (tmi->kind=="define")
     {
       me->type="#define";
@@ -1339,12 +1337,11 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
       ce->name+="-p";
     }
     addDocAnchors(ce,tci->docAnchors);
-    TagInfo *ti  = new TagInfo;
-    ti->tagName  = m_tagName;
-    ti->anchor   = tci->anchor;
-    ti->fileName = tci->filename;
+    ce->tagInfoData.tagName  = m_tagName;
+    ce->tagInfoData.anchor   = tci->anchor;
+    ce->tagInfoData.fileName = tci->filename;
+    ce->hasTagInfo  = TRUE;
     ce->id       = tci->clangId;
-    ce->tagInfo  = ti;
     ce->lang     = tci->isObjC ? SrcLangExt_ObjC : SrcLangExt_Unknown;
     // transfer base class list
     if (tci->bases)
@@ -1380,10 +1377,9 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     fe->section = guessSection(tfi->name);
     fe->name     = tfi->name;
     addDocAnchors(fe,tfi->docAnchors);
-    TagInfo *ti  = new TagInfo;
-    ti->tagName  = m_tagName;
-    ti->fileName = tfi->filename;
-    fe->tagInfo  = ti;
+    fe->tagInfoData.tagName  = m_tagName;
+    fe->tagInfoData.fileName = tfi->filename;
+    fe->hasTagInfo = TRUE;
 
     QCString fullName = m_tagName+":"+tfi->path+stripPath(tfi->name);
     fe->fileName = fullName;
@@ -1417,11 +1413,10 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     ne->section  = Entry::NAMESPACE_SEC;
     ne->name     = tni->name;
     addDocAnchors(ne,tni->docAnchors);
-    TagInfo *ti  = new TagInfo;
-    ti->tagName  = m_tagName;
-    ti->fileName = tni->filename;
+    ne->tagInfoData.tagName  = m_tagName;
+    ne->tagInfoData.fileName = tni->filename;
+    ne->hasTagInfo  = TRUE;
     ne->id       = tni->clangId;
-    ne->tagInfo  = ti;
 
     buildMemberList(ne,tni->members);
     root->moveToSubEntryAndKeep(ne);
@@ -1436,10 +1431,9 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     pe->section  = Entry::PACKAGE_SEC;
     pe->name     = tpgi->name;
     addDocAnchors(pe,tpgi->docAnchors);
-    TagInfo *ti  = new TagInfo;
-    ti->tagName  = m_tagName;
-    ti->fileName = tpgi->filename;
-    pe->tagInfo  = ti;
+    pe->tagInfoData.tagName  = m_tagName;
+    pe->tagInfoData.fileName = tpgi->filename;
+    pe->hasTagInfo  = TRUE;
 
     buildMemberList(pe,tpgi->members);
     root->moveToSubEntryAndKeep(pe);
@@ -1455,10 +1449,9 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     ge->name     = tgi->name;
     ge->type     = tgi->title;
     addDocAnchors(ge,tgi->docAnchors);
-    TagInfo *ti  = new TagInfo;
-    ti->tagName  = m_tagName;
-    ti->fileName = tgi->filename;
-    ge->tagInfo  = ti;
+    ge->tagInfoData.tagName  = m_tagName;
+    ge->tagInfoData.fileName = tgi->filename;
+    ge->hasTagInfo  = TRUE;
 
     buildMemberList(ge,tgi->members);
     root->moveToSubEntryAndKeep(ge);
@@ -1493,10 +1486,9 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     pe->name     = tpi->name;
     pe->args     = tpi->title;
     addDocAnchors(pe,tpi->docAnchors);
-    TagInfo *ti  = new TagInfo;
-    ti->tagName  = m_tagName;
-    ti->fileName = tpi->filename;
-    pe->tagInfo  = ti;
+    pe->tagInfoData.tagName  = m_tagName;
+    pe->tagInfoData.fileName = tpi->filename;
+    pe->hasTagInfo  = TRUE;
     root->moveToSubEntryAndKeep(pe);
   }
 }
diff --git a/src/util.cpp b/src/util.cpp
index 27b2222..36d673b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6616,7 +6616,7 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle,
     const char *fileName,int startLine,
     const QList<ListItemInfo> *sli,
     GroupDef *gd,
-    TagInfo *tagInfo,
+    const TagInfo *tagInfo,
     bool xref,
     SrcLangExt lang
     )
diff --git a/src/util.h b/src/util.h
index dea6b22..1bddc8a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -338,7 +338,7 @@ PageDef *addRelatedPage(const char *name,
                         const char *fileName,int startLine,
                         const QList<ListItemInfo> *sli,
                         GroupDef *gd=0,
-                        TagInfo *tagInfo=0,
+                        const TagInfo *tagInfo=0,
                         bool xref=FALSE,
                         SrcLangExt lang=SrcLangExt_Unknown
                        );
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 7db56c3..3585230 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -1121,7 +1121,6 @@ void VhdlDocGen::prepareComment(QCString& qcs)
 /*!
  * parses a function proto
  * @param text function string
- * @param qlist stores the function types
  * @param name points to the function name
  * @param ret Stores the return type
  * @param doc ???
-- 
cgit v0.12


From e8efa15a24b991332e2be0e44714d930d4d489a6 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 28 Oct 2019 20:21:10 +0100
Subject: Cleanup forward declarations of obsolete classes

---
 src/arguments.h    | 2 --
 src/entry.h        | 2 --
 src/membergroup.h  | 1 -
 src/memberlist.h   | 1 -
 src/vhdljjparser.h | 1 -
 5 files changed, 7 deletions(-)

diff --git a/src/arguments.h b/src/arguments.h
index 58aaa4f..3464def 100644
--- a/src/arguments.h
+++ b/src/arguments.h
@@ -19,8 +19,6 @@
 #include <vector>
 #include <qcstring.h>
 
-class StorageIntf;
-
 /*! \brief This class contains the information about the argument of a
  *         function or template
  *
diff --git a/src/entry.h b/src/entry.h
index 1cca6f8..ed8fd09 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -30,8 +30,6 @@
 struct SectionInfo;
 class QFile;
 class FileDef;
-class FileStorage;
-class StorageIntf;
 struct ListItemInfo;
 
 /** This class stores information about an inheritance relation
diff --git a/src/membergroup.h b/src/membergroup.h
index c332b56..51dc04b 100644
--- a/src/membergroup.h
+++ b/src/membergroup.h
@@ -32,7 +32,6 @@ class FileDef;
 class GroupDef;
 class OutputList;
 class Definition;
-class StorageIntf;
 class FTextStream;
 struct ListItemInfo;
 
diff --git a/src/memberlist.h b/src/memberlist.h
index 0697df4..422c162 100644
--- a/src/memberlist.h
+++ b/src/memberlist.h
@@ -26,7 +26,6 @@
 class GroupDef;
 class MemberGroup;
 class MemberGroupList;
-class StorageIntf;
 
 /** A list of MemberDef objects. */
 class MemberList : private QList<MemberDef>
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index a179630..d38a731 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -30,7 +30,6 @@ void  parserVhdlfile(const char* inputBuffer);
 
 class Entry;
 class ClassSDict;
-class FileStorage;
 class ClassDef;
 class MemberDef;
 struct VhdlConfNode;
-- 
cgit v0.12


From 94e8899c8013cf99a6f90d1c8f0a7815ccc3e1c3 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 28 Oct 2019 21:29:16 +0100
Subject: Replaced QList<BaseInfo> with std::vector<BaseInfo>

---
 src/commentscan.l    | 10 +++++-----
 src/doxygen.cpp      | 47 ++++++++++++++++++++---------------------------
 src/entry.cpp        | 15 ++-------------
 src/entry.h          |  2 +-
 src/fortranscanner.l |  2 +-
 src/pyscanner.l      |  4 ++--
 src/scanner.l        | 12 ++++++------
 src/tagreader.cpp    | 31 +++++++++----------------------
 src/tclscanner.l     |  2 +-
 9 files changed, 47 insertions(+), 78 deletions(-)

diff --git a/src/commentscan.l b/src/commentscan.l
index edd4910..eef76d6 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1824,7 +1824,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
                                           addOutput(yytext);
 					  // we add subpage labels as a kind of "inheritance" relation to prevent
 					  // needing to add another list to the Entry class.
-					  current->extends->append(new BaseInfo(yytext,Public,Normal));
+					  current->extends.push_back(BaseInfo(yytext,Public,Normal));
 					  BEGIN(SubpageTitle);
   					}
 <SubpageLabel>{DOCNL}			{ // missing argument
@@ -2224,8 +2224,8 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
   /* ----- handle argument of inherit command ------- */
 
 <InheritParam>({ID}("::"|"."))*{ID}	{ // found argument
-					  current->extends->append(
-					    new BaseInfo(removeRedundantWhiteSpace(yytext),Public,Normal)
+					  current->extends.push_back(
+					    BaseInfo(removeRedundantWhiteSpace(yytext),Public,Normal)
 					  );
 					  BEGIN( Comment );
   					}
@@ -2247,8 +2247,8 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
   /* ----- handle argument of extends and implements commands ------- */
 
 <ExtendsParam>({ID}("::"|"."))*{ID}	{ // found argument
-					  current->extends->append(
-					    new BaseInfo(removeRedundantWhiteSpace(yytext),Public,Normal)
+					  current->extends.push_back(
+					    BaseInfo(removeRedundantWhiteSpace(yytext),Public,Normal)
 					  );
 					  BEGIN( Comment );
   					}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 9846ecd..1646bcc 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -315,7 +315,7 @@ static bool findClassRelation(
                            const Entry *root,
                            Definition *context,
                            ClassDef *cd,
-                           BaseInfo *bi,
+                           const BaseInfo *bi,
                            QDict<int> *templateNames,
                            /*bool insertUndocumented*/
                            FindBaseClassRelation_Mode mode,
@@ -502,11 +502,11 @@ static void addSTLClass(const std::unique_ptr<Entry> &root,const STLInfo *info)
   }
   if (info->baseClass1)
   {
-    classEntry->extends->append(new BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal));
+    classEntry->extends.push_back(BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal));
   }
   if (info->baseClass2)
   {
-    classEntry->extends->append(new BaseInfo(info->baseClass2,Public,info->virtualInheritance?Virtual:Normal));
+    classEntry->extends.push_back(BaseInfo(info->baseClass2,Public,info->virtualInheritance?Virtual:Normal));
   }
   if (info->iterators)
   {
@@ -4340,20 +4340,18 @@ static void findBaseClassesForClass(
   masterCd->setVisited(TRUE);
   // The base class could ofcouse also be a non-nested class
   const ArgumentList &formalArgs = masterCd->templateArguments();
-  QListIterator<BaseInfo> bii(*root->extends);
-  BaseInfo *bi=0;
-  for (bii.toFirst();(bi=bii.current());++bii)
+  for (const BaseInfo &bi : root->extends)
   {
     //printf("masterCd=%s bi->name='%s' #actualArgs=%d\n",
     //    masterCd->localName().data(),bi->name.data(),actualArgs?(int)actualArgs->count():-1);
     bool delTempNames=FALSE;
     if (templateNames==0)
     {
-      templateNames = getTemplateArgumentsInName(formalArgs,bi->name);
+      templateNames = getTemplateArgumentsInName(formalArgs,bi.name);
       delTempNames=TRUE;
     }
-    BaseInfo tbi(bi->name,bi->prot,bi->virt);
-    tbi.name = substituteTemplateArgumentsInString(bi->name,formalArgs,actualArgs);
+    BaseInfo tbi = bi;
+    tbi.name = substituteTemplateArgumentsInString(bi.name,formalArgs,actualArgs);
     //printf("bi->name=%s tbi.name=%s\n",bi->name.data(),tbi.name.data());
 
     if (mode==DocumentedOnly)
@@ -4550,7 +4548,7 @@ static bool findClassRelation(
                            const Entry *root,
                            Definition *context,
                            ClassDef *cd,
-                           BaseInfo *bi,
+                           const BaseInfo *bi,
                            QDict<int> *templateNames,
                            FindBaseClassRelation_Mode mode,
                            bool isArtificial
@@ -4778,13 +4776,13 @@ static bool findClassRelation(
               usedName=biName;
               //printf("***** usedName=%s templSpec=%s\n",usedName.data(),templSpec.data());
             }
-            static bool sipSupport = Config_getBool(SIP_SUPPORT);
-            if (sipSupport) bi->prot=Public;
+            Protection prot = bi->prot;
+            if (Config_getBool(SIP_SUPPORT)) prot=Public;
             if (!cd->isSubClass(baseClass)) // check for recursion, see bug690787
             {
-              cd->insertBaseClass(baseClass,usedName,bi->prot,bi->virt,templSpec);
+              cd->insertBaseClass(baseClass,usedName,prot,bi->virt,templSpec);
               // add this class as super class to the base class
-              baseClass->insertSubClass(cd,bi->prot,bi->virt,templSpec);
+              baseClass->insertSubClass(cd,prot,bi->virt,templSpec);
             }
             else
             {
@@ -4916,8 +4914,8 @@ static bool isClassSection(const Entry *root)
     else if (root->section & Entry::COMPOUNDDOC_MASK)
          // is it a documentation block with inheritance info.
     {
-      bool extends = root->extends->count()>0;
-      if (extends) return TRUE;
+      bool hasExtends = !root->extends.empty();
+      if (hasExtends) return TRUE;
     }
   }
   return FALSE;
@@ -5047,18 +5045,15 @@ static void computeTemplateClassRelations()
         QCString templSpec = tdi.currentKey();
         ArgumentList templArgs;
         stringToArgumentList(templSpec,templArgs);
-        QList<BaseInfo> *baseList=root->extends;
-        QListIterator<BaseInfo> it(*baseList);
-        BaseInfo *bi;
-        for (;(bi=it.current());++it) // for each base class of the template
+        for (const BaseInfo &bi : root->extends)
         {
           // check if the base class is a template argument
-          BaseInfo tbi(bi->name,bi->prot,bi->virt);
+          BaseInfo tbi = bi;
           const ArgumentList &tl = cd->templateArguments();
           if (!tl.empty())
           {
             QDict<int> *baseClassNames = tcd->getTemplateBaseClassNames();
-            QDict<int> *templateNames = getTemplateArgumentsInName(tl,bi->name);
+            QDict<int> *templateNames = getTemplateArgumentsInName(tl,bi.name);
             // for each template name that we inherit from we need to
             // substitute the formal with the actual arguments
             QDict<int> *actualTemplateNames = new QDict<int>(17);
@@ -5085,7 +5080,7 @@ static void computeTemplateClassRelations()
             }
             delete templateNames;
 
-            tbi.name = substituteTemplateArgumentsInString(bi->name,tl,templArgs);
+            tbi.name = substituteTemplateArgumentsInString(bi.name,tl,templArgs);
             // find a documented base class in the correct scope
             if (!findClassRelation(root,cd,tcd,&tbi,actualTemplateNames,DocumentedOnly,FALSE))
             {
@@ -8803,11 +8798,9 @@ static void computePageRelations(Entry *root)
                     Doxygen::mainPage;
     if (pd)
     {
-      QListIterator<BaseInfo> bii(*root->extends);
-      BaseInfo *bi;
-      for (bii.toFirst();(bi=bii.current());++bii)
+      for (const BaseInfo &bi : root->extends)
       {
-        PageDef *subPd = Doxygen::pageSDict->find(bi->name);
+        PageDef *subPd = Doxygen::pageSDict->find(bi.name);
         if (pd==subPd)
         {
          err("page defined at line %d of file %s with label %s is a direct "
diff --git a/src/entry.cpp b/src/entry.cpp
index 22ff858..9a8d0dd 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -38,8 +38,6 @@ Entry::Entry()
   num++;
   m_parent=0;
   section = EMPTY_SEC;
-  extends = new QList<BaseInfo>;
-  extends->setAutoDelete(TRUE);
   groups = new QList<Grouping>;
   groups->setAutoDelete(TRUE);
   anchors = new QList<SectionInfo>; // Doxygen::sectionDict takes ownership of the items!
@@ -103,8 +101,6 @@ Entry::Entry(const Entry &e)
   bodyLine    = e.bodyLine;
   endBodyLine = e.endBodyLine;
   mGrpId      = e.mGrpId;
-  extends     = new QList<BaseInfo>;
-  extends->setAutoDelete(TRUE);
   groups      = new QList<Grouping>;
   groups->setAutoDelete(TRUE);
   anchors     = new QList<SectionInfo>;
@@ -141,13 +137,7 @@ Entry::Entry(const Entry &e)
     m_sublist.push_back(std::make_unique<Entry>(*cur));
   }
 
-  // deep copy base class list
-  QListIterator<BaseInfo> bli(*e.extends);
-  BaseInfo *bi;
-  for (;(bi=bli.current());++bli)
-  {
-    extends->append(new BaseInfo(*bi));
-  }
+  extends = e.extends;
   
   // deep copy group list
   QListIterator<Grouping> gli(*e.groups);
@@ -174,7 +164,6 @@ Entry::~Entry()
   //printf("Deleting entry %d name %s type %x children %d\n",
   //       num,name.data(),section,sublist->count());
 
-  delete extends;
   delete groups;
   delete anchors;
   delete sli;
@@ -302,7 +291,7 @@ void Entry::reset()
   id.resize(0);
   metaData.resize(0);
   m_sublist.clear();
-  extends->clear();
+  extends.clear();
   groups->clear();
   anchors->clear();
   argList.clear();
diff --git a/src/entry.h b/src/entry.h
index ed8fd09..c715d60 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -291,7 +291,7 @@ class Entry
     int          bodyLine;    //!< line number of the definition in the source
     int          endBodyLine; //!< line number where the definition ends
     int          mGrpId;      //!< member group id
-    QList<BaseInfo> *extends; //!< list of base classes
+    std::vector<BaseInfo> extends; //!< list of base classes
     QList<Grouping> *groups;  //!< list of groups this entry belongs to
     QList<SectionInfo> *anchors; //!< list of anchors defined in this entry
     QCString	fileName;     //!< file this entry was extracted from
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 7fa9426..161deae 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -617,7 +617,7 @@ abstract                                {
                                         }
 extends{ARGS}                           {
                                           QCString basename = extractFromParens(yytext).lower();
-                                          current->extends->append(new BaseInfo(basename, Public, Normal));
+                                          current->extends.push_back(BaseInfo(basename, Public, Normal));
                                         }
 public                                  {
                                           current->protection = Public;
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 1a3f052..829980c 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -1245,8 +1245,8 @@ STARTDOCSYMS      "##"
                        }
 
     {SCOPE}            {
-                         current->extends->append(
-					      new BaseInfo(substitute(yytext,".","::"),Public,Normal)
+                         current->extends.push_back(
+					      BaseInfo(substitute(yytext,".","::"),Public,Normal)
 					    );
                          //Has base class-do stuff
                        }
diff --git a/src/scanner.l b/src/scanner.l
index 61b51cb..6fa5008 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -5476,8 +5476,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    // there can be only one base class here
 					    if (!baseName.isEmpty())
 					    {
-					      current->extends->append(
-					        new BaseInfo(baseName,Public,Normal));
+					      current->extends.push_back(
+					        BaseInfo(baseName,Public,Normal));
 					      baseName.resize(0);
 					    }
 					    current_root->moveToSubEntryAndRefresh( current ) ;
@@ -6156,8 +6156,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->name = removeRedundantWhiteSpace(current->name);
   					  if (!baseName.isEmpty())
 					  {
-  					    current->extends->append(
-					      new BaseInfo(baseName,baseProt,baseVirt)
+  					    current->extends.push_back(
+					      BaseInfo(baseName,baseProt,baseVirt)
 					    );
 					  }
 					  if ((current->spec & (Entry::Interface|Entry::Struct)) || 
@@ -6198,8 +6198,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  current->startColumn = yyColNr;
 					  current->name = removeRedundantWhiteSpace(current->name);
   					  if (!baseName.isEmpty())
-  					    current->extends->append(
-					      new BaseInfo(baseName,baseProt,baseVirt)
+  					    current->extends.push_back(
+					       BaseInfo(baseName,baseProt,baseVirt)
 					    );
 					  curlyCount=0;
 					  if (insideObjC)
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 851a581..c2a7aac 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -100,14 +100,14 @@ class TagClassInfo
 {
   public:
     enum Kind { None=-1, Class, Struct, Union, Interface, Exception, Protocol, Category, Enum, Service, Singleton };
-    TagClassInfo() { bases=0, templateArguments=0; members.setAutoDelete(TRUE); isObjC=FALSE; kind = None; }
-   ~TagClassInfo() { delete bases; delete templateArguments; }
+    TagClassInfo() { templateArguments=0; members.setAutoDelete(TRUE); isObjC=FALSE; kind = None; }
+   ~TagClassInfo() { delete templateArguments; }
     QCString name;
     QCString filename;
     QCString clangId;
     QCString anchor;
     TagAnchorInfoList docAnchors;
-    QList<BaseInfo> *bases;
+    std::vector<BaseInfo> bases;
     QList<TagMemberInfo> members;
     QList<QCString> *templateArguments;
     QCStringList classList;
@@ -623,12 +623,7 @@ class TagFileParser : public QXmlDefaultHandler
         {
           virt = Virtual;
         }
-        if (m_curClass->bases==0) 
-        {
-          m_curClass->bases = new QList<BaseInfo>;
-          m_curClass->bases->setAutoDelete(TRUE);
-        }
-        m_curClass->bases->append(new BaseInfo(m_curString,prot,virt));
+        m_curClass->bases.push_back(BaseInfo(m_curString,prot,virt));
       }
       else
       {
@@ -640,7 +635,7 @@ class TagFileParser : public QXmlDefaultHandler
     {
       if (m_state==InClass && m_curClass)
       {
-        m_curClass->bases->getLast()->name = m_curString;
+        m_curClass->bases.back().name = m_curString;
       }
       else
       {
@@ -990,14 +985,9 @@ void TagFileParser::dump()
   {
     msg("class '%s'\n",cd->name.data());
     msg("  filename '%s'\n",cd->filename.data());
-    if (cd->bases)
+    for (const BaseInfo &bi : cd->bases)
     {
-      QListIterator<BaseInfo> bii(*cd->bases);
-      BaseInfo *bi;
-      for ( bii.toFirst() ; (bi=bii.current()) ; ++bii) 
-      {
-        msg( "  base: %s \n", bi->name.data() );
-      }
+      msg( "  base: %s \n", bi.name.data() );
     }
 
     QListIterator<TagMemberInfo> mci(cd->members);
@@ -1344,11 +1334,8 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
     ce->id       = tci->clangId;
     ce->lang     = tci->isObjC ? SrcLangExt_ObjC : SrcLangExt_Unknown;
     // transfer base class list
-    if (tci->bases)
-    {
-      delete ce->extends;
-      ce->extends = tci->bases; tci->bases = 0;
-    }
+    ce->extends  = tci->bases;
+    tci->bases.clear();
     if (tci->templateArguments)
     {
       ArgumentList al;
diff --git a/src/tclscanner.l b/src/tclscanner.l
index d0fb564..4a262bc 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -2700,7 +2700,7 @@ tcl_inf("->\n");
     {
       for (unsigned int i = 2; i < tcl.list_commandwords.count(); i = i + 2)
       {
-        tcl.scan.at(0)->entry_cl->extends->append(new BaseInfo((*tcl.list_commandwords.at(i)),Public,Normal));
+        tcl.scan.at(0)->entry_cl->extends.push_back(BaseInfo((*tcl.list_commandwords.at(i)),Public,Normal));
       }
     }
     goto command_end;
-- 
cgit v0.12


From d38df57916d5902abc9dbaf5891c14898ce675da Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 28 Oct 2019 21:56:03 +0100
Subject: Replaced QList<Grouping> with std::vector<Grouping>

---
 src/commentscan.l |  4 ++--
 src/docgroup.cpp  | 21 +++++++++---------
 src/docgroup.h    |  4 ++--
 src/doxygen.cpp   | 36 ++++++++++++++-----------------
 src/entry.cpp     | 18 +++-------------
 src/entry.h       |  2 +-
 src/groupdef.cpp  | 51 +++++++++++++++++---------------------------
 src/scanner.l     | 64 ++++---------------------------------------------------
 src/tagreader.cpp |  4 ++--
 src/types.h       |  1 -
 10 files changed, 59 insertions(+), 146 deletions(-)

diff --git a/src/commentscan.l b/src/commentscan.l
index eef76d6..29bc1d9 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -2141,8 +2141,8 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
   /* ----- handle argument of ingroup command ------- */
 
 <InGroupParam>{LABELID}			{ // group id
-  					  current->groups->append(
-					    new Grouping(yytext, Grouping::GROUPING_INGROUP)
+  					  current->groups.push_back(
+					     Grouping(yytext, Grouping::GROUPING_INGROUP)
 					  );
 					  inGroupParamFound=TRUE;
   					}
diff --git a/src/docgroup.cpp b/src/docgroup.cpp
index ecaa1af..fbdb842 100644
--- a/src/docgroup.cpp
+++ b/src/docgroup.cpp
@@ -23,7 +23,6 @@
 void DocGroup::enterFile(const char *fileName,int)
 {
   m_openCount = 0;
-  m_autoGroupStack.setAutoDelete(TRUE);
   m_autoGroupStack.clear();
   m_memberGroupId = DOX_NOGROUP;
   m_memberGroupDocs.resize(0);
@@ -40,7 +39,7 @@ void DocGroup::leaveFile(const char *fileName,int line)
   m_memberGroupId=DOX_NOGROUP;
   m_memberGroupRelates.resize(0);
   m_memberGroupDocs.resize(0);
-  if (!m_autoGroupStack.isEmpty())
+  if (!m_autoGroupStack.empty())
   {
     warn(fileName,line,"end of file while inside a group");
   }
@@ -109,10 +108,10 @@ void DocGroup::open(Entry *e,const char *,int, bool implicit)
 {
   if (!implicit) m_openCount++;
   //printf("==> openGroup(name=%s,sec=%x) m_autoGroupStack=%d\n",
-  //  	e->name.data(),e->section,m_autoGroupStack.count());
+  //  	e->name.data(),e->section,m_autoGroupStack.size());
   if (e->section==Entry::GROUPDOC_SEC) // auto group
   {
-    m_autoGroupStack.push(new Grouping(e->name,e->groupingPri()));
+    m_autoGroupStack.push_back(Grouping(e->name,e->groupingPri()));
   }
   else // start of a member group
   {
@@ -148,7 +147,7 @@ void DocGroup::close(Entry *e,const char *fileName,int line,bool foundInline,boo
     }
   }
   //printf("==> closeGroup(name=%s,sec=%x,file=%s,line=%d) m_autoGroupStack=%d\n",
-  //    e->name.data(),e->section,fileName,line,m_autoGroupStack.count());
+  //    e->name.data(),e->section,fileName,line,m_autoGroupStack.size());
   if (m_memberGroupId!=DOX_NOGROUP) // end of member group
   {
     MemberGroupInfo *info=Doxygen::memGrpInfoDict.find(m_memberGroupId);
@@ -164,13 +163,13 @@ void DocGroup::close(Entry *e,const char *fileName,int line,bool foundInline,boo
     if (!foundInline) e->mGrpId=DOX_NOGROUP;
     //printf("new group id=%d\n",m_memberGroupId);
   }
-  else if (!m_autoGroupStack.isEmpty()) // end of auto group
+  else if (!m_autoGroupStack.empty()) // end of auto group
   {
-    Grouping *grp = m_autoGroupStack.pop();
+    Grouping grp = m_autoGroupStack.back();
+    m_autoGroupStack.pop_back();
     // see bug577005: we should not remove the last group for e
-    if (!foundInline) e->groups->removeLast();
+    if (!foundInline && !e->groups.empty()) e->groups.pop_back();
     //printf("Removing %s e=%p\n",grp->groupname.data(),e);
-    delete grp;
     if (!foundInline) initGroupInfo(e);
   }
 }
@@ -181,12 +180,12 @@ void DocGroup::initGroupInfo(Entry *e)
   //       m_memberGroupRelates.data(),e);
   e->mGrpId     = m_memberGroupId;
   e->relates    = m_memberGroupRelates;
-  if (!m_autoGroupStack.isEmpty())
+  if (!m_autoGroupStack.empty())
   {
     //printf("Appending group %s to %s: count=%d entry=%p\n",
     //	m_autoGroupStack.top()->groupname.data(),
     //	e->name.data(),e->groups->count(),e);
-    e->groups->append(new Grouping(*m_autoGroupStack.top()));
+    e->groups.push_back(Grouping(m_autoGroupStack.back()));
   }
 }
 
diff --git a/src/docgroup.h b/src/docgroup.h
index 4775d90..47a0a3e 100644
--- a/src/docgroup.h
+++ b/src/docgroup.h
@@ -16,7 +16,7 @@
 #ifndef DOCGROUP_H
 #define DOCGROUP_H
 
-#include <qstack.h>
+#include <vector>
 #include <qstring.h>
 #include "membergroup.h"
 
@@ -47,7 +47,7 @@ class DocGroup
     int              m_memberGroupId;
     QCString         m_memberGroupRelates;
     QCString         m_memberGroupDocs;
-    QStack<Grouping> m_autoGroupStack;
+    std::vector<Grouping> m_autoGroupStack;
     QCString         m_compoundName;
 };
 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 1646bcc..a75a820 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -568,11 +568,9 @@ static void addPageToContext(PageDef *pd,Entry *root)
 static void addRelatedPage(Entry *root)
 {
   GroupDef *gd=0;
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
+  for (const Grouping &g : root->groups)
   {
-    if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname))) break;
+    if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname))) break;
   }
   //printf("---> addRelatedPage() %s gd=%p\n",root->name.data(),gd);
   QCString doc;
@@ -759,12 +757,10 @@ static void buildFileList(const Entry *root)
       fd->setBriefDescription(root->brief,root->briefFile,root->briefLine);
       fd->addSectionsToDefinition(root->anchors);
       fd->setRefItems(root->sli);
-      QListIterator<Grouping> gli(*root->groups);
-      Grouping *g;
-      for (;(g=gli.current());++gli)
+      for (const Grouping &g : root->groups)
       {
         GroupDef *gd=0;
-        if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+        if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
         {
           gd->addFile(fd);
           fd->makePartOfGroup(gd);
@@ -1947,12 +1943,13 @@ static void findUsingDirectives(const Entry *root)
         nd->setMetaData(root->metaData);
         nd->setInline((root->spec&Entry::Inline)!=0);
 
-        QListIterator<Grouping> gli(*root->groups);
-        Grouping *g;
-        for (;(g=gli.current());++gli)
+        //QListIterator<Grouping> gli(*root->groups);
+        //Grouping *g;
+        //for (;(g=gli.current());++gli)
+        for (const Grouping &g : root->groups)
         {
           GroupDef *gd=0;
-          if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+          if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
             gd->addNamespace(nd);
         }
 
@@ -3575,9 +3572,9 @@ static void buildFunctionList(const Entry *root)
                  )
               {
                 GroupDef *gd=0;
-                if (root->groups->getFirst() && !root->groups->getFirst()->groupname.isEmpty())
+                if (!root->groups.empty() && !root->groups.front().groupname.isEmpty())
                 {
-                  gd = Doxygen::groupSDict->find(root->groups->getFirst()->groupname);
+                  gd = Doxygen::groupSDict->find(root->groups.front().groupname);
                 }
                 //printf("match!\n");
                 //printf("mnd=%p rnd=%p nsName=%s rnsName=%s\n",mnd,rnd,nsName.data(),rnsName.data());
@@ -3641,16 +3638,15 @@ static void buildFunctionList(const Entry *root)
                   md->enableReferencesRelation(md->hasReferencesRelation() || root->referencesRelation);
 
                   // merge ingroup specifiers
-                  if (md->getGroupDef()==0 && root->groups->getFirst()!=0)
+                  if (md->getGroupDef()==0 && !root->groups.empty())
                   {
                     addMemberToGroups(root,md);
                   }
-                  else if (md->getGroupDef()!=0 && root->groups->count()==0)
+                  else if (md->getGroupDef()!=0 && root->groups.empty())
                   {
                     //printf("existing member is grouped, new member not\n");
-                    root->groups->append(new Grouping(md->getGroupDef()->name(), md->getGroupPri()));
                   }
-                  else if (md->getGroupDef()!=0 && root->groups->getFirst()!=0)
+                  else if (md->getGroupDef()!=0 && !root->groups.empty())
                   {
                     //printf("both members are grouped\n");
                   }
@@ -7455,7 +7451,7 @@ static void findEnumDocumentation(const Entry *root)
               md->setRefItems(root->sli);
 
               const GroupDef *gd=md->getGroupDef();
-              if (gd==0 &&root->groups->getFirst()!=0) // member not grouped but out-of-line documentation is
+              if (gd==0 && !root->groups.empty()) // member not grouped but out-of-line documentation is
               {
                 addMemberToGroups(root,md);
               }
@@ -7489,7 +7485,7 @@ static void findEnumDocumentation(const Entry *root)
               md->setMemberGroupId(root->mGrpId);
 
               const GroupDef *gd=md->getGroupDef();
-              if (gd==0 && root->groups->getFirst()!=0) // member not grouped but out-of-line documentation is
+              if (gd==0 && !root->groups.empty()) // member not grouped but out-of-line documentation is
               {
                 addMemberToGroups(root,md);
               }
diff --git a/src/entry.cpp b/src/entry.cpp
index 9a8d0dd..625a448 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -38,8 +38,6 @@ Entry::Entry()
   num++;
   m_parent=0;
   section = EMPTY_SEC;
-  groups = new QList<Grouping>;
-  groups->setAutoDelete(TRUE);
   anchors = new QList<SectionInfo>; // Doxygen::sectionDict takes ownership of the items!
   //printf("Entry::Entry() tArgList=0\n");
   mGrpId = -1;
@@ -101,8 +99,6 @@ Entry::Entry(const Entry &e)
   bodyLine    = e.bodyLine;
   endBodyLine = e.endBodyLine;
   mGrpId      = e.mGrpId;
-  groups      = new QList<Grouping>;
-  groups->setAutoDelete(TRUE);
   anchors     = new QList<SectionInfo>;
   fileName    = e.fileName;
   startLine   = e.startLine;
@@ -138,15 +134,8 @@ Entry::Entry(const Entry &e)
   }
 
   extends = e.extends;
-  
-  // deep copy group list
-  QListIterator<Grouping> gli(*e.groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
-  {
-    groups->append(new Grouping(*g));
-  }
-  
+  groups  = e.groups;
+
   QListIterator<SectionInfo> sli2(*e.anchors);
   SectionInfo *s;
   for (;(s=sli2.current());++sli2)
@@ -164,7 +153,6 @@ Entry::~Entry()
   //printf("Deleting entry %d name %s type %x children %d\n",
   //       num,name.data(),section,sublist->count());
 
-  delete groups;
   delete anchors;
   delete sli;
   num--;
@@ -292,7 +280,7 @@ void Entry::reset()
   metaData.resize(0);
   m_sublist.clear();
   extends.clear();
-  groups->clear();
+  groups.clear();
   anchors->clear();
   argList.clear();
   tArgLists.clear();
diff --git a/src/entry.h b/src/entry.h
index c715d60..6146c57 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -292,7 +292,7 @@ class Entry
     int          endBodyLine; //!< line number where the definition ends
     int          mGrpId;      //!< member group id
     std::vector<BaseInfo> extends; //!< list of base classes
-    QList<Grouping> *groups;  //!< list of groups this entry belongs to
+    std::vector<Grouping> groups;  //!< list of groups this entry belongs to
     QList<SectionInfo> *anchors; //!< list of anchors defined in this entry
     QCString	fileName;     //!< file this entry was extracted from
     int		startLine;    //!< start line of entry in the source
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index bcdb3d0..882cebd 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -1460,12 +1460,10 @@ void GroupDefImpl::writeQuickMemberLinks(OutputList &ol,const MemberDef *current
 
 void addClassToGroups(const Entry *root,ClassDef *cd)
 {
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
+  for (const Grouping &g : root->groups)
   {
     GroupDef *gd=0;
-    if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+    if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
     {
       if (gd->addClass(cd)) 
       {
@@ -1478,14 +1476,12 @@ void addClassToGroups(const Entry *root,ClassDef *cd)
 
 void addNamespaceToGroups(const Entry *root,NamespaceDef *nd)
 {
-  //printf("root->groups->count()=%d\n",root->groups->count());
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
+  //printf("root->groups.size()=%d\n",root->groups.size());
+  for (const Grouping &g : root->groups)
   {
     GroupDef *gd=0;
     //printf("group '%s'\n",s->data());
-    if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+    if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
     {
       if (gd->addNamespace(nd)) nd->makePartOfGroup(gd);
       //printf("Namespace %s: in group %s\n",nd->name().data(),s->data());
@@ -1495,14 +1491,12 @@ void addNamespaceToGroups(const Entry *root,NamespaceDef *nd)
 
 void addDirToGroups(const Entry *root,DirDef *dd)
 {
-  //printf("*** root->groups->count()=%d\n",root->groups->count());
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
+  //printf("*** root->groups.size()=%d\n",root->groups.size());
+  for (const Grouping &g : root->groups)
   {
     GroupDef *gd=0;
     //printf("group '%s'\n",g->groupname.data());
-    if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+    if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
     {
       gd->addDir(dd);
       dd->makePartOfGroup(gd);
@@ -1513,14 +1507,11 @@ void addDirToGroups(const Entry *root,DirDef *dd)
 
 void addGroupToGroups(const Entry *root,GroupDef *subGroup)
 {
-  //printf("addGroupToGroups for %s groups=%d\n",root->name.data(),
-  //    root->groups?root->groups->count():-1);
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
+  //printf("addGroupToGroups for %s groups=%d\n",root->name.data(),root->groups.size());
+  for (const Grouping &g : root->groups)
   {
     GroupDef *gd=0;
-    if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+    if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
     {
       if (gd==subGroup)
       {
@@ -1546,20 +1537,18 @@ void addMemberToGroups(const Entry *root,MemberDef *md)
 {
   //printf("addMemberToGroups:  Root %p = %s, md %p=%s groups=%d\n", 
   //    root, root->name.data(), md, md->name().data(), root->groups->count() );
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
 
   // Search entry's group list for group with highest pri.
   Grouping::GroupPri_t pri = Grouping::GROUPING_LOWEST;
   GroupDef *fgd=0;
-  for (;(g=gli.current());++gli)
+  for (const Grouping &g : root->groups)
   {
     GroupDef *gd=0;
-    if (!g->groupname.isEmpty() &&
-        (gd=Doxygen::groupSDict->find(g->groupname)) &&
-        g->pri >= pri)
+    if (!g.groupname.isEmpty() &&
+        (gd=Doxygen::groupSDict->find(g.groupname)) &&
+        g.pri >= pri)
     {
-      if (fgd && gd!=fgd && g->pri==pri) 
+      if (fgd && gd!=fgd && g.pri==pri) 
       {
         warn(root->fileName.data(), root->startLine,
             "Member %s found in multiple %s groups! "
@@ -1570,7 +1559,7 @@ void addMemberToGroups(const Entry *root,MemberDef *md)
       }
 
       fgd = gd;
-      pri = g->pri;
+      pri = g.pri;
     }
   }
   //printf("fgd=%p\n",fgd);
@@ -1650,12 +1639,10 @@ void addMemberToGroups(const Entry *root,MemberDef *md)
 
 void addExampleToGroups(const Entry *root,PageDef *eg)
 {
-  QListIterator<Grouping> gli(*root->groups);
-  Grouping *g;
-  for (;(g=gli.current());++gli)
+  for (const Grouping &g : root->groups)
   {
     GroupDef *gd=0;
-    if (!g->groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g->groupname)))
+    if (!g.groupname.isEmpty() && (gd=Doxygen::groupSDict->find(g.groupname)))
     {
       gd->addExample(eg);
       eg->makePartOfGroup(gd);
diff --git a/src/scanner.l b/src/scanner.l
index 6fa5008..6524272 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -251,11 +251,6 @@ static void initEntry()
   current->stat       = gstat;
   current->lang       = language;
   //printf("*** initEntry() language=%d\n",language);
-  //if (!autoGroupStack.isEmpty())
-  //{
-  //  //printf("Appending group %s\n",autoGroupStack.top()->groupname.data());
-  //  current->groups->append(new Grouping(*autoGroupStack.top()));
-  //}
   Doxygen::docGroup.initGroupInfo(current.get());
   isTypedef=FALSE;
 }
@@ -263,42 +258,6 @@ static void initEntry()
 
 //-----------------------------------------------------------------------------
 
-///// remove any automatic grouping and add new one (if given)
-//static void setCurrentGroup( QCString *newgroup, Grouping::GroupPri_t pri )
-//{
-//   /* remove auto group name from current entry and discard it */
-//   Grouping *g = current->groups->first();
-//   int i=0; 
-//   while (g)
-//   {
-//     if (g->pri <= Grouping::GROUPING_AUTO_DEF)
-//     {
-//       current->groups->remove(i);
-//       i--;
-//     }
-//     g=current->groups->next();
-//     i++;
-//   }
-//
-//   /* use new group name instead? */
-//   if ( newgroup )
-//   {
-//      current->groups->append(new Grouping(*newgroup, pri));
-//   } 
-//}
-//
-//static int newMemberGroupId()
-//{
-//  static int curGroupId=0;
-//  return curGroupId++;
-//}
-//
-// forward declarations
-//static void startGroupInDoc();
-//static void endGroup();
-
-//-----------------------------------------------------------------------------
-
 static void lineCount()
 {
   static int tabSize = Config_getInt(TAB_SIZE);
@@ -3510,10 +3469,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
                                             mtype = Method;
                                             virt = Normal;
-					    if (current->groups)
-					    {
-					      current->groups->clear();
-					    }
+					    current->groups.clear();
 					    initEntry();
 					  }
 					}
@@ -4215,14 +4171,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      varEntry->brief = current->brief.copy();
 					      varEntry->mGrpId = current->mGrpId;
                                               varEntry->initializer = current->initializer;
-
-					      // deep copy group list
-					      QListIterator<Grouping> gli(*current->groups);
-					      Grouping *g;
-					      for (;(g=gli.current());++gli)
-					      {
-						varEntry->groups->append(new Grouping(*g));
-					      }
+                                              varEntry->groups = current->groups;
 					      if (current->sli) // copy special list items
 					      {
 						QListIterator<ListItemInfo> li(*current->sli);
@@ -7132,14 +7081,9 @@ static void parseCompounds(const std::unique_ptr<Entry> &rt)
 
       // deep copy group list from parent (see bug 727732)
       static bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS);
-      if (autoGroupNested && rt->groups && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
+      if (autoGroupNested && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
       {
-        QListIterator<Grouping> gli(*rt->groups);
-        Grouping *g;
-        for (;(g=gli.current());++gli)
-        {
-          ce->groups->append(new Grouping(*g));
-        }
+        ce->groups = rt->groups;
       }
 
       int ni=ce->name.findRev("::"); if (ni==-1) ni=0; else ni+=2;
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index c2a7aac..ef4888e 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -1201,7 +1201,7 @@ void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMe
     me->id         = tmi->clangId;
     if (ce->section == Entry::GROUPDOC_SEC)
     {
-      me->groups->append(new Grouping(ce->name,Grouping::GROUPING_INGROUP));
+      me->groups.push_back(Grouping(ce->name,Grouping::GROUPING_INGROUP));
     }
     addDocAnchors(me,tmi->docAnchors);
     me->tagInfoData.tagName    = m_tagName;
@@ -1458,7 +1458,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
           [&](const std::unique_ptr<Entry> &e) { return e->name = *it; });
       if (i!=children.end())
       {
-        (*i)->groups->append(new Grouping(tgi->name,Grouping::GROUPING_INGROUP));
+        (*i)->groups.push_back(Grouping(tgi->name,Grouping::GROUPING_INGROUP));
       }
     }
   }
diff --git a/src/types.h b/src/types.h
index 4d305b6..189a93d 100644
--- a/src/types.h
+++ b/src/types.h
@@ -92,7 +92,6 @@ struct Grouping
   }
 
   Grouping( const char *gn, GroupPri_t p ) : groupname(gn), pri(p) {}
-  Grouping( const Grouping &g ) : groupname(g.groupname), pri(g.pri) {}
   QCString groupname;   //!< name of the group
   GroupPri_t pri;       //!< priority of this definition
 
-- 
cgit v0.12


From 4b745debaec0dbff60f7fe82ac32c59e3b21dfea Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 29 Oct 2019 19:37:27 +0100
Subject: Replaced QList<SectionInfo> by std::vector<SectionInfo>

---
 src/cite.cpp         |  2 +-
 src/commentscan.l    |  6 +++---
 src/definition.cpp   |  7 ++-----
 src/definition.h     |  3 ++-
 src/definitionimpl.h |  4 ++--
 src/doxygen.cpp      |  2 +-
 src/entry.cpp        | 13 ++-----------
 src/entry.h          |  2 +-
 src/reflist.cpp      |  2 +-
 src/section.h        | 27 ++++++---------------------
 src/tagreader.cpp    |  2 +-
 src/util.cpp         |  1 -
 src/util.h           |  1 -
 13 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/src/cite.cpp b/src/cite.cpp
index 42f695f..3a204de 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -296,7 +296,7 @@ void CiteDict::generatePage() const
 
   // 7. add it as a page
   addRelatedPage(CiteConsts::fileName,
-       theTranslator->trCiteReferences(),doc,0,CiteConsts::fileName,1,0,0,0);
+       theTranslator->trCiteReferences(),doc,CiteConsts::fileName,1,0,0,0);
 
   // 8. for latex we just copy the bib files to the output and let 
   //    latex do this work.
diff --git a/src/commentscan.l b/src/commentscan.l
index 29bc1d9..b3fe0ae 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -605,7 +605,7 @@ static void addXRefItem(const char *listName,const char *itemTitle,
                          g_sectionTitle,SectionInfo::Anchor,
                          g_sectionLevel);
       Doxygen::sectionDict->append(anchorLabel,si);
-      current->anchors->append(si);
+      current->anchors.push_back(si);
     }
   }
   outputXRef.resize(0);
@@ -673,7 +673,7 @@ static void addSection()
                           g_sectionTitle,sectionLevelToType(g_sectionLevel),g_sectionLevel);
 
     // add section to this entry
-    current->anchors->append(si);
+    current->anchors.push_back(si);
 
     // add section to the global dictionary
     Doxygen::sectionDict->append(g_sectionLabel,si);
@@ -850,7 +850,7 @@ static void addAnchor(const char *anchor)
   {
     si = new SectionInfo(yyFileName,yyLineNr,anchor,0,SectionInfo::Anchor,0);
     Doxygen::sectionDict->append(anchor,si);
-    current->anchors->append(si);
+    current->anchors.push_back(si);
   }
 }
 
diff --git a/src/definition.cpp b/src/definition.cpp
index b44f2d1..3c37686 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -430,13 +430,10 @@ QCString DefinitionImpl::id() const
   return m_impl->id;
 }
 
-void DefinitionImpl::addSectionsToDefinition(QList<SectionInfo> *anchorList)
+void DefinitionImpl::addSectionsToDefinition(const std::vector<const SectionInfo*> &anchorList)
 {
-  if (!anchorList) return;
   //printf("%s: addSectionsToDefinition(%d)\n",name().data(),anchorList->count());
-  QListIterator<SectionInfo> it(*anchorList);
-  SectionInfo *si;
-  for (;(si=it.current());++it)
+  for (const SectionInfo *si : anchorList)
   {
     //printf("Add section '%s' to definition '%s'\n",
     //    si->label.data(),name().data());
diff --git a/src/definition.h b/src/definition.h
index db9bbbc..e03ca97 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -18,6 +18,7 @@
 #ifndef DEFINITION_H
 #define DEFINITION_H
 
+#include <vector>
 #include <qlist.h>
 #include <qdict.h>
 
@@ -331,7 +332,7 @@ class Definition : public DefinitionIntf
     /*! Add the list of anchors that mark the sections that are found in the 
      * documentation.
      */
-    virtual void addSectionsToDefinition(QList<SectionInfo> *anchorList) = 0;
+    virtual void addSectionsToDefinition(const std::vector<const SectionInfo*> &anchorList) = 0;
     virtual void addSourceReferencedBy(const MemberDef *d) = 0;
     virtual void addSourceReferences(const MemberDef *d) = 0;
     virtual void mergeRefItems(Definition *d) = 0;
diff --git a/src/definitionimpl.h b/src/definitionimpl.h
index 4dd324b..410122c 100644
--- a/src/definitionimpl.h
+++ b/src/definitionimpl.h
@@ -83,7 +83,7 @@ class DefinitionImpl : virtual public Definition
     virtual void setBriefDescription(const char *b,const char *briefFile,int briefLine);
     virtual void setInbodyDocumentation(const char *d,const char *docFile,int docLine);
     virtual void setReference(const char *r);
-    virtual void addSectionsToDefinition(QList<SectionInfo> *anchorList);
+    virtual void addSectionsToDefinition(const std::vector<const SectionInfo*> &anchorList);
     virtual void setBodySegment(int bls,int ble);
     virtual void setBodyDef(FileDef *fd);
     virtual void addSourceReferencedBy(const MemberDef *d);
@@ -241,7 +241,7 @@ class DefinitionAliasImpl : virtual public Definition
     virtual void setBriefDescription(const char *b,const char *briefFile,int briefLine) {}
     virtual void setInbodyDocumentation(const char *d,const char *docFile,int docLine) {}
     virtual void setReference(const char *r) {}
-    virtual void addSectionsToDefinition(QList<SectionInfo> *anchorList) {}
+    virtual void addSectionsToDefinition(const std::vector<const SectionInfo*> &anchorList) {}
     virtual void setBodySegment(int bls,int ble) {}
     virtual void setBodyDef(FileDef *fd) {}
     virtual void addSourceReferencedBy(const MemberDef *d) {}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index a75a820..6b976ca 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -583,7 +583,7 @@ static void addRelatedPage(Entry *root)
     doc=root->brief+"\n\n"+root->doc+root->inbodyDocs;
   }
 
-  PageDef *pd = addRelatedPage(root->name,root->args,doc,root->anchors,
+  PageDef *pd = addRelatedPage(root->name,root->args,doc,
       root->docFile,root->docLine,
       root->sli,
       gd,root->tagInfo(),
diff --git a/src/entry.cpp b/src/entry.cpp
index 625a448..16401bf 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -38,7 +38,6 @@ Entry::Entry()
   num++;
   m_parent=0;
   section = EMPTY_SEC;
-  anchors = new QList<SectionInfo>; // Doxygen::sectionDict takes ownership of the items!
   //printf("Entry::Entry() tArgList=0\n");
   mGrpId = -1;
   hasTagInfo = FALSE;
@@ -99,7 +98,7 @@ Entry::Entry(const Entry &e)
   bodyLine    = e.bodyLine;
   endBodyLine = e.endBodyLine;
   mGrpId      = e.mGrpId;
-  anchors     = new QList<SectionInfo>;
+  anchors     = e.anchors;
   fileName    = e.fileName;
   startLine   = e.startLine;
   startColumn = e.startColumn;
@@ -136,13 +135,6 @@ Entry::Entry(const Entry &e)
   extends = e.extends;
   groups  = e.groups;
 
-  QListIterator<SectionInfo> sli2(*e.anchors);
-  SectionInfo *s;
-  for (;(s=sli2.current());++sli2)
-  {
-    anchors->append(s); // shallow copy, object are owned by Doxygen::sectionDict
-  }
-
   m_fileDef = e.m_fileDef;
 
 }
@@ -153,7 +145,6 @@ Entry::~Entry()
   //printf("Deleting entry %d name %s type %x children %d\n",
   //       num,name.data(),section,sublist->count());
 
-  delete anchors;
   delete sli;
   num--;
 }
@@ -281,7 +272,7 @@ void Entry::reset()
   m_sublist.clear();
   extends.clear();
   groups.clear();
-  anchors->clear();
+  anchors.clear();
   argList.clear();
   tArgLists.clear();
   argList.reset();
diff --git a/src/entry.h b/src/entry.h
index 6146c57..d2f2783 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -293,7 +293,7 @@ class Entry
     int          mGrpId;      //!< member group id
     std::vector<BaseInfo> extends; //!< list of base classes
     std::vector<Grouping> groups;  //!< list of groups this entry belongs to
-    QList<SectionInfo> *anchors; //!< list of anchors defined in this entry
+    std::vector<const SectionInfo*> anchors; //!< list of anchors defined in this entry
     QCString	fileName;     //!< file this entry was extracted from
     int		startLine;    //!< start line of entry in the source
     int		startColumn;  //!< start column of entry in the source
diff --git a/src/reflist.cpp b/src/reflist.cpp
index e874653..57cd0c7 100644
--- a/src/reflist.cpp
+++ b/src/reflist.cpp
@@ -206,6 +206,6 @@ void RefList::generatePage()
   }
   doc += "</dl>\n";
   //printf("generatePage('%s')\n",doc.data());
-  addRelatedPage(m_listName,m_pageTitle,doc,0,m_fileName,1,0,0,0,TRUE);
+  addRelatedPage(m_listName,m_pageTitle,doc,m_fileName,1,0,0,0,TRUE);
 }
 
diff --git a/src/section.h b/src/section.h
index b6268a9..9e6c695 100644
--- a/src/section.h
+++ b/src/section.h
@@ -26,33 +26,18 @@ class Definition;
 /** Class representing a section in a page */
 struct SectionInfo
 {
-  enum SectionType { Page          = 0, 
-                     Section       = 1, 
-                     Subsection    = 2, 
-                     Subsubsection = 3, 
-                     Paragraph     = 4, 
+  enum SectionType { Page          = 0,
+                     Section       = 1,
+                     Subsection    = 2,
+                     Subsubsection = 3,
+                     Paragraph     = 4,
                      Anchor        = 5,
                      Table         = 6
                    };
   SectionInfo(const char *f,const int lin,const char *l,const char *t,
               SectionType st,int lev,const char *r=0) :
     label(l), title(t), type(st), ref(r), definition(0),
-    fileName(f), lineNr(lin), generated(FALSE), level(lev)
-  {
-  }
-  SectionInfo(const SectionInfo &s)
-  {
-    label=s.label.copy();
-    title=s.title.copy();
-    type =s.type;
-    ref=s.ref.copy();
-    definition=s.definition;
-    fileName=s.fileName.copy();
-    lineNr=s.lineNr;
-    generated=s.generated;
-    level=s.level;
-  }
- ~SectionInfo() {}
+    fileName(f), lineNr(lin), generated(FALSE), level(lev) {}
   QCString label;
   QCString title;
   SectionType type;
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index ef4888e..65336e3 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -1152,7 +1152,7 @@ void TagFileParser::addDocAnchors(const std::unique_ptr<Entry> &e,const TagAncho
       SectionInfo *si=new SectionInfo(ta->fileName,-1,ta->label,ta->title,
           SectionInfo::Anchor,0,m_tagName);
       Doxygen::sectionDict->append(ta->label,si);
-      e->anchors->append(si);
+      e->anchors.push_back(si);
     }
     else
     {
diff --git a/src/util.cpp b/src/util.cpp
index 36d673b..523b437 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6612,7 +6612,6 @@ found:
 
 PageDef *addRelatedPage(const char *name,const QCString &ptitle,
     const QCString &doc,
-    const QList<SectionInfo> * /*anchors*/,
     const char *fileName,int startLine,
     const QList<ListItemInfo> *sli,
     GroupDef *gd,
diff --git a/src/util.h b/src/util.h
index 1bddc8a..81620c0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -334,7 +334,6 @@ void addRefItem(const QList<ListItemInfo> *sli,const char *prefix,
 PageDef *addRelatedPage(const char *name,
                         const QCString &ptitle,
                         const QCString &doc,
-                        const QList<SectionInfo> *anchors,
                         const char *fileName,int startLine,
                         const QList<ListItemInfo> *sli,
                         GroupDef *gd=0,
-- 
cgit v0.12


From 38f1441dc329e72ba4c782fdc721ce5199e01a67 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 29 Oct 2019 22:52:33 +0100
Subject: Replaced QList<ListItemInfo> with std::vector<ListItemInfo>

---
 src/cite.cpp         |  2 +-
 src/classdef.cpp     |  2 +-
 src/commentscan.l    | 15 ++++-----
 src/definition.cpp   | 91 ++++++++++++++++------------------------------------
 src/definition.h     |  4 +--
 src/definitionimpl.h |  8 ++---
 src/doxygen.cpp      |  6 ++--
 src/entry.cpp        | 49 ++++++----------------------
 src/entry.h          |  7 +---
 src/filedef.cpp      |  2 +-
 src/groupdef.cpp     |  2 +-
 src/memberdef.cpp    | 15 ++++-----
 src/membergroup.cpp  | 36 +++------------------
 src/membergroup.h    | 14 ++++----
 src/namespacedef.cpp |  2 +-
 src/reflist.cpp      |  2 +-
 src/scanner.l        | 22 +++----------
 src/util.cpp         | 22 ++++++-------
 src/util.h           |  4 +--
 19 files changed, 93 insertions(+), 212 deletions(-)

diff --git a/src/cite.cpp b/src/cite.cpp
index 3a204de..e3314ca 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -296,7 +296,7 @@ void CiteDict::generatePage() const
 
   // 7. add it as a page
   addRelatedPage(CiteConsts::fileName,
-       theTranslator->trCiteReferences(),doc,CiteConsts::fileName,1,0,0,0);
+       theTranslator->trCiteReferences(),doc,CiteConsts::fileName,1);
 
   // 8. for latex we just copy the bib files to the output and let 
   //    latex do this work.
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 88bec11..7ce6bf1 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -4432,7 +4432,7 @@ void ClassDefImpl::addListReferences()
   if (!isLinkableInProject()) return;
   //printf("ClassDef(%s)::addListReferences()\n",name().data());
   {
-    QList<ListItemInfo> *xrefItems = xrefListItems();
+    const std::vector<ListItemInfo> &xrefItems = xrefListItems();
     addRefItem(xrefItems,
              qualifiedName(),
              lang==SrcLangExt_Fortran ? theTranslator->trType(TRUE,TRUE)
diff --git a/src/commentscan.l b/src/commentscan.l
index b3fe0ae..6e7d373 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -533,7 +533,7 @@ static void addXRefItem(const char *listName,const char *itemTitle,
   if (listName==0) return;
   //printf("addXRefItem(%s,%s,%s,%d)\n",listName,itemTitle,listTitle,append);
 
-  ListItemInfo *lii=0;
+  const ListItemInfo *lii=0;
   RefList *refList = Doxygen::xrefLists->find(listName);
   if (refList==0) // new list
   {
@@ -541,16 +541,13 @@ static void addXRefItem(const char *listName,const char *itemTitle,
     Doxygen::xrefLists->insert(listName,refList);
     //printf("new list!\n");
   }
-  if (current->sli)
+  for (const ListItemInfo &item : current->sli)
   {
-    QListIterator<ListItemInfo> slii(*current->sli);
-    for (slii.toLast();(lii=slii.current());--slii)
+    if (qstrcmp(item.type,listName)==0) 
     {
-      if (qstrcmp(lii->type,listName)==0) 
-      {
-        //printf("found %s lii->type=%s\n",listName,lii->type);
-        break;
-      }
+      //printf("found %s lii->type=%s\n",listName,lii->type);
+      lii = &item;
+      break;
     }
   }
   if (lii && append) // already found item of same type just before this one
diff --git a/src/definition.cpp b/src/definition.cpp
index 3c37686..5b2136c 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+#include <algorithm>
 #include <ctype.h>
 #include <qregexp.h>
 #include "md5.h"
@@ -59,7 +60,7 @@ class DefinitionImpl::IMPL
 
     MemberSDict *sourceRefByDict;
     MemberSDict *sourceRefsDict;
-    QList<ListItemInfo> *xrefListItems;
+    std::vector<ListItemInfo> xrefListItems;
     GroupList *partOfGroups;
 
     DocInfo   *details;    // not exported
@@ -97,7 +98,7 @@ class DefinitionImpl::IMPL
 
 DefinitionImpl::IMPL::IMPL()
   : sectionDict(0), sourceRefByDict(0), sourceRefsDict(0),
-    xrefListItems(0), partOfGroups(0),
+    partOfGroups(0),
     details(0), inbodyDocs(0), brief(0), body(0), hidden(FALSE), isArtificial(FALSE),
     outerScope(0), lang(SrcLangExt_Unknown)
 {
@@ -109,7 +110,6 @@ DefinitionImpl::IMPL::~IMPL()
   delete sourceRefByDict;
   delete sourceRefsDict;
   delete partOfGroups;
-  delete xrefListItems;
   delete brief;
   delete details;
   delete body;
@@ -150,7 +150,6 @@ void DefinitionImpl::IMPL::init(const char *df, const char *n)
   sectionDict     = 0, 
   outerScope      = Doxygen::globalScope;
   partOfGroups    = 0;
-  xrefListItems   = 0;
   hidden          = FALSE;
   isArtificial    = FALSE;
   lang            = SrcLangExt_Unknown;
@@ -327,7 +326,6 @@ DefinitionImpl::DefinitionImpl(const DefinitionImpl &d)
   m_impl->sourceRefByDict = 0;
   m_impl->sourceRefsDict = 0;
   m_impl->partOfGroups = 0;
-  m_impl->xrefListItems = 0;
   m_impl->brief = 0;
   m_impl->details = 0;
   m_impl->body = 0;
@@ -371,10 +369,6 @@ DefinitionImpl::DefinitionImpl(const DefinitionImpl &d)
       makePartOfGroup(gd);
     }
   }
-  if (d.m_impl->xrefListItems)
-  {
-    setRefItems(d.m_impl->xrefListItems);
-  }
   if (d.m_impl->brief)
   {
     m_impl->brief = new BriefInfo(*d.m_impl->brief);
@@ -1614,76 +1608,47 @@ void DefinitionImpl::makePartOfGroup(GroupDef *gd)
   m_impl->partOfGroups->append(gd);
 }
 
-void DefinitionImpl::setRefItems(const QList<ListItemInfo> *sli)
+void DefinitionImpl::setRefItems(const std::vector<ListItemInfo> &sli)
 {
-  //printf("%s::setRefItems()\n",name().data());
-  if (sli)
-  {
-    // deep copy the list
-    if (m_impl->xrefListItems==0) 
-    {
-      m_impl->xrefListItems=new QList<ListItemInfo>;
-      m_impl->xrefListItems->setAutoDelete(TRUE);
-    }
-    QListIterator<ListItemInfo> slii(*sli);
-    ListItemInfo *lii;
-    for (slii.toFirst();(lii=slii.current());++slii)
-    {
-      m_impl->xrefListItems->append(new ListItemInfo(*lii));
-    } 
-  }
+  m_impl->xrefListItems = sli;
 }
 
 void DefinitionImpl::mergeRefItems(Definition *d)
 {
-  //printf("%s::mergeRefItems()\n",name().data());
-  QList<ListItemInfo> *xrefList = d->xrefListItems();
-  if (xrefList!=0)
-  {
-    // deep copy the list
-    if (m_impl->xrefListItems==0) 
-    {
-      m_impl->xrefListItems=new QList<ListItemInfo>;
-      m_impl->xrefListItems->setAutoDelete(TRUE);
-    }
-    QListIterator<ListItemInfo> slii(*xrefList);
-    QListIterator<ListItemInfo> mlii(*m_impl->xrefListItems);
-    ListItemInfo *lii;
-    ListItemInfo *mii;
-    for (slii.toFirst();(lii=slii.current());++slii)
-    {
-      bool found = false;
-      for (mlii.toFirst();(mii=mlii.current());++mlii)
-      {
-        if ((qstrcmp(lii->type,mii->type)==0) && (lii->itemId == mii->itemId))
-	{
-          found = true;
-          break;
-	}
-      }
-      if (!found) m_impl->xrefListItems->append(new ListItemInfo(*lii));
-    } 
-  }
+  auto otherXrefList = d->xrefListItems();
+
+  // append vectors
+  m_impl->xrefListItems.reserve(m_impl->xrefListItems.size()+otherXrefList.size());
+  m_impl->xrefListItems.insert (m_impl->xrefListItems.end(),
+                                otherXrefList.begin(),otherXrefList.end());
+
+  // sort results on itemId
+  std::sort(m_impl->xrefListItems.begin(),m_impl->xrefListItems.end(),
+            [](const ListItemInfo &left,const ListItemInfo &right)
+            { return left.itemId<right.itemId ||
+                     (left.itemId==right.itemId && qstrcmp(left.type,right.type)<0);
+            });
+
+  // filter out duplicates
+  auto last = std::unique(m_impl->xrefListItems.begin(),m_impl->xrefListItems.end(),
+            [](const ListItemInfo &left,const ListItemInfo &right)
+            { return left.itemId==right.itemId && left.type==right.type; });
+  m_impl->xrefListItems.erase(last, m_impl->xrefListItems.end());
 }
 
 int DefinitionImpl::_getXRefListId(const char *listName) const
 {
-  if (m_impl->xrefListItems)
+  for (const ListItemInfo &lii : m_impl->xrefListItems)
   {
-    QListIterator<ListItemInfo> slii(*m_impl->xrefListItems);
-    ListItemInfo *lii;
-    for (slii.toFirst();(lii=slii.current());++slii)
+    if (lii.type==listName)
     {
-      if (qstrcmp(lii->type,listName)==0)
-      {
-        return lii->itemId;
-      }
+      return lii.itemId;
     }
   }
   return -1;
 }
 
-QList<ListItemInfo> *DefinitionImpl::xrefListItems() const
+const std::vector<ListItemInfo> &DefinitionImpl::xrefListItems() const
 {
   return m_impl->xrefListItems;
 }
diff --git a/src/definition.h b/src/definition.h
index e03ca97..d458683 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -258,7 +258,7 @@ class Definition : public DefinitionIntf
     virtual GroupList *partOfGroups() const = 0;
     virtual bool isLinkableViaGroup() const = 0;
 
-    virtual QList<ListItemInfo> *xrefListItems() const = 0;
+    virtual const std::vector<ListItemInfo> &xrefListItems() const = 0;
 
     virtual Definition *findInnerCompound(const char *name) const = 0;
     virtual Definition *getOuterScope() const = 0;
@@ -314,7 +314,7 @@ class Definition : public DefinitionIntf
     virtual void setBodySegment(int bls,int ble) = 0;
     virtual void setBodyDef(FileDef *fd) = 0;
 
-    virtual void setRefItems(const QList<ListItemInfo> *sli) = 0;
+    virtual void setRefItems(const std::vector<ListItemInfo> &sli) = 0;
     virtual void setOuterScope(Definition *d) = 0;
 
     virtual void setHidden(bool b) = 0;
diff --git a/src/definitionimpl.h b/src/definitionimpl.h
index 410122c..036c875 100644
--- a/src/definitionimpl.h
+++ b/src/definitionimpl.h
@@ -66,7 +66,7 @@ class DefinitionImpl : virtual public Definition
     virtual SrcLangExt getLanguage() const;
     virtual GroupList *partOfGroups() const;
     virtual bool isLinkableViaGroup() const;
-    virtual QList<ListItemInfo> *xrefListItems() const;
+    virtual const std::vector<ListItemInfo> &xrefListItems() const;
     virtual Definition *findInnerCompound(const char *name) const;
     virtual Definition *getOuterScope() const;
     virtual MemberSDict *getReferencesMembers() const;
@@ -88,7 +88,7 @@ class DefinitionImpl : virtual public Definition
     virtual void setBodyDef(FileDef *fd);
     virtual void addSourceReferencedBy(const MemberDef *d);
     virtual void addSourceReferences(const MemberDef *d);
-    virtual void setRefItems(const QList<ListItemInfo> *sli);
+    virtual void setRefItems(const std::vector<ListItemInfo> &sli);
     virtual void mergeRefItems(Definition *d);
     virtual void addInnerCompound(const Definition *d);
     virtual void setOuterScope(Definition *d);
@@ -210,7 +210,7 @@ class DefinitionAliasImpl : virtual public Definition
     { return m_def->partOfGroups(); }
     virtual bool isLinkableViaGroup() const
     { return m_def->isLinkableViaGroup(); }
-    virtual QList<ListItemInfo> *xrefListItems() const
+    virtual const std::vector<ListItemInfo> &xrefListItems() const
     { return m_def->xrefListItems(); }
     virtual Definition *findInnerCompound(const char *name) const
     { return m_def->findInnerCompound(name); }
@@ -246,7 +246,7 @@ class DefinitionAliasImpl : virtual public Definition
     virtual void setBodyDef(FileDef *fd) {}
     virtual void addSourceReferencedBy(const MemberDef *d) {}
     virtual void addSourceReferences(const MemberDef *d) {}
-    virtual void setRefItems(const QList<ListItemInfo> *sli) {}
+    virtual void setRefItems(const std::vector<ListItemInfo> &sli) {}
     virtual void mergeRefItems(Definition *d) {}
     virtual void addInnerCompound(const Definition *d) {}
     virtual void setOuterScope(Definition *d) {}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 6b976ca..9c77086 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -3939,7 +3939,7 @@ static void transferFunctionDocumentation()
         MemberNameIterator mni2(*mn);
         for (;(mdef=mni2.current());++mni2)
         {
-          if (!mdec->isAlias() && !mdef->isAlias())
+          if (mdec!=mdef && !mdec->isAlias() && !mdef->isAlias())
           {
             combineDeclarationAndDefinition(mdec,mdef);
           }
@@ -5180,7 +5180,7 @@ static void addListReferences()
       name = pd->getGroupDef()->getOutputFileBase();
     }
     {
-      QList<ListItemInfo> *xrefItems = pd->xrefListItems();
+      const std::vector<ListItemInfo> &xrefItems = pd->xrefListItems();
       addRefItem(xrefItems,
           name,
           theTranslator->trPage(TRUE,TRUE),
@@ -5197,7 +5197,7 @@ static void addListReferences()
     //{
     //  name = dd->getGroupDef()->getOutputFileBase();
     //}
-    QList<ListItemInfo> *xrefItems = dd->xrefListItems();
+    const std::vector<ListItemInfo> &xrefItems = dd->xrefListItems();
     addRefItem(xrefItems,
         name,
         theTranslator->trDir(TRUE,TRUE),
diff --git a/src/entry.cpp b/src/entry.cpp
index 16401bf..066c4a0 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -41,7 +41,6 @@ Entry::Entry()
   //printf("Entry::Entry() tArgList=0\n");
   mGrpId = -1;
   hasTagInfo = FALSE;
-  sli = 0;
   relatesType = Simple;
   hidden = FALSE;
   groupDocType = GROUPDOC_NORMAL;
@@ -102,41 +101,23 @@ Entry::Entry(const Entry &e)
   fileName    = e.fileName;
   startLine   = e.startLine;
   startColumn = e.startColumn;
-  if (e.sli)
-  {
-    sli = new QList<ListItemInfo>;
-    sli->setAutoDelete(TRUE);
-    QListIterator<ListItemInfo> slii(*e.sli);
-    ListItemInfo *ili;
-    for (slii.toFirst();(ili=slii.current());++slii)
-    {
-      sli->append(new ListItemInfo(*ili));
-    }
-  }
-  else
-  {
-    sli=0;
-  }
+  sli         = e.sli;
   lang        = e.lang;
   hidden      = e.hidden;
   artificial  = e.artificial;
   groupDocType = e.groupDocType;
   id          = e.id;
+  extends     = e.extends;
+  groups      = e.groups;
+  m_fileDef   = e.m_fileDef;
 
   m_parent    = e.m_parent;
-
   // deep copy child entries
   m_sublist.reserve(e.m_sublist.size());
   for (const auto &cur : e.m_sublist)
   {
     m_sublist.push_back(std::make_unique<Entry>(*cur));
   }
-
-  extends = e.extends;
-  groups  = e.groups;
-
-  m_fileDef = e.m_fileDef;
-
 }
 
 Entry::~Entry()
@@ -145,7 +126,6 @@ Entry::~Entry()
   //printf("Deleting entry %d name %s type %x children %d\n",
   //       num,name.data(),section,sublist->count());
 
-  delete sli;
   num--;
 }
 
@@ -277,16 +257,10 @@ void Entry::reset()
   tArgLists.clear();
   argList.reset();
   typeConstr.reset();
-  if (sli)        { delete sli; sli=0; }
+  sli.clear();
   m_fileDef = 0;
 }
 
-
-int Entry::getSize()
-{
-  return sizeof(Entry);
-}
-
 void Entry::setFileDef(FileDef *fd)
 {
   m_fileDef = fd;
@@ -298,15 +272,10 @@ void Entry::setFileDef(FileDef *fd)
 
 void Entry::addSpecialListItem(const char *listName,int itemId)
 {
-  if (sli==0)
-  {
-    sli = new QList<ListItemInfo>;
-    sli->setAutoDelete(TRUE);
-  }
-  ListItemInfo *ili=new ListItemInfo;
-  ili->type = listName;
-  ili->itemId = itemId;
-  sli->append(ili);
+  ListItemInfo ili;
+  ili.type = listName;
+  ili.itemId = itemId;
+  sli.push_back(ili);
 }
 
 
diff --git a/src/entry.h b/src/entry.h
index d2f2783..9d4ae9d 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -18,7 +18,6 @@
 #ifndef ENTRY_H
 #define ENTRY_H
 
-#include <qlist.h>
 #include <qgstring.h>
 
 #include <vector>
@@ -195,9 +194,6 @@ class Entry
     Entry(const Entry &);
    ~Entry();
 
-    /*! Returns the static size of the Entry (so excluding any dynamic memory) */
-    int getSize();
-
     void addSpecialListItem(const char *listName,int index);
 
     /*! Returns the parent for this Entry or 0 if this entry has no parent. */
@@ -206,7 +202,6 @@ class Entry
     /*! Returns the list of children for this Entry
      *  @see addSubEntry() and removeSubEntry()
      */
-    //const QList<Entry> *children() const { return m_sublist; }
     const std::vector< std::unique_ptr<Entry> > &children() const { return m_sublist; }
 
     /*! @name add entry as a child and pass ownership.
@@ -297,7 +292,7 @@ class Entry
     QCString	fileName;     //!< file this entry was extracted from
     int		startLine;    //!< start line of entry in the source
     int		startColumn;  //!< start column of entry in the source
-    QList<ListItemInfo> *sli; //!< special lists (test/todo/bug/deprecated/..) this entry is in
+    std::vector<ListItemInfo> sli; //!< special lists (test/todo/bug/deprecated/..) this entry is in
     SrcLangExt  lang;         //!< programming language in which this entry was found
     bool        hidden;       //!< does this represent an entity that is hidden from the output
     bool        artificial;   //!< Artificially introduced item
diff --git a/src/filedef.cpp b/src/filedef.cpp
index e4f6c86..f358dba 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -1680,7 +1680,7 @@ bool FileDefImpl::generateSourceFile() const
 void FileDefImpl::addListReferences()
 {
   {
-    QList<ListItemInfo> *xrefItems = xrefListItems();
+    const std::vector<ListItemInfo> &xrefItems = xrefListItems();
     addRefItem(xrefItems,
                getOutputFileBase(),
                theTranslator->trFile(TRUE,TRUE),
diff --git a/src/groupdef.cpp b/src/groupdef.cpp
index 882cebd..0d6d43f 100644
--- a/src/groupdef.cpp
+++ b/src/groupdef.cpp
@@ -1659,7 +1659,7 @@ QCString GroupDefImpl::getOutputFileBase() const
 void GroupDefImpl::addListReferences()
 {
   {
-    QList<ListItemInfo> *xrefItems = xrefListItems();
+    const std::vector<ListItemInfo> &xrefItems = xrefListItems();
     addRefItem(xrefItems,
              getOutputFileBase(),
              theTranslator->trGroup(TRUE,TRUE),
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 6fed840..f19a805 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -4460,14 +4460,11 @@ void MemberDefImpl::addListReference(Definition *)
       memArgs = argsString();
     }
   }
-  QList<ListItemInfo> *xrefItems = xrefListItems();
-  if (xrefItems)
-  {
-    addRefItem(xrefItems,
+  const std::vector<ListItemInfo> &xrefItems = xrefListItems();
+  addRefItem(xrefItems,
         qualifiedName()+argsString(), // argsString is needed for overloaded functions (see bug 609624)
         memLabel,
         getOutputFileBase()+"#"+anchor(),memName,memArgs,pd);
-  }
 }
 
 const MemberList *MemberDefImpl::getSectionList() const
@@ -5964,15 +5961,15 @@ static void transferArgumentDocumentation(ArgumentList &decAl,ArgumentList &defA
 
 void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
 {
-  //printf("mdec=%s isPrototype()=%d\n",mdec->name().data(),mdec->isPrototype());
+  printf("mdec=%s isPrototype()=%d\n",mdec->name().data(),mdec->isPrototype());
   if (
       (mdef->isFunction() && !mdef->isStatic() && !mdef->isPrototype()) ||
       (mdef->isVariable() && !mdef->isExternal() && !mdef->isStatic())
      )
   {
-    //printf("mdef=(%p,%s) mdec=(%p,%s)\n",
-    //    mdef, mdef ? mdef->name().data() : "",
-    //    mdec, mdec ? mdec->name().data() : "");
+    printf("mdef=(%p,%s) mdec=(%p,%s)\n",
+        mdef, mdef ? mdef->name().data() : "",
+        mdec, mdec ? mdec->name().data() : "");
 
     const MemberDef *cmdec = const_cast<const MemberDef*>(mdec);
     const MemberDef *cmdef = const_cast<const MemberDef*>(mdef);
diff --git a/src/membergroup.cpp b/src/membergroup.cpp
index c127302..da52d64 100644
--- a/src/membergroup.cpp
+++ b/src/membergroup.cpp
@@ -56,7 +56,6 @@ MemberGroup::MemberGroup(int id,const char *hdr,const char *d,const char *docFil
   m_numDocMembers = -1;
   m_docFile       = docFile;
   m_docLine       = docLine;
-  m_xrefListItems = 0;
   //printf("Member group docs='%s'\n",doc.data());
 }
 
@@ -340,7 +339,7 @@ QCString MemberGroup::anchor() const
 void MemberGroup::addListReferences(Definition *def)
 {
   memberList->addListReferences(def);
-  if (m_xrefListItems && def)
+  if (def)
   {
     QCString name = def->getOutputFileBase()+"#"+anchor();
     addRefItem(m_xrefListItems,
@@ -357,23 +356,9 @@ void MemberGroup::findSectionsInDocumentation(const Definition *d)
   memberList->findSectionsInDocumentation(d);
 }
 
-void MemberGroup::setRefItems(const QList<ListItemInfo> *sli)
+void MemberGroup::setRefItems(const std::vector<ListItemInfo> &sli)
 {
-  if (sli)
-  {
-    // deep copy the list
-    if (m_xrefListItems==0) 
-    {
-      m_xrefListItems=new QList<ListItemInfo>;
-      m_xrefListItems->setAutoDelete(TRUE);
-    }
-    QListIterator<ListItemInfo> slii(*sli);
-    ListItemInfo *lii;
-    for (slii.toFirst();(lii=slii.current());++slii)
-    {
-      m_xrefListItems->append(new ListItemInfo(*lii));
-    } 
-  }
+  m_xrefListItems = sli;
 }
 
 void MemberGroup::writeTagFile(FTextStream &tagFile)
@@ -383,18 +368,7 @@ void MemberGroup::writeTagFile(FTextStream &tagFile)
 
 //--------------------------------------------------------------------------
 
-void MemberGroupInfo::setRefItems(const QList<ListItemInfo> *sli)
+void MemberGroupInfo::setRefItems(const std::vector<ListItemInfo> &sli)
 {
-  if (!sli) return;
-  if (m_sli==0)
-  {
-    m_sli = new QList<ListItemInfo>;
-    m_sli->setAutoDelete(TRUE);
-  }
-  QListIterator<ListItemInfo> slii(*sli);
-  ListItemInfo *ili;
-  for (slii.toFirst();(ili=slii.current());++slii)
-  {
-    m_sli->append(new ListItemInfo(*ili));
-  }
+  m_sli = sli;
 }
diff --git a/src/membergroup.h b/src/membergroup.h
index 51dc04b..0fda3d7 100644
--- a/src/membergroup.h
+++ b/src/membergroup.h
@@ -18,6 +18,8 @@
 #ifndef MEMBERGROUP_H
 #define MEMBERGROUP_H
 
+#include <vector>
+
 #include <qlist.h>
 #include "sortdict.h"
 #include "types.h"
@@ -79,7 +81,7 @@ class MemberGroup
     int countInheritableMembers(const ClassDef *inheritedFrom) const;
     void setInGroup(bool b);
     void addListReferences(Definition *d);
-    void setRefItems(const QList<ListItemInfo> *sli);
+    void setRefItems(const std::vector<ListItemInfo> &sli);
     MemberList *members() const { return memberList; }
     QCString anchor() const;
 
@@ -99,7 +101,7 @@ class MemberGroup
     const Definition *m_parent;
     QCString m_docFile;
     int m_docLine;
-    QList<ListItemInfo> *m_xrefListItems;
+    std::vector<ListItemInfo> m_xrefListItems;
 };
 
 /** A list of MemberGroup objects. */
@@ -131,15 +133,13 @@ class MemberGroupSDict : public SIntDict<MemberGroup>
 /** Data collected for a member group */
 struct MemberGroupInfo
 {
-  MemberGroupInfo() : docLine(-1), m_sli(0) {}
- ~MemberGroupInfo() { delete m_sli; m_sli=0; }
-  void setRefItems(const QList<ListItemInfo> *sli);
+  void setRefItems(const std::vector<ListItemInfo> &sli);
   QCString header;
   QCString doc;
   QCString docFile;
-  int docLine;
+  int docLine = -1;
   QCString compoundName;
-  QList<ListItemInfo> *m_sli;
+  std::vector<ListItemInfo> m_sli;
 };
 
 #endif
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 9a98e0d..fa258a0 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -1269,7 +1269,7 @@ void NamespaceDefImpl::addListReferences()
 {
   //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
   {
-    QList<ListItemInfo> *xrefItems = xrefListItems();
+    const std::vector<ListItemInfo> &xrefItems = xrefListItems();
     addRefItem(xrefItems,
         qualifiedName(),
         getLanguage()==SrcLangExt_Fortran ? 
diff --git a/src/reflist.cpp b/src/reflist.cpp
index 57cd0c7..016ef49 100644
--- a/src/reflist.cpp
+++ b/src/reflist.cpp
@@ -206,6 +206,6 @@ void RefList::generatePage()
   }
   doc += "</dl>\n";
   //printf("generatePage('%s')\n",doc.data());
-  addRelatedPage(m_listName,m_pageTitle,doc,m_fileName,1,0,0,0,TRUE);
+  addRelatedPage(m_listName,m_pageTitle,doc,m_fileName,1,std::vector<ListItemInfo>(),0,0,TRUE);
 }
 
diff --git a/src/scanner.l b/src/scanner.l
index 6524272..957c1e4 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4172,15 +4172,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      varEntry->mGrpId = current->mGrpId;
                                               varEntry->initializer = current->initializer;
                                               varEntry->groups = current->groups;
-					      if (current->sli) // copy special list items
-					      {
-						QListIterator<ListItemInfo> li(*current->sli);
-						ListItemInfo *lii;
-						for (li.toFirst();(lii=li.current());++li)
-						{
-						  varEntry->addSpecialListItem(lii->type,lii->itemId);
-						}
-					      }
+                                              varEntry->sli = current->sli;
 
 					      //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n",
 					      //      varEntry->type.data(),varEntry->name.data(),
@@ -5211,16 +5203,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    if (current->sli && previous) // copy special list items
+					    if (!current->sli.empty() && previous) // copy special list items
 					    {
-					      QListIterator<ListItemInfo> li(*current->sli);
-					      ListItemInfo *lii;
-					      for (li.toFirst();(lii=li.current());++li)
-					      {
-						previous->addSpecialListItem(lii->type,lii->itemId);
-					      }
-					      delete current->sli;
-					      current->sli = 0;
+                                              previous->sli = current->sli;
+					      current->sli.clear();
 					    }
 					    if (previous) previous->endBodyLine=yyLineNr;
 					    BEGIN( lastCurlyContext ) ;
diff --git a/src/util.cpp b/src/util.cpp
index 523b437..8e0884f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6613,7 +6613,7 @@ found:
 PageDef *addRelatedPage(const char *name,const QCString &ptitle,
     const QCString &doc,
     const char *fileName,int startLine,
-    const QList<ListItemInfo> *sli,
+    const std::vector<ListItemInfo> &sli,
     GroupDef *gd,
     const TagInfo *tagInfo,
     bool xref,
@@ -6701,30 +6701,28 @@ PageDef *addRelatedPage(const char *name,const QCString &ptitle,
 
 //----------------------------------------------------------------------------
 
-void addRefItem(const QList<ListItemInfo> *sli,
+void addRefItem(const std::vector<ListItemInfo> &sli,
     const char *key, 
     const char *prefix, const char *name,const char *title,const char *args,Definition *scope)
 {
   //printf("addRefItem(sli=%p,key=%s,prefix=%s,name=%s,title=%s,args=%s)\n",sli,key,prefix,name,title,args);
-  if (sli && key && key[0]!='@') // check for @ to skip anonymous stuff (see bug427012)
+  if (key && key[0]!='@') // check for @ to skip anonymous stuff (see bug427012)
   {
-    QListIterator<ListItemInfo> slii(*sli);
-    ListItemInfo *lii;
-    for (slii.toFirst();(lii=slii.current());++slii)
+    for (const ListItemInfo &lii : sli)
     {
-      RefList *refList = Doxygen::xrefLists->find(lii->type);
+      RefList *refList = Doxygen::xrefLists->find(lii.type);
       if (refList
           &&
           (
            // either not a built-in list or the list is enabled
-           (lii->type!="todo"       || Config_getBool(GENERATE_TODOLIST)) &&
-           (lii->type!="test"       || Config_getBool(GENERATE_TESTLIST)) &&
-           (lii->type!="bug"        || Config_getBool(GENERATE_BUGLIST))  &&
-           (lii->type!="deprecated" || Config_getBool(GENERATE_DEPRECATEDLIST))
+           (lii.type!="todo"       || Config_getBool(GENERATE_TODOLIST)) &&
+           (lii.type!="test"       || Config_getBool(GENERATE_TESTLIST)) &&
+           (lii.type!="bug"        || Config_getBool(GENERATE_BUGLIST))  &&
+           (lii.type!="deprecated" || Config_getBool(GENERATE_DEPRECATEDLIST))
           )
          )
       {
-        RefItem *item = refList->getRefItem(lii->itemId);
+        RefItem *item = refList->getRefItem(lii.itemId);
         ASSERT(item!=0);
 
         item->prefix = prefix;
diff --git a/src/util.h b/src/util.h
index 81620c0..662a1db 100644
--- a/src/util.h
+++ b/src/util.h
@@ -327,7 +327,7 @@ int getScopeFragment(const QCString &s,int p,int *l);
 
 int filterCRLF(char *buf,int len);
 
-void addRefItem(const QList<ListItemInfo> *sli,const char *prefix,
+void addRefItem(const std::vector<ListItemInfo> &sli,const char *prefix,
                 const char *key,
                 const char *name,const char *title,const char *args,Definition *scope);
 
@@ -335,7 +335,7 @@ PageDef *addRelatedPage(const char *name,
                         const QCString &ptitle,
                         const QCString &doc,
                         const char *fileName,int startLine,
-                        const QList<ListItemInfo> *sli,
+                        const std::vector<ListItemInfo> &sli = std::vector<ListItemInfo>(),
                         GroupDef *gd=0,
                         const TagInfo *tagInfo=0,
                         bool xref=FALSE,
-- 
cgit v0.12


From 35461e5fe44be0537e60fd659fec9215181d4fd0 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 30 Oct 2019 16:39:23 +0100
Subject: issue #7358: Ternary conditional and null-coalescing operator in
 constructor results in faulty warning

Problem due to the implementation of "Support for C# nullable types (Origin: bugzilla #638606)" (issue #4064, pull request #645). The used condition was a bit to stringent so later on the function was not recognized as constructor.
---
 src/scanner.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scanner.l b/src/scanner.l
index 61b51cb..c8951e5 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -6923,7 +6923,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <*>\?                                   {
-  					  if (insideCS) 
+  					  if (insideCS && (YY_START != SkipRound)) 
 					  {
 					    if (current->type.isEmpty())
 					    {
-- 
cgit v0.12


From 6b2def9ad52da8709ce9ffa91c792009f1902e41 Mon Sep 17 00:00:00 2001
From: "Charles.Lee" <cheoljoo@gmail.com>
Date: Thu, 31 Oct 2019 23:45:17 +0900
Subject: bug fix of g_bracketCount in case of if( myobject.getPair() )

---
 src/code.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/code.l b/src/code.l
index cbcb560..10468f3 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2775,7 +2775,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					    g_name.resize(0);
 					  }
 					  g_type.resize(0);
-					  g_bracketCount=0;
+					  // g_bracketCount=0; // ex.  when we parse this syntax " if( myobject.getPair()) " , we have problem that g_braceCount has wrong value as zero at "getPair(".
 					  if (g_memCallContext==Body)
 					  {
 					    BEGIN(FuncCall);
-- 
cgit v0.12


From 180c9c48cf9d466fc8fcaf3118ee2ec07b3b574d Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Fri, 1 Nov 2019 16:46:45 +0100
Subject: Removed commented out line

---
 src/code.l | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/code.l b/src/code.l
index 894082d..4a9b0da 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2793,7 +2793,6 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					    g_name.resize(0);
 					  }
 					  g_type.resize(0);
-					  // g_bracketCount=0; // ex.  when we parse this syntax " if( myobject.getPair()) " , we have problem that g_braceCount has wrong value as zero at "getPair(".
 					  if (g_memCallContext==Body)
 					  {
 					    BEGIN(FuncCall);
-- 
cgit v0.12


From 4051a98915f2d831efce409c16126712880c9a28 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 1 Nov 2019 19:00:05 +0100
Subject: Removing left over debug statements

Removing some leftover debug statements from38f1441dc329e72ba4c782fdc721ce5199e01a67 and 6216208b0a4288a41450e4d37226f0e4c492128c
---
 src/doxygen.cpp   | 2 +-
 src/memberdef.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 9c77086..4f4d13b 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1411,7 +1411,7 @@ static void resolveClassNestingRelations()
                 d->addInnerCompound(aliasCd);
                 QCString aliasFullName = d->qualifiedName()+"::"+aliasCd->localName();
                 Doxygen::classSDict->append(aliasFullName,aliasCd);
-                printf("adding %s to %s as %s\n",qPrint(aliasCd->name()),qPrint(d->name()),qPrint(aliasFullName));
+                //printf("adding %s to %s as %s\n",qPrint(aliasCd->name()),qPrint(d->name()),qPrint(aliasFullName));
                 aliasCd->setVisited(TRUE);
               }
             }
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index f19a805..b79bd50 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -5961,15 +5961,15 @@ static void transferArgumentDocumentation(ArgumentList &decAl,ArgumentList &defA
 
 void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
 {
-  printf("mdec=%s isPrototype()=%d\n",mdec->name().data(),mdec->isPrototype());
+  //printf("mdec=%s isPrototype()=%d\n",mdec->name().data(),mdec->isPrototype());
   if (
       (mdef->isFunction() && !mdef->isStatic() && !mdef->isPrototype()) ||
       (mdef->isVariable() && !mdef->isExternal() && !mdef->isStatic())
      )
   {
-    printf("mdef=(%p,%s) mdec=(%p,%s)\n",
-        mdef, mdef ? mdef->name().data() : "",
-        mdec, mdec ? mdec->name().data() : "");
+    //printf("mdef=(%p,%s) mdec=(%p,%s)\n",
+    //    mdef, mdef ? mdef->name().data() : "",
+    //    mdec, mdec ? mdec->name().data() : "");
 
     const MemberDef *cmdec = const_cast<const MemberDef*>(mdec);
     const MemberDef *cmdef = const_cast<const MemberDef*>(mdef);
-- 
cgit v0.12


From 3fe10a7eba7d55d2e542f3cd354d5a52701249ef Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 2 Nov 2019 15:53:49 +0100
Subject: Changed implementation to use SkipString/SkipStringS.

---
 src/code.l | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/code.l b/src/code.l
index c596bce..60d6c7e 100644
--- a/src/code.l
+++ b/src/code.l
@@ -2353,12 +2353,6 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  g_code->codify(yytext);
 					  g_insideProtocolList=FALSE;
   					}
-<SkipSharp>"\""((\\0[Xx0-9]+)|(\\.)|(.))*"\""	{
-  					  g_code->codify(yytext);
-  					}
-<SkipSharp>"'"((\\0[Xx0-9]+)|(\\.)|(.))"'"	{
-  					  g_code->codify(yytext);
-  					}
 <SkipSharp>"<"                          {
   					  g_code->codify(yytext);
   					  ++g_sharpCount; 
@@ -2368,6 +2362,16 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  if (--g_sharpCount<=0)
 					  BEGIN ( Bases );
 					}
+<SkipSharp>"\""                         {
+  					  g_code->codify(yytext);
+  					  g_lastStringContext=YY_START;
+                                          BEGIN(SkipString);
+                                        }
+<SkipSharp>"\'"                         {
+  					  g_code->codify(yytext);
+  					  g_lastStringContext=YY_START;
+                                          BEGIN(SkipStringS);
+                                        }
 <Bases>"("                              {
                                           g_code->codify(yytext);
                                           g_sharpCount=1;
-- 
cgit v0.12


From 1b068420dfe71dfed32e5f629563e7e648d11792 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 3 Nov 2019 12:32:59 +0100
Subject: Update generated VHDL code to JavaCC 7.0.5

---
 vhdlparser/CharStream.cc             |   22 +-
 vhdlparser/CharStream.h              |  104 +-
 vhdlparser/ErrorHandler.h            |   22 +-
 vhdlparser/JavaCC.h                  |   47 +-
 vhdlparser/ParseException.cc         |   50 +-
 vhdlparser/ParseException.h          |   22 +-
 vhdlparser/Token.cc                  |   37 +-
 vhdlparser/Token.h                   |   18 +-
 vhdlparser/TokenManager.h            |   15 +-
 vhdlparser/TokenMgrError.cc          |   28 +-
 vhdlparser/TokenMgrError.h           |   20 +-
 vhdlparser/VhdlParser.cc             | 5030 +++++++++++-----------------------
 vhdlparser/VhdlParser.h              | 1013 ++-----
 vhdlparser/VhdlParserConstants.h     |  384 +--
 vhdlparser/VhdlParserTokenManager.cc |  477 ++--
 vhdlparser/VhdlParserTokenManager.h  |   75 +-
 16 files changed, 2514 insertions(+), 4850 deletions(-)

diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc
index 65179f5..05003ef 100644
--- a/vhdlparser/CharStream.cc
+++ b/vhdlparser/CharStream.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "CharStream.h"
 
@@ -12,8 +12,8 @@ void ArrayCopy(T* src, int src_offset, T* dest, int dest_offset, int len) {
 
 class StringReaderStream : public ReaderStream {
  public:
-  StringReaderStream(const JAVACC_STRING_TYPE& str) : str_(str), cur_(0), max_(str.size()) {}
-  virtual size_t read(JAVACC_CHAR_TYPE *bufptr, int offset, size_t len) {
+  StringReaderStream(const JJString& str) : str_(str), cur_(0), max_(str.size()) {}
+  virtual size_t read(JJChar *bufptr, int offset, size_t len) {
     size_t count = str_.copy(bufptr + offset, len > max_ ? max_ : len, cur_);
     cur_ += count;
     max_ -= count;
@@ -25,7 +25,7 @@ class StringReaderStream : public ReaderStream {
   }
 
  private:
-  const JAVACC_STRING_TYPE str_;
+  const JJString str_;
   size_t cur_;
   size_t max_;
 };
@@ -33,7 +33,7 @@ class StringReaderStream : public ReaderStream {
 
 namespace vhdl {
 namespace parser {
-void CharStream::ReInit(const JAVACC_STRING_TYPE& str, int startline,
+void CharStream::ReInit(const JJString& str, int startline,
                         int startcolumn, int buffersize) {
   StringReaderStream *stream = new StringReaderStream(str);
   ReInit(stream, startline, startcolumn, buffersize);
@@ -46,12 +46,12 @@ void CharStream::ReInit(ReaderStream *input_stream, int startline,
    delete inputStream;
   }
 
-  if (buffer != NULL) {
+  if (buffer) {
     DeleteBuffers();
   }
 
   available = bufsize = buffersize;
-  buffer = new JAVACC_CHAR_TYPE[buffersize];
+  buffer = new JJChar[buffersize];
   bufline = new int[buffersize];
   bufcolumn = new int[buffersize];
 
@@ -111,7 +111,7 @@ void CharStream::adjustBeginLineColumn(int newLine, int newCol) {
 }
 
 void CharStream::ExpandBuff(bool wrapAround) {
-  JAVACC_CHAR_TYPE *newbuffer = new JAVACC_CHAR_TYPE[bufsize + 2048];
+  JJChar *newbuffer = new JJChar[bufsize + 2048];
   int *newbufline = new int[bufsize + 2048];
   int *newbufcolumn = new int[bufsize + 2048];
 
@@ -160,7 +160,7 @@ void CharStream::FillBuff() {
     }
   }
 
-  int i = inputStream->read(buffer, maxNextCharInd, available - maxNextCharInd);
+  size_t i = inputStream->read(buffer, maxNextCharInd, available - maxNextCharInd);
   if (i > 0) {
     maxNextCharInd += i;
   } else {
@@ -172,7 +172,7 @@ void CharStream::FillBuff() {
   }
 }
 
-void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
+void CharStream::UpdateLineColumn(JJChar c) {
   column++;
   if (prevCharIsLF) {
     prevCharIsLF = false;
@@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
 
 }
 }
-/* JavaCC - OriginalChecksum=ade3c1b57a731a003629de593814ffa6 (do not edit this line) */
+/* JavaCC - OriginalChecksum=0ba78d6c493d812eba61de6fa794fd15 (do not edit this line) */
diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index 2543ad1..a955d8e 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef CHARSTREAM_H
-#define CHARSTREAM_H
+#ifndef JAVACC_CHARSTREAM_H_
+#define JAVACC_CHARSTREAM_H_
+
 #include "JavaCC.h"
 
 #ifndef INITIAL_BUFFER_SIZE
@@ -29,9 +30,10 @@ namespace parser {
 
 class CharStream {
 public:
-          void setTabSize(int i) { tabSize = i; }
-          int  getTabSize(int i) { return tabSize; }
- private:
+   void setTabSize(int i) { tabSize = i; }
+   int  getTabSize(int i) { return tabSize; }
+
+private:
   int getBufcolumn(int pos) {
     if (trackLineColumn && pos>=0) {
       return bufcolumn[pos];
@@ -46,13 +48,14 @@ public:
       return -1;
     }
   }
- public:
-  virtual int getColumn() { return getBufcolumn(bufpos); }
-  virtual int getLine() { return getBufline(bufpos); }
-  virtual int getEndColumn() { return getBufcolumn(bufpos); }
-  virtual int getEndLine() { return getBufline(bufpos); }
-  virtual int getBeginColumn() { return getBufcolumn(tokenBegin); }
-  virtual int getBeginLine() { return getBufline(tokenBegin); }
+
+public:
+  virtual int getColumn()        { return getBufcolumn(bufpos); }
+  virtual int getLine()          { return getBufline(bufpos); }
+  virtual int getEndColumn()     { return getBufcolumn(bufpos); }
+  virtual int getEndLine()       { return getBufline(bufpos); }
+  virtual int getBeginColumn()   { return getBufcolumn(tokenBegin); }
+  virtual int getBeginLine()     { return getBufline(tokenBegin); }
 
   virtual bool getTrackLineColumn()         { return trackLineColumn; }
   virtual void setTrackLineColumn(bool val) { trackLineColumn = val; }
@@ -76,9 +79,9 @@ public:
  * All characters must remain in the buffer between two successive calls
  * to this method to implement backup correctly.
  */
-  virtual inline JAVACC_CHAR_TYPE BeginToken() {
+  virtual inline JJChar BeginToken() {
     tokenBegin = -1;
-    JAVACC_CHAR_TYPE c = readChar();
+    JJChar c = readChar();
     tokenBegin = bufpos;
     return c;
   }
@@ -89,7 +92,7 @@ public:
  * of selecting the input is the responsibility of the class
  * implementing this class.
  */
-  virtual inline JAVACC_CHAR_TYPE readChar() {
+  virtual inline JJChar readChar() {
     if (inBuf > 0) {
       --inBuf;
       ++bufpos;
@@ -104,7 +107,7 @@ public:
       FillBuff();
     }
 
-    JAVACC_CHAR_TYPE c = buffer[bufpos];
+    JJChar c = buffer[bufpos];
 
     if (trackLineColumn) {
       UpdateLineColumn(c);
@@ -123,11 +126,11 @@ public:
    * anything that they want to. For example, for efficiency, one might decide
    * to just return NULL, which is a valid implementation.
    */
-  virtual JAVACC_STRING_TYPE GetImage() {
+  virtual JJString GetImage() {
     if (bufpos >= tokenBegin)
-      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufpos - tokenBegin + 1);
+      return JJString(buffer + tokenBegin, bufpos - tokenBegin + 1);
     else
-      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
+      return JJString(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
   }
 
   /**
@@ -136,11 +139,11 @@ public:
    * for use in actions in the case of MORE. A simple and inefficient
    * implementation of this is as follows :
    */
-  virtual JAVACC_STRING_TYPE GetSuffix(int len) {
+  virtual JJString GetSuffix(int len) {
     if ((bufpos + 1) >= len) {
-      return JAVACC_STRING_TYPE(buffer + bufpos - len + 1, len);
+      return JJString(buffer + bufpos - len + 1, len);
     }
-    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
+    return JJString(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
   }
 
   /**
@@ -160,62 +163,62 @@ public:
     return inBuf == 0 && bufpos + 1 >= maxNextCharInd && inputStream->endOfInput();
   }
 
-  CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline,
+  CharStream(const JJChar *buf, int sz, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
-    ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize);
+    inputStream(nullptr), deleteStream(false) {
+    ReInit(JJString(buf, sz), startline, startcolumn, buffersize);
   }
 
-  CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+  CharStream(const JJChar *buf, int sz, int startline, int startcolumn) :
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
-    ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
+    inputStream(nullptr), deleteStream(false) {
+    ReInit(JJString(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
-  CharStream(const JAVACC_STRING_TYPE& str, int startline,
+  CharStream(const JJString& str, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    inputStream(nullptr), deleteStream(false) {
     ReInit(str, startline, startcolumn, buffersize);
   }
 
-  CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+  CharStream(const JJString& str, int startline, int startcolumn) :
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    inputStream(nullptr), deleteStream(false) {
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline,
              int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
-    ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
+    inputStream(nullptr), deleteStream(false) {
+    ReInit(input_stream, startline, startcolumn, buffersize);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    inputStream(nullptr), deleteStream(false) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream) :
-    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
     tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
     available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(NULL), deleteStream(false) {
+    inputStream(nullptr), deleteStream(false) {
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
@@ -229,22 +232,22 @@ public:
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(const JAVACC_STRING_TYPE& str, int startline,
+  virtual void ReInit(const JJString& str, int startline,
                       int startcolumn, int buffersize);
 
-  virtual void ReInit(const JAVACC_STRING_TYPE& str, int startline,
+  virtual void ReInit(const JJString& str, int startline,
                       int startcolumn) {
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   virtual void adjustBeginLineColumn(int newLine, int newCol);
 
- protected:
-  virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c);
+protected:
+  virtual void UpdateLineColumn(JJChar c);
 
   int*               bufline;
   int*               bufcolumn;
-  JAVACC_CHAR_TYPE*  buffer;
+  JJChar*  	         buffer;
   int                bufpos;
   int                bufsize;
   int                tokenBegin;
@@ -263,5 +266,6 @@ public:
 
 }
 }
+
 #endif
-/* JavaCC - OriginalChecksum=3f0e693d1617236429891c8c95713d73 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c5b4b2e72393f865547f405cc9def169 (do not edit this line) */
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index 9f7dc07..d5535e8 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */
-#ifndef ERRORHANDLER_H
-#define ERRORHANDLER_H
+#ifndef JAVACC_ERRORHANDLER_H
+#define JAVACC_ERRORHANDLER_H
+
 #include <stdio.h>
 #include <string>
 #include "JavaCC.h"
@@ -10,7 +11,7 @@
 namespace vhdl {
 namespace parser {
 
-JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
+JJSimpleString addUnicodeEscapes(const JJString& str);
 
   class VhdlParser;
   class ErrorHandler {
@@ -24,7 +25,7 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
       // expectedKind - token kind that the parser was trying to consume.
       // expectedToken - the image of the token - tokenImages[expectedKind].
       // actual - the actual token that the parser got instead.
-      virtual void handleUnexpectedToken(int expectedKind, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *parser) {
+      virtual void handleUnexpectedToken(int expectedKind, const JJString& expectedToken, Token *actual, VhdlParser *parser) {
         error_count++;
         fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str());
       }
@@ -32,14 +33,14 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
       // last - the last token successfully parsed.
       // unexpected - the token at which the error occurs.
       // production - the production in which this error occurrs.
-      virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser) {
+      virtual void handleParseError(Token *last, Token *unexpected, const JJSimpleString& production, VhdlParser *parser) {
         error_count++;
         fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str());
       }
       virtual int getErrorCount() {
         return error_count;
       }
-      virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *parser) {
+      virtual void handleOtherError(const JJString& message, VhdlParser *parser) {
         fprintf(stderr, "Error: %s\n", (char*)message.c_str());
       }
       virtual ~ErrorHandler() {}
@@ -62,11 +63,11 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
        //    errorAfter  : prefix that was seen before this error occurred
        //    curchar     : the offending character
        //
-       virtual void lexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* token_manager) {
+       virtual void lexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, VhdlParserTokenManager* token_manager) {
         // by default, we just print an error message and return.
         fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str()));
       }
-       virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* token_manager) {
+       virtual void lexicalError(const JJString& errorMessage, VhdlParserTokenManager* token_manager) {
         fprintf(stderr, "%s\n", (char*)errorMessage.c_str());
       }
       virtual ~TokenManagerErrorHandler() {}
@@ -76,4 +77,5 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
 }
 
 #endif
-/* JavaCC - OriginalChecksum=c18f1105ba178be8e21cc9f279f94496 (do not edit this line) */
+
+/* JavaCC - OriginalChecksum=5361b31ac6530c6c23511012deb15394 (do not edit this line) */
diff --git a/vhdlparser/JavaCC.h b/vhdlparser/JavaCC.h
index 224b2b5..2d34634 100644
--- a/vhdlparser/JavaCC.h
+++ b/vhdlparser/JavaCC.h
@@ -1,31 +1,33 @@
-/* Generated By:JavaCC: Do not edit this line. JavaCC.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. JavaCC.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_H_
-#define JAVACC_H_
-#include <stdio.h>
+#ifndef JAVACC_JAVACC_H_
+#define JAVACC_JAVACC_H_
+
 #include <string>
-#include <memory.h>
-#include <assert.h>
-#include "vhdlstring.h"
+#include <memory>
+#include <cassert>
+#include <functional>
 
 #ifndef JAVACC_CHAR_TYPE
 #define JAVACC_CHAR_TYPE char
 #endif
 
 #ifndef JAVACC_STRING_TYPE
-#define JAVACC_STRING_TYPE VhdlString
+#define JAVACC_STRING_TYPE std::basic_string<JAVACC_CHAR_TYPE>
 #endif
 
-#define JAVACC_SIMPLE_STRING VhdlString
+#define JAVACC_SIMPLE_STRING std::basic_string<char>
 
-typedef JAVACC_STRING_TYPE StringBuffer;
-typedef JAVACC_STRING_TYPE String;
+typedef JAVACC_CHAR_TYPE     JJChar;
+typedef JAVACC_STRING_TYPE   JJString;
+typedef JAVACC_STRING_TYPE   JJStringBuffer;
+typedef JAVACC_SIMPLE_STRING JJSimpleString;
 
 // Abstraction on stream classes to read a block of data into a buffer.
 class ReaderStream {
 public:
   // Read block of data into a buffer and return the actual number read.
-  virtual size_t read(JAVACC_CHAR_TYPE * /*bufptr*/, int /*offset*/, size_t /*len*/) { return 0; }
+  virtual size_t read(JAVACC_CHAR_TYPE *buffer, int offset, size_t len) { return 0; }
   virtual bool   endOfInput() { return true; }
   virtual ~ReaderStream() {}
 };
@@ -33,11 +35,26 @@ public:
 const JAVACC_CHAR_TYPE EMPTY[] = { 0 };
 
 #ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
+#define MAX(a,b) (a>=b?a:b)
 #endif
 #ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
+#define MIN(a,b) (a<=b?a:b)
 #endif
 
+template<typename T>
+struct JJEnter
+{
+    JJEnter(T f_) : f{f_} {f();}
+    ~JJEnter(){}
+    T f;
+};
+template<typename T>
+struct JJExit
+{
+    JJExit(T f_) : f{f_} {}
+    ~JJExit(){f();}
+    T f;
+};
+
 #endif
-/* JavaCC - OriginalChecksum=eb066370c81bb58bb68713327da9719f (do not edit this line) */
+/* JavaCC - OriginalChecksum=b719dd5e5f87efc5315d14df0b701850 (do not edit this line) */
diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc
index 6ef9738..9f256d9 100644
--- a/vhdlparser/ParseException.cc
+++ b/vhdlparser/ParseException.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "ParseException.h"
 
@@ -23,7 +23,7 @@ namespace parser {
    */
   ParseException::ParseException(Token currentTokenVal,
                         int** expectedTokenSequencesVal,
-                        JAVACC_STRING_TYPE* tokenImageVal
+                        JJString* tokenImageVal
                        )
   {
     initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal);
@@ -46,7 +46,7 @@ namespace parser {
   }
 
   /** Constructor with message. */
-  ParseException::ParseException(JAVACC_STRING_TYPE message) {
+  ParseException::ParseException(const JJString& message) {
   }
 
 
@@ -69,7 +69,7 @@ namespace parser {
    * parser within which the parse error occurred.  This array is
    * defined in the generated ...Constants class.
    */
-  JAVACC_STRING_TYPE* tokenImage;
+  JJString* tokenImage;
 
   /**
    * It uses "currentToken" and "expectedTokenSequences" to generate a parse
@@ -78,12 +78,12 @@ namespace parser {
    * from the parser) the correct error message
    * gets displayed.
    */
-  JAVACC_STRING_TYPE ParseException::initialise(Token currentToken,
+  JJString ParseException::initialise(Token currentToken,
                            int** expectedTokenSequences,
-                           JAVACC_STRING_TYPE* tokenImage) {
+                           JJString* tokenImage) {
 #if 0
-    //JAVACC_STRING_TYPE eol = System.getProperty("line.separator", "\n");
-     expected = new JAVACC_STRING_TYPE();
+    //JJString eol = System.getProperty("line.separator", "\n");
+     expected = new JJString();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
       if (maxSize < expectedTokenSequences[i].length) {
@@ -93,39 +93,39 @@ namespace parser {
         expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
       }
       if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected.append((JAVACC_CHAR_TYPE*)"...");
+        expected.append((JJChar*)"...");
       }
       expected.append(eol).append("    ");
     }
-    JAVACC_STRING_TYPE retval = (JAVACC_CHAR_TYPE*)"Encountered \"";
+    JJString retval = (JJChar*)"Encountered \"";
     Token tok = currentToken.next;
     for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += (JAVACC_CHAR_TYPE*)" ";
+      if (i != 0) retval += (JJChar*)" ";
       if (tok.kind == 0) {
         retval += tokenImage[0];
         break;
       }
-      retval += (JAVACC_CHAR_TYPE*)" " + tokenImage[tok.kind];
-      retval += (JAVACC_CHAR_TYPE*)" \"";
+      retval += (JJChar*)" " + tokenImage[tok.kind];
+      retval += (JJChar*)" \"";
       retval += add_escapes(tok.image);
-      retval += (JAVACC_CHAR_TYPE*)" \"";
+      retval += (JJChar*)" \"";
       tok = tok.next;
     }
-    retval += (JAVACC_CHAR_TYPE*)"\" at line " + currentToken.next.beginLine + (JAVACC_CHAR_TYPE*)", column " + currentToken.next.beginColumn;
-    retval += (JAVACC_CHAR_TYPE*)"." + eol;
+    retval += (JJChar*)"\" at line " + currentToken.next.beginLine + (JJChar*)", column " + currentToken.next.beginColumn;
+    retval += (JJChar*)"." + eol;
     if (expectedTokenSequences.length == 1) {
-      retval += (JAVACC_CHAR_TYPE*)"Was expecting:" + eol + (JAVACC_CHAR_TYPE*)"    ";
+      retval += (JJChar*)"Was expecting:" + eol + (JJChar*)"    ";
     } else {
-      retval += (JAVACC_CHAR_TYPE*)"Was expecting one of:" + eol + (JAVACC_CHAR_TYPE*)"    ";
+      retval += (JJChar*)"Was expecting one of:" + eol + (JJChar*)"    ";
     }
     retval += expected.toString();
     return retval;
 #endif
-    return (JAVACC_CHAR_TYPE*)"Parse exception";
+    return (JJChar*)"Parse exception";
   }
 
   /**
-   * The end of line JAVACC_STRING_TYPE for this machine.
+   * The end of line JJString for this machine.
    */
 #define eol "\n"
 
@@ -134,10 +134,10 @@ namespace parser {
    * when these raw version cannot be used as part of an ASCII
    * string literal.
    */
-   JAVACC_STRING_TYPE ParseException::add_escapes(JAVACC_STRING_TYPE str) {
+   JJString ParseException::add_escapes(const JJString& str) {
 /*
-      JAVACC_STRING_TYPE *retval = new JAVACC_STRING_TYPE();
-      JAVACC_CHAR_TYPE ch;
+      JJString *retval = new JJString();
+      JJChar ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))
         {
@@ -167,7 +167,7 @@ namespace parser {
               continue;
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 JAVACC_STRING_TYPE s = "0000" + Integer.toString(ch, 16);
+                 JJString s = "0000" + Integer.toString(ch, 16);
                  retval.append("\\u" + s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
@@ -181,4 +181,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */
+/* JavaCC - OriginalChecksum=7a72405661a136830ccf7f3cab0fffdc (do not edit this line) */
diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h
index c36613f..c4afc27 100644
--- a/vhdlparser/ParseException.h
+++ b/vhdlparser/ParseException.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef _PARSE_EXCEPTION_H
-#define _PARSE_EXCEPTION_H
+#ifndef JAVACC_PARSE_EXCEPTION_H
+#define JAVACC_PARSE_EXCEPTION_H
+
 #include "JavaCC.h"
 #include "Token.h"
 
@@ -28,7 +29,7 @@ class ParseException {
    */
   ParseException(Token currentTokenVal,
                         int** expectedTokenSequencesVal,
-                        JAVACC_STRING_TYPE* tokenImageVal
+                        JJString* tokenImageVal
                        );
 
   /**
@@ -44,7 +45,7 @@ class ParseException {
   ParseException();
 
   /** Constructor with message. */
-  ParseException(JAVACC_STRING_TYPE message);
+  ParseException(const JJString& message);
 
 
   /**
@@ -66,7 +67,7 @@ class ParseException {
    * parser within which the parse error occurred.  This array is
    * defined in the generated ...Constants class.
    */
-  JAVACC_STRING_TYPE* tokenImage;
+  JJString* tokenImage;
 
   /**
    * It uses "currentToken" and "expectedTokenSequences" to generate a parse
@@ -75,9 +76,9 @@ class ParseException {
    * from the parser) the correct error message
    * gets displayed.
    */
-  private:  JAVACC_STRING_TYPE initialise(Token currentToken,
+  private:  JJString initialise(Token currentToken,
                            int** expectedTokenSequences,
-                           JAVACC_STRING_TYPE* tokenImage);
+                           JJString* tokenImage);
 
   /**
    * The end of line string for this machine.
@@ -89,11 +90,12 @@ class ParseException {
    * when these raw version cannot be used as part of an ASCII
    * string literal.
    */
-   JAVACC_STRING_TYPE add_escapes(JAVACC_STRING_TYPE str);
+   JJString add_escapes(const JJString& str);
 
 };
 
 }
 }
+
 #endif
-/* JavaCC - OriginalChecksum=bd87c2fc11a4306bd2c2482fd1025b7c (do not edit this line) */
+/* JavaCC - OriginalChecksum=6705523c0ea4e83f3c38da57253c0aea (do not edit this line) */
diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc
index 735091d..d47dc68 100644
--- a/vhdlparser/Token.cc
+++ b/vhdlparser/Token.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. Token.cc Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #include "Token.h"
 
@@ -18,42 +18,46 @@ namespace parser {
    * override this method as appropriate.
    */
   void * Token::getValue() {
-    return NULL;
+    return nullptr;
   }
 
   /**
    * No-argument constructor
    */
-  Token::Token() {
-    this->next = NULL;
-    this->specialToken = NULL;
+  Token::Token() :
+  	beginLine(0), beginColumn(0), endLine(0), endColumn(0)
+  {
+    this->next = nullptr;
+    this->specialToken = nullptr;
   }
 
   /**
    * Constructs a new token for the specified Image.
    */
-  Token::Token(int kind)
+  Token::Token(int kind) :
+  	beginLine(0), beginColumn(0), endLine(0), endColumn(0) 
   {
     this->kind = kind;
-    this->next = NULL;
-    this->specialToken = NULL;
+    this->next = nullptr;
+    this->specialToken = nullptr;
   }
 
   /**
    * Constructs a new token for the specified Image and Kind.
    */
-  Token::Token(int kind, JAVACC_STRING_TYPE image)
+  Token::Token(int kind, const JJString& image)
+  	: beginLine(0), beginColumn(0), endLine(0), endColumn(0) 
   {
     this->kind = kind;
     this->image = image;
-    this->next = NULL;
-    this->specialToken = NULL;
+    this->next = nullptr;
+    this->specialToken = nullptr;
   }
 
   /**
    * Returns the image.
    */
-  JAVACC_STRING_TYPE Token::toString()
+  const JJString& Token::toString()
   {
     return image;
   }
@@ -70,7 +74,7 @@ namespace parser {
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use sit in your lexical actions.
    */
-  Token *Token::newToken(int ofKind, JAVACC_STRING_TYPE image)
+  Token *Token::newToken(int ofKind, const JJString& image)
   {
     switch(ofKind)
     {
@@ -80,13 +84,16 @@ namespace parser {
 
   Token *Token::newToken(int ofKind)
   {
-    return newToken(ofKind, JAVACC_STRING_TYPE((JAVACC_CHAR_TYPE*)""));
+    return newToken(ofKind, JJString());
   }
 
   Token::~Token() {
     if (specialToken) delete specialToken;
+    this->kind = 0;
+    this->next = nullptr;
+    this->specialToken = nullptr;
   }
 
 }
 }
-/* JavaCC - OriginalChecksum=dcb0f64486aa6455ae5af05d6bb539ec (do not edit this line) */
+/* JavaCC - OriginalChecksum=01131f3b3906a670aa8fee6224233701 (do not edit this line) */
diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h
index 040899e..3575005 100644
--- a/vhdlparser/Token.h
+++ b/vhdlparser/Token.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. Token.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
-#ifndef TOKEN_H
-#define TOKEN_H
+#ifndef JAVACC_TOKEN_H
+#define JAVACC_TOKEN_H
+
 #include "JavaCC.h"
 
 
@@ -35,7 +36,7 @@ class Token
   /**
    * The string image of the token.
    */
-  JAVACC_STRING_TYPE image;
+  JJString image;
 
   /**
    * A reference to the next regular (non-special) token from the input
@@ -84,14 +85,14 @@ class Token
   /**
    * Constructs a new token for the specified Image and Kind.
    */
-  Token(int kind, JAVACC_STRING_TYPE image);
+  Token(int kind, const JJString& image);
 
   virtual ~Token();
 
   /**
    * Returns the image.
    */
-  JAVACC_STRING_TYPE toString();
+  const JJString& toString();
 
 
   /**
@@ -106,12 +107,13 @@ class Token
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use sit in your lexical actions.
    */
-  static Token *newToken(int ofKind, JAVACC_STRING_TYPE image);
+  static Token *newToken(int ofKind, const JJString& image);
 
   static Token *newToken(int ofKind);
 };
 
 }
 }
+
 #endif
-/* JavaCC - OriginalChecksum=4748c3d6443aa3445d3c95ab54f14c2a (do not edit this line) */
+/* JavaCC - OriginalChecksum=8c237423e3d9695c3bfcf539bcf92375 (do not edit this line) */
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index 0c2caa6..6b158ae 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -1,13 +1,12 @@
-/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef TOKENMANAGER_H
-#define TOKENMANAGER_H
+#ifndef JAVACC_TOKENMANAGER_H
+#define JAVACC_TOKENMANAGER_H
+
 #include <iostream>
 #include "JavaCC.h"
 #include "Token.h"
 
-using namespace std;
-
 namespace vhdl {
 namespace parser {
 /**
@@ -23,13 +22,15 @@ public:
    */
   virtual       ~TokenManager() { }
   virtual Token *getNextToken() = 0;
+  virtual void   setParser(void* parser) {};
   virtual void   lexicalError() {
-  	cerr << "Lexical error encountered." << endl;
+  	std::cerr << "Lexical error encountered." << std::endl;
   }
 
 };
 
 }
 }
+
 #endif
-/* JavaCC - OriginalChecksum=918e2eba53e028d6c4142283ce3f498f (do not edit this line) */
+/* JavaCC - OriginalChecksum=c5e389e7ee25f48da34e517ae429ac2a (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index 74908f0..3560805 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "TokenMgrError.h"
 
@@ -14,17 +14,17 @@ namespace parser {
    *    errorLine   : line number when the error occurred
    *    errorColumn : column number when the error occurred
    *    errorAfter  : prefix that was seen before this error occurred
-   *    curJAVACC_CHAR_TYPE     : the offending character
+   *    curJJChar     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-    JAVACC_STRING_TYPE TokenMgrError::LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar) {
+    JJString TokenMgrError::LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar) {
 #if 0
-    JAVACC_STRING_TYPE s;
-    stringstream<JAVACC_STRING_TYPE> ss;
+    JJString s;
+    stringstream<JJString> ss;
     ss << "Lexical error at line " << errorLine << " column " << errorColumn
        << ".  Encountered: " << curChar << "(" << (int)curChar
        << ") after : \"" << errorAfter.c_str() << "\"";
-    return (JAVACC_STRING_TYPE)ss.rdbuf()->str();
+    return (JJString)ss.rdbuf()->str();
 #endif
     return EMPTY;
   }
@@ -38,7 +38,7 @@ namespace parser {
    *
    * from this method for such cases in the release version of your parser.
    */
-  JAVACC_STRING_TYPE TokenMgrError::getMessage() {
+  JJString TokenMgrError::getMessage() {
     return message;
   }
 
@@ -51,12 +51,12 @@ namespace parser {
   }
 
   /** Constructor with message and reason. */
-  TokenMgrError::TokenMgrError(JAVACC_STRING_TYPE message, int reason) {
+  TokenMgrError::TokenMgrError(const JJString& message, int reason) {
     errorCode = reason;
   }
 
   /** Full Constructor. */
-  TokenMgrError::TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) {
+  TokenMgrError::TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, int reason) {
     message = LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar);
    errorCode = reason;
   }
@@ -64,7 +64,7 @@ namespace parser {
 // i < 16 - guaranteed
 char hexChar(int i) {
   if (i < 10) {
-    return i + '0';
+    return i - '0';
   }
   return 'a' + (i - 10);
 }
@@ -73,10 +73,10 @@ char hexChar(int i) {
  * Replaces unprintable characters by their escaped (or unicode escaped)
  * equivalents in the given string
  */
-JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
-  JAVACC_SIMPLE_STRING retval;
+JJSimpleString addUnicodeEscapes(const JJString& str) {
+  JJSimpleString retval;
   for (size_t i = 0; i < str.size(); i++) {
-    JAVACC_CHAR_TYPE ch = str[i];
+    JJChar ch = str[i];
     switch (ch)
     {
       case '\b':
@@ -115,4 +115,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
 
 }
 }
-/* JavaCC - OriginalChecksum=72f292bc267bd0602e63291bf864f942 (do not edit this line) */
+/* JavaCC - OriginalChecksum=ed66d80b94c73435ce2644e44f7b4d49 (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h
index abb305d..90c7530 100644
--- a/vhdlparser/TokenMgrError.h
+++ b/vhdlparser/TokenMgrError.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.2 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef _TOKENMGRERROR_H
-#define _TOKENMGRERROR_H
+#ifndef JAVACC_TOKENMGRERROR_H
+#define JAVACC_TOKENMGRERROR_H
+
 #include "JavaCC.h"
 
 
@@ -54,10 +55,10 @@ public:
    *    curchar     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-    JAVACC_STRING_TYPE LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar);
+    JJString LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar);
 
 private:
-   JAVACC_STRING_TYPE message;
+   JJString message;
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -69,7 +70,7 @@ private:
    * from this method for such cases in the release version of your parser.
    */
 public:
-  JAVACC_STRING_TYPE getMessage() ;
+  JJString getMessage() ;
 
   /*
    * Constructors of various flavors follow.
@@ -79,13 +80,14 @@ public:
   TokenMgrError() ;
 
   /** Constructor with message and reason. */
-  TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
+  TokenMgrError(const JJString& message, int reason) ;
 
   /** Full Constructor. */
-  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
+  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, int reason) ;
 };
 
 }
 }
+
 #endif
-/* JavaCC - OriginalChecksum=c22a1b25630ec91deb47dcba22b6b39d (do not edit this line) */
+/* JavaCC - OriginalChecksum=4ab4cdcdef6a3feec22fd9c00ba86e07 (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 2abe6c6..2ed30e2 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -23,37 +23,31 @@ namespace parser {
 
 QCString VhdlParser::abstract_literal() {Token *tok;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DECIMAL_LITERAL:{if (!hasError) {
-      
+    case DECIMAL_LITERAL:{
+      if (!hasError) {
       tok = jj_consume_token(DECIMAL_LITERAL);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case INTEGER:{if (!hasError) {
-      
+    case INTEGER:{
+      if (!hasError) {
       tok = jj_consume_token(INTEGER);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case BASED_LITERAL:{if (!hasError) {
-      
+    case BASED_LITERAL:{
+      if (!hasError) {
       tok = jj_consume_token(BASED_LITERAL);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -65,15 +59,13 @@ assert(false);
 }
 
 
-QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if (!hasError) {
-    
+QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;
+    if (!hasError) {
     tok = jj_consume_token(ACCESS_T);
     }
     if (!hasError) {
-    
     str1 = subtype_indication();
     }
-    
 str=tok->image.c_str(); return str+str1;
 assert(false);
 }
@@ -81,37 +73,31 @@ assert(false);
 
 QCString VhdlParser::actual_designator() {QCString str;Token *t=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_T:{if (!hasError) {
-      
+    case OPEN_T:{
+      if (!hasError) {
       t = jj_consume_token(OPEN_T);
       }
       if (!hasError) {
-      
 return t->image.c_str();
       }
-      
       break;
       }
     default:
       jj_la1[1] = jj_gen;
-      if (jj_2_1(2147483647)) {if (!hasError) {
-        
+      if (jj_2_1(2147483647)) {
+        if (!hasError) {
         str = expression();
         }
         if (!hasError) {
-        
 return str;
         }
-        
-      } else if (jj_2_2(2147483647)) {if (!hasError) {
-        
+      } else if (jj_2_2(2147483647)) {
+        if (!hasError) {
         str = name();
         }
         if (!hasError) {
-        
 return str;
         }
-        
       } else {
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
@@ -121,63 +107,53 @@ assert(false);
 }
 
 
-QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::actual_parameter_part() {QCString s;
+    if (!hasError) {
     s = association_list();
     }
-    
 return s;
 assert(false);
 }
 
 
 QCString VhdlParser::actual_part() {QCString s,s1;
-    if (jj_2_3(2147483647)) {if (!hasError) {
-      
+    if (jj_2_3(2147483647)) {
+      if (!hasError) {
       s = actual_designator();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case BOX_T:{if (!hasError) {
-        
+      case BOX_T:{
+        if (!hasError) {
         jj_consume_token(BOX_T);
         }
         if (!hasError) {
-        
 return "<>";
         }
-        
         break;
         }
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         s = name();
         }
         if (!hasError) {
-        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
-        
         s1 = actual_designator();
         }
         if (!hasError) {
-        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
-        
 s+="(";s+=s1+")";return s;
         }
-        
         break;
         }
       default:
@@ -192,37 +168,31 @@ assert(false);
 
 QCString VhdlParser::adding_operator() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PLUS_T:{if (!hasError) {
-      
+    case PLUS_T:{
+      if (!hasError) {
       jj_consume_token(PLUS_T);
       }
       if (!hasError) {
-      
 return "+";
       }
-      
       break;
       }
-    case MINUS_T:{if (!hasError) {
-      
+    case MINUS_T:{
+      if (!hasError) {
       jj_consume_token(MINUS_T);
       }
       if (!hasError) {
-      
 return "-";
       }
-      
       break;
       }
-    case AMPERSAND_T:{if (!hasError) {
-      
+    case AMPERSAND_T:{
+      if (!hasError) {
       jj_consume_token(AMPERSAND_T);
       }
       if (!hasError) {
-      
 return "&";
       }
-      
       break;
       }
     default:
@@ -234,16 +204,14 @@ assert(false);
 }
 
 
-QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::aggregate() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s = element_association();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -253,60 +221,49 @@ QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) {
       default:
         jj_la1[4] = jj_gen;
         goto end_label_1;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = element_association();
       }
       if (!hasError) {
-      
 s+=","+s1;
       }
-      
     }
     end_label_1: ;
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return "("+s+")";
 assert(false);
 }
 
 
-QCString VhdlParser::alias_declaration() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::alias_declaration() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(ALIAS_T);
     }
     if (!hasError) {
-    
     s2 = alias_designator();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case COLON_T:{if (!hasError) {
-      
+    case COLON_T:{
+      if (!hasError) {
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
-      
 s+=":";
       }
       if (!hasError) {
-      
       s1 = subtype_indication();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
       break;
       }
     default:
@@ -315,33 +272,26 @@ s+=s1;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 s+=" is ";
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
 s+=s1;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LBRACKET_T:{if (!hasError) {
-      
+    case LBRACKET_T:{
+      if (!hasError) {
       s1 = signature();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
       break;
       }
     default:
@@ -350,10 +300,8 @@ s+=s1;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 addVhdlType(s2.data(),getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlDocGen::ALIAS,0,s.data(),Public);
 
  return s2+" "+s+";";
@@ -364,37 +312,31 @@ assert(false);
 QCString VhdlParser::alias_designator() {Token *tok=0;QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CHARACTER_LITERAL:{if (!hasError) {
-      
+    case CHARACTER_LITERAL:{
+      if (!hasError) {
       tok = jj_consume_token(CHARACTER_LITERAL);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case STRINGLITERAL:{if (!hasError) {
-      
+    case STRINGLITERAL:{
+      if (!hasError) {
       s = operator_symbol();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -407,26 +349,22 @@ assert(false);
 
 
 void VhdlParser::allocator() {
-    if (jj_2_4(3)) {if (!hasError) {
-      
+    if (jj_2_4(3)) {
+      if (!hasError) {
       jj_consume_token(NEW_T);
       }
       if (!hasError) {
-      
       qualified_expression();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NEW_T:{if (!hasError) {
-        
+      case NEW_T:{
+        if (!hasError) {
         jj_consume_token(NEW_T);
         }
         if (!hasError) {
-        
         subtype_indication();
         }
-        
         break;
         }
       default:
@@ -438,28 +376,23 @@ void VhdlParser::allocator() {
 }
 
 
-void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) {
-    
+void VhdlParser::architecture_body() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(ARCHITECTURE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 QCString t=s1+"::"+s;
                   genLabels.resize(0);
                   pushLabel(genLabels,s1);
@@ -467,36 +400,29 @@ QCString t=s1+"::"+s;
                   addVhdlType(t,getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
     }
     if (!hasError) {
-    
-    try {if (!hasError) {
-      
+    try {
+      if (!hasError) {
       architecture_declarative_part();
       }
-      
     } catch ( ...) {
 error_skipto(BEGIN_T);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
-    
     architecture_statement_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ARCHITECTURE_T:{if (!hasError) {
-      
+    case ARCHITECTURE_T:{
+      if (!hasError) {
       jj_consume_token(ARCHITECTURE_T);
       }
-      
       break;
       }
     default:
@@ -505,16 +431,14 @@ error_skipto(BEGIN_T);
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -523,16 +447,14 @@ error_skipto(BEGIN_T);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 lastEntity=0;lastCompound=0; genLabels.resize(0);
 }
 
 
-void VhdlParser::architecture_declarative_part() {if (!hasError) {
-    
+void VhdlParser::architecture_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -559,20 +481,18 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) {
       default:
         jj_la1[11] = jj_gen;
         goto end_label_2;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       block_declarative_item();
       }
-      
     }
     end_label_2: ;
     }
-    
 }
 
 
-void VhdlParser::architecture_statement_part() {if (!hasError) {
-    
+void VhdlParser::architecture_statement_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -592,39 +512,33 @@ void VhdlParser::architecture_statement_part() {if (!hasError) {
       default:
         jj_la1[12] = jj_gen;
         goto end_label_3;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       concurrent_statement();
       }
-      
     }
     end_label_3: ;
     }
-    
 }
 
 
 QCString VhdlParser::array_type_definition() {QCString s;
-    if (jj_2_5(2147483647)) {if (!hasError) {
-      
+    if (jj_2_5(2147483647)) {
+      if (!hasError) {
       s = unconstraint_array_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ARRAY_T:{if (!hasError) {
-        
+      case ARRAY_T:{
+        if (!hasError) {
         s = constraint_array_definition();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
       default:
@@ -637,26 +551,22 @@ assert(false);
 }
 
 
-QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
-    
+QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;
+    if (!hasError) {
     jj_consume_token(ASSERT_T);
     }
     if (!hasError) {
-    
     s = condition();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case REPORT_T:{if (!hasError) {
-      
+    case REPORT_T:{
+      if (!hasError) {
       t = jj_consume_token(REPORT_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
-      
       break;
       }
     default:
@@ -665,17 +575,14 @@ QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!h
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SEVERITY_T:{if (!hasError) {
-      
+    case SEVERITY_T:{
+      if (!hasError) {
       t1 = jj_consume_token(SEVERITY_T);
       }
       if (!hasError) {
-      
       s2 = expression();
       }
-      
       break;
       }
     default:
@@ -683,7 +590,6 @@ QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!h
       ;
     }
     }
-    
 s.prepend("assert ");
    if(t) s1.prepend(" report ");
    if(t1) s2.prepend(" report ");
@@ -692,19 +598,17 @@ assert(false);
 }
 
 
-QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!hasError) {
-    
+QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = label();
       }
       if (!hasError) {
-      
       t = jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -713,51 +617,43 @@ QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!has
     }
     }
     if (!hasError) {
-    
     s1 = assertion();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(t) s+=":";
     return s+s1+";";
 assert(false);
 }
 
 
-QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
-    
-    if (jj_2_6(2147483647)) {if (!hasError) {
-      
+QCString VhdlParser::association_element() {QCString s,s1;
+    if (!hasError) {
+    if (jj_2_6(2147483647)) {
+      if (!hasError) {
       s = formal_part();
       }
       if (!hasError) {
-      
       jj_consume_token(ARROW_T);
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     s1 = actual_part();
     }
-    
 return s+" => "+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::association_list() {QCString s,s1;
+    if (!hasError) {
     s = association_element();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -767,49 +663,40 @@ QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) {
       default:
         jj_la1[17] = jj_gen;
         goto end_label_4;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = association_element();
       }
       if (!hasError) {
-      
 s+=","+s1;
       }
-      
     }
     end_label_4: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::attribute_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(ATTRIBUTE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = type_mark();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public);
     return " attribute "+s+":"+s1+";";
 assert(false);
@@ -819,26 +706,22 @@ assert(false);
 QCString VhdlParser::attribute_designator() {QCString s;Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case RANGE_T:{if (!hasError) {
-      
+    case RANGE_T:{
+      if (!hasError) {
       tok = jj_consume_token(RANGE_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -850,42 +733,34 @@ assert(false);
 }
 
 
-QCString VhdlParser::attribute_name() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::attribute_name() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(APOSTROPHE_T);
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
 s+="'"+s1;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s+"("+s1+")";
       }
-      
       break;
       }
     default:
@@ -893,41 +768,33 @@ s+"("+s1+")";
       ;
     }
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::attribute_specification() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::attribute_specification() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(ATTRIBUTE_T);
     }
     if (!hasError) {
-    
     s = attribute_designator();
     }
     if (!hasError) {
-    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
-    
     s1 = entity_specification();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     s2 = expression();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 QCString t= s1+" is "+s2;
    addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public);
    return " attribute "+s+" of "+s1+ " is "+s2+";";
@@ -935,78 +802,70 @@ assert(false);
 }
 
 
-QCString VhdlParser::base() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::base() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(INTEGER);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::base_specifier() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::base_unit_declaration() {QCString s;
+    if (!hasError) {
     s = identifier();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::based_integer() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::based_literal() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(BASED_LITERAL);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::basic_identifier() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-void VhdlParser::binding_indication() {if (!hasError) {
-    
+void VhdlParser::binding_indication() {
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case USE_T:{if (!hasError) {
-      
+    case USE_T:{
+      if (!hasError) {
       jj_consume_token(USE_T);
       }
       if (!hasError) {
-      
       entity_aspect();
       }
-      
       break;
       }
     default:
@@ -1015,13 +874,11 @@ void VhdlParser::binding_indication() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
       generic_map_aspect();
       }
-      
       break;
       }
     default:
@@ -1030,13 +887,11 @@ void VhdlParser::binding_indication() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{if (!hasError) {
-      
+    case PORT_T:{
+      if (!hasError) {
       port_map_aspect();
       }
-      
       break;
       }
     default:
@@ -1044,40 +899,35 @@ void VhdlParser::binding_indication() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::bit_string_literal() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(BIT_STRING_LITERAL);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::bit_value() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-void VhdlParser::block_configuration() {if (!hasError) {
-    
+void VhdlParser::block_configuration() {
+    if (!hasError) {
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
-    
     block_specification();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case USE_T:{
@@ -1087,16 +937,14 @@ void VhdlParser::block_configuration() {if (!hasError) {
       default:
         jj_la1[23] = jj_gen;
         goto end_label_5;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       use_clause();
       }
-      
     }
     end_label_5: ;
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case FOR_T:{
@@ -1106,27 +954,22 @@ void VhdlParser::block_configuration() {if (!hasError) {
       default:
         jj_la1[24] = jj_gen;
         goto end_label_6;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       configuration_item();
       }
-      
     }
     end_label_6: ;
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
@@ -1135,121 +978,105 @@ void VhdlParser::block_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       type_declaration();
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       subtype_declaration();
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       constant_declaration();
       }
-      
       break;
       }
-    case SIGNAL_T:{if (!hasError) {
-      
+    case SIGNAL_T:{
+      if (!hasError) {
       signal_declaration();
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       variable_declaration();
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       file_declaration();
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       alias_declaration();
       }
-      
       break;
       }
-    case COMPONENT_T:{if (!hasError) {
-      
+    case COMPONENT_T:{
+      if (!hasError) {
       component_declaration();
       }
-      
       break;
       }
     default:
       jj_la1[25] = jj_gen;
-      if (jj_2_7(2147483647)) {if (!hasError) {
-        
+      if (jj_2_7(2147483647)) {
+        if (!hasError) {
         attribute_declaration();
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{if (!hasError) {
-          
+        case ATTRIBUTE_T:{
+          if (!hasError) {
           attribute_specification();
           }
-          
           break;
           }
-        case FOR_T:{if (!hasError) {
-          
+        case FOR_T:{
+          if (!hasError) {
           configuration_specification();
           }
-          
           break;
           }
-        case DISCONNECT_T:{if (!hasError) {
-          
+        case DISCONNECT_T:{
+          if (!hasError) {
           disconnection_specification();
           }
-          
           break;
           }
-        case USE_T:{if (!hasError) {
-          
+        case USE_T:{
+          if (!hasError) {
           use_clause();
           }
-          
           break;
           }
         default:
           jj_la1[26] = jj_gen;
-          if (jj_2_8(3)) {if (!hasError) {
-            
+          if (jj_2_8(3)) {
+            if (!hasError) {
             group_template_declaration();
             }
-            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{if (!hasError) {
-              
+            case GROUP_T:{
+              if (!hasError) {
               group_declaration();
               }
-              
               break;
               }
             default:
@@ -1264,8 +1091,8 @@ void VhdlParser::block_declarative_item() {
 }
 
 
-void VhdlParser::block_declarative_part() {if (!hasError) {
-    
+void VhdlParser::block_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -1292,36 +1119,31 @@ void VhdlParser::block_declarative_part() {if (!hasError) {
       default:
         jj_la1[28] = jj_gen;
         goto end_label_7;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       block_declarative_item();
       }
-      
     }
     end_label_7: ;
     }
-    
 }
 
 
-void VhdlParser::block_header() {if (!hasError) {
-    
-    if (jj_2_9(2147483647)) {if (!hasError) {
-      
+void VhdlParser::block_header() {
+    if (!hasError) {
+    if (jj_2_9(2147483647)) {
+      if (!hasError) {
       generic_clause();
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case GENERIC_T:{if (!hasError) {
-        
+      case GENERIC_T:{
+        if (!hasError) {
         generic_map_aspect();
         }
         if (!hasError) {
-        
         jj_consume_token(SEMI_T);
         }
-        
         break;
         }
       default:
@@ -1329,30 +1151,25 @@ void VhdlParser::block_header() {if (!hasError) {
         ;
       }
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{if (!hasError) {
-      
+    case PORT_T:{
+      if (!hasError) {
       port_clause();
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PORT_T:{if (!hasError) {
-        
+      case PORT_T:{
+        if (!hasError) {
         port_map_aspect();
         }
         if (!hasError) {
-        
         jj_consume_token(SEMI_T);
         }
-        
         break;
         }
       default:
@@ -1360,7 +1177,6 @@ void VhdlParser::block_header() {if (!hasError) {
         ;
       }
       }
-      
       break;
       }
     default:
@@ -1368,30 +1184,25 @@ void VhdlParser::block_header() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-void VhdlParser::block_specification() {if (!hasError) {
-    
+void VhdlParser::block_specification() {
+    if (!hasError) {
     name();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       index_specification();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
-      
       break;
       }
     default:
@@ -1399,42 +1210,34 @@ void VhdlParser::block_specification() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-void VhdlParser::block_statement() {QCString s;if (!hasError) {
-    
+void VhdlParser::block_statement() {QCString s;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     jj_consume_token(BLOCK_T);
     }
     if (!hasError) {
-    
 pushLabel(genLabels,s);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       expression();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
-      
       break;
       }
     default:
@@ -1443,13 +1246,11 @@ pushLabel(genLabels,s);
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       jj_consume_token(IS_T);
       }
-      
       break;
       }
     default:
@@ -1458,38 +1259,30 @@ pushLabel(genLabels,s);
     }
     }
     if (!hasError) {
-    
     block_header();
     }
     if (!hasError) {
-    
     block_declarative_part();
     }
     if (!hasError) {
-    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
-    
     block_statement_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(BLOCK_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -1498,16 +1291,14 @@ pushLabel(genLabels,s);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 genLabels=popLabel(genLabels);
 }
 
 
-void VhdlParser::block_statement_part() {if (!hasError) {
-    
+void VhdlParser::block_statement_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -1527,31 +1318,27 @@ void VhdlParser::block_statement_part() {if (!hasError) {
       default:
         jj_la1[36] = jj_gen;
         goto end_label_8;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       concurrent_statement();
       }
-      
     }
     end_label_8: ;
     }
-    
 }
 
 
-void VhdlParser::case_statement() {QCString s;if (!hasError) {
-    
+void VhdlParser::case_statement() {QCString s;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -1560,28 +1347,22 @@ void VhdlParser::case_statement() {QCString s;if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(CASE_T);
     }
     if (!hasError) {
-    
     s = expression();
     }
     if (!hasError) {
-    
 QCString ca="case "+s;
      FlowChart::addFlowChart(FlowChart::CASE_NO,0,ca);
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     case_statement_alternative();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case WHEN_T:{
@@ -1591,31 +1372,26 @@ QCString ca="case "+s;
       default:
         jj_la1[38] = jj_gen;
         goto end_label_9;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       case_statement_alternative();
       }
-      
     }
     end_label_9: ;
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(CASE_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -1624,91 +1400,75 @@ QCString ca="case "+s;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 FlowChart::moveToPrevLevel();
          FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
 }
 
 
-void VhdlParser::case_statement_alternative() {QCString s;if (!hasError) {
-    
+void VhdlParser::case_statement_alternative() {QCString s;
+    if (!hasError) {
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
-    
     s = choices();
     }
     if (!hasError) {
-    
     jj_consume_token(ARROW_T);
     }
     if (!hasError) {
-    
 QCString t="when ";
     t+=s+"=> ";
     FlowChart::addFlowChart(FlowChart::WHEN_NO,s.data(),t);
     }
     if (!hasError) {
-    
     sequence_of_statement();
     }
-    
 FlowChart::moveToPrevLevel();
 }
 
 
-QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::character_literal() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(CHARACTER_LITERAL);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
 QCString VhdlParser::choice() {QCString s;
-    if (jj_2_10(2147483647)) {if (!hasError) {
-      
+    if (jj_2_10(2147483647)) {
+      if (!hasError) {
       s = discrete_range();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_11(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_11(2147483647)) {
+      if (!hasError) {
       s = simple_expression();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_12(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_12(2147483647)) {
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OTHER_T:{if (!hasError) {
-        
+      case OTHER_T:{
+        if (!hasError) {
         jj_consume_token(OTHER_T);
         }
         if (!hasError) {
-        
 return " others ";
         }
-        
         break;
         }
       default:
@@ -1721,12 +1481,11 @@ assert(false);
 }
 
 
-QCString VhdlParser::choices() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::choices() {QCString s,s1;
+    if (!hasError) {
     s = choice();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BAR_T:{
@@ -1736,51 +1495,43 @@ QCString VhdlParser::choices() {QCString s,s1;if (!hasError) {
       default:
         jj_la1[41] = jj_gen;
         goto end_label_10;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(BAR_T);
       }
       if (!hasError) {
-      
       s1 = choice();
       }
       if (!hasError) {
-      
 s+="|";s+=s1;
       }
-      
     }
     end_label_10: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-void VhdlParser::component_configuration() {if (!hasError) {
-    
+void VhdlParser::component_configuration() {
+    if (!hasError) {
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
-    
     component_specification();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case GENERIC_T:
     case PORT_T:
     case USE_T:
-    case SEMI_T:{if (!hasError) {
-      
+    case SEMI_T:{
+      if (!hasError) {
       binding_indication();
       }
       if (!hasError) {
-      
       jj_consume_token(SEMI_T);
       }
-      
       break;
       }
     default:
@@ -1789,13 +1540,11 @@ void VhdlParser::component_configuration() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FOR_T:{if (!hasError) {
-      
+    case FOR_T:{
+      if (!hasError) {
       block_configuration();
       }
-      
       break;
       }
     default:
@@ -1804,37 +1553,30 @@ void VhdlParser::component_configuration() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::component_declaration() {QCString s;if (!hasError) {
-    
+void VhdlParser::component_declaration() {QCString s;
+    if (!hasError) {
     jj_consume_token(COMPONENT_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       jj_consume_token(IS_T);
       }
-      
       break;
       }
     default:
@@ -1843,17 +1585,14 @@ void VhdlParser::component_declaration() {QCString s;if (!hasError) {
     }
     }
     if (!hasError) {
-    
 currP=VhdlDocGen::COMPONENT;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
       generic_clause();
       }
-      
       break;
       }
     default:
@@ -1862,13 +1601,11 @@ currP=VhdlDocGen::COMPONENT;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{if (!hasError) {
-      
+    case PORT_T:{
+      if (!hasError) {
       port_clause();
       }
-      
       break;
       }
     default:
@@ -1877,27 +1614,22 @@ currP=VhdlDocGen::COMPONENT;
     }
     }
     if (!hasError) {
-    
 addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPONENT,0,0,Public);
      currP=0;
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(COMPONENT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -1906,27 +1638,22 @@ addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPON
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::component_instantiation_statement() {QCString s,s1;if (!hasError) {
-    
+void VhdlParser::component_instantiation_statement() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = instantiation_unit();
     }
     if (!hasError) {
-    
 QCString s3;
        if (s1.contains("|")) {
          s3=VhdlDocGen::getIndexWord(s1.data(),0);
@@ -1936,24 +1663,20 @@ QCString s3;
        addCompInst(s.lower().data(),s1.lower().data(),s3.data(),getLine());
     }
     if (!hasError) {
-    
-    if (jj_2_13(2147483647)) {if (!hasError) {
-      
+    if (jj_2_13(2147483647)) {
+      if (!hasError) {
       generic_map_aspect();
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{if (!hasError) {
-      
+    case PORT_T:{
+      if (!hasError) {
       port_map_aspect();
       }
-      
       break;
       }
     default:
@@ -1962,51 +1685,42 @@ QCString s3;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::component_specification() {if (!hasError) {
-    
+void VhdlParser::component_specification() {
+    if (!hasError) {
     instantiation_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     name();
     }
-    
 }
 
 
 QCString VhdlParser::composite_type_definition() {QCString s,s1;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ARRAY_T:{if (!hasError) {
-      
+    case ARRAY_T:{
+      if (!hasError) {
       s = array_type_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case RECORD_T:{if (!hasError) {
-      
+    case RECORD_T:{
+      if (!hasError) {
       record_type_definition();
       }
       if (!hasError) {
-      
 return s+"#";
       }
-      
       break;
       }
     default:
@@ -2018,29 +1732,25 @@ assert(false);
 }
 
 
-void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
-    
-    if (jj_2_14(2)) {if (!hasError) {
-      
+void VhdlParser::concurrent_assertion_statement() {
+    if (!hasError) {
+    if (jj_2_14(2)) {
+      if (!hasError) {
       identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{if (!hasError) {
-      
+    case POSTPONED_T:{
+      if (!hasError) {
       jj_consume_token(POSTPONED_T);
       }
-      
       break;
       }
     default:
@@ -2049,40 +1759,33 @@ void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     assertion();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
-    
-    if (jj_2_15(2)) {if (!hasError) {
-      
+void VhdlParser::concurrent_procedure_call_statement() {
+    if (!hasError) {
+    if (jj_2_15(2)) {
+      if (!hasError) {
       identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{if (!hasError) {
-      
+    case POSTPONED_T:{
+      if (!hasError) {
       jj_consume_token(POSTPONED_T);
       }
-      
       break;
       }
     default:
@@ -2091,40 +1794,33 @@ void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     procedure_call();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
-    
-    if (jj_2_16(2)) {if (!hasError) {
-      
+void VhdlParser::concurrent_signal_assignment_statement() {
+    if (!hasError) {
+    if (jj_2_16(2)) {
+      if (!hasError) {
       identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{if (!hasError) {
-      
+    case POSTPONED_T:{
+      if (!hasError) {
       jj_consume_token(POSTPONED_T);
       }
-      
       break;
       }
     default:
@@ -2133,19 +1829,16 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
-    if (jj_2_17(2147483647)) {if (!hasError) {
-      
+    if (jj_2_17(2147483647)) {
+      if (!hasError) {
       conditional_signal_assignment();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case WITH_T:{if (!hasError) {
-        
+      case WITH_T:{
+        if (!hasError) {
         selected_signal_assignment();
         }
-        
         break;
         }
       default:
@@ -2155,64 +1848,54 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
       }
     }
     }
-    
 }
 
 
 void VhdlParser::concurrent_statement() {
-    if (jj_2_18(2147483647)) {if (!hasError) {
-      
+    if (jj_2_18(2147483647)) {
+      if (!hasError) {
       block_statement();
       }
-      
-    } else if (jj_2_19(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_19(2147483647)) {
+      if (!hasError) {
       process_statement();
       }
-      
-    } else if (jj_2_20(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_20(2147483647)) {
+      if (!hasError) {
       generate_statement();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case CASE_T:{if (!hasError) {
-        
+      case CASE_T:{
+        if (!hasError) {
         case_scheme();
         }
-        
         break;
         }
       default:
         jj_la1[54] = jj_gen;
-        if (jj_2_21(2147483647)) {if (!hasError) {
-          
+        if (jj_2_21(2147483647)) {
+          if (!hasError) {
           concurrent_assertion_statement();
           }
-          
-        } else if (jj_2_22(2147483647)) {if (!hasError) {
-          
+        } else if (jj_2_22(2147483647)) {
+          if (!hasError) {
           concurrent_signal_assignment_statement();
           }
-          
-        } else if (jj_2_23(2147483647)) {if (!hasError) {
-          
+        } else if (jj_2_23(2147483647)) {
+          if (!hasError) {
           component_instantiation_statement();
           }
-          
-        } else if (jj_2_24(2147483647)) {if (!hasError) {
-          
+        } else if (jj_2_24(2147483647)) {
+          if (!hasError) {
           concurrent_procedure_call_statement();
           }
-          
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case VHDL2008TOOLDIR:{if (!hasError) {
-            
+          case VHDL2008TOOLDIR:{
+            if (!hasError) {
             jj_consume_token(VHDL2008TOOLDIR);
             }
-            
             break;
             }
           default:
@@ -2226,97 +1909,81 @@ void VhdlParser::concurrent_statement() {
 }
 
 
-QCString VhdlParser::condition() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::condition() {QCString s;
+    if (!hasError) {
     s = expression();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::condition_clause() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::condition_clause() {QCString s;
+    if (!hasError) {
     jj_consume_token(UNTIL_T);
     }
     if (!hasError) {
-    
     s = condition();
     }
-    
 return " until "+s;
 assert(false);
 }
 
 
-void VhdlParser::conditional_signal_assignment() {if (!hasError) {
-    
+void VhdlParser::conditional_signal_assignment() {
+    if (!hasError) {
     target();
     }
     if (!hasError) {
-    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
-    
     options();
     }
     if (!hasError) {
-    
     conditional_waveforms();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::conditional_waveforms() {if (!hasError) {
-    
+void VhdlParser::conditional_waveforms() {
+    if (!hasError) {
     waveform();
     }
     if (!hasError) {
-    
     while (!hasError) {
       if (jj_2_25(2147483647)) {
         ;
       } else {
         goto end_label_11;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       condition();
       }
       if (!hasError) {
-      
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
-      
       waveform();
       }
-      
     }
     end_label_11: ;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{if (!hasError) {
-      
+    case WHEN_T:{
+      if (!hasError) {
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       condition();
       }
-      
       break;
       }
     default:
@@ -2324,55 +1991,44 @@ void VhdlParser::conditional_waveforms() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-void VhdlParser::configuration_declaration() {QCString s,s1;if (!hasError) {
-    
+void VhdlParser::configuration_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(CONFIGURATION_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 confName=s+"::"+s1;
   addVhdlType(s.data(),getLine(CONFIGURATION_T),Entry::VARIABLE_SEC,VhdlDocGen::CONFIG,"configuration",s1.data(),Public);
     }
     if (!hasError) {
-    
     configuration_declarative_part();
     }
     if (!hasError) {
-    
     block_configuration();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONFIGURATION_T:{if (!hasError) {
-      
+    case CONFIGURATION_T:{
+      if (!hasError) {
       jj_consume_token(CONFIGURATION_T);
       }
-      
       break;
       }
     default:
@@ -2381,16 +2037,14 @@ confName=s+"::"+s1;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -2399,35 +2053,30 @@ confName=s+"::"+s1;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 genLabels.resize(0); confName="";
 }
 
 
 void VhdlParser::configuration_declarative_item() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case USE_T:{if (!hasError) {
-      
+    case USE_T:{
+      if (!hasError) {
       use_clause();
       }
-      
       break;
       }
-    case ATTRIBUTE_T:{if (!hasError) {
-      
+    case ATTRIBUTE_T:{
+      if (!hasError) {
       attribute_specification();
       }
-      
       break;
       }
-    case GROUP_T:{if (!hasError) {
-      
+    case GROUP_T:{
+      if (!hasError) {
       group_declaration();
       }
-      
       break;
       }
     default:
@@ -2438,8 +2087,8 @@ void VhdlParser::configuration_declarative_item() {
 }
 
 
-void VhdlParser::configuration_declarative_part() {if (!hasError) {
-    
+void VhdlParser::configuration_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ATTRIBUTE_T:
@@ -2451,31 +2100,27 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) {
       default:
         jj_la1[60] = jj_gen;
         goto end_label_12;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       configuration_declarative_item();
       }
-      
     }
     end_label_12: ;
     }
-    
 }
 
 
 void VhdlParser::configuration_item() {
-    if (jj_2_26(2147483647)) {if (!hasError) {
-      
+    if (jj_2_26(2147483647)) {
+      if (!hasError) {
       component_configuration();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case FOR_T:{if (!hasError) {
-        
+      case FOR_T:{
+        if (!hasError) {
         block_configuration();
         }
-        
         break;
         }
       default:
@@ -2487,54 +2132,44 @@ void VhdlParser::configuration_item() {
 }
 
 
-void VhdlParser::configuration_specification() {if (!hasError) {
-    
+void VhdlParser::configuration_specification() {
+    if (!hasError) {
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
-    
     component_specification();
     }
     if (!hasError) {
-    
     binding_indication();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!hasError) {
-    
+QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;
+    if (!hasError) {
     jj_consume_token(CONSTANT_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{if (!hasError) {
-      
+    case VARASSIGN_T:{
+      if (!hasError) {
       t = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
-      
       s2 = expression();
       }
-      
       break;
       }
     default:
@@ -2543,10 +2178,8 @@ QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!ha
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(t)
       s2.prepend(":=");
      QCString it=s1+s2;
@@ -2557,30 +2190,26 @@ assert(false);
 }
 
 
-QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::constraint_array_definition() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(ARRAY_T);
     }
     if (!hasError) {
-    
     s = index_constraint();
     }
     if (!hasError) {
-    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
-    
 return s+" "+s1;
 assert(false);
 }
 
 
-void VhdlParser::context_clause() {if (!hasError) {
-    
+void VhdlParser::context_clause() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LIBRARY_T:
@@ -2591,37 +2220,31 @@ void VhdlParser::context_clause() {if (!hasError) {
       default:
         jj_la1[63] = jj_gen;
         goto end_label_13;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       context_item();
       }
-      
     }
     end_label_13: ;
     }
-    
 }
 
 
 QCString VhdlParser::constraint() {QCString s;
-    if (jj_2_27(2147483647)) {if (!hasError) {
-      
+    if (jj_2_27(2147483647)) {
+      if (!hasError) {
       s = range_constraint();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_28(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_28(2147483647)) {
+      if (!hasError) {
       s = index_constraint();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
@@ -2632,18 +2255,16 @@ assert(false);
 
 void VhdlParser::context_item() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LIBRARY_T:{if (!hasError) {
-      
+    case LIBRARY_T:{
+      if (!hasError) {
       library_clause();
       }
-      
       break;
       }
-    case USE_T:{if (!hasError) {
-      
+    case USE_T:{
+      if (!hasError) {
       use_clause();
       }
-      
       break;
       }
     default:
@@ -2654,11 +2275,10 @@ void VhdlParser::context_item() {
 }
 
 
-QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::decimal_literal() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(DECIMAL_LITERAL);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
@@ -2666,34 +2286,29 @@ assert(false);
 
 QCString VhdlParser::delay_mechanism() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case TRANSPORT_T:{if (!hasError) {
-      
+    case TRANSPORT_T:{
+      if (!hasError) {
       jj_consume_token(TRANSPORT_T);
       }
       if (!hasError) {
-      
 return " transport ";
       }
-      
       break;
       }
     case INERTIAL_T:
-    case REJECT_T:{if (!hasError) {
-      
+    case REJECT_T:{
+      if (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case REJECT_T:{if (!hasError) {
-        
+      case REJECT_T:{
+        if (!hasError) {
         jj_consume_token(REJECT_T);
         }
         if (!hasError) {
-        
         s = expression();
         }
         if (!hasError) {
-        
 s.prepend(" reject ");
         }
-        
         break;
         }
       default:
@@ -2702,14 +2317,11 @@ s.prepend(" reject ");
       }
       }
       if (!hasError) {
-      
       jj_consume_token(INERTIAL_T);
       }
       if (!hasError) {
-      
 return s+" inertial ";
       }
-      
       break;
       }
     default:
@@ -2729,13 +2341,12 @@ void VhdlParser::design_file() {
     case ENTITY_T:
     case LIBRARY_T:
     case PACKAGE_T:
-    case USE_T:{if (!hasError) {
-      
-      while (!hasError) {if (!hasError) {
-        
+    case USE_T:{
+      if (!hasError) {
+      while (!hasError) {
+        if (!hasError) {
         design_unit();
         }
-        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case ARCHITECTURE_T:
         case CONFIGURATION_T:
@@ -2755,17 +2366,14 @@ void VhdlParser::design_file() {
       end_label_14: ;
       }
       if (!hasError) {
-      
 
       }
-      
       break;
       }
-    case 0:{if (!hasError) {
-      
+    case 0:{
+      if (!hasError) {
       jj_consume_token(0);
       }
-      
       break;
       }
     default:
@@ -2776,41 +2384,35 @@ void VhdlParser::design_file() {
 }
 
 
-void VhdlParser::design_unit() {if (!hasError) {
-    
+void VhdlParser::design_unit() {
+    if (!hasError) {
     context_clause();
     }
     if (!hasError) {
-    
     library_unit();
     }
-    
 }
 
 
 QCString VhdlParser::designator() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case STRINGLITERAL:{if (!hasError) {
-      
+    case STRINGLITERAL:{
+      if (!hasError) {
       s = operator_symbol();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -2824,26 +2426,22 @@ assert(false);
 
 QCString VhdlParser::direction() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case TO_T:{if (!hasError) {
-      
+    case TO_T:{
+      if (!hasError) {
       tok = jj_consume_token(TO_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case DOWNTO_T:{if (!hasError) {
-      
+    case DOWNTO_T:{
+      if (!hasError) {
       tok = jj_consume_token(DOWNTO_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -2855,65 +2453,53 @@ assert(false);
 }
 
 
-void VhdlParser::disconnection_specification() {if (!hasError) {
-    
+void VhdlParser::disconnection_specification() {
+    if (!hasError) {
     jj_consume_token(DISCONNECT_T);
     }
     if (!hasError) {
-    
     guarded_signal_specificatio();
     }
     if (!hasError) {
-    
     jj_consume_token(AFTER_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
-    
+void VhdlParser::guarded_signal_specificatio() {
+    if (!hasError) {
     signal_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     name();
     }
-    
 }
 
 
 QCString VhdlParser::discrete_range() {QCString s;
-    if (jj_2_29(2147483647)) {if (!hasError) {
-      
+    if (jj_2_29(2147483647)) {
+      if (!hasError) {
       s = range();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_30(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_30(2147483647)) {
+      if (!hasError) {
       s = subtype_indication();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
@@ -2922,26 +2508,22 @@ assert(false);
 }
 
 
-QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) {
-    
-    if (jj_2_31(2147483647)) {if (!hasError) {
-      
+QCString VhdlParser::element_association() {QCString s,s1;
+    if (!hasError) {
+    if (jj_2_31(2147483647)) {
+      if (!hasError) {
       s = choices();
       }
       if (!hasError) {
-      
       jj_consume_token(ARROW_T);
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     s1 = expression();
     }
-    
 if(!s.isEmpty())
  return s+"=>"+s1;
 return s1;
@@ -2949,23 +2531,19 @@ assert(false);
 }
 
 
-QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::element_declaration() {QCString s,s1;
+    if (!hasError) {
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
   //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
   return s+":"+s1;
@@ -2975,34 +2553,28 @@ assert(false);
 
 QCString VhdlParser::entity_aspect() {Token *tok=0;QCString s,s1;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{if (!hasError) {
-      
+    case ENTITY_T:{
+      if (!hasError) {
       tok = jj_consume_token(ENTITY_T);
       }
       if (!hasError) {
-      
       s = name();
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{if (!hasError) {
-        
+      case LPAREN_T:{
+        if (!hasError) {
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
-        
         s1 = identifier();
         }
         if (!hasError) {
-        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
-        
 s+="("+s1+")";
         }
-        
         break;
         }
       default:
@@ -3011,36 +2583,29 @@ s+="("+s1+")";
       }
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CONFIGURATION_T:{if (!hasError) {
-      
+    case CONFIGURATION_T:{
+      if (!hasError) {
       tok = jj_consume_token(CONFIGURATION_T);
       }
       if (!hasError) {
-      
       s = name();
       }
       if (!hasError) {
-      
 return tok->image.c_str()+s;
       }
-      
       break;
       }
-    case OPEN_T:{if (!hasError) {
-      
+    case OPEN_T:{
+      if (!hasError) {
       tok = jj_consume_token(OPEN_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -3054,191 +2619,157 @@ assert(false);
 
 QCString VhdlParser::entity_class() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{if (!hasError) {
-      
+    case ENTITY_T:{
+      if (!hasError) {
       jj_consume_token(ENTITY_T);
       }
       if (!hasError) {
-      
 return "entity";
       }
-      
       break;
       }
-    case ARCHITECTURE_T:{if (!hasError) {
-      
+    case ARCHITECTURE_T:{
+      if (!hasError) {
       jj_consume_token(ARCHITECTURE_T);
       }
       if (!hasError) {
-      
 return "architecture";
       }
-      
       break;
       }
-    case CONFIGURATION_T:{if (!hasError) {
-      
+    case CONFIGURATION_T:{
+      if (!hasError) {
       jj_consume_token(CONFIGURATION_T);
       }
       if (!hasError) {
-      
 return "configuration";
       }
-      
       break;
       }
-    case PROCEDURE_T:{if (!hasError) {
-      
+    case PROCEDURE_T:{
+      if (!hasError) {
       jj_consume_token(PROCEDURE_T);
       }
       if (!hasError) {
-      
 return "procedure";
       }
-      
       break;
       }
-    case FUNCTION_T:{if (!hasError) {
-      
+    case FUNCTION_T:{
+      if (!hasError) {
       jj_consume_token(FUNCTION_T);
       }
       if (!hasError) {
-      
 return "function";
       }
-      
       break;
       }
-    case PACKAGE_T:{if (!hasError) {
-      
+    case PACKAGE_T:{
+      if (!hasError) {
       jj_consume_token(PACKAGE_T);
       }
       if (!hasError) {
-      
 return "package";
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       jj_consume_token(TYPE_T);
       }
       if (!hasError) {
-      
 return "type";
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       jj_consume_token(SUBTYPE_T);
       }
       if (!hasError) {
-      
 return "subtype";
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
-      
 return "constant";
       }
-      
       break;
       }
-    case SIGNAL_T:{if (!hasError) {
-      
+    case SIGNAL_T:{
+      if (!hasError) {
       jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
-      
 return "signal";
       }
-      
       break;
       }
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
-      
 return "variable";
       }
-      
       break;
       }
-    case COMPONENT_T:{if (!hasError) {
-      
+    case COMPONENT_T:{
+      if (!hasError) {
       jj_consume_token(COMPONENT_T);
       }
       if (!hasError) {
-      
 return "component";
       }
-      
       break;
       }
-    case LABEL_T:{if (!hasError) {
-      
+    case LABEL_T:{
+      if (!hasError) {
       jj_consume_token(LABEL_T);
       }
       if (!hasError) {
-      
 return "label";
       }
-      
       break;
       }
-    case LITERAL_T:{if (!hasError) {
-      
+    case LITERAL_T:{
+      if (!hasError) {
       jj_consume_token(LITERAL_T);
       }
       if (!hasError) {
-      
 return "literal";
       }
-      
       break;
       }
-    case UNITS_T:{if (!hasError) {
-      
+    case UNITS_T:{
+      if (!hasError) {
       jj_consume_token(UNITS_T);
       }
       if (!hasError) {
-      
 return "units";
       }
-      
       break;
       }
-    case GROUP_T:{if (!hasError) {
-      
+    case GROUP_T:{
+      if (!hasError) {
       jj_consume_token(GROUP_T);
       }
       if (!hasError) {
-      
 return "group";
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       jj_consume_token(FILE_T);
       }
       if (!hasError) {
-      
 return "file";
       }
-      
       break;
       }
     default:
@@ -3250,22 +2781,19 @@ assert(false);
 }
 
 
-QCString VhdlParser::entity_class_entry() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::entity_class_entry() {QCString s;
+    if (!hasError) {
     s = entity_class();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case BOX_T:{if (!hasError) {
-      
+    case BOX_T:{
+      if (!hasError) {
       jj_consume_token(BOX_T);
       }
       if (!hasError) {
-      
 s+="<>";
       }
-      
       break;
       }
     default:
@@ -3273,25 +2801,21 @@ s+="<>";
       ;
     }
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;if (!hasError) {
+QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;
+    if (!hasError) {
     if (!hasError) {
-    
     s1 = entity_class_entry();
     }
     if (!hasError) {
-    
 s+=s1;
     }
-    
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -3301,66 +2825,54 @@ s+=s1;
       default:
         jj_la1[75] = jj_gen;
         goto end_label_15;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s = entity_class_entry();
       }
       if (!hasError) {
-      
 s2+=",";s2+=s;
       }
-      
     }
     end_label_15: ;
     }
-    
 return s1+s2;
 assert(false);
 }
 
 
-void VhdlParser::entity_declaration() {QCString s;if (!hasError) {
-    
+void VhdlParser::entity_declaration() {QCString s;
+    if (!hasError) {
     jj_consume_token(ENTITY_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 lastEntity=current.get();
                 lastCompound=0;
                 addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public);
     }
     if (!hasError) {
-    
     entity_header();
     }
     if (!hasError) {
-    
     entity_declarative_part();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case BEGIN_T:{if (!hasError) {
-      
+    case BEGIN_T:{
+      if (!hasError) {
       jj_consume_token(BEGIN_T);
       }
       if (!hasError) {
-      
       entity_statement_part();
       }
-      
       break;
       }
     default:
@@ -3369,17 +2881,14 @@ lastEntity=current.get();
     }
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{if (!hasError) {
-      
+    case ENTITY_T:{
+      if (!hasError) {
       jj_consume_token(ENTITY_T);
       }
-      
       break;
       }
     default:
@@ -3388,16 +2897,14 @@ lastEntity=current.get();
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -3406,10 +2913,8 @@ lastEntity=current.get();
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 lastEntity=0;lastCompound=0; genLabels.resize(0);
 }
 
@@ -3419,130 +2924,113 @@ void VhdlParser::entity_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       type_declaration();
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       subtype_declaration();
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       constant_declaration();
       }
-      
       break;
       }
-    case SIGNAL_T:{if (!hasError) {
-      
+    case SIGNAL_T:{
+      if (!hasError) {
       signal_declaration();
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       variable_declaration();
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       file_declaration();
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       alias_declaration();
       }
-      
       break;
       }
     default:
       jj_la1[79] = jj_gen;
-      if (jj_2_32(2147483647)) {if (!hasError) {
-        
+      if (jj_2_32(2147483647)) {
+        if (!hasError) {
         attribute_declaration();
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{if (!hasError) {
-          
+        case ATTRIBUTE_T:{
+          if (!hasError) {
           attribute_specification();
           }
-          
           break;
           }
-        case DISCONNECT_T:{if (!hasError) {
-          
+        case DISCONNECT_T:{
+          if (!hasError) {
           disconnection_specification();
           }
-          
           break;
           }
-        case USE_T:{if (!hasError) {
-          
+        case USE_T:{
+          if (!hasError) {
           use_clause();
           }
-          
           break;
           }
         default:
           jj_la1[80] = jj_gen;
-          if (jj_2_33(3)) {if (!hasError) {
-            
+          if (jj_2_33(3)) {
+            if (!hasError) {
             group_template_declaration();
             }
-            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{if (!hasError) {
-              
+            case GROUP_T:{
+              if (!hasError) {
               group_declaration();
               }
-              
               break;
               }
             default:
               jj_la1[81] = jj_gen;
-              if (jj_2_34(5)) {if (!hasError) {
-                
+              if (jj_2_34(5)) {
+                if (!hasError) {
                 package_instantiation_declaration();
                 }
-                
               } else {
                 switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-                case PACKAGE_T:{if (!hasError) {
-                  
+                case PACKAGE_T:{
+                  if (!hasError) {
                   package_declaration();
                   }
-                  
                   break;
                   }
-                case VHDL2008TOOLDIR:{if (!hasError) {
-                  
+                case VHDL2008TOOLDIR:{
+                  if (!hasError) {
                   jj_consume_token(VHDL2008TOOLDIR);
                   }
-                  
                   break;
                   }
                 default:
@@ -3559,8 +3047,8 @@ void VhdlParser::entity_declarative_item() {
 }
 
 
-void VhdlParser::entity_declarative_part() {if (!hasError) {
-    
+void VhdlParser::entity_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -3587,30 +3075,26 @@ void VhdlParser::entity_declarative_part() {if (!hasError) {
       default:
         jj_la1[83] = jj_gen;
         goto end_label_16;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       entity_declarative_item();
       }
-      
     }
     end_label_16: ;
     }
-    
 }
 
 
-QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::entity_designator() {QCString s,s1;
+    if (!hasError) {
     s = entity_tag();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LBRACKET_T:{if (!hasError) {
-      
+    case LBRACKET_T:{
+      if (!hasError) {
       s1 = signature();
       }
-      
       break;
       }
     default:
@@ -3618,24 +3102,21 @@ QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
       ;
     }
     }
-    
 return s+s1;
 assert(false);
 }
 
 
-void VhdlParser::entity_header() {if (!hasError) {
-    
+void VhdlParser::entity_header() {
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
 currP=VhdlDocGen::GENERIC;parse_sec=GEN_SEC;
       }
       if (!hasError) {
-      
       generic_clause();
       }
-      
       break;
       }
     default:
@@ -3644,17 +3125,14 @@ currP=VhdlDocGen::GENERIC;parse_sec=GEN_SEC;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{if (!hasError) {
-      
+    case PORT_T:{
+      if (!hasError) {
 currP=VhdlDocGen::PORT;
       }
       if (!hasError) {
-      
       port_clause();
       }
-      
       break;
       }
     default:
@@ -3662,7 +3140,6 @@ currP=VhdlDocGen::PORT;
       ;
     }
     }
-    
 }
 
 
@@ -3672,17 +3149,15 @@ QCString VhdlParser::entity_name_list() {QCString s,s1;
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
     case EXTENDED_CHARACTER:
-    case CHARACTER_LITERAL:{if (!hasError) {
-      
-      while (!hasError) {if (!hasError) {
-        
+    case CHARACTER_LITERAL:{
+      if (!hasError) {
+      while (!hasError) {
+        if (!hasError) {
         s1 = entity_designator();
         }
         if (!hasError) {
-        
 s+=s1;
         }
-        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case SLSL_T:
         case STRINGLITERAL:
@@ -3700,32 +3175,26 @@ s+=s1;
       end_label_17: ;
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case OTHER_T:{if (!hasError) {
-      
+    case OTHER_T:{
+      if (!hasError) {
       jj_consume_token(OTHER_T);
       }
       if (!hasError) {
-      
 return "other";
       }
-      
       break;
       }
-    case ALL_T:{if (!hasError) {
-      
+    case ALL_T:{
+      if (!hasError) {
       jj_consume_token(ALL_T);
       }
       if (!hasError) {
-      
 return "all";
       }
-      
       break;
       }
     default:
@@ -3737,46 +3206,40 @@ assert(false);
 }
 
 
-QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::entity_specification() {QCString s,s1;
+    if (!hasError) {
     s = entity_name_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = entity_class();
     }
-    
 return s+":"+s1;
 assert(false);
 }
 
 
 void VhdlParser::entity_statement() {
-    if (jj_2_35(2147483647)) {if (!hasError) {
-      
+    if (jj_2_35(2147483647)) {
+      if (!hasError) {
       concurrent_assertion_statement();
       }
-      
-    } else if (jj_2_36(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_36(2147483647)) {
+      if (!hasError) {
       process_statement();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case POSTPONED_T:
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         concurrent_procedure_call_statement();
         }
-        
         break;
         }
       default:
@@ -3788,8 +3251,8 @@ void VhdlParser::entity_statement() {
 }
 
 
-void VhdlParser::entity_statement_part() {if (!hasError) {
-    
+void VhdlParser::entity_statement_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -3805,15 +3268,13 @@ void VhdlParser::entity_statement_part() {if (!hasError) {
       default:
         jj_la1[90] = jj_gen;
         goto end_label_18;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       entity_statement();
       }
-      
     }
     end_label_18: ;
     }
-    
 }
 
 
@@ -3822,26 +3283,22 @@ QCString VhdlParser::entity_tag() {QCString s;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CHARACTER_LITERAL:{if (!hasError) {
-      
+    case CHARACTER_LITERAL:{
+      if (!hasError) {
       s = character_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -3856,26 +3313,22 @@ assert(false);
 QCString VhdlParser::enumeration_literal() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CHARACTER_LITERAL:{if (!hasError) {
-      
+    case CHARACTER_LITERAL:{
+      if (!hasError) {
       s = character_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -3887,16 +3340,14 @@ assert(false);
 }
 
 
-QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::enumeration_type_definition() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s = enumeration_literal();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -3906,45 +3357,38 @@ QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError)
       default:
         jj_la1[93] = jj_gen;
         goto end_label_19;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = enumeration_literal();
       }
       if (!hasError) {
-      
 s+=",";s+=s1;
       }
-      
     }
     end_label_19: ;
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return "("+s+")";
 assert(false);
 }
 
 
-QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
-    
+QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       t = jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -3953,18 +3397,15 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     }
     if (!hasError) {
-    
     jj_consume_token(EXIT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s1 = identifier();
       }
-      
       break;
       }
     default:
@@ -3973,17 +3414,14 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{if (!hasError) {
-      
+    case WHEN_T:{
+      if (!hasError) {
       t1 = jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       s2 = condition();
       }
-      
       break;
       }
     default:
@@ -3992,10 +3430,8 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 lab.resize(0);
   if(t) s+=":";
   if(t1) s2.prepend(" when ");
@@ -4006,12 +3442,11 @@ assert(false);
 }
 
 
-QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::expression() {QCString s,s1,s2;
+    if (!hasError) {
     s = relation();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND_T:
@@ -4026,23 +3461,19 @@ QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) {
       default:
         jj_la1[97] = jj_gen;
         goto end_label_20;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = logop();
       }
       if (!hasError) {
-      
       s2 = relation();
       }
       if (!hasError) {
-      
 s+=s1;s+=s2;
       }
-      
     }
     end_label_20: ;
     }
-    
 return s;
 assert(false);
 }
@@ -4050,70 +3481,58 @@ assert(false);
 
 QCString VhdlParser::logop() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case AND_T:{if (!hasError) {
-      
+    case AND_T:{
+      if (!hasError) {
       jj_consume_token(AND_T);
       }
       if (!hasError) {
-      
 return "and" ;
       }
-      
       break;
       }
-    case NAND_T:{if (!hasError) {
-      
+    case NAND_T:{
+      if (!hasError) {
       jj_consume_token(NAND_T);
       }
       if (!hasError) {
-      
 return "nand" ;
       }
-      
       break;
       }
-    case NOR_T:{if (!hasError) {
-      
+    case NOR_T:{
+      if (!hasError) {
       jj_consume_token(NOR_T);
       }
       if (!hasError) {
-      
 return "nor" ;
       }
-      
       break;
       }
-    case XNOR_T:{if (!hasError) {
-      
+    case XNOR_T:{
+      if (!hasError) {
       jj_consume_token(XNOR_T);
       }
       if (!hasError) {
-      
 return "xnor" ;
       }
-      
       break;
       }
-    case XOR_T:{if (!hasError) {
-      
+    case XOR_T:{
+      if (!hasError) {
       jj_consume_token(XOR_T);
       }
       if (!hasError) {
-      
 return "xor" ;
       }
-      
       break;
       }
-    case OR_T:{if (!hasError) {
-      
+    case OR_T:{
+      if (!hasError) {
       jj_consume_token(OR_T);
       }
       if (!hasError) {
-      
 return "or" ;
       }
-      
       break;
       }
     default:
@@ -4125,11 +3544,10 @@ assert(false);
 }
 
 
-QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) {
-    
+QCString VhdlParser::extended_identifier() {Token *t;
+    if (!hasError) {
     t = jj_consume_token(EXTENDED_CHARACTER);
     }
-    
 return t->image.c_str();
 assert(false);
 }
@@ -4148,26 +3566,22 @@ QCString VhdlParser::factor() {QCString s,s1;
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{if (!hasError) {
-      
+    case BIT_STRING_LITERAL:{
+      if (!hasError) {
       s = primary();
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case DOUBLEMULT_T:{if (!hasError) {
-        
+      case DOUBLEMULT_T:{
+        if (!hasError) {
         jj_consume_token(DOUBLEMULT_T);
         }
         if (!hasError) {
-        
         s1 = primary();
         }
         if (!hasError) {
-        
 s+="**";s+=s1;
         }
-        
         break;
         }
       default:
@@ -4176,40 +3590,32 @@ s+="**";s+=s1;
       }
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case ABS_T:{if (!hasError) {
-      
+    case ABS_T:{
+      if (!hasError) {
       jj_consume_token(ABS_T);
       }
       if (!hasError) {
-      
       s = primary();
       }
       if (!hasError) {
-      
 s1 = "abs "; return s1+s;
       }
-      
       break;
       }
-    case NOT_T:{if (!hasError) {
-      
+    case NOT_T:{
+      if (!hasError) {
       jj_consume_token(NOT_T);
       }
       if (!hasError) {
-      
       s = primary();
       }
       if (!hasError) {
-      
 s1="not ";return s1+s;
       }
-      
       break;
       }
     default:
@@ -4221,31 +3627,26 @@ assert(false);
 }
 
 
-QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) {
-    
+QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;
+    if (!hasError) {
     jj_consume_token(FILE_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s2 = subtype_indication();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IS_T:
-    case OPEN_T:{if (!hasError) {
-      
+    case OPEN_T:{
+      if (!hasError) {
       s3 = file_open_information();
       }
-      
       break;
       }
     default:
@@ -4254,10 +3655,8 @@ QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 QCString t1=s2+" "+s3;
    addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public);
    return " file "+s+":"+s2+" "+s3+";";
@@ -4265,28 +3664,25 @@ assert(false);
 }
 
 
-QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::file_logical_name() {QCString s;
+    if (!hasError) {
     s = expression();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::file_open_information() {QCString s,s1,s2;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_T:{if (!hasError) {
-      
+    case OPEN_T:{
+      if (!hasError) {
       jj_consume_token(OPEN_T);
       }
       if (!hasError) {
-      
       s = expression();
       }
-      
       break;
       }
     default:
@@ -4295,42 +3691,35 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     s1 = file_logical_name();
     }
-    
 s2="open "+s+" is "+s1;  return s2;
 assert(false);
 }
 
 
-QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::file_type_definition() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(FILE_T);
     }
     if (!hasError) {
-    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
-    
     s = type_mark();
     }
-    
 s1=" file of "+s; return s1;
 assert(false);
 }
 
 
-QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::floating_type_definition() {QCString s;
+    if (!hasError) {
     s = range_constraint();
     }
-    
 return s;
 assert(false);
 }
@@ -4341,26 +3730,22 @@ QCString VhdlParser::formal_designator() {QCString s;Token *tok=0;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case INTEGER:{if (!hasError) {
-      
+    case INTEGER:{
+      if (!hasError) {
       tok = jj_consume_token(INTEGER);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -4372,40 +3757,34 @@ assert(false);
 }
 
 
-QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::formal_parameter_list() {QCString s;
+    if (!hasError) {
     s = interface_list();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::formal_part() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::formal_part() {QCString s,s1;
+    if (!hasError) {
     s = name();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       formal_designator();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s+"("+s1+")";
       }
-      
       break;
       }
     default:
@@ -4413,45 +3792,37 @@ s+"("+s1+")";
       ;
     }
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(TYPE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 tmpEntry=current.get();
   addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
     }
     if (!hasError) {
-    
-    try {if (!hasError) {
-      
+    try {
+      if (!hasError) {
       s2 = type_definition();
       }
-      
     } catch ( ...) {
 error_skipto(SEMI_T);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if (s2.contains("#")) {
         VhdlDocGen::deleteAllChars(s2,'#');
         tmpEntry->spec=VhdlDocGen::RECORD;
@@ -4475,76 +3846,62 @@ assert(false);
 }
 
 
-QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::function_call() {QCString s,s1;
+    if (!hasError) {
     s = name();
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s1 = actual_parameter_part();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return s+"("+s1+")";
 assert(false);
 }
 
 
-void VhdlParser::generate_statement() {QCString s;if (!hasError) {
-    
+void VhdlParser::generate_statement() {QCString s;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
-    try {if (!hasError) {
-      
+    try {
+      if (!hasError) {
       generate_scheme();
       }
       if (!hasError) {
-      
       jj_consume_token(GENERATE_T);
       }
       if (!hasError) {
-      
 pushLabel(genLabels,s);
       }
       if (!hasError) {
-      
       generate_statement_body1();
       }
       if (!hasError) {
-      
       jj_consume_token(END_T);
       }
-      
     } catch ( ...) {
 error_skipto(GENERATE_T);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(GENERATE_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -4553,36 +3910,30 @@ error_skipto(GENERATE_T);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 genLabels=popLabel(genLabels);
 }
 
 
 void VhdlParser::generate_scheme() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FOR_T:{if (!hasError) {
-      
+    case FOR_T:{
+      if (!hasError) {
       jj_consume_token(FOR_T);
       }
       if (!hasError) {
-      
       parameter_specification();
       }
-      
       break;
       }
-    case IF_T:{if (!hasError) {
-      
+    case IF_T:{
+      if (!hasError) {
       jj_consume_token(IF_T);
       }
       if (!hasError) {
-      
       condition();
       }
-      
       break;
       }
     default:
@@ -4593,66 +3944,54 @@ void VhdlParser::generate_scheme() {
 }
 
 
-void VhdlParser::generic_clause() {QCString s;if (!hasError) {
-    
+void VhdlParser::generic_clause() {QCString s;
+    if (!hasError) {
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
 parse_sec=GEN_SEC;
     }
     if (!hasError) {
-    
     s = generic_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 parse_sec=0;
 }
 
 
-QCString VhdlParser::generic_list() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::generic_list() {QCString s;
+    if (!hasError) {
     s = interface_list();
     }
-    
 return s;
 assert(false);
 }
 
 
-void VhdlParser::generic_map_aspect() {if (!hasError) {
-    
+void VhdlParser::generic_map_aspect() {
+    if (!hasError) {
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
-    
     jj_consume_token(MAP_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     association_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 }
 
 
@@ -4661,26 +4000,22 @@ QCString VhdlParser::group_constituent() {QCString s;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CHARACTER_LITERAL:{if (!hasError) {
-      
+    case CHARACTER_LITERAL:{
+      if (!hasError) {
       s = character_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -4692,15 +4027,13 @@ assert(false);
 }
 
 
-QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) {
+QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;
+    if (!hasError) {
     if (!hasError) {
-    
     s1 = group_constituent();
     }
-    
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -4710,138 +4043,112 @@ QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) {
       default:
         jj_la1[108] = jj_gen;
         goto end_label_21;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s = group_constituent();
       }
       if (!hasError) {
-      
 s2+=",";s2+=s1;
       }
-      
     }
     end_label_21: ;
     }
-    
 return s+s2;
 assert(false);
 }
 
 
-QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::group_declaration() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(GROUP_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s2 = group_constituent_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return "group "+s+":"+s1+"("+s2+");";
 assert(false);
 }
 
 
-QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::group_template_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(GROUP_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s1 = entity_class_entry_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return "group "+s+ "is ("+s1+");";
 assert(false);
 }
 
 
-void VhdlParser::guarded_signal_specification() {if (!hasError) {
-    
+void VhdlParser::guarded_signal_specification() {
+    if (!hasError) {
     signal_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     type_mark();
     }
-    
 }
 
 
 QCString VhdlParser::identifier() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       tok = jj_consume_token(EXTENDED_CHARACTER);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case BASIC_IDENTIFIER:{if (!hasError) {
-      
+    case BASIC_IDENTIFIER:{
+      if (!hasError) {
       tok = jj_consume_token(BASIC_IDENTIFIER);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -4853,12 +4160,11 @@ assert(false);
 }
 
 
-QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) {
-    
+QCString VhdlParser::identifier_list() {QCString str,str1;
+    if (!hasError) {
     str = identifier();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -4868,41 +4174,35 @@ QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) {
       default:
         jj_la1[110] = jj_gen;
         goto end_label_22;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       str1 = identifier();
       }
       if (!hasError) {
-      
 str+=",";str+=str1;
       }
-      
     }
     end_label_22: ;
     }
-    
 return str;
 assert(false);
 }
 
 
-void VhdlParser::if_statement() {QCString s,s1;if (!hasError) {
-    
+void VhdlParser::if_statement() {QCString s,s1;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -4911,28 +4211,22 @@ void VhdlParser::if_statement() {QCString s,s1;if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(IF_T);
     }
     if (!hasError) {
-    
     s = condition();
     }
     if (!hasError) {
-    
     jj_consume_token(THEN_T);
     }
     if (!hasError) {
-    
 s.prepend("if ");
     FlowChart::addFlowChart(FlowChart::IF_NO,0,s);
     }
     if (!hasError) {
-    
     sequence_of_statement();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ELSIF_T:{
@@ -4942,47 +4236,38 @@ s.prepend("if ");
       default:
         jj_la1[112] = jj_gen;
         goto end_label_23;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(ELSIF_T);
       }
       if (!hasError) {
-      
       s1 = condition();
       }
       if (!hasError) {
-      
       jj_consume_token(THEN_T);
       }
       if (!hasError) {
-      
 s1.prepend("elsif ");
            FlowChart::addFlowChart(FlowChart::ELSIF_NO,0,s1.data());
       }
       if (!hasError) {
-      
       sequence_of_statement();
       }
-      
     }
     end_label_23: ;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ELSE_T:{if (!hasError) {
-      
+    case ELSE_T:{
+      if (!hasError) {
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
       }
       if (!hasError) {
-      
       sequence_of_statement();
       }
-      
       break;
       }
     default:
@@ -4991,22 +4276,18 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(IF_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -5015,47 +4296,39 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 FlowChart::moveToPrevLevel();
           FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0);
 }
 
 
-QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::incomplete_type_declaration() {QCString s;
+    if (!hasError) {
     jj_consume_token(TYPE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return "type "+s+";";
 assert(false);
 }
 
 
-QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;if (!hasError) {
-    
+QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;
+    if (!hasError) {
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s2 = discrete_range();
     }
     if (!hasError) {
-    
 s+=s2;
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -5065,42 +4338,35 @@ s+=s2;
       default:
         jj_la1[115] = jj_gen;
         goto end_label_24;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = discrete_range();
       }
       if (!hasError) {
-      
 s+=",";s+=s1;
       }
-      
     }
     end_label_24: ;
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return s+")";
 assert(false);
 }
 
 
 QCString VhdlParser::index_specification() {QCString s;
-    if (jj_2_37(2147483647)) {if (!hasError) {
-      
+    if (jj_2_37(2147483647)) {
+      if (!hasError) {
       s = discrete_range();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ABS_T:
@@ -5118,15 +4384,13 @@ return s;
       case CHARACTER_LITERAL:
       case DECIMAL_LITERAL:
       case BASED_LITERAL:
-      case BIT_STRING_LITERAL:{if (!hasError) {
-        
+      case BIT_STRING_LITERAL:{
+        if (!hasError) {
         s = expression();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
       default:
@@ -5139,19 +4403,16 @@ assert(false);
 }
 
 
-QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::index_subtype_definition() {QCString s;
+    if (!hasError) {
     s = type_mark();
     }
     if (!hasError) {
-    
     jj_consume_token(RANGE_T);
     }
     if (!hasError) {
-    
     jj_consume_token(BOX_T);
     }
-    
 return s+" range <> ";
 assert(false);
 }
@@ -5161,14 +4422,13 @@ QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case COMPONENT_T:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case COMPONENT_T:{if (!hasError) {
-        
+      case COMPONENT_T:{
+        if (!hasError) {
         jj_consume_token(COMPONENT_T);
         }
-        
         break;
         }
       default:
@@ -5177,63 +4437,50 @@ QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
       }
       }
       if (!hasError) {
-      
       s = identifier();
       }
       if (!hasError) {
-      
 s1="component "; return s;
       }
-      
       break;
       }
-    case ENTITY_T:{if (!hasError) {
-      
+    case ENTITY_T:{
+      if (!hasError) {
       jj_consume_token(ENTITY_T);
       }
       if (!hasError) {
-      
-      if (jj_2_38(2)) {if (!hasError) {
-        
+      if (jj_2_38(2)) {
+        if (!hasError) {
         jj_consume_token(BASIC_IDENTIFIER);
         }
         if (!hasError) {
-        
         jj_consume_token(DOT_T);
         }
-        
       } else {
         ;
       }
       }
       if (!hasError) {
-      
       s2 = name();
       }
       if (!hasError) {
-      
 s="entity|"+s2;
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{if (!hasError) {
-        
+      case LPAREN_T:{
+        if (!hasError) {
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
-        
         s1 = identifier();
         }
         if (!hasError) {
-        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
-        
 s+="(";s+=s1;s+=")" ;
         }
-        
         break;
         }
       default:
@@ -5242,25 +4489,20 @@ s+="(";s+=s1;s+=")" ;
       }
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CONFIGURATION_T:{if (!hasError) {
-      
+    case CONFIGURATION_T:{
+      if (!hasError) {
       jj_consume_token(CONFIGURATION_T);
       }
       if (!hasError) {
-      
       s = name();
       }
       if (!hasError) {
-      
 s1="configuration ";return s;
       }
-      
       break;
       }
     default:
@@ -5275,37 +4517,31 @@ assert(false);
 QCString VhdlParser::instantiation_list() {QCString s;Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier_list();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case OTHER_T:{if (!hasError) {
-      
+    case OTHER_T:{
+      if (!hasError) {
       tok = jj_consume_token(OTHER_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case ALL_T:{if (!hasError) {
-      
+    case ALL_T:{
+      if (!hasError) {
       tok = jj_consume_token(ALL_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -5317,78 +4553,66 @@ assert(false);
 }
 
 
-QCString VhdlParser::integer() {Token *t;if (!hasError) {
-    
+QCString VhdlParser::integer() {Token *t;
+    if (!hasError) {
     t = jj_consume_token(INTEGER);
     }
-    
 return t->image.c_str();
 assert(false);
 }
 
 
-QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::integer_type_definition() {QCString s;
+    if (!hasError) {
     s = range_constraint();
     }
-    
 return s;
 assert(false);
 }
 
 
 QCString VhdlParser::interface_declaration() {QCString s,s1;
-    if (jj_2_39(5)) {if (!hasError) {
-      
+    if (jj_2_39(5)) {
+      if (!hasError) {
       s = interface_subprogram_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PACKAGE_T:{if (!hasError) {
-        
+      case PACKAGE_T:{
+        if (!hasError) {
         interface_package_declaration();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
       default:
         jj_la1[121] = jj_gen;
-        if (jj_2_40(5)) {if (!hasError) {
-          
+        if (jj_2_40(5)) {
+          if (!hasError) {
           s = interface_variable_declaration();
           }
           if (!hasError) {
-          
 return s;
           }
-          
-        } else if (jj_2_41(5)) {if (!hasError) {
-          
+        } else if (jj_2_41(5)) {
+          if (!hasError) {
           interface_file_declaration();
           }
           if (!hasError) {
-          
 return s;
           }
-          
-        } else if (jj_2_42(2147483647)) {if (!hasError) {
-          
+        } else if (jj_2_42(2147483647)) {
+          if (!hasError) {
           subprogram_declaration();
           }
           if (!hasError) {
-          
 return s;
           }
-          
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case CONSTANT_T:
@@ -5396,22 +4620,19 @@ return s;
           case SIGNAL_T:
           case SHARED_T:
           case TYPE_T:
-          case VARIABLE_T:{if (!hasError) {
-            
+          case VARIABLE_T:{
+            if (!hasError) {
             s = object_class();
             }
             if (!hasError) {
-            
             s1 = identifier();
             }
             if (!hasError) {
-            
 if (parse_sec==GEN_SEC)
 
     addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,currP,s1.data(),0,Public);
     return s;
             }
-            
             break;
             }
           default:
@@ -5426,45 +4647,39 @@ assert(false);
 }
 
 
-QCString VhdlParser::interface_element() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::interface_element() {QCString s;
+    if (!hasError) {
     s = interface_declaration();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::interface_file_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(FILE_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
-    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
    return " file "+s+":"+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::interface_list() {QCString s,s1,s2;
+    if (!hasError) {
     s = interface_element();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SEMI_T:{
@@ -5474,63 +4689,55 @@ QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) {
       default:
         jj_la1[123] = jj_gen;
         goto end_label_25;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(SEMI_T);
       }
       if (!hasError) {
-      
       s1 = interface_element();
       }
       if (!hasError) {
-      
 s2+=";";s2+=s1;
       }
-      
     }
     end_label_25: ;
     }
-    
 return s+s2;
 assert(false);
 }
 
 
-QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;if (!hasError) {
-    
+QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case CONSTANT_T:
     case SIGNAL_T:
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case VARIABLE_T:{if (!hasError) {
-        
+      case VARIABLE_T:{
+        if (!hasError) {
         tok = jj_consume_token(VARIABLE_T);
         }
-        
         break;
         }
-      case SIGNAL_T:{if (!hasError) {
-        
+      case SIGNAL_T:{
+        if (!hasError) {
         tok = jj_consume_token(SIGNAL_T);
         }
-        
         break;
         }
-      case CONSTANT_T:{if (!hasError) {
-        
+      case CONSTANT_T:{
+        if (!hasError) {
         tok = jj_consume_token(CONSTANT_T);
         }
-        
         break;
         }
-      case SHARED_T:{if (!hasError) {
-        
+      case SHARED_T:{
+        if (!hasError) {
         tok = jj_consume_token(SHARED_T);
         }
-        
         break;
         }
       default:
@@ -5539,7 +4746,6 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
-      
       break;
       }
     default:
@@ -5548,25 +4754,21 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BUFFER_T:
     case IN_T:
     case INOUT_T:
     case LINKAGE_T:
-    case OUT_T:{if (!hasError) {
-      
+    case OUT_T:{
+      if (!hasError) {
       s1 = mode();
       }
-      
       break;
       }
     default:
@@ -5575,17 +4777,14 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
     if (!hasError) {
-    
     s2 = subtype_indication();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case BUS_T:{if (!hasError) {
-      
+    case BUS_T:{
+      if (!hasError) {
       tok1 = jj_consume_token(BUS_T);
       }
-      
       break;
       }
     default:
@@ -5594,17 +4793,14 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{if (!hasError) {
-      
+    case VARASSIGN_T:{
+      if (!hasError) {
       tok2 = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
-      
       s4 = expression();
       }
-      
       break;
       }
     default:
@@ -5612,7 +4808,6 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
       ;
     }
     }
-    
 if(tok)
                     s5=tok->image.c_str();
 
@@ -5646,40 +4841,34 @@ assert(false);
 
 QCString VhdlParser::iteration_scheme() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHILE_T:{if (!hasError) {
-      
+    case WHILE_T:{
+      if (!hasError) {
       jj_consume_token(WHILE_T);
       }
       if (!hasError) {
-      
       s = condition();
       }
       if (!hasError) {
-      
 s.prepend("while ");
    FlowChart::addFlowChart(FlowChart::WHILE_NO,0,s.data(),lab.data());
    lab="";
   return s;
       }
-      
       break;
       }
-    case FOR_T:{if (!hasError) {
-      
+    case FOR_T:{
+      if (!hasError) {
       jj_consume_token(FOR_T);
       }
       if (!hasError) {
-      
       s = parameter_specification();
       }
       if (!hasError) {
-      
 QCString q=lab+" for "+s;
     FlowChart::addFlowChart(FlowChart::FOR_NO,0,q.data(),lab.data());
     lab="";
     return q;
       }
-      
       break;
       }
     default:
@@ -5691,32 +4880,27 @@ assert(false);
 }
 
 
-QCString VhdlParser::label() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::label() {QCString s;
+    if (!hasError) {
     s = identifier();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::library_clause() {QCString s;if (!hasError) {
+QCString VhdlParser::library_clause() {QCString s;
+    if (!hasError) {
     if (!hasError) {
-    
     jj_consume_token(LIBRARY_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
     }
-    
 if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
                    {
                            addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,s.data(),"_library_",Public);
@@ -5728,34 +4912,29 @@ assert(false);
 
 
 QCString VhdlParser::library_unit() {QCString s;
-    if (jj_2_43(2)) {if (!hasError) {
-      
+    if (jj_2_43(2)) {
+      if (!hasError) {
       primary_unit();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ARCHITECTURE_T:
-      case PACKAGE_T:{if (!hasError) {
-        
+      case PACKAGE_T:{
+        if (!hasError) {
         secondary_unit();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
-      case CONTEXT_T:{if (!hasError) {
-        
+      case CONTEXT_T:{
+        if (!hasError) {
         context_declaration();
         }
-        
         break;
         }
       default:
@@ -5769,55 +4948,45 @@ assert(false);
 
 
 QCString VhdlParser::literal() {QCString s;
-    if (jj_2_44(2147483647)) {if (!hasError) {
-      
+    if (jj_2_44(2147483647)) {
+      if (!hasError) {
       s = bit_string_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_45(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_45(2147483647)) {
+      if (!hasError) {
       s = numeric_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_46(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_46(2147483647)) {
+      if (!hasError) {
       s = enumeration_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case STRINGLITERAL:{if (!hasError) {
-        
+      case STRINGLITERAL:{
+        if (!hasError) {
         s = string_literal();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
-      case NULL_T:{if (!hasError) {
-        
+      case NULL_T:{
+        if (!hasError) {
         jj_consume_token(NULL_T);
         }
         if (!hasError) {
-        
 return "null";
         }
-        
         break;
         }
       default:
@@ -5830,33 +4999,29 @@ assert(false);
 }
 
 
-QCString VhdlParser::logical_operator() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::logical_operator() {QCString s;
+    if (!hasError) {
     s = logop();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) {
-    
+QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
-      
 s+=":";
       }
-      
       break;
       }
     default:
@@ -5865,14 +5030,12 @@ s+=":";
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case FOR_T:
-    case WHILE_T:{if (!hasError) {
-      
+    case WHILE_T:{
+      if (!hasError) {
       s1 = iteration_scheme();
       }
-      
       break;
       }
     default:
@@ -5881,35 +5044,28 @@ s+=":";
     }
     }
     if (!hasError) {
-    
 if(s1.isEmpty())
         FlowChart::addFlowChart(FlowChart::LOOP_NO,0,"infinite");
     }
     if (!hasError) {
-    
     jj_consume_token(LOOP_T);
     }
     if (!hasError) {
-    
     s2 = sequence_of_statement();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LOOP_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s3 = identifier();
       }
-      
       break;
       }
     default:
@@ -5918,10 +5074,8 @@ if(s1.isEmpty())
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 QCString q = s+" loop "+s2+" end loop" +s3;
          QCString endLoop="end loop" + s3;
          FlowChart::moveToPrevLevel();
@@ -5933,37 +5087,31 @@ assert(false);
 
 QCString VhdlParser::miscellaneous_operator() {Token *t=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DOUBLEMULT_T:{if (!hasError) {
-      
+    case DOUBLEMULT_T:{
+      if (!hasError) {
       jj_consume_token(DOUBLEMULT_T);
       }
       if (!hasError) {
-      
 return "**";
       }
-      
       break;
       }
-    case ABS_T:{if (!hasError) {
-      
+    case ABS_T:{
+      if (!hasError) {
       jj_consume_token(ABS_T);
       }
       if (!hasError) {
-      
 return "abs";
       }
-      
       break;
       }
-    case NOT_T:{if (!hasError) {
-      
+    case NOT_T:{
+      if (!hasError) {
       jj_consume_token(NOT_T);
       }
       if (!hasError) {
-      
 return "not";
       }
-      
       break;
       }
     default:
@@ -5977,59 +5125,49 @@ assert(false);
 
 QCString VhdlParser::mode() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IN_T:{if (!hasError) {
-      
+    case IN_T:{
+      if (!hasError) {
       tok = jj_consume_token(IN_T);
       }
       if (!hasError) {
-      
 return "in";
       }
-      
       break;
       }
-    case OUT_T:{if (!hasError) {
-      
+    case OUT_T:{
+      if (!hasError) {
       tok = jj_consume_token(OUT_T);
       }
       if (!hasError) {
-      
 return "out";
       }
-      
       break;
       }
-    case INOUT_T:{if (!hasError) {
-      
+    case INOUT_T:{
+      if (!hasError) {
       tok = jj_consume_token(INOUT_T);
       }
       if (!hasError) {
-      
 return "inout";
       }
-      
       break;
       }
-    case BUFFER_T:{if (!hasError) {
-      
+    case BUFFER_T:{
+      if (!hasError) {
       tok = jj_consume_token(BUFFER_T);
       }
       if (!hasError) {
-      
 return "buffer";
       }
-      
       break;
       }
-    case LINKAGE_T:{if (!hasError) {
-      
+    case LINKAGE_T:{
+      if (!hasError) {
       tok = jj_consume_token(LINKAGE_T);
       }
       if (!hasError) {
-      
 return "linkage";
       }
-      
       break;
       }
     default:
@@ -6043,48 +5181,40 @@ assert(false);
 
 QCString VhdlParser::multiplying_operation() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case MULT_T:{if (!hasError) {
-      
+    case MULT_T:{
+      if (!hasError) {
       tok = jj_consume_token(MULT_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case SLASH_T:{if (!hasError) {
-      
+    case SLASH_T:{
+      if (!hasError) {
       tok = jj_consume_token(SLASH_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case MOD_T:{if (!hasError) {
-      
+    case MOD_T:{
+      if (!hasError) {
       tok = jj_consume_token(MOD_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
-    case REM_T:{if (!hasError) {
-      
+    case REM_T:{
+      if (!hasError) {
       tok = jj_consume_token(REM_T);
       }
       if (!hasError) {
-      
 return tok->image.c_str();
       }
-      
       break;
       }
     default:
@@ -6096,29 +5226,26 @@ assert(false);
 }
 
 
-QCString VhdlParser::name() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::name() {QCString s,s1;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case STRINGLITERAL:{if (!hasError) {
-      
+    case STRINGLITERAL:{
+      if (!hasError) {
       s = operator_symbol();
       }
-      
       break;
       }
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
-      
       break;
       }
-    case SLSL_T:{if (!hasError) {
-      
+    case SLSL_T:{
+      if (!hasError) {
       s = external_name();
       }
-      
       break;
       }
     default:
@@ -6128,110 +5255,90 @@ QCString VhdlParser::name() {QCString s,s1;if (!hasError) {
     }
     }
     if (!hasError) {
-    
-    if (jj_2_47(2147483647)) {if (!hasError) {
-      
+    if (jj_2_47(2147483647)) {
+      if (!hasError) {
       s1 = name_ext1();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
     } else {
       ;
     }
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::name_ext1() {QCString s,s1,s2;
+    if (!hasError) {
     s = name_ext();
     }
     if (!hasError) {
-    
     while (!hasError) {
       if (jj_2_48(2147483647)) {
         ;
       } else {
         goto end_label_26;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = name_ext();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
     }
     end_label_26: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) {
-    
-    if (jj_2_49(2147483647)) {if (!hasError) {
-      
+QCString VhdlParser::name_ext() {QCString s,s1,s2;
+    if (!hasError) {
+    if (jj_2_49(2147483647)) {
+      if (!hasError) {
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
-      
       s1 = suffix();
       }
       if (!hasError) {
-      
 s+=".";s+=s1;
       }
-      
-    } else if (jj_2_50(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_50(2147483647)) {
+      if (!hasError) {
       s1 = test_att_name();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
-    } else if (jj_2_51(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_51(2147483647)) {
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = discrete_range();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s+="(";s+=s1;s+=")";
       }
-      
-    } else if (jj_2_52(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_52(2147483647)) {
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
 s+="(";s+=s1;
       }
       if (!hasError) {
-      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -6241,89 +5348,72 @@ s+="(";s+=s1;
         default:
           jj_la1[139] = jj_gen;
           goto end_label_27;
-        }if (!hasError) {
-        
+        }
+        if (!hasError) {
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
-        
         s1 = expression();
         }
         if (!hasError) {
-        
 s+=",";s+=s1;
         }
-        
       }
       end_label_27: ;
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s+=")";
       }
-      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) {
-    
-    if (jj_2_53(2147483647)) {if (!hasError) {
-      
+QCString VhdlParser::test_att_name() {QCString s,s1;
+    if (!hasError) {
+    if (jj_2_53(2147483647)) {
+      if (!hasError) {
       s1 = signature();
       }
       if (!hasError) {
-      
 s=s1;
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(APOSTROPHE_T);
     }
     if (!hasError) {
-    
     s1 = attribute_designator();
     }
     if (!hasError) {
-    
 s+="'";s+=s1;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s+="(";s+=s1;s+=")";
       }
-      
       break;
       }
     default:
@@ -6331,30 +5421,25 @@ s+="(";s+=s1;s+=")";
       ;
     }
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::indexed_name() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::indexed_name() {QCString s,s1,s2;
+    if (!hasError) {
     s2 = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s1 = expression();
     }
     if (!hasError) {
-    
 s=s2+"("+s1;
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -6364,45 +5449,38 @@ s=s2+"("+s1;
       default:
         jj_la1[141] = jj_gen;
         goto end_label_28;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
 s+=",";s+=s1;
       }
-      
     }
     end_label_28: ;
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return s+")";
 assert(false);
 }
 
 
-QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
-    
+QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       t = jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -6411,18 +5489,15 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     }
     if (!hasError) {
-    
     jj_consume_token(NEXT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s1 = identifier();
       }
-      
       break;
       }
     default:
@@ -6431,17 +5506,14 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{if (!hasError) {
-      
+    case WHEN_T:{
+      if (!hasError) {
       t1 = jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       s2 = condition();
       }
-      
       break;
       }
     default:
@@ -6450,10 +5522,8 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;i
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(t) s+=":";
    FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2.data(),s1.data());
     lab.resize(0);
@@ -6463,23 +5533,20 @@ assert(false);
 }
 
 
-QCString VhdlParser::null_statement() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::null_statement() {QCString s;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
-      
 s+=":";
       }
-      
       break;
       }
     default:
@@ -6488,42 +5555,35 @@ s+=":";
     }
     }
     if (!hasError) {
-    
     jj_consume_token(NULL_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return s+="null";
 assert(false);
 }
 
 
 QCString VhdlParser::numeric_literal() {QCString s;
-    if (jj_2_54(2147483647)) {if (!hasError) {
-      
+    if (jj_2_54(2147483647)) {
+      if (!hasError) {
       s = physical_literal();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case INTEGER:
       case DECIMAL_LITERAL:
-      case BASED_LITERAL:{if (!hasError) {
-        
+      case BASED_LITERAL:{
+        if (!hasError) {
         s = abstract_literal();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
       default:
@@ -6538,74 +5598,61 @@ assert(false);
 
 QCString VhdlParser::object_class() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
-      
 return "constant";
       }
-      
       break;
       }
-    case SIGNAL_T:{if (!hasError) {
-      
+    case SIGNAL_T:{
+      if (!hasError) {
       jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
-      
 return "signal";
       }
-      
       break;
       }
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
-      
 return "variable";
       }
-      
       break;
       }
-    case SHARED_T:{if (!hasError) {
-      
+    case SHARED_T:{
+      if (!hasError) {
       jj_consume_token(SHARED_T);
       }
       if (!hasError) {
-      
       jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
-      
 return "shared variable";
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       jj_consume_token(FILE_T);
       }
       if (!hasError) {
-      
 return "file";
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       jj_consume_token(TYPE_T);
       }
       if (!hasError) {
-      
 return "type";
       }
-      
       break;
       }
     default:
@@ -6617,24 +5664,22 @@ assert(false);
 }
 
 
-QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::operator_symbol() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(STRINGLITERAL);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-void VhdlParser::options() {if (!hasError) {
-    
+void VhdlParser::options() {
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GUARDED_T:{if (!hasError) {
-      
+    case GUARDED_T:{
+      if (!hasError) {
       jj_consume_token(GUARDED_T);
       }
-      
       break;
       }
     default:
@@ -6643,15 +5688,13 @@ void VhdlParser::options() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INERTIAL_T:
     case REJECT_T:
-    case TRANSPORT_T:{if (!hasError) {
-      
+    case TRANSPORT_T:{
+      if (!hasError) {
       delay_mechanism();
       }
-      
       break;
       }
     default:
@@ -6659,52 +5702,42 @@ void VhdlParser::options() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-void VhdlParser::package_body() {QCString s;if (!hasError) {
-    
+void VhdlParser::package_body() {QCString s;
+    if (!hasError) {
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
-    
     jj_consume_token(BODY_T);
     }
     if (!hasError) {
-    
     s = name();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 lastCompound=current.get();
                         s.prepend("_");
                         addVhdlType(s,getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
     }
     if (!hasError) {
-    
     package_body_declarative_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PACKAGE_T:{if (!hasError) {
-      
+    case PACKAGE_T:{
+      if (!hasError) {
       jj_consume_token(PACKAGE_T);
       }
       if (!hasError) {
-      
       jj_consume_token(BODY_T);
       }
-      
       break;
       }
     default:
@@ -6713,16 +5746,14 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -6731,10 +5762,8 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 lastCompound=0; genLabels.resize(0);
 }
 
@@ -6744,77 +5773,67 @@ void VhdlParser::package_body_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       type_declaration();
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       subtype_declaration();
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       constant_declaration();
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       variable_declaration();
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       file_declaration();
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       alias_declaration();
       }
-      
       break;
       }
-    case USE_T:{if (!hasError) {
-      
+    case USE_T:{
+      if (!hasError) {
       use_clause();
       }
-      
       break;
       }
     default:
       jj_la1[152] = jj_gen;
-      if (jj_2_55(3)) {if (!hasError) {
-        
+      if (jj_2_55(3)) {
+        if (!hasError) {
         group_template_declaration();
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case GROUP_T:{if (!hasError) {
-          
+        case GROUP_T:{
+          if (!hasError) {
           group_declaration();
           }
-          
           break;
           }
         default:
@@ -6827,8 +5846,8 @@ void VhdlParser::package_body_declarative_item() {
 }
 
 
-void VhdlParser::package_body_declarative_part() {if (!hasError) {
-    
+void VhdlParser::package_body_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -6850,32 +5869,27 @@ void VhdlParser::package_body_declarative_part() {if (!hasError) {
       default:
         jj_la1[154] = jj_gen;
         goto end_label_29;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       package_body_declarative_item();
       }
-      
     }
     end_label_29: ;
     }
-    
 }
 
 
-void VhdlParser::package_declaration() {QCString s;if (!hasError) {
-    
+void VhdlParser::package_declaration() {QCString s;
+    if (!hasError) {
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 lastCompound=current.get();
                           std::unique_ptr<Entry> clone=std::make_unique<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
@@ -6888,21 +5902,17 @@ lastCompound=current.get();
                           addVhdlType(s,getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
     }
     if (!hasError) {
-    
     package_declarative_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PACKAGE_T:{if (!hasError) {
-      
+    case PACKAGE_T:{
+      if (!hasError) {
       jj_consume_token(PACKAGE_T);
       }
-      
       break;
       }
     default:
@@ -6911,16 +5921,14 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -6929,37 +5937,31 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 lastEntity=0;lastCompound=0; genLabels.resize(0);
 }
 
 
-void VhdlParser::geninter() {if (!hasError) {
-    
+void VhdlParser::geninter() {
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
       gen_interface_list();
       }
       if (!hasError) {
-      
       jj_consume_token(SEMI_T);
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case GENERIC_T:{if (!hasError) {
-        
+      case GENERIC_T:{
+        if (!hasError) {
         gen_assoc_list();
         }
         if (!hasError) {
-        
         jj_consume_token(SEMI_T);
         }
-        
         break;
         }
       default:
@@ -6967,7 +5969,6 @@ void VhdlParser::geninter() {if (!hasError) {
         ;
       }
       }
-      
       break;
       }
     default:
@@ -6975,7 +5976,6 @@ void VhdlParser::geninter() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
@@ -6984,130 +5984,113 @@ void VhdlParser::package_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       type_declaration();
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       subtype_declaration();
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       constant_declaration();
       }
-      
       break;
       }
-    case SIGNAL_T:{if (!hasError) {
-      
+    case SIGNAL_T:{
+      if (!hasError) {
       signal_declaration();
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       variable_declaration();
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       file_declaration();
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       alias_declaration();
       }
-      
       break;
       }
-    case COMPONENT_T:{if (!hasError) {
-      
+    case COMPONENT_T:{
+      if (!hasError) {
       component_declaration();
       }
-      
       break;
       }
     default:
       jj_la1[159] = jj_gen;
-      if (jj_2_56(2147483647)) {if (!hasError) {
-        
+      if (jj_2_56(2147483647)) {
+        if (!hasError) {
         attribute_declaration();
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{if (!hasError) {
-          
+        case ATTRIBUTE_T:{
+          if (!hasError) {
           attribute_specification();
           }
-          
           break;
           }
-        case DISCONNECT_T:{if (!hasError) {
-          
+        case DISCONNECT_T:{
+          if (!hasError) {
           disconnection_specification();
           }
-          
           break;
           }
-        case USE_T:{if (!hasError) {
-          
+        case USE_T:{
+          if (!hasError) {
           use_clause();
           }
-          
           break;
           }
         default:
           jj_la1[160] = jj_gen;
-          if (jj_2_57(3)) {if (!hasError) {
-            
+          if (jj_2_57(3)) {
+            if (!hasError) {
             group_template_declaration();
             }
-            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{if (!hasError) {
-              
+            case GROUP_T:{
+              if (!hasError) {
               group_declaration();
               }
-              
               break;
               }
             default:
               jj_la1[161] = jj_gen;
-              if (jj_2_58(5)) {if (!hasError) {
-                
+              if (jj_2_58(5)) {
+                if (!hasError) {
                 package_instantiation_declaration();
                 }
-                
               } else {
                 switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-                case PACKAGE_T:{if (!hasError) {
-                  
+                case PACKAGE_T:{
+                  if (!hasError) {
                   package_declaration();
                   }
-                  
                   break;
                   }
                 default:
@@ -7124,8 +6107,8 @@ void VhdlParser::package_declarative_item() {
 }
 
 
-void VhdlParser::package_declarative_part() {if (!hasError) {
-    
+void VhdlParser::package_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -7152,75 +6135,63 @@ void VhdlParser::package_declarative_part() {if (!hasError) {
       default:
         jj_la1[163] = jj_gen;
         goto end_label_30;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       package_declarative_item();
       }
-      
     }
     end_label_30: ;
     }
-    
 }
 
 
-QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::parameter_specification() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IN_T);
     }
     if (!hasError) {
-    
     s1 = discrete_range();
     }
-    
 return s+" in "+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
-    
-    if (jj_2_59(2147483647)) {if (!hasError) {
-      
+QCString VhdlParser::physical_literal() {QCString s,s1;
+    if (!hasError) {
+    if (jj_2_59(2147483647)) {
+      if (!hasError) {
       s = abstract_literal();
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     s1 = name();
     }
-    
 s+=" ";s+=s1;s.prepend(" "); return s;
 assert(false);
 }
 
 
-QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(UNITS_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
     if (!hasError) {
-    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public);
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
@@ -7231,33 +6202,28 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public)
       default:
         jj_la1[164] = jj_gen;
         goto end_label_31;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = secondary_unit_declaration();
       }
-      
     }
     end_label_31: ;
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(UNITS_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -7265,156 +6231,126 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public)
       ;
     }
     }
-    
 return s+"%";
 assert(false);
 }
 
 
-void VhdlParser::port_clause() {if (!hasError) {
-    
+void VhdlParser::port_clause() {
+    if (!hasError) {
     jj_consume_token(PORT_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     port_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 currP=0;
 }
 
 
-QCString VhdlParser::port_list() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::port_list() {QCString s;
+    if (!hasError) {
     s = interface_list();
     }
-    
 return s;
 assert(false);
 }
 
 
-void VhdlParser::port_map_aspect() {if (!hasError) {
-    
+void VhdlParser::port_map_aspect() {
+    if (!hasError) {
     jj_consume_token(PORT_T);
     }
     if (!hasError) {
-    
     jj_consume_token(MAP_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     association_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 }
 
 
 QCString VhdlParser::primary() {QCString s,s1;
-    if (jj_2_60(2147483647)) {if (!hasError) {
-      
+    if (jj_2_60(2147483647)) {
+      if (!hasError) {
       s = function_call();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_61(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_61(2147483647)) {
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s="("+s1+")"; return s;
       }
-      
-    } else if (jj_2_62(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_62(2147483647)) {
+      if (!hasError) {
       s = qualified_expression();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_63(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_63(2147483647)) {
+      if (!hasError) {
       s = type_conversion();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_64(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_64(2147483647)) {
+      if (!hasError) {
       s = literal();
       }
       if (!hasError) {
-      
 s.prepend(" ");return s;
       }
-      
-    } else if (jj_2_65(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_65(2147483647)) {
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NEW_T:{if (!hasError) {
-        
+      case NEW_T:{
+        if (!hasError) {
         allocator();
         }
         if (!hasError) {
-        
 return "";
         }
-        
         break;
         }
-      case LPAREN_T:{if (!hasError) {
-        
+      case LPAREN_T:{
+        if (!hasError) {
         s = aggregate();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
       default:
@@ -7429,39 +6365,34 @@ assert(false);
 
 void VhdlParser::primary_unit() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{if (!hasError) {
-      
+    case ENTITY_T:{
+      if (!hasError) {
       entity_declaration();
       }
-      
       break;
       }
-    case CONFIGURATION_T:{if (!hasError) {
-      
+    case CONFIGURATION_T:{
+      if (!hasError) {
       configuration_declaration();
       }
-      
       break;
       }
     default:
       jj_la1[167] = jj_gen;
-      if (jj_2_66(2147483647)) {if (!hasError) {
-        
+      if (jj_2_66(2147483647)) {
+        if (!hasError) {
         package_instantiation_declaration();
         }
-        
-      } else if (jj_2_67(4)) {if (!hasError) {
-        
+      } else if (jj_2_67(4)) {
+        if (!hasError) {
         interface_package_declaration();
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PACKAGE_T:{if (!hasError) {
-          
+        case PACKAGE_T:{
+          if (!hasError) {
           package_declaration();
           }
-          
           break;
           }
         default:
@@ -7474,30 +6405,25 @@ void VhdlParser::primary_unit() {
 }
 
 
-QCString VhdlParser::procedure_call() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::procedure_call() {QCString s,s1;
+    if (!hasError) {
     s = name();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = actual_parameter_part();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
-      
 s1.prepend("("); s1.append(")");
       }
-      
       break;
       }
     default:
@@ -7505,40 +6431,33 @@ s1.prepend("("); s1.append(")");
       ;
     }
     }
-    
 return s+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) {
-    
-    if (jj_2_68(2)) {if (!hasError) {
-      
+QCString VhdlParser::procedure_call_statement() {QCString s,s1;
+    if (!hasError) {
+    if (jj_2_68(2)) {
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
-      
 s+=":";
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     s1 = procedure_call();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return s+s1+";";
 assert(false);
 }
@@ -7549,141 +6468,117 @@ QCString VhdlParser::process_declarative_item() {QCString s;
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
       if (!hasError) {
-      
 return "";
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       s = type_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       s = subtype_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       s = constant_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       s = variable_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       s = file_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       s = alias_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
       jj_la1[170] = jj_gen;
-      if (jj_2_69(3)) {if (!hasError) {
-        
+      if (jj_2_69(3)) {
+        if (!hasError) {
         s = attribute_declaration();
         }
         if (!hasError) {
-        
 return s;
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{if (!hasError) {
-          
+        case ATTRIBUTE_T:{
+          if (!hasError) {
           s = attribute_specification();
           }
           if (!hasError) {
-          
 return s;
           }
-          
           break;
           }
-        case USE_T:{if (!hasError) {
-          
+        case USE_T:{
+          if (!hasError) {
           s = use_clause();
           }
           if (!hasError) {
-          
 return s;
           }
-          
           break;
           }
         default:
           jj_la1[171] = jj_gen;
-          if (jj_2_70(3)) {if (!hasError) {
-            
+          if (jj_2_70(3)) {
+            if (!hasError) {
             s = group_template_declaration();
             }
             if (!hasError) {
-            
 return s;
             }
-            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{if (!hasError) {
-              
+            case GROUP_T:{
+              if (!hasError) {
               s = group_declaration();
               }
               if (!hasError) {
-              
 return s;
               }
-              
               break;
               }
             default:
@@ -7699,8 +6594,8 @@ assert(false);
 }
 
 
-QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::process_declarative_part() {QCString s,s1;
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -7723,37 +6618,32 @@ QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) {
       default:
         jj_la1[173] = jj_gen;
         goto end_label_32;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = process_declarative_item();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
     }
     end_label_32: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasError) {
-    
+void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -7762,13 +6652,11 @@ void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasErro
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{if (!hasError) {
-      
+    case POSTPONED_T:{
+      if (!hasError) {
       jj_consume_token(POSTPONED_T);
       }
-      
       break;
       }
     default:
@@ -7777,40 +6665,34 @@ void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasErro
     }
     }
     if (!hasError) {
-    
 currP=VhdlDocGen::PROCESS;
                current->startLine=getLine();
                current->bodyLine=getLine();
     }
     if (!hasError) {
-    
     jj_consume_token(PROCESS_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ALL_T:{if (!hasError) {
-        
+      case ALL_T:{
+        if (!hasError) {
         tok = jj_consume_token(ALL_T);
         }
-        
         break;
         }
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         s1 = sensitivity_list();
         }
-        
         break;
         }
       default:
@@ -7820,10 +6702,8 @@ currP=VhdlDocGen::PROCESS;
       }
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
-      
       break;
       }
     default:
@@ -7832,13 +6712,11 @@ currP=VhdlDocGen::PROCESS;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       jj_consume_token(IS_T);
       }
-      
       break;
       }
     default:
@@ -7847,35 +6725,28 @@ currP=VhdlDocGen::PROCESS;
     }
     }
     if (!hasError) {
-    
     s2 = process_declarative_part();
     }
     if (!hasError) {
-    
 if (s2.data())
                   FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2.data(),0);
                 FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
     }
     if (!hasError) {
-    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
-    
     process_statement_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{if (!hasError) {
-      
+    case POSTPONED_T:{
+      if (!hasError) {
       jj_consume_token(POSTPONED_T);
       }
-      
       break;
       }
     default:
@@ -7884,18 +6755,15 @@ if (s2.data())
     }
     }
     if (!hasError) {
-    
     jj_consume_token(PROCESS_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -7904,10 +6772,8 @@ if (s2.data())
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(s.isEmpty())
    currName=VhdlDocGen::getProcessNumber();
    else
@@ -7926,8 +6792,8 @@ if(s.isEmpty())
 }
 
 
-void VhdlParser::process_statement_part() {if (!hasError) {
-    
+void VhdlParser::process_statement_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -7954,60 +6820,49 @@ void VhdlParser::process_statement_part() {if (!hasError) {
       default:
         jj_la1[181] = jj_gen;
         goto end_label_33;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       sequential_statement();
       }
-      
     }
     end_label_33: ;
     }
-    
 }
 
 
-QCString VhdlParser::qualified_expression() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::qualified_expression() {QCString s,s1;
+    if (!hasError) {
     s1 = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(APOSTROPHE_T);
     }
     if (!hasError) {
-    
 s=s1+"'";
     }
     if (!hasError) {
-    
-    if (jj_2_71(2147483647)) {if (!hasError) {
-      
+    if (jj_2_71(2147483647)) {
+      if (!hasError) {
       s1 = aggregate();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{if (!hasError) {
-        
+      case LPAREN_T:{
+        if (!hasError) {
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
-        
         s1 = expression();
         }
         if (!hasError) {
-        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
-        
 s+="(";s+=s1;s+=")";
         }
-        
         break;
         }
       default:
@@ -8017,39 +6872,32 @@ s+="(";s+=s1;s+=")";
       }
     }
     }
-    
 return s;
 assert(false);
 }
 
 
 QCString VhdlParser::range() {QCString s,s1,s2;
-    if (jj_2_72(2147483647)) {if (!hasError) {
-      
+    if (jj_2_72(2147483647)) {
+      if (!hasError) {
       s = simple_expression();
       }
       if (!hasError) {
-      
       s1 = direction();
       }
       if (!hasError) {
-      
       s2 = simple_expression();
       }
       if (!hasError) {
-      
 return s+" "+s1+" "+s2;
       }
-      
-    } else if (jj_2_73(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_73(2147483647)) {
+      if (!hasError) {
       s = attribute_name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
@@ -8058,31 +6906,27 @@ assert(false);
 }
 
 
-QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::range_constraint() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(RANGE_T);
     }
     if (!hasError) {
-    
     s = range();
     }
-    
 return " range "+s;
 assert(false);
 }
 
 
-void VhdlParser::record_type_definition() {if (!hasError) {
-    
+void VhdlParser::record_type_definition() {
+    if (!hasError) {
     jj_consume_token(RECORD_T);
     }
     if (!hasError) {
-    
-    while (!hasError) {if (!hasError) {
-      
+    while (!hasError) {
+      if (!hasError) {
       element_declaration();
       }
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
       case EXTENDED_CHARACTER:{
@@ -8097,24 +6941,20 @@ void VhdlParser::record_type_definition() {if (!hasError) {
     end_label_34: ;
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(RECORD_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       name();
       }
-      
       break;
       }
     default:
@@ -8122,31 +6962,27 @@ void VhdlParser::record_type_definition() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::relation() {QCString s,s1,s2;
+    if (!hasError) {
     s = shift_expression();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LESSTHAN_T:
     case GREATERTHAN_T:
     case LT_T:
     case GT_T:
     case EQU_T:
-    case NOTEQU_T:{if (!hasError) {
-      
+    case NOTEQU_T:{
+      if (!hasError) {
       s1 = relation_operator();
       }
       if (!hasError) {
-      
       s2 = shift_expression();
       }
-      
       break;
       }
     default:
@@ -8154,7 +6990,6 @@ QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
       ;
     }
     }
-    
 return s+s1+s2;
 assert(false);
 }
@@ -8162,70 +6997,58 @@ assert(false);
 
 QCString VhdlParser::relation_operator() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LT_T:{if (!hasError) {
-      
+    case LT_T:{
+      if (!hasError) {
       jj_consume_token(LT_T);
       }
       if (!hasError) {
-      
 return "<";
       }
-      
       break;
       }
-    case GT_T:{if (!hasError) {
-      
+    case GT_T:{
+      if (!hasError) {
       jj_consume_token(GT_T);
       }
       if (!hasError) {
-      
 return ">";
       }
-      
       break;
       }
-    case EQU_T:{if (!hasError) {
-      
+    case EQU_T:{
+      if (!hasError) {
       jj_consume_token(EQU_T);
       }
       if (!hasError) {
-      
 return "=";
       }
-      
       break;
       }
-    case GREATERTHAN_T:{if (!hasError) {
-      
+    case GREATERTHAN_T:{
+      if (!hasError) {
       jj_consume_token(GREATERTHAN_T);
       }
       if (!hasError) {
-      
 return ">=";
       }
-      
       break;
       }
-    case LESSTHAN_T:{if (!hasError) {
-      
+    case LESSTHAN_T:{
+      if (!hasError) {
       jj_consume_token(LESSTHAN_T);
       }
       if (!hasError) {
-      
 return "<=";
       }
-      
       break;
       }
-    case NOTEQU_T:{if (!hasError) {
-      
+    case NOTEQU_T:{
+      if (!hasError) {
       jj_consume_token(NOTEQU_T);
       }
       if (!hasError) {
-      
 return "/=";
       }
-      
       break;
       }
     default:
@@ -8237,19 +7060,17 @@ assert(false);
 }
 
 
-QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       t = jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -8258,25 +7079,20 @@ QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2
     }
     }
     if (!hasError) {
-    
     jj_consume_token(REPORT_T);
     }
     if (!hasError) {
-    
     s1 = expression();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SEVERITY_T:{if (!hasError) {
-      
+    case SEVERITY_T:{
+      if (!hasError) {
       t1 = jj_consume_token(SEVERITY_T);
       }
       if (!hasError) {
-      
       s2 = expression();
       }
-      
       break;
       }
     default:
@@ -8285,10 +7101,8 @@ QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(t) s.append(":");
         s1.prepend(" report ");
         if(t1) s2.prepend(" severity ");
@@ -8297,23 +7111,20 @@ assert(false);
 }
 
 
-QCString VhdlParser::return_statement() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::return_statement() {QCString s,s1;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
-      
 s+=":";
       }
-      
       break;
       }
     default:
@@ -8322,11 +7133,9 @@ s+=":";
     }
     }
     if (!hasError) {
-    
     jj_consume_token(RETURN_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ABS_T:
     case NEW_T:
@@ -8343,11 +7152,10 @@ s+=":";
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{if (!hasError) {
-      
+    case BIT_STRING_LITERAL:{
+      if (!hasError) {
       s1 = expression();
       }
-      
       break;
       }
     default:
@@ -8356,10 +7164,8 @@ s+=":";
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return s+" return "+s1+";";
 assert(false);
 }
@@ -8367,37 +7173,31 @@ assert(false);
 
 QCString VhdlParser::scalar_type_definition() {QCString s,s1;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       s = enumeration_type_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case RANGE_T:{if (!hasError) {
-      
+    case RANGE_T:{
+      if (!hasError) {
       s = range_constraint();
       }
       if (!hasError) {
-      
-      if (jj_2_74(2147483647)) {if (!hasError) {
-        
+      if (jj_2_74(2147483647)) {
+        if (!hasError) {
         s1 = physical_type_definition();
         }
-        
       } else {
         ;
       }
       }
       if (!hasError) {
-      
 return s+" "+s1+"%";
       }
-      
       break;
       }
     default:
@@ -8411,18 +7211,16 @@ assert(false);
 
 void VhdlParser::secondary_unit() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ARCHITECTURE_T:{if (!hasError) {
-      
+    case ARCHITECTURE_T:{
+      if (!hasError) {
       architecture_body();
       }
-      
       break;
       }
-    case PACKAGE_T:{if (!hasError) {
-      
+    case PACKAGE_T:{
+      if (!hasError) {
       package_body();
       }
-      
       break;
       }
     default:
@@ -8433,23 +7231,19 @@ void VhdlParser::secondary_unit() {
 }
 
 
-QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(EQU_T);
     }
     if (!hasError) {
-    
     s1 = physical_literal();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 //printf("\n %s %s [%d]",s.data(),s1.data(),getLine());
   addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public);
 
@@ -8458,74 +7252,60 @@ assert(false);
 }
 
 
-QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::selected_name() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(DOT_T);
     }
     if (!hasError) {
-    
     s1 = suffix();
     }
-    
 return s+"."+s1;
 assert(false);
 }
 
 
-void VhdlParser::selected_signal_assignment() {if (!hasError) {
-    
+void VhdlParser::selected_signal_assignment() {
+    if (!hasError) {
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
-    
     target();
     }
     if (!hasError) {
-    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
-    
     options();
     }
     if (!hasError) {
-    
     selected_waveforms();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::selected_waveforms() {if (!hasError) {
-    
+void VhdlParser::selected_waveforms() {
+    if (!hasError) {
     waveform();
     }
     if (!hasError) {
-    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
-    
     choices();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -8535,51 +7315,43 @@ void VhdlParser::selected_waveforms() {if (!hasError) {
       default:
         jj_la1[193] = jj_gen;
         goto end_label_35;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       waveform();
       }
       if (!hasError) {
-      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       choices();
       }
-      
     }
     end_label_35: ;
     }
-    
 }
 
 
-QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::sensitivity_clause() {QCString s;
+    if (!hasError) {
     jj_consume_token(ON_T);
     }
     if (!hasError) {
-    
     s = sensitivity_list();
     }
-    
 s.prepend(" on ");
   return s;
 assert(false);
 }
 
 
-QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::sensitivity_list() {QCString s,s1;
+    if (!hasError) {
     s = name();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -8589,175 +7361,142 @@ QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) {
       default:
         jj_la1[194] = jj_gen;
         goto end_label_36;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = name();
       }
       if (!hasError) {
-      
 s+=",";s+=s1;
       }
-      
     }
     end_label_36: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::sequence_of_statement() {QCString s,s1;
+    if (!hasError) {
     while (!hasError) {
       if (jj_2_75(3)) {
         ;
       } else {
         goto end_label_37;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = sequential_statement();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
     }
     end_label_37: ;
     }
-    
 return s;
 assert(false);
 }
 
 
 QCString VhdlParser::sequential_statement() {QCString s;
-    if (jj_2_76(2147483647)) {if (!hasError) {
-      
+    if (jj_2_76(2147483647)) {
+      if (!hasError) {
       s = signal_assignment_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-      
-    } else if (jj_2_77(3)) {if (!hasError) {
-      
+    } else if (jj_2_77(3)) {
+      if (!hasError) {
       s = assertion_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-      
-    } else if (jj_2_78(3)) {if (!hasError) {
-      
+    } else if (jj_2_78(3)) {
+      if (!hasError) {
       s = report_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-      
-    } else if (jj_2_79(3)) {if (!hasError) {
-      
+    } else if (jj_2_79(3)) {
+      if (!hasError) {
       s = wait_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-      
-    } else if (jj_2_80(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_80(2147483647)) {
+      if (!hasError) {
       s = variable_assignment_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-      
-    } else if (jj_2_81(3)) {if (!hasError) {
-      
+    } else if (jj_2_81(3)) {
+      if (!hasError) {
       s = procedure_call_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-      
-    } else if (jj_2_82(3)) {if (!hasError) {
-      
+    } else if (jj_2_82(3)) {
+      if (!hasError) {
       if_statement();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_83(3)) {if (!hasError) {
-      
+    } else if (jj_2_83(3)) {
+      if (!hasError) {
       case_statement();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_84(3)) {if (!hasError) {
-      
+    } else if (jj_2_84(3)) {
+      if (!hasError) {
       loop_statement();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_85(3)) {if (!hasError) {
-      
+    } else if (jj_2_85(3)) {
+      if (!hasError) {
       s = next_statement();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_86(3)) {if (!hasError) {
-      
+    } else if (jj_2_86(3)) {
+      if (!hasError) {
       s = exit_statement();
       }
       if (!hasError) {
-      
 return s;
       }
-      
-    } else if (jj_2_87(3)) {if (!hasError) {
-      
+    } else if (jj_2_87(3)) {
+      if (!hasError) {
       s = return_statement();
       }
       if (!hasError) {
-      
 FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case NULL_T:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         s = null_statement();
         }
         if (!hasError) {
-        
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
         }
-        
         break;
         }
       default:
@@ -8770,27 +7509,24 @@ assert(false);
 }
 
 
-QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::shift_expression() {QCString s,s1,s2;
+    if (!hasError) {
     s = simple_expression();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ROL_T:
     case ROR_T:
     case SLA_T:
     case SLL_T:
     case SRA_T:
-    case SRL_T:{if (!hasError) {
-      
+    case SRL_T:{
+      if (!hasError) {
       s1 = shift_operator();
       }
       if (!hasError) {
-      
       s2 = simple_expression();
       }
-      
       break;
       }
     default:
@@ -8798,7 +7534,6 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
       ;
     }
     }
-    
 return s+s1+s2;
 assert(false);
 }
@@ -8806,70 +7541,58 @@ assert(false);
 
 QCString VhdlParser::shift_operator() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SLL_T:{if (!hasError) {
-      
+    case SLL_T:{
+      if (!hasError) {
       jj_consume_token(SLL_T);
       }
       if (!hasError) {
-      
 return "sll";
       }
-      
       break;
       }
-    case SRL_T:{if (!hasError) {
-      
+    case SRL_T:{
+      if (!hasError) {
       jj_consume_token(SRL_T);
       }
       if (!hasError) {
-      
 return "srl";
       }
-      
       break;
       }
-    case SLA_T:{if (!hasError) {
-      
+    case SLA_T:{
+      if (!hasError) {
       jj_consume_token(SLA_T);
       }
       if (!hasError) {
-      
 return "sla";
       }
-      
       break;
       }
-    case SRA_T:{if (!hasError) {
-      
+    case SRA_T:{
+      if (!hasError) {
       jj_consume_token(SRA_T);
       }
       if (!hasError) {
-      
 return "sra";
       }
-      
       break;
       }
-    case ROL_T:{if (!hasError) {
-      
+    case ROL_T:{
+      if (!hasError) {
       jj_consume_token(ROL_T);
       }
       if (!hasError) {
-      
 return "rol";
       }
-      
       break;
       }
-    case ROR_T:{if (!hasError) {
-      
+    case ROR_T:{
+      if (!hasError) {
       jj_consume_token(ROR_T);
       }
       if (!hasError) {
-      
 return "ror";
       }
-      
       break;
       }
     default:
@@ -8883,26 +7606,22 @@ assert(false);
 
 QCString VhdlParser::sign() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PLUS_T:{if (!hasError) {
-      
+    case PLUS_T:{
+      if (!hasError) {
       jj_consume_token(PLUS_T);
       }
       if (!hasError) {
-      
 return "+";
       }
-      
       break;
       }
-    case MINUS_T:{if (!hasError) {
-      
+    case MINUS_T:{
+      if (!hasError) {
       jj_consume_token(MINUS_T);
       }
       if (!hasError) {
-      
 return "-";
       }
-      
       break;
       }
     default:
@@ -8915,67 +7634,56 @@ assert(false);
 
 
 QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
-    if (jj_2_89(2147483647)) {if (!hasError) {
-      
+    if (jj_2_89(2147483647)) {
+      if (!hasError) {
       conditional_signal_assignment_wave();
       }
       if (!hasError) {
-      
 return "";
       }
-      
-    } else if (jj_2_90(2147483647)) {if (!hasError) {
-      
+    } else if (jj_2_90(2147483647)) {
+      if (!hasError) {
       selected_signal_assignment_wave();
       }
       if (!hasError) {
-      
 return "";
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LPAREN_T:
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
-        if (jj_2_88(2)) {if (!hasError) {
-          
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
+        if (jj_2_88(2)) {
+          if (!hasError) {
           s = identifier();
           }
           if (!hasError) {
-          
           jj_consume_token(COLON_T);
           }
           if (!hasError) {
-          
 s+=":";
           }
-          
         } else {
           ;
         }
         }
         if (!hasError) {
-        
         s1 = target();
         }
         if (!hasError) {
-        
         jj_consume_token(LESSTHAN_T);
         }
         if (!hasError) {
-        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case INERTIAL_T:
         case REJECT_T:
-        case TRANSPORT_T:{if (!hasError) {
-          
+        case TRANSPORT_T:{
+          if (!hasError) {
           s2 = delay_mechanism();
           }
-          
           break;
           }
         default:
@@ -8984,18 +7692,14 @@ s+=":";
         }
         }
         if (!hasError) {
-        
         s3 = waveform();
         }
         if (!hasError) {
-        
         jj_consume_token(SEMI_T);
         }
         if (!hasError) {
-        
 return s+s1+"<="+s2+s3+";";
         }
-        
         break;
         }
       default:
@@ -9008,39 +7712,33 @@ assert(false);
 }
 
 
-void VhdlParser::semi() {if (!hasError) {
-    
+void VhdlParser::semi() {
+    if (!hasError) {
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) {
-    
+void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;
+    if (!hasError) {
     jj_consume_token(SIGNAL_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BUS_T:
-    case REGISTER_T:{if (!hasError) {
-      
+    case REGISTER_T:{
+      if (!hasError) {
       s2 = signal_kind();
       }
-      
       break;
       }
     default:
@@ -9049,17 +7747,14 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{if (!hasError) {
-      
+    case VARASSIGN_T:{
+      if (!hasError) {
       tok = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
-      
       s3 = expression();
       }
-      
       break;
       }
     default:
@@ -9068,10 +7763,8 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(tok)
       s3.prepend(":=");
      s4=s1+s2+s3;
@@ -9081,26 +7774,22 @@ if(tok)
 
 QCString VhdlParser::signal_kind() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case REGISTER_T:{if (!hasError) {
-      
+    case REGISTER_T:{
+      if (!hasError) {
       jj_consume_token(REGISTER_T);
       }
       if (!hasError) {
-      
 return "register";
       }
-      
       break;
       }
-    case BUS_T:{if (!hasError) {
-      
+    case BUS_T:{
+      if (!hasError) {
       jj_consume_token(BUS_T);
       }
       if (!hasError) {
-      
 return "bus";
       }
-      
       break;
       }
     default:
@@ -9117,12 +7806,11 @@ QCString VhdlParser::signal_list() {QCString s,s1;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -9132,45 +7820,37 @@ QCString VhdlParser::signal_list() {QCString s,s1;
         default:
           jj_la1[204] = jj_gen;
           goto end_label_38;
-        }if (!hasError) {
-        
+        }
+        if (!hasError) {
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
-        
         s1 = name();
         }
         if (!hasError) {
-        
 s+=",";s+=s1;
         }
-        
       }
       end_label_38: ;
       }
-      
       break;
       }
-    case OTHER_T:{if (!hasError) {
-      
+    case OTHER_T:{
+      if (!hasError) {
       jj_consume_token(OTHER_T);
       }
       if (!hasError) {
-      
 return "other";
       }
-      
       break;
       }
-    case ALL_T:{if (!hasError) {
-      
+    case ALL_T:{
+      if (!hasError) {
       jj_consume_token(ALL_T);
       }
       if (!hasError) {
-      
 return "all";
       }
-      
       break;
       }
     default:
@@ -9182,22 +7862,20 @@ assert(false);
 }
 
 
-QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::signature() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(LBRACKET_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -9207,23 +7885,19 @@ QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) {
         default:
           jj_la1[206] = jj_gen;
           goto end_label_39;
-        }if (!hasError) {
-        
+        }
+        if (!hasError) {
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
-        
         s1 = name();
         }
         if (!hasError) {
-        
 s+=",";s+=s1;
         }
-        
       }
       end_label_39: ;
       }
-      
       break;
       }
     default:
@@ -9232,21 +7906,17 @@ s+=",";s+=s1;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case RETURN_T:{if (!hasError) {
-      
+    case RETURN_T:{
+      if (!hasError) {
       jj_consume_token(RETURN_T);
       }
       if (!hasError) {
-      
       s1 = name();
       }
       if (!hasError) {
-      
 s+="return ";s+=s1;
       }
-      
       break;
       }
     default:
@@ -9255,24 +7925,21 @@ s+="return ";s+=s1;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(RBRACKET_T);
     }
-    
 s1="["+s+"]";return s1;
 assert(false);
 }
 
 
-QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::simple_expression() {QCString s,s1,s2;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PLUS_T:
-    case MINUS_T:{if (!hasError) {
-      
+    case MINUS_T:{
+      if (!hasError) {
       s = sign();
       }
-      
       break;
       }
     default:
@@ -9281,93 +7948,78 @@ QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) {
     }
     }
     if (!hasError) {
-    
     s1 = term();
     }
     if (!hasError) {
-    
 s+=s1;
     }
     if (!hasError) {
-    
     while (!hasError) {
       if (jj_2_91(2147483647)) {
         ;
       } else {
         goto end_label_40;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = adding_operator();
       }
       if (!hasError) {
-      
       s2 = term();
       }
       if (!hasError) {
-      
 s+=s1;s+=s2;
       }
-      
     }
     end_label_40: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-void VhdlParser::simple_name() {if (!hasError) {
-    
+void VhdlParser::simple_name() {
+    if (!hasError) {
     name();
     }
-    
 }
 
 
-QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::slice_name() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s1 = discrete_range();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return s+"("+s1+")";
 assert(false);
 }
 
 
-QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::string_literal() {Token *tok=0;
+    if (!hasError) {
     tok = jj_consume_token(STRINGLITERAL);
     }
-    
 return tok->image.c_str();
 assert(false);
 }
 
 
-void VhdlParser::subprogram_body() {QCString s;if (!hasError) {
-    
+void VhdlParser::subprogram_body() {QCString s;
+    if (!hasError) {
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     //try{
      s = subprogram_declarative_part();
     }
     if (!hasError) {
-    
 if (s.data())
       {
         FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,0);
@@ -9375,26 +8027,21 @@ if (s.data())
       FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
     }
     if (!hasError) {
-    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
-    
     subprogram_statement_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case FUNCTION_T:
-    case PROCEDURE_T:{if (!hasError) {
-      
+    case PROCEDURE_T:{
+      if (!hasError) {
       subprogram_kind();
       }
-      
       break;
       }
     default:
@@ -9403,15 +8050,13 @@ if (s.data())
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       designator();
       }
-      
       break;
       }
     default:
@@ -9420,10 +8065,8 @@ if (s.data())
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 tempEntry->endBodyLine=getLine(END_T);
       createFlow();
       currP=0;
@@ -9431,29 +8074,25 @@ tempEntry->endBodyLine=getLine(END_T);
 
 
 void VhdlParser::subprogram_declaration() {
-    if (jj_2_92(2147483647)) {if (!hasError) {
-      
+    if (jj_2_92(2147483647)) {
+      if (!hasError) {
       subprogram_instantiation_declaration();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case FUNCTION_T:
       case IMPURE_T:
       case PROCEDURE_T:
-      case PURE_T:{if (!hasError) {
-        
+      case PURE_T:{
+        if (!hasError) {
         subprogram_specification();
         }
         if (!hasError) {
-        
         subprogram_1();
         }
         if (!hasError) {
-        
 currP=0;
         }
-        
         break;
         }
       default:
@@ -9467,18 +8106,16 @@ currP=0;
 
 void VhdlParser::subprogram_1() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       subprogram_body();
       }
-      
       break;
       }
-    case SEMI_T:{if (!hasError) {
-      
+    case SEMI_T:{
+      if (!hasError) {
       jj_consume_token(SEMI_T);
       }
-      
       break;
       }
     default:
@@ -9494,152 +8131,126 @@ QCString VhdlParser::subprogram_declarative_item() {QCString s;
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
       if (!hasError) {
-      
 return "";
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       s = type_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       subprogram_body();
       }
       if (!hasError) {
-      
 return "";
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       s = subtype_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       s = constant_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       s = variable_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       s = file_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       s = alias_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
       jj_la1[214] = jj_gen;
-      if (jj_2_93(2147483647)) {if (!hasError) {
-        
+      if (jj_2_93(2147483647)) {
+        if (!hasError) {
         s = attribute_declaration();
         }
         if (!hasError) {
-        
 return s;
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{if (!hasError) {
-          
+        case ATTRIBUTE_T:{
+          if (!hasError) {
           s = attribute_specification();
           }
           if (!hasError) {
-          
 return s;
           }
-          
           break;
           }
-        case USE_T:{if (!hasError) {
-          
+        case USE_T:{
+          if (!hasError) {
           s = use_clause();
           }
           if (!hasError) {
-          
 return s;
           }
-          
           break;
           }
         default:
           jj_la1[215] = jj_gen;
-          if (jj_2_94(3)) {if (!hasError) {
-            
+          if (jj_2_94(3)) {
+            if (!hasError) {
             s = group_template_declaration();
             }
             if (!hasError) {
-            
 return s;
             }
-            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{if (!hasError) {
-              
+            case GROUP_T:{
+              if (!hasError) {
               s = group_declaration();
               }
               if (!hasError) {
-              
 return s;
               }
-              
               break;
               }
             default:
@@ -9655,8 +8266,8 @@ assert(false);
 }
 
 
-QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -9680,19 +8291,16 @@ QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError)
       default:
         jj_la1[217] = jj_gen;
         goto end_label_41;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = subprogram_declarative_item();
       }
       if (!hasError) {
-      
 s+=s1;
       }
-      
     }
     end_label_41: ;
     }
-    
 return s;
 assert(false);
 }
@@ -9700,18 +8308,16 @@ assert(false);
 
 void VhdlParser::subprogram_kind() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FUNCTION_T:{if (!hasError) {
-      
+    case FUNCTION_T:{
+      if (!hasError) {
       jj_consume_token(FUNCTION_T);
       }
-      
       break;
       }
-    case PROCEDURE_T:{if (!hasError) {
-      
+    case PROCEDURE_T:{
+      if (!hasError) {
       jj_consume_token(PROCEDURE_T);
       }
-      
       break;
       }
     default:
@@ -9724,16 +8330,14 @@ void VhdlParser::subprogram_kind() {
 
 void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PROCEDURE_T:{if (!hasError) {
-      
+    case PROCEDURE_T:{
+      if (!hasError) {
       jj_consume_token(PROCEDURE_T);
       }
       if (!hasError) {
-      
       s = designator();
       }
       if (!hasError) {
-      
 currP=VhdlDocGen::PROCEDURE;
               createFunction(s.data(),currP,0);
               tempEntry=current.get();
@@ -9741,29 +8345,23 @@ currP=VhdlDocGen::PROCEDURE;
                current->bodyLine=getLine(PROCEDURE_T);
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{if (!hasError) {
-        
+      case LPAREN_T:{
+        if (!hasError) {
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
-        
 param_sec=PARAM_SEC;
         }
         if (!hasError) {
-        
         interface_list();
         }
         if (!hasError) {
-        
 param_sec=0;
         }
         if (!hasError) {
-        
         jj_consume_token(RPAREN_T);
         }
-        
         break;
         }
       default:
@@ -9772,59 +8370,50 @@ param_sec=0;
       }
       }
       if (!hasError) {
-      
-      if (jj_2_95(2)) {if (!hasError) {
-        
+      if (jj_2_95(2)) {
+        if (!hasError) {
         gen_interface_list();
         }
-        
       } else {
         ;
       }
       }
       if (!hasError) {
-      
-      if (jj_2_96(2)) {if (!hasError) {
-        
+      if (jj_2_96(2)) {
+        if (!hasError) {
         gen_assoc_list();
         }
-        
       } else {
         ;
       }
       }
       if (!hasError) {
-      
       param();
       }
       if (!hasError) {
-      
 newEntry();
       }
-      
       break;
       }
     case FUNCTION_T:
     case IMPURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IMPURE_T:
-      case PURE_T:{if (!hasError) {
-        
+      case PURE_T:{
+        if (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PURE_T:{if (!hasError) {
-          
+        case PURE_T:{
+          if (!hasError) {
           tok = jj_consume_token(PURE_T);
           }
-          
           break;
           }
-        case IMPURE_T:{if (!hasError) {
-          
+        case IMPURE_T:{
+          if (!hasError) {
           tok = jj_consume_token(IMPURE_T);
           }
-          
           break;
           }
         default:
@@ -9833,7 +8422,6 @@ newEntry();
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
         }
-        
         break;
         }
       default:
@@ -9842,15 +8430,12 @@ newEntry();
       }
       }
       if (!hasError) {
-      
       t = jj_consume_token(FUNCTION_T);
       }
       if (!hasError) {
-      
       s = designator();
       }
       if (!hasError) {
-      
 currP=VhdlDocGen::FUNCTION;
      if(tok)
      createFunction(tok->image.c_str(),currP,s.data());
@@ -9861,29 +8446,23 @@ currP=VhdlDocGen::FUNCTION;
       current->bodyLine=getLine(FUNCTION_T);
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{if (!hasError) {
-        
+      case LPAREN_T:{
+        if (!hasError) {
 param_sec=PARAM_SEC;
         }
         if (!hasError) {
-        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
-        
         formal_parameter_list();
         }
         if (!hasError) {
-        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
-        
 param_sec=0;
         }
-        
         break;
         }
       default:
@@ -9892,20 +8471,16 @@ param_sec=0;
       }
       }
       if (!hasError) {
-      
       jj_consume_token(RETURN_T);
       }
       if (!hasError) {
-      
       s = type_mark();
       }
       if (!hasError) {
-      
 tempEntry=current.get();
                 current->type=s;
                 newEntry();
       }
-      
       break;
       }
     default:
@@ -9916,8 +8491,8 @@ tempEntry=current.get();
 }
 
 
-void VhdlParser::subprogram_statement_part() {if (!hasError) {
-    
+void VhdlParser::subprogram_statement_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -9944,120 +8519,100 @@ void VhdlParser::subprogram_statement_part() {if (!hasError) {
       default:
         jj_la1[224] = jj_gen;
         goto end_label_42;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       sequential_statement();
       }
-      
     }
     end_label_42: ;
     }
-    
 }
 
 
-QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::subtype_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(SUBTYPE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public);
   return " subtype "+s+" is "+s1+";";
 assert(false);
 }
 
 
-QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::subtype_indication() {QCString s,s1,s2;
+    if (!hasError) {
     s = name();
     }
     if (!hasError) {
-    
-    if (jj_2_97(2147483647)) {if (!hasError) {
-      
+    if (jj_2_97(2147483647)) {
+      if (!hasError) {
       s1 = name();
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
-    if (jj_2_98(2147483647)) {if (!hasError) {
-      
+    if (jj_2_98(2147483647)) {
+      if (!hasError) {
       s2 = constraint();
       }
-      
     } else {
       ;
     }
     }
-    
 return s+" "+s1+" "+s2;
 assert(false);
 }
 
 
 QCString VhdlParser::suffix() {QCString s;
-    if (jj_2_99(2147483647)) {if (!hasError) {
-      
+    if (jj_2_99(2147483647)) {
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case CHARACTER_LITERAL:{if (!hasError) {
-        
+      case CHARACTER_LITERAL:{
+        if (!hasError) {
         s = character_literal();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
-      case STRINGLITERAL:{if (!hasError) {
-        
+      case STRINGLITERAL:{
+        if (!hasError) {
         s = operator_symbol();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
-      case ALL_T:{if (!hasError) {
-        
+      case ALL_T:{
+        if (!hasError) {
         jj_consume_token(ALL_T);
         }
         if (!hasError) {
-        
 return " all ";
         }
-        
         break;
         }
       default:
@@ -10075,26 +8630,22 @@ QCString VhdlParser::target() {QCString s;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       s = aggregate();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -10106,96 +8657,81 @@ assert(false);
 }
 
 
-QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::term() {QCString s,s1,s2;
+    if (!hasError) {
     s = factor();
     }
     if (!hasError) {
-    
     while (!hasError) {
       if (jj_2_100(2)) {
         ;
       } else {
         goto end_label_43;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = multiplying_operation();
       }
       if (!hasError) {
-      
       s2 = factor();
       }
       if (!hasError) {
-      
 s+=s1;s+=s2;
       }
-      
     }
     end_label_43: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::timeout_clause() {QCString s;
+    if (!hasError) {
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
-    
     s = expression();
     }
-    
 return " for "+s;
 assert(false);
 }
 
 
-QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::type_conversion() {QCString s,s1;
+    if (!hasError) {
     s = name();
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s1 = expression();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 return s+"("+s1+")";
 assert(false);
 }
 
 
 QCString VhdlParser::type_declaration() {QCString s;
-    if (jj_2_101(3)) {if (!hasError) {
-      
+    if (jj_2_101(3)) {
+      if (!hasError) {
       s = full_type_declaration();
       }
       if (!hasError) {
-      
 return s;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case TYPE_T:{if (!hasError) {
-        
+      case TYPE_T:{
+        if (!hasError) {
         s = incomplete_type_declaration();
         }
         if (!hasError) {
-        
 return s;
         }
-        
         break;
         }
       default:
@@ -10211,74 +8747,62 @@ assert(false);
 QCString VhdlParser::type_definition() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case RANGE_T:
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       //try{
       s = scalar_type_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     case ARRAY_T:
-    case RECORD_T:{if (!hasError) {
-      
+    case RECORD_T:{
+      if (!hasError) {
       s = composite_type_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case ACCESS_T:{if (!hasError) {
-      
+    case ACCESS_T:{
+      if (!hasError) {
       s = access_type_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       s = file_type_definition();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
       jj_la1[228] = jj_gen;
-      if (jj_2_102(2)) {if (!hasError) {
-        
+      if (jj_2_102(2)) {
+        if (!hasError) {
         protected_type_body();
         }
         if (!hasError) {
-        
 return "";
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PROTECTED_T:{if (!hasError) {
-          
+        case PROTECTED_T:{
+          if (!hasError) {
           protected_type_declaration();
           }
           if (!hasError) {
-          
 return "";
           }
-          
           break;
           }
         default:
@@ -10292,30 +8816,26 @@ assert(false);
 }
 
 
-QCString VhdlParser::type_mark() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::type_mark() {QCString s;
+    if (!hasError) {
     s = name();
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!hasError) {
-    
+QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;
+    if (!hasError) {
     jj_consume_token(ARRAY_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     s = index_subtype_definition();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -10325,50 +8845,41 @@ QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!h
       default:
         jj_la1[230] = jj_gen;
         goto end_label_44;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = index_subtype_definition();
       }
       if (!hasError) {
-      
 s3+=",";s3+=s1;
       }
-      
     }
     end_label_44: ;
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
-    
     s2 = subtype_indication();
     }
-    
 return "array("+s+s3+") of "+s2;
 assert(false);
 }
 
 
-QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::use_clause() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(USE_T);
     }
     if (!hasError) {
-    
     s = selected_name();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -10378,27 +8889,22 @@ QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) {
       default:
         jj_la1[231] = jj_gen;
         goto end_label_45;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       s1 = selected_name();
       }
       if (!hasError) {
-      
 s+=",";s+=s1;
       }
-      
     }
     end_label_45: ;
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 QCStringList ql1=QCStringList::split(",",s);
                    for (uint j=0;j<ql1.count();j++)
                    {
@@ -10421,57 +8927,46 @@ QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
-      if (jj_2_103(2)) {if (!hasError) {
-        
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
+      if (jj_2_103(2)) {
+        if (!hasError) {
         s = identifier();
         }
         if (!hasError) {
-        
         jj_consume_token(COLON_T);
         }
         if (!hasError) {
-        
 s+=":";
         }
-        
       } else {
         ;
       }
       }
       if (!hasError) {
-      
       s1 = target();
       }
       if (!hasError) {
-      
       jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
-      
       s2 = expression();
       }
       if (!hasError) {
-      
       jj_consume_token(SEMI_T);
       }
       if (!hasError) {
-      
 return s+s1+":="+s2+";";
       }
-      
       break;
       }
-    case WITH_T:{if (!hasError) {
-      
+    case WITH_T:{
+      if (!hasError) {
       selected_variable_assignment();
       }
       if (!hasError) {
-      
 return "";
       }
-      
       break;
       }
     default:
@@ -10483,14 +8978,13 @@ assert(false);
 }
 
 
-QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SHARED_T:{if (!hasError) {
-      
+    case SHARED_T:{
+      if (!hasError) {
       tok = jj_consume_token(SHARED_T);
       }
-      
       break;
       }
     default:
@@ -10499,33 +8993,26 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s
     }
     }
     if (!hasError) {
-    
     jj_consume_token(VARIABLE_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s1 = subtype_indication();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{if (!hasError) {
-      
+    case VARASSIGN_T:{
+      if (!hasError) {
       t1 = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
-      
       s2 = expression();
       }
-      
       break;
       }
     default:
@@ -10534,10 +9021,8 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 int spec;
     if(t1)
      s2.prepend(":=");
@@ -10562,19 +9047,17 @@ assert(false);
 }
 
 
-QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasError) {
-    
+QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       s = identifier();
       }
       if (!hasError) {
-      
       t = jj_consume_token(COLON_T);
       }
-      
       break;
       }
     default:
@@ -10583,17 +9066,14 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
     }
     }
     if (!hasError) {
-    
     jj_consume_token(WAIT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ON_T:{if (!hasError) {
-      
+    case ON_T:{
+      if (!hasError) {
       s1 = sensitivity_clause();
       }
-      
       break;
       }
     default:
@@ -10602,13 +9082,11 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case UNTIL_T:{if (!hasError) {
-      
+    case UNTIL_T:{
+      if (!hasError) {
       s2 = condition_clause();
       }
-      
       break;
       }
     default:
@@ -10617,13 +9095,11 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FOR_T:{if (!hasError) {
-      
+    case FOR_T:{
+      if (!hasError) {
       s3 = timeout_clause();
       }
-      
       break;
       }
     default:
@@ -10632,10 +9108,8 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 if(t) s.append(":");
   return s+" wait "+s1+s2+s3+";";
 assert(false);
@@ -10659,12 +9133,11 @@ QCString VhdlParser::waveform() {QCString s,s1;
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{if (!hasError) {
-      
+    case BIT_STRING_LITERAL:{
+      if (!hasError) {
       s = waveform_element();
       }
       if (!hasError) {
-      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -10674,38 +9147,31 @@ QCString VhdlParser::waveform() {QCString s,s1;
         default:
           jj_la1[239] = jj_gen;
           goto end_label_46;
-        }if (!hasError) {
-        
+        }
+        if (!hasError) {
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
-        
         s1 = waveform_element();
         }
         if (!hasError) {
-        
 s+=","; s+=s1;
         }
-        
       }
       end_label_46: ;
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case UNAFFECTED_T:{if (!hasError) {
-      
+    case UNAFFECTED_T:{
+      if (!hasError) {
       jj_consume_token(UNAFFECTED_T);
       }
       if (!hasError) {
-      
 return " unaffected ";
       }
-      
       break;
       }
     default:
@@ -10717,26 +9183,22 @@ assert(false);
 }
 
 
-QCString VhdlParser::waveform_element() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::waveform_element() {QCString s,s1;
+    if (!hasError) {
     s = expression();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case AFTER_T:{if (!hasError) {
-      
+    case AFTER_T:{
+      if (!hasError) {
       jj_consume_token(AFTER_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
 s1.prepend(" after ");
       }
-      
       break;
       }
     default:
@@ -10744,45 +9206,37 @@ s1.prepend(" after ");
       ;
     }
     }
-    
 return s+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::protected_type_body() {if (!hasError) {
-    
+QCString VhdlParser::protected_type_body() {
+    if (!hasError) {
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
-    
     jj_consume_token(BODY_T);
     }
     if (!hasError) {
-    
     protected_type_body_declarative_part();
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
-    
     jj_consume_token(BODY_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -10790,7 +9244,6 @@ QCString VhdlParser::protected_type_body() {if (!hasError) {
       ;
     }
     }
-    
 return "";
 assert(false);
 }
@@ -10801,100 +9254,87 @@ void VhdlParser::protected_type_body_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
-      
       break;
       }
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       subprogram_body();
       }
-      
       break;
       }
-    case TYPE_T:{if (!hasError) {
-      
+    case TYPE_T:{
+      if (!hasError) {
       type_declaration();
       }
-      
       break;
       }
-    case SUBTYPE_T:{if (!hasError) {
-      
+    case SUBTYPE_T:{
+      if (!hasError) {
       subtype_declaration();
       }
-      
       break;
       }
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       constant_declaration();
       }
-      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       variable_declaration();
       }
-      
       break;
       }
-    case FILE_T:{if (!hasError) {
-      
+    case FILE_T:{
+      if (!hasError) {
       file_declaration();
       }
-      
       break;
       }
-    case ALIAS_T:{if (!hasError) {
-      
+    case ALIAS_T:{
+      if (!hasError) {
       alias_declaration();
       }
-      
       break;
       }
     default:
       jj_la1[243] = jj_gen;
-      if (jj_2_104(2147483647)) {if (!hasError) {
-        
+      if (jj_2_104(2147483647)) {
+        if (!hasError) {
         attribute_declaration();
         }
-        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{if (!hasError) {
-          
+        case ATTRIBUTE_T:{
+          if (!hasError) {
           attribute_specification();
           }
-          
           break;
           }
-        case USE_T:{if (!hasError) {
-          
+        case USE_T:{
+          if (!hasError) {
           use_clause();
           }
-          
           break;
           }
         default:
           jj_la1[244] = jj_gen;
-          if (jj_2_105(3)) {if (!hasError) {
-            
+          if (jj_2_105(3)) {
+            if (!hasError) {
             group_template_declaration();
             }
-            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{if (!hasError) {
-              
+            case GROUP_T:{
+              if (!hasError) {
               group_declaration();
               }
-              
               break;
               }
             default:
@@ -10909,8 +9349,8 @@ void VhdlParser::protected_type_body_declarative_item() {
 }
 
 
-void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
-    
+void VhdlParser::protected_type_body_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -10934,50 +9374,42 @@ void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
       default:
         jj_la1[246] = jj_gen;
         goto end_label_47;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       protected_type_body_declarative_item();
       }
-      
     }
     end_label_47: ;
     }
-    
 }
 
 
-QCString VhdlParser::protected_type_declaration() {if (!hasError) {
-    
+QCString VhdlParser::protected_type_declaration() {
+    if (!hasError) {
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
-    
-    try {if (!hasError) {
-      
+    try {
+      if (!hasError) {
       protected_type_declarative_part();
       }
-      
     } catch ( ...) {
 error_skipto(END_T);
     }
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -10985,7 +9417,6 @@ error_skipto(END_T);
       ;
     }
     }
-    
 return "";
 assert(false);
 }
@@ -10996,25 +9427,22 @@ void VhdlParser::protected_type_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_specification();
       }
-      
       break;
       }
-    case ATTRIBUTE_T:{if (!hasError) {
-      
+    case ATTRIBUTE_T:{
+      if (!hasError) {
       attribute_specification();
       }
-      
       break;
       }
-    case USE_T:{if (!hasError) {
-      
+    case USE_T:{
+      if (!hasError) {
       use_clause();
       }
-      
       break;
       }
     default:
@@ -11025,8 +9453,8 @@ void VhdlParser::protected_type_declarative_item() {
 }
 
 
-void VhdlParser::protected_type_declarative_part() {if (!hasError) {
-    
+void VhdlParser::protected_type_declarative_part() {
+    if (!hasError) {
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ATTRIBUTE_T:
@@ -11041,58 +9469,48 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) {
       default:
         jj_la1[249] = jj_gen;
         goto end_label_48;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       protected_type_declarative_item();
       }
       if (!hasError) {
-      
       jj_consume_token(SEMI_T);
       }
-      
     }
     end_label_48: ;
     }
-    
 }
 
 
-QCString VhdlParser::context_ref() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::context_ref() {QCString s;
+    if (!hasError) {
     jj_consume_token(CONTEXT_T);
     }
     if (!hasError) {
-    
     s = identifier_list();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 return "context "+s ;
 assert(false);
 }
 
 
-void VhdlParser::context_declaration() {QCString s,s1;if (!hasError) {
-    
+void VhdlParser::context_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(CONTEXT_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
 parse_sec=CONTEXT_SEC;
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case CONTEXT_T:
@@ -11104,26 +9522,22 @@ parse_sec=CONTEXT_SEC;
       default:
         jj_la1[250] = jj_gen;
         goto end_label_49;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = libustcont_stats();
       }
-      
     }
     end_label_49: ;
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONTEXT_T:{if (!hasError) {
-      
+    case CONTEXT_T:{
+      if (!hasError) {
       jj_consume_token(CONTEXT_T);
       }
-      
       break;
       }
     default:
@@ -11132,14 +9546,12 @@ parse_sec=CONTEXT_SEC;
     }
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -11148,10 +9560,8 @@ parse_sec=CONTEXT_SEC;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 parse_sec=0;
                           addVhdlType(s.data(),getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,"context",s1.data(),Public);
 }
@@ -11159,37 +9569,31 @@ parse_sec=0;
 
 QCString VhdlParser::libustcont_stats() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case USE_T:{if (!hasError) {
-      
+    case USE_T:{
+      if (!hasError) {
       s = use_clause();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case LIBRARY_T:{if (!hasError) {
-      
+    case LIBRARY_T:{
+      if (!hasError) {
       s = library_clause();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case CONTEXT_T:{if (!hasError) {
-      
+    case CONTEXT_T:{
+      if (!hasError) {
       s = context_ref();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -11201,38 +9605,31 @@ assert(false);
 }
 
 
-void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
-    
+void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     jj_consume_token(NEW_T);
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
     s2 = signature();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
       gen_assoc_list();
       }
-      
       break;
       }
     default:
@@ -11241,43 +9638,35 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasE
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 QCString q=" is new "+s1+s2;
       addVhdlType(s.data(),getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"package",q.data(),Public);
 }
 
 
-QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::interface_package_declaration() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     jj_consume_token(NEW_T);
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
       gen_assoc_list();
       }
-      
       break;
       }
     default:
@@ -11285,45 +9674,37 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasErro
       ;
     }
     }
-    
 current->name=s;
                             return "package "+s+" is new "+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(FUNCTION_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
-    
     jj_consume_token(NEW_T);
     }
     if (!hasError) {
-    
     s1 = name();
     }
     if (!hasError) {
-    
     s2 = signature();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{if (!hasError) {
-      
+    case GENERIC_T:{
+      if (!hasError) {
       gen_assoc_list();
       }
-      
       break;
       }
     default:
@@ -11332,10 +9713,8 @@ QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 QCString q= " is new "+s1+s2;
       addVhdlType(s.data(),getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public);
     return q;
@@ -11343,141 +9722,113 @@ assert(false);
 }
 
 
-void VhdlParser::gen_assoc_list() {if (!hasError) {
-    
+void VhdlParser::gen_assoc_list() {
+    if (!hasError) {
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
-    
     jj_consume_token(MAP_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
     association_list();
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 }
 
 
-void VhdlParser::gen_interface_list() {if (!hasError) {
-    
+void VhdlParser::gen_interface_list() {
+    if (!hasError) {
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
-    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
-    
 //int u=s_str.iLine;
                           parse_sec=GEN_SEC;
     }
     if (!hasError) {
-    
     interface_list();
     }
     if (!hasError) {
-    
 //  QCString vo=$3;
                           parse_sec=0;
     }
     if (!hasError) {
-    
     jj_consume_token(RPAREN_T);
     }
-    
 }
 
 
-void VhdlParser::case_scheme() {if (!hasError) {
-    
+void VhdlParser::case_scheme() {
+    if (!hasError) {
     jj_consume_token(CASE_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(GENERATE_T);
     }
     if (!hasError) {
-    
     when_stats();
     }
     if (!hasError) {
-    
-    if (jj_2_106(3)) {if (!hasError) {
-      
+    if (jj_2_106(3)) {
+      if (!hasError) {
       ttend();
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     jj_consume_token(GENERATE_T);
     }
     if (!hasError) {
-    
     generate_statement_body();
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::when_stats() {if (!hasError) {
-    
-    while (!hasError) {if (!hasError) {
-      
+void VhdlParser::when_stats() {
+    if (!hasError) {
+    while (!hasError) {
+      if (!hasError) {
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
-      if (jj_2_107(2)) {if (!hasError) {
-        
+      if (jj_2_107(2)) {
+        if (!hasError) {
         label();
         }
         if (!hasError) {
-        
         jj_consume_token(COLON_T);
         }
-        
       } else {
         ;
       }
       }
       if (!hasError) {
-      
       choices();
       }
       if (!hasError) {
-      
       jj_consume_token(ARROW_T);
       }
       if (!hasError) {
-      
       generate_statement_body();
       }
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case WHEN_T:{
         ;
@@ -11490,23 +9841,20 @@ void VhdlParser::when_stats() {if (!hasError) {
     }
     end_label_50: ;
     }
-    
 }
 
 
-void VhdlParser::ttend() {if (!hasError) {
-    
+void VhdlParser::ttend() {
+    if (!hasError) {
     jj_consume_token(END_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       identifier();
       }
-      
       break;
       }
     default:
@@ -11515,27 +9863,23 @@ void VhdlParser::ttend() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::generate_statement_body() {if (!hasError) {
-    
+void VhdlParser::generate_statement_body() {
+    if (!hasError) {
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
-    
     generate_statement_body();
     }
-    
 }
 
 
-void VhdlParser::generate_statement_body1() {if (!hasError) {
-    
+void VhdlParser::generate_statement_body1() {
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ALIAS_T:
     case ATTRIBUTE_T:
@@ -11555,26 +9899,23 @@ void VhdlParser::generate_statement_body1() {if (!hasError) {
     case SUBTYPE_T:
     case TYPE_T:
     case USE_T:
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       while (!hasError) {
         if (jj_2_108(2147483647)) {
           ;
         } else {
           goto end_label_51;
-        }if (!hasError) {
-        
+        }
+        if (!hasError) {
         block_declarative_item();
         }
-        
       }
       end_label_51: ;
       }
       if (!hasError) {
-      
       jj_consume_token(BEGIN_T);
       }
-      
       break;
       }
     default:
@@ -11583,7 +9924,6 @@ void VhdlParser::generate_statement_body1() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -11603,43 +9943,35 @@ void VhdlParser::generate_statement_body1() {if (!hasError) {
       default:
         jj_la1[260] = jj_gen;
         goto end_label_52;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       concurrent_statement();
       }
-      
     }
     end_label_52: ;
     }
-    
 }
 
 
-QCString VhdlParser::external_name() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::external_name() {QCString s,s1,s2;
+    if (!hasError) {
     jj_consume_token(SLSL_T);
     }
     if (!hasError) {
-    
     s = sig_stat();
     }
     if (!hasError) {
-    
     s1 = external_pathname();
     }
     if (!hasError) {
-    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    
     s2 = subtype_indication();
     }
     if (!hasError) {
-    
     jj_consume_token(RSRS_T);
     }
-    
 QCString t="<<"+s;
                          QCString t1=s1+":"+s2+">>";
                          return   s+s1;
@@ -11649,37 +9981,31 @@ assert(false);
 
 QCString VhdlParser::sig_stat() {Token *t;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONSTANT_T:{if (!hasError) {
-      
+    case CONSTANT_T:{
+      if (!hasError) {
       t = jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
-      
 return t->image.data();
       }
-      
       break;
       }
-    case SIGNAL_T:{if (!hasError) {
-      
+    case SIGNAL_T:{
+      if (!hasError) {
       t = jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
-      
 return t->image.data();
       }
-      
       break;
       }
-    case VARIABLE_T:{if (!hasError) {
-      
+    case VARIABLE_T:{
+      if (!hasError) {
       t = jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
-      
 return t->image.data();
       }
-      
       break;
       }
     default:
@@ -11693,37 +10019,31 @@ assert(false);
 
 QCString VhdlParser::external_pathname() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DOT_T:{if (!hasError) {
-      
+    case DOT_T:{
+      if (!hasError) {
       s = absolute_pathname();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case NEG_T:{if (!hasError) {
-      
+    case NEG_T:{
+      if (!hasError) {
       s = relative_pathname();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
-    case AT_T:{if (!hasError) {
-      
+    case AT_T:{
+      if (!hasError) {
       s = package_path_name();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -11736,38 +10056,31 @@ assert(false);
 
 
 QCString VhdlParser::absolute_pathname() {QCString s,s1;
-    if (jj_2_109(2147483647)) {if (!hasError) {
-      
+    if (jj_2_109(2147483647)) {
+      if (!hasError) {
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
-      
       s = pathname_element_list();
       }
       if (!hasError) {
-      
       s1 = identifier();
       }
       if (!hasError) {
-      
 return "."+s+s1;
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case DOT_T:{if (!hasError) {
-        
+      case DOT_T:{
+        if (!hasError) {
         jj_consume_token(DOT_T);
         }
         if (!hasError) {
-        
         s = identifier();
         }
         if (!hasError) {
-        
 return "."+s;
         }
-        
         break;
         }
       default:
@@ -11780,46 +10093,39 @@ assert(false);
 }
 
 
-QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
-    
+QCString VhdlParser::relative_pathname() {QCString s,s1,s2;
+    if (!hasError) {
     s = neg_list();
     }
     if (!hasError) {
-    
-    if (jj_2_110(2147483647)) {if (!hasError) {
-      
+    if (jj_2_110(2147483647)) {
+      if (!hasError) {
       s1 = pathname_element_list();
       }
-      
     } else {
       ;
     }
     }
     if (!hasError) {
-    
     s2 = identifier();
     }
-    
 return s+s1+s2;
 assert(false);
 }
 
 
-QCString VhdlParser::neg_list() {QCString s;if (!hasError) {
-    
-    while (!hasError) {if (!hasError) {
-      
+QCString VhdlParser::neg_list() {QCString s;
+    if (!hasError) {
+    while (!hasError) {
+      if (!hasError) {
       jj_consume_token(NEG_T);
       }
       if (!hasError) {
-      
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
-      
 s+="^.";
       }
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case NEG_T:{
         ;
@@ -11832,32 +10138,27 @@ s+="^.";
     }
     end_label_53: ;
     }
-    
 return s;
 assert(false);
 }
 
 
-QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::pathname_element() {QCString s,s1;
+    if (!hasError) {
     s = identifier();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = expression();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
-      
       break;
       }
     default:
@@ -11865,7 +10166,6 @@ QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
       ;
     }
     }
-    
 if(!s1.isEmpty())
      return s+"("+s1+")";
 
@@ -11874,81 +10174,69 @@ assert(false);
 }
 
 
-QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;if (!hasError) {
+QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;
+    if (!hasError) {
     if (!hasError) {
-    
     s = pathname_element();
     }
     if (!hasError) {
-    
     jj_consume_token(DOT_T);
     }
-    
     }
     if (!hasError) {
-    
 s+=".";
     }
     if (!hasError) {
-    
     while (!hasError) {
       if (jj_2_111(2147483647)) {
         ;
       } else {
         goto end_label_54;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       s1 = pathname_element();
       }
       if (!hasError) {
-      
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
-      
 s2+=s1;s2+=".";
       }
-      
     }
     end_label_54: ;
     }
-    
 return s+s2;
 assert(false);
 }
 
 
-QCString VhdlParser::package_path_name() {QCString s;if (!hasError) {
-    
+QCString VhdlParser::package_path_name() {QCString s;
+    if (!hasError) {
     jj_consume_token(AT_T);
     }
     if (!hasError) {
-    
     s = name();
     }
-    
 return "@"+s;
 assert(false);
 }
 
 
 void VhdlParser::conditional_signal_assignment_wave() {
-    if (jj_2_112(2147483647)) {if (!hasError) {
-      
+    if (jj_2_112(2147483647)) {
+      if (!hasError) {
       conditional_force_assignment();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LPAREN_T:
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         conditional_waveform_assignment();
         }
-        
         break;
         }
       default:
@@ -11960,24 +10248,21 @@ void VhdlParser::conditional_signal_assignment_wave() {
 }
 
 
-void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
-    
+void VhdlParser::conditional_waveform_assignment() {
+    if (!hasError) {
     target();
     }
     if (!hasError) {
-    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INERTIAL_T:
     case REJECT_T:
-    case TRANSPORT_T:{if (!hasError) {
-      
+    case TRANSPORT_T:{
+      if (!hasError) {
       delay_mechanism();
       }
-      
       break;
       }
     default:
@@ -11986,25 +10271,20 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     waveform_element();
     }
     if (!hasError) {
-    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ELSE_T:{if (!hasError) {
-      
+    case ELSE_T:{
+      if (!hasError) {
       else_wave_list();
       }
-      
       break;
       }
     default:
@@ -12013,33 +10293,27 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
-void VhdlParser::else_wave_list() {if (!hasError) {
-    
+void VhdlParser::else_wave_list() {
+    if (!hasError) {
     jj_consume_token(ELSE_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{if (!hasError) {
-      
+    case WHEN_T:{
+      if (!hasError) {
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       expression();
       }
-      
       break;
       }
     default:
@@ -12047,31 +10321,26 @@ void VhdlParser::else_wave_list() {if (!hasError) {
       ;
     }
     }
-    
 }
 
 
-void VhdlParser::conditional_force_assignment() {if (!hasError) {
-    
+void VhdlParser::conditional_force_assignment() {
+    if (!hasError) {
     target();
     }
     if (!hasError) {
-    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(FORCE_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IN_T:
-    case OUT_T:{if (!hasError) {
-      
+    case OUT_T:{
+      if (!hasError) {
       inout_stat();
       }
-      
       break;
       }
     default:
@@ -12080,15 +10349,12 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ABS_T:
     case NEW_T:
@@ -12105,15 +10371,13 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{if (!hasError) {
-      
+    case BIT_STRING_LITERAL:{
+      if (!hasError) {
       expression();
       }
       if (!hasError) {
-      
       else_stat();
       }
-      
       break;
       }
     default:
@@ -12122,26 +10386,22 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
 void VhdlParser::selected_signal_assignment_wave() {
-    if (jj_2_113(2147483647)) {if (!hasError) {
-      
+    if (jj_2_113(2147483647)) {
+      if (!hasError) {
       selected_force_assignment();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case WITH_T:{if (!hasError) {
-        
+      case WITH_T:{
+        if (!hasError) {
         selected_waveform_assignment();
         }
-        
         break;
         }
       default:
@@ -12153,26 +10413,22 @@ void VhdlParser::selected_signal_assignment_wave() {
 }
 
 
-void VhdlParser::selected_variable_assignment() {if (!hasError) {
-    
+void VhdlParser::selected_variable_assignment() {
+    if (!hasError) {
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case Q_T:{if (!hasError) {
-      
+    case Q_T:{
+      if (!hasError) {
       jj_consume_token(Q_T);
       }
-      
       break;
       }
     default:
@@ -12181,37 +10437,31 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     select_name();
     }
     if (!hasError) {
-    
     jj_consume_token(VARASSIGN_T);
     }
     if (!hasError) {
-    
     sel_var_list();
     }
-    
 }
 
 
 void VhdlParser::select_name() {
-    if (jj_2_114(2147483647)) {if (!hasError) {
-      
+    if (jj_2_114(2147483647)) {
+      if (!hasError) {
       aggregate();
       }
-      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         name();
         }
-        
         break;
         }
       default:
@@ -12223,26 +10473,22 @@ void VhdlParser::select_name() {
 }
 
 
-void VhdlParser::selected_waveform_assignment() {if (!hasError) {
-    
+void VhdlParser::selected_waveform_assignment() {
+    if (!hasError) {
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case Q_T:{if (!hasError) {
-      
+    case Q_T:{
+      if (!hasError) {
       jj_consume_token(Q_T);
       }
-      
       break;
       }
     default:
@@ -12251,23 +10497,19 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     target();
     }
     if (!hasError) {
-    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INERTIAL_T:
     case REJECT_T:
-    case TRANSPORT_T:{if (!hasError) {
-      
+    case TRANSPORT_T:{
+      if (!hasError) {
       delay_mechanism();
       }
-      
       break;
       }
     default:
@@ -12276,33 +10518,27 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     sel_wave_list();
     }
-    
 }
 
 
-void VhdlParser::selected_force_assignment() {if (!hasError) {
-    
+void VhdlParser::selected_force_assignment() {
+    if (!hasError) {
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case Q_T:{if (!hasError) {
-      
+    case Q_T:{
+      if (!hasError) {
       jj_consume_token(Q_T);
       }
-      
       break;
       }
     default:
@@ -12311,26 +10547,21 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     target();
     }
     if (!hasError) {
-    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
-    
     jj_consume_token(FORCE_T);
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IN_T:
-    case OUT_T:{if (!hasError) {
-      
+    case OUT_T:{
+      if (!hasError) {
       inout_stat();
       }
-      
       break;
       }
     default:
@@ -12339,41 +10570,34 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
     }
     }
     if (!hasError) {
-    
     sel_var_list();
     }
-    
 }
 
 
-void VhdlParser::sel_var_list() {if (!hasError) {
+void VhdlParser::sel_var_list() {
+    if (!hasError) {
     if (!hasError) {
-    
     expression();
     }
     if (!hasError) {
-    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
-    
     choices();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case COMMA_T:{if (!hasError) {
-      
+    case COMMA_T:{
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
-      
       break;
       }
-    case SEMI_T:{if (!hasError) {
-      
+    case SEMI_T:{
+      if (!hasError) {
       jj_consume_token(SEMI_T);
       }
-      
       break;
       }
     default:
@@ -12382,42 +10606,35 @@ void VhdlParser::sel_var_list() {if (!hasError) {
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
     }
-    
     }
     if (!hasError) {
-    
     while (!hasError) {
       if (jj_2_115(2147483647)) {
         ;
       } else {
         goto end_label_55;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       expression();
       }
       if (!hasError) {
-      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      
       choices();
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case COMMA_T:{if (!hasError) {
-        
+      case COMMA_T:{
+        if (!hasError) {
         jj_consume_token(COMMA_T);
         }
-        
         break;
         }
-      case SEMI_T:{if (!hasError) {
-        
+      case SEMI_T:{
+        if (!hasError) {
         jj_consume_token(SEMI_T);
         }
-        
         break;
         }
       default:
@@ -12426,28 +10643,23 @@ void VhdlParser::sel_var_list() {if (!hasError) {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
-      
     }
     end_label_55: ;
     }
-    
 }
 
 
-void VhdlParser::sel_wave_list() {if (!hasError) {
-    
+void VhdlParser::sel_wave_list() {
+    if (!hasError) {
     waveform_element();
     }
     if (!hasError) {
-    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
-    
     choices();
     }
     if (!hasError) {
-    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -12457,40 +10669,34 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
       default:
         jj_la1[281] = jj_gen;
         goto end_label_56;
-      }if (!hasError) {
-      
+      }
+      if (!hasError) {
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
-      
       sel_wave_list();
       }
-      
     }
     end_label_56: ;
     }
     if (!hasError) {
-    
     jj_consume_token(SEMI_T);
     }
-    
 }
 
 
 void VhdlParser::inout_stat() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IN_T:{if (!hasError) {
-      
+    case IN_T:{
+      if (!hasError) {
       jj_consume_token(IN_T);
       }
-      
       break;
       }
-    case OUT_T:{if (!hasError) {
-      
+    case OUT_T:{
+      if (!hasError) {
       jj_consume_token(OUT_T);
       }
-      
       break;
       }
     default:
@@ -12501,28 +10707,24 @@ void VhdlParser::inout_stat() {
 }
 
 
-void VhdlParser::else_stat() {if (!hasError) {
-    
-    while (!hasError) {if (!hasError) {
-      
+void VhdlParser::else_stat() {
+    if (!hasError) {
+    while (!hasError) {
+      if (!hasError) {
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
-      
       expression();
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case WHEN_T:{if (!hasError) {
-        
+      case WHEN_T:{
+        if (!hasError) {
         jj_consume_token(WHEN_T);
         }
         if (!hasError) {
-        
         expression();
         }
-        
         break;
         }
       default:
@@ -12530,7 +10732,6 @@ void VhdlParser::else_stat() {if (!hasError) {
         ;
       }
       }
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ELSE_T:{
         ;
@@ -12543,34 +10744,29 @@ void VhdlParser::else_stat() {if (!hasError) {
     }
     end_label_57: ;
     }
-    
 }
 
 
 QCString VhdlParser::interface_subprogram_declaration() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PROCEDURE_T:{if (!hasError) {
-      
+    case PROCEDURE_T:{
+      if (!hasError) {
       s = iproc();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     case FUNCTION_T:
     case IMPURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       s = ifunc();
       }
       if (!hasError) {
-      
 return s;
       }
-      
       break;
       }
     default:
@@ -12582,43 +10778,38 @@ assert(false);
 }
 
 
-QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) {
-    
+QCString VhdlParser::iproc() {QCString s,s1;
+    if (!hasError) {
     jj_consume_token(PROCEDURE_T);
     }
     if (!hasError) {
-    
     s = identifier();
     }
     if (!hasError) {
-    
     s1 = param();
     }
-    
 current->name=s;
   return "procedure "+s+s1;
 assert(false);
 }
 
 
-QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;if (!hasError) {
-    
+QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IMPURE_T:
     case PURE_T:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PURE_T:{if (!hasError) {
-        
+      case PURE_T:{
+        if (!hasError) {
         t = jj_consume_token(PURE_T);
         }
-        
         break;
         }
-      case IMPURE_T:{if (!hasError) {
-        
+      case IMPURE_T:{
+        if (!hasError) {
         t = jj_consume_token(IMPURE_T);
         }
-        
         break;
         }
       default:
@@ -12634,48 +10825,39 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
     }
     }
     if (!hasError) {
-    
     jj_consume_token(FUNCTION_T);
     }
     if (!hasError) {
-    
     s = name();
     }
     if (!hasError) {
-    
     s1 = param();
     }
     if (!hasError) {
-    
     jj_consume_token(RETURN_T);
     }
     if (!hasError) {
-    
     s2 = name();
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{if (!hasError) {
-      
+    case IS_T:{
+      if (!hasError) {
       t1 = jj_consume_token(IS_T);
       }
       if (!hasError) {
-      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{if (!hasError) {
-        
+      case EXTENDED_CHARACTER:{
+        if (!hasError) {
         s3 = identifier();
         }
-        
         break;
         }
-      case BOX_T:{if (!hasError) {
-        
+      case BOX_T:{
+        if (!hasError) {
         t2 = jj_consume_token(BOX_T);
         }
-        
         break;
         }
       default:
@@ -12684,7 +10866,6 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
-      
       break;
       }
     default:
@@ -12692,7 +10873,6 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
       ;
     }
     }
-    
 QCString q;
       if(t) q=t->image.data();
       if(t2) s3="<>";
@@ -12715,14 +10895,13 @@ assert(false);
 }
 
 
-QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
-    
+QCString VhdlParser::param() {QCString s,s1;Token *tok=0;
+    if (!hasError) {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PARAMETER_T:{if (!hasError) {
-      
+    case PARAMETER_T:{
+      if (!hasError) {
       tok = jj_consume_token(PARAMETER_T);
       }
-      
       break;
       }
     default:
@@ -12731,25 +10910,20 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
     }
     }
     if (!hasError) {
-    
 param_sec=PARAM_SEC;
     }
     if (!hasError) {
-    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{if (!hasError) {
-      
+    case LPAREN_T:{
+      if (!hasError) {
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
-      
       s1 = interface_list();
       }
       if (!hasError) {
-      
       jj_consume_token(RPAREN_T);
       }
-      
       break;
       }
     default:
@@ -12757,7 +10931,6 @@ param_sec=PARAM_SEC;
       ;
     }
     }
-    
 if(tok)
                      {
                       s = tok->image.data();
@@ -12774,21 +10947,19 @@ void VhdlParser::parseInline() {
     case POSTPONED_T:
     case PROCESS_T:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{if (!hasError) {
-      
+    case EXTENDED_CHARACTER:{
+      if (!hasError) {
       process_statement();
       }
-      
       break;
       }
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{if (!hasError) {
-      
+    case PURE_T:{
+      if (!hasError) {
       subprogram_declaration();
       }
-      
       break;
       }
     default:
@@ -12799,33 +10970,31 @@ void VhdlParser::parseInline() {
 }
 
 
- VhdlParser::VhdlParser(TokenManager *tm){
-    head = NULL;
-    errorHandlerCreated = false;
-    ReInit(tm);
+  VhdlParser::VhdlParser(TokenManager *tokenManager){
+    head = nullptr;
+    ReInit(tokenManager);
 }
 VhdlParser::~VhdlParser()
 {
   clear();
 }
 
-void VhdlParser::ReInit(TokenManager *tm){
+void VhdlParser::ReInit(TokenManager* tokenManager){
     clear();
     errorHandler = new ErrorHandler();
-    errorHandlerCreated = true;
     hasError = false;
-    token_source = tm;
+    token_source = tokenManager;
     head = token = new Token();
     token->kind = 0;
-    token->next = NULL;
+    token->next = nullptr;
     jj_lookingAhead = false;
     jj_rescan = false;
     jj_done = false;
-    jj_scanpos = jj_lastpos = NULL;
+    jj_scanpos = jj_lastpos = nullptr;
     jj_gc = 0;
     jj_kind = -1;
-    trace_indent = 0;
-    trace_enabled = false;
+    indent = 0;
+    trace = false;
     jj_ntk = -1;
     jj_gen = 0;
     for (int i = 0; i < 293; i++) jj_la1[i] = -1;
@@ -12844,15 +11013,15 @@ void VhdlParser::clear(){
       t = next;
     }
   }
-  if (errorHandlerCreated) {
-    delete errorHandler;
+  if (errorHandler) {
+    delete errorHandler, errorHandler = nullptr;
   }
 }
 
 
 Token * VhdlParser::jj_consume_token(int kind)  {
     Token *oldToken;
-    if ((oldToken = token)->next != NULL) token = token->next;
+    if ((oldToken = token)->next != nullptr) token = token->next;
     else token = token->next = token_source->getNextToken();
     jj_ntk = -1;
     if (token->kind == kind) {
@@ -12861,8 +11030,8 @@ Token * VhdlParser::jj_consume_token(int kind)  {
         jj_gc = 0;
         for (int i = 0; i < 115; i++) {
           JJCalls *c = &jj_2_rtns[i];
-          while (c != NULL) {
-            if (c->gen < jj_gen) c->first = NULL;
+          while (c != nullptr) {
+            if (c->gen < jj_gen) c->first = nullptr;
             c = c->next;
           }
         }
@@ -12871,7 +11040,7 @@ Token * VhdlParser::jj_consume_token(int kind)  {
     }
     token = oldToken;
     jj_kind = kind;
-    JAVACC_STRING_TYPE image = kind >= 0 ? tokenImage[kind] : tokenImage[0];
+    JJString image = kind >= 0 ? tokenImage[kind] : tokenImage[0];
     errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this);
     hasError = true;
     return token;
@@ -12881,7 +11050,7 @@ Token * VhdlParser::jj_consume_token(int kind)  {
 bool  VhdlParser::jj_scan_token(int kind){
     if (jj_scanpos == jj_lastpos) {
       jj_la--;
-      if (jj_scanpos->next == NULL) {
+      if (jj_scanpos->next == nullptr) {
         jj_lastpos = jj_scanpos = jj_scanpos->next = token_source->getNextToken();
       } else {
         jj_lastpos = jj_scanpos = jj_scanpos->next;
@@ -12891,8 +11060,8 @@ bool  VhdlParser::jj_scan_token(int kind){
     }
     if (jj_rescan) {
       int i = 0; Token *tok = token;
-      while (tok != NULL && tok != jj_scanpos) { i++; tok = tok->next; }
-      if (tok != NULL) jj_add_error_token(kind, i);
+      while (tok != nullptr && tok != jj_scanpos) { i++; tok = tok->next; }
+      if (tok != nullptr) jj_add_error_token(kind, i);
     }
     if (jj_scanpos->kind != kind) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) { return jj_done = true; }
@@ -12903,7 +11072,7 @@ bool  VhdlParser::jj_scan_token(int kind){
 /** Get the next Token. */
 
 Token * VhdlParser::getNextToken(){
-    if (token->next != NULL) token = token->next;
+    if (token->next != nullptr) token = token->next;
     else token = token->next = token_source->getNextToken();
     jj_ntk = -1;
     jj_gen++;
@@ -12915,7 +11084,7 @@ Token * VhdlParser::getNextToken(){
 Token * VhdlParser::getToken(int index){
     Token *t = token;
     for (int i = 0; i < index; i++) {
-      if (t->next != NULL) t = t->next;
+      if (t->next != nullptr) t = t->next;
       else t = t->next = token_source->getNextToken();
     }
     return t;
@@ -12923,7 +11092,7 @@ Token * VhdlParser::getToken(int index){
 
 
 int VhdlParser::jj_ntk_f(){
-    if ((jj_nt=token->next) == NULL)
+    if ((jj_nt=token->next) == nullptr)
       return (jj_ntk = (token->next=token_source->getNextToken())->kind);
     else
       return (jj_ntk = jj_nt->kind);
@@ -12939,6 +11108,11 @@ int VhdlParser::jj_ntk_f(){
    }
 
 
+  bool VhdlParser::trace_enabled()  {
+    return trace;
+  }
+
+
   void VhdlParser::enable_tracing()  {
   }
 
@@ -13072,7 +11246,7 @@ int VhdlParser::jj_ntk_f(){
           }
         }
         p = p->next;
-      } while (p != NULL);
+      } while (p != nullptr);
     }
     jj_rescan = false;
   }
@@ -13081,7 +11255,7 @@ int VhdlParser::jj_ntk_f(){
   void VhdlParser::jj_save(int index, int xla){
     JJCalls *p = &jj_2_rtns[index];
     while (p->gen > jj_gen) {
-      if (p->next == NULL) { p = p->next = new JJCalls(); break; }
+      if (p->next == nullptr) { p = p->next = new JJCalls(); break; }
       p = p->next;
     }
     p->gen = jj_gen + xla - jj_la; p->first = token; p->arg = xla;
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index 89dfe71..a9f14d1 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -4,9 +4,7 @@
 #include "CharStream.h"
 #include "Token.h"
 #include "TokenManager.h"
-#include "VhdlParserTokenManager.h"
 #include "vhdljjparser.h"
-
 #include "VhdlParserConstants.h"
 #include "ErrorHandler.h"
 namespace vhdl {
@@ -17,566 +15,288 @@ namespace parser {
     JJCalls*   next;
     Token*     first;
     ~JJCalls() { if (next) delete next; }
-     JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
+     JJCalls() { next = nullptr; arg = 0; gen = -1; first = nullptr; }
   };
 
 class VhdlParser {
-   public:
-
+public:
 QCString abstract_literal();
-
 QCString access_type_definition();
-
 QCString actual_designator();
-
 QCString actual_parameter_part();
-
 QCString actual_part();
-
 QCString adding_operator();
-
 QCString aggregate();
-
 QCString alias_declaration();
-
 QCString alias_designator();
-
 void allocator();
-
 void architecture_body();
-
 void architecture_declarative_part();
-
 void architecture_statement_part();
-
 QCString array_type_definition();
-
 QCString assertion();
-
 QCString assertion_statement();
-
 QCString association_element();
-
 QCString association_list();
-
 QCString attribute_declaration();
-
 QCString attribute_designator();
-
 QCString attribute_name();
-
 QCString attribute_specification();
-
 QCString base();
-
 QCString base_specifier();
-
 QCString base_unit_declaration();
-
 QCString based_integer();
-
 QCString based_literal();
-
 QCString basic_identifier();
-
 void binding_indication();
-
 QCString bit_string_literal();
-
 QCString bit_value();
-
 void block_configuration();
-
 void block_declarative_item();
-
 void block_declarative_part();
-
 void block_header();
-
 void block_specification();
-
 void block_statement();
-
 void block_statement_part();
-
 void case_statement();
-
 void case_statement_alternative();
-
 QCString character_literal();
-
 QCString choice();
-
 QCString choices();
-
 void component_configuration();
-
 void component_declaration();
-
 void component_instantiation_statement();
-
 void component_specification();
-
 QCString composite_type_definition();
-
 void concurrent_assertion_statement();
-
 void concurrent_procedure_call_statement();
-
 void concurrent_signal_assignment_statement();
-
 void concurrent_statement();
-
 QCString condition();
-
 QCString condition_clause();
-
 void conditional_signal_assignment();
-
 void conditional_waveforms();
-
 void configuration_declaration();
-
 void configuration_declarative_item();
-
 void configuration_declarative_part();
-
 void configuration_item();
-
 void configuration_specification();
-
 QCString constant_declaration();
-
 QCString constraint_array_definition();
-
 void context_clause();
-
 QCString constraint();
-
 void context_item();
-
 QCString decimal_literal();
-
 QCString delay_mechanism();
-
 void design_file();
-
 void design_unit();
-
 QCString designator();
-
 QCString direction();
-
 void disconnection_specification();
-
 void guarded_signal_specificatio();
-
 QCString discrete_range();
-
 QCString element_association();
-
 QCString element_declaration();
-
 QCString entity_aspect();
-
 QCString entity_class();
-
 QCString entity_class_entry();
-
 QCString entity_class_entry_list();
-
 void entity_declaration();
-
 void entity_declarative_item();
-
 void entity_declarative_part();
-
 QCString entity_designator();
-
 void entity_header();
-
 QCString entity_name_list();
-
 QCString entity_specification();
-
 void entity_statement();
-
 void entity_statement_part();
-
 QCString entity_tag();
-
 QCString enumeration_literal();
-
 QCString enumeration_type_definition();
-
 QCString exit_statement();
-
 QCString expression();
-
 QCString logop();
-
 QCString extended_identifier();
-
 QCString factor();
-
 QCString file_declaration();
-
 QCString file_logical_name();
-
 QCString file_open_information();
-
 QCString file_type_definition();
-
 QCString floating_type_definition();
-
 QCString formal_designator();
-
 QCString formal_parameter_list();
-
 QCString formal_part();
-
 QCString full_type_declaration();
-
 QCString function_call();
-
 void generate_statement();
-
 void generate_scheme();
-
 void generic_clause();
-
 QCString generic_list();
-
 void generic_map_aspect();
-
 QCString group_constituent();
-
 QCString group_constituent_list();
-
 QCString group_declaration();
-
 QCString group_template_declaration();
-
 void guarded_signal_specification();
-
 QCString identifier();
-
 QCString identifier_list();
-
 void if_statement();
-
 QCString incomplete_type_declaration();
-
 QCString index_constraint();
-
 QCString index_specification();
-
 QCString index_subtype_definition();
-
 QCString instantiation_unit();
-
 QCString instantiation_list();
-
 QCString integer();
-
 QCString integer_type_definition();
-
 QCString interface_declaration();
-
 QCString interface_element();
-
 QCString interface_file_declaration();
-
 QCString interface_list();
-
 QCString interface_variable_declaration();
-
 QCString iteration_scheme();
-
 QCString label();
-
 QCString library_clause();
-
 QCString library_unit();
-
 QCString literal();
-
 QCString logical_operator();
-
 QCString loop_statement();
-
 QCString miscellaneous_operator();
-
 QCString mode();
-
 QCString multiplying_operation();
-
 QCString name();
-
 QCString name_ext1();
-
 QCString name_ext();
-
 QCString test_att_name();
-
 QCString indexed_name();
-
 QCString next_statement();
-
 QCString null_statement();
-
 QCString numeric_literal();
-
 QCString object_class();
-
 QCString operator_symbol();
-
 void options();
-
 void package_body();
-
 void package_body_declarative_item();
-
 void package_body_declarative_part();
-
 void package_declaration();
-
 void geninter();
-
 void package_declarative_item();
-
 void package_declarative_part();
-
 QCString parameter_specification();
-
 QCString physical_literal();
-
 QCString physical_type_definition();
-
 void port_clause();
-
 QCString port_list();
-
 void port_map_aspect();
-
 QCString primary();
-
 void primary_unit();
-
 QCString procedure_call();
-
 QCString procedure_call_statement();
-
 QCString process_declarative_item();
-
 QCString process_declarative_part();
-
 void process_statement();
-
 void process_statement_part();
-
 QCString qualified_expression();
-
 QCString range();
-
 QCString range_constraint();
-
 void record_type_definition();
-
 QCString relation();
-
 QCString relation_operator();
-
 QCString report_statement();
-
 QCString return_statement();
-
 QCString scalar_type_definition();
-
 void secondary_unit();
-
 QCString secondary_unit_declaration();
-
 QCString selected_name();
-
 void selected_signal_assignment();
-
 void selected_waveforms();
-
 QCString sensitivity_clause();
-
 QCString sensitivity_list();
-
 QCString sequence_of_statement();
-
 QCString sequential_statement();
-
 QCString shift_expression();
-
 QCString shift_operator();
-
 QCString sign();
-
 QCString signal_assignment_statement();
-
 void semi();
-
 void signal_declaration();
-
 QCString signal_kind();
-
 QCString signal_list();
-
 QCString signature();
-
 QCString simple_expression();
-
 void simple_name();
-
 QCString slice_name();
-
 QCString string_literal();
-
 void subprogram_body();
-
 void subprogram_declaration();
-
 void subprogram_1();
-
 QCString subprogram_declarative_item();
-
 QCString subprogram_declarative_part();
-
 void subprogram_kind();
-
 void subprogram_specification();
-
 void subprogram_statement_part();
-
 QCString subtype_declaration();
-
 QCString subtype_indication();
-
 QCString suffix();
-
 QCString target();
-
 QCString term();
-
 QCString timeout_clause();
-
 QCString type_conversion();
-
 QCString type_declaration();
-
 QCString type_definition();
-
 QCString type_mark();
-
 QCString unconstraint_array_definition();
-
 QCString use_clause();
-
 QCString variable_assignment_statement();
-
 QCString variable_declaration();
-
 QCString wait_statement();
-
 QCString waveform();
-
 QCString waveform_element();
-
 QCString protected_type_body();
-
 void protected_type_body_declarative_item();
-
 void protected_type_body_declarative_part();
-
 QCString protected_type_declaration();
-
 void protected_type_declarative_item();
-
 void protected_type_declarative_part();
-
 QCString context_ref();
-
 void context_declaration();
-
 QCString libustcont_stats();
-
 void package_instantiation_declaration();
-
 QCString interface_package_declaration();
-
 QCString subprogram_instantiation_declaration();
-
 void gen_assoc_list();
-
 void gen_interface_list();
-
 void case_scheme();
-
 void when_stats();
-
 void ttend();
-
 void generate_statement_body();
-
 void generate_statement_body1();
-
 QCString external_name();
-
 QCString sig_stat();
-
 QCString external_pathname();
-
 QCString absolute_pathname();
-
 QCString relative_pathname();
-
 QCString neg_list();
-
 QCString pathname_element();
-
 QCString pathname_element_list();
-
 QCString package_path_name();
-
 void conditional_signal_assignment_wave();
-
 void conditional_waveform_assignment();
-
 void else_wave_list();
-
 void conditional_force_assignment();
-
 void selected_signal_assignment_wave();
-
 void selected_variable_assignment();
-
 void select_name();
-
 void selected_waveform_assignment();
-
 void selected_force_assignment();
-
 void sel_var_list();
-
 void sel_wave_list();
-
 void inout_stat();
-
 void else_stat();
-
 QCString interface_subprogram_declaration();
-
 QCString iproc();
-
 QCString ifunc();
-
 QCString param();
-
 void parseInline();
  inline bool jj_2_1(int xla)
  {
@@ -1533,10 +1253,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_441()) {
+    if (!jj_3R_441()) return false;
     jj_scanpos = xsp;
     if (jj_3R_442()) return true;
-    }
     return false;
   }
 
@@ -1577,16 +1296,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(116)) {
+    if (!jj_scan_token(116)) return false;
     jj_scanpos = xsp;
-    if (jj_scan_token(100)) {
+    if (!jj_scan_token(100)) return false;
     jj_scanpos = xsp;
-    if (jj_scan_token(31)) {
+    if (!jj_scan_token(31)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(101)) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -1692,22 +1408,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_39()) {
+    if (!jj_3_39()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_555()) {
+    if (!jj_3R_555()) return false;
     jj_scanpos = xsp;
-    if (jj_3_40()) {
+    if (!jj_3_40()) return false;
     jj_scanpos = xsp;
-    if (jj_3_41()) {
+    if (!jj_3_41()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_556()) {
+    if (!jj_3R_556()) return false;
     jj_scanpos = xsp;
     if (jj_3R_557()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -1760,13 +1471,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_412()) {
+    if (!jj_3R_412()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_413()) {
+    if (!jj_3R_413()) return false;
     jj_scanpos = xsp;
     if (jj_3R_414()) return true;
-    }
-    }
     return false;
   }
 
@@ -1803,13 +1512,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_325()) {
+    if (!jj_3R_325()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_326()) {
+    if (!jj_3R_326()) return false;
     jj_scanpos = xsp;
     if (jj_3R_327()) return true;
-    }
-    }
     return false;
   }
 
@@ -1836,10 +1543,9 @@ void parseInline();
     if (jj_scan_token(IS_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_695()) {
+    if (!jj_3R_695()) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(145)) return true;
-    }
     return false;
   }
 
@@ -1871,10 +1577,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_620()) {
+    if (!jj_3R_620()) return false;
     jj_scanpos = xsp;
     if (jj_3R_621()) return true;
-    }
     return false;
   }
 
@@ -2018,10 +1723,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_163()) {
+    if (!jj_3R_163()) return false;
     jj_scanpos = xsp;
     if (jj_3R_164()) return true;
-    }
     return false;
   }
 
@@ -2041,10 +1745,9 @@ void parseInline();
     if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(134)) {
+    if (!jj_scan_token(134)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
-    }
     return false;
   }
 
@@ -2110,10 +1813,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(84)) {
+    if (!jj_scan_token(84)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(52)) return true;
-    }
     return false;
   }
 
@@ -2181,10 +1883,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_606()) {
+    if (!jj_3R_606()) return false;
     jj_scanpos = xsp;
     if (jj_3R_607()) return true;
-    }
     return false;
   }
 
@@ -2225,10 +1926,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_193()) {
+    if (!jj_3R_193()) return false;
     jj_scanpos = xsp;
     if (jj_3R_194()) return true;
-    }
     return false;
   }
 
@@ -2278,10 +1978,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(53)) {
+    if (!jj_scan_token(53)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(75)) return true;
-    }
     return false;
   }
 
@@ -2305,10 +2004,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_320()) {
+    if (!jj_3R_320()) return false;
     jj_scanpos = xsp;
     if (jj_3R_321()) return true;
-    }
     return false;
   }
 
@@ -2343,10 +2041,9 @@ void parseInline();
     if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(134)) {
+    if (!jj_scan_token(134)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
-    }
     while (true) {
       xsp = jj_scanpos;
       if (jj_3R_385()) { jj_scanpos = xsp; break; }
@@ -2473,10 +2170,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_685()) {
+    if (!jj_3R_685()) return false;
     jj_scanpos = xsp;
     if (jj_3R_686()) return true;
-    }
     return false;
   }
 
@@ -2528,10 +2224,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_269()) {
+    if (!jj_3R_269()) return false;
     jj_scanpos = xsp;
     if (jj_3R_270()) return true;
-    }
     return false;
   }
 
@@ -2657,10 +2352,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_267()) {
+    if (!jj_3R_267()) return false;
     jj_scanpos = xsp;
     if (jj_3R_268()) return true;
-    }
     return false;
   }
 
@@ -2676,10 +2370,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_396()) {
+    if (!jj_3R_396()) return false;
     jj_scanpos = xsp;
     if (jj_3R_397()) return true;
-    }
     return false;
   }
 
@@ -2885,10 +2578,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_608()) {
+    if (!jj_3R_608()) return false;
     jj_scanpos = xsp;
     if (jj_3R_609()) return true;
-    }
     return false;
   }
 
@@ -2897,13 +2589,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_281()) {
+    if (!jj_3R_281()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_282()) {
+    if (!jj_3R_282()) return false;
     jj_scanpos = xsp;
     if (jj_3R_283()) return true;
-    }
-    }
     return false;
   }
 
@@ -2936,13 +2626,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_486()) {
+    if (!jj_3R_486()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_487()) {
+    if (!jj_3R_487()) return false;
     jj_scanpos = xsp;
     if (jj_3R_488()) return true;
-    }
-    }
     return false;
   }
 
@@ -3030,13 +2718,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_483()) {
+    if (!jj_3R_483()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_484()) {
+    if (!jj_3R_484()) return false;
     jj_scanpos = xsp;
     if (jj_3R_485()) return true;
-    }
-    }
     return false;
   }
 
@@ -3052,22 +2738,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_388()) {
+    if (!jj_3R_388()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_389()) {
+    if (!jj_3R_389()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_390()) {
+    if (!jj_3R_390()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_391()) {
+    if (!jj_3R_391()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_392()) {
+    if (!jj_3R_392()) return false;
     jj_scanpos = xsp;
     if (jj_3R_393()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -3273,10 +2954,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_207()) {
+    if (!jj_3R_207()) return false;
     jj_scanpos = xsp;
     if (jj_3R_208()) return true;
-    }
     return false;
   }
 
@@ -3311,10 +2991,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_693()) {
+    if (!jj_3R_693()) return false;
     jj_scanpos = xsp;
     if (jj_3R_694()) return true;
-    }
     return false;
   }
 
@@ -3417,13 +3096,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_582()) {
+    if (!jj_3R_582()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_583()) {
+    if (!jj_3R_583()) return false;
     jj_scanpos = xsp;
     if (jj_3R_584()) return true;
-    }
-    }
     return false;
   }
 
@@ -3586,13 +3263,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_717()) {
+    if (!jj_3R_717()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_718()) {
+    if (!jj_3R_718()) return false;
     jj_scanpos = xsp;
     if (jj_3R_719()) return true;
-    }
-    }
     return false;
   }
 
@@ -3887,55 +3562,39 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_585()) {
+    if (!jj_3R_585()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_586()) {
+    if (!jj_3R_586()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_587()) {
+    if (!jj_3R_587()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_588()) {
+    if (!jj_3R_588()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_589()) {
+    if (!jj_3R_589()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_590()) {
+    if (!jj_3R_590()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_591()) {
+    if (!jj_3R_591()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_592()) {
+    if (!jj_3R_592()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_593()) {
+    if (!jj_3R_593()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_594()) {
+    if (!jj_3R_594()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_595()) {
+    if (!jj_3R_595()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_596()) {
+    if (!jj_3R_596()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_597()) {
+    if (!jj_3R_597()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_598()) {
+    if (!jj_3R_598()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_599()) {
+    if (!jj_3R_599()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_600()) {
+    if (!jj_3R_600()) return false;
     jj_scanpos = xsp;
     if (jj_3R_601()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -3951,43 +3610,31 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_705()) {
+    if (!jj_3R_705()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_706()) {
+    if (!jj_3R_706()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_707()) {
+    if (!jj_3R_707()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_708()) {
+    if (!jj_3R_708()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_709()) {
+    if (!jj_3R_709()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_710()) {
+    if (!jj_3R_710()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_711()) {
+    if (!jj_3R_711()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_712()) {
+    if (!jj_3R_712()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_713()) {
+    if (!jj_3R_713()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_714()) {
+    if (!jj_3R_714()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_715()) {
+    if (!jj_3R_715()) return false;
     jj_scanpos = xsp;
-    if (jj_3_105()) {
+    if (!jj_3_105()) return false;
     jj_scanpos = xsp;
     if (jj_3R_716()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -4029,13 +3676,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_561()) {
+    if (!jj_3R_561()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_562()) {
+    if (!jj_3R_562()) return false;
     jj_scanpos = xsp;
     if (jj_3R_563()) return true;
-    }
-    }
     return false;
   }
 
@@ -4156,10 +3801,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_159()) {
+    if (!jj_3R_159()) return false;
     jj_scanpos = xsp;
     if (jj_3R_160()) return true;
-    }
     return false;
   }
 
@@ -4168,10 +3812,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_405()) {
+    if (!jj_3R_405()) return false;
     jj_scanpos = xsp;
     if (jj_3R_406()) return true;
-    }
     return false;
   }
 
@@ -4252,10 +3895,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_237()) {
+    if (!jj_3R_237()) return false;
     jj_scanpos = xsp;
     if (jj_3R_238()) return true;
-    }
     return false;
   }
 
@@ -4293,10 +3935,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_567()) {
+    if (!jj_3R_567()) return false;
     jj_scanpos = xsp;
     if (jj_3R_568()) return true;
-    }
     return false;
   }
 
@@ -4355,10 +3996,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_493()) {
+    if (!jj_3R_493()) return false;
     jj_scanpos = xsp;
     if (jj_3R_494()) return true;
-    }
     return false;
   }
 
@@ -4396,10 +4036,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_438()) {
+    if (!jj_3R_438()) return false;
     jj_scanpos = xsp;
     if (jj_3R_439()) return true;
-    }
     return false;
   }
 
@@ -4435,10 +4074,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_275()) {
+    if (!jj_3R_275()) return false;
     jj_scanpos = xsp;
     if (jj_3R_276()) return true;
-    }
     return false;
   }
 
@@ -4565,22 +4203,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_632()) {
+    if (!jj_3R_632()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_633()) {
+    if (!jj_3R_633()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_634()) {
+    if (!jj_3R_634()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_635()) {
+    if (!jj_3R_635()) return false;
     jj_scanpos = xsp;
-    if (jj_3_102()) {
+    if (!jj_3_102()) return false;
     jj_scanpos = xsp;
     if (jj_3R_636()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -4627,10 +4260,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_565()) {
+    if (!jj_3R_565()) return false;
     jj_scanpos = xsp;
     if (jj_3R_566()) return true;
-    }
     return false;
   }
 
@@ -4646,10 +4278,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_101()) {
+    if (!jj_3_101()) return false;
     jj_scanpos = xsp;
     if (jj_3R_457()) return true;
-    }
     return false;
   }
 
@@ -4710,10 +4341,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_245()) {
+    if (!jj_3R_245()) return false;
     jj_scanpos = xsp;
     if (jj_3R_246()) return true;
-    }
     return false;
   }
 
@@ -4796,16 +4426,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_214()) {
+    if (!jj_3R_214()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_215()) {
+    if (!jj_3R_215()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_216()) {
+    if (!jj_3R_216()) return false;
     jj_scanpos = xsp;
     if (jj_3R_217()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -4973,10 +4600,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(84)) {
+    if (!jj_scan_token(84)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(52)) return true;
-    }
     return false;
   }
 
@@ -5099,10 +4725,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_431()) {
+    if (!jj_3R_431()) return false;
     jj_scanpos = xsp;
     if (jj_3R_432()) return true;
-    }
     return false;
   }
 
@@ -5134,31 +4759,23 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_496()) {
+    if (!jj_3R_496()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_497()) {
+    if (!jj_3R_497()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_498()) {
+    if (!jj_3R_498()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_499()) {
+    if (!jj_3R_499()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_500()) {
+    if (!jj_3R_500()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_501()) {
+    if (!jj_3R_501()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_502()) {
+    if (!jj_3R_502()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_503()) {
+    if (!jj_3R_503()) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(189)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -5174,10 +4791,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(46)) {
+    if (!jj_scan_token(46)) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(80)) return true;
-    }
     return false;
   }
 
@@ -5251,10 +4867,9 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_scan_token(79)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_171()) {
+    if (!jj_3R_171()) return false;
     jj_scanpos = xsp;
     if (jj_3R_172()) return true;
-    }
     return false;
   }
 
@@ -5417,10 +5032,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_677()) {
+    if (!jj_3R_677()) return false;
     jj_scanpos = xsp;
     if (jj_3R_678()) return true;
-    }
     return false;
   }
 
@@ -5429,43 +5043,31 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_663()) {
+    if (!jj_3R_663()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_664()) {
+    if (!jj_3R_664()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_665()) {
+    if (!jj_3R_665()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_666()) {
+    if (!jj_3R_666()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_667()) {
+    if (!jj_3R_667()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_668()) {
+    if (!jj_3R_668()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_669()) {
+    if (!jj_3R_669()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_670()) {
+    if (!jj_3R_670()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_671()) {
+    if (!jj_3R_671()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_672()) {
+    if (!jj_3R_672()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_673()) {
+    if (!jj_3R_673()) return false;
     jj_scanpos = xsp;
-    if (jj_3_94()) {
+    if (!jj_3_94()) return false;
     jj_scanpos = xsp;
     if (jj_3R_674()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -5510,10 +5112,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_433()) {
+    if (!jj_3R_433()) return false;
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
-    }
     return false;
   }
 
@@ -5560,10 +5161,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_199()) {
+    if (!jj_3R_199()) return false;
     jj_scanpos = xsp;
     if (jj_3R_200()) return true;
-    }
     return false;
   }
 
@@ -5797,16 +5397,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_333()) {
+    if (!jj_3R_333()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_334()) {
+    if (!jj_3R_334()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_335()) {
+    if (!jj_3R_335()) return false;
     jj_scanpos = xsp;
     if (jj_3R_336()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -5905,13 +5502,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_602()) {
+    if (!jj_3R_602()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_603()) {
+    if (!jj_3R_603()) return false;
     jj_scanpos = xsp;
     if (jj_3R_604()) return true;
-    }
-    }
     return false;
   }
 
@@ -5958,10 +5553,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_577()) {
+    if (!jj_3R_577()) return false;
     jj_scanpos = xsp;
     if (jj_3R_578()) return true;
-    }
     return false;
   }
 
@@ -6118,13 +5712,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_435()) {
+    if (!jj_3R_435()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_436()) {
+    if (!jj_3R_436()) return false;
     jj_scanpos = xsp;
     if (jj_3R_437()) return true;
-    }
-    }
     return false;
   }
 
@@ -6187,10 +5779,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_400()) {
+    if (!jj_3R_400()) return false;
     jj_scanpos = xsp;
     if (jj_3R_401()) return true;
-    }
     return false;
   }
 
@@ -6297,22 +5888,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_546()) {
+    if (!jj_3R_546()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_547()) {
+    if (!jj_3R_547()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_548()) {
+    if (!jj_3R_548()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_549()) {
+    if (!jj_3R_549()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_550()) {
+    if (!jj_3R_550()) return false;
     jj_scanpos = xsp;
     if (jj_3R_551()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -6525,52 +6111,37 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_285()) {
+    if (!jj_3R_285()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_286()) {
+    if (!jj_3R_286()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_287()) {
+    if (!jj_3R_287()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_288()) {
+    if (!jj_3R_288()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_289()) {
+    if (!jj_3R_289()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_290()) {
+    if (!jj_3R_290()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_291()) {
+    if (!jj_3R_291()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_292()) {
+    if (!jj_3R_292()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_293()) {
+    if (!jj_3R_293()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_294()) {
+    if (!jj_3R_294()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_295()) {
+    if (!jj_3R_295()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_296()) {
+    if (!jj_3R_296()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_297()) {
+    if (!jj_3R_297()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_298()) {
+    if (!jj_3R_298()) return false;
     jj_scanpos = xsp;
-    if (jj_3_8()) {
+    if (!jj_3_8()) return false;
     jj_scanpos = xsp;
     if (jj_3R_299()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -6670,43 +6241,31 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_242()) {
+    if (!jj_3R_242()) return false;
     jj_scanpos = xsp;
-    if (jj_3_77()) {
+    if (!jj_3_77()) return false;
     jj_scanpos = xsp;
-    if (jj_3_78()) {
+    if (!jj_3_78()) return false;
     jj_scanpos = xsp;
-    if (jj_3_79()) {
+    if (!jj_3_79()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_243()) {
+    if (!jj_3R_243()) return false;
     jj_scanpos = xsp;
-    if (jj_3_81()) {
+    if (!jj_3_81()) return false;
     jj_scanpos = xsp;
-    if (jj_3_82()) {
+    if (!jj_3_82()) return false;
     jj_scanpos = xsp;
-    if (jj_3_83()) {
+    if (!jj_3_83()) return false;
     jj_scanpos = xsp;
-    if (jj_3_84()) {
+    if (!jj_3_84()) return false;
     jj_scanpos = xsp;
-    if (jj_3_85()) {
+    if (!jj_3_85()) return false;
     jj_scanpos = xsp;
-    if (jj_3_86()) {
+    if (!jj_3_86()) return false;
     jj_scanpos = xsp;
-    if (jj_3_87()) {
+    if (!jj_3_87()) return false;
     jj_scanpos = xsp;
     if (jj_3R_244()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -6952,10 +6511,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_675()) {
+    if (!jj_3R_675()) return false;
     jj_scanpos = xsp;
     if (jj_3R_676()) return true;
-    }
     return false;
   }
 
@@ -6964,10 +6522,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_353()) {
+    if (!jj_3R_353()) return false;
     jj_scanpos = xsp;
     if (jj_3R_354()) return true;
-    }
     return false;
   }
 
@@ -7160,22 +6717,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_477()) {
+    if (!jj_3R_477()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_478()) {
+    if (!jj_3R_478()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_479()) {
+    if (!jj_3R_479()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_480()) {
+    if (!jj_3R_480()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_481()) {
+    if (!jj_3R_481()) return false;
     jj_scanpos = xsp;
     if (jj_3R_482()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -7275,10 +6827,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_697()) {
+    if (!jj_3R_697()) return false;
     jj_scanpos = xsp;
     if (jj_3R_698()) return true;
-    }
     return false;
   }
 
@@ -7318,10 +6869,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_181()) {
+    if (!jj_3R_181()) return false;
     jj_scanpos = xsp;
     if (jj_3R_182()) return true;
-    }
     return false;
   }
 
@@ -7355,10 +6905,9 @@ void parseInline();
     if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_226()) {
+    if (!jj_3R_226()) return false;
     jj_scanpos = xsp;
     if (jj_3R_227()) return true;
-    }
     return false;
   }
 
@@ -7415,10 +6964,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_4()) {
+    if (!jj_3_4()) return false;
     jj_scanpos = xsp;
     if (jj_3R_575()) return true;
-    }
     return false;
   }
 
@@ -7456,13 +7004,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_534()) {
+    if (!jj_3R_534()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_535()) {
+    if (!jj_3R_535()) return false;
     jj_scanpos = xsp;
     if (jj_3R_536()) return true;
-    }
-    }
     return false;
   }
 
@@ -7472,10 +7018,9 @@ void parseInline();
     if (jj_scan_token(LPAREN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(15)) {
+    if (!jj_scan_token(15)) return false;
     jj_scanpos = xsp;
     if (jj_3R_339()) return true;
-    }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -7578,13 +7123,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_271()) {
+    if (!jj_3R_271()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_272()) {
+    if (!jj_3R_272()) return false;
     jj_scanpos = xsp;
     if (jj_3R_273()) return true;
-    }
-    }
     return false;
   }
 
@@ -7663,13 +7206,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_490()) {
+    if (!jj_3R_490()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_491()) {
+    if (!jj_3R_491()) return false;
     jj_scanpos = xsp;
     if (jj_3R_492()) return true;
-    }
-    }
     return false;
   }
 
@@ -7755,40 +7296,29 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_509()) {
+    if (!jj_3R_509()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_510()) {
+    if (!jj_3R_510()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_511()) {
+    if (!jj_3R_511()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_512()) {
+    if (!jj_3R_512()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_513()) {
+    if (!jj_3R_513()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_514()) {
+    if (!jj_3R_514()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_515()) {
+    if (!jj_3R_515()) return false;
     jj_scanpos = xsp;
-    if (jj_3_69()) {
+    if (!jj_3_69()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_516()) {
+    if (!jj_3R_516()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_517()) {
+    if (!jj_3R_517()) return false;
     jj_scanpos = xsp;
-    if (jj_3_70()) {
+    if (!jj_3_70()) return false;
     jj_scanpos = xsp;
     if (jj_3R_518()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -7853,13 +7383,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_151()) {
+    if (!jj_3R_151()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_152()) {
+    if (!jj_3R_152()) return false;
     jj_scanpos = xsp;
     if (jj_3R_153()) return true;
-    }
-    }
     return false;
   }
 
@@ -7921,13 +7449,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_222()) {
+    if (!jj_3R_222()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_223()) {
+    if (!jj_3R_223()) return false;
     jj_scanpos = xsp;
     if (jj_3R_224()) return true;
-    }
-    }
     return false;
   }
 
@@ -7964,19 +7490,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_201()) {
+    if (!jj_3R_201()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_202()) {
+    if (!jj_3R_202()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_203()) {
+    if (!jj_3R_203()) return false;
     jj_scanpos = xsp;
-    if (jj_3_67()) {
+    if (!jj_3_67()) return false;
     jj_scanpos = xsp;
     if (jj_3R_204()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8087,28 +7609,21 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_449()) {
+    if (!jj_3R_449()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_450()) {
+    if (!jj_3R_450()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_451()) {
+    if (!jj_3R_451()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_452()) {
+    if (!jj_3R_452()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_453()) {
+    if (!jj_3R_453()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_454()) {
+    if (!jj_3R_454()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_455()) {
+    if (!jj_3R_455()) return false;
     jj_scanpos = xsp;
     if (jj_3R_456()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8329,22 +7844,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_641()) {
+    if (!jj_3R_641()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_642()) {
+    if (!jj_3R_642()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_643()) {
+    if (!jj_3R_643()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_644()) {
+    if (!jj_3R_644()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_645()) {
+    if (!jj_3R_645()) return false;
     jj_scanpos = xsp;
     if (jj_3R_646()) return true;
-    }
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8375,10 +7885,9 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_205()) {
+    if (!jj_3R_205()) return false;
     jj_scanpos = xsp;
     if (jj_3R_206()) return true;
-    }
     return false;
   }
 
@@ -8578,16 +8087,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_210()) {
+    if (!jj_3R_210()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_211()) {
+    if (!jj_3R_211()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_212()) {
+    if (!jj_3R_212()) return false;
     jj_scanpos = xsp;
     if (jj_3R_213()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -8636,13 +8142,11 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_147()) {
+    if (!jj_3R_147()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_148()) {
+    if (!jj_3R_148()) return false;
     jj_scanpos = xsp;
     if (jj_3R_149()) return true;
-    }
-    }
     xsp = jj_scanpos;
     if (jj_3R_150()) jj_scanpos = xsp;
     return false;
@@ -8674,16 +8178,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_277()) {
+    if (!jj_3R_277()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_278()) {
+    if (!jj_3R_278()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_279()) {
+    if (!jj_3R_279()) return false;
     jj_scanpos = xsp;
     if (jj_3R_280()) return true;
-    }
-    }
-    }
     return false;
   }
 
@@ -8734,19 +8235,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_426()) {
+    if (!jj_3R_426()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_427()) {
+    if (!jj_3R_427()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_428()) {
+    if (!jj_3R_428()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_429()) {
+    if (!jj_3R_429()) return false;
     jj_scanpos = xsp;
     if (jj_3R_430()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
@@ -8851,30 +8348,32 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_228()) {
+    if (!jj_3R_228()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_229()) {
+    if (!jj_3R_229()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_230()) {
+    if (!jj_3R_230()) return false;
     jj_scanpos = xsp;
-    if (jj_3R_231()) {
+    if (!jj_3R_231()) return false;
     jj_scanpos = xsp;
     if (jj_3R_232()) return true;
-    }
-    }
-    }
-    }
     return false;
   }
 
 
 public: 
-  TokenManager *token_source;
-  CharStream   *jj_input_stream;
+  void setErrorHandler(ErrorHandler *eh) {
+    if (errorHandler) delete errorHandler;
+    errorHandler = eh;
+  }
+
+  TokenManager *token_source = nullptr;
+  CharStream   *jj_input_stream = nullptr;
   /** Current token. */
-  Token        *token;
+  Token        *token = nullptr;
   /** Next token. */
-  Token        *jj_nt;
+  Token        *jj_nt = nullptr;
+
 private: 
   int           jj_ntk;
   JJCalls       jj_2_rtns[116];
@@ -8887,57 +8386,39 @@ private:
   bool          jj_semLA;
   int           jj_gen;
   int           jj_la1[294];
-  ErrorHandler *errorHandler;
-  bool          errorHandlerCreated;
+  ErrorHandler *errorHandler = nullptr;
+
 protected: 
   bool          hasError;
-public: 
-  void setErrorHandler(ErrorHandler *eh) {
-    if (errorHandlerCreated) delete errorHandler;
-    errorHandler = eh;
-    errorHandlerCreated = false;
-  }
+
   Token *head; 
 public: 
-
- VhdlParser(TokenManager *tm);
+  VhdlParser(TokenManager *tokenManager);
   virtual ~VhdlParser();
-
-void ReInit(TokenManager *tm);
-
+void ReInit(TokenManager* tokenManager);
 void clear();
-
 Token * jj_consume_token(int kind);
-
 bool  jj_scan_token(int kind);
-
 Token * getNextToken();
-
 Token * getToken(int index);
-
 int jj_ntk_f();
 private:
   int jj_kind;
   int **jj_expentries;
   int *jj_expentry;
-
   void jj_add_error_token(int kind, int pos);
 protected:
   /** Generate ParseException. */
-
   virtual void  parseError();
 private:
-  int  trace_indent;
-  bool trace_enabled;
+  int  indent;	// trace indentation
+  bool trace = false; // trace enabled if true
 
 public:
-
+  bool trace_enabled();
   void enable_tracing();
-
   void disable_tracing();
-
   void jj_rescan_token();
-
   void jj_save(int index, int xla);
 typedef unsigned long long uint64;
 
diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index 8d4b417..b70ba42 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -2,7 +2,7 @@
 
 /**
  * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGen#start()
+ * Generated by org.javacc.parser.OtherFilesGenCPP#start()
  */
 #ifndef VHDLPARSERCONSTANTS_H
 #define VHDLPARSERCONSTANTS_H
@@ -387,387 +387,387 @@ const  int VHDL2008TOOLDIR = 189;
 const  int DEFAULT = 0;
 
   /** Literal token values. */
-  static JAVACC_CHAR_TYPE tokenImage_arr_0[] = 
+  static const JJChar tokenImage_arr_0[] = 
 {0x3c, 0x45, 0x4f, 0x46, 0x3e, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_1[] = 
+  static const JJChar tokenImage_arr_1[] = 
 {0x22, 0x20, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_2[] = 
+  static const JJChar tokenImage_arr_2[] = 
 {0x22, 0x9, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_3[] = 
+  static const JJChar tokenImage_arr_3[] = 
 {0x22, 0xa, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_4[] = 
+  static const JJChar tokenImage_arr_4[] = 
 {0x22, 0xd, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_5[] = 
+  static const JJChar tokenImage_arr_5[] = 
 {0x22, 0x3c, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_6[] = 
+  static const JJChar tokenImage_arr_6[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_7[] = 
+  static const JJChar tokenImage_arr_7[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x46, 0x4c, 0x4f, 0x57, 0x43, 0x48, 0x41, 0x52, 0x54, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_8[] = 
+  static const JJChar tokenImage_arr_8[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_9[] = 
+  static const JJChar tokenImage_arr_9[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_10[] = 
+  static const JJChar tokenImage_arr_10[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_11[] = 
+  static const JJChar tokenImage_arr_11[] = 
 {0x22, 0x61, 0x62, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_12[] = 
+  static const JJChar tokenImage_arr_12[] = 
 {0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_13[] = 
+  static const JJChar tokenImage_arr_13[] = 
 {0x22, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_14[] = 
+  static const JJChar tokenImage_arr_14[] = 
 {0x22, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_15[] = 
+  static const JJChar tokenImage_arr_15[] = 
 {0x22, 0x61, 0x6c, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_16[] = 
+  static const JJChar tokenImage_arr_16[] = 
 {0x22, 0x61, 0x6e, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_17[] = 
+  static const JJChar tokenImage_arr_17[] = 
 {0x22, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_18[] = 
+  static const JJChar tokenImage_arr_18[] = 
 {0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_19[] = 
+  static const JJChar tokenImage_arr_19[] = 
 {0x22, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_20[] = 
+  static const JJChar tokenImage_arr_20[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_21[] = 
+  static const JJChar tokenImage_arr_21[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_22[] = 
+  static const JJChar tokenImage_arr_22[] = 
 {0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_23[] = 
+  static const JJChar tokenImage_arr_23[] = 
 {0x22, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_24[] = 
+  static const JJChar tokenImage_arr_24[] = 
 {0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_25[] = 
+  static const JJChar tokenImage_arr_25[] = 
 {0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_26[] = 
+  static const JJChar tokenImage_arr_26[] = 
 {0x22, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_27[] = 
+  static const JJChar tokenImage_arr_27[] = 
 {0x22, 0x62, 0x75, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_28[] = 
+  static const JJChar tokenImage_arr_28[] = 
 {0x22, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_29[] = 
+  static const JJChar tokenImage_arr_29[] = 
 {0x22, 0x63, 0x61, 0x73, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_30[] = 
+  static const JJChar tokenImage_arr_30[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_31[] = 
+  static const JJChar tokenImage_arr_31[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_32[] = 
+  static const JJChar tokenImage_arr_32[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_33[] = 
+  static const JJChar tokenImage_arr_33[] = 
 {0x22, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_34[] = 
+  static const JJChar tokenImage_arr_34[] = 
 {0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_35[] = 
+  static const JJChar tokenImage_arr_35[] = 
 {0x22, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_36[] = 
+  static const JJChar tokenImage_arr_36[] = 
 {0x22, 0x64, 0x6f, 0x77, 0x6e, 0x74, 0x6f, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_37[] = 
+  static const JJChar tokenImage_arr_37[] = 
 {0x22, 0x65, 0x6c, 0x73, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_38[] = 
+  static const JJChar tokenImage_arr_38[] = 
 {0x22, 0x65, 0x6c, 0x73, 0x69, 0x66, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_39[] = 
+  static const JJChar tokenImage_arr_39[] = 
 {0x22, 0x65, 0x6e, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_40[] = 
+  static const JJChar tokenImage_arr_40[] = 
 {0x22, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_41[] = 
+  static const JJChar tokenImage_arr_41[] = 
 {0x22, 0x65, 0x78, 0x69, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_42[] = 
+  static const JJChar tokenImage_arr_42[] = 
 {0x22, 0x66, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x73, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_43[] = 
+  static const JJChar tokenImage_arr_43[] = 
 {0x22, 0x66, 0x69, 0x6c, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_44[] = 
+  static const JJChar tokenImage_arr_44[] = 
 {0x22, 0x66, 0x6f, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_45[] = 
+  static const JJChar tokenImage_arr_45[] = 
 {0x22, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_46[] = 
+  static const JJChar tokenImage_arr_46[] = 
 {0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_47[] = 
+  static const JJChar tokenImage_arr_47[] = 
 {0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_48[] = 
+  static const JJChar tokenImage_arr_48[] = 
 {0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_49[] = 
+  static const JJChar tokenImage_arr_49[] = 
 {0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_50[] = 
+  static const JJChar tokenImage_arr_50[] = 
 {0x22, 0x67, 0x75, 0x61, 0x72, 0x64, 0x65, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_51[] = 
+  static const JJChar tokenImage_arr_51[] = 
 {0x22, 0x69, 0x66, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_52[] = 
+  static const JJChar tokenImage_arr_52[] = 
 {0x22, 0x69, 0x6d, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_53[] = 
+  static const JJChar tokenImage_arr_53[] = 
 {0x22, 0x69, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_54[] = 
+  static const JJChar tokenImage_arr_54[] = 
 {0x22, 0x69, 0x6e, 0x65, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_55[] = 
+  static const JJChar tokenImage_arr_55[] = 
 {0x22, 0x69, 0x6e, 0x6f, 0x75, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_56[] = 
+  static const JJChar tokenImage_arr_56[] = 
 {0x22, 0x69, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_57[] = 
+  static const JJChar tokenImage_arr_57[] = 
 {0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_58[] = 
+  static const JJChar tokenImage_arr_58[] = 
 {0x22, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_59[] = 
+  static const JJChar tokenImage_arr_59[] = 
 {0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_60[] = 
+  static const JJChar tokenImage_arr_60[] = 
 {0x22, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_61[] = 
+  static const JJChar tokenImage_arr_61[] = 
 {0x22, 0x6c, 0x6f, 0x6f, 0x70, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_62[] = 
+  static const JJChar tokenImage_arr_62[] = 
 {0x22, 0x6d, 0x61, 0x70, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_63[] = 
+  static const JJChar tokenImage_arr_63[] = 
 {0x22, 0x6d, 0x6f, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_64[] = 
+  static const JJChar tokenImage_arr_64[] = 
 {0x22, 0x6e, 0x61, 0x6e, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_65[] = 
+  static const JJChar tokenImage_arr_65[] = 
 {0x22, 0x6e, 0x65, 0x77, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_66[] = 
+  static const JJChar tokenImage_arr_66[] = 
 {0x22, 0x6e, 0x65, 0x78, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_67[] = 
+  static const JJChar tokenImage_arr_67[] = 
 {0x22, 0x6e, 0x6f, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_68[] = 
+  static const JJChar tokenImage_arr_68[] = 
 {0x22, 0x6e, 0x6f, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_69[] = 
+  static const JJChar tokenImage_arr_69[] = 
 {0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_70[] = 
+  static const JJChar tokenImage_arr_70[] = 
 {0x22, 0x6f, 0x66, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_71[] = 
+  static const JJChar tokenImage_arr_71[] = 
 {0x22, 0x6f, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_72[] = 
+  static const JJChar tokenImage_arr_72[] = 
 {0x22, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_73[] = 
+  static const JJChar tokenImage_arr_73[] = 
 {0x22, 0x6f, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_74[] = 
+  static const JJChar tokenImage_arr_74[] = 
 {0x22, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_75[] = 
+  static const JJChar tokenImage_arr_75[] = 
 {0x22, 0x6f, 0x75, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_76[] = 
+  static const JJChar tokenImage_arr_76[] = 
 {0x22, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_77[] = 
+  static const JJChar tokenImage_arr_77[] = 
 {0x22, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_78[] = 
+  static const JJChar tokenImage_arr_78[] = 
 {0x22, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_79[] = 
+  static const JJChar tokenImage_arr_79[] = 
 {0x22, 0x70, 0x6f, 0x73, 0x74, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_80[] = 
+  static const JJChar tokenImage_arr_80[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_81[] = 
+  static const JJChar tokenImage_arr_81[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_82[] = 
+  static const JJChar tokenImage_arr_82[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_83[] = 
+  static const JJChar tokenImage_arr_83[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_84[] = 
+  static const JJChar tokenImage_arr_84[] = 
 {0x22, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_85[] = 
+  static const JJChar tokenImage_arr_85[] = 
 {0x22, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_86[] = 
+  static const JJChar tokenImage_arr_86[] = 
 {0x22, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_87[] = 
+  static const JJChar tokenImage_arr_87[] = 
 {0x22, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_88[] = 
+  static const JJChar tokenImage_arr_88[] = 
 {0x22, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_89[] = 
+  static const JJChar tokenImage_arr_89[] = 
 {0x22, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_90[] = 
+  static const JJChar tokenImage_arr_90[] = 
 {0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_91[] = 
+  static const JJChar tokenImage_arr_91[] = 
 {0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_92[] = 
+  static const JJChar tokenImage_arr_92[] = 
 {0x22, 0x72, 0x65, 0x6d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_93[] = 
+  static const JJChar tokenImage_arr_93[] = 
 {0x22, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_94[] = 
+  static const JJChar tokenImage_arr_94[] = 
 {0x22, 0x72, 0x6f, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_95[] = 
+  static const JJChar tokenImage_arr_95[] = 
 {0x22, 0x72, 0x6f, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_96[] = 
+  static const JJChar tokenImage_arr_96[] = 
 {0x22, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_97[] = 
+  static const JJChar tokenImage_arr_97[] = 
 {0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_98[] = 
+  static const JJChar tokenImage_arr_98[] = 
 {0x22, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_99[] = 
+  static const JJChar tokenImage_arr_99[] = 
 {0x22, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_100[] = 
+  static const JJChar tokenImage_arr_100[] = 
 {0x22, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_101[] = 
+  static const JJChar tokenImage_arr_101[] = 
 {0x22, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_102[] = 
+  static const JJChar tokenImage_arr_102[] = 
 {0x22, 0x73, 0x6c, 0x61, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_103[] = 
+  static const JJChar tokenImage_arr_103[] = 
 {0x22, 0x73, 0x6c, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_104[] = 
+  static const JJChar tokenImage_arr_104[] = 
 {0x22, 0x73, 0x72, 0x61, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_105[] = 
+  static const JJChar tokenImage_arr_105[] = 
 {0x22, 0x73, 0x72, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_106[] = 
+  static const JJChar tokenImage_arr_106[] = 
 {0x22, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x67, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_107[] = 
+  static const JJChar tokenImage_arr_107[] = 
 {0x22, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_108[] = 
+  static const JJChar tokenImage_arr_108[] = 
 {0x22, 0x74, 0x68, 0x65, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_109[] = 
+  static const JJChar tokenImage_arr_109[] = 
 {0x22, 0x74, 0x6f, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_110[] = 
+  static const JJChar tokenImage_arr_110[] = 
 {0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_111[] = 
+  static const JJChar tokenImage_arr_111[] = 
 {0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_112[] = 
+  static const JJChar tokenImage_arr_112[] = 
 {0x22, 0x75, 0x6e, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_113[] = 
+  static const JJChar tokenImage_arr_113[] = 
 {0x22, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_114[] = 
+  static const JJChar tokenImage_arr_114[] = 
 {0x22, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_115[] = 
+  static const JJChar tokenImage_arr_115[] = 
 {0x22, 0x75, 0x73, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_116[] = 
+  static const JJChar tokenImage_arr_116[] = 
 {0x22, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_117[] = 
+  static const JJChar tokenImage_arr_117[] = 
 {0x22, 0x76, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_118[] = 
+  static const JJChar tokenImage_arr_118[] = 
 {0x22, 0x76, 0x70, 0x72, 0x6f, 0x70, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_119[] = 
+  static const JJChar tokenImage_arr_119[] = 
 {0x22, 0x76, 0x75, 0x6e, 0x69, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_120[] = 
+  static const JJChar tokenImage_arr_120[] = 
 {0x22, 0x77, 0x61, 0x69, 0x74, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_121[] = 
+  static const JJChar tokenImage_arr_121[] = 
 {0x22, 0x77, 0x68, 0x65, 0x6e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_122[] = 
+  static const JJChar tokenImage_arr_122[] = 
 {0x22, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_123[] = 
+  static const JJChar tokenImage_arr_123[] = 
 {0x22, 0x77, 0x69, 0x74, 0x68, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_124[] = 
+  static const JJChar tokenImage_arr_124[] = 
 {0x22, 0x78, 0x6f, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_125[] = 
+  static const JJChar tokenImage_arr_125[] = 
 {0x22, 0x78, 0x6e, 0x6f, 0x72, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_126[] = 
+  static const JJChar tokenImage_arr_126[] = 
 {0x22, 0x26, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_127[] = 
+  static const JJChar tokenImage_arr_127[] = 
 {0x22, 0x27, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_128[] = 
+  static const JJChar tokenImage_arr_128[] = 
 {0x22, 0x28, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_129[] = 
+  static const JJChar tokenImage_arr_129[] = 
 {0x22, 0x29, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_130[] = 
+  static const JJChar tokenImage_arr_130[] = 
 {0x22, 0x2a, 0x2a, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_131[] = 
+  static const JJChar tokenImage_arr_131[] = 
 {0x22, 0x2a, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_132[] = 
+  static const JJChar tokenImage_arr_132[] = 
 {0x22, 0x2b, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_133[] = 
+  static const JJChar tokenImage_arr_133[] = 
 {0x22, 0x2d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_134[] = 
+  static const JJChar tokenImage_arr_134[] = 
 {0x22, 0x2c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_135[] = 
+  static const JJChar tokenImage_arr_135[] = 
 {0x22, 0x3a, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_136[] = 
+  static const JJChar tokenImage_arr_136[] = 
 {0x22, 0x3a, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_137[] = 
+  static const JJChar tokenImage_arr_137[] = 
 {0x22, 0x3b, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_138[] = 
+  static const JJChar tokenImage_arr_138[] = 
 {0x22, 0x3c, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_139[] = 
+  static const JJChar tokenImage_arr_139[] = 
 {0x22, 0x3e, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_140[] = 
+  static const JJChar tokenImage_arr_140[] = 
 {0x22, 0x3c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_141[] = 
+  static const JJChar tokenImage_arr_141[] = 
 {0x22, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_142[] = 
+  static const JJChar tokenImage_arr_142[] = 
 {0x22, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_143[] = 
+  static const JJChar tokenImage_arr_143[] = 
 {0x22, 0x2f, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_144[] = 
+  static const JJChar tokenImage_arr_144[] = 
 {0x22, 0x3d, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_145[] = 
+  static const JJChar tokenImage_arr_145[] = 
 {0x22, 0x3c, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_146[] = 
+  static const JJChar tokenImage_arr_146[] = 
 {0x22, 0x3c, 0x3c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_147[] = 
+  static const JJChar tokenImage_arr_147[] = 
 {0x22, 0x3e, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_148[] = 
+  static const JJChar tokenImage_arr_148[] = 
 {0x22, 0x3f, 0x3f, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_149[] = 
+  static const JJChar tokenImage_arr_149[] = 
 {0x22, 0x3f, 0x3e, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_150[] = 
+  static const JJChar tokenImage_arr_150[] = 
 {0x22, 0x3f, 0x3c, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_151[] = 
+  static const JJChar tokenImage_arr_151[] = 
 {0x22, 0x3f, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_152[] = 
+  static const JJChar tokenImage_arr_152[] = 
 {0x22, 0x3f, 0x3c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_153[] = 
+  static const JJChar tokenImage_arr_153[] = 
 {0x22, 0x3f, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_154[] = 
+  static const JJChar tokenImage_arr_154[] = 
 {0x22, 0x3f, 0x2f, 0x3d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_155[] = 
+  static const JJChar tokenImage_arr_155[] = 
 {0x22, 0x3f, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_156[] = 
+  static const JJChar tokenImage_arr_156[] = 
 {0x22, 0x7c, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_157[] = 
+  static const JJChar tokenImage_arr_157[] = 
 {0x22, 0x2e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_158[] = 
+  static const JJChar tokenImage_arr_158[] = 
 {0x22, 0x2f, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_159[] = 
+  static const JJChar tokenImage_arr_159[] = 
 {0x22, 0x40, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_160[] = 
+  static const JJChar tokenImage_arr_160[] = 
 {0x22, 0x5e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_161[] = 
+  static const JJChar tokenImage_arr_161[] = 
 {0x22, 0x5b, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_162[] = 
+  static const JJChar tokenImage_arr_162[] = 
 {0x22, 0x5d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_163[] = 
+  static const JJChar tokenImage_arr_163[] = 
 {0x22, 0x7b, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_164[] = 
+  static const JJChar tokenImage_arr_164[] = 
 {0x22, 0x7d, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_165[] = 
+  static const JJChar tokenImage_arr_165[] = 
 {0x22, 0x3c, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_166[] = 
+  static const JJChar tokenImage_arr_166[] = 
 {0x22, 0x3c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_167[] = 
+  static const JJChar tokenImage_arr_167[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_168[] = 
+  static const JJChar tokenImage_arr_168[] = 
 {0x22, 0x3c, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_169[] = 
+  static const JJChar tokenImage_arr_169[] = 
 {0x22, 0x3c, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_170[] = 
+  static const JJChar tokenImage_arr_170[] = 
 {0x22, 0x3c, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_171[] = 
+  static const JJChar tokenImage_arr_171[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_172[] = 
+  static const JJChar tokenImage_arr_172[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_173[] = 
+  static const JJChar tokenImage_arr_173[] = 
 {0x22, 0x3c, 0x45, 0x58, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_174[] = 
+  static const JJChar tokenImage_arr_174[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_175[] = 
+  static const JJChar tokenImage_arr_175[] = 
 {0x22, 0x3c, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_176[] = 
+  static const JJChar tokenImage_arr_176[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_177[] = 
+  static const JJChar tokenImage_arr_177[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x5f, 0x4f, 0x52, 0x5f, 0x53, 0x54, 0x44, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_178[] = 
+  static const JJChar tokenImage_arr_178[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_179[] = 
+  static const JJChar tokenImage_arr_179[] = 
 {0x22, 0x3c, 0x55, 0x50, 0x50, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_180[] = 
+  static const JJChar tokenImage_arr_180[] = 
 {0x22, 0x3c, 0x42, 0x49, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_181[] = 
+  static const JJChar tokenImage_arr_181[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_182[] = 
+  static const JJChar tokenImage_arr_182[] = 
 {0x22, 0x3c, 0x53, 0x54, 0x44, 0x5f, 0x4c, 0x4f, 0x47, 0x49, 0x43, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_183[] = 
+  static const JJChar tokenImage_arr_183[] = 
 {0x22, 0x3c, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_184[] = 
+  static const JJChar tokenImage_arr_184[] = 
 {0x22, 0x3c, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_185[] = 
+  static const JJChar tokenImage_arr_185[] = 
 {0x22, 0x3c, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_186[] = 
+  static const JJChar tokenImage_arr_186[] = 
 {0x22, 0x3c, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_187[] = 
+  static const JJChar tokenImage_arr_187[] = 
 {0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_188[] = 
+  static const JJChar tokenImage_arr_188[] = 
 {0x22, 0x3c, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x3e, 0x22, 0};
-  static JAVACC_CHAR_TYPE tokenImage_arr_189[] = 
+  static const JJChar tokenImage_arr_189[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x32, 0x30, 0x30, 0x38, 0x54, 0x4f, 0x4f, 0x4c, 0x44, 0x49, 0x52, 0x3e, 0x22, 0};
-  static JAVACC_STRING_TYPE tokenImage[] = {
+  static const JJChar* const tokenImage[] = {
 tokenImage_arr_0, 
 tokenImage_arr_1, 
 tokenImage_arr_2, 
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 11e0ced..29ce7cb 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -18,227 +18,227 @@ static const int jjnextStates[] = {
    40, 42, 56, 57, 58, 61, 60, 59, 61, 65, 66, 67, 68, 69, 71, 9, 
    10, 28, 29, 45, 47, 50, 52, 27, 30, 
 };
-static JAVACC_CHAR_TYPE jjstrLiteralChars_0[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_1[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_2[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_3[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_4[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_5[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_6[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_7[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_8[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_9[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_10[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_11[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_12[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_13[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_14[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_15[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_16[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_17[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_18[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_19[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_20[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_21[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_22[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_23[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_24[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_25[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_26[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_27[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_28[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_29[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_30[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_31[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_32[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_33[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_34[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_35[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_36[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_37[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_38[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_39[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_40[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_41[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_42[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_43[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_44[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_45[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_46[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_47[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_48[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_49[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_50[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_51[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_52[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_53[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_54[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_55[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_56[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_57[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_58[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_59[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_60[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_61[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_62[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_63[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_64[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_65[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_66[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_67[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_68[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_69[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_70[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_71[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_72[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_73[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_74[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_75[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_76[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_77[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_78[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_79[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_80[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_81[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_82[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_83[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_84[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_85[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_86[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_87[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_88[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_89[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_90[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_91[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_92[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_93[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_94[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_95[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_96[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_97[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_98[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_99[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_100[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_101[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_102[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_103[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_104[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_105[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_106[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_107[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_108[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_109[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_110[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_111[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_112[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_113[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_114[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_115[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_116[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_117[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_118[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_119[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_120[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_121[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_122[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_123[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_124[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_125[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_126[] = {0x26, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_127[] = {0x27, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_128[] = {0x28, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_129[] = {0x29, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_130[] = {0x2a, 0x2a, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_131[] = {0x2a, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_132[] = {0x2b, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_133[] = {0x2d, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_134[] = {0x2c, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_135[] = {0x3a, 0x3d, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_136[] = {0x3a, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_137[] = {0x3b, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_138[] = {0x3c, 0x3d, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_139[] = {0x3e, 0x3d, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_140[] = {0x3c, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_141[] = {0x3e, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_142[] = {0x3d, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_143[] = {0x2f, 0x3d, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_144[] = {0x3d, 0x3e, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_145[] = {0x3c, 0x3e, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_146[] = {0x3c, 0x3c, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_147[] = {0x3e, 0x3e, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_148[] = {0x3f, 0x3f, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_149[] = {0x3f, 0x3e, 0x3d, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_150[] = {0x3f, 0x3c, 0x3d, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_151[] = {0x3f, 0x3e, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_152[] = {0x3f, 0x3c, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_153[] = {0x3f, 0x3d, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_154[] = {0x3f, 0x2f, 0x3d, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_155[] = {0x3f, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_156[] = {0x7c, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_157[] = {0x2e, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_158[] = {0x2f, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_159[] = {0x40, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_160[] = {0x5e, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_161[] = {0x5b, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_162[] = {0x5d, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_163[] = {0x7b, 0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_164[] = {0x7d, 0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_165[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_166[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_167[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_168[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_169[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_170[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_171[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_172[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_173[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_174[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_175[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_176[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_177[] = {0};
-
-static JAVACC_CHAR_TYPE jjstrLiteralChars_178[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_179[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_180[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_181[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_182[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_183[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_184[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_185[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_186[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_187[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_188[] = {0};
-static JAVACC_CHAR_TYPE jjstrLiteralChars_189[] = {0};
-static const JAVACC_STRING_TYPE jjstrLiteralImages[] = {
+static JJChar jjstrLiteralChars_0[] = {0};
+static JJChar jjstrLiteralChars_1[] = {0};
+static JJChar jjstrLiteralChars_2[] = {0};
+static JJChar jjstrLiteralChars_3[] = {0};
+static JJChar jjstrLiteralChars_4[] = {0};
+static JJChar jjstrLiteralChars_5[] = {0};
+static JJChar jjstrLiteralChars_6[] = {0};
+
+static JJChar jjstrLiteralChars_7[] = {0};
+static JJChar jjstrLiteralChars_8[] = {0};
+static JJChar jjstrLiteralChars_9[] = {0};
+static JJChar jjstrLiteralChars_10[] = {0};
+static JJChar jjstrLiteralChars_11[] = {0};
+static JJChar jjstrLiteralChars_12[] = {0};
+static JJChar jjstrLiteralChars_13[] = {0};
+static JJChar jjstrLiteralChars_14[] = {0};
+static JJChar jjstrLiteralChars_15[] = {0};
+static JJChar jjstrLiteralChars_16[] = {0};
+static JJChar jjstrLiteralChars_17[] = {0};
+static JJChar jjstrLiteralChars_18[] = {0};
+static JJChar jjstrLiteralChars_19[] = {0};
+static JJChar jjstrLiteralChars_20[] = {0};
+
+static JJChar jjstrLiteralChars_21[] = {0};
+static JJChar jjstrLiteralChars_22[] = {0};
+static JJChar jjstrLiteralChars_23[] = {0};
+static JJChar jjstrLiteralChars_24[] = {0};
+static JJChar jjstrLiteralChars_25[] = {0};
+static JJChar jjstrLiteralChars_26[] = {0};
+static JJChar jjstrLiteralChars_27[] = {0};
+static JJChar jjstrLiteralChars_28[] = {0};
+static JJChar jjstrLiteralChars_29[] = {0};
+static JJChar jjstrLiteralChars_30[] = {0};
+static JJChar jjstrLiteralChars_31[] = {0};
+static JJChar jjstrLiteralChars_32[] = {0};
+static JJChar jjstrLiteralChars_33[] = {0};
+static JJChar jjstrLiteralChars_34[] = {0};
+
+static JJChar jjstrLiteralChars_35[] = {0};
+static JJChar jjstrLiteralChars_36[] = {0};
+static JJChar jjstrLiteralChars_37[] = {0};
+static JJChar jjstrLiteralChars_38[] = {0};
+static JJChar jjstrLiteralChars_39[] = {0};
+static JJChar jjstrLiteralChars_40[] = {0};
+static JJChar jjstrLiteralChars_41[] = {0};
+static JJChar jjstrLiteralChars_42[] = {0};
+static JJChar jjstrLiteralChars_43[] = {0};
+static JJChar jjstrLiteralChars_44[] = {0};
+static JJChar jjstrLiteralChars_45[] = {0};
+static JJChar jjstrLiteralChars_46[] = {0};
+static JJChar jjstrLiteralChars_47[] = {0};
+static JJChar jjstrLiteralChars_48[] = {0};
+
+static JJChar jjstrLiteralChars_49[] = {0};
+static JJChar jjstrLiteralChars_50[] = {0};
+static JJChar jjstrLiteralChars_51[] = {0};
+static JJChar jjstrLiteralChars_52[] = {0};
+static JJChar jjstrLiteralChars_53[] = {0};
+static JJChar jjstrLiteralChars_54[] = {0};
+static JJChar jjstrLiteralChars_55[] = {0};
+static JJChar jjstrLiteralChars_56[] = {0};
+static JJChar jjstrLiteralChars_57[] = {0};
+static JJChar jjstrLiteralChars_58[] = {0};
+static JJChar jjstrLiteralChars_59[] = {0};
+static JJChar jjstrLiteralChars_60[] = {0};
+static JJChar jjstrLiteralChars_61[] = {0};
+static JJChar jjstrLiteralChars_62[] = {0};
+
+static JJChar jjstrLiteralChars_63[] = {0};
+static JJChar jjstrLiteralChars_64[] = {0};
+static JJChar jjstrLiteralChars_65[] = {0};
+static JJChar jjstrLiteralChars_66[] = {0};
+static JJChar jjstrLiteralChars_67[] = {0};
+static JJChar jjstrLiteralChars_68[] = {0};
+static JJChar jjstrLiteralChars_69[] = {0};
+static JJChar jjstrLiteralChars_70[] = {0};
+static JJChar jjstrLiteralChars_71[] = {0};
+static JJChar jjstrLiteralChars_72[] = {0};
+static JJChar jjstrLiteralChars_73[] = {0};
+static JJChar jjstrLiteralChars_74[] = {0};
+static JJChar jjstrLiteralChars_75[] = {0};
+static JJChar jjstrLiteralChars_76[] = {0};
+
+static JJChar jjstrLiteralChars_77[] = {0};
+static JJChar jjstrLiteralChars_78[] = {0};
+static JJChar jjstrLiteralChars_79[] = {0};
+static JJChar jjstrLiteralChars_80[] = {0};
+static JJChar jjstrLiteralChars_81[] = {0};
+static JJChar jjstrLiteralChars_82[] = {0};
+static JJChar jjstrLiteralChars_83[] = {0};
+static JJChar jjstrLiteralChars_84[] = {0};
+static JJChar jjstrLiteralChars_85[] = {0};
+static JJChar jjstrLiteralChars_86[] = {0};
+static JJChar jjstrLiteralChars_87[] = {0};
+static JJChar jjstrLiteralChars_88[] = {0};
+static JJChar jjstrLiteralChars_89[] = {0};
+static JJChar jjstrLiteralChars_90[] = {0};
+
+static JJChar jjstrLiteralChars_91[] = {0};
+static JJChar jjstrLiteralChars_92[] = {0};
+static JJChar jjstrLiteralChars_93[] = {0};
+static JJChar jjstrLiteralChars_94[] = {0};
+static JJChar jjstrLiteralChars_95[] = {0};
+static JJChar jjstrLiteralChars_96[] = {0};
+static JJChar jjstrLiteralChars_97[] = {0};
+static JJChar jjstrLiteralChars_98[] = {0};
+static JJChar jjstrLiteralChars_99[] = {0};
+static JJChar jjstrLiteralChars_100[] = {0};
+static JJChar jjstrLiteralChars_101[] = {0};
+static JJChar jjstrLiteralChars_102[] = {0};
+static JJChar jjstrLiteralChars_103[] = {0};
+static JJChar jjstrLiteralChars_104[] = {0};
+
+static JJChar jjstrLiteralChars_105[] = {0};
+static JJChar jjstrLiteralChars_106[] = {0};
+static JJChar jjstrLiteralChars_107[] = {0};
+static JJChar jjstrLiteralChars_108[] = {0};
+static JJChar jjstrLiteralChars_109[] = {0};
+static JJChar jjstrLiteralChars_110[] = {0};
+static JJChar jjstrLiteralChars_111[] = {0};
+static JJChar jjstrLiteralChars_112[] = {0};
+static JJChar jjstrLiteralChars_113[] = {0};
+static JJChar jjstrLiteralChars_114[] = {0};
+static JJChar jjstrLiteralChars_115[] = {0};
+static JJChar jjstrLiteralChars_116[] = {0};
+static JJChar jjstrLiteralChars_117[] = {0};
+static JJChar jjstrLiteralChars_118[] = {0};
+
+static JJChar jjstrLiteralChars_119[] = {0};
+static JJChar jjstrLiteralChars_120[] = {0};
+static JJChar jjstrLiteralChars_121[] = {0};
+static JJChar jjstrLiteralChars_122[] = {0};
+static JJChar jjstrLiteralChars_123[] = {0};
+static JJChar jjstrLiteralChars_124[] = {0};
+static JJChar jjstrLiteralChars_125[] = {0};
+
+static JJChar jjstrLiteralChars_126[] = {0x26, 0};
+static JJChar jjstrLiteralChars_127[] = {0x27, 0};
+
+static JJChar jjstrLiteralChars_128[] = {0x28, 0};
+static JJChar jjstrLiteralChars_129[] = {0x29, 0};
+
+static JJChar jjstrLiteralChars_130[] = {0x2a, 0x2a, 0};
+static JJChar jjstrLiteralChars_131[] = {0x2a, 0};
+
+static JJChar jjstrLiteralChars_132[] = {0x2b, 0};
+static JJChar jjstrLiteralChars_133[] = {0x2d, 0};
+
+static JJChar jjstrLiteralChars_134[] = {0x2c, 0};
+static JJChar jjstrLiteralChars_135[] = {0x3a, 0x3d, 0};
+
+static JJChar jjstrLiteralChars_136[] = {0x3a, 0};
+static JJChar jjstrLiteralChars_137[] = {0x3b, 0};
+
+static JJChar jjstrLiteralChars_138[] = {0x3c, 0x3d, 0};
+static JJChar jjstrLiteralChars_139[] = {0x3e, 0x3d, 0};
+
+static JJChar jjstrLiteralChars_140[] = {0x3c, 0};
+static JJChar jjstrLiteralChars_141[] = {0x3e, 0};
+
+static JJChar jjstrLiteralChars_142[] = {0x3d, 0};
+static JJChar jjstrLiteralChars_143[] = {0x2f, 0x3d, 0};
+
+static JJChar jjstrLiteralChars_144[] = {0x3d, 0x3e, 0};
+static JJChar jjstrLiteralChars_145[] = {0x3c, 0x3e, 0};
+
+static JJChar jjstrLiteralChars_146[] = {0x3c, 0x3c, 0};
+static JJChar jjstrLiteralChars_147[] = {0x3e, 0x3e, 0};
+
+static JJChar jjstrLiteralChars_148[] = {0x3f, 0x3f, 0};
+static JJChar jjstrLiteralChars_149[] = {0x3f, 0x3e, 0x3d, 0};
+
+static JJChar jjstrLiteralChars_150[] = {0x3f, 0x3c, 0x3d, 0};
+static JJChar jjstrLiteralChars_151[] = {0x3f, 0x3e, 0};
+
+static JJChar jjstrLiteralChars_152[] = {0x3f, 0x3c, 0};
+static JJChar jjstrLiteralChars_153[] = {0x3f, 0x3d, 0};
+
+static JJChar jjstrLiteralChars_154[] = {0x3f, 0x2f, 0x3d, 0};
+static JJChar jjstrLiteralChars_155[] = {0x3f, 0};
+
+static JJChar jjstrLiteralChars_156[] = {0x7c, 0};
+static JJChar jjstrLiteralChars_157[] = {0x2e, 0};
+
+static JJChar jjstrLiteralChars_158[] = {0x2f, 0};
+static JJChar jjstrLiteralChars_159[] = {0x40, 0};
+
+static JJChar jjstrLiteralChars_160[] = {0x5e, 0};
+static JJChar jjstrLiteralChars_161[] = {0x5b, 0};
+
+static JJChar jjstrLiteralChars_162[] = {0x5d, 0};
+static JJChar jjstrLiteralChars_163[] = {0x7b, 0};
+
+static JJChar jjstrLiteralChars_164[] = {0x7d, 0};
+static JJChar jjstrLiteralChars_165[] = {0};
+static JJChar jjstrLiteralChars_166[] = {0};
+static JJChar jjstrLiteralChars_167[] = {0};
+static JJChar jjstrLiteralChars_168[] = {0};
+static JJChar jjstrLiteralChars_169[] = {0};
+static JJChar jjstrLiteralChars_170[] = {0};
+static JJChar jjstrLiteralChars_171[] = {0};
+static JJChar jjstrLiteralChars_172[] = {0};
+static JJChar jjstrLiteralChars_173[] = {0};
+static JJChar jjstrLiteralChars_174[] = {0};
+static JJChar jjstrLiteralChars_175[] = {0};
+static JJChar jjstrLiteralChars_176[] = {0};
+static JJChar jjstrLiteralChars_177[] = {0};
+
+static JJChar jjstrLiteralChars_178[] = {0};
+static JJChar jjstrLiteralChars_179[] = {0};
+static JJChar jjstrLiteralChars_180[] = {0};
+static JJChar jjstrLiteralChars_181[] = {0};
+static JJChar jjstrLiteralChars_182[] = {0};
+static JJChar jjstrLiteralChars_183[] = {0};
+static JJChar jjstrLiteralChars_184[] = {0};
+static JJChar jjstrLiteralChars_185[] = {0};
+static JJChar jjstrLiteralChars_186[] = {0};
+static JJChar jjstrLiteralChars_187[] = {0};
+static JJChar jjstrLiteralChars_188[] = {0};
+static JJChar jjstrLiteralChars_189[] = {0};
+static const JJString jjstrLiteralImages[] = {
 jjstrLiteralChars_0, 
 jjstrLiteralChars_1, 
 jjstrLiteralChars_2, 
@@ -432,9 +432,9 @@ jjstrLiteralChars_189,
 };
 
 /** Lexer state names. */
-static const JAVACC_CHAR_TYPE lexStateNames_arr_0[] = 
+static const JJChar lexStateNames_arr_0[] = 
 {0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0};
-static const JAVACC_STRING_TYPE lexStateNames[] = {
+static const JJString lexStateNames[] = {
 lexStateNames_arr_0, 
 };
 static const unsigned long long jjtoToken[] = {
@@ -444,7 +444,7 @@ static const unsigned long long jjtoSkip[] = {
    0x7deULL, 0x0ULL, 0x0ULL, 
 };
 
-void  VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; }
+  void  VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; }
 
  int  VhdlParserTokenManager::jjStopAtPos(int pos, int kind){
    jjmatchedKind = kind;
@@ -3321,12 +3321,12 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo
 
 Token * VhdlParserTokenManager::jjFillToken(){
    Token *t;
-   JAVACC_STRING_TYPE curTokenImage;
+   JJString curTokenImage;
    int beginLine   = -1;
    int endLine     = -1;
    int beginColumn = -1;
    int endColumn   = -1;
-   JAVACC_STRING_TYPE im = jjstrLiteralImages[jjmatchedKind];
+   JJString im = jjstrLiteralImages[jjmatchedKind];
    curTokenImage = (im.length() == 0) ? input_stream->GetImage() : im;
    if (input_stream->getTrackLineColumn()) {
      beginLine = input_stream->getBeginLine();
@@ -3337,8 +3337,8 @@ Token * VhdlParserTokenManager::jjFillToken(){
    t = Token::newToken(jjmatchedKind);
    t->kind = jjmatchedKind;
    t->image = curTokenImage;
-   t->specialToken = NULL;
-   t->next = NULL;
+   t->specialToken = nullptr;
+   t->next = nullptr;
 
    if (input_stream->getTrackLineColumn()) {
    t->beginLine = beginLine;
@@ -3353,7 +3353,7 @@ const int defaultLexState = 0;
 /** Get the next Token. */
 
 Token * VhdlParserTokenManager::getNextToken(){
-  Token *matchedToken;
+  Token *matchedToken = nullptr;
   int curPos = 0;
 
   for (;;)
@@ -3386,13 +3386,13 @@ Token * VhdlParserTokenManager::getNextToken(){
       }
       else
       {
-         SkipLexicalActions(NULL);
+         SkipLexicalActions(nullptr);
          goto EOFLoop;
       }
    }
    int error_line = input_stream->getEndLine();
    int error_column = input_stream->getEndColumn();
-   JAVACC_STRING_TYPE error_after;
+   JJString error_after;
    bool EOFSeen = false;
    if (input_stream->endOfInput()) {
       EOFSeen = true;
@@ -3593,7 +3593,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
    }
 }
   /** Reinitialise parser. */
-  void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg) {
+  void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState) {
     clear();
     jjmatchedPos = jjnewStateCnt = 0;
     curLexState = lexState;
@@ -3601,9 +3601,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
     ReInitRounds();
     debugStream = stdout; // init
     SwitchTo(lexState);
-    parser = parserArg;
     errorHandler = new TokenManagerErrorHandler();
-    errorHandlerCreated = true;
   }
 
   void VhdlParserTokenManager::ReInitRounds() {
@@ -3616,7 +3614,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   /** Switch to specified lex state. */
   void VhdlParserTokenManager::SwitchTo(int lexState) {
     if (lexState >= 1 || lexState < 0) {
-      JAVACC_STRING_TYPE message;
+      JJString message;
 #ifdef WIDE_CHAR
       message += L"Error: Ignoring invalid lexical state : ";
       message += lexState; message += L". State unchanged.";
@@ -3630,11 +3628,10 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   }
 
   /** Constructor. */
-  VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg)
+  VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState)
   {
-    input_stream = NULL;
-    errorHandlerCreated = false;
-    ReInit(stream, lexState, parserArg);
+    input_stream = nullptr;
+    ReInit(stream, lexState);
   }
 
   // Destructor
@@ -3647,7 +3644,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
     //Since input_stream was generated outside of TokenManager
     //TokenManager should not take care of deleting it
     //if (input_stream) delete input_stream;
-    if (errorHandlerCreated) delete errorHandler;    
+    if (errorHandler) delete errorHandler, errorHandler = nullptr;    
   }
 
 
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index 8109bf0..5100369 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -9,77 +9,50 @@
 #include "VhdlParserConstants.h"
 #include "VhdlParser.h"
 
+
 namespace vhdl {
 namespace parser {
 class VhdlParser;
 
 /** Token Manager. */
 class VhdlParserTokenManager : public TokenManager {
-   public:
+public:
 
-  /** Debug output. */
   FILE *debugStream;
-  /** Set debug output. */
-
-void  setDebugStream(FILE *ds);
-
+  void  setDebugStream(FILE *ds);
  int  jjStopAtPos(int pos, int kind);
-
  int  jjMoveStringLiteralDfa0_0();
-
  int  jjMoveStringLiteralDfa1_0(unsigned long long active0, unsigned long long active1, unsigned long long active2);
-
  int  jjMoveStringLiteralDfa2_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1, unsigned long long old2, unsigned long long active2);
-
  int  jjMoveStringLiteralDfa3_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1, unsigned long long old2, unsigned long long active2);
-
  int  jjMoveStringLiteralDfa4_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa5_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa6_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa7_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa8_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa9_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa10_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa11_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa12_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa13_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa14_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa15_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa16_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
-
  int  jjMoveStringLiteralDfa17_0(unsigned long long old1, unsigned long long active1);
-
 int jjMoveNfa_0(int startState, int curPos);
-
 bool jjCanMove_0(int hiByte, int i1, int i2, unsigned long long l1, unsigned long long l2);
-
 bool jjCanMove_1(int hiByte, int i1, int i2, unsigned long long l1, unsigned long long l2);
-
 Token * jjFillToken();
 
-public: int curLexState;
-public: int jjnewStateCnt;
-public: int jjround;
-public: int jjmatchedPos;
-public: int jjmatchedKind;
-
+public:
+    int curLexState;
+    int jjnewStateCnt;
+    int jjround;
+    int jjmatchedPos;
+    int jjmatchedKind;
 
 Token * getNextToken();
-
 void  SkipLexicalActions(Token *matchedToken);
-
 void  TokenLexicalActions(Token *matchedToken);
 #define jjCheckNAdd(state)\
 {\
@@ -111,31 +84,33 @@ void  TokenLexicalActions(Token *matchedToken);
 #ifndef JAVACC_CHARSTREAM
 #define JAVACC_CHARSTREAM CharStream
 #endif
-  private: VhdlParser*parser;
-  private: void ReInitRounds();
-  public: VhdlParserTokenManager(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
-  public: virtual ~VhdlParserTokenManager();
-  void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
+
+private:
+  void ReInitRounds();
+
+public:
+  VhdlParserTokenManager(JAVACC_CHARSTREAM *stream, int lexState = 0);
+  virtual ~VhdlParserTokenManager();
+  void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0);
   void SwitchTo(int lexState);
   void clear();
-  const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
-  const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
+  const JJSimpleString jjKindsForBitVector(int i, unsigned long long vec);
+  const JJSimpleString jjKindsForStateVector(int lexState, int vec[], int start, int end);
+
   JAVACC_CHARSTREAM*        input_stream;
   int                       jjrounds[77];
   int                       jjstateSet[2 * 77];
-  JAVACC_STRING_TYPE        jjimage;
-  JAVACC_STRING_TYPE        image;
+  JJString                  jjimage;
+  JJString                  image;
   int                       jjimageLen;
   int                       lengthOfMatch;
-  JAVACC_CHAR_TYPE          curChar;
-  TokenManagerErrorHandler* errorHandler;
-  bool                      errorHandlerCreated;
+  JJChar                    curChar;
+  TokenManagerErrorHandler* errorHandler = nullptr;
 
 public: 
   void setErrorHandler(TokenManagerErrorHandler *eh) {
-      if (errorHandlerCreated && errorHandler != NULL) delete errorHandler;
+      if (errorHandler) delete errorHandler, errorHandler = nullptr;
       errorHandler = eh;
-      errorHandlerCreated = false;
     }
     
 };
-- 
cgit v0.12


From cc4675afcc5f6825b9302fd0915c0c4148f555ab Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 3 Nov 2019 14:10:40 +0100
Subject: Fix double delete in VHDL error handler.

---
 vhdlparser/VhdlParserIF.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vhdlparser/VhdlParserIF.cpp b/vhdlparser/VhdlParserIF.cpp
index 3a6746f..676546b 100644
--- a/vhdlparser/VhdlParserIF.cpp
+++ b/vhdlparser/VhdlParserIF.cpp
@@ -34,8 +34,6 @@ void  VhdlParserIF::parseVhdlfile(const char* inputBuffer,bool inLine)
   //  fprintf(stderr,"\n\nparsed lines: %d\n",yyLineNr);
   //  fprintf(stderr,"\n\nerrors : %d\n\n",myErr->getErrorCount());
   delete myParser;
-  delete myErr;
- 
 }
 
 void VhdlParser::error_skipto(int kind)
-- 
cgit v0.12


From 7e99e9b66c48da2dfeea29f14b207a30aae62a1e Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 4 Nov 2019 12:52:39 +0100
Subject: QGDict::hashAsciiKey: Invalid null key due to empty procedure name

When having a problem like:
```
namespace eval ::tk::dialog {}
namespace eval ::tk::dialog::file {}

namespace eval ::tk::dialog::file::chooseDir {
    namespace import -force ::tk::msgcat::*
}

proc ::tk::dialog::file::chooseDir:: {args} {
}
```
This will lead to the following warnings:
```
QGDict::hashAsciiKey: Invalid null key
.../aa.tcl:9: warning: Illegal member name found.
```
this is due to the fact that the procedure name definition ends with `::` and thus actually has an empty procedure name (this is legal in TCL).
(see also: https://stackoverflow.com/questions/58683103/meaning-of-a-proc-name-ending-with).

In case of an empty name the last component is taken for the name too.
---
 src/tclscanner.l | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/tclscanner.l b/src/tclscanner.l
index 4a262bc..45ad9c0 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -535,6 +535,13 @@ static void tcl_name(const QCString &ns0, const QCString &name0, QCString &ns, Q
     ns = "";
     name = myNm;
   }
+  else if (myNm.length()-myStart == 2)
+  {
+    // ending with :: so get name equal to last component
+    ns = myNm.mid(0,myStart);
+    myStart = ns.findRev("::");
+    name = myNm.mid(myStart+2);
+  }
   else
   {
     ns = myNm.mid(0,myStart);
-- 
cgit v0.12


From f349b89d9c6f2692047848de8c0a6fa2a7f87b4d Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 4 Nov 2019 14:39:24 +0100
Subject: Spelling corrections for vhdl directory

Spelling corrections as found by codespell and in #561.

`assume_guarentee` is not a vhdl keyword, `assume_guarantee` is.
A number of spelling errors are in generated code (through javacc) and have been reported upstrean (https://github.com/javacc/javacc/pull/118)
Corection of `guarded_signal_specificatio` to `guarded_signal_specification` is not possible as `guarded_signal_specification` exists as well.
---
 vhdlparser/vhdlparser.jj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index 126118c..a3d6731 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -134,7 +134,7 @@ TOKEN [IGNORE_CASE] :
 | <ARRAY_T: "array"> {VhdlParser::setLineParsed(ARRAY_T);}
 | <ASSERT_T: "assert">
 | <ASSUME_T: "assume">
-| <ASSUME_GUARANTEE_T: "assume_guarentee">
+| <ASSUME_GUARANTEE_T: "assume_guarantee">
 | <ATTRIBUTE_T: "attribute"> {::vhdl::parser::VhdlParser::setLineParsed(ATTRIBUTE_T);}
 | <BEGIN_T: "begin">
 | <BLOCK_T: "block">
-- 
cgit v0.12


From 284188a8b2f7920653c61734ae2ff0e741a261af Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 4 Nov 2019 14:57:34 +0100
Subject: Spelling corrections for testing directory

Spelling corrections as found by codespell and in #561.

Most reported problems were already fixed, others are fixed here.
---
 testing/012/indexpage.xml | 2 +-
 testing/012_cite.dox      | 2 +-
 testing/testsqlite3.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/012/indexpage.xml b/testing/012/indexpage.xml
index c0d96e7..3ee0fc8 100644
--- a/testing/012/indexpage.xml
+++ b/testing/012/indexpage.xml
@@ -7,7 +7,7 @@
     </briefdescription>
     <detaileddescription>
       <para>See <ref refid="citelist_1CITEREF_knuth79" kindref="member">[3]</ref> for more info.</para>
-      <para>Other references with crossreference see <ref refid="citelist_1CITEREF_Be09" kindref="member">[1]</ref> and <ref refid="citelist_1CITEREF_BertholdHeinzVigerske2009" kindref="member">[2]</ref> for more info. </para>
+      <para>Other references with cross references see <ref refid="citelist_1CITEREF_Be09" kindref="member">[1]</ref> and <ref refid="citelist_1CITEREF_BertholdHeinzVigerske2009" kindref="member">[2]</ref> for more info. </para>
     </detaileddescription>
   </compounddef>
 </doxygen>
diff --git a/testing/012_cite.dox b/testing/012_cite.dox
index 2e022de..6cec0cf 100644
--- a/testing/012_cite.dox
+++ b/testing/012_cite.dox
@@ -5,5 +5,5 @@
 /** \mainpage
  *  See \cite knuth79 for more info.
  *  
- *  Other references with crossreference see \cite Be09 and \cite BertholdHeinzVigerske2009 for more info.
+ *  Other references with cross references see \cite Be09 and \cite BertholdHeinzVigerske2009 for more info.
  */
diff --git a/testing/testsqlite3.py b/testing/testsqlite3.py
index e8ab16c..b4227b4 100755
--- a/testing/testsqlite3.py
+++ b/testing/testsqlite3.py
@@ -6,7 +6,7 @@ import sys
 import getopt
 
 # map XML attributes/elements to SQL rows
-# --POC: iterate through the children and attributes of the memberdef elelement
+# --POC: iterate through the children and attributes of the memberdef element
 #        and search it in doxygen_sqlite3.db
 
 g_conn=None
-- 
cgit v0.12


From 812122864c7474e434606a3377deead0defb0be0 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 4 Nov 2019 15:14:21 +0100
Subject: Spelling corrections for templates directory

Spelling corrections as found by codespell and in #561.

One reported problem was already fixed, others are fixed here.
---
 templates/html/htmllayout.tpl          | 2 +-
 templates/html/htmltypeconstraints.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/html/htmllayout.tpl b/templates/html/htmllayout.tpl
index a40bdbc..b434d0c 100644
--- a/templates/html/htmllayout.tpl
+++ b/templates/html/htmllayout.tpl
@@ -98,7 +98,7 @@
 {# write the file sources #}
 {% for compound in fileList %}
   {% with page=compound %}
-    {# TODO: to deal with clang optimisation, we need to write the sources in a different order! #}
+    {# TODO: to deal with clang optimization, we need to write the sources in a different order! #}
     {% if compound.hasSourceFile %}
       {% create compound.sourceFileName|append:config.HTML_FILE_EXTENSION from 'htmlsource.tpl' %}
     {% endif %}
diff --git a/templates/html/htmltypeconstraints.tpl b/templates/html/htmltypeconstraints.tpl
index b5a8cd0..ccb3579 100644
--- a/templates/html/htmltypeconstraints.tpl
+++ b/templates/html/htmltypeconstraints.tpl
@@ -1,6 +1,6 @@
 {# obj should be a class or member #}
 {% if obj.typeConstraints %}
-  <div class="typecontraint">
+  <div class="typeconstraint">
   <dl><dt><b>{{ tr.typeConstraints }}</b></dt>
   <dd><table border="0" cellspacing="2" cellpadding="0">
   {% for arg in obj.typeConstraints %}
-- 
cgit v0.12


From 4ca56cd603207078dfc1b793586aee1be3a6e4c1 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 4 Nov 2019 15:31:56 +0100
Subject: Spelling corrections for examples directory

Spelling corrections as found by codespell and in #561.

The dbusxml.xml file is not part of the doxygen distribution anymore.
Other problems are fixed here.
---
 examples/templ.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/templ.cpp b/examples/templ.cpp
index 9ed48fb..e790684 100644
--- a/examples/templ.cpp
+++ b/examples/templ.cpp
@@ -27,9 +27,9 @@ template<class T,int i> Test<T,i>::Test() {}
 /*! The copy constructor */
 template<class T,int i> Test<T,i>::Test(const Test &t) {}
 
-/*! The constructor of the partial specilization */
+/*! The constructor of the partial specialization */
 template<class T> Test<T *>::Test() {}
 
-/*! The constructor of the specilization */
+/*! The constructor of the specialization */
 template<> Test<void *,200>::Test() {}
 
-- 
cgit v0.12


From 5ff3c02602652e60f5787e8b988f7b279f649d3e Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 4 Nov 2019 20:03:08 +0100
Subject: Spelling corrections for doc directory

Spelling corrections as found by codespell and in #561.

Some reported problems were already fixed, others are fixed here.
Theer are a few that are not corrected as they signal a documentation correction.
---
 doc/changelog.doc | 300 +++++++++++++++++++++++++++---------------------------
 doc/htmlcmds.doc  |   2 +-
 doc/translator.py |   4 +-
 3 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/doc/changelog.doc b/doc/changelog.doc
index e87c7ce..96652eb 100644
--- a/doc/changelog.doc
+++ b/doc/changelog.doc
@@ -178,7 +178,7 @@
 <li>Forgot to comment out debug print [<a href="https://github.com/doxygen/doxygen/commit/9ef21db5efbd521c570121cc7638de8d4d487536">view</a>]</li>
 <li>Give warning when a retval is used multiple times [<a href="https://github.com/doxygen/doxygen/commit/e6fb6ea2017e3245a6b45b6c8e73472829215b09">view</a>]</li>
 <li>Handling digraph versus label [<a href="https://github.com/doxygen/doxygen/commit/f3a08615439a4e82f14a5dc9d1a758b401905e30">view</a>]</li>
-<li>High consequence coverity mesages [<a href="https://github.com/doxygen/doxygen/commit/5059d796ea951d06cebc55f1a9158a8dd001af0e">view</a>]</li>
+<li>High consequence coverity messages [<a href="https://github.com/doxygen/doxygen/commit/5059d796ea951d06cebc55f1a9158a8dd001af0e">view</a>]</li>
 <li>Image not seen as svg image [<a href="https://github.com/doxygen/doxygen/commit/a3d574ecf12c71bc25579b38670f17ef663b82a6">view</a>]</li>
 <li>Implement a new EXTRACT_PRIVATE_VIRTUAL option. [<a href="https://github.com/doxygen/doxygen/commit/d18b3eaf3486e224fa9de7e77b536883952b40b9">view</a>]</li>
 <li>Implementing `&lt;hr&gt;` for LaTeX [<a href="https://github.com/doxygen/doxygen/commit/dbddf36cd10c3e6cd9419a08d688f8cbfd57f9c3">view</a>]</li>
@@ -224,7 +224,7 @@
 <li>Option for &#39;input buffer overflow&#39; [<a href="https://github.com/doxygen/doxygen/commit/efc67de9d1a4e36ab94164352778fd19f33652b3">view</a>]</li>
 <li>Option syntax for commands is unclear [<a href="https://github.com/doxygen/doxygen/commit/9ecbe35ae2826b2404f37cc7e5d4377e39430b51">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/bd645c0e3ee05582adf30dcd91af5eafec7733c4">view</a>]</li>
 <li>PLANTUML_RUN_JAVA_ONCE is working well.  But some specific plantuml has error on ver 1.8.15 [<a href="https://github.com/doxygen/doxygen/commit/aeff95e38dca51f4a9ace9af8aa0387ad683f7f0">view</a>]</li>
-<li>Portuguse translators updated to Doxygen 1.8.16. [<a href="https://github.com/doxygen/doxygen/commit/6b4fd5000c6f6787155743dc93d67a249ca2b881">view</a>]</li>
+<li>Portuguese translators updated to Doxygen 1.8.16. [<a href="https://github.com/doxygen/doxygen/commit/6b4fd5000c6f6787155743dc93d67a249ca2b881">view</a>]</li>
 <li>Possibility to show converted fixed form [<a href="https://github.com/doxygen/doxygen/commit/1659f94a4c8acff1c2564226db21afbd2bc04736">view</a>]</li>
 <li>Problem with just an asterisks on a `\code` line [<a href="https://github.com/doxygen/doxygen/commit/3088ae34eda1fbeab287e2271a7f1804de2c784f">view</a>]</li>
 <li>Problem with with comment recognition for group open and closing commands [<a href="https://github.com/doxygen/doxygen/commit/ef5af7618fbec3ac240e7a1099607d9ff2b3cc4f">view</a>]</li>
@@ -306,7 +306,7 @@ href="https://github.com/doxygen/doxygen/commit/9d83d43f0d8b7058e2f89371a6ab276c
 <li>constexp.l: group the flex options [<a href="https://github.com/doxygen/doxygen/commit/306e3051b1374cf180b1464700ae79662ced95c2">view</a>]</li>
 <li>constexp.y: drop the = from name-prefix [<a href="https://github.com/doxygen/doxygen/commit/a18e967baabf5a9a234627e677d866bcf45741d4">view</a>]</li>
 <li>declinfo.l: enable reentrant [<a href="https://github.com/doxygen/doxygen/commit/2513172db2942a364e8af4a0d21d0fb2de328af1">view</a>]</li>
-<li>declinfo.l: group flex options toghether [<a href="https://github.com/doxygen/doxygen/commit/49c97e860a97615995eed4f58dec58d9a2a9339f">view</a>]</li>
+<li>declinfo.l: group flex options together [<a href="https://github.com/doxygen/doxygen/commit/49c97e860a97615995eed4f58dec58d9a2a9339f">view</a>]</li>
 <li>declinfo.l: move function declarations before [<a href="https://github.com/doxygen/doxygen/commit/44f678794f5338881620525a5e0fbe25962c7690">view</a>]</li>
 <li>delayed creation and update of .md5 files after successful creation of output files [<a href="https://github.com/doxygen/doxygen/commit/572035ffcd0e4f7313bab23d375d63008ebbe5a3">view</a>], [<a href="http://github.com/doxygen/doxygen/commit/9dda0c6ddc5117f800afcb19fb8c6be031fe6c27">view</a>]</li>
 <li>do not clobber version placeholder [<a href="https://github.com/doxygen/doxygen/commit/faafe83a69d2f3c27daca0974c9a063bdb81ecdc">view</a>]</li>
@@ -664,7 +664,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Problems and some enhancements for LaTeX tables [<a href="https://github.com/doxygen/doxygen/commit/d984f7dd21863fc01a1a6ede0878d3dd14af157a">view</a>]</li>
 <li>RTF layout regarding References and Referenced by [<a href="https://github.com/doxygen/doxygen/commit/c90505681054d51da05fd476d08c610d3e20ca38">view</a>]</li>
 <li>RTF lists more levels and removing extra paragraphs [<a href="https://github.com/doxygen/doxygen/commit/8fc23878b4375546bfb6a9149f009fbe0f7da42f">view</a>]</li>
-<li>Readded missing &quot;Span&quot; case to DocStyleChange::styleString [<a href="https://github.com/doxygen/doxygen/commit/6a3d1b3d12e353d0c6ebd642b691e5e2608f8df2">view</a>]</li>
+<li>Re-added missing &quot;Span&quot; case to DocStyleChange::styleString [<a href="https://github.com/doxygen/doxygen/commit/6a3d1b3d12e353d0c6ebd642b691e5e2608f8df2">view</a>]</li>
 <li>Redundant whitespace removal breaks some C++ links [with test case and Git bisect] (Origin: bugzilla #791942) [<a href="https://github.com/doxygen/doxygen/commit/449a7e2b4ff114a72be573013558bae19672ebbc">view</a>]</li>
 <li>Refactored code a bit [<a href="https://github.com/doxygen/doxygen/commit/4ed08b969b575d6dc1a49bca936a43eb43d337e2">view</a>]</li>
 <li>Refactored code a bit (use const references and made global functions members) [<a href="https://github.com/doxygen/doxygen/commit/3820f6a841115bd66ed409221c73824ec41ae6ab">view</a>]</li>
@@ -766,7 +766,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6139">6139</a> - Menu does not work without Javascript [<a href="https://github.com/doxygen/doxygen/commit/1be97720b7820361e85242d08d4cac3e46570bfe">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6141">6141</a> - Too greedy behavior of @ref const matching [<a href="https://github.com/doxygen/doxygen/commit/04001c8926fb0f37dfcf284b3637b182125bba75">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6169">6169</a> - doxygen build fails [<a href="https://github.com/doxygen/doxygen/commit/bb5c8dd29782ecbb05a4ef9788f2507e9a156848">view</a>]</li>
-<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6170">6170</a> - Add &quot;\~&quot; command to internatioalization article [<a href="https://github.com/doxygen/doxygen/commit/e204b982eebd54bd15148a520da6608935e33e50">view</a>]</li>
+<li>Bug <a href="https://github.com/doxygen/doxygen/issues/6170">6170</a> - Add &quot;\~&quot; command to internationalization article [<a href="https://github.com/doxygen/doxygen/commit/e204b982eebd54bd15148a520da6608935e33e50">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6223">6223</a> - Problem RTF output: The class list &quot;classes&quot; within the namespace report is wrong indicated. [<a href="https://github.com/doxygen/doxygen/commit/753c06281f6b2e9172c449157fc9f863063232e3">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/6238">6238</a> - parsing error in Fortran file with preprocessing [<a href="https://github.com/doxygen/doxygen/commit/2f5e22a4be9d237a150d04659bf6abec1349fbd9">view</a>]
 , [<a href="https://github.com/doxygen/doxygen/commit/ec12eb659d8c8e78ad4bb15d1a941ac3153a0f66">view</a>]</li>
@@ -844,7 +844,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Use hidden symbol visibility by default [<a href="https://github.com/doxygen/doxygen/commit/dcb3b2d0b888902a062eefd8200ea194ed1c42d6">view</a>]</li>
 <li>Use language identifier instead of file extension for language attribute [<a href="https://github.com/doxygen/doxygen/commit/ed9acb6e1bb81a2eec334180f7b8c1bf0598b444">view</a>]</li>
 <li>Use language in stead of lang for language name attribute [<a href="https://github.com/doxygen/doxygen/commit/4e4741221f4290412ef4a6b6bbfe9799abafaf6c">view</a>]</li>
-<li>Update of the Brazillian translation [<a href="https://github.com/doxygen/doxygen/commit/d283dfcdcaa0837e84d7995676d436fa04e96d1f">view</a>]</li>
+<li>Update of the Brazilian translation [<a href="https://github.com/doxygen/doxygen/commit/d283dfcdcaa0837e84d7995676d436fa04e96d1f">view</a>]</li>
 <li>[preprocessing.doc] typo amended [<a href="https://github.com/doxygen/doxygen/commit/6b67a64bd0bd1c6759294c323433dbd7d37df6ac">view</a>]</li>
 <li>add decimal to base identifier [<a href="https://github.com/doxygen/doxygen/commit/9cbc1a04e584e83d91ff3f7501f38b0a825e1953">view</a>]</li>
 <li>add the number of conditionals path and bugfix [<a href="https://github.com/doxygen/doxygen/commit/20af63f43e583a31dfe93f78807aa868f9b9ff14">view</a>]</li>
@@ -944,7 +944,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/1662">1662</a> - Fix missing title in non-page docanchors from tag files [<a href="https://github.com/doxygen/doxygen/commit/616b392e9bc8984251d969577a5b63974efb1eef">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/2763">2763</a> - FILTER_PATTERNS won&#39;t take command with arguments [<a href="https://github.com/doxygen/doxygen/commit/ce7a983c2849e4c8fa72189a896e594a8497dd4c">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/4691">4691</a> - Uses &lt;img&gt; instead of &lt;object&gt; html tag for SVG images [<a href="https://github.com/doxygen/doxygen/commit/8ccd98643a3b88aaa3245b76202666900a2cd401">view</a>]</li>
-<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5174">5174</a> - error state 21 with fortran code (fixed format) [<a href="https://github.com/doxygen/doxygen/commit/fdee5e9fade0ff5a578817048c6205f2a9acbced">view</a>]</li>
+<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5174">5174</a> - error state 21 with Fortran code (fixed format) [<a href="https://github.com/doxygen/doxygen/commit/fdee5e9fade0ff5a578817048c6205f2a9acbced">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5323">5323</a> - Missing Page References in the Index Chapters of the LaTex/PDF output [<a href="https://github.com/doxygen/doxygen/commit/efd49dacfbae1ad55d7922a748e2c1d60068b014">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5411">5411</a> - Inherited member of template class issues warning and is not documented [<a href="https://github.com/doxygen/doxygen/commit/4dfc5887660284b345eb93b6c07dc1f91e780fac">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5711">5711</a> - Fortran: attributes after a blank line are ignored / Bug <a href="https://github.com/doxygen/doxygen/issues/3880">3880</a> - FORTRAN: comment in subroutine argument list [<a href="https://github.com/doxygen/doxygen/commit/e9ebf43585bffee80c31dd69538feae2a4525178">view</a>]</li>
@@ -959,7 +959,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5933">5933</a> - Phantom variables/functions in XML, created from non-code files [<a href="https://github.com/doxygen/doxygen/commit/7dc9b378a107b1ccae2245b3f3f3d628db2bd008">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5937">5937</a> - CASE_SENSE_NAMES ignored [<a href="https://github.com/doxygen/doxygen/commit/fab854a10f358c15a69291a59388ea0c184bce20">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5938">5938</a> - Spaces between the closing bracket of the typename and the opening bracket of the parameter list cause detection issues. [<a href="https://github.com/doxygen/doxygen/commit/622d18637f9d633b184e43fd3594b661cf4e9375">view</a>]</li>
-<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5941">5941</a> - python unicode docstrings are ignored [<a href="https://github.com/doxygen/doxygen/commit/936f242956350825d870f7396ae5d6106fe3081d">view</a>]
+<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5941">5941</a> - python Unicode docstrings are ignored [<a href="https://github.com/doxygen/doxygen/commit/936f242956350825d870f7396ae5d6106fe3081d">view</a>]
 , [<a href="https://github.com/doxygen/doxygen/commit/be100f882604a23d94025fee6d059bdb5ec28d3e">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5945">5945</a> - Do not allow ligatures in log output [<a href="https://github.com/doxygen/doxygen/commit/894bdfdf268ba24a268fa72d7b33899a9f3a126b">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5958">5958</a> - References for one function can inherit References from subsequent non documented function [<a href="https://github.com/doxygen/doxygen/commit/9abcad810b8d41d338d501ff5b32524e1ced7f33">view</a>]</li>
@@ -977,7 +977,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5981">5981</a> - quick link index in alphabetical class list in classes.html doesn&#39;t work [<a href="https://github.com/doxygen/doxygen/commit/ec1ef7b4971540bbe042b16d7ebd3f2a0e0e57f1">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5982">5982</a> - Bad character escaping scheme in HTML anchor generation. [<a href="https://github.com/doxygen/doxygen/commit/6136cf9e3ad70d58cac4d8022cce8c8729805119">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5983">5983</a> - `@addindex`entries fail to link to the exact location in Compiled HTML Help. [<a href="https://github.com/doxygen/doxygen/commit/8dea6e11faf3969c3b6b17b700533f43c9ca73f8">view</a>]</li>
-<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5985">5985</a> - Java: final keyword on a parameter brakes docs inherinance [<a href="https://github.com/doxygen/doxygen/commit/dfd0336f1a97e189d49e29860db1c43915aced76">view</a>]</li>
+<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5985">5985</a> - Java: final keyword on a parameter brakes docs inheritance [<a href="https://github.com/doxygen/doxygen/commit/dfd0336f1a97e189d49e29860db1c43915aced76">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5991">5991</a> - Using `@page` to add title to Markdown file generates surplus empty page. [<a href="https://github.com/doxygen/doxygen/commit/42c7d88ffc11651d1fb6b997fd23cc938bce4a39">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5998">5998</a> - DOT_PATH not expanded [<a href="https://github.com/doxygen/doxygen/commit/752523cd122d6ffdd72c89955005d77819740675">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5999">5999</a> - Files with incorrect extensions (.doc) are picked up by doxygen [<a href="https://github.com/doxygen/doxygen/commit/14b04be2af279e1093f17d6b933d1e9ab530e128">view</a>]</li>
@@ -1023,17 +1023,17 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Documentation for extensions .f95, .f03 and .f08 [<a href="https://github.com/doxygen/doxygen/commit/4c2e91c10dc6d007c410cd282a00fc7a42d38a0d">view</a>]</li>
 <li>Doxygen fails to copy logo image to LaTex output dir [<a href="https://github.com/doxygen/doxygen/commit/711c6c0bee87d47d70b3ffa9ca8b39b704e91723">view</a>]</li>
 <li>FORTRAN determination string in preprocessing [<a href="https://github.com/doxygen/doxygen/commit/4a7673fed2f28a24e0c7e8bb94621b0e14ac9ed5">view</a>]</li>
-<li>Feature: Translations for german language (changes since 1.8.4) [<a href="https://github.com/doxygen/doxygen/commit/261077497f2bcc3364e182e338d914c470a0a235">view</a>]</li>
+<li>Feature: Translations for German language (changes since 1.8.4) [<a href="https://github.com/doxygen/doxygen/commit/261077497f2bcc3364e182e338d914c470a0a235">view</a>]</li>
 <li>Fix STRIP_FROM_PATH when running from drive root [<a href="https://github.com/doxygen/doxygen/commit/fd808ae3c1e37a8d476d250cf6b4325624a9eccb">view</a>]</li>
 <li>Fix Windows build instructions. [<a href="https://github.com/doxygen/doxygen/commit/eec8d0a31161746041fc94ccbba5a54aecd8cf93">view</a>]</li>
 <li>Fix documentation typos [<a href="https://github.com/doxygen/doxygen/commit/770adb37b2072bbea5412f9cc2058d98d1de60e4">view</a>]</li>
 <li>Fix for HTML output when using server side search and the new menu bar [<a href="https://github.com/doxygen/doxygen/commit/0faf45600c6c640bfaf11b017d43a4b9de193ebf">view</a>]</li>
-<li>Fix for changed references due to different removeRedudantWhiteSpace() implementation [<a href="https://github.com/doxygen/doxygen/commit/f26cc41d0d3d436c809c293a56c66c1f5f953745">view</a>]</li>
+<li>Fix for changed references due to different removeRedundantWhiteSpace() implementation [<a href="https://github.com/doxygen/doxygen/commit/f26cc41d0d3d436c809c293a56c66c1f5f953745">view</a>]</li>
 <li>Fix for empty file name [<a href="https://github.com/doxygen/doxygen/commit/0fead5249b8ef2c3c5cbbbd712855bae877aa27b">view</a>]</li>
 <li>Fix for error in travis.yml [<a href="https://github.com/doxygen/doxygen/commit/81cf39f249c58db66368d60d596ac164d886ae90">view</a>]</li>
 <li>Fix issue escaping backslash inside markdown style code span [<a href="https://github.com/doxygen/doxygen/commit/402970f77f961b85b6371c8e53bd69981435c2d7">view</a>]</li>
 <li>Fix linker flags for building with clang on Windows [<a href="https://github.com/doxygen/doxygen/commit/41846b467bea58b904e26ce139394f7371ea5870">view</a>]</li>
-<li>Fix order of member initilaization [<a href="https://github.com/doxygen/doxygen/commit/6b1ebb6bcb345d8997054492c21276dc2dc36416">view</a>]</li>
+<li>Fix order of member initialization [<a href="https://github.com/doxygen/doxygen/commit/6b1ebb6bcb345d8997054492c21276dc2dc36416">view</a>]</li>
 <li>Fix return-type warnings with -DNDEBUG [<a href="https://github.com/doxygen/doxygen/commit/f4574baf118da6aa2051b865040a9948bb0d22c9">view</a>]</li>
 <li>Fix search box rendering in HTML when menu bar is disabled [<a href="https://github.com/doxygen/doxygen/commit/ee9a0664c03c306d0aeb127295ced29f8078ae03">view</a>]</li>
 <li>Fix uppercase letters B-Z being unnecessarily escaped in index HTML anchors. [<a href="https://github.com/doxygen/doxygen/commit/0f699ab17cb88beff0ae4aa9b10042c0ccaff937">view</a>]</li>
@@ -1209,7 +1209,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Moved creation of inline class documentation to separate template file [<a href="https://github.com/doxygen/doxygen/commit/4bd50c9f0dc1d7b1413a6bda587b8a5999cd7a19">view</a>]</li>
 <li>RTF improvement: Example section was merged with next function title [<a href="https://github.com/doxygen/doxygen/commit/ca617e1e1cd42ee0080c8c13ce3884c8671629dd">view</a>]</li>
 <li>Remove obsolete py files [<a href="https://github.com/doxygen/doxygen/commit/183f36fe97cb95636f1947c2c4be61f7b78f87e0">view</a>]</li>
-<li>Removed BOM marker from greek translator to avoid Visual C warnings [<a href="https://github.com/doxygen/doxygen/commit/9ee8f777f5a4b7a49e644c2da5247fa509038feb">view</a>]</li>
+<li>Removed BOM marker from Greek translator to avoid Visual C warnings [<a href="https://github.com/doxygen/doxygen/commit/9ee8f777f5a4b7a49e644c2da5247fa509038feb">view</a>]</li>
 <li>Repaired breaking @include for LaTeX output [<a href="https://github.com/doxygen/doxygen/commit/ab861c197c596f78c7aea4f45c0e1252de10fc1f">view</a>]</li>
 <li>Revert &quot;Spelling correction for error message with USE_HTAGS usage&quot; [<a href="https://github.com/doxygen/doxygen/commit/a888543ca5f3fd28121f7eea4dbd25898fa7be57">view</a>]</li>
 <li>Revert using container-based infra as sudo is needed :-( [<a href="https://github.com/doxygen/doxygen/commit/f089c3fa4f47dc8bedd25d9d857d004525ee82c0">view</a>]</li>
@@ -1236,7 +1236,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Using tabu package for LaTeX tables [<a href="https://github.com/doxygen/doxygen/commit/647b6ac8669cd8ba1e8c60eeb3c2de961c7d6a1b">view</a>]</li>
 <li>[Bug <a href="https://github.com/doxygen/doxygen/issues/5872">5872</a>] On Windows, generated layout is with UNIX EOL [<a href="https://github.com/doxygen/doxygen/commit/78a80001223af290c7c7321ad2d210fb3cd16f11">view</a>]</li>
 <li>[Doxygen-users] plugin / filter not behaving as expected [<a href="https://github.com/doxygen/doxygen/commit/0c7f182016c7c2604a484367738e76cb40c0541b">view</a>]</li>
-<li>add spaces like &quot;Doyxgen&quot;CN_SPC-&gt;&quot;Doyxgen&quot; CN_SPC [<a href="https://github.com/doxygen/doxygen/commit/35d1aa8bf9208302601fa96462e246c98aa0b0e5">view</a>]</li>
+<li>add spaces like &quot;Doxygen&quot;CN_SPC-&gt;&quot;Doxygen&quot; CN_SPC [<a href="https://github.com/doxygen/doxygen/commit/35d1aa8bf9208302601fa96462e246c98aa0b0e5">view</a>]</li>
 <li>allow building with custom iconv on Windows [<a href="https://github.com/doxygen/doxygen/commit/3d684f6d123abdbf630bb19bc6095cc9d69efb68">view</a>]</li>
 <li>doc: generate doxygen&#39;s documentation. [<a href="https://github.com/doxygen/doxygen/commit/3c4a1ea2ee56f2604c2277f13737d53b3a0b0353">view</a>]</li>
 <li>doc: put man pages under share/man/man1 [<a href="https://github.com/doxygen/doxygen/commit/95d28153779810dc95afafa38ed838f32516a1f4">view</a>]</li>
@@ -1293,7 +1293,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5720">5720</a> - &lt;CAPTION&gt; inside &lt;TABLE&gt; no longer works for LaTex output [<a href="https://github.com/doxygen/doxygen/commit/0599f92d06ff433446f34136ffe2f3d65d6bd109">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5726">5726</a> - Duplicate anchors from tagfiles [<a href="https://github.com/doxygen/doxygen/commit/1f21c23c57c91ba6901c0de38bb236f7246e88c9">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5727">5727</a> - Tagfile anchors not generated for enumeration values [<a href="https://github.com/doxygen/doxygen/commit/1d4f37cb13a75ca8bdc49be3558438104e7eef19">view</a>]</li>
-<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5728">5728</a> - Non-ascii characters are not emphasised [<a href="https://github.com/doxygen/doxygen/commit/8f67d4f63efd45b0d38502bdf68987d7fc1e92e9">view</a>]</li>
+<li>Bug <a href="https://github.com/doxygen/doxygen/issues/5728">5728</a> - Non-ascii characters are not emphasized [<a href="https://github.com/doxygen/doxygen/commit/8f67d4f63efd45b0d38502bdf68987d7fc1e92e9">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5744">5744</a> - Using TAGFILES prevents symbol extraction [<a href="https://github.com/doxygen/doxygen/commit/a735498be5a572236755cc3da65bf4774cbac25c">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5753">5753</a> - PATCH: please consider making doxygen output byte for byte identical between individual runs by default [<a href="https://github.com/doxygen/doxygen/commit/3f2e8a3067712b025623e4420e6eb161febfd42b">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5754">5754</a> - Doxygen generates bad &quot;More...&quot; file links for functions within a namespace [<a href="https://github.com/doxygen/doxygen/commit/ea202be55d68af33917658e3fec169da3a7fa7a8">view</a>]</li>
@@ -1518,9 +1518,9 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5690">5690</a> - Crash when building gtkmm documentation [<a href="https://github.com/doxygen/doxygen/commit/050fce2b73d6e4455808ab86da2fddcf2f26e9b5">view</a>]</li>
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5694">5694</a> - \cite confused by labels ending with a dot (improved warning message) [<a href="https://github.com/doxygen/doxygen/commit/78fd02dc41384d81baddf17ff0bb3431267452fc">view</a>]</li>
 <li>fix docbook output [<a href="https://github.com/doxygen/doxygen/commit/1a403d80160458091bab7c442e54f836c0b90bca">view</a>]
-    <ol><li>support other than english</li>
+    <ol><li>support other than English</li>
         <li>fix broken example link id</li>
-        <li>fix incomplete TOC : no Classe etc.</li>
+        <li>fix incomplete TOC : no Classes etc.</li>
         <li>add brief description for Functions etc.</li>
         <li>Comply with REPEAT_BRIEF </li>
         <li>Do not output duplicated contents when detailed description is missing.</li>
@@ -1793,7 +1793,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Bug <a href="https://github.com/doxygen/doxygen/issues/5456">5456</a> - Crash on \addindex \term [<a href="https://github.com/doxygen/doxygen/commit/653a2a8b123b79835af9f684f8b92ef7f88712aa">view</a>]</li>
 <li>A new files have been added but is not incorporated in the windows build part [<a href="https://github.com/doxygen/doxygen/commit/d9dd873e25fba968ddcbcc79d6643f5df669b626">view</a>]</li>
 <li>Add docbook directory to be removed as well [<a href="https://github.com/doxygen/doxygen/commit/08ea10029e705a388ab14ee29544d496a203f23f">view</a>]</li>
-<li>Add extra (documenattion) directories to ignore pattern [<a href="https://github.com/doxygen/doxygen/commit/db358b1f219fecf0d7df96d8c70b47b245471c66">view</a>]</li>
+<li>Add extra (documentation) directories to ignore pattern [<a href="https://github.com/doxygen/doxygen/commit/db358b1f219fecf0d7df96d8c70b47b245471c66">view</a>]</li>
 <li>Add index support to context [<a href="https://github.com/doxygen/doxygen/commit/12cd22f4c32ed8b92da7b5a03181aa6735018a5b">view</a>]</li>
 <li>Add line numbers in case comment is not closed properly. [<a href="https://github.com/doxygen/doxygen/commit/b1d513b2ac65fe26ceec2fa494867713efa01cd5">view</a>]</li>
 <li>Add template context for annotated class index [<a href="https://github.com/doxygen/doxygen/commit/9434ecb13e1f3e2901b78d3e41e7f1d7d9469434">view</a>]</li>
@@ -1832,7 +1832,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Fix id parsing for atx markdown headers [<a href="https://github.com/doxygen/doxygen/commit/ee830bb8888535ac48c0c4fd90580542e7f70481">view</a>]</li>
 <li>Fix segfault on invalid bounding FIG when patching dot [<a href="https://github.com/doxygen/doxygen/commit/1bd2e38a2ce2d0823557381c48fe47cb53d6fba8">view</a>]</li>
 <li>Fix to VHDL scanner. [<a href="https://github.com/doxygen/doxygen/commit/5ca7d423a11337d5c31082f52a287a3dc0986642">view</a>]</li>
-<li>Fix typos in russian translation [<a href="https://github.com/doxygen/doxygen/commit/8ce2b0d7aec1d4398b5b4f365a7d3abbe75daf5f">view</a>]</li>
+<li>Fix typos in Russian translation [<a href="https://github.com/doxygen/doxygen/commit/8ce2b0d7aec1d4398b5b4f365a7d3abbe75daf5f">view</a>]</li>
 <li>Fixed Tidy&#39;s &#39;empty span&#39; warning in HTML output [<a href="https://github.com/doxygen/doxygen/commit/8cfac90d6c8632436db1a6b650a05a8dfcfab5d0">view</a>]</li>
 <li>Fixed compiler warnings in section.h [<a href="https://github.com/doxygen/doxygen/commit/683ef76f7bf1ba929f9c263064bb5f6c8e377275">view</a>]</li>
 <li>Fixed difference between generated XML schema and XML files for HTML entities [<a href="https://github.com/doxygen/doxygen/commit/836af2f9510d10f2dd7d832025f214983387b3c6">view</a>]</li>
@@ -1847,7 +1847,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Fixed typo in doxyindexer.vcproj [<a href="https://github.com/doxygen/doxygen/commit/2bc8a820b3e2fefaedb10a3129eed35581a1ea5b">view</a>]</li>
 <li>Fixes for missing build dependencies [<a href="https://github.com/doxygen/doxygen/commit/62379ff8fdb13d95c7651419d92db47150e15bcc">view</a>]</li>
 <li>Give message when PROJECT_LOGO cannot be found or cannot be converted [<a href="https://github.com/doxygen/doxygen/commit/164864d9bc8ea7e32a69fbc0e47cff54dc678a48">view</a>]</li>
-<li>Handlingh of -- by \c and &lt;code&gt; results in - adjusted documentation [<a href="https://github.com/doxygen/doxygen/commit/73d12cc5cf0656e94125baea62cdb19b67908b3d">view</a>]</li>
+<li>Handling of -- by \c and &lt;code&gt; results in - adjusted documentation [<a href="https://github.com/doxygen/doxygen/commit/73d12cc5cf0656e94125baea62cdb19b67908b3d">view</a>]</li>
 <li>Improve rendering of sub and superscripts in LaTeX [<a href="https://github.com/doxygen/doxygen/commit/a7c7f36ea2a67969bf3916c7600fe487e34438c0">view</a>]</li>
 <li>Improved handling of percent symbol [<a href="https://github.com/doxygen/doxygen/commit/0e080f486f67008ef427c834f6ab6ebca7578124">view</a>]</li>
 <li>Improved performance of rendering large index pages, by replacing images in the tables by spans [<a href="https://github.com/doxygen/doxygen/commit/956a7fb004e72923f737e387d053812f99b7bda2">view</a>]</li>
@@ -1893,7 +1893,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>Use hook arrow for hyphens in symbol names in the LaTeX output. [<a href="https://github.com/doxygen/doxygen/commit/ac813134a85ba9bd999fb4cf8271c74e02cd4ebb">view</a>]</li>
 <li>Wrong UTF 8 codes [<a href="https://github.com/doxygen/doxygen/commit/fd4beb272e5f1a760a71ab8d85463b8356c6f786">view</a>]</li>
 <li>Fix broken links to subpages in LaTeX output [<a href="https://github.com/doxygen/doxygen/commit/10189681dcb46e543a287827e2096cef3dbc42ae">view</a>]</li>
-<li>\xmlonly aoppeared twice in see also section of \htmlonly and \docbookonly [<a href="https://github.com/doxygen/doxygen/commit/f1cdb27194dd180f1bff1fbdd87874bb0d15758d">view</a>]</li>
+<li>\xmlonly appeared twice in see also section of \htmlonly and \docbookonly [<a href="https://github.com/doxygen/doxygen/commit/f1cdb27194dd180f1bff1fbdd87874bb0d15758d">view</a>]</li>
 <li>add css-escape to avoid jquery based xss [<a href="https://github.com/doxygen/doxygen/commit/7fea82094723ecfb4e9b3ea6819137b99d7dfa9c">view</a>]</li>
 <li>add parameter [<a href="https://github.com/doxygen/doxygen/commit/c5bc9fc8c407aac845d594b2685d0c92699727d8">view</a>]</li>
 <li>add search.py, a client for doxygen_sqlite3.db [<a href="https://github.com/doxygen/doxygen/commit/697ac97aad7fa045b6cc205050b69cf3f22408ad">view</a>]</li>
@@ -2004,7 +2004,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li> Allow links to other markdown pages of the form [link text](page.md)</li>
 <li> Avoid accessing uninitialized memory in fileToString</li>
 <li> Build problem with unistd.h and Cygwin The standard g++ compiler under windows (win32-g++) has unistd.gh file; Microsoft windows does not have it, therefore it is better to use the winbuild directory in case of windows and no dependency otherwise</li>
-<li> Consistency in language part of the documentation Made documentation more inline with other parts of the documentation (regarding the way e.g. filenames are presented) Corrected some spelling errors Corrected the warning in the language.doc by placing ta reference to the files from which language.doc is generated Corrected the color for the languages that are still v1.4.6 (language name now also red  in stead of a pink background, was confusing with languages that were 1.5 / 1.6 compatible)</li>
+<li> Consistency in language part of the documentation Made documentation more inline with other parts of the documentation (regarding the way e.g. filenames are presented) Corrected some spelling errors Corrected the warning in the language.doc by placing a reference to the files from which language.doc is generated Corrected the color for the languages that are still v1.4.6 (language name now also red  in stead of a pink background, was confusing with languages that were 1.5 / 1.6 compatible)</li>
 <li> Corrected some inconsistencies in the comments</li>
 <li> Debug output for lexical analyzer</li>
 <li> Deleted generated files from source repository</li>
@@ -2109,7 +2109,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li> Bug <a href="https://github.com/doxygen/doxygen/issues/5225">5225</a> - Segmentation fault parsing a fortran file</li>
 <li> Bug <a href="https://github.com/doxygen/doxygen/issues/5226">5226</a> - Can't use @ref instead of \ref with msc</li>
 <li> Bug <a href="https://github.com/doxygen/doxygen/issues/5228">5228</a> - Misleading warning about DOT font</li>
-<li> Bug <a href="https://github.com/doxygen/doxygen/issues/5233">5233</a> - Out-of-line docs for class template specialisations failing</li>
+<li> Bug <a href="https://github.com/doxygen/doxygen/issues/5233">5233</a> - Out-of-line docs for class template specializations failing</li>
 <li> Bug <a href="https://github.com/doxygen/doxygen/issues/5234">5234</a> - Generated XML is malformed</li>
 <li> Bug <a href="https://github.com/doxygen/doxygen/issues/5239">5239</a> - Nested Aliases fail when the nested alias has two or more arguments.</li>
 <li> Bug <a href="https://github.com/doxygen/doxygen/issues/5242">5242</a> - doxygen don't hide private Inherited Members</li>
@@ -2206,7 +2206,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5056">5056</a>: Added support for processing DocSets with Dash (thanks to
        Bogdan Popescu for the patch </li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4900">4900</a>: Added option EXTERNAL_PAGES which can be used to determine
-       whether or not pages importated via tags will appear under related 
+       whether or not pages imported via tags will appear under related 
        pages (similar to EXTERNAL_GROUPS).</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5042">5042</a>: Added new MathJax command MATHJAX_CODEFILE which supports
        including a file with MathJax related scripting to be inserted before
@@ -2253,7 +2253,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4650">4650</a>: Replaced "echo -n" with "printf" in the configure script.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4684">4684</a>: Removed warning when using \endinternal</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4696">4696</a>: Added &amp;, @, and # as allowed characters for commands that</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/4788">4788</a>: Included patch by Abert to correctly link pages in the manual</li>
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/4788">4788</a>: Included patch by Albert to correctly link pages in the manual</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4850">4850</a>: Added support for single column Markdown tables.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4855">4855</a>: Incomplete documentation on doxygen -w latex</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4877">4877</a>: Doxygen crashed when structural commands (like \var) appeared 
@@ -2267,7 +2267,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
        rather than the file name.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5059">5059</a>: build using ./configure ; make did not work if the path
        contained a space.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/5060">5060</a>: Tag files are now identfied by the full path instead of
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/5060">5060</a>: Tag files are now identified by the full path instead of
        only the name of the tag file.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5086">5086</a>: In some cases members were missing from the tag file.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5079">5079</a>: Fortran: derive intent from documentation in case no 
@@ -2501,7 +2501,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5001">5001</a>: Fixed case where doxygen would during preprocessing.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/5002">5002</a>: A file specified using HTML_EXTRA_STYLEHSHEET did not end
        up in the Qt Help index.</li>
-<li>   Improved the way enum's are rendered in the HTML output.</li>
+<li>   Improved the way enums are rendered in the HTML output.</li>
 <li>   When inlining structs (INLINE_SIMPLE_STRUCTS=YES) a &lt;p&gt; was missing
        for members with a detailed description, causing invalid XHTML.</li>
 <li>   Fixed problem loading the navigation tree when using .xhtml as the
@@ -2583,7 +2583,7 @@ href="https://github.com/doxygen/doxygen/commit/a697caadf1912d0d74faa208f4cff887
 <li>   Added option AUTOLINK_SUPPORT which can be used to enable/disable
        autolinking globally.</li>
 <li>   Included language updates for Czech, Spanish, Greek, Slovak, and 
-       Esparanto.</li>
+       Esperanto.</li>
 </ul>
 <h3>Bug fixes</h3>
 <ul>
@@ -2870,8 +2870,8 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4651">4651</a>: Included patch by Ryan Schmidt to make the Mac versions
        in qglobal.h match that of Apple header files.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4659">4659</a>: Added C++11 classes when BUILTIN_STL_SUPPORT is enabled.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/4662">4662</a>: Using a backslash in a section cause 026E30F to appear in the
-       latex TOC.</li>
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/4662">4662</a>: Using a backslash in a section causes 026E30F to appear in the
+       LaTeX TOC.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4675">4675</a>: Fortran: case sensitiveness for routines and functions 
        did not work</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4676">4676</a>: Fortran: continuation by ampersand not placed in code output.</li>
@@ -2934,7 +2934,7 @@ make sure you add the following:
             (amount of &gt;'s determine the indentation level).</li>
        <li> emphasis using *emphasize this* or _emphasis this_ or
             strong emphasis using **emphasis this**. Unlike classic
-            Markdown 'some_great_indentifier' is not touched.</li>
+            Markdown 'some_great_identifier' is not touched.</li>
        <li> code spans can be created using back-ticks, i.e. `here's an example`</li>
        <li> Using three or more -'s or *'s alone on a line with only spaces
             will produce a horizontal ruler.</li>
@@ -3254,7 +3254,7 @@ make sure you add the following:
        depending on the code page (thanks to Hirao for the patch).</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/2867">2867</a>: The .spec file in the source distribution did not get
        updated to the latest version.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/2872">2872</a>: Fortran: Continuation character was not recognised in 
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/2872">2872</a>: Fortran: Continuation character was not recognized in 
        fixed format code.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/2887">2887</a>: Fortran: @param checking was not case insensitive.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3168">3168</a>: Fixed problem combining @cond with preprocessor directives.</li>
@@ -3290,7 +3290,7 @@ make sure you add the following:
        GENERATE_TREEVIEW was enabled.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4242">4242</a>: Linking to a section on the main page could result in a
        broken link when GENERATE_TREEVIEW was enabled.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/4243">4243</a>: Fixed invalid warning when using @deparated method with
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/4243">4243</a>: Fixed invalid warning when using @deprecated method with
        default values for parameters.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4245">4245</a>: A function made related using @relates could end up in
        the wrong class if there was already a method with a matching
@@ -3378,7 +3378,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4085">4085</a>: using @dot...@endot produced an image referenced with
                   absolute path.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4091">4091</a>: \mscfile did not work properly for LaTeX output.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/4095">4095</a>: Fixed problem where #include's could cause phantom __pad__
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/4095">4095</a>: Fixed problem where #include could cause phantom __pad__
                   members to appear in the output (appeared on Windows only).</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4103">4103</a>: Options PROJECT_LOGO and PROJECT_BRIEF were missing
                   from the manual.</li>
@@ -3402,7 +3402,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4128">4128</a>: Included patch to fix broken hyperlink to page entry 
                   in xreflists.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4136">4136</a>: Header of \page was wrong in Man page output.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/4137">4137</a>: #include's to other directories were not always linked.</li>
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/4137">4137</a>: #include to other directories were not always linked.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4140">4140</a>: Using "use Foo\Foo;" in PHP could cause doxygen to hang.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4142">4142</a>: In some cases the HTML output could contain an extra &lt;/p&gt;.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/4147">4147</a>: Tooltips with HTML entities could be wrongly truncated.</li>
@@ -3428,7 +3428,7 @@ make sure you add the following:
 <h3>Changes</h3>
 <ul>
 <li>   Added a header for each HTML page above the navigation menu, 
-       showing the project name and logo and a short descriptin (all optional).
+       showing the project name and logo and a short description (all optional).
        Disabling the index (with DISABLE_INDEX) still shows the new header
        (you can still customize this using HTML_HEADER). This now works
        nicely in combination with GENERATE_TREEVIEW = YES and/or
@@ -3471,7 +3471,7 @@ make sure you add the following:
        (thanks to Albert).</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3731">3731</a>: Fixed problem handling @cond..@endcond in Fortran code.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3779">3779</a>: Scope was missing in Tokens.xml when using docsets.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/3870">3870</a>, <a href="https://github.com/doxygen/doxygen/issues/2891">2891</a>: Applied patch tp avoid stripping prefixes for Fortran 
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/3870">3870</a>, <a href="https://github.com/doxygen/doxygen/issues/2891">2891</a>: Applied patch to avoid stripping prefixes for Fortran 
        subroutines.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3895">3895</a>: allow label before end statement in Fortran</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3956">3956</a>: &lt;/see&gt; was not handled properly in comment block.</li>
@@ -3543,7 +3543,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/2097">2097</a>, <a href="https://github.com/doxygen/doxygen/issues/2669">2669</a>: /// were not stripped from formulas and \dot..\enddot</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3190">3190</a>: dropped support for a4wide paper format for LaTeX, since
        it is on the LaTeX taboo list.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/3261">3261</a>: Behaviour of CLASS_DIAGRAM=NO in combination with
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/3261">3261</a>: Behavior of CLASS_DIAGRAM=NO in combination with
        HAVE_DOT=YES, was not properly documented.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3332">3332</a>: Python comments for next class or method could end up in
        code of a method/class when enabling INLINE_SOURCES.</li>
@@ -3583,7 +3583,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3877">3877</a>: In the HTML output &lt;/div&gt; was missing for built-in
        class diagrams.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3876">3876</a>: References in example files with underscores were wrong.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/"></a>: When using Japanese characters mixed with ascii characters
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/"></a>: When using Japanese characters mixed with ASCII characters
        doxygen incorrectly ended the brief description with a dot.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3886">3886</a>: setting MULTILINE_CPP_IS_BRIEF to YES, cause /// to appear
        in the output.</li>
@@ -3595,7 +3595,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3898">3898</a>: \copydoc did not work for array type arguments (e.g. int[]).</li>
 <li>   Use \dotfile did not produce the correct map file, so URLs in dot
        files did not work.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/3907">3907</a>: #define's in files only found via INCLUDE_PATH were not
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/3907">3907</a>: #define in files only found via INCLUDE_PATH were not
        correctly handled.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3918">3918</a>: auto brief description ending with .) cause the ) to
        end up in the detailed part.</li>
@@ -3607,7 +3607,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3937">3937</a>: Latex makefile clean target used rm command also for Windows.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3939">3939</a>: the EXCLUDE_SYMBOLS option was missing form the online docs.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3962">3962</a>: \htmlinclude and \verbinclude ended the brief description.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/3963">3963</a>: Inconsistent behaviour when a brief description was given 
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/3963">3963</a>: Inconsistent behavior when a brief description was given 
        following by a detailed comment block with JAVADOC_AUTOBRIEF enabled.</li>
 <li>   Fixed a number of typos in the documentation 
        (thanks to Albert)</li>
@@ -3683,7 +3683,7 @@ make sure you add the following:
        and HTML_COLORSTYLE_GAMMA, which control respectively the hue, 
        saturation, and gamma of all elements in the HTML output.</li>
 <li>   Moved dot invocations to the end of a doxygen run. Doxygen will now
-       run multiple instances of dot in parallel (for better CPU utilisation
+       run multiple instances of dot in parallel (for better CPU utilization
        on multi-core systems). The new config option DOT_NUM_THREADS 
        determines the number of threads used (were 0 is auto-detect).</li>
 <li>   Added option EXT_LINKS_IN_WINDOW which controls whether or not
@@ -3698,7 +3698,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/2255">2255</a>, <a href="https://github.com/doxygen/doxygen/issues/3796">3796</a>: \if and \endif did not work properly inside auto lists.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3139">3139</a>: No warning for missing return type documentation even though
        WARN_NO_PARAMDOC was set to YES.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/3341">3341</a>: Handling of nesting \defgroup's was not always working
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/3341">3341</a>: Handling of nesting \defgroup was not always working
        properly.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3355">3355</a>: &oslash; was not translated correctly in the LaTeX output.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3401">3401</a>: Use relative paths for mscgen diagrams to avoid errors in the
@@ -4063,7 +4063,7 @@ make sure you add the following:
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3457">3457</a>: Fixed problem handling strings like a"\b" within a comment.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3459">3459</a>: Fixed problem matching explicitly scoped parameter in a 
        template class.</li>
-<li>   id <a href="https://github.com/doxygen/doxygen/issues/3473">3473</a>: A namespaced with name "internal" (C++/CLI keyword)
+<li>   id <a href="https://github.com/doxygen/doxygen/issues/3473">3473</a>: A namespace with name "internal" (C++/CLI keyword)
        could confuse doxygen's C++ parser.</li>
 <li>   id <a href="https://github.com/doxygen/doxygen/issues/3477">3477</a>: @optional/@required attributes for Objective-C were missing
        from the XML output.</li>
@@ -4183,8 +4183,8 @@ make sure you add the following:
 <li>   id 437346: Fixed issue handling multibyte characters in the RTF output.</li>
 <li>   id 475377: Improved error handling in case of character encoding
        problems.</li>
-<li>   id 486747: Inherited typedefs were not resolved propertly.</li>
-<li>   id 508752: Add support for BLOCK DATA to the fortran parser.</li>
+<li>   id 486747: Inherited typedefs were not resolved properly.</li>
+<li>   id 508752: Add support for BLOCK DATA to the Fortran parser.</li>
 <li>   id 532695: included documentation update about the use of \public
        and friends for object-oriented programming in C.</li>
 <li>   id 532808: References to class variables in PHP code did not already work.</li>
@@ -4206,7 +4206,7 @@ make sure you add the following:
        wrong line counting and missing cross-references.</li>
 <li>   id 545128: \overload didn't work if it was the last statement in a
        comment and not followed by a newline.</li>
-<li>   id 553380: Removed bogus warning refering to a namespace member from
+<li>   id 553380: Removed bogus warning referring to a namespace member from
        with a brief description that was converted to a tooltip.</li>
 <li>   id 553968: Added support for JavaDoc command {@code ... }</li>
 <li>   id 554444: Bullet lists were no longer correctly indented when using
@@ -4318,7 +4318,7 @@ make sure you add the following:
        <code>INCLUDED_BY_GRAPH</code>.
        Run doxygen with the -l option to generate the default layout file.</li>
 <li>   Included update for the Macedonian, Catalan, Brazilian, and Serbian 
-       translation and also support for Serbian with Cyrilic characters.</li>
+       translation and also support for Serbian with Cyrillic characters.</li>
 </ul>
 <h3>Bug fixes</h3>
 <ul>
@@ -4358,14 +4358,14 @@ make sure you add the following:
        from multi-byte UTF-8 characters.</li>
 <li>   id 544479: <code>SORT_MEMBER_DOCS</code> did not work for class members.</li>
 <li>   id 546621: Fixed makefile so that .svn stuff is removed from the 
-       tarball when doing "make archive".</li>
+       tar-ball when doing "make archive".</li>
 <li>   id 546812: Using a table with row span greater than 1 did not 
        produce correct LaTeX output.</li>
 <li>   id 545098: Fixed problem parsing where clauses in combination with C#
        generics.</li>
 <li>   id 545503: Nameless parameters of type "struct A" could end up wrongly
        in the XML output.</li>
-<li>   id 545970: Refering to the main page did not work as advertised.</li>
+<li>   id 545970: Referring to the main page did not work as advertised.</li>
 <li>   id 546158: The variable defined inside a foreach statement in C# code 
        was not considered for source linking, cause potentially incomplete call
        graphs.</li>
@@ -4396,7 +4396,7 @@ make sure you add the following:
 <li>   id 553616: One can now remove the automatic line breaks in the type 
        part of a declaration by using a custom stylesheet with
        BR.typebreak { display: none; }</li>
-<li>   id 553663: Aliases did not work in Fortan comments.</li>
+<li>   id 553663: Aliases did not work in Fortran comments.</li>
 <li>   id 549022: Reimplemented in links could be wrong in case of 
        overloaded members.</li>
 <li>   id 553225: Parser was confused by arrays inside an Obj-C message.</li>
@@ -4432,7 +4432,7 @@ make sure you add the following:
 <li>   id 519573: Included patch to make the font-size button visible in the
        CHM output.</li>
 <li>   id 521288: Added new options SHOW_NAMESPACES and SHOW_FILES to 
-       Suppress Namepace and Files Pages.</li>
+       Suppress Namespace and Files Pages.</li>
 <li>   id 521495: Included a patch that makes it easy to modify the root of
        the html treeview with an image using style sheets.</li>
 <li>   id 522300: Added option IDL_PROPERTY_SUPPORT to enable/disable special 
@@ -4461,8 +4461,8 @@ make sure you add the following:
 <li>   id 495687: Replaced MAX_DOT_GRAPH_MAX_NODES with DOT_GRAPH_MAX_NODES 
        in the docs &amp; config file.</li>
 <li>   id 508694 Fixed problem with mixed simple and double quotes in 
-       fortran format declaration</li>
-<li>   id 508752: Fixed problem where the fortran scanner didn't recognize END</li>
+       Fortran format declaration</li>
+<li>   id 508752: Fixed problem where the Fortran scanner didn't recognize END</li>
 <li>   id 510971: Fortran: parser was confused by double REAL() in processed 
        statements.</li>
 <li>   id 514488: Fixed problem matching argument lists with const qualifiers.</li>
@@ -4503,7 +4503,7 @@ make sure you add the following:
 <li>   id 524473: Removed incorrect warnings about parameters in VHDL.</li>
 <li>   id 525140: Improved handling of Objective-C 2.0 properties.</li>
 <li>   id 525143: Properties are now listed as attributes in the UML diagrams.</li>
-<li>   id 525144: GENERATE_DOCSET option greyed out in doxywizard.</li>
+<li>   id 525144: GENERATE_DOCSET option grayed out in doxywizard.</li>
 <li>   id 526155: Removed warning about QFile::setName when parsing VHDL files.</li>
 <li>   id 527781: Template arguments for bases class not shown in a consistent
        way.</li>
@@ -4545,7 +4545,7 @@ make sure you add the following:
        #define C(S,m) /** container S */ struct S { /** value m */ int m; }
        </code></li>
 <li>   id 493923: The options SOURCE_BROWSER, CALL_GRAPH, CALLER_GRAPH, 
-       REFERENCES_RELATION, and REFERENCED_BY_RELATION can now be indepently
+       REFERENCES_RELATION, and REFERENCED_BY_RELATION can now be independently
        enabled and disabled. By default the relations are now disabled.</li>
 </ul>
 <h3>New features</h3>
@@ -4553,7 +4553,7 @@ make sure you add the following:
 <li>   Added support for VHDL (.vhd or .vhdl extension) based on a patch by
        Martin Kreis. Use OPTIMIZE_OUTPUT_VHDL when parsing VHDL code. </li>
 <li>   id 374699: Added support for Objective-C 2.0 properties.</li>
-<li>   Added compilation support for MacOSX 10.5 (Leopard) incombination with 
+<li>   Added compilation support for MacOSX 10.5 (Leopard) in combination with 
        Xcode 3</li>
 <li>   Added support for docsets, which allow integration of doxygen generated 
        API documentation in Xcode 3. new options: 
@@ -4572,7 +4572,7 @@ make sure you add the following:
        the second and third argument of a \class command, when
        the documentation is already in front of a class definition.</li>
 <li>   Added translator support for Macedonian.</li>
-<li>   Added language updates for German, Perian, Spanish, Taiwanese,  
+<li>   Added language updates for German, Persian, Spanish, Taiwanese,  
        and Chinese, Korean, Croatian.</li>
 </ul>
 <h3>Bug fixes</h3>
@@ -4607,7 +4607,7 @@ make sure you add the following:
        some compilers.</li>
 <li>   id 492027: Ampersand (&amp;) in front of parameter stops documenting 
        of PHP source</li>
-<li>   id 493249: using a namespace (or fortran module) caused the namespace
+<li>   id 493249: using a namespace (or Fortran module) caused the namespace
        to appear in the documentation as if it was defined.</li>
 <li>   id 493434: Nested C# style XML lists in a comment block were not
        handled correctly.            </li>
@@ -4631,7 +4631,7 @@ make sure you add the following:
 <li>   id 500635: Project name is no longer placed before each top level 
        item in the treeview and other indices.</li>
 <li>   id 500465: Fixed some issues compiling for AIX.</li>
-<li>   id 500928: Fixed parser issue handling a tripple quoted 
+<li>   id 500928: Fixed parser issue handling a tipple quoted 
                   string when used to initialize a Python variable.</li>
 <li>   id 500944: Python variables with package scope were only extracted if
        EXTRACT_STATIC was enabled.</li>
@@ -4650,7 +4650,7 @@ make sure you add the following:
 <li>   id 507603: Enabling FILTER_SOURCE_FILES caused strange warnings when
        INPUT_FILTER is empty.</li>
 <li>   id 508740: Using upper case port mode specifiers did not work correctly.</li>
-<li>   id 508753: Fortran: Added .f as allowed fortran extension.</li>
+<li>   id 508753: Fortran: Added .f as allowed Fortran extension.</li>
 <li>   id 508759: Fortran: fixed potential memory corruption while scanning 
        parameter lists.</li>
 <li>   id 507528: XML output was not correct for pointer arrays.</li>
@@ -4659,7 +4659,7 @@ make sure you add the following:
        documentation.</li>
 <li>   id 509582: Fortran: Spaces in function return type were not parsed 
        properly.</li>
-<li>   id 510387: Fortran scanner didn't parse initialisation of complex type
+<li>   id 510387: Fortran scanner didn't parse initialization of complex type
        correctly. </li>
 <li>   id 511921: @file command ended brief description even when
        JAVADOC_AUTOBRIEF was enabled.</li>
@@ -4692,7 +4692,7 @@ make sure you add the following:
        (used for Python to C++ bindings).</li>
 <li>   id 475828: Added support for CLI/C++ style indexed properties.</li>
 <li>   Added config option TYPEDEF_HIDES_STRUCT which when enabled treats a typedef
-       of a struct as a struct with the name of the typedef. This behavious was
+       of a struct as a struct with the name of the typedef. This behavior was
        coupled to OPTIMIZE_OUTPUT_FOR_C in the previous version and is now an independent
        option.</li>
 <li>   Included updates for the Korean, Brazilian and Chinese translations.</li>
@@ -4784,7 +4784,7 @@ make sure you add the following:
 <li>   When <code>OPTIMIZE_OUTPUT_FOR_C</code> is enabled then a struct definition of the
        form <code>typedef struct _S { ... } S_t</code> will be shown in the output as a
        struct of type <code>S_t</code> and the typedef itself is omitted 
-       (previousily <code>_S</code> was shown
+       (previously <code>_S</code> was shown
        as well as a typedef of the form <code>typedef _S S_t</code>). </li>
 <li>   Improved the line-breaking rules for members whose return types have many characters
        (for example a function returning a pointer to a template class).</li>
@@ -4970,7 +4970,7 @@ make sure you add the following:
 <li>   id 390821: Fixed problem parsing Java 1.5 enums with initializers.</li>
 <li>   id 391619: When dot produces an non-zero return code, doxygen now prints the
                   return code and the command it tried to execute.</li>
-<li>   id 407815: Doxygen's got confused by certain combinations of " and ' s in PHP code.</li>
+<li>   id 407815: Doxygen got confused by certain combinations of " and ' in PHP code.</li>
 <li>   id 409935: Fixed bug in qcstring.cpp</li>
 <li>   id 411300: PDF/Latex output was broken for operator[] documentation.</li>
 <li>   id 411328: Fixed Accessibility/Section 508 Compliance issue.</li>
@@ -5034,7 +5034,7 @@ make sure you add the following:
 <li>   id 131445: Fixed autolinking for related functions.</li>
 <li>   id 137236: Updated documentation to make it clear that a lower-case only word
        is not a candidate for autolinking.</li>
-<li>   id 141758: Fixed a problem parsing &lt;?=...?&gt; contructs outside of functions in PHP.</li>
+<li>   id 141758: Fixed a problem parsing &lt;?=...?&gt; constructs outside of functions in PHP.</li>
 <li>   id 319169: Second level index not shown when DISABLE_INDEX=YES.</li>
 <li>   id 325337: Added "optimize output for C#" option to Doxywizard.</li>
 <li>   id 325426: Partial C# class inside a namespace where not handled properly.</li>
@@ -5068,7 +5068,7 @@ make sure you add the following:
        an anonymous namespace  </li>
 <li>   id 349867: Fixed issue handling brief and detailed description when
        both are positioned after an item. </li>
-<li>   id 350168: Doxygen didn't parse C# type contraints properly.</li>
+<li>   id 350168: Doxygen didn't parse C# type constraints properly.</li>
 <li>   id 351890: In some cases C# attributes were treated as properties.</li>
 <li>   id 353044: C99 style variadic macros were not handled properly by doxygen.</li>
 <li>   id 353195: Member grouping with SUBGROUPING = YES now works the same for files
@@ -5249,7 +5249,7 @@ make sure you add the following:
                   set.</li>
 <li>   id 318460: Multiply-defined labels if two function specializations 
        differ only on the name of a template parameter.</li>
-<li>   id 319219: Spurious space was inserted after inlined math formulae.</li>
+<li>   id 319219: Spurious space was inserted after inlined math formulas.</li>
 <li>   id 319826: The file name for template classes could become too 
        long causing files that cannot be created by some file systems.</li>
 <li>   id 320026: undocumented "typedef struct foo baz" causes subsequent 
@@ -5362,7 +5362,7 @@ make sure you add the following:
 <li>   id 311198: If JAVADOC_AUTOBRIEF was set to YES, a \todo or \bug like
        command always ended at the first dot.</li>
 <li>   id 311207: The /* and */ inside a \code ... \endcode code fragment 
-       were stipped.</li>
+       were stripped.</li>
 <li>   id 311577: Putting a documentated class name in the title of the main
        page caused a LaTeX error if pdf hyperlinks were enabled.</li>
 <li>   id 311665: Fixed compile issue for Solaris.</li>
@@ -5464,13 +5464,13 @@ make sure you add the following:
 <li>   id 304598: Using operator-- in resulted in broken HTML output due to the
                   embedded doxytag that include the end of a HTML comment.</li>
 <li>   id 304623: Spreading a @fn command over multiple lines didn't work
-                  anymore without using line-contination characters.</li>
+                  anymore without using line-continuation characters.</li>
 <li>   id 304666: Attributes of the same class appeared separated with \n in 
                   collaboration diagrams</li>
-<li>   id 304751: A define "foo()" was indisguishable from a define "foo" in
+<li>   id 304751: A define "foo()" was indistinguishable from a define "foo" in
                   the XML output.</li>
 <li>   id 304752: XML location tag attribute "file" could have the
-                  syntactially wrong value "&lt;generated&gt;" in some cases.</li>
+                  syntactically wrong value "&lt;generated&gt;" in some cases.</li>
 <li>   id 305334: INPUT_FILTER tag did not work properly anymore due to
                   additional quotes.</li>
 <li>   id 305364: Improved argument matching routine to avoid cases where
@@ -5581,12 +5581,12 @@ make sure you add the following:
                   CASE_SENSE_NAME was set to NO.</li>
 <li>   id 170592: Using \ref for Objective-C methods did not work if the
                   name contained a colon.</li>
-<li>   id 171795: Refering to Objective-C methods now follows Apple's
+<li>   id 171795: Referring to Objective-C methods now follows Apple's
                   conventions. </li>
 <li>   id 171878: When JAVADOC_AUTOBRIEF = YES and there was no blank line 
                   after a page command, the first sentence did not appear in
                   the documentation.</li>
-<li>   id 171923: Doxygen failed to match arguments for a function documentated
+<li>   id 171923: Doxygen failed to match arguments for a function documented
                   out-of-line with @fn and using @relatesalso.</li>
 <li>   id 172118: Doxywizard now shows the version of doxygen it is for.</li>
 <li>   id 172133: Doxygen did not longer ignore preceding C++ comments inside a
@@ -5596,7 +5596,7 @@ make sure you add the following:
 <li>   id 172329: The index of the CHM did not always link to groups correctly.</li>
 <li>   id 172456: Fixed case where doxygen had problems differentiating const 
                   and non-const member functions.</li>
-<li>   id 172494: @code blocks were not poperly ignored by the preprocessor 
+<li>   id 172494: @code blocks were not properly ignored by the preprocessor 
                   in some cases.</li>
 <li>   id 172622: Fixed parse problem for Objective-C method implementations 
                   whole declaration part ended with a semicolon.</li>
@@ -5754,7 +5754,7 @@ make sure you add the following:
                an anonymous namespace.</li>
 <li>id 169549: Previous fixes introduced flattening of the class hierarchy.</li>
 <li>id 169640: File suffix check for the D language was broken.</li>
-<li>id 169641: D contructors and destructors were not detected.</li>
+<li>id 169641: D constructors and destructors were not detected.</li>
 <li>is 169657: Fixed the way import is treated in D to prevent recursive
                lockup.</li>
 <li>id 169784: Objective-C methods with a variable number of arguments were
@@ -5881,7 +5881,7 @@ make sure you add the following:
 <li>   id 155272: Image filenames in RTF output were not quoted causing problem
                   with custom images whose name contained spaces.</li>
 <li>   id 155322: Fixed parse problem for php code containing '#'.  </li>
-<li>   id 155224: Java interfaces did't resolve across packages w/o FQN.</li>
+<li>   id 155224: Java interfaces didn't resolve across packages w/o FQN.</li>
 <li>   id 156411: Return type of a function was not hyperlinked in some cases 
                   (typical with nested namespaces or Java packages).</li>
 <li>   id 156445: function seen first in header and doc'ed in 
@@ -6129,7 +6129,7 @@ make sure you add the following:
 <li>   Included patch that removes some cosmetic annoyances in the man page 
        output (thanks to Chris Croughton).</li>
 <li>   Added internationalization support for Afrikaans and
-       Lithanian.  Included language updates for Dutch, 
+       Lithuanian.  Included language updates for Dutch, 
        Czech, Italian, Brazilian, Croatian, Japanese, Norwegian and
        Russian.</li>
 </ul>
@@ -6146,7 +6146,7 @@ make sure you add the following:
 <li>   id 138394: C style comments placed on the same line after a macro 
        definition appeared as part of the macro's value.</li>
 <li>   id 138429: Fixed language setting for HTML output when using 
-       traditional chinese.</li>
+       traditional Chinese.</li>
 <li>   id 140259: Using @dotfile in a comment block could cause broken @refs
        to sections defined after the @dotfile command.</li>
 <li>   id 141915: Fixed a couple of problems with the RTF output.</li>
@@ -6309,7 +6309,7 @@ make sure you add the following:
 <li>   Examples (documented via \example) are now included in the XML output.</li>
 <li>   New option SORT_BRIEF_DOCS which when enabled will list the
        declaration section of the documentation (with the brief descriptions)
-       in alpabetical order, instead of declaration order (thanks to 
+       in alphabetical order, instead of declaration order (thanks to 
        Akos Kiss for the patch).</li>
 <li>   Included patch for Hungarian translation (thanks to Akos Kiss)
        and for the Serbian language. Added support for mixed Korean/english 
@@ -6364,7 +6364,7 @@ make sure you add the following:
 <h3>New features</h3>
 <ul>
 <li>   Added support for parsing K&amp;R style function prototypes. 
-       Please try it on your favourite legacy C project and report any 
+       Please try it on your favorite legacy C project and report any 
        problems.</li>
 <li>   Included languages updates for Traditional Chinese, 
        Danish, German, Korian translation.</li>
@@ -6374,7 +6374,7 @@ make sure you add the following:
        generating source code listings as part of the XML output (thanks to
        Paul Ross for the patch).  </li>
 <li>   Added new config option ABBREVIATE_BRIEF which makes the
-       abbration process of brief descriptions configurable and language
+       aberration process of brief descriptions configurable and language
        independent (thanks to Jake Colman for the patch).</li>
 <li>   The alphabetical class list now comes with a quick index
        (thanks to Marcin Zukowski for the patch).</li>
@@ -6396,7 +6396,7 @@ make sure you add the following:
        was produced.</li>
 <li>   id 123206: Fixed problem in qtools when opening files in text mode.</li>
 <li>   id 123322: The search page did not honor DISABLE_INDEX.</li>
-<li>   id 123420: Functions with a brief description caused bugus &lt;/em&gt; tags 
+<li>   id 123420: Functions with a brief description caused bogus &lt;/em&gt; tags 
                   in the HTML output.</li>
 <li>   id 124114: typo in the generated PHP search script could cause errors
        in the search result page.</li>
@@ -6436,7 +6436,7 @@ make sure you add the following:
 <li>   Fixed problem that HTML image maps ended up in the RTF output.</li>
 <li>   Fixed bug in code fragment parser that could cause memory corruption
        in certain cases.</li>
-<li>   Fixed problem matching definition and declation of functions, which
+<li>   Fixed problem matching definition and declaration of functions, which
        could cause bogus warnings for functions with the same name but in 
        different namespaces.</li>
 <li>   Using "/// @file" to document a file quickly was not possible, while
@@ -6679,7 +6679,7 @@ make sure you add the following:
 <li>   Links to groups imported via tag files were broken.</li>
 <li>   Fixed problem resolving class relations for nested classes within
        namespaces.</li>
-<li>   Static members can now be documentated in a separate file using \fn
+<li>   Static members can now be documented in a separate file using \fn
        as long as they have unique names. If the names are not unique the 
        documentation must be located in the same file (as was required before).</li>
 <li>   In arguments and return types of the form NA::A were not linked if NA 
@@ -6704,7 +6704,7 @@ make sure you add the following:
 <li>   Fixed problem handling omission of the optional arguments of 
        the \image command.</li>
 <li>   Enabling HIDE_IN_BODY_DOCS did not work properly if C++-style special
-       comments were used inside the body of a fucntion.</li>
+       comments were used inside the body of a function.</li>
 <li>   Fixed problem cross-referencing variables used as a
        guard (i.e. if (var) ...) </li>
 <li>   Setting ENUM_VALUES_PER_LINE to 0 caused a division by 0 error.</li>
@@ -6776,7 +6776,7 @@ make sure you add the following:
 <li>   Fixed preprocessor problem with parsing /*//*/</li>
 <li>   URL's in the docs using &lt;a href=""&gt; caused a nested link. </li>
 <li>   "using namespace A::B;" confused the code parser.</li>
-<li>   Interface keyword was not recognised in C# (thanks to Onorio Catenacci
+<li>   Interface keyword was not recognized in C# (thanks to Onorio Catenacci
        for the patch).</li>
 <li>   Line counting was incorrect when parsing multi-line formulas.</li>
 <li>   \section's in a \mainpage are now correctly numbered in the LaTeX
@@ -6829,7 +6829,7 @@ make sure you add the following:
        if they were documented.</li>
 <li>   The treeview page was not rendered with the right character set (it was
        always English).</li>
-<li>   Explicit template instantations appeared as a variable in the output.</li>
+<li>   Explicit template instances appeared as a variable in the output.</li>
 <li>   Java instance and static initializer blocks are now correctly parsed
        and can be documented.</li>
 <li>   Fixed bug in the LATEX_HIDE_INDICES option.</li>
@@ -6897,7 +6897,7 @@ make sure you add the following:
        was already suggested in the docs).</li>
 <li>   source code line in the XML output didn't escape special characters 
        like &amp; anymore.</li>
-<li>   Fixed small bug in german translation (thanks to Jens Seidel).</li>
+<li>   Fixed small bug in German translation (thanks to Jens Seidel).</li>
 <li>   e-mail addresses with multiple dots got truncated when linked.</li>
 <li>   Attributes of html commands with value "" where not properly parsed
        causing the image in the legend page not to appear.</li>
@@ -6931,7 +6931,7 @@ make sure you add the following:
 <li>   Fixed problem in code browser that prevented linking to global 
        variables defined in other files.</li>
 <li>   When putting a "using namespace X" in a header file doxygen did not
-       recognise this in files that included the header file.</li>
+       recognize this in files that included the header file.</li>
 <li>   Fixed bug in parsing sections without title.</li>
 <li>   doxytag did not include anchor in the search index. Thanks to 
        Joerg Schlichenmaier for the fix.</li>
@@ -6978,7 +6978,7 @@ make sure you add the following:
 <li>   RCS/CVS tags did not appear in the output.</li>
 <li>   @note section result in section with type "bug" in the XML output.</li>
 <li>   Dot graphs were truncated too quickly in some cases.</li>
-<li>   Files with a .php4 extension are now recognised as PHP files.</li>
+<li>   Files with a .php4 extension are now recognized as PHP files.</li>
 <li>   Source browser could get out of sync causing wrong cross references.</li>
 <li>   Text after @} could end up in another documentation block.</li>
 <li>   Putting a style command such as \c or \b at the end of a line, before
@@ -7020,7 +7020,7 @@ make sure you add the following:
 <li>   Included language updates for French, Czech, and Russian.</li>
 <li>   Included a number of enhancements to the xml parser (thanks to 
        a patch by Tree).</li>
-<li>   Locally documentated parameters now appear in the XML output
+<li>   Locally documented parameters now appear in the XML output
        (thanks to Cormac Twomey for the patch). </li>
 <li>   The preprocessor now inserts line control commands where appropriate.</li>
 </ul>
@@ -7028,7 +7028,7 @@ make sure you add the following:
 <ul>
 <li>   Aliased \if .. \endif commands around a \brief section were not handled
        properly.</li>
-<li>   Warnings for undocumentation members were not generated anymore
+<li>   Warnings for undocumented members were not generated anymore
        in certain cases.</li>
 <li>   A member of a group linked with \ref showed the group's title 
        as link text instead of the member's name.</li>
@@ -7111,7 +7111,7 @@ make sure you add the following:
        <li> Undocumented private friend classes no longer cause warnings</li>
        <li> Undocumented private classes no longer cause warnings</li>
        <li> Undocumented members are now hidden if they are 
-            default constuctors, destructors or reimplemented.</li>
+            default constructors, destructors or reimplemented.</li>
        </ul></li>
 <li>   Pages introduced via \page are now context aware. This means that
        if you put them inside a class or namespace, names do not have
@@ -7126,11 +7126,11 @@ make sure you add the following:
        that a list of all deprecated items is generated.
        Thanks to Angela Marshall for the patch.</li>
 <li>   Enum value documentation was added to the XML output.</li>
-<li>   Files ending with ".inc" are now recognised as PHP files
+<li>   Files ending with ".inc" are now recognized as PHP files
        (thanks to Marcus Ahlfors).</li>
 <li>   Included updated documentation for language translators 
        (thanks to Petr Prikryl).</li>
-<li>   Included language updates for Czech, Slovak, Brazillan, Croatian,
+<li>   Included language updates for Czech, Slovak, Brazilian, Croatian,
        Portuguese, Russian, Polish, Japanese and Serbian. 
        Include language support for Catalan (thanks to Albert Mora)</li>
 <li>   Included .dsp update by Simon Goodwin (already needs to be updated 
@@ -7218,12 +7218,12 @@ make sure you add the following:
        of some item and paste it in another documentation block.</li>
 <li>   i18n: Added support for the Serbian language (thanks to Dejan Milosavljevic).
        Included a new language option Japanese-en for combined Japanese 
-       and english.</li>
+       and English.</li>
 <li>   Included patch for dealing with variable argument macros in @param 
        (thanks to Alfred Heggestad).</li>
 <li>   Added new option MULTILINE_CPP_IS_BRIEF to make doxygen treat
        a multi-line brief comment block as a brief description. Set this to
-       YES to obtain the behaviour of version 1.2.15 and earlier. Default as
+       YES to obtain the behavior of version 1.2.15 and earlier. Default as
        of version 1.2.16 is to treat multi-line C++ comment block as a 
        detailed description.</li>
 <li>   New option CHM_FILE to set the .chm file (and path) to use for
@@ -7298,7 +7298,7 @@ make sure you add the following:
        </ul></li>
 <li>   operator|() caused invalid entries in the latex index.</li>
 <li>   Fixed bug parsing URLs with curly braces in documentation blocks.</li>
-<li>   Html help output now uses the correct language code if non english
+<li>   Html help output now uses the correct language code if non English
        language is selected.</li>
 <li>   Fixed bug in generate makefile for latex output (thanks to Petr 
        Prikryl)</li>
@@ -7306,7 +7306,7 @@ make sure you add the following:
        confused the parser.</li>
 <li>   Fixed problem handling function typedefs.</li>
 <li>   \endif appeared in output when used via ALIASES in a brief description.</li>
-<li>   Included heuristic to distiguish between a variable definition 
+<li>   Included heuristic to distinguish between a variable definition 
        with initialization via a constructor and a function prototype 
        (e.g. "Test var(initVal);", v.s. "Test func(SomeType);").</li>
 <li>   Fixed lock-up problem when to @brief were put after each other in a
@@ -7373,10 +7373,10 @@ make sure you add the following:
        Please report any problems that remain.</li>
 <li>   Alias commands put in separate parameter documentation blocks 
        were not resolved.</li>
-<li>   The documentation for arguments, documented with a seperate 
+<li>   The documentation for arguments, documented with a separate 
        documentation block, was not consistently shown in source and header 
        files, depending on the order of the input files. </li>
-<li>   The characters '(', ')', '$', ''', and ';' were not recognised 
+<li>   The characters '(', ')', '$', ''', and ';' were not recognized 
        as part of an URL.</li>
 <li>   Grouped enum values could not share the same documentation block
        even when DISTRIBUTE_GROUP_DOC is YES. </li>
@@ -7397,7 +7397,7 @@ make sure you add the following:
        classes, imported via using declarations, as their parameter type.</li>
 <li>   Fixed bug in conditional section handling for cases like:
        @if guard text @else more text @endif</li>
-<li>   The html help files did not honour the HTML_FILE_EXTENSION settings.</li>
+<li>   The html help files did not honor the HTML_FILE_EXTENSION settings.</li>
 <li>   Removed bogus warning when using @param for function-type 
        parameters.</li>
 <li>   Include statements in the source browser output now link to the 
@@ -7470,7 +7470,7 @@ make sure you add the following:
        with full access to documentation blocks. 
        Made inheritance/collaboration diagrams accessible via the
        XML parser API (see addon/doxmlparser/include/doxmlintf.h).
-       Reorganised the internals of the XML parser so the API does
+       Reorganized the internals of the XML parser so the API does
        not require destructors. Made the parser more portable (it should
        compile with gcc and M$ visual C++ now).</li>
 </ul>
@@ -7493,7 +7493,7 @@ make sure you add the following:
 <li>   In some cases the tree view showed leaf elements as non-leafs. </li>
 <li>   Fixed a number of cases where illegal characters could end up in 
        the XML output.</li>
-<li>   If a function in a base class was (re)implemented by serveral classes
+<li>   If a function in a base class was (re)implemented by several classes
        only one of them appeared in the "(re)implemented in" list. </li>
 <li>   graph_legend.gif was hardcoded in translator_*.h files. 
        Note to translators: this has affected all translator files, so please
@@ -7560,7 +7560,7 @@ make sure you add the following:
             this tag switches off the language filter...
        */
        </pre>
-       Which of the language specific fragments is outputed depends
+       Which of the language specific fragments is outputted depends
        on the setting of OUTPUT_LANGUAGE (Thanks to Milan Rusek for the patch).</li>
 <li>   Added build support for Cygwin (thanks to Ryunosuke Sato).        </li>
 <li>   Added new option HTML_FILE_EXTENSION to allow different file extension
@@ -7595,7 +7595,7 @@ make sure you add the following:
 <li>   Undocumented classes exposed when setting EXTRACT_ALL to YES, could
        result in broken links in the class hierarchy.</li>
 <li>   Exception specifications in Java were not parsed properly.</li>
-<li>   If INLINE_INHERITED_MEMB was YES, pure vitual members of base classes
+<li>   If INLINE_INHERITED_MEMB was YES, pure virtual members of base classes
        reachable via multiple paths appeared more than once in the 
        documentation.</li>
 <li>   Removed potential recursive loop when computing reimplements relations
@@ -7856,7 +7856,7 @@ make sure you add the following:
 <li>   Fixed a number of XML output bugs (thanks to Christian Hammond).</li>
 <li>   Fixed bug parsing character literals.</li>
 <li>   Fixed bug in RTF output (bracket mismatch).</li>
-<li>   Inializer of the last enum value of an enum did not always appear.</li>
+<li>   Initializer of the last enum value of an enum did not always appear.</li>
 <li>   Dots were removed from return types in Java.</li>
 <li>   In some cases a broken "More..." link was generated after 
        a brief class description.</li>
@@ -7965,10 +7965,10 @@ make sure you add the following:
 <ul>
 <li>   Friend class declarations are now treated as normal members.</li>
 <li>   Completely rewrote the way templates are handled. 
-       Doxygen now (internally) computes all template instances it encounters. 
+       Doxygen now (internally) computes all template instantiations it encounters. 
        This has the following advantages:
        <ul>
-       <li>Template instances are now shown in the hierarchical index
+       <li>Template instantiations are now shown in the hierarchical index
            and in all class diagrams in a uniform way.</li>
        <li>The list of all members is now correct for classes deriving
            from a template.</li>
@@ -7986,7 +7986,7 @@ make sure you add the following:
 <li>   Added GNU install tool auto detection to the configure script.</li>
 <li>   Included update for French translation (thanks to Xavier Outhier)
        Olexij Tkatchenko has added support for the Ukrainian language.
-       Included update for Portuguese and Brazillian.</li>
+       Included update for Portuguese and Brazilian.</li>
 <li>   Added --docdir option to the configure script.</li>
 <li>   Using the non-commercial version of Qt for windows, it is now
        possible to build doxywizard for windows.</li>
@@ -8001,7 +8001,7 @@ make sure you add the following:
 <li>   Removed bogus warnings when parsing tag files.</li>
 <li>   The detailed description in a @name block can now be more than 
        plain text.</li>
-<li>   Included fix for the tree view script for the mozilla browser
+<li>   Included fix for the tree view script for the Mozilla browser
        (thanks to Alec Panovici).</li>
 <li>   Grouping members with the same signature but with a different scopes
        is now possible.</li>
@@ -8036,7 +8036,7 @@ make sure you add the following:
        list of all members, while they were accessible from the derived class.</li>
 <li>   Reworked part of the template handling. Doxygen should now be
        capable of handling nested template classes correctly. Please test
-       this if you are using these contructs. Thanks to Christoph Koegl
+       this if you are using these constructs. Thanks to Christoph Koegl
        for providing some difficult test cases.</li>
 <li>   Fixed parse problem when parsing &lt;&lt; as part of the first 
        argument of a typedef.</li>
@@ -8088,7 +8088,7 @@ make sure you add the following:
 <h3>New features</h3>
 <ul>
 <li>   The dot generated inheritance and collaboration graphs for classes
-       should now show the proper template instantation for the derived/used
+       should now show the proper template instantiation for the derived/used
        classes. For instance it should show that class S uses class V 
        (indirectly) in the following example:
        <pre>
@@ -8127,7 +8127,7 @@ make sure you add the following:
 
        \defgroup must be used exactly once for a group, so you should
        provide a title. Without the title you will get a warning and
-       doxygen will use the name as title (this is the old behaviour).
+       doxygen will use the name as title (this is the old behavior).
        <pre>
        /** \addtogroup name */
        </pre> 
@@ -8176,7 +8176,7 @@ make sure you add the following:
 <h3>Bug fixes</h3>
 <ul>
 <li>   Fixed a bug in the LaTeX output generation (empty lists).</li>
-<li>   Doxygen can now distiguishing f(const A) from f(const B)
+<li>   Doxygen can now distinguishing f(const A) from f(const B)
        even though they match from a syntactical point of view.</li>
 <li>   A template base class that is actually an inherited template 
        argument of the derived class is no longer shown in the output 
@@ -8265,7 +8265,7 @@ make sure you add the following:
 <li>   Setting OPTIMIZE_OUTPUT_FOR_C still produced some C++-ish 
        sentences for the list of all struct/union fields.</li>
 <li>   Undocumented friend functions were listed as friend classes.</li>
-<li>   A CORBA IDL union with a switch was not always recognised correctly.  </li>
+<li>   A CORBA IDL union with a switch was not always recognized correctly.  </li>
 <li>   doxygen did not handle try-function-blocks with multiple catch clauses
        properly.</li>
 <li>   \bug and co. were not working for static members.</li>
@@ -8320,8 +8320,8 @@ make sure you add the following:
        <ul>
        <li> the addin no longer requires administrator privileges to work 
          (thanks to Michael Beck)</li>
-       <li> the existance of files is now checked (thanks to Pekka Pessi).</li>
-       <li> .odl and .inl files are recognised (thanks to Pekka Pessi).</li>
+       <li> the existence of files is now checked (thanks to Pekka Pessi).</li>
+       <li> .odl and .inl files are recognized (thanks to Pekka Pessi).</li>
        </ul></li>
 </ul>
 
@@ -8351,7 +8351,7 @@ make sure you add the following:
        if EXTRACT_PRIVATE is set to YES, instead of just the non-inherited
        private members.</li>
 <li>   Fixed autolink problem for grouped members.</li>
-<li>   Mutliple static global functions with the same name (but in different
+<li>   Multiple static global functions with the same name (but in different
        files), which were forward declared, could make doxygen put 
        the wrong documentation block at the wrong global function.</li>
 <li>   Support for Norwegian was not enabled.</li>
@@ -8378,7 +8378,7 @@ make sure you add the following:
 <li>   Putting &lt;a href="..."&gt;&lt;img src="..."&gt;&lt;/a&gt; in the 
        docs will now work as expected for HTML.</li>
 <li>   Fixed problems with &gt;pre&gt;...&gt;/pre&gt; block in LaTeX.</li>
-<li>   Putting &amp;ccedil; in the docs now preduces a c-cedille.</li>
+<li>   Putting &amp;ccedil; in the docs now produces a c-cedille.</li>
 </ul>
 
 
@@ -8430,7 +8430,7 @@ make sure you add the following:
 <h3>Bug fixes</h3>
 <ul>
 <li>   Fixed 0-pointer bug that could crash doxygen in some cases.</li>
-<li>   Starting a list in a brief JavaDoc-style description splitted
+<li>   Starting a list in a brief JavaDoc-style description split
        the list into two invalid parts if a list item ended with a dot.</li>
 <li>   Fixed a problem with linking to grouped class members.</li>
 <li>   Indenting of code fragment in LaTeX output was not always correct.
@@ -8517,7 +8517,7 @@ make sure you add the following:
 <li>   \ingroup can now be put in a one line comments (thanks to Patrick Ohly)</li>
 <li>   \ingroup in a comment block before a comma separated list of  
        variables is now applied to all variables (as is the documentation 
-       itself). (thanke to Patrick Ohly for the patch)</li>
+       itself). (thanks to Patrick Ohly for the patch)</li>
 <li>   @{ .. @} blocks can now be used for normal groups as well
        (thanks to Trevor Robinson for the patch). Here is an example:
        <pre>
@@ -8623,7 +8623,7 @@ make sure you add the following:
 <ul>
 <li>   Support for the Slovene language (thanks to Matjaz Ostroversnik)</li>
 <li>   Bit fields for struct members are now shown in the documentation.</li>
-<li>   Enabled "favourites" and "Full text-search" for the generated
+<li>   Enabled "favorites" and "Full text-search" for the generated
        HTML Help browser files. </li>
 <li>   Added support for M$-IDL properties. The "methods:" section
        now also works.</li>
@@ -8678,9 +8678,9 @@ make sure you add the following:
        now always pointing to the correct file (thanks to Bill Soudan
        for the patch).</li>
 <li>   Fixed HTML bug in non-indexed namespace member lists. </li>
-<li>   Using `:' inside ID's caused problems for some
-       XML parsers. I'm now using "__" instead. Also removed @ from appearing
-       in the output when annonymous compounds were used.</li>
+<li>   Using ':' inside ID's caused problems for some
+       XML parsers, I'm now using "__" instead. Also removed @ from appearing
+       in the output when anonymous compounds were used.</li>
 <li>   Fixed output bug that is caused by nesting paragraph commands
        inside autolists.</li>
 <li>   Doxygen no longer generates source files for input files that
@@ -8731,7 +8731,7 @@ make sure you add the following:
 <li>   Added support for namespace aliases.</li>
 <li>   Added RTF patch from Alexander Bartolich. Here is his description of
        the changes:
-       "The following patch of rtgen.cpp allows to read *complete* style 
+       "The following patch of rtfgen.cpp allows to read *complete* style 
         definitions from rtfstyle. This includes \sbasedon, \snext, \additive 
         and actual style names.
 
@@ -8758,7 +8758,7 @@ make sure you add the following:
        and <code>a[2]-&gt;func()</code>.</li>
 <li>   \em %className did not remove the %</li>
 <li>   In some cases namespace members ended up multiple times in the
-       documentatation.</li>
+       documentation.</li>
 <li>   Fixed a bug in the auto list generation.</li>
 <li>   \latexonly inside brief description did not work properly.</li>
 <li>   "Referenced By" list did not include constructors with 
@@ -8785,7 +8785,7 @@ make sure you add the following:
        item indicating where the todo item was found. The todo list (and
        all todo items) can be disabled by setting GENERATE_TODOLIST to NO.</li>
 <li>   &lt;pre&gt; ... &lt;/pre&gt; blocks now behave as in plain HTML instead of
-       \code ... \endcode blocks. This also works for LaTeX ofcourse. 
+       \code ... \endcode blocks. This also works for LaTeX of course. 
        These blocks differ from \verbatim ... \endverbatim blocks in that 
        commands can be used inside these blocks.</li>
 </ul>
@@ -8824,7 +8824,7 @@ make sure you add the following:
        </pre>
        Credits go to Joerg Baumann.</li>
 <li>   Included French and Czech language updates from Mathieu Despriée and
-       Petr Prikryl. Also included a language update for german from 
+       Petr Prikryl. Also included a language update for German from 
        Raimund Klein.</li>
 <li>   Doxygen will now do give proper warnings for formulas that do not 
        end properly.</li>
@@ -8896,7 +8896,7 @@ make sure you add the following:
        graphicx package instead of epsfig to simplify the use of pdflatex 
        (thanks to Pier Giorgio for showing me how that works).</li>
 <li>   Reimplemented the <code>system()</code> call for Unix, so doxygen becomes
-       interruptable when calling external tools such as dot.</li>
+       interruptible when calling external tools such as dot.</li>
 <li>   Changed the way <code>-w</code> works. It can now also be used to generate
        template header and footers.</li>
 </ul>
@@ -8932,7 +8932,7 @@ make sure you add the following:
        set the file patterns for the include files (if left empty the 
        <code>FILE_PATTERNS</code> will be used, which was also the old 
        behaviour). </li>
-<li>   Added a couple of commands for kdoc compatability: <code>@p</code>, 
+<li>   Added a couple of commands for kdoc compatibility: <code>@p</code>, 
        <code>@li</code>, <code>@em</code>.
        Also made @ref a bit less strict.</li>
 <li>   Portuguese translation by Rui Lopes.  </li>
@@ -8964,12 +8964,12 @@ make sure you add the following:
 <li>   Global functions within anonymous namespace scopes did appear
        in the documentation with the anonymous scope marker used internally
        by doxygen.</li>
-<li>   "namespace{}",so without space was not recognised as a namespace.</li>
+<li>   "namespace{}",so without space was not recognized as a namespace.</li>
 <li>   If the search engine was used then running installdox on the generated
        html resulted in bogus links to the search engine.</li>
 <li>   Fixed some compiler warning on Solaris.</li>
 <li>   Changed grey by grey50 in dot.cpp to avoid PDF conversion problems.</li>
-<li>   A &lt;/pre&gt; that was not preceeded by a whitespace was ignored </li>
+<li>   A &lt;/pre&gt; that was not preceded by a whitespace was ignored </li>
 <li>   The methods operator&lt;() and operator&lt;&lt;() were not 
        automatically linked anymore.</li>
 <li>   Some special characters in LaTeX were eating up the blanks that 
@@ -9041,7 +9041,7 @@ make sure you add the following:
        which files #include (i.e. depend on) a given file. This graph is 
        enabled by setting HAVE_DOT and INCLUDED_BY_GRAPH to YES.</li>
 <li>   added new configuration option EXTRACT_STATIC that can be used
-       to enable/disable the extraction of static file members. The behaviour
+       to enable/disable the extraction of static file members. The behavior
        of this option used to be linked with EXTRACT_PRIVATE.</li>
 <li>   Added two new configuration options MAX_DOT_GRAPH_WIDTH and 
        MAX_DOT_GRAPH_HEIGHT that let the user configure how big the
@@ -9100,7 +9100,7 @@ make sure you add the following:
 </ul>
 <h3>Bug fixes</h3>
 <ul>
-<li>   the warning message in case of ambigous file matches was containing
+<li>   the warning message in case of ambiguous file matches was containing
        a bogus <code>%s</code>, which could even crash doxygen.</li>
 <li>   An autolist followed by a \retval, \param, or \exception did 
        produced invalid output, resulting in a compile error in LaTeX. </li>
@@ -9113,7 +9113,7 @@ make sure you add the following:
 <li>   The hierarchy shown in the "Contents" part of the html help
        browser did not properly show the hierarchy when it contained
        undocumented classes. </li>
-<li>   explict compound specifiers in the return type could lead to 
+<li>   explicit compound specifiers in the return type could lead to 
        parse problems. Example:
        <pre>
        enum SomeEnumType_e Func()
@@ -9128,8 +9128,8 @@ make sure you add the following:
        and links to the correct reimplemented member are generated.</li>
 <li>   \ingroup did not work when grouping enums</li>
 <li>   members of a module were not cross-referenced with the sources.</li>
-<li>   Function pointers like <code>void ( *func )()</code> where not c
-       orrectly parsed because of the extra spacing between 
+<li>   Function pointers like <code>void ( *func )()</code> where not 
+       correctly parsed because of the extra spacing between 
        the `(' and the `*'. </li>
 <li>   The const in void <code>func(int * const val /*&lt; a value. */);</code>
        was named part of the name, instead of the type.</li>
@@ -9389,7 +9389,7 @@ make sure you add the following:
          template &lt;class T&gt; class S&lt;C&lt;T&gt; &gt; : public SB&lt;C&lt;T&gt; &gt; {};
        </pre> </li>
 <li>   #includes in code fragments where not hyperlinked. Operator
-       methods were also not correctly recognised.</li>
+       methods were also not correctly recognized.</li>
 <li>   C/C++ comments inside initializers where not handled properly.</li>
 <li>   If the type of an argument of a member definition was prefixed 
        with a (redudant) scope name of an indirect base class, 
@@ -9418,7 +9418,7 @@ make sure you add the following:
        case file names with space were used.</li>
 <li>   back-references from source-lines to documentation only worked for
        those members of a member group that were explicitly documented.</li>
-<li>   doxygen did not distriguish between func(int a) and func(int a[])
+<li>   doxygen did not distinguish between func(int a) and func(int a[])
        which could cause documentation to end up at the wrong member
        in case over overloading. </li>
 </ul>
@@ -9502,7 +9502,7 @@ make sure you add the following:
 <li>   Since 1.1.2, environment variable expansion in the config 
        file always resulted in a single string for each expanded variable
        (just as if quotes were put around the environment variable).
-       The old behaviour is restored again.</li>
+       The old behavior is restored again.</li>
 <li>   removed redundant spaces in the man page output and fixed the
        tab alignment in code fragments.</li>
 <li>   <code>typedef ( bla::*proc)();</code> was not properly parsed because of the
@@ -9524,7 +9524,7 @@ make sure you add the following:
        dot graphs. The cause was likely to be multiple frees of the same 
        pointer (but I have not been able to reproduce the crash myself). 
        I've now reimplemented the deletion routine of the dot graph
-       respresentation, which hopefully fixes this problem.</li>
+       representation, which hopefully fixes this problem.</li>
 <li>   Elements of the configuration options in lists, which used quotes 
        were broken up into smaller pieces anyway. This most notably broke
        PREDEFINED in some cases that worked before.</li>
@@ -9553,7 +9553,7 @@ make sure you add the following:
        of the LaTeX output (doxygen.sty a.o.) was not generated 
        (Thanks to Markus Lepper for reporting this).</li>
 <li>   Doxygen can now match arguments containing an explicit namespace
-       qualifier against arguments containing an implicit qualitifier 
+       qualifier against arguments containing an implicit qualifier 
        (i.e. imported via a using directive). 
        An example (thanks to Karl Stroetmann):
        <pre>
@@ -9619,7 +9619,7 @@ make sure you add the following:
        <p>
        <b>Usage:</b> A group is defined by a <code>//@{ .. //@}</code> block 
        (or <code>/*@{*/../*@}*/</code> if 
-       you're addited to C style comments :-) Nesting of groups is not 
+       you're addicted to C style comments :-) Nesting of groups is not 
        allowed. Before the opening marker of a block a separate comment 
        block should be placed. This block should contain the @name 
        (or \name) command to specify the header of the group.
@@ -9757,7 +9757,7 @@ make sure you add the following:
 <li>   Fixed a bug in structure of the graphical class hierarchy
        (thanks to Paul Bohme for pointing me at this bug)</li>
 <li>   Non-function members can now also be documented if they
-       are inside annonymous namespaces, which themselves are nested in 
+       are inside anonymous namespaces, which themselves are nested in 
        named namespaces.</li>
 <li>   #defines can now grouped with \defgroup and \ingroup as well.</li>
 <li>   fixed a bug in the latex output of groups (thanks to Gregory Kurz
@@ -9929,7 +9929,7 @@ make sure you add the following:
        /*! let's go to the bar */
        class foo::bar { };
        </pre></li>
-<li>   Members inside annonymous namespaces nested inside named namespaces 
+<li>   Members inside anonymous namespaces nested inside named namespaces 
        were not properly handled. </li>
 <li>   When documenting template specializations with the \class command,
        the second argument was not interpreted correctly.</li>
@@ -10089,7 +10089,7 @@ make sure you add the following:
        </pre></li>
 <li>   Three new section commands <code>\pre</code>, <code>\post</code> and 
        <code>\invariant</code> are added to describe
-       preconditions, postcondictions and invariants respectively.</li>
+       preconditions, postconditions and invariants respectively.</li>
 <li>   Variable/enum initializers and define definitions are 
        now included in documentation (unless the initializer/definition 
        is more than 30 lines long)</li>
@@ -10113,7 +10113,7 @@ make sure you add the following:
 <li>   Autolinks to #defines looked like function macro even if they weren't.</li>
 <li>   Members that were hidden deep in an inheritance tree, got multiple
        scope prefixes in the "all members list", while a scope prefix to
-       the member in the base class was enough to use it unambiguishly.</li>
+       the member in the base class was enough to use it unambiguously.</li>
 <li>   <code>\latexonly ... \endlatexonly</code> in the main page produced 
        erroneous text in refman.tex</li>
 <li>   The keywords in header and footer were only evaluated once.</li>
diff --git a/doc/htmlcmds.doc b/doc/htmlcmds.doc
index 605bf5a..57ddf6f 100644
--- a/doc/htmlcmds.doc
+++ b/doc/htmlcmds.doc
@@ -304,7 +304,7 @@ The list of entities with their descriptions has been taken from <a href="http:/
 <li><tt>\&notin;</tt>`&nbsp;&nbsp;&nbsp;`                 not an element of: &notin;
 <li><tt>\&ni;</tt>`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`  contains as member: &ni;
 <li><tt>\&prod;</tt>`&nbsp;&nbsp;&nbsp;&nbsp;`            n-ary product = product sign: &prod;
-<li><tt>\&sum;</tt>`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`       n-ary sumation: &sum;
+<li><tt>\&sum;</tt>`&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;`       n-ary summation: &sum;
 <li><tt>\&minus;</tt>`&nbsp;&nbsp;&nbsp;`                 minus sign: &minus;
 <li><tt>\&lowast;</tt>`&nbsp;&nbsp;`                      asterisk operator: &lowast;
 <li><tt>\&radic;</tt>`&nbsp;&nbsp;&nbsp;`                 square root = radical sign: &radic;
diff --git a/doc/translator.py b/doc/translator.py
index ed001bb..c04a367 100644
--- a/doc/translator.py
+++ b/doc/translator.py
@@ -141,8 +141,8 @@ class Transl:
         self.baseClassId = None
         self.readableStatus = None   # 'up-to-date', '1.2.3', '1.3', etc.
         self.status = None           # '', '1.2.03', '1.3.00', etc.
-        self.lang = None             # like 'Brasilian'
-        self.langReadable = None     # like 'Brasilian Portuguese'
+        self.lang = None             # like 'Brazilian'
+        self.langReadable = None     # like 'Brazilian Portuguese'
         self.note = None             # like 'should be cleaned up'
         self.prototypeDic = {}       # uniPrototype -> prototype
         self.translateMeText = 'translate me!'
-- 
cgit v0.12


From e6c910b1480e4cdba1a8054d2c0d1442c483cd9b Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 5 Nov 2019 13:56:27 +0100
Subject: Spelling corrections for src directory

Spelling corrections as found by codespell and in #561.

Some reported problems were already fixed, others are fixed here, with some exceptions (a,o.):
- "referenceby" in defgen.cpp as this is in the output and I cannot oversee the consequences (looks like none, but ...)
- "HANGEUL_CHARSET" left as is as in some MS documentation is written: 'HANGUL_CHARSET: Also spelled "Hangeul". Specifies the Hangul Korean character set.' (https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-wmf/0d0b32ac-a836-4bd2-a112-b6000a1b4fc9).
---
 src/cite.cpp         |  2 +-
 src/clangparser.cpp  |  2 +-
 src/classdef.cpp     | 16 ++++++++--------
 src/code.l           |  2 +-
 src/commentcnv.l     |  2 +-
 src/commentscan.l    |  2 +-
 src/condparser.h     |  2 +-
 src/context.cpp      |  8 ++++----
 src/declinfo.l       |  2 +-
 src/definition.cpp   |  2 +-
 src/diagram.cpp      |  4 ++--
 src/dirdef.cpp       |  2 +-
 src/docparser.cpp    |  2 +-
 src/doctokenizer.l   |  4 ++--
 src/dotdirdeps.cpp   |  4 ++--
 src/dotgraph.cpp     |  2 +-
 src/doxygen.cpp      | 10 +++++-----
 src/filedef.cpp      |  2 +-
 src/fortrancode.l    |  2 +-
 src/fortranscanner.l |  6 +++---
 src/htmlhelp.cpp     |  2 +-
 src/languages.py     |  2 +-
 src/latexgen.cpp     |  2 +-
 src/markdown.cpp     |  4 ++--
 src/pre.l            |  2 +-
 src/pycode.l         |  2 +-
 src/rtfgen.cpp       |  2 +-
 src/rtfgen.h         |  2 +-
 src/scanner.l        |  2 +-
 src/searchindex.cpp  |  2 +-
 src/searchindex.h    |  2 +-
 src/sortdict.h       |  4 ++--
 src/sqlite3gen.cpp   |  2 +-
 src/template.cpp     |  2 +-
 src/util.cpp         |  2 +-
 src/vhdldocgen.h     |  1 -
 src/vhdljjparser.cpp |  2 +-
 src/xmlgen.cpp       |  4 ++--
 38 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/src/cite.cpp b/src/cite.cpp
index e3314ca..f15f595 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -151,7 +151,7 @@ void CiteDict::generatePage() const
           p=s+1;
 
 	  int i;
-          if ((i = line.find("crossref")) != -1) /* assumption crossreference is on one line and the only item */
+          if ((i = line.find("crossref")) != -1) /* assumption cross reference is on one line and the only item */
           {
             int j=line.find("{",i);
             int k=line.find("}",i);
diff --git a/src/clangparser.cpp b/src/clangparser.cpp
index 271b99f..f6020dd 100644
--- a/src/clangparser.cpp
+++ b/src/clangparser.cpp
@@ -87,7 +87,7 @@ static QCString detab(const QCString &s)
           while (stop--) out.addChar(' '); 
         }
         break;
-      case '\n': // reset colomn counter
+      case '\n': // reset column counter
         out.addChar(c);
         col=0;
         break;
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 7ce6bf1..900551d 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -3315,7 +3315,7 @@ bool ClassDefImpl::hasExamples() const
 
 void ClassDefImpl::addTypeConstraint(const QCString &typeConstraint,const QCString &type)
 {
-  //printf("addTypeContraint(%s,%s)\n",type.data(),typeConstraint.data());
+  //printf("addTypeConstraint(%s,%s)\n",type.data(),typeConstraint.data());
   static bool hideUndocRelation = Config_getBool(HIDE_UNDOC_RELATIONS);
   if (typeConstraint.isEmpty() || type.isEmpty()) return;
   ClassDef *cd = const_cast<ClassDef*>(getResolvedClass(this,getFileDef(),typeConstraint));
@@ -3655,7 +3655,7 @@ void ClassDefImpl::mergeMembers()
             {
               MemberDef *srcMd = srcMi->memberDef;
               bool found=FALSE;
-              bool ambigue=FALSE;
+              bool ambiguous=FALSE;
               bool hidden=FALSE;
               MemberNameInfoIterator dstMnii(*dstMni);
               MemberInfo *dstMi;
@@ -3694,7 +3694,7 @@ void ClassDefImpl::mergeMembers()
                     QCString scope=dstMi->scopePath.left(dstMi->scopePath.find(sep)+sepLen);
                     if (scope!=dstMi->ambiguityResolutionScope.left(scope.length()))
                       dstMi->ambiguityResolutionScope.prepend(scope);
-                    ambigue=TRUE;
+                    ambiguous=TRUE;
                   }
                 }
                 else // same members
@@ -3723,12 +3723,12 @@ void ClassDefImpl::mergeMembers()
                     {
                       dstMi->ambiguityResolutionScope.prepend(scope);
                     }
-                    ambigue=TRUE;
+                    ambiguous=TRUE;
                   }
                 }
               }
-              //printf("member %s::%s hidden %d ambigue %d srcMi->ambigClass=%p\n",
-              //    srcCd->name().data(),srcMd->name().data(),hidden,ambigue,srcMi->ambigClass);
+              //printf("member %s::%s hidden %d ambiguous %d srcMi->ambigClass=%p\n",
+              //    srcCd->name().data(),srcMd->name().data(),hidden,ambiguous,srcMi->ambigClass);
 
               // TODO: fix the case where a member is hidden by inheritance
               //       of a member with the same name but with another prototype,
@@ -3757,7 +3757,7 @@ void ClassDefImpl::mergeMembers()
 
                 MemberInfo *newMi = new MemberInfo(srcMd,prot,virt,TRUE);
                 newMi->scopePath=bClass->name()+sep+srcMi->scopePath;
-                if (ambigue)
+                if (ambiguous)
                 {
                   //printf("$$ New member %s %s add scope %s::\n",
                   //     srcMi->ambiguityResolutionScope.data(),
@@ -4733,7 +4733,7 @@ int ClassDefImpl::countAdditionalInheritedMembers() const
       }
     }
   }
-  //printf("countAdditonalInheritedMembers()=%d\n",totalCount);
+  //printf("countAdditionalInheritedMembers()=%d\n",totalCount);
   return totalCount;
 }
 
diff --git a/src/code.l b/src/code.l
index 60d6c7e..c73911a 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1147,7 +1147,7 @@ static bool generateClassMemberLink(CodeOutputInterface &ol,MemberDef *xmd,const
   if (xd && xd->isLinkable())
   {
 
-    //printf("g_currentDefiniton=%p g_currentMemberDef=%p xmd=%p g_insideBody=%d\n",g_currentDefinition,g_currentMemberDef,xmd,g_insideBody);
+    //printf("g_currentDefinition=%p g_currentMemberDef=%p xmd=%p g_insideBody=%d\n",g_currentDefinition,g_currentMemberDef,xmd,g_insideBody);
 
     if (xmd->templateMaster()) xmd = xmd->templateMaster();
 
diff --git a/src/commentcnv.l b/src/commentcnv.l
index f144aec..3e5faba 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -496,7 +496,7 @@ void replaceComment(int offset);
 				     g_lastCommentContext = YY_START;
                                      BEGIN(Verbatim);
                                    }
-<Scan>.                            { /* any ather character */
+<Scan>.                            { /* any other character */
                                      copyToOutput(yytext,(int)yyleng); 
                                    }
 <Verbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endrtfonly"|"endmanonly"|"f$"|"f]"|"f}") { /* end of verbatim block */
diff --git a/src/commentscan.l b/src/commentscan.l
index 6e7d373..a1ce096 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1970,7 +1970,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
   					  BEGIN(Comment);
   					}
 <GuardParamEnd>{B}*			{
-  					  if (!g_spaceBeforeIf.isEmpty()) // needed for 665313 in combation with bug620924
+  					  if (!g_spaceBeforeIf.isEmpty()) // needed for 665313 in combination with bug620924
 					  {
 					    addOutput(g_spaceBeforeIf);
 					  }
diff --git a/src/condparser.h b/src/condparser.h
index 09a4f74..1ad13b1 100644
--- a/src/condparser.h
+++ b/src/condparser.h
@@ -13,7 +13,7 @@
  * Documents produced by Doxygen are derivative works derived from the
  * input used in their production; they are not affected by this license.
  *
- * C++ Expression parser for EXTABLED_SETIONS in Doxygen
+ * C++ Expression parser for ENABLED_SECTIONS in Doxygen
  *
  * Features used:
  *     Operators:
diff --git a/src/context.cpp b/src/context.cpp
index 361bfa2..e5f4597 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1079,7 +1079,7 @@ class TranslateContext::Private
         s_inst.addProperty("fileMembers",       &Private::fileMembers);
         //%% string fileMembersDescription
         s_inst.addProperty("fileMembersDescription", &Private::fileMembersDescription);
-        //%% string relatedPagesDescripiton
+        //%% string relatedPagesDescription
         s_inst.addProperty("relatedPagesDesc",  &Private::relatedPagesDesc);
         //%% string more
         s_inst.addProperty("more",              &Private::more);
@@ -1133,7 +1133,7 @@ class TranslateContext::Private
         s_inst.addProperty("referencesRelation",   &Private::referencesRelation);
         //%% markerstring inheritedFrom
         s_inst.addProperty("inheritedFrom",      &Private::inheritedFrom);
-        //%% string addtionalInheritedMembers
+        //%% string additionalInheritedMembers
         s_inst.addProperty("additionalInheritedMembers",&Private::additionalInheritedMembers);
         //%% string includeDependencyGraph:container_name
         s_inst.addProperty("includeDependencyGraph",&Private::includeDependencyGraph);
@@ -8432,7 +8432,7 @@ TemplateVariant NamespaceMembersIndexContext::get(const char *name) const
 
 //------------------------------------------------------------------------
 
-//%% struct InheritanceGraph: a connected graph reprenting part of the overall inheritance tree
+//%% struct InheritanceGraph: a connected graph representing part of the overall inheritance tree
 //%% {
 class InheritanceGraphContext::Private
 {
@@ -10297,7 +10297,7 @@ void generateOutputViaTemplate()
       ctx->set("classMembersIndex",classMembersIndex.get());
       //%% NamespaceMembersIndex namespaceMembersIndex:
       ctx->set("namespaceMembersIndex",namespaceMembersIndex.get());
-      //%% SearchIndicaes searchindicaes
+      //%% SearchIndices searchIndices
       ctx->set("searchIndices",searchIndices.get());
       //%% string space
       ctx->set("space"," ");
diff --git a/src/declinfo.l b/src/declinfo.l
index 0ac1516..c27af39 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -290,7 +290,7 @@ void parseFuncDecl(const QCString &decl,const SrcLangExt lang,QCString &cl,QCStr
   //        yyextra->type.data(),yyextra->scope.data(),yyextra->name.data(),yyextra->args.data());
 
   int nb = yyextra->name.findRev('[');
-  if (nb!=-1 && yyextra->args.isEmpty()) // correct for [] in yyextra->name ambigity (due to Java return yyextra->type allowing [])
+  if (nb!=-1 && yyextra->args.isEmpty()) // correct for [] in yyextra->name ambiguity (due to Java return yyextra->type allowing [])
   {
     yyextra->args.prepend(yyextra->name.right(yyextra->name.length()-nb));
     yyextra->name=yyextra->name.left(nb);
diff --git a/src/definition.cpp b/src/definition.cpp
index 5b2136c..a6e58ae 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -1001,7 +1001,7 @@ bool readCodeFragment(const char *fileName,
   }
   result = transcodeCharacterStringToUTF8(result);
   if (!result.isEmpty() && result.at(result.length()-1)!='\n') result += "\n";
-  //fprintf(stderr,"readCodeFragement(%d-%d)=%s\n",startLine,endLine,result.data());
+  //printf("readCodeFragment(%d-%d)=%s\n",startLine,endLine,result.data());
   return found;
 }
 
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 2dadc12..edc895d 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -107,7 +107,7 @@ class DiagramRowIterator : public QListIterator<DiagramRow>
       : QListIterator<DiagramRow>(d) {}
 };
 
-/** Class represeting the tree layout for the built-in class diagram. */
+/** Class representing the tree layout for the built-in class diagram. */
 class TreeDiagram : public QList<DiagramRow>
 {
   public:
@@ -308,7 +308,7 @@ QCString DiagramItem::label() const
   QCString result;
   if (!templSpec.isEmpty())
   {
-    // we use classDef->name() here and not diplayName() in order
+    // we use classDef->name() here and not displayName() in order
     // to get the name used in the inheritance relation.
     QCString n = classDef->name();
     if (/*n.right(2)=="-g" ||*/ n.right(2)=="-p")
diff --git a/src/dirdef.cpp b/src/dirdef.cpp
index 5db8b99..ba792e1 100644
--- a/src/dirdef.cpp
+++ b/src/dirdef.cpp
@@ -94,7 +94,7 @@ static int g_dirCount=0;
 DirDefImpl::DirDefImpl(const char *path) : DefinitionImpl(path,1,1,path)
 {
   bool fullPathNames = Config_getBool(FULL_PATH_NAMES);
-  // get display name (stipping the paths mentioned in STRIP_FROM_PATH)
+  // get display name (stripping the paths mentioned in STRIP_FROM_PATH)
   // get short name (last part of path)
   m_shortName = path;
   m_diskName = path;
diff --git a/src/docparser.cpp b/src/docparser.cpp
index a22087e..6d5e777 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -4562,7 +4562,7 @@ void DocSimpleSect::appendLinkWord(const QCString &word)
   {
     p = (DocPara *)m_children.getLast();
     
-    // Comma-seperate <seealso> links.
+    // Comma-separate <seealso> links.
     p->injectToken(TK_WORD,",");
     p->injectToken(TK_WHITESPACE," ");
   }
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 22b14a0..f0a6a83 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -329,8 +329,8 @@ static int yyread(char *buf,int max_size)
 
 //--------------------------------------------------------------------------
 //#define REAL_YY_DECL int doctokenizerYYlex (void)
-//#define YY_DECL static int local_doctokinizer(void)
-//#define LOCAL_YY_DECL local_doctokinizer()
+//#define YY_DECL static int local_doctokenizer(void)
+//#define LOCAL_YY_DECL local_doctokenizer()
 
 %}
 
diff --git a/src/dotdirdeps.cpp b/src/dotdirdeps.cpp
index 98c7ca7..c70128c 100644
--- a/src/dotdirdeps.cpp
+++ b/src/dotdirdeps.cpp
@@ -140,8 +140,8 @@ void writeDotDirDepGraph(FTextStream &t,const DirDef *dd,bool linkRelations)
     for (udi.toFirst();(udir=udi.current());++udi) // foreach used dir
     {
       const DirDef *usedDir=udir->dir();
-      if ((dir!=dd || !udir->inherited()) &&     // only show direct dependendies for this dir
-        (usedDir!=dd || !udir->inherited()) && // only show direct dependendies for this dir
+      if ((dir!=dd || !udir->inherited()) &&     // only show direct dependencies for this dir
+        (usedDir!=dd || !udir->inherited()) && // only show direct dependencies for this dir
         !usedDir->isParentOf(dir) &&             // don't point to own parent
         dirsInGraph.find(usedDir->getOutputFileBase())) // only point to nodes that are in the graph
       {
diff --git a/src/dotgraph.cpp b/src/dotgraph.cpp
index bbffaf0..9b7ddb7 100644
--- a/src/dotgraph.cpp
+++ b/src/dotgraph.cpp
@@ -117,7 +117,7 @@ QCString DotGraph::writeGraph(
         EmbeddedOutputFormat ef,  // html, latex, ...
         const char* path,         // output folder
         const char* fileName,     // name of the code file (for code patcher)
-        const char* relPath,      // output folder relativ to code file
+        const char* relPath,      // output folder relative to code file
         bool generateImageMap,    // in case of bitmap, shall there be code generated?
         int graphId)              // number of this graph in the current code, used in svg code
 {
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 4f4d13b..a68c339 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1317,7 +1317,7 @@ static void addClassToContext(const Entry *root)
     //printf("ClassDict.insert(%s)\n",fullName.data());
     Doxygen::classSDict->append(fullName,cd);
 
-    if (cd->isGeneric()) // generics are also stored in a separate dictionary for fast lookup of instantions
+    if (cd->isGeneric()) // generics are also stored in a separate dictionary for fast lookup of instances
     {
       //printf("inserting generic '%s' cd=%p\n",fullName.data(),cd);
       Doxygen::genericsDict->insert(fullName,cd);
@@ -6540,7 +6540,7 @@ static void findMember(const Entry *root,
 
           // first note that we pass:
           //   (root->tArgLists ? root->tArgLists->last() : 0)
-          // for the template arguments fo the new "member."
+          // for the template arguments for the new "member."
           // this accurately reflects the template arguments of
           // the related function, which don't have to do with
           // those of the related class.
@@ -9497,7 +9497,7 @@ static void parseFiles(const std::unique_ptr<Entry> &root)
       }
     }
   }
-  else // normal pocessing
+  else // normal processing
 #endif
   {
     StringListIterator it(g_inputFiles);
@@ -9588,7 +9588,7 @@ static QDict<void> g_pathsVisited(1009);
 //----------------------------------------------------------------------------
 // Read all files matching at least one pattern in 'patList' in the
 // directory represented by 'fi'.
-// The directory is read iff the recusiveFlag is set.
+// The directory is read iff the recursiveFlag is set.
 // The contents of all files is append to the input string
 
 int readDir(QFileInfo *fi,
@@ -11924,7 +11924,7 @@ void generateOutput()
 
   cleanUpDoxygen();
 
-  finializeSearchIndexer();
+  finalizeSearchIndexer();
 //  Doxygen::symbolStorage->close();
   QDir thisDir;
   thisDir.remove(Doxygen::objDBFileName);
diff --git a/src/filedef.cpp b/src/filedef.cpp
index f358dba..f00c82b 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -735,7 +735,7 @@ void FileDefImpl::writeClassDeclarations(OutputList &ol,const QCString &title,Cl
 
 void FileDefImpl::writeInlineClasses(OutputList &ol)
 {
-  // temporarily undo the disbling could be done by startMemberDocumentation()
+  // temporarily undo the disabling could be done by startMemberDocumentation()
   // as a result of setting SEPARATE_MEMBER_PAGES to YES; see bug730512
   bool isEnabled = ol.isEnabled(OutputGenerator::Html);
   ol.enable(OutputGenerator::Html);
diff --git a/src/fortrancode.l b/src/fortrancode.l
index 303bbfb..72feb3d 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -17,7 +17,7 @@
  */
 
 /**
- @todo - continutation lines not always recognized
+ @todo - continuation lines not always recognized
        - merging of use-statements with same module name and different only-names
        - rename part of use-statement
        - links to interface functions 
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 161deae..a053910 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -141,7 +141,7 @@ static const char *     inputString;
 static int		inputPosition;
 static bool             isFixedForm;
 static QCString         inputStringPrepass; ///< Input string for prepass of line cont. '&'
-static QCString         inputStringSemi; ///< Input string after command separetor ';'
+static QCString         inputStringSemi; ///< Input string after command separator ';'
 static unsigned int     inputPositionPrepass;
 static int              lineCountPrepass = 0;
 
@@ -1841,7 +1841,7 @@ static QCString extractFromParens(const QCString name)
   return extracted;
 }
 
-/*! remove unuseful spaces from bind statement */
+/*! remove useless spaces from bind statement */
 static QCString extractBind(const QCString name)
 {
   QCString parensPart = extractFromParens(name);
@@ -2540,7 +2540,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
       // strip direction
       loc_doc = loc_doc.right(loc_doc.length()-strlen(directionParam[SymbolModifiers::IN]));
       loc_doc.stripWhiteSpace();
-      // in case of empty documentation or (now) just name, consider it as no documemntation
+      // in case of empty documentation or (now) just name, consider it as no documentation
       if (!loc_doc.isEmpty() && (loc_doc.lower() != argName.lower()))
       {
         handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::IN] + " " + 
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 20cb6ca..c514102 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -93,7 +93,7 @@ HtmlHelpIndex::~HtmlHelpIndex()
 }
 
 /*! Stores an item in the index if it is not already present. 
- *  Items are stored in alphetical order, by sorting on the
+ *  Items are stored in alphabetical order, by sorting on the
  *  concatenation of \a level1 and \a level2 (if present).
  *
  *  \param level1 the string at level 1 in the index.
diff --git a/src/languages.py b/src/languages.py
index 5bb65cf..ea3f348 100755
--- a/src/languages.py
+++ b/src/languages.py
@@ -74,7 +74,7 @@ for f in new_list:
         tmp = tmp.replace("\n","")
         l = re.sub('[^"]*"([^"]*)".*','\\1',tmp)
         l1 = l.replace("-","")
-        # capatalize first letter
+        # capitalize first letter
         l = l.title()
         print("""\
                                    <EnumProperty
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index e6c6861..0d529ab 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1919,7 +1919,7 @@ void LatexGenerator::endMemberDescription()
 
 void LatexGenerator::writeNonBreakableSpace(int) 
 {
-  //printf("writeNonBreakbleSpace()\n");
+  //printf("writeNonBreakableSpace()\n");
   if (insideTabbing)
   {
     t << "\\>";
diff --git a/src/markdown.cpp b/src/markdown.cpp
index d1a6a63..f6720ea 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2021,7 +2021,7 @@ static int writeBlockQuote(GrowBuf &out,const char *data,int size)
         out.addStr("<blockquote>\n");
       }
     }
-    else if (level<curLevel) // quote level descreased => add end markers
+    else if (level<curLevel) // quote level decreased => add end markers
     {
       for (l=level;l<curLevel;l++)
       {
@@ -2470,7 +2470,7 @@ static QCString detab(const QCString &s,int &refIndent)
           while (stop--) out.addChar(' '); 
         }
         break;
-      case '\n': // reset colomn counter
+      case '\n': // reset column counter
         out.addChar(c);
         col=0;
         break;
diff --git a/src/pre.l b/src/pre.l
index 5e46110..3f935d9 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -87,7 +87,7 @@ struct FileState
 };  
 
 /** @brief Singleton that manages the defines available while 
- *  proprocessing files. 
+ *  preprocessing files. 
  */
 class DefineManager
 {
diff --git a/src/pycode.l b/src/pycode.l
index 8cae0e2..4ff4fc1 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1276,7 +1276,7 @@ TARGET           ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBUT
 
     {BB}/({NONEMPTY}|{EXPCHAR}) {
                                  // This implements poor
-				 // indendation-tracking;
+				 // indentation-tracking;
                                  // should be improved.
 				 // (translate tabs to space, etc)
   		                 codifyLines(yytext);
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index f32936e..6ec5231 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -1952,7 +1952,7 @@ void RTFGenerator::endCodeFragment()
 {
   //newParagraph();
   //styleStack.pop();
-  //printf("RTFGenerator::endCodeFrament() top=%s\n",styleStack.top());
+  //printf("RTFGenerator::endCodeFragment() top=%s\n",styleStack.top());
   //t << rtf_Style_Reset << styleStack.top() << endl;
   //endCodeLine checks is there is still an open code line, if so closes it.
   endCodeLine();
diff --git a/src/rtfgen.h b/src/rtfgen.h
index b5f06f0..575b9a3 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -283,7 +283,7 @@ class RTFGenerator : public OutputGenerator
     bool m_prettyCode;
 
     bool m_bstartedBody;  // has startbody been called yet?
-    int  m_listLevel; // // RTF does not really have a addative indent...manually set list level.
+    int  m_listLevel; // // RTF does not really have a additive indent...manually set list level.
     bool m_omitParagraph; // should a the next paragraph command be ignored?
     int  m_numCols; // number of columns in a table
     QCString relPath;
diff --git a/src/scanner.l b/src/scanner.l
index 2259085..8710ca2 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -3230,7 +3230,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  *pCopyRoundGString+=*yytext;
   					}
 
-  /* generic square bracket list copy rules for growable strings, we should only enter here in case of php, left the test part as in GCopyRound to keep it compatible with te round bracket version */
+  /* generic square bracket list copy rules for growable strings, we should only enter here in case of php, left the test part as in GCopyRound to keep it compatible with the round bracket version */
 <GCopySquare>\"                         {
                                           *pCopySquareGString+=*yytext;
                                             pCopyQuotedGString=pCopySquareGString;
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index b21d587..06c5c75 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -1372,7 +1372,7 @@ void initSearchIndexer()
   }
 }
 
-void finializeSearchIndexer()
+void finalizeSearchIndexer()
 {
   delete Doxygen::searchIndex;
 }
diff --git a/src/searchindex.h b/src/searchindex.h
index 9a612ad..8cbe352 100644
--- a/src/searchindex.h
+++ b/src/searchindex.h
@@ -34,7 +34,7 @@ class MemberDef;
 /*! Initialize the search indexer */
 void initSearchIndexer();
 /*! Cleanup the search indexer */
-void finializeSearchIndexer();
+void finalizeSearchIndexer();
 
 //------- server side search index ----------------------
 
diff --git a/src/sortdict.h b/src/sortdict.h
index 0e0b5c1..203ae5e 100644
--- a/src/sortdict.h
+++ b/src/sortdict.h
@@ -244,7 +244,7 @@ class SDict
       return m_list->find(item);
     }
 
-    /*! Equavalent to find(). */
+    /*! Equivalent to find(). */
     T *operator[](const char *key) const
     {
       return m_dict->find(key);
@@ -553,7 +553,7 @@ class SIntDict
       return m_dict->find(key);
     }
 
-    /*! Equavalent to find(). */
+    /*! Equivalent to find(). */
     T *operator[](int key) const
     {
       return m_dict->find(key);
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index dc0cc85..4192c28 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -1099,7 +1099,7 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co
 static void insertMemberDefineParams(int memberdef_id,const MemberDef *md, const Definition *def)
 {
     if (md->argumentList().empty()) // special case for "foo()" to
-                                    // disguish it from "foo".
+                                    // distinguish it from "foo".
     {
       DBG_CTX(("no params\n"));
     }
diff --git a/src/template.cpp b/src/template.cpp
index 228da4d..173df74 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -4693,7 +4693,7 @@ void TemplateLexer::tokenize(QList<TemplateToken> &tokens)
         {
           state=StateBeginTemplate;
         }
-        else if (c!=' ' && c!='\t' && c!='\n') // non-whitepace text
+        else if (c!=' ' && c!='\t' && c!='\n') // non-whitespace text
         {
           emptyOutputLine=FALSE;
         }
diff --git a/src/util.cpp b/src/util.cpp
index 8e0884f..23ce18e 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -955,7 +955,7 @@ class AccessStack
  */
 int isAccessibleFrom(const Definition *scope,const FileDef *fileScope,const Definition *item)
 {
-  //printf("<isAccesibleFrom(scope=%s,item=%s itemScope=%s)\n",
+  //printf("<isAccessibleFrom(scope=%s,item=%s itemScope=%s)\n",
   //    scope->name().data(),item->name().data(),item->getOuterScope()->name().data());
 
   static AccessStack accessStack;
diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h
index 18985ff..1d9397b 100644
--- a/src/vhdldocgen.h
+++ b/src/vhdldocgen.h
@@ -194,7 +194,6 @@ class VhdlDocGen
     static void correctMemberProperties(MemberDef *md);
     
     static void writeSource(const MemberDef *mdef,OutputList& ol,const QCString & cname);
-    static void writeAlphbeticalClass(OutputList& ol,const ClassDef* cd,const QCString &);
 
     static QCString  parseForConfig(QCString & entity,QCString & arch);
     static QCString  parseForBinding(QCString & entity,QCString & arch);
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index 39981a0..d6e3ac3 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -347,7 +347,7 @@ void VhdlParser::addCompInst(const char *n, const char* instName, const char* co
     current->write=genLabels.right(genLabels.length()-u);
     current->read=genLabels.left(u);
   }
-  //printf  (" \n genlable: [%s]  inst: [%s]  name: [%s] %d\n",n,instName,comp,iLine);
+  //printf  (" \n genlabel: [%s]  inst: [%s]  name: [%s] %d\n",n,instName,comp,iLine);
 
   if (lastCompound)
   {
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index dfbf630..8532ac3 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -430,7 +430,7 @@ void writeXMLCodeBlock(FTextStream &t,FileDef *fd)
                 fd,          // fileDef
                 -1,          // startLine
                 -1,          // endLine
-                FALSE,       // inlineFragement
+                FALSE,       // inlineFragment
                 0,           // memberDef
                 TRUE         // showLineNumbers
                 );
@@ -900,7 +900,7 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
           md->argsString()) // define
   {
     if (md->argumentList().empty())     // special case for "foo()" to
-                                        // disguish it from "foo".
+                                        // distinguish it from "foo".
     {
       t << "        <param></param>" << endl;
     }
-- 
cgit v0.12


From c7716a291ca04369292d57e0a472bd2f350d1bf1 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 5 Nov 2019 15:29:14 +0100
Subject: Spelling corrections for addon directory

Spelling corrections as in #561.
The Doxyfiles have been regenerated to conform the current status (a.o. no obsolete tags)
---
 addon/doxmlparser/Doxyfile            | 309 +++++++++++++++++++++++++---------
 addon/doxmlparser/Doxyfile.impl       | 307 ++++++++++++++++++++++++---------
 addon/doxmlparser/include/doxmlintf.h |   2 +-
 addon/doxmlparser/test/main.cpp       |   2 +-
 4 files changed, 468 insertions(+), 152 deletions(-)

diff --git a/addon/doxmlparser/Doxyfile b/addon/doxmlparser/Doxyfile
index e95ee76..2cef6cf 100644
--- a/addon/doxmlparser/Doxyfile
+++ b/addon/doxmlparser/Doxyfile
@@ -1,176 +1,335 @@
-# Doxyfile 1.2.12-20011209
+# Doxyfile 1.8.17
 
 #---------------------------------------------------------------------------
-# General configuration options
+# Project related configuration options
 #---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = doxmlparser
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         =
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = doc
+CREATE_SUBDIRS         = NO
+ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
+OUTPUT_TEXT_DIRECTION  = None
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+JAVADOC_BANNER         = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 8
+ALIASES                =
+TCL_SUBST              =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
+AUTOLINK_SUPPORT       = YES
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
 EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = YES
+EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
-STRIP_CODE_COMMENTS    = YES
 CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = NO
 HIDE_SCOPE_NAMES       = NO
-VERBATIM_HEADERS       = YES
+HIDE_COMPOUND_REFERENCE= NO
 SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = NO
-INHERIT_DOCS           = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
-ALIASES                = 
-ENABLED_SECTIONS       = 
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = NO
 SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
-WARN_FORMAT            = 
-WARN_LOGFILE           = 
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_AS_ERROR          = NO
+WARN_FORMAT            =
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = include
+INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *.h
 RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 SOURCE_BROWSER         = YES
 INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = 
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
+HTML_OUTPUT            =
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = NO
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
 GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
+ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 GENERATE_LATEX         = NO
-LATEX_OUTPUT           = 
+LATEX_OUTPUT           =
+LATEX_CMD_NAME         =
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
+LATEX_TIMESTAMP        = NO
+LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 GENERATE_RTF           = NO
-RTF_OUTPUT             = 
+RTF_OUTPUT             =
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 GENERATE_MAN           = NO
-MAN_OUTPUT             = 
-MAN_EXTENSION          = 
+MAN_OUTPUT             =
+MAN_EXTENSION          =
+MAN_SUBDIR             =
 MAN_LINKS              = NO
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 GENERATE_XML           = YES
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 TAGFILES               = ../../qtools_docs/qtools.tag=../../../../qtools_docs/html
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
+DIA_PATH               =
+HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = NO
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = YES
-HIDE_UNDOC_RELATIONS   = YES
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1280
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+MSCFILE_DIRS           =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = 
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = 
-EXT_DOC_PATHS          = 
diff --git a/addon/doxmlparser/Doxyfile.impl b/addon/doxmlparser/Doxyfile.impl
index 88818ab..5bddcc4 100644
--- a/addon/doxmlparser/Doxyfile.impl
+++ b/addon/doxmlparser/Doxyfile.impl
@@ -1,178 +1,335 @@
-# Doxyfile 1.2.13.1
+# Doxyfile 1.8.17
 
 #---------------------------------------------------------------------------
-# General configuration options
+# Project related configuration options
 #---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = doxmlparser
-PROJECT_NUMBER         = 
+PROJECT_NUMBER         =
+PROJECT_BRIEF          =
+PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = doc_impl
+CREATE_SUBDIRS         = NO
+ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
+OUTPUT_TEXT_DIRECTION  = None
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = NO
+JAVADOC_BANNER         = NO
+QT_AUTOBRIEF           = NO
+MULTILINE_CPP_IS_BRIEF = NO
+INHERIT_DOCS           = YES
+SEPARATE_MEMBER_PAGES  = NO
+TAB_SIZE               = 8
+ALIASES                =
+TCL_SUBST              =
+OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_JAVA   = NO
+OPTIMIZE_FOR_FORTRAN   = NO
+OPTIMIZE_OUTPUT_VHDL   = NO
+OPTIMIZE_OUTPUT_SLICE  = NO
+EXTENSION_MAPPING      =
+MARKDOWN_SUPPORT       = YES
+TOC_INCLUDE_HEADINGS   = 5
+AUTOLINK_SUPPORT       = YES
+BUILTIN_STL_SUPPORT    = NO
+CPP_CLI_SUPPORT        = NO
+SIP_SUPPORT            = NO
+IDL_PROPERTY_SUPPORT   = YES
+DISTRIBUTE_GROUP_DOC   = NO
+GROUP_NESTED_COMPOUNDS = NO
+SUBGROUPING            = YES
+INLINE_GROUPED_CLASSES = NO
+INLINE_SIMPLE_STRUCTS  = NO
+TYPEDEF_HIDES_STRUCT   = NO
+LOOKUP_CACHE_SIZE      = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
 EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = YES
+EXTRACT_PRIV_VIRTUAL   = NO
+EXTRACT_PACKAGE        = NO
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+EXTRACT_ANON_NSPACES   = NO
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
-STRIP_CODE_COMMENTS    = YES
 CASE_SENSE_NAMES       = YES
-SHORT_NAMES            = NO
 HIDE_SCOPE_NAMES       = NO
-VERBATIM_HEADERS       = YES
+HIDE_COMPOUND_REFERENCE= NO
 SHOW_INCLUDE_FILES     = YES
-JAVADOC_AUTOBRIEF      = NO
-INHERIT_DOCS           = YES
+SHOW_GROUPED_MEMB_INC  = NO
+FORCE_LOCAL_INCLUDES   = NO
 INLINE_INFO            = YES
 SORT_MEMBER_DOCS       = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
+SORT_BRIEF_DOCS        = NO
+SORT_MEMBERS_CTORS_1ST = NO
+SORT_GROUP_NAMES       = NO
+SORT_BY_SCOPE_NAME     = NO
+STRICT_PROTO_MATCHING  = NO
 GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
-ALIASES                = 
-ENABLED_SECTIONS       = 
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
-OPTIMIZE_OUTPUT_FOR_C  = NO
 SHOW_USED_FILES        = YES
+SHOW_FILES             = YES
+SHOW_NAMESPACES        = YES
+FILE_VERSION_FILTER    =
+LAYOUT_FILE            =
+CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 QUIET                  = NO
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
-WARN_FORMAT            = 
-WARN_LOGFILE           = 
+WARN_IF_DOC_ERROR      = YES
+WARN_NO_PARAMDOC       = NO
+WARN_AS_ERROR          = NO
+WARN_FORMAT            =
+WARN_LOGFILE           =
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = src
-FILE_PATTERNS          = 
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          =
 RECURSIVE              = NO
-EXCLUDE                = 
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
+EXCLUDE_SYMBOLS        =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
+FILTER_SOURCE_PATTERNS =
+USE_MDFILE_AS_MAINPAGE =
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES
 REFERENCES_RELATION    = YES
+REFERENCES_LINK_SOURCE = YES
+SOURCE_TOOLTIPS        = YES
+USE_HTAGS              = NO
+VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = 
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
+HTML_OUTPUT            =
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            =
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_FILES       =
+HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_GAMMA  = 80
+HTML_TIMESTAMP         = NO
+HTML_DYNAMIC_MENUS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
+HTML_INDEX_NUM_ENTRIES = 100
+GENERATE_DOCSET        = NO
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+DOCSET_PUBLISHER_NAME  = Publisher
 GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
+CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
+GENERATE_QHP           = NO
+QCH_FILE               =
+QHP_NAMESPACE          = org.doxygen.Project
+QHP_VIRTUAL_FOLDER     = doc
+QHP_CUST_FILTER_NAME   =
+QHP_CUST_FILTER_ATTRS  =
+QHP_SECT_FILTER_ATTRS  =
+QHG_LOCATION           =
+GENERATE_ECLIPSEHELP   = NO
+ECLIPSE_DOC_ID         = org.doxygen.Project
 DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
+ENUM_VALUES_PER_LINE   = 4
 TREEVIEW_WIDTH         = 250
+EXT_LINKS_IN_WINDOW    = NO
+FORMULA_FONTSIZE       = 10
+FORMULA_TRANSPARENT    = YES
+USE_MATHJAX            = NO
+MATHJAX_FORMAT         = HTML-CSS
+MATHJAX_RELPATH        = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/
+MATHJAX_EXTENSIONS     =
+MATHJAX_CODEFILE       =
+SEARCHENGINE           = NO
+SERVER_BASED_SEARCH    = NO
+EXTERNAL_SEARCH        = NO
+SEARCHENGINE_URL       =
+SEARCHDATA_FILE        = searchdata.xml
+EXTERNAL_SEARCH_ID     =
+EXTRA_SEARCH_MAPPINGS  =
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 GENERATE_LATEX         = NO
-LATEX_OUTPUT           = 
+LATEX_OUTPUT           =
+LATEX_CMD_NAME         =
+MAKEINDEX_CMD_NAME     = makeindex
+LATEX_MAKEINDEX_CMD    = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+LATEX_FOOTER           =
+LATEX_EXTRA_STYLESHEET =
+LATEX_EXTRA_FILES      =
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+LATEX_SOURCE_CODE      = NO
+LATEX_BIB_STYLE        = plain
+LATEX_TIMESTAMP        = NO
+LATEX_EMOJI_DIRECTORY  =
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 GENERATE_RTF           = NO
-RTF_OUTPUT             = 
+RTF_OUTPUT             =
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+RTF_SOURCE_CODE        = NO
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 GENERATE_MAN           = NO
-MAN_OUTPUT             = 
-MAN_EXTENSION          = 
+MAN_OUTPUT             =
+MAN_EXTENSION          =
+MAN_SUBDIR             =
 MAN_LINKS              = NO
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 GENERATE_XML           = YES
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = YES
+XML_NS_MEMB_FILE_SCOPE = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+GENERATE_DOCBOOK       = NO
+DOCBOOK_OUTPUT         = docbook
+DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 GENERATE_AUTOGEN_DEF   = NO
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
 EXPAND_AS_DEFINED      = DEFINE_CLS_IMPL
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 TAGFILES               = ../../qtools_docs/qtools.tag=../../../../qtools_docs/html
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
+EXTERNAL_PAGES         = YES
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
+# Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = NO
+DIA_PATH               =
+HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
+DOT_NUM_THREADS        = 0
+DOT_FONTNAME           = Helvetica
+DOT_FONTSIZE           = 10
+DOT_FONTPATH           =
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = YES
+GROUP_GRAPHS           = YES
+UML_LOOK               = NO
+UML_LIMIT_NUM_FIELDS   = 10
 TEMPLATE_RELATIONS     = YES
-HIDE_UNDOC_RELATIONS   = YES
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = NO
+CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1280
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DIRECTORY_GRAPH        = YES
+DOT_IMAGE_FORMAT       = png
+INTERACTIVE_SVG        = NO
+DOT_PATH               =
+DOTFILE_DIRS           =
+MSCFILE_DIRS           =
+DIAFILE_DIRS           =
+PLANTUML_JAR_PATH      =
+PLANTUML_CFG_FILE      =
+PLANTUML_INCLUDE_PATH  =
+DOT_GRAPH_MAX_NODES    = 50
+MAX_DOT_GRAPH_DEPTH    = 0
+DOT_TRANSPARENT        = NO
+DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
-CGI_NAME               = 
-CGI_URL                = 
-DOC_URL                = 
-DOC_ABSPATH            = 
-BIN_ABSPATH            = 
-EXT_DOC_PATHS          = 
diff --git a/addon/doxmlparser/include/doxmlintf.h b/addon/doxmlparser/include/doxmlintf.h
index 22cecdb..cb4a9eb 100644
--- a/addon/doxmlparser/include/doxmlintf.h
+++ b/addon/doxmlparser/include/doxmlintf.h
@@ -1114,7 +1114,7 @@ class IDoxygen
     virtual ICompoundIterator *memberByName(const char * name) const = 0;
 
     /*! Releases the memory for the object hierarchy obtained by 
-     *  createdObjecModelFromXML(). First release all iterators before calling
+     *  createdObjectModel(). First release all iterators before calling
      *  this function.
      */
     virtual void release() = 0;
diff --git a/addon/doxmlparser/test/main.cpp b/addon/doxmlparser/test/main.cpp
index 70c79da..0d1f95e 100644
--- a/addon/doxmlparser/test/main.cpp
+++ b/addon/doxmlparser/test/main.cpp
@@ -707,7 +707,7 @@ int main(int argc,char **argv)
       printf("==== inheritance graph ==== \n");
       DumpGraph(cls->inheritanceGraph());
 
-      printf("==== collabration graph ==== \n");
+      printf("==== collaboration graph ==== \n");
       DumpGraph(cls->collaborationGraph());
 
       printf("==== base classes ==== \n");
-- 
cgit v0.12


From 83b138afee3405c1b08b671efccba5b3ec1ec45c Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 5 Nov 2019 15:58:43 +0100
Subject: Spelling corrections for libmscgen directory

Spelling corrections as found by codespell.

The original package was written by UK-English writing person so left the words in UK-English (upon request this can be changed as well to US-English spelling).
---
 libmscgen/gd.h               | 4 ++--
 libmscgen/mscgen_adraw.h     | 2 +-
 libmscgen/mscgen_adraw_int.h | 2 +-
 libmscgen/mscgen_api.c       | 8 ++++----
 libmscgen/mscgen_gd_out.c    | 2 +-
 libmscgen/mscgen_lexer.l     | 2 +-
 libmscgen/mscgen_msc.h       | 4 ++--
 libmscgen/mscgen_usage.c     | 2 +-
 libmscgen/mscgen_utf8.c      | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libmscgen/gd.h b/libmscgen/gd.h
index d6bbebd..c1a5754 100644
--- a/libmscgen/gd.h
+++ b/libmscgen/gd.h
@@ -333,7 +333,7 @@ typedef double (* interpolation_method )(double);
      <Accessor Macros>
 
    (Previous versions of this library encouraged directly manipulating
-   the contents ofthe struct but we are attempting to move away from
+   the contents of the struct but we are attempting to move away from
    this practice so the fields are no longer documented here.  If you
    need to poke at the internals of this struct, feel free to look at
    *gd.h*.)
@@ -1572,7 +1572,7 @@ BGD_DECLARE(int) gdTransformAffineBoundingBox(gdRectPtr src, const double affine
  *
  * Constants:
  *   GD_CMP_IMAGE       - Actual image IS different
- *   GD_CMP_NUM_COLORS  - Number of colors in pallette differ
+ *   GD_CMP_NUM_COLORS  - Number of colors in palette differ
  *   GD_CMP_COLOR       - Image colors differ
  *   GD_CMP_SIZE_X      - Image width differs
  *   GD_CMP_SIZE_Y      - Image heights differ
diff --git a/libmscgen/mscgen_adraw.h b/libmscgen/mscgen_adraw.h
index b2e11a3..9ac1037 100644
--- a/libmscgen/mscgen_adraw.h
+++ b/libmscgen/mscgen_adraw.h
@@ -253,7 +253,7 @@ ADraw;
  * image functions to be executed.
  *
  * \param[in] w                The width of the output image.
- * \param[in] h                The height of the ouput image.
+ * \param[in] h                The height of the oupput image.
  * \param[in] file             The file to which the image should be written.
  * \param[in] fontName         The name of the font to use for rendering.
  * \param[in] type             The output type to generate.
diff --git a/libmscgen/mscgen_adraw_int.h b/libmscgen/mscgen_adraw_int.h
index 6f79ca4..1912fe1 100644
--- a/libmscgen/mscgen_adraw_int.h
+++ b/libmscgen/mscgen_adraw_int.h
@@ -29,7 +29,7 @@
  * Preprocessor Macros
  ***************************************************************************/
 
-/* Define macro to supress unused parameter warnings */
+/* Define macro to suppress unused parameter warnings */
 #ifndef UNUSED
 # ifdef __GNUC__
 #  define UNUSED __attribute__((unused))
diff --git a/libmscgen/mscgen_api.c b/libmscgen/mscgen_api.c
index 31f5556..c5a9eb3 100644
--- a/libmscgen/mscgen_api.c
+++ b/libmscgen/mscgen_api.c
@@ -662,7 +662,7 @@ static char *getLine(const char        *string,
  * \param  x           The x position at which the entity text should be centered.
  * \param  y           The y position where the text should be placed.
  * \param  entLabel    The label to render, which maybe \a NULL in which case
- *                       no ouput is produced.
+ *                       no output is produced.
  * \param  entUrl      The URL for rendering the label as a hyperlink.  This
  *                       maybe \a NULL if not required.
  * \param  entId       The text identifier for the arc.
@@ -704,7 +704,7 @@ static void entityText(Context          *ctx,
             /* Check if a URL is associated */
             if(entUrl)
             {
-                /* If no explict colour has been set, make URLS blue */
+                /* If no explicit colour has been set, make URLS blue */
                 ctx->drw.setPen(&ctx->drw, ADRAW_COL_BLUE);
 
                 /* Image map output */
@@ -1431,7 +1431,7 @@ static void arcLine(Context          *ctx,
  */
 static Boolean checkMsc(Msc m)
 {
-    /* Check all arc entites are known */
+    /* Check all arc entities are known */
     MscResetArcIterator(m);
     do
     {
@@ -1710,7 +1710,7 @@ int mscgen_generate(const char *inputFile,
         assert(startCol != -1);
         assert(endCol != -1 || isBroadcastArc(MscGetCurrentArcDest(m)));
 
-        /* Check for entity colouring if not set explicity on the arc */
+        /* Check for entity colouring if not set explicitly on the arc */
         if (arcTextColour == NULL)
         {
           arcTextColour = MscGetEntAttrib(m, startCol, MSC_ATTR_ARC_TEXT_COLOUR);
diff --git a/libmscgen/mscgen_gd_out.c b/libmscgen/mscgen_gd_out.c
index 263431e..8d8198c 100644
--- a/libmscgen/mscgen_gd_out.c
+++ b/libmscgen/mscgen_gd_out.c
@@ -119,7 +119,7 @@ static int getGdoPen(struct ADrawTag *ctx)
 
 
 /** Given a colour value, convert to a gd colour reference.
- * This searches the current pallette of colours for the passed colour and
+ * This searches the current palette of colours for the passed colour and
  * returns an existing reference if possible.  Otherwise a new colour reference
  * is allocated and returned.
  */
diff --git a/libmscgen/mscgen_lexer.l b/libmscgen/mscgen_lexer.l
index 8410e07..52f5e05 100644
--- a/libmscgen/mscgen_lexer.l
+++ b/libmscgen/mscgen_lexer.l
@@ -142,7 +142,7 @@ NOTE|note                             yylval.arctype = MSC_ARC_NOTE;     return
 %%
 
 /* Handle a new line of input.
- *  This counts the line number and duplicates the string incase we need
+ *  This counts the line number and duplicates the string in case we need
  *  it for error reporting.  The line is then returned back for parsing
  *  without the newline characters prefixed.
  */
diff --git a/libmscgen/mscgen_msc.h b/libmscgen/mscgen_msc.h
index 2c75131..bcbdf3a 100644
--- a/libmscgen/mscgen_msc.h
+++ b/libmscgen/mscgen_msc.h
@@ -217,7 +217,7 @@ int           MscGetEntityIndex(struct MscTag *m, const char *label);
  * @{
  */
 
-/** Reset the entity interator.
+/** Reset the entity iterator.
  * This moves the pointer to the current entity to the head of the list.
  */
 void          MscResetEntityIterator(Msc m);
@@ -249,7 +249,7 @@ const char   *MscGetEntAttrib(Msc m, unsigned int entIdx, MscAttribType a);
  * @{
  */
 
-/** Reset the arc interator.
+/** Reset the arc iterator.
  * This moves the pointer to the current arc to the head of the list.
  */
 void          MscResetArcIterator   (Msc m);
diff --git a/libmscgen/mscgen_usage.c b/libmscgen/mscgen_usage.c
index 2126d44..5d448f8 100644
--- a/libmscgen/mscgen_usage.c
+++ b/libmscgen/mscgen_usage.c
@@ -61,7 +61,7 @@ void Usage(void)
 "              to write output directly to stdout.\n"
 #ifdef USE_FREETYPE
 " -F <font>   Use specified font for PNG output.  This must be a font specifier\n"
-"              compatbile with fontconfig (see 'fc-list'), and overrides the\n"
+"              compatible with fontconfig (see 'fc-list'), and overrides the\n"
 "              MSCGEN_FONT environment variable if also set.\n"
 #endif
 " -p          Print parsed msc output (for parser debug).\n"
diff --git a/libmscgen/mscgen_utf8.c b/libmscgen/mscgen_utf8.c
index 9614c47..e23eef3 100644
--- a/libmscgen/mscgen_utf8.c
+++ b/libmscgen/mscgen_utf8.c
@@ -95,7 +95,7 @@ Boolean Utf8Decode(const char *s, unsigned int *r, unsigned int *bytes)
             }
         }
 
-        /* Success if no NULL was encoutered */
+        /* Success if no NULL was encountered */
         return t == *bytes;
     }
 }
-- 
cgit v0.12


From 04df92f43f9a11c30c5855013dd285b168c621f5 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 5 Nov 2019 17:38:09 +0100
Subject: Spelling corrections for qtools directory

Spelling corrections as found by codespell and in #561.

Some reported problems were already fixed, others are fixed here.
---
 qtools/qcstring.h     |  2 +-
 qtools/qdict.doc      |  2 +-
 qtools/qglobal.h      |  2 +-
 qtools/qlist.doc      |  2 +-
 qtools/qstring.cpp    |  2 +-
 qtools/qtextcodec.cpp |  2 +-
 qtools/qtl.doc        |  2 +-
 qtools/qvaluelist.doc |  6 +++---
 qtools/qxml.cpp       | 14 +++++++-------
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/qtools/qcstring.h b/qtools/qcstring.h
index f484207..c2a5dc3 100644
--- a/qtools/qcstring.h
+++ b/qtools/qcstring.h
@@ -329,7 +329,7 @@ public:
       return m_rep.at(i);
     }
 
-    /** Indexing operator. Equavalent to at(). */
+    /** Indexing operator. Equivalent to at(). */
     char &operator[]( int i ) const
     {
       return m_rep.at((uint)i);
diff --git a/qtools/qdict.doc b/qtools/qdict.doc
index a414d3f..bf1ea01 100644
--- a/qtools/qdict.doc
+++ b/qtools/qdict.doc
@@ -175,7 +175,7 @@
 
   Setting \e caseSensitive to TRUE will treat "abc" and "Abc" as different
   keys.  Setting it to FALSE will make the dictionary ignore case.
-  Case insensitive comparison includes the whole Unicode alphabeth.
+  Case insensitive comparison includes the whole Unicode alphabet.
 */
 
 /*!
diff --git a/qtools/qglobal.h b/qtools/qglobal.h
index 8512f41..56b2d40 100644
--- a/qtools/qglobal.h
+++ b/qtools/qglobal.h
@@ -175,7 +175,7 @@
 //
 
 
-// Should be sorted most-authorative to least-authorative
+// Should be sorted most-authoritative to least-authoritative
 
 #if defined(__SC__)
 #define _CC_SYM_
diff --git a/qtools/qlist.doc b/qtools/qlist.doc
index 59cc971..4f97e35 100644
--- a/qtools/qlist.doc
+++ b/qtools/qlist.doc
@@ -858,7 +858,7 @@
 
 /*!
   \fn type *QListIterator::operator*()
-  Asterix operator. Returns a pointer to the current iterator item.
+  Asterisk operator. Returns a pointer to the current iterator item.
   Same as current().
 */
 
diff --git a/qtools/qstring.cpp b/qtools/qstring.cpp
index 0e2b14a..e809d0d 100644
--- a/qtools/qstring.cpp
+++ b/qtools/qstring.cpp
@@ -11538,7 +11538,7 @@ static inline bool format(QChar::Decomposition tag, QString & str,
   Applies possible ligatures to a QString, useful when composition-rich
   text requires rendering with glyph-poor fonts, but also
   makes compositions such as QChar(0x0041) ('A') and QChar(0x0308)
-  (Unicode accent diaresis) giving QChar(0x00c4) (German A Umlaut).
+  (Unicode accent diaeresis) giving QChar(0x00c4) (German A Umlaut).
 */
 void QString::compose()
 {
diff --git a/qtools/qtextcodec.cpp b/qtools/qtextcodec.cpp
index 842a72d..8ce266d 100644
--- a/qtools/qtextcodec.cpp
+++ b/qtools/qtextcodec.cpp
@@ -280,7 +280,7 @@ int QTextCodec::heuristicNameMatch(const char* hint) const
 }
 
 
-// returns a string cotnaining the letters and numbers from input,
+// returns a string containing the letters and numbers from input,
 // with a space separating run of a character class.  e.g. "iso8859-1"
 // becomes "iso 8859 1"
 static QString lettersAndNumbers( const char * input )
diff --git a/qtools/qtl.doc b/qtools/qtl.doc
index e83b177..8ce89bd 100644
--- a/qtools/qtl.doc
+++ b/qtools/qtl.doc
@@ -38,7 +38,7 @@
 
 \title Qt Template library
 
-Thq Qt Template Library is a set of templates within Qt dealing with
+The Qt Template Library is a set of templates within Qt dealing with
 containers of objects.  It provides a list of objects, a stack of
 objects, a map (or dictionary) from one type to another, and
 associated iterators and algorithms.
diff --git a/qtools/qvaluelist.doc b/qtools/qvaluelist.doc
index f7a0dde..9f34c8e 100644
--- a/qtools/qvaluelist.doc
+++ b/qtools/qvaluelist.doc
@@ -615,12 +615,12 @@
 
 /*!
   \fn T& QValueListIterator::operator*()
-  Asterix operator. Returns a reference to the current iterator item.
+  Asterisk operator. Returns a reference to the current iterator item.
 */
 
 /*!
   \fn const T& QValueListIterator::operator*() const
-  Asterix operator. Returns a reference to the current iterator item.
+  Asterisk operator. Returns a reference to the current iterator item.
 */
 
 /*!
@@ -726,7 +726,7 @@
 
 /*!
   \fn const T& QValueListConstIterator::operator*() const
-  Asterix operator. Returns a reference to the current iterator item.
+  Asterisk operator. Returns a reference to the current iterator item.
 */
 
 /*!
diff --git a/qtools/qxml.cpp b/qtools/qxml.cpp
index 4138a28..f8a4e0d 100644
--- a/qtools/qxml.cpp
+++ b/qtools/qxml.cpp
@@ -778,7 +778,7 @@ void QXmlInputSource::setData( const QString& dat )
 }
 
 /*!
-  Read the XML file from the byte array; try to recoginize the encoding.
+  Read the XML file from the byte array; try to recognize the encoding.
 */
 // ### The input source should not do the encoding detection!
 void QXmlInputSource::readInput( QByteArray& rawData )
@@ -1895,7 +1895,7 @@ private:
   <a href="xml-sax.html#quickStart">Quick start</a>.
 */
 
-//guaranteed not to be a characater
+//guaranteed not to be a character
 const QChar QXmlSimpleReader::QEOF = QChar((ushort)0xffff);
 
 /*!
@@ -2609,7 +2609,7 @@ bool QXmlSimpleReader::parseElementAttribute( QString &prefix, QString &uri, QSt
 		}
 	    }
 	} else {
-	    // no namespace delcaration
+	    // no namespace declaration
 	    d->namespaceSupport.processName( name(), TRUE, uri, lname );
 	    d->attList.qnameList.append( name() );
 	    d->attList.uriList.append( uri );
@@ -3036,7 +3036,7 @@ parseError:
   Precondition: the beginning '<' of the PI is already read and the head stand
   on the '?' of '<?'.
 
-  If this funktion was successful, the head-position is on the first
+  If this function was successful, the head-position is on the first
   character after the PI.
 */
 bool QXmlSimpleReader::parsePI( bool xmldecl )
@@ -3258,7 +3258,7 @@ parseError:
   Precondition: the beginning '<!' of the doctype is already read the head
   stands on the 'D' of '<!DOCTYPE'.
 
-  If this funktion was successful, the head-position is on the first
+  If this function was successful, the head-position is on the first
   character after the document type definition.
 */
 bool QXmlSimpleReader::parseDoctype()
@@ -3915,7 +3915,7 @@ bool QXmlSimpleReader::parseAttlistDecl()
 	{ -1,      Done,    Attdef,  Attdef,   Attdef,  Attdef,  Attdef,  Attdef  }, // Ws1
 	{ Ws2,     -1,      -1,      -1,       -1,      -1,      -1,      -1      }, // Attdef
 	{ -1,      Atttype, Atttype, Atttype,  Atttype, Atttype, Atttype, Atttype }, // Ws2
-	{ Ws3,     -1,      -1,      -1,       -1,      -1,      -1,      -1      }, // Attype
+	{ Ws3,     -1,      -1,      -1,       -1,      -1,      -1,      -1      }, // Atttype
 	{ -1,      Attval,  DDecH,   Attval,   Attval,  Attval,  Attval,  Attval  }, // Ws3
 	{ -1,      -1,      -1,      -1,       DefImp,  DefFix,  DefReq,  -1      }, // DDecH
 	{ Ws4,     Ws4,     -1,      -1,       -1,      -1,      -1,      -1      }, // DefReq
@@ -5291,7 +5291,7 @@ parseError:
   Precondition: the beginning '<!' of the comment is already read and the head
   stands on the first '-' of '<!--'.
 
-  If this funktion was successful, the head-position is on the first
+  If this function was successful, the head-position is on the first
   character after the comment.
 */
 bool QXmlSimpleReader::parseComment()
-- 
cgit v0.12


From ce4b7363932c1152060ba4b24d9a7e7bf438d4e4 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 5 Nov 2019 18:52:56 +0100
Subject: Simple nospam email address

When having a simple nospam email address coded like:
```
/** \file
 * Big Unknown <big at none dot com>
 */
```
this results in the warning:
```
aa.c:2: warning: Unsupported xml/html tag <big> found
```
and in the HTML output it looks like:
```
Big Unknown <big at none dot com>
```
instead of:
```
Big Unknown <big at none dot com>
```

(Found in a couple of open source projects).
---
 src/doctokenizer.l | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 22b14a0..59a0a9d 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -345,6 +345,7 @@ CITESCHAR [a-z_A-Z0-9\x80-\xFF\-\?]
 CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/\?]
 CITEID    {CITESCHAR}{CITEECHAR}*("."{CITESCHAR}{CITEECHAR}*)*|"\""{CITESCHAR}{CITEECHAR}*("."{CITESCHAR}{CITEECHAR}*)*"\""
 MAILADR   ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+
+MAILADR2  {BLANK}*[a-z_A-Z0-9+-]+({BLANK}*[Dd][Oo][Tt]{BLANK}*[a-z_A-Z0-9+-]+)?{BLANK}*[Aa][Tt]{BLANK}*[a-z_A-Z0-9-]+({BLANK}*[Dd][Oo][Tt]{BLANK}*[a-z_A-Z0-9\-]+)+{BLANK}*[a-z_A-Z0-9\-]+{BLANK}*
 OPTSTARS  ("//"{BLANK}*)?"*"*{BLANK}*
 LISTITEM  {BLANK}*[-]("#")?{WS}
 MLISTITEM {BLANK}*[+*]{WS}
@@ -655,6 +656,10 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
 			 g_token->isEMailAddr=TRUE;
 			 return TK_URL;
                        }
+<St_Para>"<"{MAILADR2}">" { // anti spame mail address
+                         g_token->name=yytext;
+			 return TK_WORD;
+                       }
 <St_Para>"$"{ID}":"[^:\n$][^\n$]*"$" { /* RCS tag */
                          QCString tagName(yytext+1);
 			 int index=tagName.find(':');
-- 
cgit v0.12


From b32afdbd35624376000aaf12d09930e311692c53 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 5 Nov 2019 19:49:17 +0100
Subject: issue #7302: Determination of anonymous is too restrictive

---
 src/classdef.cpp                                   | 27 +++-----------
 src/classdef.h                                     |  1 -
 src/classlist.cpp                                  |  6 +--
 src/context.cpp                                    | 15 ++++----
 src/definition.cpp                                 | 43 +++++++++++-----------
 src/definition.h                                   |  5 +++
 src/definitionimpl.h                               |  3 ++
 src/doxygen.cpp                                    | 16 ++++----
 src/index.cpp                                      |  6 +--
 src/memberdef.cpp                                  | 24 ++++++------
 src/perlmodgen.cpp                                 |  4 +-
 src/sqlite3gen.cpp                                 |  8 ++--
 src/tooltip.cpp                                    |  5 +--
 src/util.cpp                                       |  2 +-
 src/xmlgen.cpp                                     |  9 ++---
 testing/071/namespace_a_namespace_1_1_0d0.xml      |  8 ++--
 ...xml__namespace__members__in__file__scope_8h.xml |  4 +-
 17 files changed, 88 insertions(+), 98 deletions(-)

diff --git a/src/classdef.cpp b/src/classdef.cpp
index 7ce6bf1..9c2ab53 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -133,7 +133,6 @@ class ClassDefImpl : public DefinitionImpl, public ClassDef
     virtual MemberDef *isSmartPointer() const;
     virtual bool isJavaEnum() const;
     virtual bool isGeneric() const;
-    virtual bool isAnonymous() const;
     virtual const ClassSDict *innerClasses() const;
     virtual QCString title() const;
     virtual QCString generatedFromFiles() const;
@@ -423,8 +422,6 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef
     { return getCdAlias()->isJavaEnum(); }
     virtual bool isGeneric() const
     { return getCdAlias()->isGeneric(); }
-    virtual bool isAnonymous() const
-    { return getCdAlias()->isAnonymous(); }
     virtual const ClassSDict *innerClasses() const
     { return getCdAlias()->innerClasses(); }
     virtual QCString title() const
@@ -687,8 +684,6 @@ class ClassDefImpl::IMPL
 
     bool isGeneric;
 
-    bool isAnonymous;
-
     uint64 spec;
 
     QCString metaData;
@@ -751,7 +746,6 @@ void ClassDefImpl::IMPL::init(const char *defFileName, const char *name,
     isLocal=FALSE;
   }
   isGeneric = (lang==SrcLangExt_CSharp || lang==SrcLangExt_Java) && QCString(name).find('<')!=-1;
-  isAnonymous = QCString(name).find('@')!=-1;
 }
 
 ClassDefImpl::IMPL::IMPL() : vhdlSummaryTitles(17)
@@ -835,6 +829,10 @@ QCString ClassDefImpl::displayName(bool includeScope) const
       n=className();
     }
   }
+  if (isAnonymous())
+  {
+    n = removeAnonymousScopes(n);
+  }
   QCString sep=getLanguageSpecificSeparator(lang);
   if (sep!="::")
   {
@@ -849,14 +847,7 @@ QCString ClassDefImpl::displayName(bool includeScope) const
   //  n = n.left(n.length()-2);
   //}
   //printf("ClassDefImpl::displayName()=%s\n",n.data());
-  if (n.find('@')!=-1)
-  {
-    return removeAnonymousScopes(n);
-  }
-  else
-  {
-    return n;
-  }
+  return n;
 }
 
 // inserts a base/super class in the inheritance list
@@ -3077,7 +3068,7 @@ void ClassDefImpl::writeMemberList(OutputList &ol) const
       //printf("%s: Member %s of class %s md->protection()=%d mi->prot=%d prot=%d inherited=%d\n",
       //    name().data(),md->name().data(),cd->name().data(),md->protection(),mi->prot,prot,mi->inherited);
 
-      if (cd && !md->name().isEmpty() && md->name()[0]!='@')
+      if (cd && !md->name().isEmpty() && !md->isAnonymous())
       {
         bool memberWritten=FALSE;
         if (cd->isLinkable() && md->isLinkable())
@@ -5299,7 +5290,6 @@ bool ClassDefImpl::isSliceLocal() const
 
 void ClassDefImpl::setName(const char *name)
 {
-  m_impl->isAnonymous = QCString(name).find('@')!=-1;
   DefinitionImpl::setName(name);
 }
 
@@ -5308,11 +5298,6 @@ void ClassDefImpl::setMetaData(const char *md)
   m_impl->metaData = md;
 }
 
-bool ClassDefImpl::isAnonymous() const
-{
-  return m_impl->isAnonymous;
-}
-
 QCString ClassDefImpl::collaborationGraphFileName() const
 {
   return m_impl->collabFileName;
diff --git a/src/classdef.h b/src/classdef.h
index c9cc806..3158c50 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -302,7 +302,6 @@ class ClassDef : virtual public Definition
     virtual bool isJavaEnum() const = 0;
 
     virtual bool isGeneric() const = 0;
-    virtual bool isAnonymous() const = 0;
     virtual const ClassSDict *innerClasses() const = 0;
     virtual QCString title() const = 0;
 
diff --git a/src/classlist.cpp b/src/classlist.cpp
index 6928c52..2b284b1 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -72,7 +72,7 @@ bool ClassSDict::declVisible(const ClassDef::CompoundType *filter) const
     ClassDef *cd=0;
     for (sdi.toFirst();(cd=sdi.current());++sdi)
     {
-      if (cd->name().find('@')==-1 &&
+      if (!cd->isAnonymous() &&
           (filter==0 || *filter==cd->compoundType())
          )
       {
@@ -103,7 +103,7 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
     for (sdi.toFirst();(cd=sdi.current());++sdi)
     {
       //printf("  ClassSDict::writeDeclaration for %s\n",cd->name().data());
-      if (cd->name().find('@')==-1 &&
+      if (!cd->isAnonymous() &&
           !cd->isExtension() &&
           (cd->protection()!=Private || extractPrivate) &&
           (filter==0 || *filter==cd->compoundType())
@@ -137,7 +137,7 @@ void ClassSDict::writeDocumentation(OutputList &ol,const Definition * container)
       //  cd->name().data(),cd->getOuterScope(),cd->isLinkableInProject(),cd->isEmbeddedInOuterScope(),
       //  container,cd->partOfGroups() ? cd->partOfGroups()->count() : 0);
 
-      if (cd->name().find('@')==-1 &&
+      if (!cd->isAnonymous() &&
           cd->isLinkableInProject() &&
           cd->isEmbeddedInOuterScope() &&
           !cd->isAlias() &&
diff --git a/src/context.cpp b/src/context.cpp
index 361bfa2..0dd81af 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -2353,7 +2353,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
           const ClassDef *cd;
           for (sdi.toFirst();(cd=sdi.current());++sdi)
           {
-            if (cd->name().find('@')==-1 &&
+            if (!cd->isAnonymous() &&
                 cd->isLinkableInProject() &&
                 cd->isEmbeddedInOuterScope() &&
                 cd->partOfGroups()==0
@@ -2941,7 +2941,7 @@ class NamespaceContext::Private : public DefinitionContext<NamespaceContext::Pri
           const ClassDef *cd;
           for (sdi.toFirst();(cd=sdi.current());++sdi)
           {
-            if (cd->name().find('@')==-1 &&
+            if (!cd->isAnonymous() &&
                 cd->isLinkableInProject() &&
                 cd->isEmbeddedInOuterScope() &&
                 cd->partOfGroups()==0)
@@ -3405,7 +3405,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
           const ClassDef *cd;
           for (sdi.toFirst();(cd=sdi.current());++sdi)
           {
-            if (cd->name().find('@')==-1 &&
+            if (!cd->isAnonymous() &&
                 cd->isLinkableInProject() &&
                 cd->isEmbeddedInOuterScope() &&
                 cd->partOfGroups()==0)
@@ -4450,8 +4450,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
     }
     TemplateVariant isAnonymous() const
     {
-      QCString name = m_memberDef->name();
-      return !name.isEmpty() && name.at(0)=='@';
+      return m_memberDef->isAnonymous();
     }
     TemplateVariant anonymousType() const
     {
@@ -5725,7 +5724,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
           const ClassDef *cd;
           for (sdi.toFirst();(cd=sdi.current());++sdi)
           {
-            if (cd->name().find('@')==-1 &&
+            if (!cd->isAnonymous() &&
                 cd->isLinkableInProject() &&
                 cd->isEmbeddedInOuterScope() &&
                 cd->partOfGroups()==0)
@@ -6543,7 +6542,7 @@ class NestingContext::Private : public GenericNodeListContext
       const NamespaceDef *nd;
       for (nli.toFirst();(nd=nli.current());++nli)
       {
-        if (nd->localName().find('@')==-1 &&
+        if (!nd->isAnonymous() &&
             (!rootOnly || nd->getOuterScope()==Doxygen::globalScope))
         {
           bool hasChildren = namespaceHasVisibleChild(nd,addClasses,false,ClassDef::Class);
@@ -8799,7 +8798,7 @@ class AllMembersListContext::Private : public GenericNodeListContext
           {
             MemberDef *md=mi->memberDef;
             const ClassDef  *cd=md->getClassDef();
-            if (cd && !md->name().isEmpty() && md->name()[0]!='@')
+            if (cd && !md->isAnonymous())
             {
               if ((cd->isLinkable() && md->isLinkable()) ||
                   (!cd->isArtificial() && !hideUndocMembers &&
diff --git a/src/definition.cpp b/src/definition.cpp
index 5b2136c..1a166fe 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -51,22 +51,21 @@
 class DefinitionImpl::IMPL
 {
   public:
-    IMPL();
    ~IMPL();
     void init(const char *df, const char *n);
     void setDefFileName(const QCString &df);
 
-    SectionDict *sectionDict;  // dictionary of all sections, not accessible
+    SectionDict *sectionDict = 0;  // dictionary of all sections, not accessible
 
-    MemberSDict *sourceRefByDict;
-    MemberSDict *sourceRefsDict;
+    MemberSDict *sourceRefByDict = 0;
+    MemberSDict *sourceRefsDict = 0;
     std::vector<ListItemInfo> xrefListItems;
-    GroupList *partOfGroups;
+    GroupList *partOfGroups = 0;
 
-    DocInfo   *details;    // not exported
-    DocInfo   *inbodyDocs; // not exported
-    BriefInfo *brief;      // not exported
-    BodyInfo  *body;       // not exported
+    DocInfo   *details = 0;    // not exported
+    DocInfo   *inbodyDocs = 0; // not exported
+    BriefInfo *brief = 0;      // not exported
+    BodyInfo  *body = 0;       // not exported
     QCString   briefSignatures;
     QCString   docSignatures;
 
@@ -75,16 +74,17 @@ class DefinitionImpl::IMPL
     QCString qualifiedName;
     QCString ref;   // reference to external documentation
 
-    bool hidden;
-    bool isArtificial;
+    bool hidden = FALSE;
+    bool isArtificial = FALSE;
+    bool isAnonymous = FALSE;
 
-    Definition *outerScope;  // not owner
+    Definition *outerScope = 0;  // not owner
 
     // where the item was defined
     QCString defFileName;
     QCString defFileExt;
 
-    SrcLangExt lang;
+    SrcLangExt lang = SrcLangExt_Unknown;
 
     QCString id; // clang unique id
 
@@ -96,13 +96,6 @@ class DefinitionImpl::IMPL
     Cookie *cookie;
 };
 
-DefinitionImpl::IMPL::IMPL()
-  : sectionDict(0), sourceRefByDict(0), sourceRefsDict(0),
-    partOfGroups(0),
-    details(0), inbodyDocs(0), brief(0), body(0), hidden(FALSE), isArtificial(FALSE),
-    outerScope(0), lang(SrcLangExt_Unknown)
-{
-}
 
 DefinitionImpl::IMPL::~IMPL()
 {
@@ -304,7 +297,7 @@ DefinitionImpl::DefinitionImpl(const char *df,int dl,int dc,
                        const char *d,bool isSymbol)
 {
   m_impl = new DefinitionImpl::IMPL;
-  m_impl->name = name;
+  setName(name);
   m_impl->defLine = dl;
   m_impl->defColumn = dc;
   m_impl->init(df,name);
@@ -406,6 +399,9 @@ void DefinitionImpl::setName(const char *name)
 {
   if (name==0) return;
   m_impl->name = name;
+  m_impl->isAnonymous = m_impl->name.isEmpty() ||
+                        m_impl->name.at(0)=='@' ||
+                        m_impl->name.find("::@")!=-1;
 }
 
 void DefinitionImpl::setId(const char *id)
@@ -2203,6 +2199,11 @@ QCString DefinitionImpl::name() const
   return m_impl->name;
 }
 
+bool DefinitionImpl::isAnonymous() const
+{
+  return m_impl->isAnonymous;
+}
+
 int DefinitionImpl::getDefLine() const
 {
   return m_impl->defLine;
diff --git a/src/definition.h b/src/definition.h
index d458683..b3ece2c 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -112,6 +112,11 @@ class Definition : public DefinitionIntf
     /*! Returns the name of the definition */
     virtual QCString name() const = 0;
 
+    /*! Returns TRUE iff this definition has an artificially generated name
+     * (typically starting with a @) that is used for nameless definitions
+     */
+    virtual bool isAnonymous() const = 0;
+
     /*! Returns the name of the definition as it appears in the output */
     virtual QCString displayName(bool includeScope=TRUE) const = 0;
 
diff --git a/src/definitionimpl.h b/src/definitionimpl.h
index 036c875..2d8886d 100644
--- a/src/definitionimpl.h
+++ b/src/definitionimpl.h
@@ -32,6 +32,7 @@ class DefinitionImpl : virtual public Definition
 
     virtual bool isAlias() const { return FALSE; }
     virtual QCString name() const;
+    virtual bool isAnonymous() const;
     virtual QCString localName() const;
     virtual QCString qualifiedName() const;
     virtual QCString symbolName() const;
@@ -142,6 +143,8 @@ class DefinitionAliasImpl : virtual public Definition
     virtual bool isAlias() const { return TRUE; }
     virtual QCString name() const
     { return m_def->name(); }
+    virtual bool isAnonymous() const
+    { return m_def->isAnonymous(); }
     virtual QCString localName() const
     { return m_def->localName(); }
     virtual QCString qualifiedName() const
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 4f4d13b..bf282b6 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1604,7 +1604,7 @@ static void processTagLessClasses(ClassDef *rootCd,
             if (type.find(icd->name())!=-1) // matching tag less struct/union
             {
               QCString name = md->name();
-              if (name.at(0)=='@') name = "__unnamed__";
+              if (md->isAnonymous()) name = "__unnamed__";
               if (!prefix.isEmpty()) name.prepend(prefix+".");
               //printf("    found %s for class %s\n",name.data(),cd->name().data());
               ClassDef *ncd = createTagLessInstance(rootCd,icd,name);
@@ -2461,7 +2461,7 @@ static MemberDef *addVariableToFile(
   QCString def;
 
   // determine the definition of the global variable
-  if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@' &&
+  if (nd && !nd->isAnonymous() &&
       !Config_getBool(HIDE_SCOPE_NAMES)
      )
     // variable is inside a namespace, so put the scope before the name
@@ -2616,7 +2616,7 @@ static MemberDef *addVariableToFile(
   addMemberToGroups(root,md);
 
   md->setRefItems(root->sli);
-  if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@')
+  if (nd && !nd->isAnonymous())
   {
     md->setNamespace(nd);
     nd->insertMember(md);
@@ -7027,7 +7027,7 @@ static void findEnums(const Entry *root)
       mnsd=Doxygen::memberNameSDict;
       isGlobal=FALSE;
     }
-    else if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@') // found enum inside namespace
+    else if (nd) // found enum inside namespace
     {
       mnsd=Doxygen::functionNameSDict;
       isGlobal=TRUE;
@@ -7076,7 +7076,7 @@ static void findEnums(const Entry *root)
         baseType.prepend(" : ");
       }
 
-      if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@')
+      if (nd)
       {
         if (isRelated || Config_getBool(HIDE_SCOPE_NAMES))
         {
@@ -7095,7 +7095,7 @@ static void findEnums(const Entry *root)
       // even if we have already added the enum to a namespace, we still
       // also want to add it to other appropriate places such as file
       // or class.
-      if (isGlobal)
+      if (isGlobal && (nd==0 || !nd->isAnonymous()))
       {
         if (!defSet) md->setDefinition(name+baseType);
         if (fd==0 && root->parent())
@@ -7204,7 +7204,7 @@ static void addEnumValuesToEnums(const Entry *root)
       mnsd=Doxygen::memberNameSDict;
       isGlobal=FALSE;
     }
-    else if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@') // found enum inside namespace
+    else if (nd && !nd->isAnonymous()) // found enum inside namespace
     {
       //printf("Enum in namespace '%s'::'%s'\n",nd->name().data(),name.data());
       mnsd=Doxygen::functionNameSDict;
@@ -7312,7 +7312,7 @@ static void addEnumValuesToEnums(const Entry *root)
                     {
                       //printf("found enum value with same name %s in scope %s\n",
                       //    fmd->name().data(),fmd->getOuterScope()->name().data());
-                      if (nd && !nd->name().isEmpty() && nd->name().at(0)!='@')
+                      if (nd && !nd->isAnonymous())
                       {
                         const NamespaceDef *fnd=fmd->getNamespaceDef();
                         if (fnd==nd) // enum value is inside a namespace
diff --git a/src/index.cpp b/src/index.cpp
index 1acd941..edc302b 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -368,7 +368,7 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
           {
             const MemberList *enumList = md->enumFieldList();
             bool isDir = enumList!=0 && md->isEnumerate();
-            bool isAnonymous = md->name().find('@')!=-1;
+            bool isAnonymous = md->isAnonymous();
             static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS);
             static bool extractStatic = Config_getBool(EXTRACT_STATIC);
             if (!isAnonymous &&
@@ -1660,7 +1660,7 @@ static void writeNamespaceTree(const NamespaceSDict *nsDict,FTVHelp *ftv,
     const NamespaceDef *nd;
     for (nli.toFirst();(nd=nli.current());++nli)
     {
-      if (nd->localName().find('@')==-1 &&
+      if (!nd->isAnonymous() &&
           (!rootOnly || nd->getOuterScope()==Doxygen::globalScope))
       {
 
@@ -4060,7 +4060,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
           {
             const MemberList *enumList = md->enumFieldList();
             bool isDir = enumList!=0 && md->isEnumerate();
-            if (md->isVisible() && md->name().find('@')==-1)
+            if (md->isVisible() && !md->isAnonymous())
             {
               Doxygen::indexList->addContentsItem(isDir,
                   md->name(),md->getReference(),
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index b79bd50..9b6967b 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -1771,7 +1771,7 @@ QCString MemberDefImpl::getOutputFileBase() const
       return baseName;
     }
   }
-  else if (nspace && nspace->isLinkableInProject())
+  else if (nspace)
   {
     baseName=nspace->getOutputFileBase();
   }
@@ -1877,7 +1877,7 @@ void MemberDefImpl::_computeLinkableInProject()
     m_isLinkableCached = templateMaster()->isLinkableInProject() ? 2 : 1;
     return;
   }
-  if (name().isEmpty() || name().at(0)=='@')
+  if (isAnonymous())
   {
     //printf("name invalid\n");
     m_isLinkableCached = 1; // not a valid or a dummy name
@@ -2257,10 +2257,10 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   ol.startMemberDeclaration();
 
   // start a new member declaration
-  bool isAnonymous = annoClassDef || m_impl->annMemb || m_impl->annEnumType;
+  bool isAnonType = annoClassDef || m_impl->annMemb || m_impl->annEnumType;
   ///printf("startMemberItem for %s\n",name().data());
   ol.startMemberItem(anchor(),
-                     isAnonymous ? 1 : !m_impl->tArgList.empty() ? 3 : 0,
+                     isAnonType ? 1 : !m_impl->tArgList.empty() ? 3 : 0,
                      inheritId
                     );
 
@@ -2301,9 +2301,9 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   // *** write template lists
   if (m_impl->tArgList.hasParameters() && getLanguage()==SrcLangExt_Cpp)
   {
-    if (!isAnonymous) ol.startMemberTemplateParams();
+    if (!isAnonType) ol.startMemberTemplateParams();
     writeTemplatePrefix(ol,m_impl->tArgList);
-    if (!isAnonymous) ol.endMemberTemplateParams(anchor(),inheritId);
+    if (!isAnonType) ol.endMemberTemplateParams(anchor(),inheritId);
   }
 
   // *** write type
@@ -2343,7 +2343,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
       QCString varName=ltype.right(ltype.length()-ir).stripWhiteSpace();
       //printf(">>>>>> ltype='%s' varName='%s'\n",ltype.data(),varName.data());
       ol.docify("}");
-      if (varName.isEmpty() && (name().isEmpty() || name().at(0)=='@'))
+      if (varName.isEmpty() && isAnonymous())
       {
         ol.docify(";");
       }
@@ -2425,13 +2425,13 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   }
 
   // *** write name
-  if (!name().isEmpty() && name().at(0)!='@') // hide anonymous stuff
+  if (!isAnonymous()) // hide anonymous stuff
   {
     static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE);
     static bool extractPrivateVirtual = Config_getBool(EXTRACT_PRIV_VIRTUAL);
     static bool extractStatic  = Config_getBool(EXTRACT_STATIC);
     //printf("Member name=`%s gd=%p md->groupDef=%p inGroup=%d isLinkable()=%d hasDocumentation=%d\n",name().data(),gd,getGroupDef(),inGroup,isLinkable(),hasDocumentation());
-    if (!(name().isEmpty() || name().at(0)=='@') && // name valid
+    if (!name().isEmpty() && // name valid
         (hasDocumentation() || isReference()) && // has docs
         !(m_impl->prot==Private && !extractPrivate && (m_impl->virt==Normal || !extractPrivateVirtual) && m_impl->mtype!=MemberType_Friend) && // hidden due to protection
         !(isStatic() && getClassDef()==0 && !extractStatic) // hidden due to static-ness
@@ -2479,7 +2479,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
   }
 
   // add to index
-  if (isEnumerate() && name().at(0)=='@')
+  if (isEnumerate() && isAnonymous())
   {
     // don't add to index
   }
@@ -3202,7 +3202,7 @@ QCString MemberDefImpl::displayDefinition() const
   QCString title = name();
   if (isEnumerate())
   {
-    if (title.at(0)=='@')
+    if (isAnonymous())
     {
       ldef = title = "anonymous enum";
       if (!m_impl->enumBaseType.isEmpty())
@@ -3221,7 +3221,7 @@ QCString MemberDefImpl::displayDefinition() const
   }
   else if (isEnumValue())
   {
-    if (ldef.at(0)=='@')
+    if (isAnonymous())
     {
       ldef=ldef.mid(2);
     }
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index c8f9273..be226b7 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -1792,9 +1792,9 @@ void PerlModGenerator::generatePerlModForClass(const ClassDef *cd)
   // + standard member sections
   // + detailed member documentation
   // - examples using the class
-  
+
   if (cd->isReference())        return; // skip external references.
-  if (cd->name().find('@')!=-1) return; // skip anonymous compounds.
+  if (cd->isAnonymous())        return; // skip anonymous compounds.
   if (cd->templateMaster()!=0)  return; // skip generated template instances.
 
   m_output.openHash()
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
index dc0cc85..cb92788 100644
--- a/src/sqlite3gen.cpp
+++ b/src/sqlite3gen.cpp
@@ -1125,7 +1125,7 @@ static void associateMember(const MemberDef *md, struct Refid member_refid, stru
   // TODO: skip EnumValue only to guard against recording refids and member records
   // for enumvalues until we can support documenting them as entities.
   if (md->memberType()==MemberType_EnumValue) return;
-  if (md->name().at(0)!='@') // skip anonymous members
+  if (!md->isAnonymous()) // skip anonymous members
   {
     bindIntParameter(member_insert, ":scope_rowid", scope_refid.rowid);
     bindIntParameter(member_insert, ":memberdef_rowid", member_refid.rowid);
@@ -1276,7 +1276,7 @@ static void writeInnerClasses(const ClassSDict *cl, struct Refid outer_refid)
   const ClassDef *cd;
   for (cli.toFirst();(cd=cli.current());++cli)
   {
-    if (!cd->isHidden() && cd->name().find('@')==-1) // skip anonymous scopes
+    if (!cd->isHidden() && !cd->isAnonymous())
     {
       struct Refid inner_refid = insertRefid(cd->getOutputFileBase());
 
@@ -1365,7 +1365,7 @@ static void writeInnerNamespaces(const NamespaceSDict *nl, struct Refid outer_re
     const NamespaceDef *nd;
     for (nli.toFirst();(nd=nli.current());++nli)
     {
-      if (!nd->isHidden() && nd->name().find('@')==-1) // skip anonymous scopes
+      if (!nd->isHidden() && !nd->isAnonymous())
       {
         struct Refid inner_refid = insertRefid(nd->getOutputFileBase());
 
@@ -1954,7 +1954,7 @@ static void generateSqlite3ForClass(const ClassDef *cd)
 
   if (cd->isReference())        return; // skip external references.
   if (cd->isHidden())           return; // skip hidden classes.
-  if (cd->name().find('@')!=-1) return; // skip anonymous compounds.
+  if (cd->isAnonymous())        return; // skip anonymous compounds.
   if (cd->templateMaster()!=0)  return; // skip generated template instances.
 
   struct Refid refid = insertRefid(cd->getOutputFileBase());
diff --git a/src/tooltip.cpp b/src/tooltip.cpp
index a30a85c..8cc1f87 100644
--- a/src/tooltip.cpp
+++ b/src/tooltip.cpp
@@ -115,10 +115,9 @@ void TooltipManager::writeTooltips(CodeOutputInterface &ol)
     if (d->definitionType()==Definition::TypeMember)
     {
       MemberDef *md = dynamic_cast<MemberDef*>(d);
-      decl = md->declaration();
-      if (!decl.isEmpty() && decl.at(0)=='@') // hide enum values
+      if (!md->isAnonymous())
       {
-        decl.resize(0);
+        decl = md->declaration();
       }
     }
     ol.writeTooltip(di.currentKey(),                 // id
diff --git a/src/util.cpp b/src/util.cpp
index 8e0884f..9cdf810 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8646,7 +8646,7 @@ bool namespaceHasVisibleChild(const NamespaceDef *nd,bool includeClasses,bool fi
     const NamespaceDef *cnd;
     for (cnli.toFirst();(cnd=cnli.current());++cnli)
     {
-      if (cnd->isLinkableInProject() && cnd->localName().find('@')==-1)
+      if (cnd->isLinkableInProject() && !cnd->isAnonymous())
       {
         return TRUE;
       }
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index dfbf630..4950778 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -514,7 +514,6 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
   // enum values are written as part of the enum
   if (md->memberType()==MemberType_EnumValue) return;
   if (md->isHidden()) return;
-  //if (md->name().at(0)=='@') return; // anonymous member
 
   // group members are only visible in their group
   //if (def->definitionType()!=Definition::TypeGroup && md->getGroupDef()) return;
@@ -1090,7 +1089,7 @@ static void writeListOfAllMembers(const ClassDef *cd,FTextStream &t)
       for (mii.toFirst();(mi=mii.current());++mii)
       {
         const MemberDef *md=mi->memberDef;
-        if (md->name().at(0)!='@') // skip anonymous members
+        if (!md->isAnonymous())
         {
           Protection prot = mi->prot;
           Specifier virt=md->virtualness();
@@ -1132,7 +1131,7 @@ static void writeInnerClasses(const ClassSDict *cl,FTextStream &t)
     const ClassDef *cd;
     for (cli.toFirst();(cd=cli.current());++cli)
     {
-      if (!cd->isHidden() && cd->name().find('@')==-1) // skip anonymous scopes
+      if (!cd->isHidden() && !cd->isAnonymous())
       {
         t << "    <innerclass refid=\"" << classOutputFileBase(cd)
           << "\" prot=\"";
@@ -1157,7 +1156,7 @@ static void writeInnerNamespaces(const NamespaceSDict *nl,FTextStream &t)
     const NamespaceDef *nd;
     for (nli.toFirst();(nd=nli.current());++nli)
     {
-      if (!nd->isHidden() && nd->name().find('@')==-1) // skip anonymous scopes
+      if (!nd->isHidden() && !nd->isAnonymous())
       {
         t << "    <innernamespace refid=\"" << nd->getOutputFileBase()
           << "\">" << convertToXML(nd->name()) << "</innernamespace>" << endl;
@@ -1247,7 +1246,7 @@ static void generateXMLForClass(const ClassDef *cd,FTextStream &ti)
 
   if (cd->isReference())        return; // skip external references.
   if (cd->isHidden())           return; // skip hidden classes.
-  if (cd->name().find('@')!=-1) return; // skip anonymous compounds.
+  if (cd->isAnonymous())        return; // skip anonymous compounds.
   if (cd->templateMaster()!=0)  return; // skip generated template instances.
   if (cd->isArtificial())       return; // skip artificially created classes
 
diff --git a/testing/071/namespace_a_namespace_1_1_0d0.xml b/testing/071/namespace_a_namespace_1_1_0d0.xml
index 14f5a51..d439723 100644
--- a/testing/071/namespace_a_namespace_1_1_0d0.xml
+++ b/testing/071/namespace_a_namespace_1_1_0d0.xml
@@ -3,24 +3,24 @@
   <compounddef id="namespace_a_namespace_1_1_0d0" kind="namespace" language="C++">
     <compoundname>ANamespace::@0</compoundname>
     <sectiondef kind="enum">
-      <memberdef kind="enum" id="071__enum__in__anon__ns_8cpp_1a96ab6574751fdf6a53ceec8a3896c45d" prot="public" static="no" strong="yes">
+      <memberdef kind="enum" id="namespace_a_namespace_1_1_0d0_1a96ab6574751fdf6a53ceec8a3896c45d" prot="public" static="no" strong="yes">
         <type/>
         <name>Boolean</name>
-        <enumvalue id="071__enum__in__anon__ns_8cpp_1a96ab6574751fdf6a53ceec8a3896c45daf8320b26d30ab433c5a54546d21f414c" prot="public">
+        <enumvalue id="namespace_a_namespace_1_1_0d0_1a96ab6574751fdf6a53ceec8a3896c45daf8320b26d30ab433c5a54546d21f414c" prot="public">
           <name>False</name>
           <briefdescription>
           </briefdescription>
           <detaileddescription>
           </detaileddescription>
         </enumvalue>
-        <enumvalue id="071__enum__in__anon__ns_8cpp_1a96ab6574751fdf6a53ceec8a3896c45daf827cf462f62848df37c5e1e94a4da74" prot="public">
+        <enumvalue id="namespace_a_namespace_1_1_0d0_1a96ab6574751fdf6a53ceec8a3896c45daf827cf462f62848df37c5e1e94a4da74" prot="public">
           <name>True</name>
           <briefdescription>
           </briefdescription>
           <detaileddescription>
           </detaileddescription>
         </enumvalue>
-        <enumvalue id="071__enum__in__anon__ns_8cpp_1a96ab6574751fdf6a53ceec8a3896c45da2767828026039e8ba7b38973cbb701f2" prot="public">
+        <enumvalue id="namespace_a_namespace_1_1_0d0_1a96ab6574751fdf6a53ceec8a3896c45da2767828026039e8ba7b38973cbb701f2" prot="public">
           <name>FileNotFound</name>
           <briefdescription>
           </briefdescription>
diff --git a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
index 1198549..078c5ad 100644
--- a/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
+++ b/testing/078/078__xml__namespace__members__in__file__scope_8h.xml
@@ -4,7 +4,7 @@
     <compoundname>078_xml_namespace_members_in_file_scope.h</compoundname>
     <innernamespace refid="namespace_namespace">Namespace</innernamespace>
     <sectiondef kind="enum">
-      <memberdef kind="enum" id="078__xml__namespace__members__in__file__scope_8h_1add172b93283b1ab7612c3ca6cc5dcfea" prot="public" static="no" strong="yes">
+      <memberdef kind="enum" id="namespace_namespace_1add172b93283b1ab7612c3ca6cc5dcfea" prot="public" static="no" strong="yes">
         <type/>
         <name>Enum</name>
         <briefdescription>
@@ -18,7 +18,7 @@
       </memberdef>
     </sectiondef>
     <sectiondef kind="func">
-      <memberdef kind="function" id="078__xml__namespace__members__in__file__scope_8h_1a0f1fe1a972c7c4196988a1bdde63ec77" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+      <memberdef kind="function" id="namespace_namespace_1a0f1fe1a972c7c4196988a1bdde63ec77" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
         <type>void</type>
         <definition>void Namespace::foo</definition>
         <argsstring>()</argsstring>
-- 
cgit v0.12


From 03fb8168b060f33fe6011604fb4b08549df36865 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 6 Nov 2019 12:37:28 +0100
Subject: Better warning message in case of illegal command

When having a problem like:
```
/** \file
  *
  * \link Something \see nothing2 \endlink
  *
  * \link Something @see nothing3 \endlink
  */
```
We will get a.o. the warnings:
```
.../aa.h:3: warning: Illegal command see as part of a \link
.../aa.h:5: warning: Illegal command see as part of a \link
```
it is not clear what the problem is. With this patch we get a little bit clearer warning:
```
.../aa.h:3: warning: Illegal command \see as part of a \link
.../aa.h:5: warning: Illegal command @see as part of a \link
```
---
 src/docparser.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index a22087e..568f7ed 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -803,14 +803,15 @@ static bool findDocsForMemberOrCompound(const char *commandName,
 inline void errorHandleDefaultToken(DocNode *parent,int tok,
                                QList<DocNode> &children,const char *txt)
 {
+  char *cmd_start = "\\";
   switch (tok)
   {
     case TK_COMMAND_AT:
-        // fall through
+      cmd_start = "@";
     case TK_COMMAND_BS:
       children.append(new DocWord(parent,TK_COMMAND_CHAR(tok) + g_token->name));
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s as part of a %s",
-       qPrint(TK_COMMAND_CHAR(tok) + g_token->name), txt);
+       qPrint(cmd_start + g_token->name),txt);
       break;
     case TK_SYMBOL:
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Unsupported symbol %s found found as part of a %s",
@@ -2312,6 +2313,7 @@ void DocSecRefList::parse()
   {
     if (tok==TK_COMMAND_AT || tok == TK_COMMAND_BS)
     {
+      char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");
       switch (Mappers::cmdMapper->map(g_token->name))
       {
         case CMD_SECREFITEM:
@@ -2339,7 +2341,7 @@ void DocSecRefList::parse()
           goto endsecreflist;
         default:
           warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s as part of a \\secreflist",
-              qPrint(g_token->name));
+              qPrint(cmd_start + g_token->name));
           goto endsecreflist;
       }
     }
@@ -2646,9 +2648,11 @@ QCString DocLink::parse(bool isJavaLink,bool isXmlLink)
   {
     if (!defaultHandleToken(this,tok,m_children,FALSE))
     {
+      char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
+          cmd_start = "@";
         // fall through
         case TK_COMMAND_BS:
           switch (Mappers::cmdMapper->map(g_token->name))
@@ -2661,7 +2665,7 @@ QCString DocLink::parse(bool isJavaLink,bool isXmlLink)
               goto endlink;
             default:
               warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s as part of a \\link",
-                  qPrint(g_token->name));
+                  qPrint(cmd_start + g_token->name));
               break;
           }
           break;
@@ -3793,9 +3797,11 @@ int DocHtmlDescTitle::parse()
   {
     if (!defaultHandleToken(this,tok,m_children))
     {
+      char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
+          cmd_start = "@";
         // fall through
         case TK_COMMAND_BS:
           {
@@ -3866,8 +3872,8 @@ int DocHtmlDescTitle::parse()
 
                 break;
               default:
-                warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command \\%s found as part of a <dt> tag",
-                               qPrint(g_token->name));
+                warn_doc_error(g_fileName,doctokenizerYYlineno,"Illegal command %s found as part of a <dt> tag",
+                  qPrint(cmd_start + g_token->name));
             }
           }
           break;
-- 
cgit v0.12


From fa2e951d698c99feac64f5a480142482781ef8b8 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 6 Nov 2019 12:55:51 +0100
Subject: Better warning message in case of illegal command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correcting compilation errors and warnings like:
```
 error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]

       char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");

warning: ISO C++ forbids converting a string constant to ‘char*’ [-Wwrite-strings]

       char *cmd_start = "\\";
```
---
 src/docparser.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 568f7ed..ff21ce4 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -803,7 +803,7 @@ static bool findDocsForMemberOrCompound(const char *commandName,
 inline void errorHandleDefaultToken(DocNode *parent,int tok,
                                QList<DocNode> &children,const char *txt)
 {
-  char *cmd_start = "\\";
+  const char *cmd_start = "\\";
   switch (tok)
   {
     case TK_COMMAND_AT:
@@ -2313,7 +2313,7 @@ void DocSecRefList::parse()
   {
     if (tok==TK_COMMAND_AT || tok == TK_COMMAND_BS)
     {
-      char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");
+      const char *cmd_start = (tok==TK_COMMAND_AT ? "@" : "\\");
       switch (Mappers::cmdMapper->map(g_token->name))
       {
         case CMD_SECREFITEM:
@@ -2648,7 +2648,7 @@ QCString DocLink::parse(bool isJavaLink,bool isXmlLink)
   {
     if (!defaultHandleToken(this,tok,m_children,FALSE))
     {
-      char *cmd_start = "\\";
+      const char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
@@ -3797,7 +3797,7 @@ int DocHtmlDescTitle::parse()
   {
     if (!defaultHandleToken(this,tok,m_children))
     {
-      char *cmd_start = "\\";
+      const char *cmd_start = "\\";
       switch (tok)
       {
         case TK_COMMAND_AT:
-- 
cgit v0.12


From 2001c933292d3dd25ebc6634dab62aab7389c5bc Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 6 Nov 2019 18:46:24 +0100
Subject: Output of unknown xml/html tag

When having a problem like:
```
/** \file

- Just name <name>
- name plus subname <name subname>
- name plus twice subname <name subname subname>
- name plus subname subname="" <name subname subname="">
 */
```
we get correctly the warnings:
```
.../aa.h:3: warning: Unsupported xml/html tag <name> found
.../aa.h:4: warning: Unsupported xml/html tag <name> found
.../aa.h:5: warning: Unsupported xml/html tag <name> found
.../aa.h:6: warning: Unsupported xml/html tag <name> found
```
but the output doesn't look good as there is `=""` added:
```
    Just name <name>
    name plus subname <name subname="">
    name plus twice subname <name subname="" subname="">
    name plus subname subname="" <name subname="" subname="">
```

This patch fixes this output.
---
 src/docparser.cpp  |  2 +-
 src/doctokenizer.h |  1 +
 src/doctokenizer.l | 31 +++++++++++++++++++++----------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index a22087e..f3ccbf5 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -6286,7 +6286,7 @@ int DocPara::handleHtmlStartTag(const QCString &tagName,const HtmlAttribList &ta
       break;
     case HTML_UNKNOWN:
       warn_doc_error(g_fileName,doctokenizerYYlineno,"Unsupported xml/html tag <%s> found", qPrint(tagName));
-      m_children.append(new DocWord(this, "<"+tagName+tagHtmlAttribs.toString()+">"));
+      m_children.append(new DocWord(this, "<"+tagName+g_token->attribsStr+">"));
       break;
   case XML_INHERITDOC:
       handleInheritDoc();
diff --git a/src/doctokenizer.h b/src/doctokenizer.h
index f89069c..e95c4c0 100644
--- a/src/doctokenizer.h
+++ b/src/doctokenizer.h
@@ -100,6 +100,7 @@ struct TokenInfo
   HtmlAttribList attribs;
   bool endTag;
   bool emptyTag;
+  QCString attribsStr;
 
   // whitespace
   QCString chars;
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index 22b14a0..016b621 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -39,6 +39,7 @@
 #include "doxygen.h"
 #include "portable.h"
 #include "cite.h"
+#include "growbuf.h"
 
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
@@ -177,6 +178,10 @@ static void processSection()
 
 static void handleHtmlTag()
 {
+  static GrowBuf growBuf;
+  growBuf.clear();
+  g_token->attribsStr="";
+
   QCString tagText=yytext;
   g_token->attribs.clear();
   g_token->endTag = FALSE;
@@ -207,54 +212,58 @@ static void handleHtmlTag()
   {
     char c=tagText.at(i);
     // skip spaces
-    while (i<(int)yyleng && isspace((uchar)c)) { c=tagText.at(++i); }
+    while (i<(int)yyleng && isspace((uchar)c)) { growBuf.addChar(c);c=tagText.at(++i); }
     // check for end of the tag
     if (c == '>') break;
     // Check for XML style "empty" tag.
     if (c == '/') 
     {
+      growBuf.addChar(c);
       g_token->emptyTag = TRUE;
       break;
     }
     startName=i;
     // search for end of name
-    while (i<(int)yyleng && !isspace((uchar)c) && c!='=' && c!= '>') { c=tagText.at(++i); }
+    while (i<(int)yyleng && !isspace((uchar)c) && c!='=' && c!= '>') { growBuf.addChar(c);c=tagText.at(++i); }
     endName=i;
     HtmlAttrib opt;
     opt.name  = tagText.mid(startName,endName-startName).lower(); 
     // skip spaces
-    while (i<(int)yyleng && isspace((uchar)c)) { c=tagText.at(++i); } 
+    while (i<(int)yyleng && isspace((uchar)c)) { growBuf.addChar(c);c=tagText.at(++i); } 
     if (tagText.at(i)=='=') // option has value
     {
+      growBuf.addChar(c);
       c=tagText.at(++i);
       // skip spaces
-      while (i<(int)yyleng && isspace((uchar)c)) { c=tagText.at(++i); } 
+      while (i<(int)yyleng && isspace((uchar)c)) { growBuf.addChar(c);c=tagText.at(++i); } 
       if (tagText.at(i)=='\'') // option '...'
       {
+        growBuf.addChar(c);
         c=tagText.at(++i);
 	startAttrib=i;
 	
 	// search for matching quote 
-        while (i<(int)yyleng && c!='\'') { c=tagText.at(++i); } 
+        while (i<(int)yyleng && c!='\'') { growBuf.addChar(c);c=tagText.at(++i); } 
 	endAttrib=i;
-        if (i<(int)yyleng) c=tagText.at(++i);
+        if (i<(int)yyleng) {growBuf.addChar(c);c=tagText.at(++i);}
       }
       else if (tagText.at(i)=='"') // option "..."
       {
+        growBuf.addChar(c);
         c=tagText.at(++i);
 	startAttrib=i;
 	// search for matching quote 
-        while (i<(int)yyleng && c!='"') { c=tagText.at(++i); } 
+        while (i<(int)yyleng && c!='"') { growBuf.addChar(c);c=tagText.at(++i); } 
 	endAttrib=i;
-        if (i<(int)yyleng) c=tagText.at(++i);
+        if (i<(int)yyleng) {growBuf.addChar(c);c=tagText.at(++i);}
       }
       else // value without any quotes
       {
 	startAttrib=i;
 	// search for separator or end symbol
-        while (i<(int)yyleng && !isspace((uchar)c) && c!='>') { c=tagText.at(++i); } 
+        while (i<(int)yyleng && !isspace((uchar)c) && c!='>') { growBuf.addChar(c);c=tagText.at(++i); } 
 	endAttrib=i;
-	if (i<(int)yyleng) c=tagText.at(++i);
+        if (i<(int)yyleng) {growBuf.addChar(c);c=tagText.at(++i);}
       }
       opt.value  = tagText.mid(startAttrib,endAttrib-startAttrib); 
       if (opt.name == "align") opt.value = opt.value.lower();
@@ -271,6 +280,8 @@ static void handleHtmlTag()
     //    opt.name.data(),opt.value.data());
     g_token->attribs.append(&opt);
   }
+  growBuf.addChar(0);
+  g_token->attribsStr = growBuf.get();
 }
   
 static QCString stripEmptyLines(const QCString &s)
-- 
cgit v0.12


From aa33a2a657b70e61208c07d9861d0f721e8e68b2 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Wed, 6 Nov 2019 19:59:05 +0100
Subject: Update of generated VhdlParser files.

---
 vhdlparser/VhdlParserConstants.h     | 2 +-
 vhdlparser/VhdlParserTokenManager.cc | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index b70ba42..fe51270 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -430,7 +430,7 @@ const  int DEFAULT = 0;
   static const JJChar tokenImage_arr_20[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0};
   static const JJChar tokenImage_arr_21[] = 
-{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
+{0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
   static const JJChar tokenImage_arr_22[] = 
 {0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0};
   static const JJChar tokenImage_arr_23[] = 
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 29ce7cb..7187449 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -2491,25 +2491,25 @@ static const unsigned long long jjtoSkip[] = {
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x8000000ULL);
+         return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0x8000000ULL);
       case 69:
          if ((active0 & 0x20000ULL) != 0L)
          {
             jjmatchedKind = 17;
             jjmatchedPos = 11;
          }
-         return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0L);
+         break;
       case 79:
          return jjMoveStringLiteralDfa12_0(active0, 0x40000000ULL, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa12_0(active0, 0L, active1, 0x8000000ULL);
+         return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0x8000000ULL);
       case 101:
          if ((active0 & 0x20000ULL) != 0L)
          {
             jjmatchedKind = 17;
             jjmatchedPos = 11;
          }
-         return jjMoveStringLiteralDfa12_0(active0, 0x200000ULL, active1, 0L);
+         break;
       case 111:
          return jjMoveStringLiteralDfa12_0(active0, 0x40000000ULL, active1, 0L);
       default :
-- 
cgit v0.12


From 2702af59b09e68ad2db9eff7ef4ae5594deb15ae Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 9 Nov 2019 14:00:44 +0100
Subject: Fixed use of uninitialized data in VHDL generator

---
 src/vhdldocgen.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 3585230..90d4829 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -717,7 +717,7 @@ static QMap<ClassDef*,QList<ClassDef> > packages;
 
 MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& memName)
 {
-  ClassDef* cd,*ecd;
+  ClassDef* cd,*ecd=0;
   MemberDef *mdef=0;
 
   cd=getClass(className);
@@ -793,9 +793,11 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem
     if (!packages.contains(ecd)) VhdlDocGen::findAllPackages(ecd);
   }
 
- QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.find(ecd);
-      if (cList.key()!=0)
-	  {
+  if (ecd)
+  {
+    QMap<ClassDef*,QList<ClassDef> >::Iterator cList=packages.find(ecd);
+    if (cList!=packages.end())
+    {
       QList<ClassDef> mlist=cList.data();
       for (uint j=0;j<mlist.count();j++)
       {
@@ -804,7 +806,8 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem
         mdef=VhdlDocGen::findMemberDef(mlist.at(j),memName,MemberListType_pubMethods);
         if (mdef) return mdef;
       }
-	  }
+    }
+  }
   return 0;
 
 }//findMember
-- 
cgit v0.12


From 1919a8e0457925ff63d91a0227729340121d461e Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 9 Nov 2019 14:01:22 +0100
Subject: Make preprocess code reentrant

---
 src/doxygen.cpp |   10 +-
 src/doxygen.h   |    2 +
 src/pre.h       |   16 +-
 src/pre.l       | 4689 ++++++++++++++++++++++++++++---------------------------
 4 files changed, 2383 insertions(+), 2334 deletions(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index bf282b6..b0b3e67 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -171,6 +171,7 @@ bool             Doxygen::generatingXmlOutput = FALSE;
 bool             Doxygen::markdownSupport = TRUE;
 GenericsSDict   *Doxygen::genericsDict;
 DocGroup         Doxygen::docGroup;
+Preprocessor    *Doxygen::preprocessor = 0;
 
 // locally accessible globals
 static std::unordered_map< std::string, const Entry* > g_classEntries;
@@ -9395,7 +9396,7 @@ static void parseFile(ParserInterface *parser,
     BufStr inBuf(fi.size()+4096);
     msg("Preprocessing %s...\n",fn);
     readInputFile(fileName,inBuf);
-    preprocessFile(fileName,inBuf,preBuf);
+    Doxygen::preprocessor->processFile(fileName,inBuf,preBuf);
   }
   else // no preprocessing
   {
@@ -10078,7 +10079,7 @@ void initDoxygen()
   portable_correct_path();
 
   Doxygen::runningTime.start();
-  initPreprocessor();
+  Doxygen::preprocessor = new Preprocessor();
 
   Doxygen::parserManager = new ParserManager;
   Doxygen::parserManager->registerDefaultParser(         new FileParser);
@@ -10182,7 +10183,7 @@ void cleanUpDoxygen()
   delete Doxygen::globalScope;
   delete Doxygen::xrefLists;
   delete Doxygen::parserManager;
-  cleanUpPreprocessor();
+  delete Doxygen::preprocessor;
   delete theTranslator;
   delete g_outputList;
   Mappers::freeMappers();
@@ -10662,7 +10663,7 @@ void adjustConfiguration()
   while (s)
   {
     QFileInfo fi(s);
-    addSearchDir(fi.absFilePath().utf8());
+    Doxygen::preprocessor->addSearchDir(fi.absFilePath().utf8());
     s=includePath.next();
   }
 
@@ -11266,7 +11267,6 @@ void parseInput()
 
   // we are done with input scanning now, so free up the buffers used by flex
   // (can be around 4MB)
-  preFreeScanner();
   scanFreeScanner();
   pyscanFreeScanner();
 
diff --git a/src/doxygen.h b/src/doxygen.h
index c8eee7c..a23a678 100644
--- a/src/doxygen.h
+++ b/src/doxygen.h
@@ -60,6 +60,7 @@ class FormulaList;
 class FormulaDict;
 class FormulaNameDict;
 class SectionDict;
+class Preprocessor;
 struct MemberGroupInfo;
 
 typedef QList<QCString>    StringList;
@@ -152,6 +153,7 @@ class Doxygen
     static bool                      markdownSupport;
     static GenericsSDict            *genericsDict;
     static DocGroup                  docGroup;
+    static Preprocessor             *preprocessor;
 };
 
 void initDoxygen();
diff --git a/src/pre.h b/src/pre.h
index 190673f..193ab60 100644
--- a/src/pre.h
+++ b/src/pre.h
@@ -20,10 +20,16 @@
 
 class BufStr;
 
-void initPreprocessor();
-void cleanUpPreprocessor();
-void addSearchDir(const char *dir);
-void preprocessFile(const char *fileName,BufStr &input,BufStr &output);
-void preFreeScanner();
+class Preprocessor
+{
+  public:
+    Preprocessor();
+   ~Preprocessor();
+    void processFile(const char *fileName,BufStr &input,BufStr &output);
+    void addSearchDir(const char *dir);
+ private:
+   class Private;
+   Private *p;
+};
 
 #endif
diff --git a/src/pre.l b/src/pre.l
index 5e46110..0541b46 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -16,6 +16,8 @@
  */
 %option never-interactive
 %option prefix="preYY"
+%option reentrant
+%option extra-type="struct preYY_state *"
 
 %{
 
@@ -96,7 +98,8 @@ class DefineManager
   {
     public:
       /** Creates an empty container for defines */
-      DefinesPerFile() : m_defines(257), m_includedFiles(17)
+      DefinesPerFile(DefineManager *parent) 
+         : m_parent(parent), m_defines(257), m_includedFiles(17)
       {
         m_defines.setAutoDelete(TRUE);
       }
@@ -126,24 +129,25 @@ class DefineManager
       }
       void collectDefines(DefineDict *dict,QDict<void> &includeStack);
     private:
+      DefineManager *m_parent;
       DefineDict m_defines;
       QDict<void> m_includedFiles;
   };
 
   public:
     friend class DefinesPerFile;
-    /** Returns a reference to the singleton */
-    static DefineManager &instance()
+
+    /** Creates a new DefineManager object */
+    DefineManager() : m_fileMap(1009), m_contextDefines(1009)
     {
-      if (theInstance==0) theInstance = new DefineManager;
-      return *theInstance;
+      m_fileMap.setAutoDelete(TRUE);
     }
-    /** Deletes the singleton */
-    static void deleteInstance()
+
+    /** Destroys the object */
+    virtual ~DefineManager() 
     {
-      delete theInstance;
-      theInstance = 0;
     }
+
     /** Starts a context in which defines are collected. 
      *  Called at the start of a new file that is preprocessed.
      *  @param fileName the name of the file to process.
@@ -157,7 +161,7 @@ class DefineManager
       if (dpf==0)
       {
 	//printf("New file!\n");
-	dpf = new DefinesPerFile;
+	dpf = new DefinesPerFile(this);
 	m_fileMap.insert(fileName,dpf);
       }
     }
@@ -182,7 +186,7 @@ class DefineManager
       if (dpf==0)
       {
 	//printf("New file!\n");
-	dpf = new DefinesPerFile;
+	dpf = new DefinesPerFile(this);
 	m_fileMap.insert(fileName,dpf);
       }
       else
@@ -211,7 +215,7 @@ class DefineManager
       DefinesPerFile *dpf = m_fileMap.find(fileName);
       if (dpf==0)
       {
-	dpf = new DefinesPerFile;
+	dpf = new DefinesPerFile(this);
 	m_fileMap.insert(fileName,dpf);
       }
       dpf->addDefine(def);
@@ -228,7 +232,7 @@ class DefineManager
       DefinesPerFile *dpf = m_fileMap.find(fromFileName);
       if (dpf==0)
       {
-	dpf = new DefinesPerFile;
+	dpf = new DefinesPerFile(this);
 	m_fileMap.insert(fromFileName,dpf);
       }
       dpf->addInclude(toFileName);
@@ -248,9 +252,8 @@ class DefineManager
     {
       return m_contextDefines;
     }
-  private:
-    static DefineManager *theInstance;
 
+  private:
     /** Helper function to collect all define for a given file */
     void collectDefinesForFile(const char *fileName,DefineDict *dict)
     {
@@ -270,23 +273,10 @@ class DefineManager
       return m_fileMap.find(fileName);
     }
 
-    /** Creates a new DefineManager object */
-    DefineManager() : m_fileMap(1009), m_contextDefines(1009)
-    {
-      m_fileMap.setAutoDelete(TRUE);
-    }
-
-    /** Destroys the object */
-    virtual ~DefineManager() 
-    {
-    }
-
     QDict<DefinesPerFile> m_fileMap;
     DefineDict m_contextDefines;
 };
 
-/** Singleton instance */
-DefineManager *DefineManager::theInstance = 0;
 
 /** Collects all defines for a file and all files that the file includes.
  *  This function will recursively call itself for each file.
@@ -304,7 +294,7 @@ void DefineManager::DefinesPerFile::collectDefines(
     for (di.toFirst();(di.current());++di)
     {
       QCString incFile = di.currentKey();
-      DefinesPerFile *dpf = DefineManager::instance().find(incFile);
+      DefinesPerFile *dpf = m_parent->find(incFile);
       if (dpf && includeStack.find(incFile)==0) 
       {
         //printf("  processing include %s\n",incFile.data());
@@ -334,1903 +324,560 @@ void DefineManager::DefinesPerFile::collectDefines(
  *	scanner's state
  */
 
-static int                g_yyLineNr   = 1;
-static int                g_yyMLines   = 1;
-static int                g_yyColNr   = 1;
-static QCString           g_yyFileName;
-static FileDef           *g_yyFileDef;
-static FileDef           *g_inputFileDef;
-static int                g_ifcount    = 0;
-static QStrList          *g_pathList = 0;  
-static QStack<FileState>  g_includeStack;
-static QDict<int>        *g_argDict;
-static int                g_defArgs = -1;
-static QCString           g_defName;
-static QCString           g_defText;
-static QCString           g_defLitText;
-static QCString           g_defArgsStr;
-static QCString           g_defExtraSpacing;
-static bool               g_defVarArgs;
-static int                g_level;
-static int                g_lastCContext;
-static int                g_lastCPPContext;
-static QArray<int>        g_levelGuard;
-static BufStr            *g_inputBuf;
-static int                g_inputBufPos;
-static BufStr            *g_outputBuf;
-static int                g_roundCount;
-static bool               g_quoteArg;
-static DefineDict        *g_expandedDict;
-static int                g_findDefArgContext;
-static bool               g_expectGuard;
-static QCString           g_guardName;
-static QCString           g_lastGuardName;
-static QCString           g_incName;
-static QCString           g_guardExpr;
-static int                g_curlyCount;
-static bool               g_nospaces; // add extra spaces during macro expansion
-
-static bool               g_macroExpansion; // from the configuration
-static bool               g_expandOnlyPredef; // from the configuration
-static int                g_commentCount;
-static bool               g_insideComment;
-static bool               g_isImported;
-static QCString           g_blockName;
-static int                g_condCtx;
-static bool               g_skip;
-static QStack<CondCtx>    g_condStack;
-static bool               g_insideCS; // C# has simpler preprocessor
-static bool               g_isSource;
-
-static bool               g_lexInit = FALSE;
-static int                g_fenceSize = 0;
-static bool               g_ccomment;
-static QCString           g_delimiter;
-
-//DefineDict* getGlobalDefineDict() 
-//{
-//  return g_globalDefineDict;
-//}
-
-static void setFileName(const char *name)
-{
-  bool ambig;
-  QFileInfo fi(name);
-  g_yyFileName=fi.absFilePath().utf8();
-  g_yyFileDef=findFileDef(Doxygen::inputNameDict,g_yyFileName,ambig);
-  if (g_yyFileDef==0) // if this is not an input file check if it is an
-                      // include file
-  {
-    g_yyFileDef=findFileDef(Doxygen::includeNameDict,g_yyFileName,ambig);
-  }
-  //printf("setFileName(%s) g_yyFileName=%s g_yyFileDef=%p\n",
-  //    name,g_yyFileName.data(),g_yyFileDef);
-  if (g_yyFileDef && g_yyFileDef->isReference()) g_yyFileDef=0;
-  g_insideCS = getLanguageFromFileName(g_yyFileName)==SrcLangExt_CSharp;
-  g_isSource = guessSection(g_yyFileName);
-}
-
-static void incrLevel()
-{
-  g_level++;
-  g_levelGuard.resize(g_level);
-  g_levelGuard[g_level-1]=FALSE;
-  //printf("%s line %d: incrLevel %d\n",g_yyFileName.data(),g_yyLineNr,g_level);
-}
-
-static void decrLevel()
+struct preYY_state
 {
-  //printf("%s line %d: decrLevel %d\n",g_yyFileName.data(),g_yyLineNr,g_level);
-  if (g_level > 0)
-  {
-    g_level--;
-    g_levelGuard.resize(g_level);
-  }
-  else
-  {
-    warn(g_yyFileName,g_yyLineNr,"More #endif's than #if's found.\n");
-  }
-}
-
-static bool otherCaseDone()
-{
-  if (g_level==0)
-  {
-    warn(g_yyFileName,g_yyLineNr,"Found an #else without a preceding #if.\n");
-    return TRUE;
-  }
-  else
-  {
-    return g_levelGuard[g_level-1];
-  }
-}
+  preYY_state() :    allIncludes(10009) {}
+  int                yyLineNr   = 1;
+  int                yyMLines   = 1;
+  int                yyColNr   = 1;
+  QCString           yyFileName;
+  FileDef           *yyFileDef;
+  FileDef           *inputFileDef;
+  int                ifcount    = 0;
+  QStrList          *pathList = 0;  
+  QStack<FileState>  includeStack;
+  QDict<int>        *argDict;
+  int                defArgs = -1;
+  QCString           defName;
+  QCString           defText;
+  QCString           defLitText;
+  QCString           defArgsStr;
+  QCString           defExtraSpacing;
+  bool               defVarArgs;
+  int                level;
+  int                lastCContext;
+  int                lastCPPContext;
+  QArray<int>        levelGuard;
+  BufStr            *inputBuf;
+  int                inputBufPos;
+  BufStr            *outputBuf;
+  int                roundCount;
+  bool               quoteArg;
+  DefineDict        *expandedDict;
+  int                findDefArgContext;
+  bool               expectGuard;
+  QCString           guardName;
+  QCString           lastGuardName;
+  QCString           incName;
+  QCString           guardExpr;
+  int                curlyCount;
+  bool               nospaces; // add extra spaces during macro expansion
+
+  bool               macroExpansion; // from the configuration
+  bool               expandOnlyPredef; // from the configuration
+  int                commentCount;
+  bool               insideComment;
+  bool               isImported;
+  QCString           blockName;
+  int                condCtx;
+  bool               skip;
+  QStack<CondCtx>    condStack;
+  bool               insideCS; // C# has simpler preprocessor
+  bool               isSource;
+
+  int                fenceSize = 0;
+  bool               ccomment;
+  QCString           delimiter;
+  QDict<void>        allIncludes;
+  DefineManager      defineManager;
+};
 
-static void setCaseDone(bool value)
-{
-  g_levelGuard[g_level-1]=value;
-}
+// stateless functions
+static QCString escapeAt(const char *text);
+static QCString extractTrailingComment(const char *s);
+static char resolveTrigraph(char c);
+
+// statefull functions
+static inline void outputArray(yyscan_t yyscanner,const char *a,int len);
+static inline void  outputChar(yyscan_t yyscanner,char c);
+static QCString    expandMacro(yyscan_t yyscanner,const QCString &name);
+static void    readIncludeFile(yyscan_t yyscanner,const QCString &inc);
+static void          incrLevel(yyscan_t yyscanner);
+static void          decrLevel(yyscan_t yyscanner);
+static void        setCaseDone(yyscan_t yyscanner,bool value);
+static bool      otherCaseDone(yyscan_t yyscanner);
+static bool  computeExpression(yyscan_t yyscanner,const QCString &expr);
+static void   startCondSection(yyscan_t yyscanner,const char *sectId);
+static void     endCondSection(yyscan_t yyscanner);
+static void          addDefine(yyscan_t yyscanner);
+static Define *      newDefine(yyscan_t yyscanner);
+static void        setFileName(yyscan_t yyscanner,const char *name);
+static int              yyread(yyscan_t yyscanner,char *buf,int max_size);
 
-static QDict<void> g_allIncludes(10009);
+/* ----------------------------------------------------------------- */
 
-static FileState *checkAndOpenFile(const QCString &fileName,bool &alreadyIncluded)
-{
-  alreadyIncluded = FALSE;
-  FileState *fs = 0;
-  //printf("checkAndOpenFile(%s)\n",fileName.data());
-  QFileInfo fi(fileName);
-  if (fi.exists() && fi.isFile())
-  {
-    static QStrList &exclPatterns = Config_getList(EXCLUDE_PATTERNS);
-    if (patternMatch(fi,&exclPatterns)) return 0;
+#undef  YY_INPUT
+#define YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
 
-    QCString absName = fi.absFilePath().utf8();
+/* ----------------------------------------------------------------- */
 
-    // global guard
-    if (g_curlyCount==0) // not #include inside { ... }
-    {
-      if (g_allIncludes.find(absName)!=0)
-      {
-        alreadyIncluded = TRUE;
-        //printf("  already included 1\n");
-        return 0; // already done
-      }
-      g_allIncludes.insert(absName,(void *)0x8);
-    }
-    // check include stack for absName
+%}
 
-    QStack<FileState> tmpStack;
-    g_includeStack.setAutoDelete(FALSE);
-    while ((fs=g_includeStack.pop()))
-    {
-      if (fs->fileName==absName) alreadyIncluded=TRUE;
-      tmpStack.push(fs);
-    }
-    while ((fs=tmpStack.pop()))
-    {
-      g_includeStack.push(fs);
-    }
-    g_includeStack.setAutoDelete(TRUE);
+ID	[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
+B       [ \t]
+BN	[ \t\r\n]
+RAWBEGIN  (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
+RAWEND    ")"[^ \t\(\)\\]{0,16}\"
+CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 
-    if (alreadyIncluded)
-    {
-      //printf("  already included 2\n");
-      return 0;
-    }
-    //printf("#include %s\n",absName.data());
+%option noyywrap
 
-    fs = new FileState(fi.size()+4096);
-    alreadyIncluded = FALSE;
-    if (!readInputFile(absName,fs->fileBuf))
-    { // error
-      //printf("  error reading\n");
-      delete fs;
-      fs=0;
-    }
-    else
-    {
-      fs->oldFileBuf    = g_inputBuf;
-      fs->oldFileBufPos = g_inputBufPos;
-    }
-  }
-  return fs;
-}
+%x      Start
+%x	Command
+%x	SkipCommand
+%x	SkipLine
+%x	SkipString
+%x	CopyLine
+%x	CopyString
+%x	CopyStringCs
+%x	CopyStringFtn
+%x	CopyStringFtnDouble
+%x      CopyRawString
+%x      Include
+%x      IncludeID
+%x      EndImport
+%x	DefName
+%x	DefineArg
+%x	DefineText
+%x      SkipCPPBlock
+%x      Ifdef
+%x      Ifndef
+%x	SkipCComment
+%x	ArgCopyCComment
+%x	CopyCComment
+%x	SkipVerbatim
+%x	SkipCPPComment
+%x	RemoveCComment
+%x	RemoveCPPComment
+%x	Guard
+%x	DefinedExpr1
+%x	DefinedExpr2
+%x	SkipDoubleQuote
+%x	SkipSingleQuote
+%x	UndefName
+%x	IgnoreLine
+%x	FindDefineArgs
+%x	ReadString
+%x	CondLineC
+%x	CondLineCpp
+%x      SkipCond
 
-static FileState *findFile(const char *fileName,bool localInclude,bool &alreadyIncluded)
-{
-  //printf("** findFile(%s,%d) g_yyFileName=%s\n",fileName,localInclude,g_yyFileName.data());
-  if (portable_isAbsolutePath(fileName))
-  {
-    FileState *fs = checkAndOpenFile(fileName,alreadyIncluded);
-    if (fs)
-    {
-      setFileName(fileName);
-      g_yyLineNr=1;
-      return fs;
-    }
-    else if (alreadyIncluded)
-    {
-      return 0;
-    }
-  }
-  if (localInclude && !g_yyFileName.isEmpty())
-  {
-    QFileInfo fi(g_yyFileName);
-    if (fi.exists())
-    {
-      QCString absName = QCString(fi.dirPath(TRUE).data())+"/"+fileName;
-      FileState *fs = checkAndOpenFile(absName,alreadyIncluded);
-      if (fs)
-      {
-	setFileName(absName);
-	g_yyLineNr=1;
-	return fs;
-      }
-      else if (alreadyIncluded)
-      {
-	return 0;
-      }
-    }
-  }
-  if (g_pathList==0) 
-  {
-    return 0;
-  }
-  char *s=g_pathList->first();
-  while (s)
-  {
-    QCString absName = (QCString)s+"/"+fileName;
-    //printf("  Looking for %s in %s\n",fileName,s);
-    FileState *fs = checkAndOpenFile(absName,alreadyIncluded);
-    if (fs)
-    {
-      setFileName(absName);
-      g_yyLineNr=1;
-      //printf("  -> found it\n");
-      return fs;
-    }
-    else if (alreadyIncluded)
-    {
-      return 0;
-    }
+%%
 
-    s=g_pathList->next();
-  } 
-  return 0;
-}
+<*>\x06					
+<*>\x00
+<*>\r
+<*>"??"[=/'()!<>-]			{ // Trigraph
+  					  unput(resolveTrigraph(yytext[2]));
+  					}
+<Start>^{B}*"#"				{ BEGIN(Command); yyextra->yyColNr+=yyleng; yyextra->yyMLines=0;}
+<Start>^{B}*/[^#]			{
+ 					  outputArray(yyscanner,yytext,(int)yyleng);
+  					  BEGIN(CopyLine); 
+					}
+<Start>^{B}*[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]+{B}*"("[^\)\n]*")"/{BN}{1,10}*[:{] { // constructors?
+					  int i;
+					  for (i=(int)yyleng-1;i>=0;i--)
+					  {
+					    unput(yytext[i]);
+					  }
+					  BEGIN(CopyLine);
+                                        }
+<Start>^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\(\)\n]*"("[^\)\n]*")"[^\)\n]*")"{B}*\n | // function list macro with one (...) argument, e.g. for K_GLOBAL_STATIC_WITH_ARGS
+<Start>^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\)\n]*")"{B}*\n { // function like macro
+  					  bool skipFuncMacros = Config_getBool(SKIP_FUNCTION_MACROS);
+					  QCString name(yytext);
+					  name=name.left(name.find('(')).stripWhiteSpace();
 
-static QCString extractTrailingComment(const char *s)
-{
-  if (s==0) return "";
-  int i=strlen(s)-1;
-  while (i>=0)
-  {
-    char c=s[i];
-    switch (c)
-    {
-      case '/':
-	{
-	  i--;
-	  if (i>=0 && s[i]=='*') // end of a comment block
-	  {
-	    i--;
-	    while (i>0 && !(s[i-1]=='/' && s[i]=='*')) i--;
-	    if (i==0) 
-	    {
-	      i++;
-	    }
-	    // only /*!< or /**< are treated as a comment for the macro name,
-	    // otherwise the comment is treated as part of the macro definition
-	    return ((s[i+1]=='*' || s[i+1]=='!') && s[i+2]=='<') ? &s[i-1] : ""; 
-	  }
-	  else
-	  {
-	    return "";
-	  }
-	} 
-	break;
-	// whitespace or line-continuation
-      case ' ':
-      case '\t': 
-      case '\r':
-      case '\n':
-      case '\\':
-	break;
-      default:
-	return "";
-    }
-    i--;
-  }
-  return "";
-}
-
-static int getNextChar(const QCString &expr,QCString *rest,uint &pos);
-static int getCurrentChar(const QCString &expr,QCString *rest,uint pos);
-static void unputChar(const QCString &expr,QCString *rest,uint &pos,char c);
-static void expandExpression(QCString &expr,QCString *rest,int pos);
-
-static QCString stringize(const QCString &s)
-{
-  QCString result;
-  uint i=0;
-  bool inString=FALSE;
-  bool inChar=FALSE;
-  char c,pc;
-  while (i<s.length())
-  {
-    if (!inString && !inChar)
-    {
-      while (i<s.length() && !inString && !inChar)
-      {
-	c=s.at(i++);
-	if (c=='"')
-	{
-	  result+="\\\"";
-	  inString=TRUE;
-	}
-	else if (c=='\'')
-	{
-	  result+=c;
-	  inChar=TRUE;
-	}
-	else
-	{
-	  result+=c;
-	}
-      }
-    }
-    else if (inChar)
-    {
-      while (i<s.length() && inChar)
-      {
-	c=s.at(i++);
-	if (c=='\'')
-	{
-	  result+='\'';
-	  inChar=FALSE;
-	}
-	else if (c=='\\')
-	{
-	  result+="\\\\";
-	}
-	else
-	{
-	  result+=c;
-	}
-      }
-    }
-    else
-    {
-      pc=0;
-      while (i<s.length() && inString)
-      {
-	char c=s.at(i++);
-	if (c=='"') 
-	{
-	  result+="\\\"";
-	  inString= pc=='\\';
-	}
-	else if (c=='\\')
-	  result+="\\\\";
-	else
-	  result+=c;
-	pc=c;
-      }
-    }
-  }
-  //printf("stringize '%s'->'%s'\n",s.data(),result.data());
-  return result;
-}
-
-/*! Execute all ## operators in expr. 
- * If the macro name before or after the operator contains a no-rescan 
- * marker (@-) then this is removed (before the concatenated macro name
- * may be expanded again.
- */
-static void processConcatOperators(QCString &expr)
-{
-  //printf("processConcatOperators: in='%s'\n",expr.data());
-  QRegExp r("[ \\t\\n]*##[ \\t\\n]*"); 
-  int l,n,i=0;
-  if (expr.isEmpty()) return;
-  while ((n=r.match(expr,i,&l))!=-1)
-  {
-    //printf("Match: '%s'\n",expr.data()+i);
-    if (n+l+1<(int)expr.length() && expr.at(n+l)=='@' && expr.at(n+l+1)=='-')
-    {
-      // remove no-rescan marker after ID
-      l+=2;
-    }
-    //printf("found '%s'\n",expr.mid(n,l).data());
-    // remove the ## operator and the surrounding whitespace
-    expr=expr.left(n)+expr.right(expr.length()-n-l);
-    int k=n-1;
-    while (k>=0 && isId(expr.at(k))) k--; 
-    if (k>0 && expr.at(k)=='-' && expr.at(k-1)=='@')
-    {
-      // remove no-rescan marker before ID
-      expr=expr.left(k-1)+expr.right(expr.length()-k-1);
-      n-=2;
-    }
-    i=n;
-  }
-  //printf("processConcatOperators: out='%s'\n",expr.data());
-}
-
-static void yyunput (int c,char *buf_ptr  );
-static void returnCharToStream(char c)
-{
-  unput(c);
-}
-
-static inline void addTillEndOfString(const QCString &expr,QCString *rest,
-                                       uint &pos,char term,QCString &arg)
-{
-  int cc;
-  while ((cc=getNextChar(expr,rest,pos))!=EOF && cc!=0)
-  {
-    if (cc=='\\') arg+=(char)cc,cc=getNextChar(expr,rest,pos);
-    else if (cc==term) return;
-    arg+=(char)cc;
-  }
-}
-
-/*! replaces the function macro \a def whose argument list starts at
- * \a pos in expression \a expr. 
- * Notice that this routine may scan beyond the \a expr string if needed.
- * In that case the characters will be read from the input file.
- * The replacement string will be returned in \a result and the 
- * length of the (unexpanded) argument list is stored in \a len.
- */ 
-static bool replaceFunctionMacro(const QCString &expr,QCString *rest,int pos,int &len,const Define *def,QCString &result)
-{
-  //printf("replaceFunctionMacro(expr=%s,rest=%s,pos=%d,def=%s) level=%d\n",expr.data(),rest ? rest->data() : 0,pos,def->name.data(),g_level);
-  uint j=pos;
-  len=0;
-  result.resize(0);
-  int cc;
-  while ((cc=getCurrentChar(expr,rest,j))!=EOF && isspace(cc)) 
-  { 
-    len++; 
-    getNextChar(expr,rest,j); 
-  }
-  if (cc!='(') 
-  { 
-    unputChar(expr,rest,j,' '); 
-    return FALSE; 
-  }
-  getNextChar(expr,rest,j); // eat the '(' character
-
-  QDict<QCString> argTable;  // list of arguments
-  argTable.setAutoDelete(TRUE);
-  QCString arg;
-  int argCount=0;
-  bool done=FALSE;
-  
-  // PHASE 1: read the macro arguments
-  if (def->nargs==0)
-  {
-    while ((cc=getNextChar(expr,rest,j))!=EOF && cc!=0)
-    {
-      char c = (char)cc;
-      if (c==')') break;
-    }
-  }
-  else
-  {
-    while (!done && (argCount<def->nargs || def->varArgs) && 
-	((cc=getNextChar(expr,rest,j))!=EOF && cc!=0)
-	  )
-    {
-      char c=(char)cc;
-      if (c=='(') // argument is a function => search for matching )
-      {
-	int level=1;
-	arg+=c;
-	//char term='\0';
-	while ((cc=getNextChar(expr,rest,j))!=EOF && cc!=0)
-	{
-	  char c=(char)cc;
-	  //printf("processing %c: term=%c (%d)\n",c,term,term);
-	  if (c=='\'' || c=='\"') // skip ('s and )'s inside strings
-	  {
-	    arg+=c;
-	    addTillEndOfString(expr,rest,j,c,arg);
-	  }
-	  if (c==')')
-	  {
-	    level--;
-	    arg+=c;
-	    if (level==0) break;
-	  }
-	  else if (c=='(')
-	  {
-	    level++;
-	    arg+=c;
-	  }
-	  else
-	    arg+=c;
-	}
-      }
-      else if (c==')' || c==',') // last or next argument found
-      {
-	if (c==',' && argCount==def->nargs-1 && def->varArgs)
-	{
-	  arg=arg.stripWhiteSpace();
-	  arg+=',';
-	}
-	else
-	{
-	  QCString argKey;
-	  argKey.sprintf("@%d",argCount++); // key name
-	  arg=arg.stripWhiteSpace();
-	  // add argument to the lookup table
-	  argTable.insert(argKey, new QCString(arg));
-	  arg.resize(0);
-	  if (c==')') // end of the argument list
-	  {
-	    done=TRUE;
-	  }
-	}
-      } 
-      else if (c=='\"') // append literal strings
-      {
-	arg+=c; 
-	bool found=FALSE;
-	while (!found && (cc=getNextChar(expr,rest,j))!=EOF && cc!=0)
-	{
-	  found = cc=='"';
-	  if (cc=='\\')
-	  {
-	    c=(char)cc;	  
-	    arg+=c;
-	    if ((cc=getNextChar(expr,rest,j))==EOF || cc==0) break;
-	  }
-	  c=(char)cc;	  
-	  arg+=c;
-	}
-      }
-      else if (c=='\'') // append literal characters
-      {
-	arg+=c;
-	bool found=FALSE;
-	while (!found && (cc=getNextChar(expr,rest,j))!=EOF && cc!=0)
-	{
-	  found = cc=='\'';
-	  if (cc=='\\')
-	  {
-	    c=(char)cc;	  
-	    arg+=c;
-	    if ((cc=getNextChar(expr,rest,j))==EOF || cc==0) break;
-	  }
-	  c=(char)cc;
-	  arg+=c;
-	}
-      }	    
-      else if (c=='/') // possible start of a comment
-      {
-        char prevChar = '\0';
-        arg+=c;
-        if ((cc=getCurrentChar(expr,rest,j)) == '*') // we have a comment
-        {
-          while ((cc=getNextChar(expr,rest,j))!=EOF && cc!=0)
-          {
-            c=(char)cc;
-            arg+=c;
-            if (c == '/' && prevChar == '*') break; // we have an end of comment
-            prevChar = c;
-          }
-        }
-      }
-      else // append other characters
-      {
-	arg+=c;
-      }
-    }
-  }
-
-  // PHASE 2: apply the macro function
-  if (argCount==def->nargs || // same number of arguments
-      (argCount>=def->nargs-1 && def->varArgs)) // variadic macro with at least as many
-                                                // params as the non-variadic part (see bug731985)
-  {
-    uint k=0;
-    // substitution of all formal arguments
-    QCString resExpr;
-    const QCString d=def->definition.stripWhiteSpace();
-    //printf("Macro definition: %s\n",d.data());
-    bool inString=FALSE;
-    while (k<d.length())
-    {
-      if (d.at(k)=='@') // maybe a marker, otherwise an escaped @
-      {
-	if (d.at(k+1)=='@') // escaped @ => copy it (is unescaped later)
-	{
-	  k+=2;
-	  resExpr+="@@"; // we unescape these later
-	}
-	else if (d.at(k+1)=='-') // no-rescan marker
-	{
-	  k+=2;
-	  resExpr+="@-";
-	}
-	else // argument marker => read the argument number
-	{
-	  QCString key="@";
-	  QCString *subst=0;
-	  bool hash=FALSE;
-	  int l=k-1;
-	  // search for ## backward
-	  if (l>=0 && d.at(l)=='"') l--;
-	  while (l>=0 && d.at(l)==' ') l--;
-	  if (l>0 && d.at(l)=='#' && d.at(l-1)=='#') hash=TRUE;
-	  k++;
-	  // scan the number
-	  while (k<d.length() && d.at(k)>='0' && d.at(k)<='9') key+=d.at(k++);
-	  if (!hash) 
-	  {
-	    // search for ## forward
-	    l=k;
-	    if (l<(int)d.length() && d.at(l)=='"') l++;
-	    while (l<(int)d.length() && d.at(l)==' ') l++;
-	    if (l<(int)d.length()-1 && d.at(l)=='#' && d.at(l+1)=='#') hash=TRUE;
-	  }
-	  //printf("request key %s result %s\n",key.data(),argTable[key]->data());
-	  if (key.length()>1 && (subst=argTable[key])) 
-	  {
-	    QCString substArg=*subst;
-	    //printf("substArg='%s'\n",substArg.data());
-	    // only if no ## operator is before or after the argument
-	    // marker we do macro expansion.
-	    if (!hash) expandExpression(substArg,0,0);
-	    if (inString)
-	    {
-	      //printf("'%s'=stringize('%s')\n",stringize(*subst).data(),subst->data());
-
-	      // if the marker is inside a string (because a # was put 
-	      // before the macro name) we must escape " and \ characters
-	      resExpr+=stringize(substArg);
-	    }
-	    else
-	    {
-	      if (hash && substArg.isEmpty())
-	      {
-		resExpr+="@E"; // empty argument will be remove later on
-	      }
-	      else if (g_nospaces)
-	      {
-	        resExpr+=substArg;
-	      }
-	      else
-	      {
-	        resExpr+=" "+substArg+" ";
-	      }
-	    }
-	  }
-	}
-      }
-      else // no marker, just copy
-      {
-	if (!inString && d.at(k)=='\"') 
-	{
-	  inString=TRUE; // entering a literal string
-	}
-	else if (inString && d.at(k)=='\"' && (d.at(k-1)!='\\' || d.at(k-2)=='\\'))
-	{
-	  inString=FALSE; // leaving a literal string
-	}
-	resExpr+=d.at(k++);
-      }
-    }
-    len=j-pos;
-    result=resExpr;
-    //printf("result after substitution '%s' expr='%s'\n",
-    //       result.data(),expr.mid(pos,len).data());
-    return TRUE;
-  }
-  return FALSE;
-}
-
-
-/*! returns the next identifier in string \a expr by starting at position \a p.
- * The position of the identifier is returned (or -1 if nothing is found)
- * and \a l is its length. Any quoted strings are skipping during the search.
- */
-static int getNextId(const QCString &expr,int p,int *l)
-{
-  int n;
-  while (p<(int)expr.length())
-  {
-    char c=expr.at(p++);
-    if (isdigit(c)) // skip number
-    {
-      while (p<(int)expr.length() && isId(expr.at(p))) p++;
-    }
-    else if (isalpha(c) || c=='_') // read id
-    {
-      n=p-1;
-      while (p<(int)expr.length() && isId(expr.at(p))) p++;
-      *l=p-n;
-      return n; 
-    }
-    else if (c=='"') // skip string
-    {
-      char ppc=0,pc=c;
-      if (p<(int)expr.length()) c=expr.at(p);
-      while (p<(int)expr.length() && (c!='"' || (pc=='\\' && ppc!='\\'))) 
-	// continue as long as no " is found, but ignoring \", but not \\"
-      {
-	ppc=pc;
-	pc=c;
-	c=expr.at(p);
-	p++;
-      }
-      if (p<(int)expr.length()) ++p; // skip closing quote
-    }
-    else if (c=='/') // skip C Comment
-    {
-      //printf("Found C comment at p=%d\n",p);
-      char pc=c;
-      if (p<(int)expr.length()) 
-      {
-	c=expr.at(p);
-        if (c=='*')  // Start of C comment
-        { 
-	  p++;
-  	  while (p<(int)expr.length() && !(pc=='*' && c=='/'))
-	  {
-	    pc=c;
-	    c=expr.at(p++);
-	  }
-        }
-      }
-      //printf("Found end of C comment at p=%d\n",p);
-    }
-  }
-  return -1;
-}
-
-/*! performs recursive macro expansion on the string \a expr
- *  starting at position \a pos.
- *  May read additional characters from the input while re-scanning!
- *  If \a expandAll is \c TRUE then all macros in the expression are
- *  expanded, otherwise only the first is expanded.
- */
-static void expandExpression(QCString &expr,QCString *rest,int pos)
-{
-  //printf("expandExpression(%s,%s)\n",expr.data(),rest ? rest->data() : 0);
-  QCString macroName;
-  QCString expMacro;
-  bool definedTest=FALSE;
-  int i=pos,l,p,len;
-  while ((p=getNextId(expr,i,&l))!=-1) // search for an macro name
-  {
-    bool replaced=FALSE;
-    macroName=expr.mid(p,l);
-    //printf("macroName=%s\n",macroName.data());
-    if (p<2 || !(expr.at(p-2)=='@' && expr.at(p-1)=='-')) // no-rescan marker?
-    {
-      if (g_expandedDict->find(macroName)==0) // expand macro
-      {
-	Define *def=DefineManager::instance().isDefined(macroName);
-        if (macroName=="defined")
-        {
-  	  //printf("found defined inside macro definition '%s'\n",expr.right(expr.length()-p).data());
-	  definedTest=TRUE;
-        }
-	else if (definedTest) // macro name was found after defined 
-	{
-	  if (def) expMacro = " 1 "; else expMacro = " 0 ";
-	  replaced=TRUE;
-	  len=l;
-	  definedTest=FALSE;
-	}
-	else if (def && def->nargs==-1) // simple macro
-	{
-	  // substitute the definition of the macro
-	  //printf("macro '%s'->'%s'\n",macroName.data(),def->definition.data());
-	  if (g_nospaces)
-	  {
-	    expMacro=def->definition.stripWhiteSpace();
-	  }
-	  else
-	  {
-	    expMacro=" "+def->definition.stripWhiteSpace()+" ";
-	  }
-	  //expMacro=def->definition.stripWhiteSpace();
-	  replaced=TRUE;
-	  len=l;
-	  //printf("simple macro expansion='%s'->'%s'\n",macroName.data(),expMacro.data());
-	}
-	else if (def && def->nargs>=0) // function macro
-	{
-	  replaced=replaceFunctionMacro(expr,rest,p+l,len,def,expMacro);
-	  len+=l;
-	}
-
-	if (replaced) // expand the macro and rescan the expression
-	{
-	  //printf("replacing '%s'->'%s'\n",expr.mid(p,len).data(),expMacro.data());
-	  QCString resultExpr=expMacro;
-	  QCString restExpr=expr.right(expr.length()-len-p);
-	  processConcatOperators(resultExpr);
-	  if (def && !def->nonRecursive)
-	  {
-	    g_expandedDict->insert(macroName,def);
-	    expandExpression(resultExpr,&restExpr,0);
-	    g_expandedDict->remove(macroName);
-	  }
-	  expr=expr.left(p)+resultExpr+restExpr;
-	  i=p;
-	  //printf("new expression: %s\n",expr.data());
-	}
-	else // move to the next macro name
-	{
-	  //printf("moving to the next macro old=%d new=%d\n",i,p+l);
-	  i=p+l;
-	}
-      }
-      else // move to the next macro name
-      {
-	expr=expr.left(p)+"@-"+expr.right(expr.length()-p);
-	//printf("macro already expanded, moving to the next macro expr=%s\n",expr.data());
-	i=p+l+2;
-	//i=p+l;
-      }
-    }
-    else // no re-scan marker found, skip the macro name
-    {
-      //printf("skipping marked macro\n");
-      i=p+l;
-    }
-  }
-}
-
-/*! @brief Process string or character literal.
- *
- * \a inputStr should point to the start of a string or character literal.
- * the routine will return a pointer to just after the end of the literal
- * the character making up the literal will be added to \a result.
- */
-const char *processUntilMatchingTerminator(const char *inputStr,QCString &result)
-{
-  if (inputStr==0) return inputStr;
-  char term = *inputStr; // capture start character of the literal
-  if (term!='\'' && term!='"') return inputStr; // not a valid literal
-  char c=term;
-  // output start character
-  result+=c;
-  inputStr++;
-  while ((c=*inputStr)) // while inside the literal
-  {
-    if (c==term) // found end marker of the literal
-    {
-      // output end character and stop
-      result+=c;
-      inputStr++;
-      break;
-    }
-    else if (c=='\\') // escaped character, process next character
-                      // as well without checking for end marker.
-    {
-      result+=c;
-      inputStr++;
-      c=*inputStr;
-      if (c==0) break; // unexpected end of string after escape character
-    }
-    result+=c;
-    inputStr++;
-  }
-  return inputStr;
-}
-
-/*! replaces all occurrences of @@@@ in \a s by @@
- *  and removes all occurrences of @@E.
- *  All identifiers found are replaced by 0L
- */
-QCString removeIdsAndMarkers(const char *s)
-{
-  //printf("removeIdsAndMarkers(%s)\n",s);
-  const char *p=s;
-  char c;
-  bool inNum=FALSE;
-  QCString result;
-  if (p)
-  {
-    while ((c=*p))
-    {
-      if (c=='@') // replace @@ with @ and remove @E
-      {
-	if (*(p+1)=='@')
-	{
-	  result+=c; 
-	}
-	else if (*(p+1)=='E')
-	{
-	  // skip
-	}
-	p+=2;
-      }
-      else if (isdigit(c)) // number
-      {
-	result+=c;
-	p++;
-        inNum=TRUE;	
-      }
-      else if (c=='\'') // quoted character
-      {
-        p = processUntilMatchingTerminator(p,result);
-      }
-      else if (c=='d' && !inNum) // identifier starting with a 'd'
-      {
-	if (qstrncmp(p,"defined ",8)==0 || qstrncmp(p,"defined(",8)==0) 
-	           // defined keyword
-	{
-	  p+=7; // skip defined
-	}
-	else
-	{
-	  result+="0L";
-	  p++;
-	  while ((c=*p) && isId(c)) p++;
-	}
-      }
-      else if ((isalpha(c) || c=='_') && !inNum) // replace identifier with 0L
-      {
-	result+="0L";
-	p++;
-	while ((c=*p) && isId(c)) p++;
-	while ((c=*p) && isspace((uchar)c)) p++;
-	if (*p=='(') // undefined function macro
-	{
-	  p++;
-	  int count=1;
-	  while ((c=*p++))
-	  {
-	    if (c=='(') count++;
-	    else if (c==')')
-	    {
-	      count--;
-	      if (count==0) break;
-	    }
-	    else if (c=='/')
-	    {
-	      char pc=c;
-	      c=*++p;
-	      if (c=='*') // start of C comment
-	      {
-		while (*p && !(pc=='*' && c=='/')) // search end of comment
-		{
-		  pc=c;
-		  c=*++p;
-		}
-		p++;
-	      }
-	    }
-	  }
-	}
-      }
-      else if (c=='/') // skip C comments
-      {
-	char pc=c;
-	c=*++p;
-	if (c=='*') // start of C comment
-	{ 
-	  while (*p && !(pc=='*' && c=='/')) // search end of comment
-	  {
-	    pc=c;
-	    c=*++p;
-	  }
-	  p++;
-	}
-	else // oops, not comment but division
-	{
-	  result+=pc;
-	  goto nextChar;
-	}
-      }
-      else 
-      {
-nextChar:
-	result+=c;
-	char lc=tolower(c);
-	if (!isId(lc) && lc!='.' /*&& lc!='-' && lc!='+'*/) inNum=FALSE;
-	p++;
-      }
-    }
-  }
-  //printf("removeIdsAndMarkers(%s)=%s\n",s,result.data());
-  return result;
-}
-
-/*! replaces all occurrences of @@ in \a s by @
- *  \par assumption: 
- *   \a s only contains pairs of @@'s
- */
-QCString removeMarkers(const char *s)
-{
-  const char *p=s;
-  char c;
-  QCString result;
-  if (p)
-  {
-    while ((c=*p))
-    {
-      switch(c)
-      {
-	case '@': // replace @@ with @
-	  {
-	    if (*(p+1)=='@')
-	    {
-	      result+=c; 
-	    }
-	    p+=2;
-	  }
-	  break;
-	case '/': // skip C comments
-	  {
-	    result+=c;
-	    char pc=c;
-	    c=*++p;
-	    if (c=='*') // start of C comment
-	    { 
-	      while (*p && !(pc=='*' && c=='/')) // search end of comment
-	      {
-		if (*p=='@' && *(p+1)=='@') 
-		  result+=c,p++;
-		else 
-		  result+=c;
-		pc=c;
-		c=*++p;
-	      }
-	      if (*p) result+=c,p++;
-	    }
-	  }
-	  break;
-	case '"': // skip string literals
-	case '\'': // skip char literals
-          p = processUntilMatchingTerminator(p,result);
-	  break;
-	default:
-	  {
-	    result+=c;
-	    p++;
-	  }
-	  break;
-      }
-    }
-  }
-  //printf("RemoveMarkers(%s)=%s\n",s,result.data());
-  return result;
-}
-
-/*! compute the value of the expression in string \a expr.
- *  If needed the function may read additional characters from the input.
- */
-
-bool computeExpression(const QCString &expr)
-{
-  QCString e=expr;
-  expandExpression(e,0,0);
-  //printf("after expansion '%s'\n",e.data());
-  e = removeIdsAndMarkers(e);
-  if (e.isEmpty()) return FALSE;
-  //printf("parsing '%s'\n",e.data());
-  return parseconstexp(g_yyFileName,g_yyLineNr,e);
-}
-
-/*! expands the macro definition in \a name
- *  If needed the function may read additional characters from the input
- */
-
-QCString expandMacro(const QCString &name)
-{
-  QCString n=name;
-  expandExpression(n,0,0);
-  n=removeMarkers(n);
-  //printf("expandMacro '%s'->'%s'\n",name.data(),n.data());
-  return n;
-}
-
-Define *newDefine()
-{
-  Define *def=new Define;
-  def->name       = g_defName;
-  def->definition = g_defText.stripWhiteSpace();
-  def->nargs      = g_defArgs;
-  def->fileName   = g_yyFileName; 
-  def->fileDef    = g_yyFileDef;
-  def->lineNr     = g_yyLineNr-g_yyMLines;
-  def->columnNr   = g_yyColNr;
-  def->varArgs    = g_defVarArgs;
-  //printf("newDefine: %s %s file: %s\n",def->name.data(),def->definition.data(),
-  //    def->fileDef ? def->fileDef->name().data() : def->fileName.data());
-  //printf("newDefine: '%s'->'%s'\n",def->name.data(),def->definition.data());
-  if (!def->name.isEmpty() && Doxygen::expandAsDefinedDict[def->name])
-  {
-    def->isPredefined=TRUE;
-  }
-  return def;
-}
-
-void addDefine()
-{
-  if (g_skip) return; // do not add this define as it is inside a 
-                      // conditional section (cond command) that is disabled.
-  if (!Doxygen::gatherDefines) return;
-
-  //printf("addDefine %s %s\n",g_defName.data(),g_defArgsStr.data());
-  //ArgumentList *al = new ArgumentList;
-  //stringToArgumentList(g_defArgsStr,al);
-  MemberDef *md=createMemberDef(
-      g_yyFileName,g_yyLineNr-g_yyMLines,g_yyColNr,
-      "#define",g_defName,g_defArgsStr,0,
-      Public,Normal,FALSE,Member,MemberType_Define,ArgumentList(),ArgumentList(),"");
-  if (!g_defArgsStr.isEmpty())
-  {
-    ArgumentList argList;
-    //printf("addDefine() g_defName='%s' g_defArgsStr='%s'\n",g_defName.data(),g_defArgsStr.data());
-    stringToArgumentList(g_defArgsStr,argList);
-    md->setArgumentList(argList);
-  }
-  //printf("Setting initializer for '%s' to '%s'\n",g_defName.data(),g_defText.data());
-  int l=g_defLitText.find('\n');
-  if (l>0 && g_defLitText.left(l).stripWhiteSpace()=="\\")
-  {
-    // strip first line if it only contains a slash
-    g_defLitText = g_defLitText.right(g_defLitText.length()-l-1);
-  }
-  else if (l>0)
-  {
-    // align the items on the first line with the items on the second line
-    int k=l+1;
-    const char *p=g_defLitText.data()+k;
-    char c;
-    while ((c=*p++) && (c==' ' || c=='\t')) k++;
-    g_defLitText=g_defLitText.mid(l+1,k-l-1)+g_defLitText.stripWhiteSpace();
-  }
-  md->setInitializer(g_defLitText.stripWhiteSpace());
-
-  //printf("pre.l: md->setFileDef(%p)\n",g_inputFileDef);
-  md->setFileDef(g_inputFileDef);
-  md->setDefinition("#define "+g_defName);
-
-  MemberName *mn=Doxygen::functionNameSDict->find(g_defName);
-  if (mn==0)
-  {
-    mn = new MemberName(g_defName);
-    Doxygen::functionNameSDict->append(g_defName,mn);
-  }
-  mn->append(md);
-  if (g_yyFileDef) 
-  {
-    g_yyFileDef->insertMember(md);
-  }
-
-  //Define *d;
-  //if ((d=defineDict[g_defName])==0) defineDict.insert(g_defName,newDefine()); 
-}
-
-static inline void outputChar(char c)
-{
-  if (g_includeStack.isEmpty() || g_curlyCount>0) g_outputBuf->addChar(c);
-}
-
-static inline void outputArray(const char *a,int len)
-{
-  if (g_includeStack.isEmpty() || g_curlyCount>0) g_outputBuf->addArray(a,len);
-}
-
-static void readIncludeFile(const QCString &inc)
-{
-  static bool searchIncludes = Config_getBool(SEARCH_INCLUDES);
-  uint i=0;
-
-  // find the start of the include file name
-  while (i<inc.length() &&
-         (inc.at(i)==' ' || inc.at(i)=='"' || inc.at(i)=='<')
-        ) i++;
-  uint s=i;
-
-  // was it a local include?
-  bool localInclude = s>0 && inc.at(s-1)=='"';
-
-  // find the end of the include file name
-  while (i<inc.length() && inc.at(i)!='"' && inc.at(i)!='>') i++;
-
-  if (s<inc.length() && i>s) // valid include file name found
-  {
-    // extract include path+name
-    QCString incFileName=inc.mid(s,i-s).stripWhiteSpace();
-
-    QCString dosExt = incFileName.right(4);
-    if (dosExt==".exe" || dosExt==".dll" || dosExt==".tlb")
-    {
-      // skip imported binary files (e.g. M$ type libraries)
-      return;
-    }
-
-    QCString oldFileName = g_yyFileName;
-    FileDef *oldFileDef  = g_yyFileDef;
-    int oldLineNr        = g_yyLineNr;
-    //printf("Searching for '%s'\n",incFileName.data());
-
-    // absIncFileName avoids difficulties for incFileName starting with "../" (bug 641336)
-    QCString absIncFileName = incFileName;
-    {
-      QFileInfo fi(g_yyFileName);
-      if (fi.exists())
-      {
-	QCString absName = QCString(fi.dirPath(TRUE).data())+"/"+incFileName;
-        QFileInfo fi2(absName);
-        if (fi2.exists())
-        {
-	  absIncFileName=fi2.absFilePath().utf8();
-	}
-	else if (searchIncludes) // search in INCLUDE_PATH as well
-	{
-	  QStrList &includePath = Config_getList(INCLUDE_PATH);
-	  char *s=includePath.first();
-	  while (s)
-	  {
-	    QFileInfo fi(s);
-	    if (fi.exists() && fi.isDir())
-	    {
-	      QCString absName = QCString(fi.absFilePath().utf8())+"/"+incFileName;
-	      //printf("trying absName=%s\n",absName.data());
-	      QFileInfo fi2(absName);
-	      if (fi2.exists())
-	      {
-		absIncFileName=fi2.absFilePath().utf8();
-		break;
-	      }
-	      //printf( "absIncFileName = %s\n", absIncFileName.data() );
-	    }
-	    s=includePath.next();
-	  }
-	}
-	//printf( "absIncFileName = %s\n", absIncFileName.data() );
-      }
-    }
-    DefineManager::instance().addInclude(g_yyFileName,absIncFileName);
-    DefineManager::instance().addFileToContext(absIncFileName);
-
-    // findFile will overwrite g_yyFileDef if found
-    FileState *fs;
-    bool alreadyIncluded = FALSE;
-    //printf("calling findFile(%s)\n",incFileName.data());
-    if ((fs=findFile(incFileName,localInclude,alreadyIncluded))) // see if the include file can be found
-    {
-      //printf("Found include file!\n");
-      if (Debug::isFlagSet(Debug::Preprocessor))
-      {
-        for (i=0;i<g_includeStack.count();i++) 
-        {
-          Debug::print(Debug::Preprocessor,0,"  ");
-        }
-        //msg("#include %s: parsing...\n",incFileName.data());
-      }
-      if (oldFileDef)
-      {
-        // add include dependency to the file in which the #include was found
-	bool ambig;
-	// change to absolute name for bug 641336 
-        FileDef *incFd = findFileDef(Doxygen::inputNameDict,absIncFileName,ambig);
-        oldFileDef->addIncludeDependency(ambig ? 0 : incFd,incFileName,localInclude,g_isImported,FALSE);
-        // add included by dependency
-        if (g_yyFileDef)
-        {
-          //printf("Adding include dependency %s->%s\n",oldFileDef->name().data(),incFileName.data());
-          g_yyFileDef->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,g_isImported);
-        }
-      }
-      else if (g_inputFileDef)
-      {
-        g_inputFileDef->addIncludeDependency(0,absIncFileName,localInclude,g_isImported,TRUE);
-      }
-      fs->bufState = YY_CURRENT_BUFFER;
-      fs->lineNr   = oldLineNr;
-      fs->fileName = oldFileName;
-      fs->curlyCount = g_curlyCount;
-      g_curlyCount = 0;
-      // push the state on the stack
-      g_includeStack.push(fs);
-      // set the scanner to the include file
-
-      // Deal with file changes due to 
-      // #include's within { .. } blocks
-      QCString lineStr(g_yyFileName.length()+20);
-      lineStr.sprintf("# 1 \"%s\" 1\n",g_yyFileName.data());
-      outputArray(lineStr.data(),lineStr.length());
-
-      DBG_CTX((stderr,"Switching to include file %s\n",incFileName.data()));
-      g_expectGuard=TRUE;
-      g_inputBuf   = &fs->fileBuf;
-      g_inputBufPos=0;
-      yy_switch_to_buffer(yy_create_buffer(0, YY_BUF_SIZE));
-    }
-    else
-    {
-      //printf("  calling findFile(%s) alreadyInc=%d\n",incFileName.data(),alreadyIncluded);
-      if (oldFileDef)
-      {
-	bool ambig;
-	//QCString absPath = incFileName;
-	//if (QDir::isRelativePath(incFileName))
-	//{
-	//  absPath = QDir::cleanDirPath(oldFileDef->getPath()+"/"+incFileName);
-	//  //printf("%s + %s -> resolved path %s\n",oldFileDef->getPath().data(),incFileName.data(),absPath.data());
-	//}
-
-	// change to absolute name for bug 641336 
-	FileDef *fd = findFileDef(Doxygen::inputNameDict,absIncFileName,ambig);
-	//printf("%s::findFileDef(%s)=%p\n",oldFileDef->name().data(),incFileName.data(),fd);
-	// add include dependency to the file in which the #include was found
-	oldFileDef->addIncludeDependency(ambig ? 0 : fd,incFileName,localInclude,g_isImported,FALSE);
-	// add included by dependency
-        if (fd)
-        {
-          //printf("Adding include dependency (2) %s->%s ambig=%d\n",oldFileDef->name().data(),fd->name().data(),ambig);
-          fd->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,g_isImported);
-        }
-      }
-      else if (g_inputFileDef)
-      {
-        g_inputFileDef->addIncludeDependency(0,absIncFileName,localInclude,g_isImported,TRUE);
-      }
-      if (Debug::isFlagSet(Debug::Preprocessor))
-      {
-	if (alreadyIncluded)
-	{
-          Debug::print(Debug::Preprocessor,0,"#include %s: already included! skipping...\n",qPrint(incFileName));
-	}
-	else
-	{
-          Debug::print(Debug::Preprocessor,0,"#include %s: not found! skipping...\n",qPrint(incFileName));
-	}
-        //printf("error: include file %s not found\n",yytext);
-      }
-      if (g_curlyCount>0 && !alreadyIncluded) // failed to find #include inside { ... }
-      {
-	warn(g_yyFileName,g_yyLineNr,"include file %s not found, perhaps you forgot to add its directory to INCLUDE_PATH?",incFileName.data());
-      }
-    }
-  }
-}
-
-/* ----------------------------------------------------------------- */
-
-static void startCondSection(const char *sectId)
-{
-  //printf("startCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
-  CondParser prs;
-  bool expResult = prs.parse(g_yyFileName,g_yyLineNr,sectId);
-  g_condStack.push(new CondCtx(g_yyLineNr,sectId,g_skip));
-  if (!expResult)
-  {
-    g_skip=TRUE;
-  }
-  //printf("  expResult=%d skip=%d\n",expResult,g_skip);
-}
-
-static void endCondSection()
-{
-  if (g_condStack.isEmpty())
-  {
-    g_skip=FALSE;
-  }
-  else
-  {
-    CondCtx *ctx = g_condStack.pop();
-    g_skip=ctx->skip;
-    delete ctx;
-  }
-  //printf("endCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
-}
-
-static void forceEndCondSection()
-{
-  while (!g_condStack.isEmpty())
-  {
-    delete g_condStack.pop();
-  }
-  g_skip=FALSE;
-}
-
-static QCString escapeAt(const char *text)
-{
-  QCString result;
-  if (text)
-  {
-    char c;
-    const char *p=text;
-    while ((c=*p++))
-    {
-      if (c=='@') result+="@@"; else result+=c;
-    }
-  }
-  return result;
-}
-
-static char resolveTrigraph(char c)
-{
-  switch (c)
-  {
-    case '=': return '#';
-    case '/': return '\\';
-    case '\'': return '^';
-    case '(': return '[';
-    case ')': return ']';
-    case '!': return '|';
-    case '<': return '{';
-    case '>': return '}';
-    case '-': return '~';
-  }
-  return '?';
-}
-
-/* ----------------------------------------------------------------- */
-
-#undef  YY_INPUT
-#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
-
-static int yyread(char *buf,int max_size)
-{
-  int bytesInBuf = g_inputBuf->curPos()-g_inputBufPos;
-  int bytesToCopy = QMIN(max_size,bytesInBuf);
-  memcpy(buf,g_inputBuf->data()+g_inputBufPos,bytesToCopy);
-  g_inputBufPos+=bytesToCopy;
-  return bytesToCopy;
-}
-
-/* ----------------------------------------------------------------- */
-
-%}
-
-ID	[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
-B       [ \t]
-BN	[ \t\r\n]
-RAWBEGIN  (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
-RAWEND    ")"[^ \t\(\)\\]{0,16}\"
-CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
-
-%option noyywrap
-
-%x      Start
-%x	Command
-%x	SkipCommand
-%x	SkipLine
-%x	SkipString
-%x	CopyLine
-%x	CopyString
-%x	CopyStringCs
-%x	CopyStringFtn
-%x	CopyStringFtnDouble
-%x      CopyRawString
-%x      Include
-%x      IncludeID
-%x      EndImport
-%x	DefName
-%x	DefineArg
-%x	DefineText
-%x      SkipCPPBlock
-%x      Ifdef
-%x      Ifndef
-%x	SkipCComment
-%x	ArgCopyCComment
-%x	CopyCComment
-%x	SkipVerbatim
-%x	SkipCPPComment
-%x	RemoveCComment
-%x	RemoveCPPComment
-%x	Guard
-%x	DefinedExpr1
-%x	DefinedExpr2
-%x	SkipDoubleQuote
-%x	SkipSingleQuote
-%x	UndefName
-%x	IgnoreLine
-%x	FindDefineArgs
-%x	ReadString
-%x	CondLineC
-%x	CondLineCpp
-%x      SkipCond
-
-%%
-
-<*>\x06					
-<*>\x00
-<*>\r
-<*>"??"[=/'()!<>-]			{ // Trigraph
-  					  unput(resolveTrigraph(yytext[2]));
-  					}
-<Start>^{B}*"#"				{ BEGIN(Command); g_yyColNr+=yyleng; g_yyMLines=0;}
-<Start>^{B}*/[^#]			{
- 					  outputArray(yytext,(int)yyleng);
-  					  BEGIN(CopyLine); 
-					}
-<Start>^{B}*[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]+{B}*"("[^\)\n]*")"/{BN}{1,10}*[:{] { // constructors?
-					  int i;
-					  for (i=(int)yyleng-1;i>=0;i--)
-					  {
-					    unput(yytext[i]);
-					  }
-					  BEGIN(CopyLine);
-                                        }
-<Start>^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\(\)\n]*"("[^\)\n]*")"[^\)\n]*")"{B}*\n | // function list macro with one (...) argument, e.g. for K_GLOBAL_STATIC_WITH_ARGS
-<Start>^{B}*[_A-Z][_A-Z0-9]+{B}*"("[^\)\n]*")"{B}*\n { // function like macro
-  					  static bool skipFuncMacros = Config_getBool(SKIP_FUNCTION_MACROS);
-					  QCString name(yytext);
-					  name=name.left(name.find('(')).stripWhiteSpace();
-
-					  Define *def=0;
-					  if (skipFuncMacros && 
-					      name!="Q_PROPERTY" &&
-					      !(
-					         (g_includeStack.isEmpty() || g_curlyCount>0) &&
-					         g_macroExpansion &&
-					         (def=DefineManager::instance().isDefined(name)) &&
-						 /*macroIsAccessible(def) &&*/
-					         (!g_expandOnlyPredef || def->isPredefined)
-					       )
-					     )
-					  {
-					    outputChar('\n');
-					    g_yyLineNr++;
-					  }
-					  else // don't skip
-					  {
-					    int i;
-					    for (i=(int)yyleng-1;i>=0;i--)
-					    {
-					      unput(yytext[i]);
-					    }
-					    BEGIN(CopyLine);
-					  }
-  					}
-<CopyLine>"extern"{BN}{0,80}"\"C\""*{BN}{0,80}"{"	{
-                                          QCString text=yytext;
-  					  g_yyLineNr+=text.contains('\n');
-					  outputArray(yytext,(int)yyleng);
-  					}
-<CopyLine>{RAWBEGIN}                    {
-                                          g_delimiter = yytext+2;
-                                          g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-					  outputArray(yytext,(int)yyleng);
-                                          BEGIN(CopyRawString);
-                                        }
-<CopyLine>"{"				{ // count brackets inside the main file
-  					  if (g_includeStack.isEmpty()) 
-					  {
-					    g_curlyCount++;
-					  }
-					  outputChar(*yytext);
-  					}
-<CopyLine>"}"				{ // count brackets inside the main file
-  					  if (g_includeStack.isEmpty() && g_curlyCount>0) 
-					  {
-					    g_curlyCount--;
-					  }
-					  outputChar(*yytext);
-  					}
-<CopyLine>"'"\\[0-7]{1,3}"'"		{ 
-  					  outputArray(yytext,(int)yyleng);
-					}
-<CopyLine>"'"\\."'"			{ 
-  					  outputArray(yytext,(int)yyleng);
-					}
-<CopyLine>"'"."'"			{ 
-  					  outputArray(yytext,(int)yyleng);
-					}
-<CopyLine>@\"				{
-                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_CSharp) REJECT;
-					  outputArray(yytext,(int)yyleng);
-					  BEGIN( CopyStringCs );
-					}
-<CopyLine>\"				{
-					  outputChar(*yytext);
-                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran)
-                                          {
-					    BEGIN( CopyString );
-                                          }
-                                          else
-                                          {
-					    BEGIN( CopyStringFtnDouble );
-                                          }
-					}
-<CopyLine>\'				{
-                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
-					  outputChar(*yytext);
-					  BEGIN( CopyStringFtn );
-					}
-<CopyString>[^\"\\\r\n]+		{
-					  outputArray(yytext,(int)yyleng);
-					}
-<CopyStringCs>[^\"\r\n]+		{
-  					  outputArray(yytext,(int)yyleng);
-					}
-<CopyString>\\.				{
-					  outputArray(yytext,(int)yyleng);
-					}
-<CopyString,CopyStringCs>\"		{
-					  outputChar(*yytext);
-					  BEGIN( CopyLine );
-					}
-<CopyStringFtnDouble>[^\"\\\r\n]+	{
-					  outputArray(yytext,(int)yyleng);
-					}
-<CopyStringFtnDouble>\\.		{
-					  outputArray(yytext,(int)yyleng);
-					}
-<CopyStringFtnDouble>\"			{
-					  outputChar(*yytext);
-					  BEGIN( CopyLine );
-					}
-<CopyStringFtn>[^\'\\\r\n]+		{
-					  outputArray(yytext,(int)yyleng);
-					}
-<CopyStringFtn>\\.			{
-					  outputArray(yytext,(int)yyleng);
-					}
-<CopyStringFtn>\'			{
-					  outputChar(*yytext);
-					  BEGIN( CopyLine );
-					}
-<CopyRawString>{RAWEND}                 {
-					  outputArray(yytext,(int)yyleng);
-                                          QCString delimiter = yytext+1;
-                                          delimiter=delimiter.left(delimiter.length()-1);
-                                          if (delimiter==g_delimiter)
-                                          {
-                                            BEGIN( CopyLine );
-                                          }
-                                        }
-<CopyRawString>[^)]+                    {
-					  outputArray(yytext,(int)yyleng);
-                                        }
-<CopyRawString>.                        {
-					  outputChar(*yytext);
-                                        }
-<CopyLine>{ID}/{BN}{0,80}"("		{
-  					  g_expectGuard = FALSE;
-  					  Define *def=0;
-					  //def=g_globalDefineDict->find(yytext);
-					  //def=DefineManager::instance().isDefined(yytext);
-					  //printf("Search for define %s found=%d g_includeStack.isEmpty()=%d "
-					  //       "g_curlyCount=%d g_macroExpansion=%d g_expandOnlyPredef=%d "
-					  //	 "isPreDefined=%d\n",yytext,def ? 1 : 0,
-					  //	 g_includeStack.isEmpty(),g_curlyCount,g_macroExpansion,g_expandOnlyPredef,
-					  //	 def ? def->isPredefined : -1
-					  //	);
-					  if ((g_includeStack.isEmpty() || g_curlyCount>0) &&
-					      g_macroExpansion &&
-					      (def=DefineManager::instance().isDefined(yytext)) &&
-				              /*(def->isPredefined || macroIsAccessible(def)) && */
-					      (!g_expandOnlyPredef || def->isPredefined)
-					     )
-					  {
-					    //printf("Found it! #args=%d\n",def->nargs);
-					    g_roundCount=0;
-					    g_defArgsStr=yytext;
-					    if (def->nargs==-1) // no function macro
-					    {
-					      QCString result = def->isPredefined ? def->definition : expandMacro(g_defArgsStr);
-					      outputArray(result,result.length());
-					    }
-					    else // zero or more arguments
-					    {
-					      g_findDefArgContext = CopyLine;
-					      BEGIN(FindDefineArgs);
-					    }
-					  }
-					  else
-					  {
-					    outputArray(yytext,(int)yyleng);
-					  }
-  					}
-<CopyLine>{ID}				{
-                                          Define *def=0;
-  					  if ((g_includeStack.isEmpty() || g_curlyCount>0) && 
-					      g_macroExpansion &&
-					      (def=DefineManager::instance().isDefined(yytext)) &&
-					      def->nargs==-1 &&
-				              /*(def->isPredefined || macroIsAccessible(def)) &&*/
-					      (!g_expandOnlyPredef || def->isPredefined)
-					     )
-					  {
-					    QCString result=def->isPredefined ? def->definition : expandMacro(yytext); 
-					    outputArray(result,result.length());
-					  }
-					  else
-					  {
-					    outputArray(yytext,(int)yyleng);
-					  }
-  					}
-<CopyLine>"\\"\r?/\n			{ // strip line continuation characters
-                                          if (getLanguageFromFileName(g_yyFileName)==SrcLangExt_Fortran) outputChar(*yytext);
-  					}
-<CopyLine>.				{
-  					  outputChar(*yytext);
-  					}
-<CopyLine>\n				{
-  					  outputChar('\n');
-					  BEGIN(Start);
-					  g_yyLineNr++;
-					  g_yyColNr=1;
-  					}
-<FindDefineArgs>"("			{
-  					  g_defArgsStr+='(';
-  					  g_roundCount++;
-  					}
-<FindDefineArgs>")"			{
-  					  g_defArgsStr+=')';
-					  g_roundCount--;
-					  if (g_roundCount==0)
-					  {
-					    QCString result=expandMacro(g_defArgsStr);
-					    //printf("g_defArgsStr='%s'->'%s'\n",g_defArgsStr.data(),result.data());
-					    if (g_findDefArgContext==CopyLine)
-					    {
-					      outputArray(result,result.length());
-					      BEGIN(g_findDefArgContext);
-					    }
-					    else // g_findDefArgContext==IncludeID
-					    {
-					      readIncludeFile(result);
-					      g_nospaces=FALSE;
-					      BEGIN(Start);
-					    }
-					  }
-  					}
-  /*
-<FindDefineArgs>")"{B}*"("		{
-  					  g_defArgsStr+=yytext;
-  					}
-  */
-<FindDefineArgs>{CHARLIT}		{
-  					  g_defArgsStr+=yytext;
-  					}
-<FindDefineArgs>"/*"[*]?                {
-                                          g_defArgsStr+=yytext;
-                                          BEGIN(ArgCopyCComment);
-                                        }
-<FindDefineArgs>\"			{
-  					  g_defArgsStr+=*yytext;
-  					  BEGIN(ReadString);
-  					}
-<FindDefineArgs>'                       {
-                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
-                                          g_defArgsStr+=*yytext;
-                                          BEGIN(ReadString);
-                                        }
-<FindDefineArgs>\n			{
-                                          g_defArgsStr+=' ';
-  					  g_yyLineNr++;
-					  outputChar('\n');
-  					}
-<FindDefineArgs>"@"			{
-  					  g_defArgsStr+="@@";
-  					}
-<FindDefineArgs>.			{
-  					  g_defArgsStr+=*yytext;
-  					}
-<ArgCopyCComment>[^*\n]+		{
-					  g_defArgsStr+=yytext;
-  					}
-<ArgCopyCComment>"*/"			{
-					  g_defArgsStr+=yytext;
-  					  BEGIN(FindDefineArgs);
-  					}
-<ArgCopyCComment>\n			{ 
-                                          g_defArgsStr+=' ';
-  					  g_yyLineNr++;
-					  outputChar('\n');
-  					}
-<ArgCopyCComment>.			{ 
-                                          g_defArgsStr+=yytext;
-                                        }
-<ReadString>"\""			{
-  					  g_defArgsStr+=*yytext;
-					  BEGIN(FindDefineArgs);
-  					}
-<ReadString>"'"                         {
-                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
-                                          g_defArgsStr+=*yytext;
-                                          BEGIN(FindDefineArgs);
-                                        }
+					  Define *def=0;
+					  if (skipFuncMacros && 
+					      name!="Q_PROPERTY" &&
+					      !(
+					         (yyextra->includeStack.isEmpty() || yyextra->curlyCount>0) &&
+					         yyextra->macroExpansion &&
+					         (def=yyextra->defineManager.isDefined(name)) &&
+						 /*macroIsAccessible(def) &&*/
+					         (!yyextra->expandOnlyPredef || def->isPredefined)
+					       )
+					     )
+					  {
+					    outputChar(yyscanner,'\n');
+					    yyextra->yyLineNr++;
+					  }
+					  else // don't skip
+					  {
+					    int i;
+					    for (i=(int)yyleng-1;i>=0;i--)
+					    {
+					      unput(yytext[i]);
+					    }
+					    BEGIN(CopyLine);
+					  }
+  					}
+<CopyLine>"extern"{BN}{0,80}"\"C\""*{BN}{0,80}"{"	{
+                                          QCString text=yytext;
+  					  yyextra->yyLineNr+=text.contains('\n');
+					  outputArray(yyscanner,yytext,(int)yyleng);
+  					}
+<CopyLine>{RAWBEGIN}                    {
+                                          yyextra->delimiter = yytext+2;
+                                          yyextra->delimiter=yyextra->delimiter.left(yyextra->delimiter.length()-1);
+					  outputArray(yyscanner,yytext,(int)yyleng);
+                                          BEGIN(CopyRawString);
+                                        }
+<CopyLine>"{"				{ // count brackets inside the main file
+  					  if (yyextra->includeStack.isEmpty()) 
+					  {
+					    yyextra->curlyCount++;
+					  }
+					  outputChar(yyscanner,*yytext);
+  					}
+<CopyLine>"}"				{ // count brackets inside the main file
+  					  if (yyextra->includeStack.isEmpty() && yyextra->curlyCount>0) 
+					  {
+					    yyextra->curlyCount--;
+					  }
+					  outputChar(yyscanner,*yytext);
+  					}
+<CopyLine>"'"\\[0-7]{1,3}"'"		{ 
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyLine>"'"\\."'"			{ 
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyLine>"'"."'"			{ 
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyLine>@\"				{
+                                          if (getLanguageFromFileName(yyextra->yyFileName)!=SrcLangExt_CSharp) REJECT;
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					  BEGIN( CopyStringCs );
+					}
+<CopyLine>\"				{
+					  outputChar(yyscanner,*yytext);
+                                          if (getLanguageFromFileName(yyextra->yyFileName)!=SrcLangExt_Fortran)
+                                          {
+					    BEGIN( CopyString );
+                                          }
+                                          else
+                                          {
+					    BEGIN( CopyStringFtnDouble );
+                                          }
+					}
+<CopyLine>\'				{
+                                          if (getLanguageFromFileName(yyextra->yyFileName)!=SrcLangExt_Fortran) REJECT;
+					  outputChar(yyscanner,*yytext);
+					  BEGIN( CopyStringFtn );
+					}
+<CopyString>[^\"\\\r\n]+		{
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyStringCs>[^\"\r\n]+		{
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyString>\\.				{
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyString,CopyStringCs>\"		{
+					  outputChar(yyscanner,*yytext);
+					  BEGIN( CopyLine );
+					}
+<CopyStringFtnDouble>[^\"\\\r\n]+	{
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyStringFtnDouble>\\.		{
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyStringFtnDouble>\"			{
+					  outputChar(yyscanner,*yytext);
+					  BEGIN( CopyLine );
+					}
+<CopyStringFtn>[^\'\\\r\n]+		{
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyStringFtn>\\.			{
+					  outputArray(yyscanner,yytext,(int)yyleng);
+					}
+<CopyStringFtn>\'			{
+					  outputChar(yyscanner,*yytext);
+					  BEGIN( CopyLine );
+					}
+<CopyRawString>{RAWEND}                 {
+					  outputArray(yyscanner,yytext,(int)yyleng);
+                                          QCString delimiter = yytext+1;
+                                          delimiter=delimiter.left(delimiter.length()-1);
+                                          if (delimiter==yyextra->delimiter)
+                                          {
+                                            BEGIN( CopyLine );
+                                          }
+                                        }
+<CopyRawString>[^)]+                    {
+					  outputArray(yyscanner,yytext,(int)yyleng);
+                                        }
+<CopyRawString>.                        {
+					  outputChar(yyscanner,*yytext);
+                                        }
+<CopyLine>{ID}/{BN}{0,80}"("		{
+  					  yyextra->expectGuard = FALSE;
+  					  Define *def=0;
+					  //def=yyextra->globalDefineDict->find(yytext);
+					  //def=yyextra->defineManager.isDefined(yytext);
+					  //printf("Search for define %s found=%d yyextra->includeStack.isEmpty()=%d "
+					  //       "yyextra->curlyCount=%d yyextra->macroExpansion=%d yyextra->expandOnlyPredef=%d "
+					  //	 "isPreDefined=%d\n",yytext,def ? 1 : 0,
+					  //	 yyextra->includeStack.isEmpty(),yyextra->curlyCount,yyextra->macroExpansion,yyextra->expandOnlyPredef,
+					  //	 def ? def->isPredefined : -1
+					  //	);
+					  if ((yyextra->includeStack.isEmpty() || yyextra->curlyCount>0) &&
+					      yyextra->macroExpansion &&
+					      (def=yyextra->defineManager.isDefined(yytext)) &&
+				              /*(def->isPredefined || macroIsAccessible(def)) && */
+					      (!yyextra->expandOnlyPredef || def->isPredefined)
+					     )
+					  {
+					    //printf("Found it! #args=%d\n",def->nargs);
+					    yyextra->roundCount=0;
+					    yyextra->defArgsStr=yytext;
+					    if (def->nargs==-1) // no function macro
+					    {
+					      QCString result = def->isPredefined ? def->definition : expandMacro(yyscanner,yyextra->defArgsStr);
+					      outputArray(yyscanner,result,result.length());
+					    }
+					    else // zero or more arguments
+					    {
+					      yyextra->findDefArgContext = CopyLine;
+					      BEGIN(FindDefineArgs);
+					    }
+					  }
+					  else
+					  {
+					    outputArray(yyscanner,yytext,(int)yyleng);
+					  }
+  					}
+<CopyLine>{ID}				{
+                                          Define *def=0;
+  					  if ((yyextra->includeStack.isEmpty() || yyextra->curlyCount>0) && 
+					      yyextra->macroExpansion &&
+					      (def=yyextra->defineManager.isDefined(yytext)) &&
+					      def->nargs==-1 &&
+				              /*(def->isPredefined || macroIsAccessible(def)) &&*/
+					      (!yyextra->expandOnlyPredef || def->isPredefined)
+					     )
+					  {
+					    QCString result=def->isPredefined ? def->definition : expandMacro(yyscanner,yytext); 
+					    outputArray(yyscanner,result,result.length());
+					  }
+					  else
+					  {
+					    outputArray(yyscanner,yytext,(int)yyleng);
+					  }
+  					}
+<CopyLine>"\\"\r?/\n			{ // strip line continuation characters
+                                          if (getLanguageFromFileName(yyextra->yyFileName)==SrcLangExt_Fortran) outputChar(yyscanner,*yytext);
+  					}
+<CopyLine>.				{
+  					  outputChar(yyscanner,*yytext);
+  					}
+<CopyLine>\n				{
+  					  outputChar(yyscanner,'\n');
+					  BEGIN(Start);
+					  yyextra->yyLineNr++;
+					  yyextra->yyColNr=1;
+  					}
+<FindDefineArgs>"("			{
+  					  yyextra->defArgsStr+='(';
+  					  yyextra->roundCount++;
+  					}
+<FindDefineArgs>")"			{
+  					  yyextra->defArgsStr+=')';
+					  yyextra->roundCount--;
+					  if (yyextra->roundCount==0)
+					  {
+					    QCString result=expandMacro(yyscanner,yyextra->defArgsStr);
+					    //printf("yyextra->defArgsStr='%s'->'%s'\n",yyextra->defArgsStr.data(),result.data());
+					    if (yyextra->findDefArgContext==CopyLine)
+					    {
+					      outputArray(yyscanner,result,result.length());
+					      BEGIN(yyextra->findDefArgContext);
+					    }
+					    else // yyextra->findDefArgContext==IncludeID
+					    {
+					      readIncludeFile(yyscanner,result);
+					      yyextra->nospaces=FALSE;
+					      BEGIN(Start);
+					    }
+					  }
+  					}
+  /*
+<FindDefineArgs>")"{B}*"("		{
+  					  yyextra->defArgsStr+=yytext;
+  					}
+  */
+<FindDefineArgs>{CHARLIT}		{
+  					  yyextra->defArgsStr+=yytext;
+  					}
+<FindDefineArgs>"/*"[*]?                {
+                                          yyextra->defArgsStr+=yytext;
+                                          BEGIN(ArgCopyCComment);
+                                        }
+<FindDefineArgs>\"			{
+  					  yyextra->defArgsStr+=*yytext;
+  					  BEGIN(ReadString);
+  					}
+<FindDefineArgs>'                       {
+                                          if (getLanguageFromFileName(yyextra->yyFileName)!=SrcLangExt_Fortran) REJECT;
+                                          yyextra->defArgsStr+=*yytext;
+                                          BEGIN(ReadString);
+                                        }
+<FindDefineArgs>\n			{
+                                          yyextra->defArgsStr+=' ';
+  					  yyextra->yyLineNr++;
+					  outputChar(yyscanner,'\n');
+  					}
+<FindDefineArgs>"@"			{
+  					  yyextra->defArgsStr+="@@";
+  					}
+<FindDefineArgs>.			{
+  					  yyextra->defArgsStr+=*yytext;
+  					}
+<ArgCopyCComment>[^*\n]+		{
+					  yyextra->defArgsStr+=yytext;
+  					}
+<ArgCopyCComment>"*/"			{
+					  yyextra->defArgsStr+=yytext;
+  					  BEGIN(FindDefineArgs);
+  					}
+<ArgCopyCComment>\n			{ 
+                                          yyextra->defArgsStr+=' ';
+  					  yyextra->yyLineNr++;
+					  outputChar(yyscanner,'\n');
+  					}
+<ArgCopyCComment>.			{ 
+                                          yyextra->defArgsStr+=yytext;
+                                        }
+<ReadString>"\""			{
+  					  yyextra->defArgsStr+=*yytext;
+					  BEGIN(FindDefineArgs);
+  					}
+<ReadString>"'"                         {
+                                          if (getLanguageFromFileName(yyextra->yyFileName)!=SrcLangExt_Fortran) REJECT;
+                                          yyextra->defArgsStr+=*yytext;
+                                          BEGIN(FindDefineArgs);
+                                        }
 
 <ReadString>"//"|"/*"			{
-  					  g_defArgsStr+=yytext;
+  					  yyextra->defArgsStr+=yytext;
   					}
 <ReadString>\\/\r?\n			{ // line continuation
 					}
 <ReadString>\\.				{
-  					  g_defArgsStr+=yytext;
+  					  yyextra->defArgsStr+=yytext;
   					}
 <ReadString>.				{
-  					  g_defArgsStr+=*yytext;
+  					  yyextra->defArgsStr+=*yytext;
   					}
 <Command>("include"|"import"){B}+/{ID}	{
-  					  g_isImported = yytext[1]=='m';
-  					  if (g_macroExpansion) 
+  					  yyextra->isImported = yytext[1]=='m';
+  					  if (yyextra->macroExpansion) 
 					    BEGIN(IncludeID);
   					}
 <Command>("include"|"import"){B}*[<"]	{ 
-  					  g_isImported = yytext[1]=='m';
+  					  yyextra->isImported = yytext[1]=='m';
 					  char c[2];
 					  c[0]=yytext[yyleng-1];c[1]='\0';
-					  g_incName=c;
+					  yyextra->incName=c;
   					  BEGIN(Include); 
 					}
 <Command>("cmake")?"define"{B}+		{ 
   			                  //printf("!!!DefName\n"); 
-					  g_yyColNr+=yyleng;
+					  yyextra->yyColNr+=yyleng;
   					  BEGIN(DefName); 
 					}
 <Command>"ifdef"/{B}*"("		{
-  					  incrLevel();
-					  g_guardExpr.resize(0);
+  					  incrLevel(yyscanner);
+					  yyextra->guardExpr.resize(0);
   					  BEGIN(DefinedExpr2);
   					}
 <Command>"ifdef"/{B}+			{
   					  //printf("Pre.l: ifdef\n");
-  					  incrLevel();
-					  g_guardExpr.resize(0);
+  					  incrLevel(yyscanner);
+					  yyextra->guardExpr.resize(0);
   					  BEGIN(DefinedExpr1);
   					}
 <Command>"ifndef"/{B}*"("		{
-  					  incrLevel();
-					  g_guardExpr="! ";
+  					  incrLevel(yyscanner);
+					  yyextra->guardExpr="! ";
   					  BEGIN(DefinedExpr2);
 					}
 <Command>"ifndef"/{B}+			{
-  					  incrLevel();
-					  g_guardExpr="! ";
+  					  incrLevel(yyscanner);
+					  yyextra->guardExpr="! ";
   					  BEGIN(DefinedExpr1);
   					}
 <Command>"if"/[ \t(!]			{
-  					  incrLevel();
-					  g_guardExpr.resize(0);
+  					  incrLevel(yyscanner);
+					  yyextra->guardExpr.resize(0);
 					  BEGIN(Guard);
 					}
 <Command>("elif"|"else"{B}*"if")/[ \t(!]	{
-  					  if (!otherCaseDone())
+  					  if (!otherCaseDone(yyscanner))
 					  {
-					    g_guardExpr.resize(0);
+					    yyextra->guardExpr.resize(0);
 					    BEGIN(Guard);  
 					  }
 					  else
 					  {
-					    g_ifcount=0;
+					    yyextra->ifcount=0;
 					    BEGIN(SkipCPPBlock);
 					  }
   					}
 <Command>"else"/[^a-z_A-Z0-9\x80-\xFF]		{
-					  //printf("else g_levelGuard[%d]=%d\n",g_level-1,g_levelGuard[g_level-1]);
-  					  if (otherCaseDone())
+					  //printf("else yyextra->levelGuard[%d]=%d\n",yyextra->level-1,yyextra->levelGuard[yyextra->level-1]);
+  					  if (otherCaseDone(yyscanner))
 					  {
-					    g_ifcount=0;
+					    yyextra->ifcount=0;
 					    BEGIN(SkipCPPBlock);
 					  }
 					  else
 					  {
-					    setCaseDone(TRUE);
-					    //g_levelGuard[g_level-1]=TRUE;
+					    setCaseDone(yyscanner,TRUE);
+					    //yyextra->levelGuard[yyextra->level-1]=TRUE;
 					  } 
   					}
 <Command>"undef"{B}+			{
   					  BEGIN(UndefName);
   					}
 <Command>("elif"|"else"{B}*"if")/[ \t(!]	{
-  					  if (!otherCaseDone())
+  					  if (!otherCaseDone(yyscanner))
 					  {
-					    g_guardExpr.resize(0);
+					    yyextra->guardExpr.resize(0);
   					    BEGIN(Guard);
 					  }
   					}
 <Command>"endif"/[^a-z_A-Z0-9\x80-\xFF]		{
   					  //printf("Pre.l: #endif\n");
-  					  decrLevel();
+  					  decrLevel(yyscanner);
   					}
 <Command,IgnoreLine>\n			{
-  					  outputChar('\n');
+  					  outputChar(yyscanner,'\n');
   					  BEGIN(Start);
-					  g_yyLineNr++;
+					  yyextra->yyLineNr++;
   					}
 <Command>"pragma"{B}+"once"             {
-                                          g_expectGuard = FALSE;
+                                          yyextra->expectGuard = FALSE;
                                         }
 <Command>{ID}				{ // unknown directive
 					  BEGIN(IgnoreLine);
 					}
 <IgnoreLine>\\[\r]?\n			{
-  					  outputChar('\n');
-					  g_yyLineNr++;
+  					  outputChar(yyscanner,'\n');
+					  yyextra->yyLineNr++;
 					}
 <IgnoreLine>.
-<Command>. {g_yyColNr+=yyleng;}
+<Command>. {yyextra->yyColNr+=yyleng;}
 <UndefName>{ID}				{
   					  Define *def;
-  					  if ((def=DefineManager::instance().isDefined(yytext)) 
+  					  if ((def=yyextra->defineManager.isDefined(yytext)) 
 					      /*&& !def->isPredefined*/
 					      && !def->nonRecursive
 					     )
@@ -2241,9 +888,9 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 					  BEGIN(Start);
   					}
 <Guard>\\[\r]?\n			{
-  					  outputChar('\n');
-  					  g_guardExpr+=' ';
-					  g_yyLineNr++;
+  					  outputChar(yyscanner,'\n');
+  					  yyextra->guardExpr+=' ';
+					  yyextra->yyLineNr++;
   					}
 <Guard>"defined"/{B}*"("		{
     					  BEGIN(DefinedExpr2);
@@ -2251,45 +898,45 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <Guard>"defined"/{B}+			{
     					  BEGIN(DefinedExpr1);
     					}
-<Guard>{ID}				{ g_guardExpr+=yytext; }
-<Guard>"@"                              { g_guardExpr+="@@"; }
-<Guard>.				{ g_guardExpr+=*yytext; }
+<Guard>{ID}				{ yyextra->guardExpr+=yytext; }
+<Guard>"@"                              { yyextra->guardExpr+="@@"; }
+<Guard>.				{ yyextra->guardExpr+=*yytext; }
 <Guard>\n				{
   					  unput(*yytext);
   					  //printf("Guard: '%s'\n",
-					  //    g_guardExpr.data());
-					  bool guard=computeExpression(g_guardExpr);
-					  setCaseDone(guard);
-					  //printf("if g_levelGuard[%d]=%d\n",g_level-1,g_levelGuard[g_level-1]);
+					  //    yyextra->guardExpr.data());
+					  bool guard=computeExpression(yyscanner,yyextra->guardExpr);
+					  setCaseDone(yyscanner,guard);
+					  //printf("if yyextra->levelGuard[%d]=%d\n",yyextra->level-1,yyextra->levelGuard[yyextra->level-1]);
 					  if (guard)
 					  {
 					    BEGIN(Start);
 					  } 
 					  else
 					  {
-					    g_ifcount=0;
+					    yyextra->ifcount=0;
 					    BEGIN(SkipCPPBlock);
 					  }
   					}
-<DefinedExpr1,DefinedExpr2>\\\n		{ g_yyLineNr++; outputChar('\n'); }
+<DefinedExpr1,DefinedExpr2>\\\n		{ yyextra->yyLineNr++; outputChar(yyscanner,'\n'); }
 <DefinedExpr1>{ID}			{
-  					  if (DefineManager::instance().isDefined(yytext) || g_guardName==yytext)
-					    g_guardExpr+=" 1L ";
+  					  if (yyextra->defineManager.isDefined(yytext) || yyextra->guardName==yytext)
+					    yyextra->guardExpr+=" 1L ";
 					  else
-					    g_guardExpr+=" 0L ";
-					  g_lastGuardName=yytext;
+					    yyextra->guardExpr+=" 0L ";
+					  yyextra->lastGuardName=yytext;
 					  BEGIN(Guard);
   					}
 <DefinedExpr2>{ID}			{
-  					  if (DefineManager::instance().isDefined(yytext) || g_guardName==yytext)
-					    g_guardExpr+=" 1L ";
+  					  if (yyextra->defineManager.isDefined(yytext) || yyextra->guardName==yytext)
+					    yyextra->guardExpr+=" 1L ";
 					  else
-					    g_guardExpr+=" 0L ";
-					  g_lastGuardName=yytext;
+					    yyextra->guardExpr+=" 0L ";
+					  yyextra->lastGuardName=yytext;
   					}
 <DefinedExpr1,DefinedExpr2>\n		{ // should not happen, handle anyway
-                                          g_yyLineNr++;
-  					  g_ifcount=0;
+                                          yyextra->yyLineNr++;
+  					  yyextra->ifcount=0;
  					  BEGIN(SkipCPPBlock); 
 					}
 <DefinedExpr2>")"			{
@@ -2298,29 +945,29 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <DefinedExpr1,DefinedExpr2>.
 <SkipCPPBlock>^{B}*"#"			{ BEGIN(SkipCommand); }
 <SkipCPPBlock>^{B}*/[^#]		{ BEGIN(SkipLine); }
-<SkipCPPBlock>\n			{ g_yyLineNr++; outputChar('\n'); }
+<SkipCPPBlock>\n			{ yyextra->yyLineNr++; outputChar(yyscanner,'\n'); }
 <SkipCPPBlock>.
 <SkipCommand>"if"(("n")?("def"))?/[ \t(!]	{ 
-  					  incrLevel();
-                                          g_ifcount++; 
-  					  //printf("#if... depth=%d\n",g_ifcount);
+  					  incrLevel(yyscanner);
+                                          yyextra->ifcount++; 
+  					  //printf("#if... depth=%d\n",yyextra->ifcount);
 					}
 <SkipCommand>"else"			{
-					  //printf("Else! g_ifcount=%d otherCaseDone=%d\n",g_ifcount,otherCaseDone());
-  					  if (g_ifcount==0 && !otherCaseDone())
+					  //printf("Else! yyextra->ifcount=%d otherCaseDone=%d\n",yyextra->ifcount,otherCaseDone());
+  					  if (yyextra->ifcount==0 && !otherCaseDone(yyscanner))
 					  {
-					    setCaseDone(TRUE);
-  					    //outputChar('\n');
+					    setCaseDone(yyscanner,TRUE);
+  					    //outputChar(yyscanner,'\n');
 					    BEGIN(Start);
 					  }
   					}
 <SkipCommand>("elif"|"else"{B}*"if")/[ \t(!]		{
-  					  if (g_ifcount==0) 
+  					  if (yyextra->ifcount==0) 
 					  {
-  					    if (!otherCaseDone())
+  					    if (!otherCaseDone(yyscanner))
 					    {
-					      g_guardExpr.resize(0);
-					      g_lastGuardName.resize(0);
+					      yyextra->guardExpr.resize(0);
+					      yyextra->lastGuardName.resize(0);
   					      BEGIN(Guard);
 					    }
 					    else
@@ -2330,17 +977,17 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 					  }
 					}
 <SkipCommand>"endif"			{ 
-					  g_expectGuard = FALSE;
-  					  decrLevel();
-  				          if (--g_ifcount<0)
+					  yyextra->expectGuard = FALSE;
+  					  decrLevel(yyscanner);
+  				          if (--yyextra->ifcount<0)
   					  {
-  					    //outputChar('\n');
+  					    //outputChar(yyscanner,'\n');
 					    BEGIN(Start);
 					  }
 					}
 <SkipCommand>\n				{ 
-  					  outputChar('\n');
-  					  g_yyLineNr++; 
+  					  outputChar(yyscanner,'\n');
+  					  yyextra->yyLineNr++; 
 					  BEGIN(SkipCPPBlock);
 					}
 <SkipCommand>{ID}			{ // unknown directive 
@@ -2356,18 +1003,18 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 <SkipString>"//"/[^\n]*                 { 
                                         }
 <SkipLine,SkipCommand,SkipCPPBlock>"//"[^\n]* {
-  					  g_lastCPPContext=YY_START;
+  					  yyextra->lastCPPContext=YY_START;
   					  BEGIN(RemoveCPPComment);
 					}
 <SkipString>"/*"/[^\n]*                 { 
                                         }
 <SkipLine,SkipCommand,SkipCPPBlock>"/*"/[^\n]* {
-					  g_lastCContext=YY_START;
+					  yyextra->lastCContext=YY_START;
   					  BEGIN(RemoveCComment);
   					}
 <SkipLine>\n				{
-  					  outputChar('\n');
-					  g_yyLineNr++;  
+  					  outputChar(yyscanner,'\n');
+					  yyextra->yyLineNr++;  
 					  BEGIN(SkipCPPBlock);
 					}
 <SkipString>[^"\\\n]+			{ }
@@ -2377,21 +1024,21 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
   					}
 <SkipString>.				{ }
 <IncludeID>{ID}{B}*/"("			{
-  					  g_nospaces=TRUE;
-				          g_roundCount=0;
-					  g_defArgsStr=yytext;
-					  g_findDefArgContext = IncludeID;
+  					  yyextra->nospaces=TRUE;
+				          yyextra->roundCount=0;
+					  yyextra->defArgsStr=yytext;
+					  yyextra->findDefArgContext = IncludeID;
 					  BEGIN(FindDefineArgs);
 					}
 <IncludeID>{ID}				{
-  					  g_nospaces=TRUE;
-                                          readIncludeFile(expandMacro(yytext));
+  					  yyextra->nospaces=TRUE;
+                                          readIncludeFile(yyscanner,expandMacro(yyscanner,yytext));
 					  BEGIN(Start);
   					}
 <Include>[^\">\n]+[\">]			{ 
-					  g_incName+=yytext;
-					  readIncludeFile(g_incName);
-					  if (g_isImported)
+					  yyextra->incName+=yytext;
+					  readIncludeFile(yyscanner,yyextra->incName);
+					  if (yyextra->isImported)
 					  {
 					    BEGIN(EndImport);
 					  }
@@ -2404,391 +1051,391 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
   					  BEGIN(Start);
   					}
 <EndImport>\\[\r]?"\n"			{ 
-					  outputChar('\n');
-					  g_yyLineNr++;
+					  outputChar(yyscanner,'\n');
+					  yyextra->yyLineNr++;
 					}
 <EndImport>.				{
   					}
 <DefName>{ID}/("\\\n")*"("		{ // define with argument
   					  //printf("Define() '%s'\n",yytext);
-					  delete g_argDict;
-					  g_argDict = new QDict<int>(31);
-					  g_argDict->setAutoDelete(TRUE);
-					  g_defArgs = 0; 
-                                          g_defArgsStr.resize(0);
-					  g_defText.resize(0);
-					  g_defLitText.resize(0);
-					  g_defName = yytext;
-					  g_defVarArgs = FALSE;
-					  g_defExtraSpacing.resize(0);
+					  delete yyextra->argDict;
+					  yyextra->argDict = new QDict<int>(31);
+					  yyextra->argDict->setAutoDelete(TRUE);
+					  yyextra->defArgs = 0; 
+                                          yyextra->defArgsStr.resize(0);
+					  yyextra->defText.resize(0);
+					  yyextra->defLitText.resize(0);
+					  yyextra->defName = yytext;
+					  yyextra->defVarArgs = FALSE;
+					  yyextra->defExtraSpacing.resize(0);
 					  BEGIN(DefineArg);
   					}
 <DefName>{ID}{B}+"1"/[ \r\t\n]		{ // special case: define with 1 -> can be "guard"
   					  //printf("Define '%s'\n",yytext);
-					  delete g_argDict; g_argDict=0;
-					  g_defArgs = -1;
-                                          g_defArgsStr.resize(0);
-					  g_defName = yytext;
-					  g_defName = g_defName.left(g_defName.length()-1).stripWhiteSpace();
-					  g_defVarArgs = FALSE;
+					  delete yyextra->argDict; yyextra->argDict=0;
+					  yyextra->defArgs = -1;
+                                          yyextra->defArgsStr.resize(0);
+					  yyextra->defName = yytext;
+					  yyextra->defName = yyextra->defName.left(yyextra->defName.length()-1).stripWhiteSpace();
+					  yyextra->defVarArgs = FALSE;
 					  //printf("Guard check: %s!=%s || %d\n",
-					  //    g_defName.data(),g_lastGuardName.data(),g_expectGuard);
-					  if (g_curlyCount>0 || g_defName!=g_lastGuardName || !g_expectGuard)
+					  //    yyextra->defName.data(),yyextra->lastGuardName.data(),yyextra->expectGuard);
+					  if (yyextra->curlyCount>0 || yyextra->defName!=yyextra->lastGuardName || !yyextra->expectGuard)
 					  { // define may appear in the output
-					    QCString tmp=(QCString)"#define "+g_defName;
-					    outputArray(tmp.data(),tmp.length());
-					    g_quoteArg=FALSE;
-					    g_insideComment=FALSE;
-					    g_lastGuardName.resize(0);
-				            g_defText="1"; 
-					    g_defLitText="1"; 
+					    QCString tmp=(QCString)"#define "+yyextra->defName;
+					    outputArray(yyscanner,tmp.data(),tmp.length());
+					    yyextra->quoteArg=FALSE;
+					    yyextra->insideComment=FALSE;
+					    yyextra->lastGuardName.resize(0);
+				            yyextra->defText="1"; 
+					    yyextra->defLitText="1"; 
 					    BEGIN(DefineText); 
 					  }
 					  else // define is a guard => hide
 					  {
 					    //printf("Found a guard %s\n",yytext);
-					    g_defText.resize(0);
-					    g_defLitText.resize(0);
+					    yyextra->defText.resize(0);
+					    yyextra->defLitText.resize(0);
 					    BEGIN(Start);
 					  }
-					  g_expectGuard=FALSE;
+					  yyextra->expectGuard=FALSE;
   					}
 <DefName>{ID}/{B}*"\n"			{ // empty define
-					  delete g_argDict; g_argDict=0;
-					  g_defArgs = -1;
-					  g_defName = yytext;
-                                          g_defArgsStr.resize(0);
-					  g_defText.resize(0);
-					  g_defLitText.resize(0);
-					  g_defVarArgs = FALSE;
+					  delete yyextra->argDict; yyextra->argDict=0;
+					  yyextra->defArgs = -1;
+					  yyextra->defName = yytext;
+                                          yyextra->defArgsStr.resize(0);
+					  yyextra->defText.resize(0);
+					  yyextra->defLitText.resize(0);
+					  yyextra->defVarArgs = FALSE;
 					  //printf("Guard check: %s!=%s || %d\n",
-					  //    g_defName.data(),g_lastGuardName.data(),g_expectGuard);
-					  if (g_curlyCount>0 || g_defName!=g_lastGuardName || !g_expectGuard)
+					  //    yyextra->defName.data(),yyextra->lastGuardName.data(),yyextra->expectGuard);
+					  if (yyextra->curlyCount>0 || yyextra->defName!=yyextra->lastGuardName || !yyextra->expectGuard)
 					  { // define may appear in the output
-					    QCString tmp=(QCString)"#define "+g_defName;
-					    outputArray(tmp.data(),tmp.length());
-					    g_quoteArg=FALSE;
-					    g_insideComment=FALSE;
-					    if (g_insideCS) g_defText="1"; // for C#, use "1" as define text
+					    QCString tmp=(QCString)"#define "+yyextra->defName;
+					    outputArray(yyscanner,tmp.data(),tmp.length());
+					    yyextra->quoteArg=FALSE;
+					    yyextra->insideComment=FALSE;
+					    if (yyextra->insideCS) yyextra->defText="1"; // for C#, use "1" as define text
 					    BEGIN(DefineText);
 					  }
 					  else // define is a guard => hide
 					  {
 					    //printf("Found a guard %s\n",yytext);
-					    g_guardName = yytext;
-					    g_lastGuardName.resize(0);
+					    yyextra->guardName = yytext;
+					    yyextra->lastGuardName.resize(0);
 					    BEGIN(Start);
 					  }
-					  g_expectGuard=FALSE;
+					  yyextra->expectGuard=FALSE;
   					}
 <DefName>{ID}/{B}*			{ // define with content
   					  //printf("Define '%s'\n",yytext);
-					  delete g_argDict; g_argDict=0;
-					  g_defArgs = -1;
-                                          g_defArgsStr.resize(0);
-					  g_defText.resize(0);
-					  g_defLitText.resize(0);
-					  g_defName = yytext;
-					  g_defVarArgs = FALSE;
-					  QCString tmp=(QCString)"#define "+g_defName+g_defArgsStr;
-					  outputArray(tmp.data(),tmp.length());
-					  g_quoteArg=FALSE;
-					  g_insideComment=FALSE;
+					  delete yyextra->argDict; yyextra->argDict=0;
+					  yyextra->defArgs = -1;
+                                          yyextra->defArgsStr.resize(0);
+					  yyextra->defText.resize(0);
+					  yyextra->defLitText.resize(0);
+					  yyextra->defName = yytext;
+					  yyextra->defVarArgs = FALSE;
+					  QCString tmp=(QCString)"#define "+yyextra->defName+yyextra->defArgsStr;
+					  outputArray(yyscanner,tmp.data(),tmp.length());
+					  yyextra->quoteArg=FALSE;
+					  yyextra->insideComment=FALSE;
 					  BEGIN(DefineText); 
   					}
 <DefineArg>"\\\n"                       {
-  					  g_defExtraSpacing+="\n";
-					  g_yyLineNr++;
+  					  yyextra->defExtraSpacing+="\n";
+					  yyextra->yyLineNr++;
                                         }
-<DefineArg>","{B}*			{ g_defArgsStr+=yytext; }
-<DefineArg>"("{B}*                      { g_defArgsStr+=yytext; }
+<DefineArg>","{B}*			{ yyextra->defArgsStr+=yytext; }
+<DefineArg>"("{B}*                      { yyextra->defArgsStr+=yytext; }
 <DefineArg>{B}*")"{B}*			{
-                                          g_defArgsStr+=yytext; 
-					  QCString tmp=(QCString)"#define "+g_defName+g_defArgsStr+g_defExtraSpacing;
-					  outputArray(tmp.data(),tmp.length());
-					  g_quoteArg=FALSE;
-					  g_insideComment=FALSE;
+                                          yyextra->defArgsStr+=yytext; 
+					  QCString tmp=(QCString)"#define "+yyextra->defName+yyextra->defArgsStr+yyextra->defExtraSpacing;
+					  outputArray(yyscanner,tmp.data(),tmp.length());
+					  yyextra->quoteArg=FALSE;
+					  yyextra->insideComment=FALSE;
   					  BEGIN(DefineText);
   					}
 <DefineArg>"..."			{ // Variadic macro
-					  g_defVarArgs = TRUE;
-					  g_defArgsStr+=yytext;
-					  g_argDict->insert("__VA_ARGS__",new int(g_defArgs));
-					  g_defArgs++;
+					  yyextra->defVarArgs = TRUE;
+					  yyextra->defArgsStr+=yytext;
+					  yyextra->argDict->insert("__VA_ARGS__",new int(yyextra->defArgs));
+					  yyextra->defArgs++;
   					}
 <DefineArg>{ID}{B}*("..."?)		{
   					  //printf("Define addArg(%s)\n",yytext);
   					  QCString argName=yytext;
-  					  g_defVarArgs = yytext[yyleng-1]=='.';
-					  if (g_defVarArgs) // strip ellipsis
+  					  yyextra->defVarArgs = yytext[yyleng-1]=='.';
+					  if (yyextra->defVarArgs) // strip ellipsis
 					  {
 					    argName=argName.left(argName.length()-3);
 					  }
 					  argName = argName.stripWhiteSpace();
-                                          g_defArgsStr+=yytext;
-					  g_argDict->insert(argName,new int(g_defArgs)); 
-					  g_defArgs++;
+                                          yyextra->defArgsStr+=yytext;
+					  yyextra->argDict->insert(argName,new int(yyextra->defArgs)); 
+					  yyextra->defArgs++;
   					}
   /*
 <DefineText>"/ **"|"/ *!"			{
-  					  g_defText+=yytext;
-					  g_defLitText+=yytext;
-					  g_insideComment=TRUE;
+  					  yyextra->defText+=yytext;
+					  yyextra->defLitText+=yytext;
+					  yyextra->insideComment=TRUE;
   					}
 <DefineText>"* /"			{
-  					  g_defText+=yytext;
-					  g_defLitText+=yytext;
-					  g_insideComment=FALSE;
+  					  yyextra->defText+=yytext;
+					  yyextra->defLitText+=yytext;
+					  yyextra->insideComment=FALSE;
   					}
   */
 <DefineText>"/*"[!*]?			{
-					  g_defText+=yytext;
-					  g_defLitText+=yytext;
-					  g_lastCContext=YY_START;
-					  g_commentCount=1;
+					  yyextra->defText+=yytext;
+					  yyextra->defLitText+=yytext;
+					  yyextra->lastCContext=YY_START;
+					  yyextra->commentCount=1;
   					  BEGIN(CopyCComment);
   					}
 <DefineText>"//"[!/]?			{
-  					  outputArray(yytext,(int)yyleng);
-  					  g_lastCPPContext=YY_START;
-					  g_defLitText+=' ';
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+  					  yyextra->lastCPPContext=YY_START;
+					  yyextra->defLitText+=' ';
   					  BEGIN(SkipCPPComment);
   					}
 <SkipCComment>[/]?"*/"			{
-  					  if (yytext[0]=='/') outputChar('/');
-  					  outputChar('*');outputChar('/');
-					  if (--g_commentCount<=0)
+  					  if (yytext[0]=='/') outputChar(yyscanner,'/');
+  					  outputChar(yyscanner,'*');outputChar(yyscanner,'/');
+					  if (--yyextra->commentCount<=0)
 					  {
-					    if (g_lastCContext==Start) 
+					    if (yyextra->lastCContext==Start) 
 					      // small hack to make sure that ^... rule will
 					      // match when going to Start... Example: "/*...*/ some stuff..."
 					    {
 					      YY_CURRENT_BUFFER->yy_at_bol=1;
 					    }
-  					    BEGIN(g_lastCContext);  
+  					    BEGIN(yyextra->lastCContext);  
 					  }
   					}
 <SkipCComment>"//"("/")*		{
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
   					}
 <SkipCComment>"/*"			{
-  					  outputChar('/');outputChar('*');
-					  //g_commentCount++;
+  					  outputChar(yyscanner,'/');outputChar(yyscanner,'*');
+					  //yyextra->commentCount++;
   					}
 <SkipCComment>[\\@][\\@]("f{"|"f$"|"f[") {
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
   					}
 <SkipCComment>^({B}*"*"+)?{B}{0,3}"~~~"[~]*   {
-                                          static bool markdownSupport = Config_getBool(MARKDOWN_SUPPORT);
+                                          bool markdownSupport = Config_getBool(MARKDOWN_SUPPORT);
                                           if (!markdownSupport)
                                           {
                                             REJECT;
                                           }
                                           else
                                           {
-  					    outputArray(yytext,(int)yyleng);
-                                            g_fenceSize=yyleng;
+  					    outputArray(yyscanner,yytext,(int)yyleng);
+                                            yyextra->fenceSize=yyleng;
                                             BEGIN(SkipVerbatim);
                                           }
                                         }
 <SkipCComment>^({B}*"*"+)?{B}{0,3}"```"[`]*            {
-                                          static bool markdownSupport = Config_getBool(MARKDOWN_SUPPORT);
+                                          bool markdownSupport = Config_getBool(MARKDOWN_SUPPORT);
                                           if (!markdownSupport)
                                           {
                                             REJECT;
                                           }
                                           else
                                           {
-  					    outputArray(yytext,(int)yyleng);
-                                            g_fenceSize=yyleng;
+  					    outputArray(yyscanner,yytext,(int)yyleng);
+                                            yyextra->fenceSize=yyleng;
                                             BEGIN(SkipVerbatim);
                                           }
                                         }
 <SkipCComment>[\\@][\\@]("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"docbookonly"|"rtfonly"|"manonly"|"dot"|"code"("{"[^}]*"}")?){BN}+ {
-  					  outputArray(yytext,(int)yyleng);
-  					  g_yyLineNr+=QCString(yytext).contains('\n');
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+  					  yyextra->yyLineNr+=QCString(yytext).contains('\n');
   					}
 <SkipCComment>[\\@]("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"docbookonly"|"rtfonly"|"manonly"|"dot"|"code"("{"[^}]*"}")?){BN}+	{
-  					  outputArray(yytext,(int)yyleng);
-  					  g_yyLineNr+=QCString(yytext).contains('\n');
-                                          g_fenceSize=0;
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+  					  yyextra->yyLineNr+=QCString(yytext).contains('\n');
+                                          yyextra->fenceSize=0;
 					  if (yytext[1]=='f')
 					  {
-					    g_blockName="f";
+					    yyextra->blockName="f";
 					  }
 					  else
 					  {
                                             QCString bn=&yytext[1];
                                             int i = bn.find('{'); // for \code{.c}
                                             if (i!=-1) bn=bn.left(i);
-					    g_blockName=bn.stripWhiteSpace();
+					    yyextra->blockName=bn.stripWhiteSpace();
 					  }
 					  BEGIN(SkipVerbatim);
   					}
 <SkipCComment,SkipCPPComment>[\\@][\\@]"cond"[ \t]+ { // escaped @cond
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
                                         }
 <SkipCPPComment>[\\@]"cond"[ \t]+	{ // conditional section
-                                          g_ccomment=TRUE;  
-                                          g_condCtx=YY_START;
+                                          yyextra->ccomment=TRUE;  
+                                          yyextra->condCtx=YY_START;
   					  BEGIN(CondLineCpp);
   					}
 <SkipCComment>[\\@]"cond"[ \t]+	{ // conditional section
-                                          g_ccomment=FALSE;  
-                                          g_condCtx=YY_START;
+                                          yyextra->ccomment=FALSE;  
+                                          yyextra->condCtx=YY_START;
   					  BEGIN(CondLineC);
   					}
 <CondLineC,CondLineCpp>[!()&| \ta-z_A-Z0-9\x80-\xFF.\-]+      {
-  				          startCondSection(yytext);
-                                          if (g_skip)
+  				          startCondSection(yyscanner,yytext);
+                                          if (yyextra->skip)
                                           {
                                             if (YY_START==CondLineC)
                                             {
                                               // end C comment
-  					      outputArray("*/",2);
-                                              g_ccomment=TRUE;
+  					      outputArray(yyscanner,"*/",2);
+                                              yyextra->ccomment=TRUE;
                                             }
                                             else
                                             {
-                                              g_ccomment=FALSE;
+                                              yyextra->ccomment=FALSE;
                                             }
                                             BEGIN(SkipCond);
                                           }
                                           else
                                           {
-  					    BEGIN(g_condCtx);
+  					    BEGIN(yyextra->condCtx);
                                           }
   					}
 <CondLineC,CondLineCpp>.		{ // non-guard character
   					  unput(*yytext);
-  					  startCondSection(" ");
-                                          if (g_skip)
+  					  startCondSection(yyscanner," ");
+                                          if (yyextra->skip)
                                           {
                                             if (YY_START==CondLineC)
                                             {
                                               // end C comment
-  					      outputArray("*/",2);
-                                              g_ccomment=TRUE;
+  					      outputArray(yyscanner,"*/",2);
+                                              yyextra->ccomment=TRUE;
                                             }
                                             else
                                             {
-                                              g_ccomment=FALSE;
+                                              yyextra->ccomment=FALSE;
                                             }
                                             BEGIN(SkipCond);
                                           }
                                           else
                                           {
-					    BEGIN(g_condCtx);
+					    BEGIN(yyextra->condCtx);
                                           }
   					}
 <SkipCComment,SkipCPPComment>[\\@]"cond"[ \t\r]*/\n { // no guard
                                           if (YY_START==SkipCComment)
                                           {
-                                            g_ccomment=TRUE;
+                                            yyextra->ccomment=TRUE;
                                             // end C comment
-  					    outputArray("*/",2);
+  					    outputArray(yyscanner,"*/",2);
                                           }
                                           else
                                           {
-                                            g_ccomment=FALSE;
+                                            yyextra->ccomment=FALSE;
                                           }
-                                          g_condCtx=YY_START;
-                                          startCondSection(" ");
+                                          yyextra->condCtx=YY_START;
+                                          startCondSection(yyscanner," ");
                                           BEGIN(SkipCond);
   					}
-<SkipCond>\n                            { g_yyLineNr++; outputChar('\n'); }
+<SkipCond>\n                            { yyextra->yyLineNr++; outputChar(yyscanner,'\n'); }
 <SkipCond>.                             { }
 <SkipCond>[^\/\!*\\@\n]+                { }
-<SkipCond>"//"[/!]                      { g_ccomment=FALSE; }
-<SkipCond>"/*"[*!]                      { g_ccomment=TRUE; }
+<SkipCond>"//"[/!]                      { yyextra->ccomment=FALSE; }
+<SkipCond>"/*"[*!]                      { yyextra->ccomment=TRUE; }
 <SkipCond,SkipCComment,SkipCPPComment>[\\@][\\@]"endcond"/[^a-z_A-Z0-9\x80-\xFF] {
-                                          if (!g_skip)
+                                          if (!yyextra->skip)
                                           {
-  					    outputArray(yytext,(int)yyleng);
+  					    outputArray(yyscanner,yytext,(int)yyleng);
                                           }
                                         }
 <SkipCond>[\\@]"endcond"/[^a-z_A-Z0-9\x80-\xFF]  { 
-                                          bool oldSkip = g_skip;
-                                          endCondSection(); 
-                                          if (oldSkip && !g_skip)
+                                          bool oldSkip = yyextra->skip;
+                                          endCondSection(yyscanner);
+                                          if (oldSkip && !yyextra->skip)
                                           {
-                                            if (g_ccomment)
+                                            if (yyextra->ccomment)
                                             {
-                                              outputArray("/** ",4);
+                                              outputArray(yyscanner,"/** ",4);
                                             }
-                                            BEGIN(g_condCtx);
+                                            BEGIN(yyextra->condCtx);
                                           }
                                         }
 <SkipCComment,SkipCPPComment>[\\@]"endcond"/[^a-z_A-Z0-9\x80-\xFF] {
-                                          bool oldSkip = g_skip;
-  					  endCondSection();
-                                          if (oldSkip && !g_skip) 
+                                          bool oldSkip = yyextra->skip;
+  					  endCondSection(yyscanner);
+                                          if (oldSkip && !yyextra->skip) 
                                           {
-                                            BEGIN(g_condCtx);
+                                            BEGIN(yyextra->condCtx);
                                           }
   					}
 <SkipVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endrtfonly"|"endmanonly"|"enddot"|"endcode"|"f$"|"f]"|"f}") { /* end of verbatim block */
-  					  outputArray(yytext,(int)yyleng);
-					  if (yytext[1]=='f' && g_blockName=="f")
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+					  if (yytext[1]=='f' && yyextra->blockName=="f")
 					  {
 					    BEGIN(SkipCComment);
 					  }
-					  else if (&yytext[4]==g_blockName)
+					  else if (&yytext[4]==yyextra->blockName)
 					  {
 					    BEGIN(SkipCComment);
 					  }
   					}
 <SkipVerbatim>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                 {
-  					  outputArray(yytext,(int)yyleng);
-                                          if (g_fenceSize==yyleng)
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+                                          if (yyextra->fenceSize==yyleng)
                                           {
                                             BEGIN(SkipCComment);
                                           }
                                         }
 <SkipVerbatim>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
-  					  outputArray(yytext,(int)yyleng);
-                                          if (g_fenceSize==yyleng)
+  					  outputArray(yyscanner,yytext,(int)yyleng);
+                                          if (yyextra->fenceSize==yyleng)
                                           {
                                             BEGIN(SkipCComment);
                                           }
                                         }
 <SkipVerbatim>"*/"|"/*"			{
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
   					}
 <SkipCComment,SkipVerbatim>[^*\\@\x06~`\n\/]+ {
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
   					}
 <SkipCComment,SkipVerbatim>\n		{ 
-  					  g_yyLineNr++;
-  					  outputChar('\n');
+  					  yyextra->yyLineNr++;
+  					  outputChar(yyscanner,'\n');
   					}
 <SkipCComment,SkipVerbatim>.		{
-  					  outputChar(*yytext);
+  					  outputChar(yyscanner,*yytext);
   					}
 <CopyCComment>[^*a-z_A-Z\x80-\xFF\n]*[^*a-z_A-Z\x80-\xFF\\\n] {
-					  g_defLitText+=yytext;
-					  g_defText+=escapeAt(yytext);
+					  yyextra->defLitText+=yytext;
+					  yyextra->defText+=escapeAt(yytext);
 					}
 <CopyCComment>\\[\r]?\n                 {
-                                          g_defLitText+=yytext;
-                                          outputChar('\n');
-                                          g_defText+=" ";
-                                          g_yyLineNr++;
-                                          g_yyMLines++;
+                                          yyextra->defLitText+=yytext;
+                                          outputChar(yyscanner,'\n');
+                                          yyextra->defText+=" ";
+                                          yyextra->yyLineNr++;
+                                          yyextra->yyMLines++;
                                         }
 <CopyCComment>"*/"			{
-					  g_defLitText+=yytext;
-					  g_defText+=yytext;
-  					  BEGIN(g_lastCContext);
+					  yyextra->defLitText+=yytext;
+					  yyextra->defText+=yytext;
+  					  BEGIN(yyextra->lastCContext);
   					}
 <CopyCComment>\n			{ 
-  					  g_yyLineNr++;
-  					  outputChar('\n');
-					  g_defLitText+=yytext;
-					  g_defText+=' ';
+  					  yyextra->yyLineNr++;
+  					  outputChar(yyscanner,'\n');
+					  yyextra->defLitText+=yytext;
+					  yyextra->defText+=' ';
   					}
 <RemoveCComment>"*/"{B}*"#"	        { // see bug 594021 for a usecase for this rule
-                                          if (g_lastCContext==SkipCPPBlock)
+                                          if (yyextra->lastCContext==SkipCPPBlock)
 					  {
 					    BEGIN(SkipCommand);
 					  }
@@ -2797,246 +1444,1632 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 					    REJECT;
 					  }
 					}
-<RemoveCComment>"*/"		        { BEGIN(g_lastCContext); }
+<RemoveCComment>"*/"		        { BEGIN(yyextra->lastCContext); }
 <RemoveCComment>"//"			
 <RemoveCComment>"/*"
 <RemoveCComment>[^*\x06\n]+
-<RemoveCComment>\n			{ g_yyLineNr++; outputChar('\n'); }
+<RemoveCComment>\n			{ yyextra->yyLineNr++; outputChar(yyscanner,'\n'); }
 <RemoveCComment>.			
 <SkipCPPComment>[^\n\/\\@]+		{
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
   					}
 <SkipCPPComment,RemoveCPPComment>\n	{
   					  unput(*yytext);
-  					  BEGIN(g_lastCPPContext);
+  					  BEGIN(yyextra->lastCPPContext);
   					}
 <SkipCPPComment>"/*"			{
-  					  outputChar('/');outputChar('*');
+  					  outputChar(yyscanner,'/');outputChar(yyscanner,'*');
   					}
 <SkipCPPComment>"//"			{
-  					  outputChar('/');outputChar('/');
+  					  outputChar(yyscanner,'/');outputChar(yyscanner,'/');
   					}
 <SkipCPPComment>[^\x06\@\\\n]+		{
-  					  outputArray(yytext,(int)yyleng);
+  					  outputArray(yyscanner,yytext,(int)yyleng);
   					}
 <SkipCPPComment>.			{
-  					  outputChar(*yytext);
+  					  outputChar(yyscanner,*yytext);
   					}
 <RemoveCPPComment>"/*"
 <RemoveCPPComment>"//"
 <RemoveCPPComment>[^\x06\n]+
 <RemoveCPPComment>.
 <DefineText>"#"				{
-  					  g_quoteArg=TRUE;
-					  g_defLitText+=yytext;
+  					  yyextra->quoteArg=TRUE;
+					  yyextra->defLitText+=yytext;
   					}
 <DefineText,CopyCComment>{ID}		{
-					  g_defLitText+=yytext;
-  					  if (g_quoteArg)
+					  yyextra->defLitText+=yytext;
+  					  if (yyextra->quoteArg)
 					  {
-					    g_defText+="\"";
+					    yyextra->defText+="\"";
 					  }
-					  if (g_defArgs>0)
+					  if (yyextra->defArgs>0)
 					  {
 					    int *n;
-					    if ((n=(*g_argDict)[yytext]))
+					    if ((n=(*yyextra->argDict)[yytext]))
 					    {
-					      //if (!g_quoteArg) g_defText+=' ';
-					      g_defText+='@';
+					      //if (!yyextra->quoteArg) yyextra->defText+=' ';
+					      yyextra->defText+='@';
 					      QCString numStr;
 					      numStr.sprintf("%d",*n);
-					      g_defText+=numStr;
-					      //if (!g_quoteArg) g_defText+=' ';
+					      yyextra->defText+=numStr;
+					      //if (!yyextra->quoteArg) yyextra->defText+=' ';
 					    }
 					    else
 					    {
-					      g_defText+=yytext;
+					      yyextra->defText+=yytext;
 					    }
 					  }
 					  else
 					  {
-					    g_defText+=yytext;
+					    yyextra->defText+=yytext;
 					  }
-					  if (g_quoteArg)
+					  if (yyextra->quoteArg)
 					  {
-					    g_defText+="\"";
+					    yyextra->defText+="\"";
 					  }
-					  g_quoteArg=FALSE;
+					  yyextra->quoteArg=FALSE;
   					}
 <CopyCComment>.				{
-					  g_defLitText+=yytext;
-					  g_defText+=yytext;
+					  yyextra->defLitText+=yytext;
+					  yyextra->defText+=yytext;
   					}
 <DefineText>\\[\r]?\n			{
-					  g_defLitText+=yytext;
-					  outputChar('\n');
-					  g_defText += ' ';
-					  g_yyLineNr++;
-					  g_yyMLines++;
+					  yyextra->defLitText+=yytext;
+					  outputChar(yyscanner,'\n');
+					  yyextra->defText += ' ';
+					  yyextra->yyLineNr++;
+					  yyextra->yyMLines++;
+					}
+<DefineText>\n				{
+					  QCString comment=extractTrailingComment(yyextra->defLitText);
+					  yyextra->defLitText+=yytext;
+					  if (!comment.isEmpty())
+					  {
+					    outputArray(yyscanner,comment,comment.length());
+					    yyextra->defLitText=yyextra->defLitText.left(yyextra->defLitText.length()-comment.length()-1);
+					  }
+  					  outputChar(yyscanner,'\n');
+  					  Define *def=0;
+					  //printf("Define name='%s' text='%s' litTexti='%s'\n",yyextra->defName.data(),yyextra->defText.data(),yyextra->defLitText.data());
+					  if (yyextra->includeStack.isEmpty() || yyextra->curlyCount>0) 
+					  {
+					    addDefine(yyscanner);
+					  }
+					  def=yyextra->defineManager.isDefined(yyextra->defName);
+					  if (def==0) // new define
+					  {
+					    //printf("new define '%s'!\n",yyextra->defName.data());
+					    Define *nd = newDefine(yyscanner);
+					    yyextra->defineManager.addDefine(yyextra->yyFileName,nd);
+
+					    // also add it to the local file list if it is a source file
+					    //if (yyextra->isSource && yyextra->includeStack.isEmpty())
+					    //{
+					    //  yyextra->fileDefineDict->insert(yyextra->defName,nd);
+					    //}
+					  }
+					  else if (def /*&& macroIsAccessible(def)*/)
+					       // name already exists
+					  {
+					    //printf("existing define!\n");
+					    //printf("define found\n");
+					    if (def->undef) // undefined name
+					    {
+					      def->undef = FALSE;
+					      def->name = yyextra->defName;
+					      def->definition = yyextra->defText.stripWhiteSpace();
+					      def->nargs = yyextra->defArgs;
+					      def->fileName = yyextra->yyFileName.copy(); 
+					      def->lineNr = yyextra->yyLineNr-yyextra->yyMLines;
+					      def->columnNr = yyextra->yyColNr;
+					    }
+					    else
+					    {
+					      //printf("error: define %s is defined more than once!\n",yyextra->defName.data());
+					    }
+					  }
+					  delete yyextra->argDict; yyextra->argDict=0;
+					  yyextra->yyLineNr++;
+					  yyextra->yyColNr=1;
+					  yyextra->lastGuardName.resize(0);
+					  BEGIN(Start);
+  					}
+<DefineText>{B}*			{ yyextra->defText += ' '; yyextra->defLitText+=yytext; }
+<DefineText>{B}*"##"{B}*		{ yyextra->defText += "##"; yyextra->defLitText+=yytext; }
+<DefineText>"@"				{ yyextra->defText += "@@"; yyextra->defLitText+=yytext; }
+<DefineText>\"				{ 
+                                          yyextra->defText += *yytext; 
+  					  yyextra->defLitText+=yytext; 
+					  if (!yyextra->insideComment)
+					  {
+					    BEGIN(SkipDoubleQuote);
+					  }
+  					}
+<DefineText>\'				{ yyextra->defText += *yytext;
+  					  yyextra->defLitText+=yytext; 
+					  if (!yyextra->insideComment)
+					  {
+  					    BEGIN(SkipSingleQuote);
+					  }
+					}
+<SkipDoubleQuote>"//"[/]?		{ yyextra->defText += yytext; yyextra->defLitText+=yytext; }
+<SkipDoubleQuote>"/*"			{ yyextra->defText += yytext; yyextra->defLitText+=yytext; }
+<SkipDoubleQuote>\"			{
+  					  yyextra->defText += *yytext; yyextra->defLitText+=yytext; 
+					  BEGIN(DefineText);
+  					}
+<SkipSingleQuote,SkipDoubleQuote>\\.	{
+  					  yyextra->defText += yytext; yyextra->defLitText+=yytext;
+					}
+<SkipSingleQuote>\'			{
+  					  yyextra->defText += *yytext; yyextra->defLitText+=yytext;
+					  BEGIN(DefineText);
+  					}
+<SkipDoubleQuote>.			{ yyextra->defText += *yytext; yyextra->defLitText+=yytext; }
+<SkipSingleQuote>.			{ yyextra->defText += *yytext; yyextra->defLitText+=yytext; }
+<DefineText>.				{ yyextra->defText += *yytext; yyextra->defLitText+=yytext; }
+<<EOF>>					{
+                                          DBG_CTX((stderr,"End of include file\n"));
+					  //printf("Include stack depth=%d\n",yyextra->includeStack.count());
+  					  if (yyextra->includeStack.isEmpty())
+					  {
+					    DBG_CTX((stderr,"Terminating scanner!\n"));
+					    yyterminate();
+					  }
+					  else
+					  {
+					    FileState *fs=yyextra->includeStack.pop();
+					    //fileDefineCache->merge(yyextra->yyFileName,fs->fileName);
+					    YY_BUFFER_STATE oldBuf = YY_CURRENT_BUFFER;
+					    yy_switch_to_buffer( fs->bufState, yyscanner );
+					    yy_delete_buffer( oldBuf, yyscanner );
+					    yyextra->yyLineNr    = fs->lineNr;
+                                            //preYYin = fs->oldYYin;
+                                            yyextra->inputBuf    = fs->oldFileBuf;
+					    yyextra->inputBufPos = fs->oldFileBufPos;
+                                            yyextra->curlyCount = fs->curlyCount;
+					    setFileName(yyscanner,fs->fileName);
+					    DBG_CTX((stderr,"######## FileName %s\n",yyextra->yyFileName.data()));
+					    
+                                            // Deal with file changes due to 
+                                            // #include's within { .. } blocks
+                                            QCString lineStr(15+yyextra->yyFileName.length());
+                                            lineStr.sprintf("# %d \"%s\" 2",yyextra->yyLineNr,yyextra->yyFileName.data());
+                                            outputArray(yyscanner,lineStr.data(),lineStr.length());
+					    
+					    delete fs; fs=0;
+					  }
+  					}
+<*>"/*"/"*/"				|
+<*>"/*"[*]?				{
+                                          if (YY_START==SkipVerbatim || YY_START==SkipCond)
+                                          {
+                                            REJECT;
+                                          }
+                                          else
+                                          {
+					    outputArray(yyscanner,yytext,(int)yyleng);
+  					    yyextra->lastCContext=YY_START;
+					    yyextra->commentCount=1;
+					    if (yyleng==3) yyextra->lastGuardName.resize(0); // reset guard in case the #define is documented!
+					    BEGIN(SkipCComment);
+                                          }
+  					}
+<*>"//"[/]?				{
+                                          if (YY_START==SkipVerbatim || YY_START==SkipCond || getLanguageFromFileName(yyextra->yyFileName)==SrcLangExt_Fortran)
+                                          {
+                                            REJECT;
+                                          }
+                                          else
+                                          {
+					    outputArray(yyscanner,yytext,(int)yyleng);
+  					    yyextra->lastCPPContext=YY_START;
+					    if (yyleng==3) yyextra->lastGuardName.resize(0); // reset guard in case the #define is documented!
+					    BEGIN(SkipCPPComment);
+                                          }
+					}
+<*>\n					{ 
+  					  outputChar(yyscanner,'\n');
+  					  yyextra->yyLineNr++; 
 					}
-<DefineText>\n				{
-					  QCString comment=extractTrailingComment(g_defLitText);
-					  g_defLitText+=yytext;
-					  if (!comment.isEmpty())
-					  {
-					    outputArray(comment,comment.length());
-					    g_defLitText=g_defLitText.left(g_defLitText.length()-comment.length()-1);
-					  }
-  					  outputChar('\n');
-  					  Define *def=0;
-					  //printf("Define name='%s' text='%s' litTexti='%s'\n",g_defName.data(),g_defText.data(),g_defLitText.data());
-					  if (g_includeStack.isEmpty() || g_curlyCount>0) 
-					  {
-					    addDefine();
-					  }
-					  def=DefineManager::instance().isDefined(g_defName);
-					  if (def==0) // new define
-					  {
-					    //printf("new define '%s'!\n",g_defName.data());
-					    Define *nd = newDefine();
-					    DefineManager::instance().addDefine(g_yyFileName,nd);
+<*>.				        {
+  					  yyextra->expectGuard = FALSE;
+  					  outputChar(yyscanner,*yytext);
+  					}
+
+%%
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+static int yyread(yyscan_t yyscanner,char *buf,int max_size)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  int bytesInBuf = state->inputBuf->curPos()-state->inputBufPos;
+  int bytesToCopy = QMIN(max_size,bytesInBuf);
+  memcpy(buf,state->inputBuf->data()+state->inputBufPos,bytesToCopy);
+  state->inputBufPos+=bytesToCopy;
+  return bytesToCopy;
+}
+
+static void setFileName(yyscan_t yyscanner,const char *name)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  bool ambig;
+  QFileInfo fi(name);
+  state->yyFileName=fi.absFilePath().utf8();
+  state->yyFileDef=findFileDef(Doxygen::inputNameDict,state->yyFileName,ambig);
+  if (state->yyFileDef==0) // if this is not an input file check if it is an
+                      // include file
+  {
+    state->yyFileDef=findFileDef(Doxygen::includeNameDict,state->yyFileName,ambig);
+  }
+  //printf("setFileName(%s) state->yyFileName=%s state->yyFileDef=%p\n",
+  //    name,state->yyFileName.data(),state->yyFileDef);
+  if (state->yyFileDef && state->yyFileDef->isReference()) state->yyFileDef=0;
+  state->insideCS = getLanguageFromFileName(state->yyFileName)==SrcLangExt_CSharp;
+  state->isSource = guessSection(state->yyFileName);
+}
+
+static void incrLevel(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  state->level++;
+  state->levelGuard.resize(state->level);
+  state->levelGuard[state->level-1]=FALSE;
+  //printf("%s line %d: incrLevel %d\n",yyextra->yyFileName.data(),yyextra->yyLineNr,yyextra->level);
+}
+
+static void decrLevel(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  //printf("%s line %d: decrLevel %d\n",state->yyFileName.data(),state->yyLineNr,state->level);
+  if (state->level > 0)
+  {
+    state->level--;
+    state->levelGuard.resize(state->level);
+  }
+  else
+  {
+    warn(state->yyFileName,state->yyLineNr,"More #endif's than #if's found.\n");
+  }
+}
+
+static bool otherCaseDone(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  if (state->level==0)
+  {
+    warn(state->yyFileName,state->yyLineNr,"Found an #else without a preceding #if.\n");
+    return TRUE;
+  }
+  else
+  {
+    return state->levelGuard[state->level-1];
+  }
+}
+
+static void setCaseDone(yyscan_t yyscanner,bool value)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  state->levelGuard[state->level-1]=value;
+}
+
+
+static FileState *checkAndOpenFile(yyscan_t yyscanner,const QCString &fileName,bool &alreadyIncluded)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  alreadyIncluded = FALSE;
+  FileState *fs = 0;
+  //printf("checkAndOpenFile(%s)\n",fileName.data());
+  QFileInfo fi(fileName);
+  if (fi.exists() && fi.isFile())
+  {
+    const QStrList &exclPatterns = Config_getList(EXCLUDE_PATTERNS);
+    if (patternMatch(fi,&exclPatterns)) return 0;
+
+    QCString absName = fi.absFilePath().utf8();
+
+    // global guard
+    if (state->curlyCount==0) // not #include inside { ... }
+    {
+      if (state->allIncludes.find(absName)!=0)
+      {
+        alreadyIncluded = TRUE;
+        //printf("  already included 1\n");
+        return 0; // already done
+      }
+      state->allIncludes.insert(absName,(void *)0x8);
+    }
+    // check include stack for absName
+
+    QStack<FileState> tmpStack;
+    state->includeStack.setAutoDelete(FALSE);
+    while ((fs=state->includeStack.pop()))
+    {
+      if (fs->fileName==absName) alreadyIncluded=TRUE;
+      tmpStack.push(fs);
+    }
+    while ((fs=tmpStack.pop()))
+    {
+      state->includeStack.push(fs);
+    }
+    state->includeStack.setAutoDelete(TRUE);
+
+    if (alreadyIncluded)
+    {
+      //printf("  already included 2\n");
+      return 0;
+    }
+    //printf("#include %s\n",absName.data());
+
+    fs = new FileState(fi.size()+4096);
+    alreadyIncluded = FALSE;
+    if (!readInputFile(absName,fs->fileBuf))
+    { // error
+      //printf("  error reading\n");
+      delete fs;
+      fs=0;
+    }
+    else
+    {
+      fs->oldFileBuf    = state->inputBuf;
+      fs->oldFileBufPos = state->inputBufPos;
+    }
+  }
+  return fs;
+}
+
+static FileState *findFile(yyscan_t yyscanner, const char *fileName,bool localInclude,bool &alreadyIncluded)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  //printf("** findFile(%s,%d) state->yyFileName=%s\n",fileName,localInclude,state->yyFileName.data());
+  if (portable_isAbsolutePath(fileName))
+  {
+    FileState *fs = checkAndOpenFile(yyscanner,fileName,alreadyIncluded);
+    if (fs)
+    {
+      setFileName(yyscanner,fileName);
+      state->yyLineNr=1;
+      return fs;
+    }
+    else if (alreadyIncluded)
+    {
+      return 0;
+    }
+  }
+  if (localInclude && !state->yyFileName.isEmpty())
+  {
+    QFileInfo fi(state->yyFileName);
+    if (fi.exists())
+    {
+      QCString absName = QCString(fi.dirPath(TRUE).data())+"/"+fileName;
+      FileState *fs = checkAndOpenFile(yyscanner,absName,alreadyIncluded);
+      if (fs)
+      {
+	setFileName(yyscanner,absName);
+	state->yyLineNr=1;
+	return fs;
+      }
+      else if (alreadyIncluded)
+      {
+	return 0;
+      }
+    }
+  }
+  if (state->pathList==0) 
+  {
+    return 0;
+  }
+  char *s=state->pathList->first();
+  while (s)
+  {
+    QCString absName = (QCString)s+"/"+fileName;
+    //printf("  Looking for %s in %s\n",fileName,s);
+    FileState *fs = checkAndOpenFile(yyscanner,absName,alreadyIncluded);
+    if (fs)
+    {
+      setFileName(yyscanner,absName);
+      state->yyLineNr=1;
+      //printf("  -> found it\n");
+      return fs;
+    }
+    else if (alreadyIncluded)
+    {
+      return 0;
+    }
+
+    s=state->pathList->next();
+  } 
+  return 0;
+}
+
+static QCString extractTrailingComment(const char *s)
+{
+  if (s==0) return "";
+  int i=strlen(s)-1;
+  while (i>=0)
+  {
+    char c=s[i];
+    switch (c)
+    {
+      case '/':
+	{
+	  i--;
+	  if (i>=0 && s[i]=='*') // end of a comment block
+	  {
+	    i--;
+	    while (i>0 && !(s[i-1]=='/' && s[i]=='*')) i--;
+	    if (i==0) 
+	    {
+	      i++;
+	    }
+	    // only /*!< or /**< are treated as a comment for the macro name,
+	    // otherwise the comment is treated as part of the macro definition
+	    return ((s[i+1]=='*' || s[i+1]=='!') && s[i+2]=='<') ? &s[i-1] : ""; 
+	  }
+	  else
+	  {
+	    return "";
+	  }
+	} 
+	break;
+	// whitespace or line-continuation
+      case ' ':
+      case '\t': 
+      case '\r':
+      case '\n':
+      case '\\':
+	break;
+      default:
+	return "";
+    }
+    i--;
+  }
+  return "";
+}
+
+static int getNextChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos);
+static int getCurrentChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint pos);
+static void unputChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos,char c);
+static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos);
+
+static QCString stringize(const QCString &s)
+{
+  QCString result;
+  uint i=0;
+  bool inString=FALSE;
+  bool inChar=FALSE;
+  char c,pc;
+  while (i<s.length())
+  {
+    if (!inString && !inChar)
+    {
+      while (i<s.length() && !inString && !inChar)
+      {
+	c=s.at(i++);
+	if (c=='"')
+	{
+	  result+="\\\"";
+	  inString=TRUE;
+	}
+	else if (c=='\'')
+	{
+	  result+=c;
+	  inChar=TRUE;
+	}
+	else
+	{
+	  result+=c;
+	}
+      }
+    }
+    else if (inChar)
+    {
+      while (i<s.length() && inChar)
+      {
+	c=s.at(i++);
+	if (c=='\'')
+	{
+	  result+='\'';
+	  inChar=FALSE;
+	}
+	else if (c=='\\')
+	{
+	  result+="\\\\";
+	}
+	else
+	{
+	  result+=c;
+	}
+      }
+    }
+    else
+    {
+      pc=0;
+      while (i<s.length() && inString)
+      {
+	char c=s.at(i++);
+	if (c=='"') 
+	{
+	  result+="\\\"";
+	  inString= pc=='\\';
+	}
+	else if (c=='\\')
+	  result+="\\\\";
+	else
+	  result+=c;
+	pc=c;
+      }
+    }
+  }
+  //printf("stringize '%s'->'%s'\n",s.data(),result.data());
+  return result;
+}
+
+/*! Execute all ## operators in expr. 
+ * If the macro name before or after the operator contains a no-rescan 
+ * marker (@-) then this is removed (before the concatenated macro name
+ * may be expanded again.
+ */
+static void processConcatOperators(QCString &expr)
+{
+  //printf("processConcatOperators: in='%s'\n",expr.data());
+  QRegExp r("[ \\t\\n]*##[ \\t\\n]*"); 
+  int l,n,i=0;
+  if (expr.isEmpty()) return;
+  while ((n=r.match(expr,i,&l))!=-1)
+  {
+    //printf("Match: '%s'\n",expr.data()+i);
+    if (n+l+1<(int)expr.length() && expr.at(n+l)=='@' && expr.at(n+l+1)=='-')
+    {
+      // remove no-rescan marker after ID
+      l+=2;
+    }
+    //printf("found '%s'\n",expr.mid(n,l).data());
+    // remove the ## operator and the surrounding whitespace
+    expr=expr.left(n)+expr.right(expr.length()-n-l);
+    int k=n-1;
+    while (k>=0 && isId(expr.at(k))) k--; 
+    if (k>0 && expr.at(k)=='-' && expr.at(k-1)=='@')
+    {
+      // remove no-rescan marker before ID
+      expr=expr.left(k-1)+expr.right(expr.length()-k-1);
+      n-=2;
+    }
+    i=n;
+  }
+  //printf("processConcatOperators: out='%s'\n",expr.data());
+}
+
+static void returnCharToStream(yyscan_t yyscanner,char c)
+{
+  struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+  unput(c);
+}
+
+static inline void addTillEndOfString(yyscan_t yyscanner,const QCString &expr,QCString *rest,
+                                       uint &pos,char term,QCString &arg)
+{
+  int cc;
+  while ((cc=getNextChar(yyscanner,expr,rest,pos))!=EOF && cc!=0)
+  {
+    if (cc=='\\') arg+=(char)cc,cc=getNextChar(yyscanner,expr,rest,pos);
+    else if (cc==term) return;
+    arg+=(char)cc;
+  }
+}
+
+/*! replaces the function macro \a def whose argument list starts at
+ * \a pos in expression \a expr. 
+ * Notice that this routine may scan beyond the \a expr string if needed.
+ * In that case the characters will be read from the input file.
+ * The replacement string will be returned in \a result and the 
+ * length of the (unexpanded) argument list is stored in \a len.
+ */ 
+static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCString *rest,int pos,int &len,const Define *def,QCString &result)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  //printf("replaceFunctionMacro(expr=%s,rest=%s,pos=%d,def=%s) level=%d\n",expr.data(),rest ? rest->data() : 0,pos,def->name.data(),state->level);
+  uint j=pos;
+  len=0;
+  result.resize(0);
+  int cc;
+  while ((cc=getCurrentChar(yyscanner,expr,rest,j))!=EOF && isspace(cc)) 
+  { 
+    len++; 
+    getNextChar(yyscanner,expr,rest,j); 
+  }
+  if (cc!='(') 
+  { 
+    unputChar(yyscanner,expr,rest,j,' '); 
+    return FALSE; 
+  }
+  getNextChar(yyscanner,expr,rest,j); // eat the '(' character
+
+  QDict<QCString> argTable;  // list of arguments
+  argTable.setAutoDelete(TRUE);
+  QCString arg;
+  int argCount=0;
+  bool done=FALSE;
+  
+  // PHASE 1: read the macro arguments
+  if (def->nargs==0)
+  {
+    while ((cc=getNextChar(yyscanner,expr,rest,j))!=EOF && cc!=0)
+    {
+      char c = (char)cc;
+      if (c==')') break;
+    }
+  }
+  else
+  {
+    while (!done && (argCount<def->nargs || def->varArgs) && 
+	((cc=getNextChar(yyscanner,expr,rest,j))!=EOF && cc!=0)
+	  )
+    {
+      char c=(char)cc;
+      if (c=='(') // argument is a function => search for matching )
+      {
+	int level=1;
+	arg+=c;
+	//char term='\0';
+	while ((cc=getNextChar(yyscanner,expr,rest,j))!=EOF && cc!=0)
+	{
+	  char c=(char)cc;
+	  //printf("processing %c: term=%c (%d)\n",c,term,term);
+	  if (c=='\'' || c=='\"') // skip ('s and )'s inside strings
+	  {
+	    arg+=c;
+	    addTillEndOfString(yyscanner,expr,rest,j,c,arg);
+	  }
+	  if (c==')')
+	  {
+	    level--;
+	    arg+=c;
+	    if (level==0) break;
+	  }
+	  else if (c=='(')
+	  {
+	    level++;
+	    arg+=c;
+	  }
+	  else
+	    arg+=c;
+	}
+      }
+      else if (c==')' || c==',') // last or next argument found
+      {
+	if (c==',' && argCount==def->nargs-1 && def->varArgs)
+	{
+	  arg=arg.stripWhiteSpace();
+	  arg+=',';
+	}
+	else
+	{
+	  QCString argKey;
+	  argKey.sprintf("@%d",argCount++); // key name
+	  arg=arg.stripWhiteSpace();
+	  // add argument to the lookup table
+	  argTable.insert(argKey, new QCString(arg));
+	  arg.resize(0);
+	  if (c==')') // end of the argument list
+	  {
+	    done=TRUE;
+	  }
+	}
+      } 
+      else if (c=='\"') // append literal strings
+      {
+	arg+=c; 
+	bool found=FALSE;
+	while (!found && (cc=getNextChar(yyscanner,expr,rest,j))!=EOF && cc!=0)
+	{
+	  found = cc=='"';
+	  if (cc=='\\')
+	  {
+	    c=(char)cc;	  
+	    arg+=c;
+	    if ((cc=getNextChar(yyscanner,expr,rest,j))==EOF || cc==0) break;
+	  }
+	  c=(char)cc;	  
+	  arg+=c;
+	}
+      }
+      else if (c=='\'') // append literal characters
+      {
+	arg+=c;
+	bool found=FALSE;
+	while (!found && (cc=getNextChar(yyscanner,expr,rest,j))!=EOF && cc!=0)
+	{
+	  found = cc=='\'';
+	  if (cc=='\\')
+	  {
+	    c=(char)cc;	  
+	    arg+=c;
+	    if ((cc=getNextChar(yyscanner,expr,rest,j))==EOF || cc==0) break;
+	  }
+	  c=(char)cc;
+	  arg+=c;
+	}
+      }	    
+      else if (c=='/') // possible start of a comment
+      {
+        char prevChar = '\0';
+        arg+=c;
+        if ((cc=getCurrentChar(yyscanner,expr,rest,j)) == '*') // we have a comment
+        {
+          while ((cc=getNextChar(yyscanner,expr,rest,j))!=EOF && cc!=0)
+          {
+            c=(char)cc;
+            arg+=c;
+            if (c == '/' && prevChar == '*') break; // we have an end of comment
+            prevChar = c;
+          }
+        }
+      }
+      else // append other characters
+      {
+	arg+=c;
+      }
+    }
+  }
+
+  // PHASE 2: apply the macro function
+  if (argCount==def->nargs || // same number of arguments
+      (argCount>=def->nargs-1 && def->varArgs)) // variadic macro with at least as many
+                                                // params as the non-variadic part (see bug731985)
+  {
+    uint k=0;
+    // substitution of all formal arguments
+    QCString resExpr;
+    const QCString d=def->definition.stripWhiteSpace();
+    //printf("Macro definition: %s\n",d.data());
+    bool inString=FALSE;
+    while (k<d.length())
+    {
+      if (d.at(k)=='@') // maybe a marker, otherwise an escaped @
+      {
+	if (d.at(k+1)=='@') // escaped @ => copy it (is unescaped later)
+	{
+	  k+=2;
+	  resExpr+="@@"; // we unescape these later
+	}
+	else if (d.at(k+1)=='-') // no-rescan marker
+	{
+	  k+=2;
+	  resExpr+="@-";
+	}
+	else // argument marker => read the argument number
+	{
+	  QCString key="@";
+	  QCString *subst=0;
+	  bool hash=FALSE;
+	  int l=k-1;
+	  // search for ## backward
+	  if (l>=0 && d.at(l)=='"') l--;
+	  while (l>=0 && d.at(l)==' ') l--;
+	  if (l>0 && d.at(l)=='#' && d.at(l-1)=='#') hash=TRUE;
+	  k++;
+	  // scan the number
+	  while (k<d.length() && d.at(k)>='0' && d.at(k)<='9') key+=d.at(k++);
+	  if (!hash) 
+	  {
+	    // search for ## forward
+	    l=k;
+	    if (l<(int)d.length() && d.at(l)=='"') l++;
+	    while (l<(int)d.length() && d.at(l)==' ') l++;
+	    if (l<(int)d.length()-1 && d.at(l)=='#' && d.at(l+1)=='#') hash=TRUE;
+	  }
+	  //printf("request key %s result %s\n",key.data(),argTable[key]->data());
+	  if (key.length()>1 && (subst=argTable[key])) 
+	  {
+	    QCString substArg=*subst;
+	    //printf("substArg='%s'\n",substArg.data());
+	    // only if no ## operator is before or after the argument
+	    // marker we do macro expansion.
+	    if (!hash) expandExpression(yyscanner,substArg,0,0);
+	    if (inString)
+	    {
+	      //printf("'%s'=stringize('%s')\n",stringize(*subst).data(),subst->data());
+
+	      // if the marker is inside a string (because a # was put 
+	      // before the macro name) we must escape " and \ characters
+	      resExpr+=stringize(substArg);
+	    }
+	    else
+	    {
+	      if (hash && substArg.isEmpty())
+	      {
+		resExpr+="@E"; // empty argument will be remove later on
+	      }
+	      else if (state->nospaces)
+	      {
+	        resExpr+=substArg;
+	      }
+	      else
+	      {
+	        resExpr+=" "+substArg+" ";
+	      }
+	    }
+	  }
+	}
+      }
+      else // no marker, just copy
+      {
+	if (!inString && d.at(k)=='\"') 
+	{
+	  inString=TRUE; // entering a literal string
+	}
+	else if (inString && d.at(k)=='\"' && (d.at(k-1)!='\\' || d.at(k-2)=='\\'))
+	{
+	  inString=FALSE; // leaving a literal string
+	}
+	resExpr+=d.at(k++);
+      }
+    }
+    len=j-pos;
+    result=resExpr;
+    //printf("result after substitution '%s' expr='%s'\n",
+    //       result.data(),expr.mid(pos,len).data());
+    return TRUE;
+  }
+  return FALSE;
+}
+
+
+/*! returns the next identifier in string \a expr by starting at position \a p.
+ * The position of the identifier is returned (or -1 if nothing is found)
+ * and \a l is its length. Any quoted strings are skipping during the search.
+ */
+static int getNextId(const QCString &expr,int p,int *l)
+{
+  int n;
+  while (p<(int)expr.length())
+  {
+    char c=expr.at(p++);
+    if (isdigit(c)) // skip number
+    {
+      while (p<(int)expr.length() && isId(expr.at(p))) p++;
+    }
+    else if (isalpha(c) || c=='_') // read id
+    {
+      n=p-1;
+      while (p<(int)expr.length() && isId(expr.at(p))) p++;
+      *l=p-n;
+      return n; 
+    }
+    else if (c=='"') // skip string
+    {
+      char ppc=0,pc=c;
+      if (p<(int)expr.length()) c=expr.at(p);
+      while (p<(int)expr.length() && (c!='"' || (pc=='\\' && ppc!='\\'))) 
+	// continue as long as no " is found, but ignoring \", but not \\"
+      {
+	ppc=pc;
+	pc=c;
+	c=expr.at(p);
+	p++;
+      }
+      if (p<(int)expr.length()) ++p; // skip closing quote
+    }
+    else if (c=='/') // skip C Comment
+    {
+      //printf("Found C comment at p=%d\n",p);
+      char pc=c;
+      if (p<(int)expr.length()) 
+      {
+	c=expr.at(p);
+        if (c=='*')  // Start of C comment
+        { 
+	  p++;
+  	  while (p<(int)expr.length() && !(pc=='*' && c=='/'))
+	  {
+	    pc=c;
+	    c=expr.at(p++);
+	  }
+        }
+      }
+      //printf("Found end of C comment at p=%d\n",p);
+    }
+  }
+  return -1;
+}
+
+/*! performs recursive macro expansion on the string \a expr
+ *  starting at position \a pos.
+ *  May read additional characters from the input while re-scanning!
+ *  If \a expandAll is \c TRUE then all macros in the expression are
+ *  expanded, otherwise only the first is expanded.
+ */
+static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  //printf("expandExpression(%s,%s)\n",expr.data(),rest ? rest->data() : 0);
+  QCString macroName;
+  QCString expMacro;
+  bool definedTest=FALSE;
+  int i=pos,l,p,len;
+  while ((p=getNextId(expr,i,&l))!=-1) // search for an macro name
+  {
+    bool replaced=FALSE;
+    macroName=expr.mid(p,l);
+    //printf("macroName=%s\n",macroName.data());
+    if (p<2 || !(expr.at(p-2)=='@' && expr.at(p-1)=='-')) // no-rescan marker?
+    {
+      if (state->expandedDict->find(macroName)==0) // expand macro
+      {
+	Define *def=state->defineManager.isDefined(macroName);
+        if (macroName=="defined")
+        {
+  	  //printf("found defined inside macro definition '%s'\n",expr.right(expr.length()-p).data());
+	  definedTest=TRUE;
+        }
+	else if (definedTest) // macro name was found after defined 
+	{
+	  if (def) expMacro = " 1 "; else expMacro = " 0 ";
+	  replaced=TRUE;
+	  len=l;
+	  definedTest=FALSE;
+	}
+	else if (def && def->nargs==-1) // simple macro
+	{
+	  // substitute the definition of the macro
+	  //printf("macro '%s'->'%s'\n",macroName.data(),def->definition.data());
+	  if (state->nospaces)
+	  {
+	    expMacro=def->definition.stripWhiteSpace();
+	  }
+	  else
+	  {
+	    expMacro=" "+def->definition.stripWhiteSpace()+" ";
+	  }
+	  //expMacro=def->definition.stripWhiteSpace();
+	  replaced=TRUE;
+	  len=l;
+	  //printf("simple macro expansion='%s'->'%s'\n",macroName.data(),expMacro.data());
+	}
+	else if (def && def->nargs>=0) // function macro
+	{
+	  replaced=replaceFunctionMacro(yyscanner,expr,rest,p+l,len,def,expMacro);
+	  len+=l;
+	}
+
+	if (replaced) // expand the macro and rescan the expression
+	{
+	  //printf("replacing '%s'->'%s'\n",expr.mid(p,len).data(),expMacro.data());
+	  QCString resultExpr=expMacro;
+	  QCString restExpr=expr.right(expr.length()-len-p);
+	  processConcatOperators(resultExpr);
+	  if (def && !def->nonRecursive)
+	  {
+	    state->expandedDict->insert(macroName,def);
+	    expandExpression(yyscanner,resultExpr,&restExpr,0);
+	    state->expandedDict->remove(macroName);
+	  }
+	  expr=expr.left(p)+resultExpr+restExpr;
+	  i=p;
+	  //printf("new expression: %s\n",expr.data());
+	}
+	else // move to the next macro name
+	{
+	  //printf("moving to the next macro old=%d new=%d\n",i,p+l);
+	  i=p+l;
+	}
+      }
+      else // move to the next macro name
+      {
+	expr=expr.left(p)+"@-"+expr.right(expr.length()-p);
+	//printf("macro already expanded, moving to the next macro expr=%s\n",expr.data());
+	i=p+l+2;
+	//i=p+l;
+      }
+    }
+    else // no re-scan marker found, skip the macro name
+    {
+      //printf("skipping marked macro\n");
+      i=p+l;
+    }
+  }
+}
+
+/*! @brief Process string or character literal.
+ *
+ * \a inputStr should point to the start of a string or character literal.
+ * the routine will return a pointer to just after the end of the literal
+ * the character making up the literal will be added to \a result.
+ */
+static const char *processUntilMatchingTerminator(const char *inputStr,QCString &result)
+{
+  if (inputStr==0) return inputStr;
+  char term = *inputStr; // capture start character of the literal
+  if (term!='\'' && term!='"') return inputStr; // not a valid literal
+  char c=term;
+  // output start character
+  result+=c;
+  inputStr++;
+  while ((c=*inputStr)) // while inside the literal
+  {
+    if (c==term) // found end marker of the literal
+    {
+      // output end character and stop
+      result+=c;
+      inputStr++;
+      break;
+    }
+    else if (c=='\\') // escaped character, process next character
+                      // as well without checking for end marker.
+    {
+      result+=c;
+      inputStr++;
+      c=*inputStr;
+      if (c==0) break; // unexpected end of string after escape character
+    }
+    result+=c;
+    inputStr++;
+  }
+  return inputStr;
+}
+
+/*! replaces all occurrences of @@@@ in \a s by @@
+ *  and removes all occurrences of @@E.
+ *  All identifiers found are replaced by 0L
+ */
+static QCString removeIdsAndMarkers(const char *s)
+{
+  //printf("removeIdsAndMarkers(%s)\n",s);
+  const char *p=s;
+  char c;
+  bool inNum=FALSE;
+  QCString result;
+  if (p)
+  {
+    while ((c=*p))
+    {
+      if (c=='@') // replace @@ with @ and remove @E
+      {
+	if (*(p+1)=='@')
+	{
+	  result+=c; 
+	}
+	else if (*(p+1)=='E')
+	{
+	  // skip
+	}
+	p+=2;
+      }
+      else if (isdigit(c)) // number
+      {
+	result+=c;
+	p++;
+        inNum=TRUE;	
+      }
+      else if (c=='\'') // quoted character
+      {
+        p = processUntilMatchingTerminator(p,result);
+      }
+      else if (c=='d' && !inNum) // identifier starting with a 'd'
+      {
+	if (qstrncmp(p,"defined ",8)==0 || qstrncmp(p,"defined(",8)==0) 
+	           // defined keyword
+	{
+	  p+=7; // skip defined
+	}
+	else
+	{
+	  result+="0L";
+	  p++;
+	  while ((c=*p) && isId(c)) p++;
+	}
+      }
+      else if ((isalpha(c) || c=='_') && !inNum) // replace identifier with 0L
+      {
+	result+="0L";
+	p++;
+	while ((c=*p) && isId(c)) p++;
+	while ((c=*p) && isspace((uchar)c)) p++;
+	if (*p=='(') // undefined function macro
+	{
+	  p++;
+	  int count=1;
+	  while ((c=*p++))
+	  {
+	    if (c=='(') count++;
+	    else if (c==')')
+	    {
+	      count--;
+	      if (count==0) break;
+	    }
+	    else if (c=='/')
+	    {
+	      char pc=c;
+	      c=*++p;
+	      if (c=='*') // start of C comment
+	      {
+		while (*p && !(pc=='*' && c=='/')) // search end of comment
+		{
+		  pc=c;
+		  c=*++p;
+		}
+		p++;
+	      }
+	    }
+	  }
+	}
+      }
+      else if (c=='/') // skip C comments
+      {
+	char pc=c;
+	c=*++p;
+	if (c=='*') // start of C comment
+	{ 
+	  while (*p && !(pc=='*' && c=='/')) // search end of comment
+	  {
+	    pc=c;
+	    c=*++p;
+	  }
+	  p++;
+	}
+	else // oops, not comment but division
+	{
+	  result+=pc;
+	  goto nextChar;
+	}
+      }
+      else 
+      {
+nextChar:
+	result+=c;
+	char lc=tolower(c);
+	if (!isId(lc) && lc!='.' /*&& lc!='-' && lc!='+'*/) inNum=FALSE;
+	p++;
+      }
+    }
+  }
+  //printf("removeIdsAndMarkers(%s)=%s\n",s,result.data());
+  return result;
+}
+
+/*! replaces all occurrences of @@ in \a s by @
+ *  \par assumption: 
+ *   \a s only contains pairs of @@'s
+ */
+static QCString removeMarkers(const char *s)
+{
+  const char *p=s;
+  char c;
+  QCString result;
+  if (p)
+  {
+    while ((c=*p))
+    {
+      switch(c)
+      {
+	case '@': // replace @@ with @
+	  {
+	    if (*(p+1)=='@')
+	    {
+	      result+=c; 
+	    }
+	    p+=2;
+	  }
+	  break;
+	case '/': // skip C comments
+	  {
+	    result+=c;
+	    char pc=c;
+	    c=*++p;
+	    if (c=='*') // start of C comment
+	    { 
+	      while (*p && !(pc=='*' && c=='/')) // search end of comment
+	      {
+		if (*p=='@' && *(p+1)=='@') 
+		  result+=c,p++;
+		else 
+		  result+=c;
+		pc=c;
+		c=*++p;
+	      }
+	      if (*p) result+=c,p++;
+	    }
+	  }
+	  break;
+	case '"': // skip string literals
+	case '\'': // skip char literals
+          p = processUntilMatchingTerminator(p,result);
+	  break;
+	default:
+	  {
+	    result+=c;
+	    p++;
+	  }
+	  break;
+      }
+    }
+  }
+  //printf("RemoveMarkers(%s)=%s\n",s,result.data());
+  return result;
+}
+
+/*! compute the value of the expression in string \a expr.
+ *  If needed the function may read additional characters from the input.
+ */
+
+static bool computeExpression(yyscan_t yyscanner,const QCString &expr)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  QCString e=expr;
+  expandExpression(yyscanner,e,0,0);
+  //printf("after expansion '%s'\n",e.data());
+  e = removeIdsAndMarkers(e);
+  if (e.isEmpty()) return FALSE;
+  //printf("parsing '%s'\n",e.data());
+  return parseconstexp(state->yyFileName,state->yyLineNr,e);
+}
+
+/*! expands the macro definition in \a name
+ *  If needed the function may read additional characters from the input
+ */
+
+static QCString expandMacro(yyscan_t yyscanner,const QCString &name)
+{
+  QCString n=name;
+  expandExpression(yyscanner,n,0,0);
+  n=removeMarkers(n);
+  //printf("expandMacro '%s'->'%s'\n",name.data(),n.data());
+  return n;
+}
+
+static Define *newDefine(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  Define *def=new Define;
+  def->name       = state->defName;
+  def->definition = state->defText.stripWhiteSpace();
+  def->nargs      = state->defArgs;
+  def->fileName   = state->yyFileName; 
+  def->fileDef    = state->yyFileDef;
+  def->lineNr     = state->yyLineNr-state->yyMLines;
+  def->columnNr   = state->yyColNr;
+  def->varArgs    = state->defVarArgs;
+  //printf("newDefine: %s %s file: %s\n",def->name.data(),def->definition.data(),
+  //    def->fileDef ? def->fileDef->name().data() : def->fileName.data());
+  //printf("newDefine: '%s'->'%s'\n",def->name.data(),def->definition.data());
+  if (!def->name.isEmpty() && Doxygen::expandAsDefinedDict[def->name])
+  {
+    def->isPredefined=TRUE;
+  }
+  return def;
+}
+
+static void addDefine(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  if (state->skip) return; // do not add this define as it is inside a 
+                      // conditional section (cond command) that is disabled.
+  if (!Doxygen::gatherDefines) return;
+
+  //printf("addDefine %s %s\n",state->defName.data(),state->defArgsStr.data());
+  //ArgumentList *al = new ArgumentList;
+  //stringToArgumentList(state->defArgsStr,al);
+  MemberDef *md=createMemberDef(
+      state->yyFileName,state->yyLineNr-state->yyMLines,state->yyColNr,
+      "#define",state->defName,state->defArgsStr,0,
+      Public,Normal,FALSE,Member,MemberType_Define,ArgumentList(),ArgumentList(),"");
+  if (!state->defArgsStr.isEmpty())
+  {
+    ArgumentList argList;
+    //printf("addDefine() state->defName='%s' state->defArgsStr='%s'\n",state->defName.data(),state->defArgsStr.data());
+    stringToArgumentList(state->defArgsStr,argList);
+    md->setArgumentList(argList);
+  }
+  //printf("Setting initializer for '%s' to '%s'\n",state->defName.data(),state->defText.data());
+  int l=state->defLitText.find('\n');
+  if (l>0 && state->defLitText.left(l).stripWhiteSpace()=="\\")
+  {
+    // strip first line if it only contains a slash
+    state->defLitText = state->defLitText.right(state->defLitText.length()-l-1);
+  }
+  else if (l>0)
+  {
+    // align the items on the first line with the items on the second line
+    int k=l+1;
+    const char *p=state->defLitText.data()+k;
+    char c;
+    while ((c=*p++) && (c==' ' || c=='\t')) k++;
+    state->defLitText=state->defLitText.mid(l+1,k-l-1)+state->defLitText.stripWhiteSpace();
+  }
+  md->setInitializer(state->defLitText.stripWhiteSpace());
+
+  //printf("pre.l: md->setFileDef(%p)\n",state->inputFileDef);
+  md->setFileDef(state->inputFileDef);
+  md->setDefinition("#define "+state->defName);
+
+  MemberName *mn=Doxygen::functionNameSDict->find(state->defName);
+  if (mn==0)
+  {
+    mn = new MemberName(state->defName);
+    Doxygen::functionNameSDict->append(state->defName,mn);
+  }
+  mn->append(md);
+  if (state->yyFileDef) 
+  {
+    state->yyFileDef->insertMember(md);
+  }
+
+  //Define *d;
+  //if ((d=defineDict[state->defName])==0) defineDict.insert(state->defName,newDefine()); 
+}
+
+static inline void outputChar(yyscan_t yyscanner,char c)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  if (state->includeStack.isEmpty() || state->curlyCount>0) state->outputBuf->addChar(c);
+}
+
+static inline void outputArray(yyscan_t yyscanner,const char *a,int len)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  if (state->includeStack.isEmpty() || state->curlyCount>0) state->outputBuf->addArray(a,len);
+}
+
+static void readIncludeFile(yyscan_t yyscanner,const QCString &inc)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  static bool searchIncludes = Config_getBool(SEARCH_INCLUDES);
+  uint i=0;
+
+  // find the start of the include file name
+  while (i<inc.length() &&
+         (inc.at(i)==' ' || inc.at(i)=='"' || inc.at(i)=='<')
+        ) i++;
+  uint s=i;
+
+  // was it a local include?
+  bool localInclude = s>0 && inc.at(s-1)=='"';
+
+  // find the end of the include file name
+  while (i<inc.length() && inc.at(i)!='"' && inc.at(i)!='>') i++;
+
+  if (s<inc.length() && i>s) // valid include file name found
+  {
+    // extract include path+name
+    QCString incFileName=inc.mid(s,i-s).stripWhiteSpace();
+
+    QCString dosExt = incFileName.right(4);
+    if (dosExt==".exe" || dosExt==".dll" || dosExt==".tlb")
+    {
+      // skip imported binary files (e.g. M$ type libraries)
+      return;
+    }
+
+    QCString oldFileName = state->yyFileName;
+    FileDef *oldFileDef  = state->yyFileDef;
+    int oldLineNr        = state->yyLineNr;
+    //printf("Searching for '%s'\n",incFileName.data());
+
+    // absIncFileName avoids difficulties for incFileName starting with "../" (bug 641336)
+    QCString absIncFileName = incFileName;
+    {
+      QFileInfo fi(state->yyFileName);
+      if (fi.exists())
+      {
+	QCString absName = QCString(fi.dirPath(TRUE).data())+"/"+incFileName;
+        QFileInfo fi2(absName);
+        if (fi2.exists())
+        {
+	  absIncFileName=fi2.absFilePath().utf8();
+	}
+	else if (searchIncludes) // search in INCLUDE_PATH as well
+	{
+	  QStrList &includePath = Config_getList(INCLUDE_PATH);
+	  char *s=includePath.first();
+	  while (s)
+	  {
+	    QFileInfo fi(s);
+	    if (fi.exists() && fi.isDir())
+	    {
+	      QCString absName = QCString(fi.absFilePath().utf8())+"/"+incFileName;
+	      //printf("trying absName=%s\n",absName.data());
+	      QFileInfo fi2(absName);
+	      if (fi2.exists())
+	      {
+		absIncFileName=fi2.absFilePath().utf8();
+		break;
+	      }
+	      //printf( "absIncFileName = %s\n", absIncFileName.data() );
+	    }
+	    s=includePath.next();
+	  }
+	}
+	//printf( "absIncFileName = %s\n", absIncFileName.data() );
+      }
+    }
+    state->defineManager.addInclude(state->yyFileName,absIncFileName);
+    state->defineManager.addFileToContext(absIncFileName);
 
-					    // also add it to the local file list if it is a source file
-					    //if (g_isSource && g_includeStack.isEmpty())
-					    //{
-					    //  g_fileDefineDict->insert(g_defName,nd);
-					    //}
-					  }
-					  else if (def /*&& macroIsAccessible(def)*/)
-					       // name already exists
-					  {
-					    //printf("existing define!\n");
-					    //printf("define found\n");
-					    if (def->undef) // undefined name
-					    {
-					      def->undef = FALSE;
-					      def->name = g_defName;
-					      def->definition = g_defText.stripWhiteSpace();
-					      def->nargs = g_defArgs;
-					      def->fileName = g_yyFileName.copy(); 
-					      def->lineNr = g_yyLineNr-g_yyMLines;
-					      def->columnNr = g_yyColNr;
-					    }
-					    else
-					    {
-					      //printf("error: define %s is defined more than once!\n",g_defName.data());
-					    }
-					  }
-					  delete g_argDict; g_argDict=0;
-					  g_yyLineNr++;
-					  g_yyColNr=1;
-					  g_lastGuardName.resize(0);
-					  BEGIN(Start);
-  					}
-<DefineText>{B}*			{ g_defText += ' '; g_defLitText+=yytext; }
-<DefineText>{B}*"##"{B}*		{ g_defText += "##"; g_defLitText+=yytext; }
-<DefineText>"@"				{ g_defText += "@@"; g_defLitText+=yytext; }
-<DefineText>\"				{ 
-                                          g_defText += *yytext; 
-  					  g_defLitText+=yytext; 
-					  if (!g_insideComment)
-					  {
-					    BEGIN(SkipDoubleQuote);
-					  }
-  					}
-<DefineText>\'				{ g_defText += *yytext;
-  					  g_defLitText+=yytext; 
-					  if (!g_insideComment)
-					  {
-  					    BEGIN(SkipSingleQuote);
-					  }
-					}
-<SkipDoubleQuote>"//"[/]?		{ g_defText += yytext; g_defLitText+=yytext; }
-<SkipDoubleQuote>"/*"			{ g_defText += yytext; g_defLitText+=yytext; }
-<SkipDoubleQuote>\"			{
-  					  g_defText += *yytext; g_defLitText+=yytext; 
-					  BEGIN(DefineText);
-  					}
-<SkipSingleQuote,SkipDoubleQuote>\\.	{
-  					  g_defText += yytext; g_defLitText+=yytext;
-					}
-<SkipSingleQuote>\'			{
-  					  g_defText += *yytext; g_defLitText+=yytext;
-					  BEGIN(DefineText);
-  					}
-<SkipDoubleQuote>.			{ g_defText += *yytext; g_defLitText+=yytext; }
-<SkipSingleQuote>.			{ g_defText += *yytext; g_defLitText+=yytext; }
-<DefineText>.				{ g_defText += *yytext; g_defLitText+=yytext; }
-<<EOF>>					{
-                                          DBG_CTX((stderr,"End of include file\n"));
-					  //printf("Include stack depth=%d\n",g_includeStack.count());
-  					  if (g_includeStack.isEmpty())
-					  {
-					    DBG_CTX((stderr,"Terminating scanner!\n"));
-					    yyterminate();
-					  }
-					  else
-					  {
-					    FileState *fs=g_includeStack.pop();
-					    //fileDefineCache->merge(g_yyFileName,fs->fileName);
-					    YY_BUFFER_STATE oldBuf = YY_CURRENT_BUFFER;
-					    yy_switch_to_buffer( fs->bufState );
-					    yy_delete_buffer( oldBuf );
-					    g_yyLineNr    = fs->lineNr;
-                                            //preYYin = fs->oldYYin;
-                                            g_inputBuf    = fs->oldFileBuf;
-					    g_inputBufPos = fs->oldFileBufPos;
-                                            g_curlyCount = fs->curlyCount;
-					    setFileName(fs->fileName);
-					    DBG_CTX((stderr,"######## FileName %s\n",g_yyFileName.data()));
-					    
-                                            // Deal with file changes due to 
-                                            // #include's within { .. } blocks
-                                            QCString lineStr(15+g_yyFileName.length());
-                                            lineStr.sprintf("# %d \"%s\" 2",g_yyLineNr,g_yyFileName.data());
-                                            outputArray(lineStr.data(),lineStr.length());
-					    
-					    delete fs; fs=0;
-					  }
-  					}
-<*>"/*"/"*/"				|
-<*>"/*"[*]?				{
-                                          if (YY_START==SkipVerbatim || YY_START==SkipCond)
-                                          {
-                                            REJECT;
-                                          }
-                                          else
-                                          {
-					    outputArray(yytext,(int)yyleng);
-  					    g_lastCContext=YY_START;
-					    g_commentCount=1;
-					    if (yyleng==3) g_lastGuardName.resize(0); // reset guard in case the #define is documented!
-					    BEGIN(SkipCComment);
-                                          }
-  					}
-<*>"//"[/]?				{
-                                          if (YY_START==SkipVerbatim || YY_START==SkipCond || getLanguageFromFileName(g_yyFileName)==SrcLangExt_Fortran)
-                                          {
-                                            REJECT;
-                                          }
-                                          else
-                                          {
-					    outputArray(yytext,(int)yyleng);
-  					    g_lastCPPContext=YY_START;
-					    if (yyleng==3) g_lastGuardName.resize(0); // reset guard in case the #define is documented!
-					    BEGIN(SkipCPPComment);
-                                          }
-					}
-<*>\n					{ 
-  					  outputChar('\n');
-  					  g_yyLineNr++; 
-					}
-<*>.				        {
-  					  g_expectGuard = FALSE;
-  					  outputChar(*yytext);
-  					}
+    // findFile will overwrite state->yyFileDef if found
+    FileState *fs;
+    bool alreadyIncluded = FALSE;
+    //printf("calling findFile(%s)\n",incFileName.data());
+    if ((fs=findFile(yyscanner,incFileName,localInclude,alreadyIncluded))) // see if the include file can be found
+    {
+      //printf("Found include file!\n");
+      if (Debug::isFlagSet(Debug::Preprocessor))
+      {
+        for (i=0;i<state->includeStack.count();i++) 
+        {
+          Debug::print(Debug::Preprocessor,0,"  ");
+        }
+        //msg("#include %s: parsing...\n",incFileName.data());
+      }
+      if (oldFileDef)
+      {
+        // add include dependency to the file in which the #include was found
+	bool ambig;
+	// change to absolute name for bug 641336 
+        FileDef *incFd = findFileDef(Doxygen::inputNameDict,absIncFileName,ambig);
+        oldFileDef->addIncludeDependency(ambig ? 0 : incFd,incFileName,localInclude,state->isImported,FALSE);
+        // add included by dependency
+        if (state->yyFileDef)
+        {
+          //printf("Adding include dependency %s->%s\n",oldFileDef->name().data(),incFileName.data());
+          state->yyFileDef->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,state->isImported);
+        }
+      }
+      else if (state->inputFileDef)
+      {
+        state->inputFileDef->addIncludeDependency(0,absIncFileName,localInclude,state->isImported,TRUE);
+      }
+      struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
+      fs->bufState = YY_CURRENT_BUFFER;
+      fs->lineNr   = oldLineNr;
+      fs->fileName = oldFileName;
+      fs->curlyCount = state->curlyCount;
+      state->curlyCount = 0;
+      // push the state on the stack
+      state->includeStack.push(fs);
+      // set the scanner to the include file
 
-%%
+      // Deal with file changes due to 
+      // #include's within { .. } blocks
+      QCString lineStr(state->yyFileName.length()+20);
+      lineStr.sprintf("# 1 \"%s\" 1\n",state->yyFileName.data());
+      outputArray(yyscanner,lineStr.data(),lineStr.length());
+
+      DBG_CTX((stderr,"Switching to include file %s\n",incFileName.data()));
+      state->expectGuard=TRUE;
+      state->inputBuf   = &fs->fileBuf;
+      state->inputBufPos=0;
+      yy_switch_to_buffer(yy_create_buffer(0, YY_BUF_SIZE, yyscanner),yyscanner);
+    }
+    else
+    {
+      //printf("  calling findFile(%s) alreadyInc=%d\n",incFileName.data(),alreadyIncluded);
+      if (oldFileDef)
+      {
+	bool ambig;
+	//QCString absPath = incFileName;
+	//if (QDir::isRelativePath(incFileName))
+	//{
+	//  absPath = QDir::cleanDirPath(oldFileDef->getPath()+"/"+incFileName);
+	//  //printf("%s + %s -> resolved path %s\n",oldFileDef->getPath().data(),incFileName.data(),absPath.data());
+	//}
+
+	// change to absolute name for bug 641336 
+	FileDef *fd = findFileDef(Doxygen::inputNameDict,absIncFileName,ambig);
+	//printf("%s::findFileDef(%s)=%p\n",oldFileDef->name().data(),incFileName.data(),fd);
+	// add include dependency to the file in which the #include was found
+	oldFileDef->addIncludeDependency(ambig ? 0 : fd,incFileName,localInclude,state->isImported,FALSE);
+	// add included by dependency
+        if (fd)
+        {
+          //printf("Adding include dependency (2) %s->%s ambig=%d\n",oldFileDef->name().data(),fd->name().data(),ambig);
+          fd->addIncludedByDependency(oldFileDef,oldFileDef->docName(),localInclude,state->isImported);
+        }
+      }
+      else if (state->inputFileDef)
+      {
+        state->inputFileDef->addIncludeDependency(0,absIncFileName,localInclude,state->isImported,TRUE);
+      }
+      if (Debug::isFlagSet(Debug::Preprocessor))
+      {
+	if (alreadyIncluded)
+	{
+          Debug::print(Debug::Preprocessor,0,"#include %s: already included! skipping...\n",qPrint(incFileName));
+	}
+	else
+	{
+          Debug::print(Debug::Preprocessor,0,"#include %s: not found! skipping...\n",qPrint(incFileName));
+	}
+        //printf("error: include file %s not found\n",yytext);
+      }
+      if (state->curlyCount>0 && !alreadyIncluded) // failed to find #include inside { ... }
+      {
+	warn(state->yyFileName,state->yyLineNr,"include file %s not found, perhaps you forgot to add its directory to INCLUDE_PATH?",incFileName.data());
+      }
+    }
+  }
+}
+
+/* ----------------------------------------------------------------- */
+
+static void startCondSection(yyscan_t yyscanner,const char *sectId)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  //printf("startCondSection: skip=%d stack=%d\n",state->skip,state->condStack.count());
+  CondParser prs;
+  bool expResult = prs.parse(state->yyFileName,state->yyLineNr,sectId);
+  state->condStack.push(new CondCtx(state->yyLineNr,sectId,state->skip));
+  if (!expResult)
+  {
+    state->skip=TRUE;
+  }
+  //printf("  expResult=%d skip=%d\n",expResult,state->skip);
+}
+
+static void endCondSection(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  if (state->condStack.isEmpty())
+  {
+    state->skip=FALSE;
+  }
+  else
+  {
+    CondCtx *ctx = state->condStack.pop();
+    state->skip=ctx->skip;
+    delete ctx;
+  }
+  //printf("endCondSection: skip=%d stack=%d\n",state->skip,state->condStack.count());
+}
+
+static void forceEndCondSection(yyscan_t yyscanner)
+{
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
+  while (!state->condStack.isEmpty())
+  {
+    delete state->condStack.pop();
+  }
+  state->skip=FALSE;
+}
+
+static QCString escapeAt(const char *text)
+{
+  QCString result;
+  if (text)
+  {
+    char c;
+    const char *p=text;
+    while ((c=*p++))
+    {
+      if (c=='@') result+="@@"; else result+=c;
+    }
+  }
+  return result;
+}
+
+static char resolveTrigraph(char c)
+{
+  switch (c)
+  {
+    case '=': return '#';
+    case '/': return '\\';
+    case '\'': return '^';
+    case '(': return '[';
+    case ')': return ']';
+    case '!': return '|';
+    case '<': return '{';
+    case '>': return '}';
+    case '-': return '~';
+  }
+  return '?';
+}
 
 /*@ ----------------------------------------------------------------------------
  */
 
-static int getNextChar(const QCString &expr,QCString *rest,uint &pos)
+static int getNextChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos)
 {
   //printf("getNextChar(%s,%s,%d)\n",expr.data(),rest ? rest->data() : 0,pos);
   if (pos<expr.length())
@@ -3053,13 +3086,13 @@ static int getNextChar(const QCString &expr,QCString *rest,uint &pos)
   }
   else
   {
-    int cc=yyinput();
+    int cc=yyinput(yyscanner);
     //printf("%d=yyinput() %d\n",cc,EOF);
     return cc;
   }
 }
  
-static int getCurrentChar(const QCString &expr,QCString *rest,uint pos)
+static int getCurrentChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint pos)
 {
   //printf("getCurrentChar(%s,%s,%d)\n",expr.data(),rest ? rest->data() : 0,pos);
   if (pos<expr.length())
@@ -3075,15 +3108,15 @@ static int getCurrentChar(const QCString &expr,QCString *rest,uint pos)
   }
   else
   {
-    int cc=yyinput();
-    returnCharToStream(cc);
+    int cc=yyinput(yyscanner);
+    returnCharToStream(yyscanner,cc);
     //unput((char)cc);
     //printf("%c=yyinput()\n",cc);
     return cc;
   }
 }
 
-static void unputChar(const QCString &expr,QCString *rest,uint &pos,char c)
+static void unputChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos,char c)
 {
   //printf("unputChar(%s,%s,%d,%c)\n",expr.data(),rest ? rest->data() : 0,pos,c);
   if (pos<expr.length())
@@ -3099,61 +3132,80 @@ static void unputChar(const QCString &expr,QCString *rest,uint &pos,char c)
   else
   {
     //unput(c);
-    returnCharToStream(c);
+    returnCharToStream(yyscanner,c);
   }
   //printf("result: unputChar(%s,%s,%d,%c)\n",expr.data(),rest ? rest->data() : 0,pos,c);
 }
 
-void addSearchDir(const char *dir)
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+struct Preprocessor::Private
+{
+  yyscan_t yyscanner;
+  preYY_state state;
+  bool firstTime = FALSE;
+};
+
+void Preprocessor::addSearchDir(const char *dir)
 {
+  YY_EXTRA_TYPE state = preYYget_extra(p->yyscanner);
   QFileInfo fi(dir);
-  if (fi.isDir()) g_pathList->append(fi.absFilePath().utf8());
+  if (fi.isDir()) state->pathList->append(fi.absFilePath().utf8());
 } 
 
-void initPreprocessor()
+Preprocessor::Preprocessor()
 {
-  g_pathList = new QStrList;
+  p = new Private;
+  preYYlex_init_extra(&p->state,&p->yyscanner);
+  YY_EXTRA_TYPE state = preYYget_extra(p->yyscanner);
+  state->pathList = new QStrList;
   addSearchDir(".");
-  g_expandedDict = new DefineDict(17);
+  state->expandedDict = new DefineDict(17);
 }
 
-void cleanUpPreprocessor()
+Preprocessor::~Preprocessor()
 {
-  delete g_expandedDict; g_expandedDict=0;
-  delete g_pathList; g_pathList=0;
-  DefineManager::deleteInstance();
+  YY_EXTRA_TYPE state = preYYget_extra(p->yyscanner);
+  delete state->expandedDict; 
+  state->expandedDict=0;
+  delete state->pathList; 
+  state->pathList=0;
+  preYYlex_destroy(p->yyscanner);
+  delete p;
 }
 
-
-void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
+void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output)
 {
+  yyscan_t yyscanner = p->yyscanner;
+  YY_EXTRA_TYPE state = preYYget_extra(p->yyscanner);
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
   printlex(yy_flex_debug, TRUE, __FILE__, fileName);
   uint orgOffset=output.curPos();
   //printf("##########################\n%s\n####################\n",
   //    input.data());
 
-  g_macroExpansion = Config_getBool(MACRO_EXPANSION);
-  g_expandOnlyPredef = Config_getBool(EXPAND_ONLY_PREDEF);
-  g_skip=FALSE;
-  g_curlyCount=0;
-  g_nospaces=FALSE;
-  g_inputBuf=&input;
-  g_inputBufPos=0;
-  g_outputBuf=&output;
-  g_includeStack.setAutoDelete(TRUE);
-  g_includeStack.clear();
-  g_expandedDict->setAutoDelete(FALSE);
-  g_expandedDict->clear();
-  g_condStack.setAutoDelete(TRUE);
-  g_condStack.clear();
-  //g_fileDefineDict->clear();
-
-  setFileName(fileName);
-  g_inputFileDef = g_yyFileDef;
-  DefineManager::instance().startContext(g_yyFileName);
+  state->macroExpansion = Config_getBool(MACRO_EXPANSION);
+  state->expandOnlyPredef = Config_getBool(EXPAND_ONLY_PREDEF);
+  state->skip=FALSE;
+  state->curlyCount=0;
+  state->nospaces=FALSE;
+  state->inputBuf=&input;
+  state->inputBufPos=0;
+  state->outputBuf=&output;
+  state->includeStack.setAutoDelete(TRUE);
+  state->includeStack.clear();
+  state->expandedDict->setAutoDelete(FALSE);
+  state->expandedDict->clear();
+  state->condStack.setAutoDelete(TRUE);
+  state->condStack.clear();
+  //state->fileDefineDict->clear();
+
+  setFileName(yyscanner,fileName);
+  state->inputFileDef = state->yyFileDef;
+  state->defineManager.startContext(state->yyFileName);
   
-  static bool firstTime=TRUE;
-  if (firstTime)
+  p->firstTime=TRUE;
+  if (p->firstTime)
   {
     // add predefined macros
     char *defStr;
@@ -3226,9 +3278,9 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
 	  def->nargs        = count;
 	  def->isPredefined = TRUE;
 	  def->nonRecursive = nonRecursive;
-	  def->fileDef      = g_yyFileDef;
+	  def->fileDef      = state->yyFileDef;
 	  def->fileName     = fileName;
-	  DefineManager::instance().addDefine(g_yyFileName,def);
+	  state->defineManager.addDefine(state->yyFileName,def);
 	}
 
 	//printf("#define '%s' '%s' #nargs=%d\n",
@@ -3257,9 +3309,9 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
 	  def->nargs = -1;
 	  def->isPredefined = TRUE;
 	  def->nonRecursive = nonRecursive;
-	  def->fileDef      = g_yyFileDef;
+	  def->fileDef      = state->yyFileDef;
 	  def->fileName     = fileName;
-	  DefineManager::instance().addDefine(g_yyFileName,def);
+	  state->defineManager.addDefine(state->yyFileName,def);
 	}
 	else
 	{
@@ -3273,24 +3325,23 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
     //firstTime=FALSE;
   }
  
-  g_yyLineNr = 1;
-  g_yyColNr  = 1;
-  g_level    = 0;
-  g_ifcount  = 0;
+  state->yyLineNr = 1;
+  state->yyColNr  = 1;
+  state->level    = 0;
+  state->ifcount  = 0;
 
   BEGIN( Start );
   
-  g_expectGuard = guessSection(fileName)==Entry::HEADER_SEC;
-  g_guardName.resize(0);
-  g_lastGuardName.resize(0);
-  g_guardExpr.resize(0);
+  state->expectGuard = guessSection(fileName)==Entry::HEADER_SEC;
+  state->guardName.resize(0);
+  state->lastGuardName.resize(0);
+  state->guardExpr.resize(0);
   
-  preYYlex();
-  g_lexInit=TRUE;
+  preYYlex(yyscanner);
 
-  while (!g_condStack.isEmpty())
+  while (!state->condStack.isEmpty())
   {
-    CondCtx *ctx = g_condStack.pop();
+    CondCtx *ctx = state->condStack.pop();
     QCString sectionInfo = " ";
     if (ctx->sectionId!=" ") sectionInfo.sprintf(" with label '%s' ",ctx->sectionId.stripWhiteSpace().data());
     warn(fileName,ctx->lineNr,"Conditional section%sdoes not have "
@@ -3298,18 +3349,18 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
     delete ctx;
   }
   // make sure we don't extend a \cond with missing \endcond over multiple files (see bug 624829)
-  forceEndCondSection();
+  forceEndCondSection(yyscanner);
 
   // remove locally defined macros so they can be redefined in another source file
-  //if (g_fileDefineDict->count()>0)
+  //if (state->fileDefineDict->count()>0)
   //{
-  //  QDictIterator<Define> di(*g_fileDefineDict);
+  //  QDictIterator<Define> di(*state->fileDefineDict);
   //  Define *d;
   //  for (di.toFirst();(d=di.current());++di)
   //  {
-  //    g_globalDefineDict->remove(di.currentKey());
+  //    state->globalDefineDict->remove(di.currentKey());
   //  }
-  //  g_fileDefineDict->clear();
+  //  state->fileDefineDict->clear();
   //}
 
   if (Debug::isFlagSet(Debug::Preprocessor))
@@ -3326,11 +3377,11 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
       orgPos++;
     }
     Debug::print(Debug::Preprocessor,0,"\n---------\n");
-    if (DefineManager::instance().defineContext().count()>0)
+    if (state->defineManager.defineContext().count()>0)
     {
       Debug::print(Debug::Preprocessor,0,"Macros accessible in this file:\n");
       Debug::print(Debug::Preprocessor,0,"---------\n");
-      QDictIterator<Define> di(DefineManager::instance().defineContext());
+      QDictIterator<Define> di(state->defineManager.defineContext());
       Define *def;
       for (di.toFirst();(def=di.current());++di)
       {
@@ -3343,20 +3394,10 @@ void preprocessFile(const char *fileName,BufStr &input,BufStr &output)
       Debug::print(Debug::Preprocessor,0,"No macros accessible in this file.\n");
     }
   }
-  DefineManager::instance().endContext();
+  state->defineManager.endContext();
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
 }
 
-void preFreeScanner()
-{
-#if defined(YY_FLEX_SUBMINOR_VERSION) 
-  if (g_lexInit)
-  {
-    preYYlex_destroy();
-  }
-#endif
-}
-
 #if !defined(YY_FLEX_SUBMINOR_VERSION) 
 extern "C" { // some bogus code to keep the compiler happy
 //  int  preYYwrap() { return 1 ; }
-- 
cgit v0.12


From 28c738d0319bf5de25bcf6aed90234419feded07 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 9 Nov 2019 17:29:15 +0100
Subject: Remove global state from constexp lexer

---
 src/constexp.h   | 23 ++++++++---------------
 src/constexp.l   | 57 ++++++++++++++++++++++++++++++++++----------------------
 src/constexp.y   | 21 ++++++++-------------
 src/constexp_p.h | 44 +++++++++++++++++++++++++++++++++++++++++++
 src/pre.h        |  2 +-
 src/pre.l        |  3 ++-
 6 files changed, 98 insertions(+), 52 deletions(-)
 create mode 100644 src/constexp_p.h

diff --git a/src/constexp.h b/src/constexp.h
index 8bf582e..0b52e14 100644
--- a/src/constexp.h
+++ b/src/constexp.h
@@ -19,24 +19,17 @@
 #ifndef _CONSTEXP_H
 #define _CONSTEXP_H
 
-#include "cppvalue.h"
 #include <qcstring.h>
 
-#define YYSTYPE CPPValue
-typedef void* yyscan_t;
-struct constexpYY_state
+class ConstExpressionParser
 {
-  QCString    g_strToken;
-  CPPValue    g_resultValue;
-  int         g_constExpLineNr;
-  QCString    g_constExpFileName;
-
-  const char *g_inputString;
-  int         g_inputPosition;
+  public:
+    ConstExpressionParser();
+   ~ConstExpressionParser();
+    bool parse(const char *fileName,int line,const QCString &expression);
+  private:
+    struct Private;
+    Private *p;
 };
 
-extern bool parseconstexp(const char *fileName,int line,const QCString &s);
-extern int constexpYYparse(yyscan_t);
-extern int constexpYYlex(YYSTYPE *lvalp, yyscan_t);
-struct constexpYY_state*  constexpYYget_extra (yyscan_t yyscanner );
 #endif
diff --git a/src/constexp.l b/src/constexp.l
index b6b3c5c..eae8a3b 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -24,6 +24,7 @@
 %{
 
 #include "constexp.h"  
+#include "constexp_p.h"  
 #include "cppvalue.h"
 #include "ce_parse.hpp" // generated header file
 #include "message.h"
@@ -31,7 +32,6 @@
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
 
-
 static const char *stateToString(int state);
 static int yyread(char *buf,int max_size,yyscan_t yyscanner);
 
@@ -70,23 +70,23 @@ CONSTSUFFIX ([uU][lL]?[lL]?)|([lL][lL]?[uU]?)
 "("             		   { return TOK_LPAREN; }
 ")"             		   { return TOK_RPAREN; }
 "'"(([^\'\n\r\\]+)|(\\(([ntvbrfa\\?'\"])|([0-9]+)|([xX][0-9a-fA-F]+))))"'"   { 
-                                     yyextra->g_strToken=yytext;  
+                                     yyextra->strToken=yytext;  
 				     return TOK_CHARACTER; 
 				   }
-0[0-7]*{CONSTSUFFIX}?              { yyextra->g_strToken=yytext; 
+0[0-7]*{CONSTSUFFIX}?              { yyextra->strToken=yytext; 
   				     return TOK_OCTALINT; 
 				   }
-[1-9][0-9]*{CONSTSUFFIX}?          { yyextra->g_strToken=yytext; 
+[1-9][0-9]*{CONSTSUFFIX}?          { yyextra->strToken=yytext; 
   				     return TOK_DECIMALINT; 
 				   }
-(0x|0X)[0-9a-fA-F]+{CONSTSUFFIX}?  { yyextra->g_strToken=yytext+2; 
+(0x|0X)[0-9a-fA-F]+{CONSTSUFFIX}?  { yyextra->strToken=yytext+2; 
                                      return TOK_HEXADECIMALINT; 
                                    }
 (([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+))([eE]([\-\+])?[0-9]+)?([fFlL])? { 
-                                     yyextra->g_strToken=yytext; return TOK_FLOAT; 
+                                     yyextra->strToken=yytext; return TOK_FLOAT; 
                                    }
 ([0-9]+[eE])([\-\+])?[0-9]+([fFlL])? { 
-                                     yyextra->g_strToken=yytext; return TOK_FLOAT; 
+                                     yyextra->strToken=yytext; return TOK_FLOAT; 
 			           }
 .				   
 \n
@@ -97,43 +97,56 @@ static int yyread(char *buf,int max_size,yyscan_t yyscanner)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   int c=0;
-  while( c < max_size && yyextra->g_inputString[yyextra->g_inputPosition] )
+  while( c < max_size && yyextra->inputString[yyextra->inputPosition] )
   {
-    *buf = yyextra->g_inputString[yyextra->g_inputPosition++] ;
+    *buf = yyextra->inputString[yyextra->inputPosition++] ;
     c++; buf++;
   }
   return c;
 }
 
+struct ConstExpressionParser::Private
+{
+  yyscan_t yyscanner;
+  struct constexpYY_state constexpYY_extra;
+};
 
-static yyscan_t yyscanner;
-static struct constexpYY_state constexpYY_extra;
 
-bool parseconstexp(const char *fileName,int lineNr,const QCString &s)
+ConstExpressionParser::ConstExpressionParser()
 {
-  constexpYYlex_init_extra(&constexpYY_extra, &yyscanner);
-  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  p = new Private;
+  constexpYYlex_init_extra(&p->constexpYY_extra, &p->yyscanner);
+}
+
+ConstExpressionParser::~ConstExpressionParser()
+{
+  constexpYYlex_destroy(p->yyscanner);
+  delete p;
+}
+
+bool ConstExpressionParser::parse(const char *fileName,int lineNr,const QCString &s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
 
 #ifdef FLEX_DEBUG
   yyset_debug(1,yyscanner);
 #endif
 
-  yyextra->g_constExpFileName = fileName;
-  yyextra->g_constExpLineNr = lineNr;
-  yyextra->g_inputString = s;
-  yyextra->g_inputPosition = 0;
-  constexpYYrestart( yyin, yyscanner );
+  yyextra->constExpFileName = fileName;
+  yyextra->constExpLineNr = lineNr;
+  yyextra->inputString = s;
+  yyextra->inputPosition = 0;
+  constexpYYrestart( yyin, p->yyscanner );
 
   printlex(yy_flex_debug, TRUE, __FILE__, fileName);
   //printf("Expression: '%s'\n",s.data());
 
-  constexpYYparse(yyscanner);
+  constexpYYparse(p->yyscanner);
 
   //printf("Result: %ld\n",(long)g_resultValue);
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
-  bool result = (long)yyextra->g_resultValue!=0;
+  bool result = (long)yyextra->resultValue!=0;
 
-  constexpYYlex_destroy(yyscanner);
   return result;
 }
 
diff --git a/src/constexp.y b/src/constexp.y
index 62a51f3..100614a 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -19,21 +19,16 @@
 %{
 
 #include "cppvalue.h"
-#include "constexp.h"
+#include "constexp_p.h"
 #include "message.h"
 
-#if defined(_MSC_VER)
-#define MSDOS
-#endif
-
-
 #include <stdio.h>
 #include <stdlib.h>
 
 int constexpYYerror(yyscan_t yyscanner, const char *s)
 {
   struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-  warn(yyextra->g_constExpFileName, yyextra->g_constExpLineNr,
+  warn(yyextra->constExpFileName, yyextra->constExpLineNr,
        "preprocessing issue while doing constant expression evaluation: %s",s);
   return 0;
 }
@@ -80,7 +75,7 @@ int constexpYYerror(yyscan_t yyscanner, const char *s)
 start: constant_expression
        {
          struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-         yyextra->g_resultValue = $1; return 0;
+         yyextra->resultValue = $1; return 0;
        }
 ;
 
@@ -272,27 +267,27 @@ primary_expression: constant
 constant: TOK_OCTALINT
 	  {
 	    struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-	    $$ = parseOctal(yyextra->g_strToken);
+	    $$ = parseOctal(yyextra->strToken);
 	  }
 	| TOK_DECIMALINT
 	  {
 	    struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-	    $$ = parseDecimal(yyextra->g_strToken);
+	    $$ = parseDecimal(yyextra->strToken);
 	  }
 	| TOK_HEXADECIMALINT
 	  {
 	    struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-	    $$ = parseHexadecimal(yyextra->g_strToken);
+	    $$ = parseHexadecimal(yyextra->strToken);
 	  }
 	| TOK_CHARACTER
 	  {
 	    struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-	    $$ = parseCharacter(yyextra->g_strToken);
+	    $$ = parseCharacter(yyextra->strToken);
 	  }
 	| TOK_FLOAT
 	  {
 	    struct constexpYY_state* yyextra = constexpYYget_extra(yyscanner);
-	    $$ = parseFloat(yyextra->g_strToken);
+	    $$ = parseFloat(yyextra->strToken);
 	  }
 ;
 
diff --git a/src/constexp_p.h b/src/constexp_p.h
new file mode 100644
index 0000000..ad09b2d
--- /dev/null
+++ b/src/constexp_p.h
@@ -0,0 +1,44 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby 
+ * granted. No representations are made about the suitability of this software 
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
+#ifndef _CONSTEXP_P_H
+#define _CONSTEXP_P_H
+
+#include <qcstring.h>
+
+//! @file
+//! @brief Private interface between Parser (constexp.y) and Lexer (constexp.l)
+
+#include "cppvalue.h"
+#define YYSTYPE CPPValue
+
+typedef void* yyscan_t;
+struct constexpYY_state
+{
+  QCString    strToken;
+  CPPValue    resultValue;
+  int         constExpLineNr;
+  QCString    constExpFileName;
+
+  const char *inputString;
+  int         inputPosition;
+};
+constexpYY_state* constexpYYget_extra(yyscan_t yyscanner );
+
+extern int constexpYYlex(YYSTYPE *lvalp, yyscan_t);
+extern int constexpYYparse(yyscan_t);
+
+
+#endif
diff --git a/src/pre.h b/src/pre.h
index 193ab60..137b397 100644
--- a/src/pre.h
+++ b/src/pre.h
@@ -28,7 +28,7 @@ class Preprocessor
     void processFile(const char *fileName,BufStr &input,BufStr &output);
     void addSearchDir(const char *dir);
  private:
-   class Private;
+   struct Private;
    Private *p;
 };
 
diff --git a/src/pre.l b/src/pre.l
index ecf6b57..0ce7eaa 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -380,6 +380,7 @@ struct preYY_state
   QCString           delimiter;
   QDict<void>        allIncludes;
   DefineManager      defineManager;
+  ConstExpressionParser constExpParser;
 };
 
 // stateless functions
@@ -2704,7 +2705,7 @@ static bool computeExpression(yyscan_t yyscanner,const QCString &expr)
   e = removeIdsAndMarkers(e);
   if (e.isEmpty()) return FALSE;
   //printf("parsing '%s'\n",e.data());
-  return parseconstexp(state->yyFileName,state->yyLineNr,e);
+  return state->constExpParser.parse(state->yyFileName,state->yyLineNr,e);
 }
 
 /*! expands the macro definition in \a name
-- 
cgit v0.12


From bae74a501c520bc180ea329dbe8d91b1ce81d90e Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 9 Nov 2019 19:46:38 +0100
Subject: Fixed use of uninitialized pointer in preprocessor

---
 src/fileparser.h     |  2 +-
 src/fortranscanner.h |  2 +-
 src/fortranscanner.l |  2 +-
 src/markdown.h       |  2 +-
 src/parserintf.h     |  2 +-
 src/pre.l            | 10 +++++-----
 src/pyscanner.h      |  2 +-
 src/pyscanner.l      |  2 +-
 src/scanner.h        |  2 +-
 src/scanner.l        |  2 +-
 src/sqlscanner.h     |  2 +-
 src/tclscanner.h     |  2 +-
 src/tclscanner.l     |  2 +-
 src/vhdljjparser.h   |  2 +-
 src/xmlscanner.h     |  2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/fileparser.h b/src/fileparser.h
index 7c3f40c..3132f92 100644
--- a/src/fileparser.h
+++ b/src/fileparser.h
@@ -26,7 +26,7 @@ class FileParser : public ParserInterface
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char *, const char *,const std::unique_ptr<Entry> &, bool, QStrList &) {}
-    bool needsPreprocessing(const QCString &) { return FALSE; }
+    bool needsPreprocessing(const QCString &) const { return FALSE; }
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
diff --git a/src/fortranscanner.h b/src/fortranscanner.h
index 7490cde..6476c98 100644
--- a/src/fortranscanner.h
+++ b/src/fortranscanner.h
@@ -36,7 +36,7 @@ class FortranLanguageScanner : public ParserInterface
                     const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
-    bool needsPreprocessing(const QCString &extension);
+    bool needsPreprocessing(const QCString &extension) const;
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index a053910..39c45e7 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -2793,7 +2793,7 @@ void FortranLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
                      showLineNumbers,searchCtx,collectXRefs,m_format);
 }
 
-bool FortranLanguageScanner::needsPreprocessing(const QCString &extension)
+bool FortranLanguageScanner::needsPreprocessing(const QCString &extension) const
 {
   return extension!=extension.lower(); // use preprocessor only for upper case extensions
 }
diff --git a/src/markdown.h b/src/markdown.h
index f101e5a..2c9a496 100644
--- a/src/markdown.h
+++ b/src/markdown.h
@@ -36,7 +36,7 @@ class MarkdownFileParser : public ParserInterface
                     const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
-    bool needsPreprocessing(const QCString &) { return FALSE; }
+    bool needsPreprocessing(const QCString &) const { return FALSE; }
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
diff --git a/src/parserintf.h b/src/parserintf.h
index a269bfb..c0939c9 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -78,7 +78,7 @@ class ParserInterface
      *  parser.
      *  @see parseInput()
      */
-    virtual bool needsPreprocessing(const QCString &extension) = 0;
+    virtual bool needsPreprocessing(const QCString &extension) const = 0;
     
     /** Parses a source file or fragment with the goal to produce
      *  highlighted and cross-referenced output.
diff --git a/src/pre.l b/src/pre.l
index 0ce7eaa..0aa54b9 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -334,9 +334,9 @@ struct preYY_state
   FileDef           *yyFileDef;
   FileDef           *inputFileDef;
   int                ifcount    = 0;
-  QStrList          *pathList = 0;  
+  QStrList          *pathList = 0;
   QStack<FileState>  includeStack;
-  QDict<int>        *argDict;
+  QDict<int>        *argDict = 0;
   int                defArgs = -1;
   QCString           defName;
   QCString           defText;
@@ -348,12 +348,12 @@ struct preYY_state
   int                lastCContext;
   int                lastCPPContext;
   QArray<int>        levelGuard;
-  BufStr            *inputBuf;
+  BufStr            *inputBuf = 0;
   int                inputBufPos;
-  BufStr            *outputBuf;
+  BufStr            *outputBuf = 0;
   int                roundCount;
   bool               quoteArg;
-  DefineDict        *expandedDict;
+  DefineDict        *expandedDict = 0;
   int                findDefArgContext;
   bool               expectGuard;
   QCString           guardName;
diff --git a/src/pyscanner.h b/src/pyscanner.h
index 13b10b9..2faffdc 100644
--- a/src/pyscanner.h
+++ b/src/pyscanner.h
@@ -42,7 +42,7 @@ class PythonLanguageScanner : public ParserInterface
                     const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
-    bool needsPreprocessing(const QCString &extension);
+    bool needsPreprocessing(const QCString &extension) const;
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 829980c..63f11e3 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -1901,7 +1901,7 @@ void PythonLanguageScanner::parseInput(const char *fileName,
   // printAST(global_root);
 }
 
-bool PythonLanguageScanner::needsPreprocessing(const QCString &)
+bool PythonLanguageScanner::needsPreprocessing(const QCString &) const
 {
   return FALSE;
 }
diff --git a/src/scanner.h b/src/scanner.h
index 7103cb0..65206be 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -37,7 +37,7 @@ class CLanguageScanner : public ParserInterface
                     const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
-    bool needsPreprocessing(const QCString &extension);
+    bool needsPreprocessing(const QCString &extension) const;
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
diff --git a/src/scanner.l b/src/scanner.l
index 8710ca2..33ea4d4 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -7364,7 +7364,7 @@ void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
 	       showLineNumbers,searchCtx,collectXRefs);
 }
 
-bool CLanguageScanner::needsPreprocessing(const QCString &extension)
+bool CLanguageScanner::needsPreprocessing(const QCString &extension) const
 {
   QCString fe=extension.lower();
   SrcLangExt lang = getLanguageFromFileName(extension);
diff --git a/src/sqlscanner.h b/src/sqlscanner.h
index b981b5b..694bf80 100644
--- a/src/sqlscanner.h
+++ b/src/sqlscanner.h
@@ -29,7 +29,7 @@ public:
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char *, const char *, const std::unique_ptr<Entry> &, bool , QStrList &) {}
-    bool needsPreprocessing(const QCString &) { return FALSE; }
+    bool needsPreprocessing(const QCString &) const { return FALSE; }
 
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
diff --git a/src/tclscanner.h b/src/tclscanner.h
index 482fb1f..94da68b 100644
--- a/src/tclscanner.h
+++ b/src/tclscanner.h
@@ -36,7 +36,7 @@ class TclLanguageScanner : public ParserInterface
                     const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
-    bool needsPreprocessing(const QCString &extension);
+    bool needsPreprocessing(const QCString &extension) const;
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 45ad9c0..4f2d837 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -3081,7 +3081,7 @@ tcl_inf("%s (%d,%d) %d %d\n",myStr.data(),startLine,endLine,isExampleBlock,inlin
   printlex(yy_flex_debug, FALSE, __FILE__, fileDef ? fileDef->fileName().data(): NULL);
 }
 
-bool TclLanguageScanner::needsPreprocessing(const QCString &extension)
+bool TclLanguageScanner::needsPreprocessing(const QCString &extension) const
 {
   (void)extension;
   return FALSE;
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index d38a731..f2bf60d 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -66,7 +66,7 @@ class VHDLLanguageScanner : public ParserInterface
                    const Definition *searchCtx=0,
                    bool collectXRefs=TRUE
 				   );
-		bool needsPreprocessing(const QCString &) { return TRUE; }
+		bool needsPreprocessing(const QCString &) const { return TRUE; }
 		void resetCodeParserState(){};
 	    void parsePrototype(const char *text);
 };
diff --git a/src/xmlscanner.h b/src/xmlscanner.h
index b54d416..0fe01a7 100644
--- a/src/xmlscanner.h
+++ b/src/xmlscanner.h
@@ -29,7 +29,7 @@ public:
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char *, const char *, const std::unique_ptr<Entry> &, bool , QStrList &) {}
-    bool needsPreprocessing(const QCString &) { return FALSE; }
+    bool needsPreprocessing(const QCString &) const { return FALSE; }
 
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
-- 
cgit v0.12


From 4884295c6a3bc9af6e01c1688a3173ac6c3bc315 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 10 Nov 2019 11:16:40 +0100
Subject: Simplied the logic for moving documentation to the most nested Entry

---
 src/scanner.l | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/scanner.l b/src/scanner.l
index e9ca1c7..abc0c3b 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -3910,17 +3910,24 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace")
                                             {
                                               int split_point;
-                                              Entry *first_current = current;
+                                              // save documentation values
+                                              QCString doc       = current->doc;
+                                              int      docLine   = current->docLine;
+                                              QCString docFile   = current->docFile;
+                                              QCString brief     = current->brief;
+                                              int      briefLine = current->briefLine;
+                                              QCString briefFile = current->briefFile;
+                                              // reset documentation values
+                                              current->doc       = "";
+                                              current->docLine   = 0;
+                                              current->docFile   = "";
+                                              current->brief     = "";
+                                              current->briefLine = 0;
+                                              current->briefFile = "";
                                               while ((split_point = current->name.find("::")) != -1)
                                               {
                                                 std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*current);
                                                 current->program = "";
-                                                new_current->doc = "";
-                                                new_current->docLine = 0;
-                                                new_current->docFile = "";
-                                                new_current->brief = "";
-                                                new_current->briefLine = 0;
-                                                new_current->briefFile = "";
                                                 new_current->name  = current->name.mid(split_point + 2);
                                                 current->name  = current->name.left(split_point);
                                                 if (!current_root->name.isEmpty()) current->name.prepend(current_root->name+"::");
@@ -3930,22 +3937,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                                 current_root = tmp;
                                                 current.swap(new_current);
                                               }
-                                              // put documentation in the right entity
-                                              if (first_current!=current)
-                                              {
-                                                current->doc = first_current->doc;
-                                                current->docLine = first_current->docLine;
-                                                current->docFile = first_current->docFile;
-                                                current->brief = first_current->brief;
-                                                current->briefLine = first_current->briefLine;
-                                                current->briefFile = first_current->briefFile;
-                                                first_current->doc = "";
-                                                first_current->docLine = 0;
-                                                first_current->docFile = "";
-                                                first_current->brief = "";
-                                                first_current->briefLine = 0;
-                                                first_current->briefFile = "";
-                                              }
+                                              // restore documentation values
+                                              current->doc       = doc;
+                                              current->docLine   = docLine;
+                                              current->docFile   = docFile;
+                                              current->brief     = brief;
+                                              current->briefLine = briefLine;
+                                              current->briefFile = briefFile;
                                             }
 					    QCString &cn = current->name;
 					    QCString rn = current_root->name.copy();
-- 
cgit v0.12


From f08e87623368134c6541af12995b811ef9aff069 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 12 Nov 2019 11:42:22 +0100
Subject: issue #7290 error: Problem running ghostscript gs -q -g562x56
 -r384x384x -sDEVICE=ppmraw -sOutputFile=_form0.pnm -dNOPAUSE -dBATCH --
 _form0.ps. Check your installation!

@maehr had a talk with Robin Watts and Ken Sharp at IRC and there seem to be basically 3 different problems:
* `-r%dx%d` (the dimension for `r` shouldn't be `-r384x384x`, but `-r384x384`),
* misuse / unnecessary use of `--` and
* since 9.50 the command needs more control access (that might be worked around by either whitelisting the file via `--permit-file-read=_form0.eps` (only works from 9.50 and upwards) or generally accepting any file with `-dNOSAFER` (works since quite some time). The second option is considered to be unsafe if we would process any file, but in this case we process self produced / controlled files. I don't know if doxygen has any threat model that it assumes. ).

> Ken Sharp: Yeah the %dx is wrong, as Robin says its sheer luck that works
the -- isn't needed and is what's causing the first problem
and file control is the new bugbear

The suggestions have been implemented and test / docs works now with old and new version.
---
 src/formula.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/formula.cpp b/src/formula.cpp
index 534f56a..3d8e6ce 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
       // used.  
 
       char gsArgs[4096];
-      sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
-                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
+      sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
+                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
                     formBase.data(),formBase.data()
              );
-- 
cgit v0.12


From 0809acf9d38525578080e50a4b23b61127706ebe Mon Sep 17 00:00:00 2001
From: Roel Standaert <roel@emweb.be>
Date: Tue, 12 Nov 2019 14:23:57 +0100
Subject: Fix line count after multiline close group

Fix for issue #7393

When closing a group on multiple lines, like:

/*! @}
*/

The line count of subsequent lines is wrong (it's one line less than it
should be).
---
 src/scanner.l | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/scanner.l b/src/scanner.l
index abc0c3b..393d6d4 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -2852,6 +2852,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers,FindFields,ReadInitializer>"//"([!/]){B}*{CMD}"}".*|"/*"([!*]){B}*{CMD}"}"[^*]*"*/"	{
                                           bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && lastInitializerContext==FindFields); // see bug746226
   					  Doxygen::docGroup.close(current.get(),yyFileName,yyLineNr,insideEnum);
+  					  lineCount();
   					}
 <FindMembers>"="			{ // in PHP code this could also be due to "<?="
   					  current->bodyLine = yyLineNr;
-- 
cgit v0.12


From 6b821a1da54e558947b631a7d2b836c8aa6935e7 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Tue, 12 Nov 2019 18:08:22 +0100
Subject: Problem with horizontal ruler directly after fenced code section

When having a fenced code block directly followed by a horizontal ruler like:
```
~~~
B
~~~
---
```
we get the warning:
```
bb.md:5: warning: unexpected command endcode
```
due to the fact that the markdown parser replaces the `~~~` by a `@code` / `endcode` block and then handles the horizontal ruler `---` but this is seen as a level 2 header on the previous part resulting in the markdown code:
```
@page md_bb bb

@subsection autotoc_md0 @code
B
@endcode
```

The problem also occurs when a fenced code block is created with back tics.

By adding a `\n` this problem is fixed.
---
 src/markdown.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/markdown.cpp b/src/markdown.cpp
index f6720ea..e054941 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2176,7 +2176,7 @@ static void writeFencedCodeBlock(GrowBuf &out,const char *data,const char *lng,
   }
   out.addStr(data+blockStart,blockEnd-blockStart);
   out.addStr("\n");
-  out.addStr("@endcode");
+  out.addStr("@endcode\n");
 }
 
 static QCString processQuotations(const QCString &s,int refIndent)
-- 
cgit v0.12


From 82e952f272b285b641a1980143826bf8816c70c1 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 13 Nov 2019 11:50:45 +0100
Subject: Illegal Character in XML output

The usage of, the unusual, `&` in a filename caused troubles as the filenames in the file strings in the location element were not translated to XML.
---
 src/xmlgen.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 9e76d6f..83e97b2 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -980,7 +980,7 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
   if (md->getDefLine()!=-1)
   {
     t << "        <location file=\"" 
-      << stripFromPath(md->getDefFileName()) << "\" line=\"" 
+      << convertToXML(stripFromPath(md->getDefFileName())) << "\" line=\""
       << md->getDefLine() << "\" column=\"" 
       << md->getDefColumn() << "\"" ;
     if (md->getStartBodyLine()!=-1)
@@ -988,14 +988,14 @@ static void generateXMLForMember(const MemberDef *md,FTextStream &ti,FTextStream
       FileDef *bodyDef = md->getBodyDef();
       if (bodyDef)
       {
-        t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
+        t << " bodyfile=\"" << convertToXML(stripFromPath(bodyDef->absFilePath())) << "\"";
       }
       t << " bodystart=\"" << md->getStartBodyLine() << "\" bodyend=\"" 
         << md->getEndBodyLine() << "\"";
     }
     if (md->getDeclLine()!=-1)
     {
-      t << " declfile=\"" << stripFromPath(md->getDeclFileName()) << "\" declline=\""
+      t << " declfile=\"" << convertToXML(stripFromPath(md->getDeclFileName())) << "\" declline=\""
         << md->getDeclLine() << "\" declcolumn=\""
         << md->getDeclColumn() << "\"";
     }
@@ -1418,7 +1418,7 @@ static void generateXMLForClass(const ClassDef *cd,FTextStream &ti)
     t << "    </collaborationgraph>" << endl;
   }
   t << "    <location file=\"" 
-    << stripFromPath(cd->getDefFileName()) << "\" line=\"" 
+    << convertToXML(stripFromPath(cd->getDefFileName())) << "\" line=\""
     << cd->getDefLine() << "\"" << " column=\"" 
     << cd->getDefColumn() << "\"" ;
     if (cd->getStartBodyLine()!=-1)
@@ -1426,7 +1426,7 @@ static void generateXMLForClass(const ClassDef *cd,FTextStream &ti)
       FileDef *bodyDef = cd->getBodyDef();
       if (bodyDef)
       {
-        t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
+        t << " bodyfile=\"" << convertToXML(stripFromPath(bodyDef->absFilePath())) << "\"";
       }
       t << " bodystart=\"" << cd->getStartBodyLine() << "\" bodyend=\"" 
         << cd->getEndBodyLine() << "\"";
@@ -1506,7 +1506,7 @@ static void generateXMLForNamespace(const NamespaceDef *nd,FTextStream &ti)
   writeXMLDocBlock(t,nd->docFile(),nd->docLine(),nd,0,nd->documentation());
   t << "    </detaileddescription>" << endl;
   t << "    <location file=\""
-    << stripFromPath(nd->getDefFileName()) << "\" line=\""
+    << convertToXML(stripFromPath(nd->getDefFileName())) << "\" line=\""
     << nd->getDefLine() << "\"" << " column=\""
     << nd->getDefColumn() << "\"/>" << endl ;
   t << "  </compounddef>" << endl;
@@ -1648,7 +1648,7 @@ static void generateXMLForFile(FileDef *fd,FTextStream &ti)
     writeXMLCodeBlock(t,fd);
     t << "    </programlisting>" << endl;
   }
-  t << "    <location file=\"" << stripFromPath(fd->getDefFileName()) << "\"/>" << endl;
+  t << "    <location file=\"" << convertToXML(stripFromPath(fd->getDefFileName())) << "\"/>" << endl;
   t << "  </compounddef>" << endl;
   t << "</doxygen>" << endl;
 
@@ -1762,7 +1762,7 @@ static void generateXMLForDir(DirDef *dd,FTextStream &ti)
   t << "    <detaileddescription>" << endl;
   writeXMLDocBlock(t,dd->docFile(),dd->docLine(),dd,0,dd->documentation());
   t << "    </detaileddescription>" << endl;
-  t << "    <location file=\"" << stripFromPath(dd->name()) << "\"/>" << endl; 
+  t << "    <location file=\"" << convertToXML(stripFromPath(dd->name())) << "\"/>" << endl;
   t << "  </compounddef>" << endl;
   t << "</doxygen>" << endl;
 
-- 
cgit v0.12


From d4a0825b1d00ead2ce441c3407d1983f80401353 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 14 Nov 2019 22:27:39 +0100
Subject: issue #7325: Endless loop in preprocessor due to #define A()

---
 src/pre.l | 63 +++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/pre.l b/src/pre.l
index 0aa54b9..1ee57a9 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -379,6 +379,7 @@ struct preYY_state
   bool               ccomment;
   QCString           delimiter;
   QDict<void>        allIncludes;
+  QDict<void>        expansionDict;
   DefineManager      defineManager;
   ConstExpressionParser constExpParser;
 };
@@ -1933,7 +1934,7 @@ static QCString extractTrailingComment(const char *s)
 static int getNextChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos);
 static int getCurrentChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint pos);
 static void unputChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos,char c);
-static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos);
+static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level);
 
 static QCString stringize(const QCString &s)
 {
@@ -2068,10 +2069,10 @@ static inline void addTillEndOfString(yyscan_t yyscanner,const QCString &expr,QC
  * The replacement string will be returned in \a result and the 
  * length of the (unexpanded) argument list is stored in \a len.
  */ 
-static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCString *rest,int pos,int &len,const Define *def,QCString &result)
+static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCString *rest,int pos,int &len,const Define *def,QCString &result,int level)
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
-  //printf("replaceFunctionMacro(expr=%s,rest=%s,pos=%d,def=%s) level=%d\n",expr.data(),rest ? rest->data() : 0,pos,def->name.data(),state->level);
+  //printf(">replaceFunctionMacro(expr='%s',rest='%s',pos=%d,def='%s') level=%d\n",expr.data(),rest ? rest->data() : 0,pos,def->name.data(),state->level);
   uint j=pos;
   len=0;
   result.resize(0);
@@ -2225,7 +2226,7 @@ static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCStrin
     // substitution of all formal arguments
     QCString resExpr;
     const QCString d=def->definition.stripWhiteSpace();
-    //printf("Macro definition: %s\n",d.data());
+    //printf("Macro definition: '%s'\n",d.data());
     bool inString=FALSE;
     while (k<d.length())
     {
@@ -2269,7 +2270,10 @@ static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCStrin
 	    //printf("substArg='%s'\n",substArg.data());
 	    // only if no ## operator is before or after the argument
 	    // marker we do macro expansion.
-	    if (!hash) expandExpression(yyscanner,substArg,0,0);
+	    if (!hash)
+            {
+              expandExpression(yyscanner,substArg,0,0,level+1);
+            }
 	    if (inString)
 	    {
 	      //printf("'%s'=stringize('%s')\n",stringize(*subst).data(),subst->data());
@@ -2311,10 +2315,10 @@ static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCStrin
     }
     len=j-pos;
     result=resExpr;
-    //printf("result after substitution '%s' expr='%s'\n",
-    //       result.data(),expr.mid(pos,len).data());
+    //printf("<replaceFunctionMacro(expr='%s',rest='%s',pos=%d,def='%s',result='%s') level=%d return=TRUE\n",expr.data(),rest ? rest->data() : 0,pos,def->name.data(),result.data(),state->level);
     return TRUE;
   }
+  //printf("<replaceFunctionMacro(expr='%s',rest='%s',pos=%d,def='%s',result='%s') level=%d return=FALSE\n",expr.data(),rest ? rest->data() : 0,pos,def->name.data(),result.data(),state->level);
   return FALSE;
 }
 
@@ -2380,13 +2384,19 @@ static int getNextId(const QCString &expr,int p,int *l)
 /*! performs recursive macro expansion on the string \a expr
  *  starting at position \a pos.
  *  May read additional characters from the input while re-scanning!
- *  If \a expandAll is \c TRUE then all macros in the expression are
- *  expanded, otherwise only the first is expanded.
  */
-static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos)
+static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level)
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
-  //printf("expandExpression(%s,%s)\n",expr.data(),rest ? rest->data() : 0);
+  printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos, level);
+  if (state->expansionDict.find(expr)!=0) // check for recursive expansions
+  {
+    return;
+  }
+  else
+  {
+    state->expansionDict.insert(expr,(void*)0x8);
+  }
   QCString macroName;
   QCString expMacro;
   bool definedTest=FALSE;
@@ -2395,7 +2405,7 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
   {
     bool replaced=FALSE;
     macroName=expr.mid(p,l);
-    //printf("macroName=%s\n",macroName.data());
+    //printf(" p=%d macroName=%s\n",p,macroName.data());
     if (p<2 || !(expr.at(p-2)=='@' && expr.at(p-1)=='-')) // no-rescan marker?
     {
       if (state->expandedDict->find(macroName)==0) // expand macro
@@ -2432,29 +2442,33 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
 	}
 	else if (def && def->nargs>=0) // function macro
 	{
-	  replaced=replaceFunctionMacro(yyscanner,expr,rest,p+l,len,def,expMacro);
+          //printf(" >>>> call replaceFunctionMacro\n");
+	  replaced=replaceFunctionMacro(yyscanner,expr,rest,p+l,len,def,expMacro,level);
+          //printf(" <<<< call replaceFunctionMacro: replaced=%d\n",replaced);
 	  len+=l;
 	}
+        //printf(" macroName='%s' expMacro='%s' replaced=%d\n",macroName.data(),expMacro.data(),replaced);
 
 	if (replaced) // expand the macro and rescan the expression
 	{
-	  //printf("replacing '%s'->'%s'\n",expr.mid(p,len).data(),expMacro.data());
+	  //printf(" replacing '%s'->'%s'\n",expr.mid(p,len).data(),expMacro.data());
 	  QCString resultExpr=expMacro;
 	  QCString restExpr=expr.right(expr.length()-len-p);
 	  processConcatOperators(resultExpr);
+          //printf(" macroName=%s def->nonRecursive=%d\n",macroName.data(),def->nonRecursive);
 	  if (def && !def->nonRecursive)
 	  {
 	    state->expandedDict->insert(macroName,def);
-	    expandExpression(yyscanner,resultExpr,&restExpr,0);
+	    expandExpression(yyscanner,resultExpr,&restExpr,0,level+1);
 	    state->expandedDict->remove(macroName);
 	  }
 	  expr=expr.left(p)+resultExpr+restExpr;
+	  //printf(" new expression: '%s' old i=%d new i=%d\n",expr.data(),i,p);
 	  i=p;
-	  //printf("new expression: %s\n",expr.data());
 	}
 	else // move to the next macro name
 	{
-	  //printf("moving to the next macro old=%d new=%d\n",i,p+l);
+	  //printf(" moving to the next macro old i=%d new i=%d\n",i,p+l);
 	  i=p+l;
 	}
       }
@@ -2472,6 +2486,7 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
       i=p+l;
     }
   }
+  printf("<expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos,level);
 }
 
 /*! @brief Process string or character literal.
@@ -2700,7 +2715,8 @@ static bool computeExpression(yyscan_t yyscanner,const QCString &expr)
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
   QCString e=expr;
-  expandExpression(yyscanner,e,0,0);
+  state->expansionDict.clear();
+  expandExpression(yyscanner,e,0,0,0);
   //printf("after expansion '%s'\n",e.data());
   e = removeIdsAndMarkers(e);
   if (e.isEmpty()) return FALSE;
@@ -2714,8 +2730,10 @@ static bool computeExpression(yyscan_t yyscanner,const QCString &expr)
 
 static QCString expandMacro(yyscan_t yyscanner,const QCString &name)
 {
+  YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
   QCString n=name;
-  expandExpression(yyscanner,n,0,0);
+  state->expansionDict.clear();
+  expandExpression(yyscanner,n,0,0,0);
   n=removeMarkers(n);
   //printf("expandMacro '%s'->'%s'\n",name.data(),n.data());
   return n;
@@ -2750,7 +2768,7 @@ static void addDefine(yyscan_t yyscanner)
                       // conditional section (cond command) that is disabled.
   if (!Doxygen::gatherDefines) return;
 
-  //printf("addDefine %s %s\n",state->defName.data(),state->defArgsStr.data());
+  //printf("addDefine '%s' '%s'\n",state->defName.data(),state->defArgsStr.data());
   //ArgumentList *al = new ArgumentList;
   //stringToArgumentList(state->defArgsStr,al);
   MemberDef *md=createMemberDef(
@@ -3180,6 +3198,11 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output
   yyscan_t yyscanner = p->yyscanner;
   YY_EXTRA_TYPE state = preYYget_extra(p->yyscanner);
   struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+
+#ifdef FLEX_DEBUG
+  preYYset_debug(1,yyscanner);
+#endif
+
   printlex(yy_flex_debug, TRUE, __FILE__, fileName);
   uint orgOffset=output.curPos();
   //printf("##########################\n%s\n####################\n",
-- 
cgit v0.12


From 4d173a0b2e13b2cd26c996894480afc65d50cd87 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 15 Nov 2019 15:39:42 +0100
Subject: HHC and directory elements starting with "."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on the question 'Doxygen failed to run html help compiler, hhc.exe error HHC5010 when running from folder that has a parent folder that starts with “.”/ (https://stackoverflow.com/questions/58861908/doxygen-failed-to-run-html-help-compiler-hhc-exe-error-hhc5010-when-running-fro).

In we https://social.msdn.microsoft.com/Forums/en-US/0681145c-223b-498c-b7bf-be83209cbf4e/issue-with-html-workshop-in-a-windows-container?forum=visualstudiogeneral see:
HTML Help 1.x command line compiler hhc.exe cannot compile CHM file to folder whose full path contains folder name starting with dot. If you have that problem, you probably specified output path with folder starting with dot, e.g. "d:\My files.NET\documentation". You can use dots in folder names but not at the beginning.

We first convert the current path to a short name path and set this as current directory, this is only done on Windows other systems are not touched.
---
 src/doxygen.cpp  |  1 +
 src/portable.cpp | 17 +++++++++++++++++
 src/portable.h   |  2 ++
 3 files changed, 20 insertions(+)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index c622f78..b4a4deb 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11862,6 +11862,7 @@ void generateOutput()
     g_s.begin("Running html help compiler...\n");
     QString oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
+    portable_setShortDir();
     portable_sysTimerStart();
     if (portable_system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
     {
diff --git a/src/portable.cpp b/src/portable.cpp
index c6e829d..b447adc 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -478,3 +478,20 @@ void portable_unlink(const char *fileName)
 #endif
 }
 
+void portable_setShortDir(void)
+{
+#if defined(_WIN32) && !defined(__CYGWIN__)
+  long     length = 0;
+  TCHAR*   buffer = NULL;
+  // First obtain the size needed by passing NULL and 0.
+  length = GetShortPathName(QDir::currentDirPath().data(), NULL, 0);
+  // Dynamically allocate the correct size
+  // (terminating null char was included in length)
+  buffer = new TCHAR[length];
+  // Now simply call again using same (long) path.
+  length = GetShortPathName(QDir::currentDirPath().data(), buffer, length);
+  // Set the correct directory (short name)
+  QDir::setCurrent(buffer);
+  delete [] buffer;
+#endif
+}
diff --git a/src/portable.h b/src/portable.h
index 83f90ef..c1b8c29 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -4,6 +4,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <qglobal.h>
+#include <qdir.h>
 
 #if defined(_WIN32)
 typedef __int64 portable_off_t;
@@ -37,6 +38,7 @@ double         portable_getSysElapsedTime();
 void           portable_sleep(int ms);
 bool           portable_isAbsolutePath(const char *fileName);
 void           portable_correct_path(void);
+void           portable_setShortDir(void);
 
 extern "C" {
   void *         portable_iconv_open(const char* tocode, const char* fromcode);
-- 
cgit v0.12


From caea19d73d20faadddeab5ea23199fb3d6e306de Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 16 Nov 2019 12:46:40 +0100
Subject: remove debug prints

---
 src/pre.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pre.l b/src/pre.l
index 1ee57a9..0652dbb 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2388,7 +2388,7 @@ static int getNextId(const QCString &expr,int p,int *l)
 static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level)
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
-  printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos, level);
+  //printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos, level);
   if (state->expansionDict.find(expr)!=0) // check for recursive expansions
   {
     return;
@@ -2486,7 +2486,7 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
       i=p+l;
     }
   }
-  printf("<expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos,level);
+  //printf("<expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos,level);
 }
 
 /*! @brief Process string or character literal.
-- 
cgit v0.12


From 15a47ccc703c44d1355146a2744f1ccc38ee136f Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 16 Nov 2019 12:54:42 +0100
Subject: Fixed issue with "QGDict::hashAsciiKey: Invalid null key" in pre.l

---
 src/pre.l | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pre.l b/src/pre.l
index 0652dbb..8bde725 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2389,6 +2389,10 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
   //printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos, level);
+  if (expr.isEmpty())
+  {
+    return;
+  }
   if (state->expansionDict.find(expr)!=0) // check for recursive expansions
   {
     return;
-- 
cgit v0.12


From bc17f30dd77812177ec872f79e53d0556871d343 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 16 Nov 2019 13:45:21 +0100
Subject: issue #7403: xref versus namespace in multiple file

---
 src/definition.cpp  | 2 +-
 src/membergroup.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/definition.cpp b/src/definition.cpp
index f2b9018..80060ba 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -1606,7 +1606,7 @@ void DefinitionImpl::makePartOfGroup(GroupDef *gd)
 
 void DefinitionImpl::setRefItems(const std::vector<ListItemInfo> &sli)
 {
-  m_impl->xrefListItems = sli;
+  m_impl->xrefListItems.insert(m_impl->xrefListItems.end(), sli.cbegin(), sli.cend());
 }
 
 void DefinitionImpl::mergeRefItems(Definition *d)
diff --git a/src/membergroup.cpp b/src/membergroup.cpp
index da52d64..05c38c3 100644
--- a/src/membergroup.cpp
+++ b/src/membergroup.cpp
@@ -358,7 +358,7 @@ void MemberGroup::findSectionsInDocumentation(const Definition *d)
 
 void MemberGroup::setRefItems(const std::vector<ListItemInfo> &sli)
 {
-  m_xrefListItems = sli;
+  m_xrefListItems.insert(m_xrefListItems.end(), sli.cbegin(), sli.cend());
 }
 
 void MemberGroup::writeTagFile(FTextStream &tagFile)
@@ -370,5 +370,5 @@ void MemberGroup::writeTagFile(FTextStream &tagFile)
 
 void MemberGroupInfo::setRefItems(const std::vector<ListItemInfo> &sli)
 {
-  m_sli = sli;
+  m_sli.insert(m_sli.end(), sli.cbegin(), sli.cend());
 }
-- 
cgit v0.12


From 7acba2f316a6e8f02364d76ab96b7ff9e739aec1 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 16 Nov 2019 15:49:20 +0100
Subject: issue #7348 Better warning in case a graph would have been to large

---
 src/classdef.cpp        | 3 ++-
 src/dotcallgraph.cpp    | 9 +++++++--
 src/dotcallgraph.h      | 1 +
 src/dotclassgraph.cpp   | 7 ++++++-
 src/dotclassgraph.h     | 1 +
 src/dotincldepgraph.cpp | 8 ++++++--
 src/dotincldepgraph.h   | 1 +
 src/filedef.cpp         | 6 ++++--
 src/memberdef.cpp       | 6 ++++--
 9 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/classdef.cpp b/src/classdef.cpp
index cee8be9..fd24f0b 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1706,7 +1706,8 @@ void ClassDefImpl::writeInheritanceGraph(OutputList &ol) const
     DotClassGraph inheritanceGraph(this,Inheritance);
     if (inheritanceGraph.isTooBig())
     {
-       warn_uncond("Inheritance graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",name().data());
+       warn_uncond("Inheritance graph for '%s' not generated, too many nodes (%d), threshold is %d. Consider increasing DOT_GRAPH_MAX_NODES.\n",
+           name().data(), inheritanceGraph.numNodes(), Config_getInt(DOT_GRAPH_MAX_NODES));
     }
     else if (!inheritanceGraph.isTrivial())
     {
diff --git a/src/dotcallgraph.cpp b/src/dotcallgraph.cpp
index 15d408a..b024f09 100644
--- a/src/dotcallgraph.cpp
+++ b/src/dotcallgraph.cpp
@@ -212,6 +212,11 @@ bool DotCallGraph::isTrivial() const
 
 bool DotCallGraph::isTooBig() const
 {
-  int numNodes = m_startNode->children() ? m_startNode->children()->count() : 0;
-  return numNodes>=DOT_GRAPH_MAX_NODES;
+  return numNodes()>=DOT_GRAPH_MAX_NODES;
 }
+
+int DotCallGraph::numNodes() const
+{
+  return m_startNode->children() ? m_startNode->children()->count() : 0;
+}
+
diff --git a/src/dotcallgraph.h b/src/dotcallgraph.h
index c96b9cf..bba976c 100644
--- a/src/dotcallgraph.h
+++ b/src/dotcallgraph.h
@@ -28,6 +28,7 @@ class DotCallGraph : public DotGraph
     ~DotCallGraph();
     bool isTrivial() const;
     bool isTooBig() const;
+    int numNodes() const;
     QCString writeGraph(FTextStream &t, GraphOutputFormat gf, EmbeddedOutputFormat ef,
                         const char *path,const char *fileName,
                         const char *relPath,bool writeImageMap=TRUE,
diff --git a/src/dotclassgraph.cpp b/src/dotclassgraph.cpp
index 3f5d228..da272b4 100644
--- a/src/dotclassgraph.cpp
+++ b/src/dotclassgraph.cpp
@@ -420,13 +420,18 @@ bool DotClassGraph::isTrivial() const
 
 bool DotClassGraph::isTooBig() const
 {
+  return numNodes()>=DOT_GRAPH_MAX_NODES;
+}
+
+int DotClassGraph::numNodes() const
+{
   int numNodes = 0;
   numNodes+= m_startNode->children() ? m_startNode->children()->count() : 0;
   if (m_graphType==Inheritance)
   {
     numNodes+= m_startNode->parents() ? m_startNode->parents()->count() : 0;
   }
-  return numNodes>=DOT_GRAPH_MAX_NODES;
+  return numNodes;
 }
 
 DotClassGraph::~DotClassGraph()
diff --git a/src/dotclassgraph.h b/src/dotclassgraph.h
index b3b9291..1874f54 100644
--- a/src/dotclassgraph.h
+++ b/src/dotclassgraph.h
@@ -28,6 +28,7 @@ public:
   ~DotClassGraph();
   bool isTrivial() const;
   bool isTooBig() const;
+  int numNodes() const;
   QCString writeGraph(FTextStream &t,GraphOutputFormat gf,EmbeddedOutputFormat ef,
     const char *path, const char *fileName, const char *relPath,
     bool TBRank=TRUE,bool imageMap=TRUE,int graphId=-1);
diff --git a/src/dotincldepgraph.cpp b/src/dotincldepgraph.cpp
index 23588db..05a96d9 100644
--- a/src/dotincldepgraph.cpp
+++ b/src/dotincldepgraph.cpp
@@ -213,8 +213,12 @@ bool DotInclDepGraph::isTrivial() const
 
 bool DotInclDepGraph::isTooBig() const
 {
-  int numNodes = m_startNode->children() ? m_startNode->children()->count() : 0;
-  return numNodes>=Config_getInt(DOT_GRAPH_MAX_NODES);
+  return numNodes()>=Config_getInt(DOT_GRAPH_MAX_NODES);
+}
+
+int DotInclDepGraph::numNodes() const
+{
+  return m_startNode->children() ? m_startNode->children()->count() : 0;
 }
 
 void DotInclDepGraph::writeXML(FTextStream &t)
diff --git a/src/dotincldepgraph.h b/src/dotincldepgraph.h
index b664ccb..5807ce8 100644
--- a/src/dotincldepgraph.h
+++ b/src/dotincldepgraph.h
@@ -32,6 +32,7 @@ class DotInclDepGraph : public DotGraph
                         bool writeImageMap=TRUE,int graphId=-1);
     bool isTrivial() const;
     bool isTooBig() const;
+    int numNodes() const;
     void writeXML(FTextStream &t);
     void writeDocbook(FTextStream &t);
 
diff --git a/src/filedef.cpp b/src/filedef.cpp
index f00c82b..346fb62 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -664,7 +664,8 @@ void FileDefImpl::writeIncludeGraph(OutputList &ol)
     DotInclDepGraph incDepGraph(this,FALSE);
     if (incDepGraph.isTooBig())
     {
-       warn_uncond("Include graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",name().data());
+       warn_uncond("Include graph for '%s' not generated, too many nodes (%d), threshold is %d. Consider increasing DOT_GRAPH_MAX_NODES.\n",
+           name().data(), incDepGraph.numNodes(), Config_getInt(DOT_GRAPH_MAX_NODES));
     }
     else if (!incDepGraph.isTrivial())
     {
@@ -688,7 +689,8 @@ void FileDefImpl::writeIncludedByGraph(OutputList &ol)
     DotInclDepGraph incDepGraph(this,TRUE);
     if (incDepGraph.isTooBig())
     {
-       warn_uncond("Included by graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",name().data());
+       warn_uncond("Included by graph for '%s' not generated, too many nodes (%d), threshold is %d. Consider increasing DOT_GRAPH_MAX_NODES.\n",
+           name().data(), incDepGraph.numNodes(), Config_getInt(DOT_GRAPH_MAX_NODES));
     }
     else if (!incDepGraph.isTrivial())
     {
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 9b6967b..840dd78 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2877,7 +2877,8 @@ void MemberDefImpl::_writeCallGraph(OutputList &ol) const
     DotCallGraph callGraph(this,FALSE);
     if (callGraph.isTooBig())
     {
-       warn_uncond("Call graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",qPrint(qualifiedName()));
+       warn_uncond("Call graph for '%s' not generated, too many nodes (%d), threshold is %d. Consider increasing DOT_GRAPH_MAX_NODES.\n",
+           qPrint(qualifiedName()), callGraph.numNodes(), Config_getInt(DOT_GRAPH_MAX_NODES));
     }
     else if (!callGraph.isTrivial())
     {
@@ -2900,7 +2901,8 @@ void MemberDefImpl::_writeCallerGraph(OutputList &ol) const
     DotCallGraph callerGraph(this, TRUE);
     if (callerGraph.isTooBig())
     {
-       warn_uncond("Caller graph for '%s' not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.\n",qPrint(qualifiedName()));
+       warn_uncond("Caller graph for '%s' not generated, too many nodes (%d), threshold is %d. Consider increasing DOT_GRAPH_MAX_NODES.\n",
+           qPrint(qualifiedName()), callerGraph.numNodes(), Config_getInt(DOT_GRAPH_MAX_NODES));
     }
     else if (!callerGraph.isTrivial())
     {
-- 
cgit v0.12


From 2972f6ddc491f615f814b1277ec715b6f707c419 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 17 Nov 2019 13:15:09 +0100
Subject: Made commentcnv.l reentrant

---
 src/commentcnv.l | 959 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 493 insertions(+), 466 deletions(-)

diff --git a/src/commentcnv.l b/src/commentcnv.l
index 3e5faba..14abb8f 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -16,6 +16,8 @@
  */
 %option never-interactive
 %option prefix="commentcnvYY"
+%option reentrant
+%option extra-type="struct commentcnvYY_state *"
 
 %{
 
@@ -41,8 +43,8 @@
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
 
-#define ADDCHAR(c)    g_outBuf->addChar(c)
-#define ADDARRAY(a,s) g_outBuf->addArray(a,s)
+#define ADDCHAR(c)    yyextra->outBuf->addChar(c)
+#define ADDARRAY(a,s) yyextra->outBuf->addArray(a,s)
   
 struct CondCtx
 {
@@ -60,182 +62,60 @@ struct CommentCtx
   int lineNr;
 };
   
-static BufStr * g_inBuf;
-static BufStr * g_outBuf;
-static int      g_inBufPos;
-static int      g_col;
-static int      g_blockHeadCol;
-static bool     g_mlBrief;
-static int      g_readLineCtx;
-static bool     g_skip;
-static QCString g_fileName;
-static int      g_lineNr;
-static int      g_condCtx;
-static QStack<CondCtx> g_condStack;
-static QStack<CommentCtx> g_commentStack;
-static QCString g_blockName;
-static int      g_lastCommentContext;
-static bool     g_inSpecialComment;
-static bool     g_inRoseComment;
-static int      g_stringContext;
-static int      g_charContext;
-static int      g_javaBlock;
-static bool     g_specialComment;
+struct commentcnvYY_state
+{
+  BufStr * inBuf = 0;
+  BufStr * outBuf = 0;
+  int      inBufPos = 0;
+  int      col = 0;
+  int      blockHeadCol = 0;
+  bool     mlBrief = FALSE;
+  int      readLineCtx = 0;
+  bool     skip = FALSE;
+  QCString fileName;
+  int      lineNr = 0;
+  int      condCtx = 0;
+  QStack<CondCtx> condStack;
+  QStack<CommentCtx> commentStack;
+  QCString blockName;
+  int      lastCommentContext = 0;
+  bool     inSpecialComment = FALSE;
+  bool     inRoseComment= FALSE;
+  int      stringContext = 0;
+  int      charContext = 0;
+  int      javaBlock = 0;
+  bool     specialComment = FALSE;
 
-static QCString g_aliasString;
-static int      g_blockCount;
-static bool     g_lastEscaped;
-static int      g_lastBlockContext;
-static bool     g_pythonDocString;
-static int      g_nestingCount;
+  QCString aliasString;
+  int      blockCount = 0;
+  bool     lastEscaped = FALSE;
+  int      lastBlockContext= 0;
+  bool     pythonDocString = FALSE;
+  int      nestingCount= 0;
 
-static bool     g_vhdl; // for VHDL old style --! comment
+  bool     vhdl = FALSE; // for VHDL old style --! comment
 
-static SrcLangExt g_lang;
-static bool       isFixedForm; // For Fortran
+  SrcLangExt lang = SrcLangExt_Unknown;
+  bool       isFixedForm = FALSE; // For Fortran
+};
 
 static const char *stateToString(int state);
+static inline int computeIndent(const char *s);
 
-static void replaceCommentMarker(const char *s,int len)
-{
-  const char *p=s;
-  char c;
-  // copy leading blanks
-  while ((c=*p) && (c==' ' || c=='\t' || c=='\n')) 
-  {
-    ADDCHAR(c);
-    g_lineNr += c=='\n';
-    p++;
-  }
-  // replace start of comment marker by blanks and the last character by a *
-  int blanks=0;
-  while ((c=*p) && (c=='/' || c=='!' || c=='#')) 
-  {
-    blanks++;
-    p++;
-    if (*p=='<') // comment-after-item marker 
-    { 
-      blanks++;
-      p++; 
-    }
-    if (c=='!') // end after first !
-    {
-      break;
-    }
-  }
-  if (blanks>0)
-  {
-    while (blanks>2)
-    {
-      ADDCHAR(' ');
-      blanks--;
-    }
-    if (blanks>1) ADDCHAR('*');
-    ADDCHAR(' ');
-  }
-  // copy comment line to output
-  ADDARRAY(p,len-(int)(p-s));
-}
+static void replaceCommentMarker(yyscan_t yyscanner,const char *s,int len);
+static inline void copyToOutput(yyscan_t yyscanner,const char *s,int len);
+static void startCondSection(yyscan_t yyscanner,const char *sectId);
+static void endCondSection(yyscan_t yyscanner);
+static void replaceAliases(yyscan_t yyscanner,const char *s);
+static int yyread(yyscan_t yyscanner,char *buf,int max_size);
+static void replaceComment(yyscan_t yyscanner,int offset);
 
-static inline int computeIndent(const char *s)
-{
-  int col=0;
-  static int tabSize=Config_getInt(TAB_SIZE);
-  const char *p=s;
-  char c;
-  while ((c=*p++))
-  {
-    if (c==' ') col++;
-    else if (c=='\t') col+=tabSize-(col%tabSize); 
-    else break;
-  }
-  return col;
-}
 
-static inline void copyToOutput(const char *s,int len)
-{
-  int i;
-  if (g_skip) // only add newlines.
-  {
-    for (i=0;i<len;i++) 
-    {
-      if (s[i]=='\n') 
-      {
-	ADDCHAR('\n');
-	//fprintf(stderr,"---> skip %d\n",g_lineNr);
-	g_lineNr++;
-      }
-    }
-  }
-  else if (len>0)
-  {
-    ADDARRAY(s,len);
-    static int tabSize=Config_getInt(TAB_SIZE);
-    for (i=0;i<len;i++) 
-    {
-      switch (s[i])
-      {
-	case '\n': g_col=0; 
-	           //fprintf(stderr,"---> copy %d\n",g_lineNr);
-		   g_lineNr++; break;
-	case '\t': g_col+=tabSize-(g_col%tabSize); break;
-	default:   g_col++; break;
-      }
-    }
-  }
-}
-
-static void startCondSection(const char *sectId)
-{
-  //printf("startCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
-  CondParser prs;
-  bool expResult = prs.parse(g_fileName,g_lineNr,sectId);
-  g_condStack.push(new CondCtx(g_lineNr,sectId,g_skip));
-  if (!expResult) // not enabled
-  {
-    g_skip=TRUE;
-  }
-}
-
-static void endCondSection()
-{
-  if (g_condStack.isEmpty())
-  {
-    warn(g_fileName,g_lineNr,"Found \\endcond command without matching \\cond");
-    g_skip=FALSE;
-  }
-  else
-  {
-    CondCtx *ctx = g_condStack.pop();
-    g_skip=ctx->skip;
-  }
-  //printf("endCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
-}
-
-/** copies string \a s with length \a len to the output, while 
- *  replacing any alias commands found in the string.
- */
-static void replaceAliases(const char *s)
-{
-  QCString result = resolveAliasCmd(s);
-  //printf("replaceAliases(%s)->'%s'\n",s,result.data());
-  copyToOutput(result,result.length());
-}
 
 
 #undef  YY_INPUT
-#define YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
+#define YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
 
-static int yyread(char *buf,int max_size)
-{
-  int bytesInBuf = g_inBuf->curPos()-g_inBufPos;
-  int bytesToCopy = QMIN(max_size,bytesInBuf);
-  memcpy(buf,g_inBuf->data()+g_inBufPos,bytesToCopy);
-  g_inBufPos+=bytesToCopy;
-  return bytesToCopy;
-}
-
-void replaceComment(int offset);
 
 %}
 
@@ -255,55 +135,55 @@ void replaceComment(int offset);
 %%
 
 <Scan>[^"'!\/\n\\#,\-]*             { /* eat anything that is not " / , or \n */
-                                       copyToOutput(yytext,(int)yyleng);
+                                       copyToOutput(yyscanner,yytext,(int)yyleng);
                                     }
 <Scan>[,]                           { /* eat , so we have a nice separator in long initialization lines */ 
-                                       copyToOutput(yytext,(int)yyleng);
+                                       copyToOutput(yyscanner,yytext,(int)yyleng);
                                     }
 <Scan>"\"\"\""!                     { /* start of python long comment */
-                                     if (g_lang!=SrcLangExt_Python)
+                                     if (yyextra->lang!=SrcLangExt_Python)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       g_pythonDocString = TRUE;
-                                       g_nestingCount=1;
-                                       g_commentStack.clear(); /*  to be on the save side */
-                                       copyToOutput(yytext,(int)yyleng);
+                                       yyextra->pythonDocString = TRUE;
+                                       yyextra->nestingCount=1;
+                                       yyextra->commentStack.clear(); /*  to be on the save side */
+                                       copyToOutput(yyscanner,yytext,(int)yyleng);
 				       BEGIN(CComment);
-                                       g_commentStack.push(new CommentCtx(g_lineNr));
+                                       yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				     }
                                    }
 <Scan>![><!]/.*\n	   {
-                                     if (g_lang!=SrcLangExt_Fortran)
+                                     if (yyextra->lang!=SrcLangExt_Fortran)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       copyToOutput(yytext,(int)yyleng); 
-                                       g_nestingCount=0; // Fortran doesn't have an end comment
-                                       g_commentStack.clear(); /*  to be on the save side */
+                                       copyToOutput(yyscanner,yytext,(int)yyleng); 
+                                       yyextra->nestingCount=0; // Fortran doesn't have an end comment
+                                       yyextra->commentStack.clear(); /*  to be on the save side */
 				       BEGIN(CComment);
-                                       g_commentStack.push(new CommentCtx(g_lineNr));
+                                       yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				     }
   				   }
 <Scan>[Cc\*][><!]/.*\n	   {
-                                     if (g_lang!=SrcLangExt_Fortran)
+                                     if (yyextra->lang!=SrcLangExt_Fortran)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
                                        /* check for fixed format; we might have some conditional as part of multiline if like C<5 .and. & */
-                                       if (isFixedForm && (g_col == 0))
+                                       if (yyextra->isFixedForm && (yyextra->col == 0))
                                        {
-                                         copyToOutput(yytext,(int)yyleng); 
-                                         g_nestingCount=0; // Fortran doesn't have an end comment
-                                         g_commentStack.clear(); /* to be on the safe side */
+                                         copyToOutput(yyscanner,yytext,(int)yyleng); 
+                                         yyextra->nestingCount=0; // Fortran doesn't have an end comment
+                                         yyextra->commentStack.clear(); /* to be on the safe side */
 				         BEGIN(CComment);
-                                         g_commentStack.push(new CommentCtx(g_lineNr));
+                                         yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				       }
 				       else
 				       {
@@ -312,25 +192,25 @@ void replaceComment(int offset);
 				     }
   				   }
 <Scan>!.*\n		   {
-  			             if (g_lang!=SrcLangExt_Fortran)
+  			             if (yyextra->lang!=SrcLangExt_Fortran)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       copyToOutput(yytext,(int)yyleng); 
+                                       copyToOutput(yyscanner,yytext,(int)yyleng); 
 				     }
                                    }
 <Scan>[Cc\*].*\n		   {
-  			             if (g_lang!=SrcLangExt_Fortran)
+  			             if (yyextra->lang!=SrcLangExt_Fortran)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       if (g_col == 0)
+                                       if (yyextra->col == 0)
                                        {
-                                         copyToOutput(yytext,(int)yyleng); 
+                                         copyToOutput(yyscanner,yytext,(int)yyleng); 
 				       }
 				       else
 				       {
@@ -339,24 +219,24 @@ void replaceComment(int offset);
 				     }
                                    }
 <Scan>"\""                         { /* start of a string */ 
-                                     copyToOutput(yytext,(int)yyleng); 
-				     g_stringContext = YY_START;
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->stringContext = YY_START;
 				     BEGIN(SkipString); 
                                    }
 <Scan>'				   {
-                                     copyToOutput(yytext,(int)yyleng); 
-				     g_charContext = YY_START;
-                                     if (g_lang!=SrcLangExt_VHDL)
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->charContext = YY_START;
+                                     if (yyextra->lang!=SrcLangExt_VHDL)
                                      {
 				       BEGIN(SkipChar);
                                      }
   				   }
 <Scan>\n                           { /* new line */ 
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <Scan>"//!"/.*\n[ \t]*"//"[\/!][^\/] | /* start C++ style special comment block */
 <Scan>("///"[/]*)/[^/].*\n[ \t]*"//"[\/!][^\/] { /* start C++ style special comment block */
-  				     if (g_mlBrief) 
+  				     if (yyextra->mlBrief) 
 				     {
 				       REJECT; // bail out if we do not need to convert
 				     }
@@ -367,190 +247,190 @@ void replaceComment(int offset);
 				       {
 					 while (i<(int)yyleng && yytext[i]=='/') i++;
 				       }
-				       g_blockHeadCol=g_col;
-				       copyToOutput("/**",3); 
-				       replaceAliases(yytext+i);
-				       g_inSpecialComment=TRUE;
+				       yyextra->blockHeadCol=yyextra->col;
+				       copyToOutput(yyscanner,"/**",3); 
+				       replaceAliases(yyscanner,yytext+i);
+				       yyextra->inSpecialComment=TRUE;
 				       //BEGIN(SComment); 
-				       g_readLineCtx=SComment;
+				       yyextra->readLineCtx=SComment;
 				       BEGIN(ReadLine);
 				     }
                                    }
 <Scan>"//##Documentation".*/\n	   { /* Start of Rational Rose ANSI C++ comment block */
-                                     if (g_mlBrief) REJECT;
+                                     if (yyextra->mlBrief) REJECT;
                                      int i=17; //=strlen("//##Documentation");
-				     g_blockHeadCol=g_col;
-				     copyToOutput("/**",3);
-				     replaceAliases(yytext+i);
-				     g_inRoseComment=TRUE;
+				     yyextra->blockHeadCol=yyextra->col;
+				     copyToOutput(yyscanner,"/**",3);
+				     replaceAliases(yyscanner,yytext+i);
+				     yyextra->inRoseComment=TRUE;
 				     BEGIN(SComment);
   				   }
 <Scan>"//"[!\/]/.*\n[ \t]*"//"[|\/][ \t]*[@\\]"}" { // next line contains an end marker, see bug 752712
-				     g_inSpecialComment=yytext[2]=='/' || yytext[2]=='!';
-  				     copyToOutput(yytext,(int)yyleng); 
-				     g_readLineCtx=YY_START;
+				     yyextra->inSpecialComment=yytext[2]=='/' || yytext[2]=='!';
+  				     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->readLineCtx=YY_START;
 				     BEGIN(ReadLine);
                                    }
 <Scan>"//"/.*\n	                   { /* one line C++ comment */ 
-				     g_inSpecialComment=yytext[2]=='/' || yytext[2]=='!';
-  				     copyToOutput(yytext,(int)yyleng); 
-				     g_readLineCtx=YY_START;
+				     yyextra->inSpecialComment=yytext[2]=='/' || yytext[2]=='!';
+  				     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->readLineCtx=YY_START;
 				     BEGIN(ReadLine);
 				   }
 <Scan>"/**/"                       { /* avoid matching next rule for empty C comment, see bug 711723 */
-                                     copyToOutput(yytext,(int)yyleng);
+                                     copyToOutput(yyscanner,yytext,(int)yyleng);
                                    }
 <Scan>"/*"[*!]?			   { /* start of a C comment */
-                                     if ((g_lang==SrcLangExt_Python) || (g_lang==SrcLangExt_Tcl))
+                                     if ((yyextra->lang==SrcLangExt_Python) || (yyextra->lang==SrcLangExt_Tcl))
 				     {
 				       REJECT;
                                      }
-  			             g_specialComment=(int)yyleng==3;
-                                     g_nestingCount=1;
-                                     g_commentStack.clear(); /*  to be on the save side */
-                                     copyToOutput(yytext,(int)yyleng); 
+  			             yyextra->specialComment=(int)yyleng==3;
+                                     yyextra->nestingCount=1;
+                                     yyextra->commentStack.clear(); /*  to be on the save side */
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
 				     BEGIN(CComment); 
-                                     g_commentStack.push(new CommentCtx(g_lineNr));
+                                     yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
                                    }
 <Scan>"#"("#")?		           {
-                                     if (g_lang!=SrcLangExt_Python)
+                                     if (yyextra->lang!=SrcLangExt_Python)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       copyToOutput(yytext,(int)yyleng); 
-                                       g_nestingCount=0; // Python doesn't have an end comment for #
-                                       g_commentStack.clear(); /*  to be on the save side */
+                                       copyToOutput(yyscanner,yytext,(int)yyleng); 
+                                       yyextra->nestingCount=0; // Python doesn't have an end comment for #
+                                       yyextra->commentStack.clear(); /*  to be on the save side */
 				       BEGIN(CComment);
-                                       g_commentStack.push(new CommentCtx(g_lineNr));
+                                       yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				     }
   				   }
 <Scan>"--!"		           {
-                                     if (g_lang!=SrcLangExt_VHDL)
+                                     if (yyextra->lang!=SrcLangExt_VHDL)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       g_vhdl = TRUE;
-                                       copyToOutput(yytext,(int)yyleng); 
-                                       g_nestingCount=0;  // VHDL doesn't have an end comment
-                                       g_commentStack.clear(); /*  to be on the save side */
+                                       yyextra->vhdl = TRUE;
+                                       copyToOutput(yyscanner,yytext,(int)yyleng); 
+                                       yyextra->nestingCount=0;  // VHDL doesn't have an end comment
+                                       yyextra->commentStack.clear(); /*  to be on the save side */
 				       BEGIN(CComment);
-                                       g_commentStack.push(new CommentCtx(g_lineNr));
+                                       yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				     }
   				   }
 <Scan>![><!]		           {
-                                     if (g_lang!=SrcLangExt_Fortran)
+                                     if (yyextra->lang!=SrcLangExt_Fortran)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       copyToOutput(yytext,(int)yyleng); 
-                                       g_nestingCount=0;  // Fortran doesn't have an end comment
-                                       g_commentStack.clear(); /*  to be on the save side */
+                                       copyToOutput(yyscanner,yytext,(int)yyleng); 
+                                       yyextra->nestingCount=0;  // Fortran doesn't have an end comment
+                                       yyextra->commentStack.clear(); /*  to be on the save side */
 				       BEGIN(CComment);
-                                       g_commentStack.push(new CommentCtx(g_lineNr));
+                                       yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				     }
   				   }
 <CComment>"{@code"/[ \t\n]	   {
-                                     copyToOutput("@code",5); 
-				     g_lastCommentContext = YY_START;
-				     g_javaBlock=1;
-				     g_blockName=&yytext[1];
+                                     copyToOutput(yyscanner,"@code",5); 
+				     yyextra->lastCommentContext = YY_START;
+				     yyextra->javaBlock=1;
+				     yyextra->blockName=&yytext[1];
                                      BEGIN(VerbatimCode);
   				   }
 <CComment,ReadLine>[\\@]("dot"|"code"|"msc"|"startuml")/[^a-z_A-Z0-9] { /* start of a verbatim block */
-                                     copyToOutput(yytext,(int)yyleng); 
-				     g_lastCommentContext = YY_START;
-				     g_javaBlock=0;
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->lastCommentContext = YY_START;
+				     yyextra->javaBlock=0;
                                      if (qstrcmp(&yytext[1],"startuml")==0)
                                      {
-                                       g_blockName="uml";
+                                       yyextra->blockName="uml";
                                      }
                                      else
                                      {
-				       g_blockName=&yytext[1];
+				       yyextra->blockName=&yytext[1];
                                      }
                                      BEGIN(VerbatimCode);
   				   }
 <CComment,ReadLine>[\\@]("f$"|"f["|"f{") {
-                                     copyToOutput(yytext,(int)yyleng); 
-				     g_blockName=&yytext[1];
-				     if (g_blockName.at(1)=='[')
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->blockName=&yytext[1];
+				     if (yyextra->blockName.at(1)=='[')
 				     {
-				       g_blockName.at(1)=']';
+				       yyextra->blockName.at(1)=']';
 				     }
-				     else if (g_blockName.at(1)=='{')
+				     else if (yyextra->blockName.at(1)=='{')
 				     {
-				       g_blockName.at(1)='}';
+				       yyextra->blockName.at(1)='}';
 				     }
-				     g_lastCommentContext = YY_START;
+				     yyextra->lastCommentContext = YY_START;
 				     BEGIN(Verbatim);
   			           }
 <CComment,ReadLine>[\\@]("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"docbookonly"|"rtfonly"|"manonly")/[^a-z_A-Z0-9] { /* start of a verbatim block */
-                                     copyToOutput(yytext,(int)yyleng); 
-				     g_blockName=&yytext[1];
-				     g_lastCommentContext = YY_START;
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->blockName=&yytext[1];
+				     yyextra->lastCommentContext = YY_START;
                                      BEGIN(Verbatim);
                                    }
 <Scan>.                            { /* any other character */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <Verbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endrtfonly"|"endmanonly"|"f$"|"f]"|"f}") { /* end of verbatim block */
-                                     copyToOutput(yytext,(int)yyleng);
-				     if (&yytext[1]==g_blockName) // end of formula
+                                     copyToOutput(yyscanner,yytext,(int)yyleng);
+				     if (&yytext[1]==yyextra->blockName) // end of formula
 				     {
-				       BEGIN(g_lastCommentContext);
+				       BEGIN(yyextra->lastCommentContext);
 				     }
-				     else if (&yytext[4]==g_blockName)
+				     else if (&yytext[4]==yyextra->blockName)
 				     {
-				       BEGIN(g_lastCommentContext);
+				       BEGIN(yyextra->lastCommentContext);
 				     }
                                    }
 <VerbatimCode>"{"		   {
-                                     if (g_javaBlock==0)
+                                     if (yyextra->javaBlock==0)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-				       g_javaBlock++;
-                                       copyToOutput(yytext,(int)yyleng);
+				       yyextra->javaBlock++;
+                                       copyToOutput(yyscanner,yytext,(int)yyleng);
 				     }
                                    }
 <VerbatimCode>"}"		   {
-                                     if (g_javaBlock==0)
+                                     if (yyextra->javaBlock==0)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-				       g_javaBlock--;
-				       if (g_javaBlock==0)
+				       yyextra->javaBlock--;
+				       if (yyextra->javaBlock==0)
 				       {
-                                         copyToOutput(" @endcode ",10);
-				         BEGIN(g_lastCommentContext);
+                                         copyToOutput(yyscanner," @endcode ",10);
+				         BEGIN(yyextra->lastCommentContext);
 				       }
 				       else
 				       {
-                                         copyToOutput(yytext,(int)yyleng);
+                                         copyToOutput(yyscanner,yytext,(int)yyleng);
 				       }
 				     }
   				   }
 <VerbatimCode>[\\@]("enddot"|"endcode"|"endmsc"|"enduml") { /* end of verbatim block */
-                                     copyToOutput(yytext,(int)yyleng);
-				     if (&yytext[4]==g_blockName)
+                                     copyToOutput(yyscanner,yytext,(int)yyleng);
+				     if (&yytext[4]==yyextra->blockName)
 				     {
-				       BEGIN(g_lastCommentContext);
+				       BEGIN(yyextra->lastCommentContext);
 				     }
                                    }
 <VerbatimCode>^[ \t]*"//"[\!\/]?   { /* skip leading comments */
-  				     if (!g_inSpecialComment)
+  				     if (!yyextra->inSpecialComment)
 				     {
-                                       copyToOutput(yytext,(int)yyleng); 
+                                       copyToOutput(yyscanner,yytext,(int)yyleng); 
 				     }
                                      else
                                      {
@@ -559,25 +439,25 @@ void replaceComment(int offset);
                                        {
                                          l++;
                                        }
-                                       copyToOutput(yytext,l);
+                                       copyToOutput(yyscanner,yytext,l);
                                        if (yyleng-l==3) // ends with //! or ///
                                        {
-                                         copyToOutput(" * ",3);
+                                         copyToOutput(yyscanner," * ",3);
                                        }
                                        else // ends with //
                                        {
-                                         copyToOutput("//",2);
+                                         copyToOutput(yyscanner,"//",2);
                                        }
                                      }
   				   }
 <Verbatim,VerbatimCode>[^@\/\\\n{}]* { /* any character not a backslash or new line or } */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <Verbatim,VerbatimCode>\n	   { /* new line in verbatim block */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <Verbatim>^[ \t]*"///"             {
-  				     if (g_blockName=="dot" || g_blockName=="msc" || g_blockName=="uml" || g_blockName.at(0)=='f')
+  				     if (yyextra->blockName=="dot" || yyextra->blockName=="msc" || yyextra->blockName=="uml" || yyextra->blockName.at(0)=='f')
 				     {
 				       // see bug 487871, strip /// from dot images and formulas.
                                        int l=0;
@@ -585,8 +465,8 @@ void replaceComment(int offset);
                                        {
                                          l++;
                                        }
-                                       copyToOutput(yytext,l);
-				       copyToOutput("   ",3);
+                                       copyToOutput(yyscanner,yytext,l);
+				       copyToOutput(yyscanner,"   ",3);
 				     }
 				     else // even slashes are verbatim (e.g. \verbatim, \code)
 				     {
@@ -594,119 +474,119 @@ void replaceComment(int offset);
 				     }
   				   }
 <Verbatim,VerbatimCode>.	   { /* any other character */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <SkipString>\\.                    { /* escaped character in string */
-                                     if (g_lang==SrcLangExt_Fortran)
+                                     if (yyextra->lang==SrcLangExt_Fortran)
                                      {
                                        unput(yytext[1]);
-                                       copyToOutput(yytext,1);
+                                       copyToOutput(yyscanner,yytext,1);
                                      }
                                      else
                                      {
-                                       copyToOutput(yytext,(int)yyleng);
+                                       copyToOutput(yyscanner,yytext,(int)yyleng);
                                      }
                                    }
 <SkipString>"\""       	           { /* end of string */ 
-                                     copyToOutput(yytext,(int)yyleng); 
-				     BEGIN(g_stringContext); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     BEGIN(yyextra->stringContext); 
                                    }
 <SkipString>.                      { /* any other string character */ 
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <SkipString>\n                     { /* new line inside string (illegal for some compilers) */ 
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <SkipChar>\\.		           { /* escaped character */
-                                     if (g_lang==SrcLangExt_Fortran)
+                                     if (yyextra->lang==SrcLangExt_Fortran)
                                      {
                                        unput(yytext[1]);
-                                       copyToOutput(yytext,1);
+                                       copyToOutput(yyscanner,yytext,1);
                                      }
                                      else
                                      {
-                                       copyToOutput(yytext,(int)yyleng);
+                                       copyToOutput(yyscanner,yytext,(int)yyleng);
                                      }
                                    }
 <SkipChar>'                        { /* end of character literal */ 
-                                     copyToOutput(yytext,(int)yyleng); 
-                                     BEGIN(g_charContext);
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
+                                     BEGIN(yyextra->charContext);
                                    }
 <SkipChar>.                        { /* any other string character */ 
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <SkipChar>\n                       { /* new line character */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 
 <CComment>[^\\!@*\n{\"\/]*           { /* anything that is not a '*' or command */ 
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <CComment>"*"+[^*/\\@\n{\"]*       { /* stars without slashes */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <CComment>"\"\"\""                 { /* end of Python docstring */
-                                     if (g_lang!=SrcLangExt_Python)
+                                     if (yyextra->lang!=SrcLangExt_Python)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       g_nestingCount--;
-                                       g_pythonDocString = FALSE;
-				       copyToOutput(yytext,(int)yyleng);
+                                       yyextra->nestingCount--;
+                                       yyextra->pythonDocString = FALSE;
+				       copyToOutput(yyscanner,yytext,(int)yyleng);
 				       BEGIN(Scan);
 				     }
   				   }
 <CComment>\n                       { /* new line in comment */
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                      /* in case of Fortran always end of comment */
-  				     if (g_lang==SrcLangExt_Fortran)
+  				     if (yyextra->lang==SrcLangExt_Fortran)
 				     {
 				       BEGIN(Scan);
 				     }
                                    }
 <CComment>"/"+"*"                  { /* nested C comment */
-                                     if ((g_lang==SrcLangExt_Python) || (g_lang==SrcLangExt_Tcl))
+                                     if ((yyextra->lang==SrcLangExt_Python) || (yyextra->lang==SrcLangExt_Tcl))
 				     {
 				       REJECT;
                                      }
-                                     g_nestingCount++;
-                                     g_commentStack.push(new CommentCtx(g_lineNr));
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     yyextra->nestingCount++;
+                                     yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <CComment>"*"+"/"                  { /* end of C comment */
-                                     if ((g_lang==SrcLangExt_Python) || (g_lang==SrcLangExt_Tcl))
+                                     if ((yyextra->lang==SrcLangExt_Python) || (yyextra->lang==SrcLangExt_Tcl))
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-				       copyToOutput(yytext,(int)yyleng);
-                                       g_nestingCount--;
-                                       if (g_nestingCount<=0)
+				       copyToOutput(yyscanner,yytext,(int)yyleng);
+                                       yyextra->nestingCount--;
+                                       if (yyextra->nestingCount<=0)
                                        {
 				         BEGIN(Scan);
                                        }
                                        else
                                        {
-                                         //g_nestingCount--;
-                                         delete g_commentStack.pop();
+                                         //yyextra->nestingCount--;
+                                         delete yyextra->commentStack.pop();
                                        }
 				     }
                                    }
   /* Python an VHDL share CComment, so special attention for ending comments is required */
 <CComment>"\n"/[ \t]*"#" 	   {
-                                     if (g_lang!=SrcLangExt_VHDL)
+                                     if (yyextra->lang!=SrcLangExt_VHDL)
                                      {
                                        REJECT;
                                      }
                                      else
                                      {
-                                       if (g_vhdl) // inside --! comment
+                                       if (yyextra->vhdl) // inside --! comment
                                        {
-                                         g_vhdl = FALSE;
-				         copyToOutput(yytext,(int)yyleng);
+                                         yyextra->vhdl = FALSE;
+				         copyToOutput(yyscanner,yytext,(int)yyleng);
 				         BEGIN(Scan);
                                        }
                                        else // C-type comment
@@ -716,35 +596,35 @@ void replaceComment(int offset);
                                      }
                                    }
 <CComment>"\n"/[ \t]*"-" 	   {
-                                     if (g_lang!=SrcLangExt_Python || g_pythonDocString)
+                                     if (yyextra->lang!=SrcLangExt_Python || yyextra->pythonDocString)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-				       copyToOutput(yytext,(int)yyleng);
+				       copyToOutput(yyscanner,yytext,(int)yyleng);
 				       BEGIN(Scan);
 				     }
                                    }
 <CComment>"\n"/[ \t]*[^ \t#\-] 	   {
-                                     if (g_lang==SrcLangExt_Python)
+                                     if (yyextra->lang==SrcLangExt_Python)
                                      {
-                                       if (g_pythonDocString)
+                                       if (yyextra->pythonDocString)
                                        {
                                          REJECT;
                                        }
                                        else
                                        {
-				         copyToOutput(yytext,(int)yyleng);
+				         copyToOutput(yyscanner,yytext,(int)yyleng);
 				         BEGIN(Scan);
                                        }
                                      }
-                                     else if (g_lang==SrcLangExt_VHDL)
+                                     else if (yyextra->lang==SrcLangExt_VHDL)
                                      {
-                                       if (g_vhdl) // inside --! comment
+                                       if (yyextra->vhdl) // inside --! comment
                                        {
-                                         g_vhdl = FALSE;
-				         copyToOutput(yytext,(int)yyleng);
+                                         yyextra->vhdl = FALSE;
+				         copyToOutput(yyscanner,yytext,(int)yyleng);
 				         BEGIN(Scan);
                                        }
                                        else // C-type comment
@@ -759,122 +639,122 @@ void replaceComment(int offset);
                                    }
    /* removed for bug 674842 (bug was introduced in rev 768)
 <CComment>"'"			   {
-  			             g_charContext = YY_START;
-				     copyToOutput(yytext,(int)yyleng);
+  			             yyextra->charContext = YY_START;
+				     copyToOutput(yyscanner,yytext,(int)yyleng);
 				     BEGIN(SkipChar);
   				   }
 <CComment>"\""			   {
-  			             g_stringContext = YY_START;
-				     copyToOutput(yytext,(int)yyleng);
+  			             yyextra->stringContext = YY_START;
+				     copyToOutput(yyscanner,yytext,(int)yyleng);
 				     BEGIN(SkipString);
   				   }
    */
 <CComment>.			   {
-                                     copyToOutput(yytext,(int)yyleng); 
+                                     copyToOutput(yyscanner,yytext,(int)yyleng); 
   				   }
 <SComment>^[ \t]*"///"[\/]*/\n     {
-  				     replaceComment(0);
+  				     replaceComment(yyscanner,0);
   				   }
 <SComment>\n[ \t]*"///"[\/]*/\n    {
-                                     replaceComment(1); 
+                                     replaceComment(yyscanner,1); 
                                    }
 <SComment>^[ \t]*"///"[^\/\n]/.*\n { 
-  				     replaceComment(0);
-				     g_readLineCtx=YY_START;
+  				     replaceComment(yyscanner,0);
+				     yyextra->readLineCtx=YY_START;
 				     BEGIN(ReadLine);
   				   }
 <SComment>\n[ \t]*"//"[\/!]("<")?[ \t]*[\\@]"}".*\n {   
                                      /* See Bug 752712: end the multiline comment when finding a @} or \} command */
-                                     copyToOutput(" */",3); 
-				     copyToOutput(yytext,(int)yyleng); 
-				     g_inSpecialComment=FALSE;
-				     g_inRoseComment=FALSE;
+                                     copyToOutput(yyscanner," */",3); 
+				     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->inSpecialComment=FALSE;
+				     yyextra->inRoseComment=FALSE;
 				     BEGIN(Scan); 
                                    }
 <SComment>\n[ \t]*"///"[^\/\n]/.*\n  { 
-                                     replaceComment(1); 
-				     g_readLineCtx=YY_START;
+                                     replaceComment(yyscanner,1); 
+				     yyextra->readLineCtx=YY_START;
 				     BEGIN(ReadLine);
   				   }
 <SComment>^[ \t]*"//!"             |    // just //!
 <SComment>^[ \t]*"//!<"/.*\n       |    // or   //!< something
 <SComment>^[ \t]*"//!"[^<]/.*\n    {    // or   //!something
-  				     replaceComment(0);
-				     g_readLineCtx=YY_START;
+  				     replaceComment(yyscanner,0);
+				     yyextra->readLineCtx=YY_START;
 				     BEGIN(ReadLine);
                                    }
 <SComment>\n[ \t]*"//!"            |
 <SComment>\n[ \t]*"//!<"/.*\n      |
 <SComment>\n[ \t]*"//!"[^<\n]/.*\n { 
-                                     replaceComment(1); 
-				     g_readLineCtx=YY_START;
+                                     replaceComment(yyscanner,1); 
+				     yyextra->readLineCtx=YY_START;
 				     BEGIN(ReadLine);
                                    }
 <SComment>^[ \t]*"//##"/.*\n       {
-                                     if (!g_inRoseComment)
+                                     if (!yyextra->inRoseComment)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-  				       replaceComment(0);
-				       g_readLineCtx=YY_START;
+  				       replaceComment(yyscanner,0);
+				       yyextra->readLineCtx=YY_START;
 				       BEGIN(ReadLine);
 				     }
                                    }
 <SComment>\n[ \t]*"//##"/.*\n      {
-                                     if (!g_inRoseComment)
+                                     if (!yyextra->inRoseComment)
 				     {
 				       REJECT;
 				     }
 				     else
 				     {
-                                       replaceComment(1); 
-				       g_readLineCtx=YY_START;
+                                       replaceComment(yyscanner,1); 
+				       yyextra->readLineCtx=YY_START;
 				       BEGIN(ReadLine);
 				     }
                                    }
 <SComment>\n			   { /* end of special comment */
-                                     copyToOutput(" */",3); 
-				     copyToOutput(yytext,(int)yyleng); 
-				     g_inSpecialComment=FALSE;
-				     g_inRoseComment=FALSE;
+                                     copyToOutput(yyscanner," */",3); 
+				     copyToOutput(yyscanner,yytext,(int)yyleng); 
+				     yyextra->inSpecialComment=FALSE;
+				     yyextra->inRoseComment=FALSE;
 				     BEGIN(Scan); 
                                    }
 <ReadLine>"*/"                     {
-				     copyToOutput("*&zwj;/",7);
+				     copyToOutput(yyscanner,"*&zwj;/",7);
 				   }
 <ReadLine>"*"                      {
-				     copyToOutput(yytext,(int)yyleng);
+				     copyToOutput(yyscanner,yytext,(int)yyleng);
 				   }
 <ReadLine>[^\\@\n\*]*              {
-				     copyToOutput(yytext,(int)yyleng);
+				     copyToOutput(yyscanner,yytext,(int)yyleng);
 				   }
 <ReadLine>[^\\@\n\*]*/\n           {
-				     copyToOutput(yytext,(int)yyleng);
-				     BEGIN(g_readLineCtx);
+				     copyToOutput(yyscanner,yytext,(int)yyleng);
+				     BEGIN(yyextra->readLineCtx);
 				   }
 <CComment,ReadLine>[\\@][\\@][~a-z_A-Z][a-z_A-Z0-9]*[ \t]* { // escaped command
-				     copyToOutput(yytext,(int)yyleng);
+				     copyToOutput(yyscanner,yytext,(int)yyleng);
   				   }
 <CComment,ReadLine>[\\@]"cond"/[^a-z_A-Z0-9]	   { // conditional section
-  				     g_condCtx = YY_START; 
+  				     yyextra->condCtx = YY_START; 
   				     BEGIN(CondLine);
   				   }
 <CComment,ReadLine>[\\@]"endcond"/[^a-z_A-Z0-9] { // end of conditional section
-  				     bool oldSkip=g_skip;
-  				     endCondSection();
-				     if (YY_START==CComment && oldSkip && !g_skip) 
+  				     bool oldSkip=yyextra->skip;
+  				     endCondSection(yyscanner);
+				     if (YY_START==CComment && oldSkip && !yyextra->skip) 
     			             {
 				       //printf("** Adding start of comment!\n");
-				       if (g_lang!=SrcLangExt_Python &&
-					   g_lang!=SrcLangExt_VHDL &&
-					   g_lang!=SrcLangExt_Markdown &&
-					   g_lang!=SrcLangExt_Fortran)
+				       if (yyextra->lang!=SrcLangExt_Python &&
+					   yyextra->lang!=SrcLangExt_VHDL &&
+					   yyextra->lang!=SrcLangExt_Markdown &&
+					   yyextra->lang!=SrcLangExt_Fortran)
 				       {
  				         ADDCHAR('/');
      				         ADDCHAR('*');
-					 if (g_specialComment)
+					 if (yyextra->specialComment)
 					 {
 					   ADDCHAR('*');
 					 }
@@ -882,142 +762,284 @@ void replaceComment(int offset);
     				     }
 				    }
 <CondLine>[!()&| \ta-z_A-Z0-9.\-]+ {
-  				     bool oldSkip=g_skip;
-                                     startCondSection(yytext);
-				     if ((g_condCtx==CComment || g_readLineCtx==SComment) && 
-                                         !oldSkip && g_skip) 
+  				     bool oldSkip=yyextra->skip;
+                                     startCondSection(yyscanner,yytext);
+				     if ((yyextra->condCtx==CComment || yyextra->readLineCtx==SComment) && 
+                                         !oldSkip && yyextra->skip) 
     			             {
-				       if (g_lang!=SrcLangExt_Python &&
-					   g_lang!=SrcLangExt_VHDL &&
-					   g_lang!=SrcLangExt_Markdown &&
-					   g_lang!=SrcLangExt_Fortran)
+				       if (yyextra->lang!=SrcLangExt_Python &&
+					   yyextra->lang!=SrcLangExt_VHDL &&
+					   yyextra->lang!=SrcLangExt_Markdown &&
+					   yyextra->lang!=SrcLangExt_Fortran)
 				       {
  				         ADDCHAR('*');
      				         ADDCHAR('/');
 				       }
     				     }
-                                     if (g_readLineCtx==SComment)
+                                     if (yyextra->readLineCtx==SComment)
                                      {
                                        BEGIN(SComment);
                                      }
                                      else
                                      {
-  				       BEGIN(g_condCtx);
+  				       BEGIN(yyextra->condCtx);
                                      }
   				   }
 <CondLine>[ \t]*
 <CComment,ReadLine>[\\@]"cond"[ \t\r]*/\n |
 <CondLine>.			   { // forgot section id?
-  				     if (YY_START!=CondLine) g_condCtx=YY_START;
-  				     bool oldSkip=g_skip;
-  				     startCondSection(" "); // fake section id causing the section to be hidden unconditionally
-				     if ((g_condCtx==CComment || g_readLineCtx==SComment) && 
-                                         !oldSkip && g_skip) 
+  				     if (YY_START!=CondLine) yyextra->condCtx=YY_START;
+  				     bool oldSkip=yyextra->skip;
+  				     startCondSection(yyscanner," "); // fake section id causing the section to be hidden unconditionally
+				     if ((yyextra->condCtx==CComment || yyextra->readLineCtx==SComment) && 
+                                         !oldSkip && yyextra->skip) 
     			             {
 				       //printf("** Adding terminator for comment!\n");
-				       if (g_lang!=SrcLangExt_Python &&
-					   g_lang!=SrcLangExt_VHDL &&
-					   g_lang!=SrcLangExt_Markdown &&
-					   g_lang!=SrcLangExt_Fortran)
+				       if (yyextra->lang!=SrcLangExt_Python &&
+					   yyextra->lang!=SrcLangExt_VHDL &&
+					   yyextra->lang!=SrcLangExt_Markdown &&
+					   yyextra->lang!=SrcLangExt_Fortran)
 				       {
  				         ADDCHAR('*');
      				         ADDCHAR('/');
 				       }
     				     }
-				     if (*yytext=='\n') g_lineNr++;
-                                     if (g_readLineCtx==SComment)
+				     if (*yytext=='\n') yyextra->lineNr++;
+                                     if (yyextra->readLineCtx==SComment)
                                      {
                                        BEGIN(SComment);
                                      }
                                      else
                                      {
-  				       BEGIN(g_condCtx);
+  				       BEGIN(yyextra->condCtx);
                                      }
   				   }
 <CComment,ReadLine>[\\@][a-z_A-Z][a-z_A-Z0-9]*  { // expand alias without arguments
-				     replaceAliases(yytext);
+				     replaceAliases(yyscanner,yytext);
   				   }
 <CComment,ReadLine>[\\@][a-z_A-Z][a-z_A-Z0-9]*"{" { // expand alias with arguments
-                                     g_lastBlockContext=YY_START;
-				     g_blockCount=1;
-				     g_aliasString=yytext;
-				     g_lastEscaped=0;
+                                     yyextra->lastBlockContext=YY_START;
+				     yyextra->blockCount=1;
+				     yyextra->aliasString=yytext;
+				     yyextra->lastEscaped=0;
 				     BEGIN( ReadAliasArgs );
   				   }
 <ReadAliasArgs>^[ \t]*"//"[/!]/[^\n]+   { // skip leading special comments (see bug 618079)
   				   }
 <ReadAliasArgs>"*/"		   { // oops, end of comment in the middle of an alias?
-                                     if (g_lang==SrcLangExt_Python)
+                                     if (yyextra->lang==SrcLangExt_Python)
 				     {
 				       REJECT;
 				     }
 				     else // abort the alias, restart scanning
 				     {
-				       copyToOutput(g_aliasString,g_aliasString.length());
-				       copyToOutput(yytext,(int)yyleng);
+				       copyToOutput(yyscanner,yyextra->aliasString,yyextra->aliasString.length());
+				       copyToOutput(yyscanner,yytext,(int)yyleng);
 				       BEGIN(Scan);
 				     }
   				   }
 <ReadAliasArgs>[^{}\n\\\*]+	   {
-                                     g_aliasString+=yytext;
-				     g_lastEscaped=FALSE;
+                                     yyextra->aliasString+=yytext;
+				     yyextra->lastEscaped=FALSE;
   				   }
 <ReadAliasArgs>"\\"		   {
-                                     if (g_lastEscaped)  g_lastEscaped=FALSE;
-                                     else                g_lastEscaped=TRUE;
-                                     g_aliasString+=yytext;
+                                     if (yyextra->lastEscaped)  yyextra->lastEscaped=FALSE;
+                                     else                yyextra->lastEscaped=TRUE;
+                                     yyextra->aliasString+=yytext;
                                    }
 <ReadAliasArgs>\n		   {
-                                     g_aliasString+=yytext;
-                                     g_lineNr++;
-				     g_lastEscaped=FALSE;
+                                     yyextra->aliasString+=yytext;
+                                     yyextra->lineNr++;
+				     yyextra->lastEscaped=FALSE;
   				   }
 <ReadAliasArgs>"{"		   {
-                                     g_aliasString+=yytext;
-                                     if (!g_lastEscaped) g_blockCount++;
-				     g_lastEscaped=FALSE;
+                                     yyextra->aliasString+=yytext;
+                                     if (!yyextra->lastEscaped) yyextra->blockCount++;
+				     yyextra->lastEscaped=FALSE;
                                    }
 <ReadAliasArgs>"}"		   {
-                                     g_aliasString+=yytext;
-				     if (!g_lastEscaped) g_blockCount--;
-				     if (g_blockCount==0)
+                                     yyextra->aliasString+=yytext;
+				     if (!yyextra->lastEscaped) yyextra->blockCount--;
+				     if (yyextra->blockCount==0)
 				     {
-				       replaceAliases(g_aliasString);
-				       BEGIN( g_lastBlockContext );
+				       replaceAliases(yyscanner,yyextra->aliasString);
+				       BEGIN( yyextra->lastBlockContext );
 				     }
-				     g_lastEscaped=FALSE;
+				     yyextra->lastEscaped=FALSE;
   			           }
 <ReadAliasArgs>.		   {
-                                     g_aliasString+=yytext;
-				     g_lastEscaped=FALSE;
+                                     yyextra->aliasString+=yytext;
+				     yyextra->lastEscaped=FALSE;
   				   }
 <ReadLine>.			   {
-  				     copyToOutput(yytext,(int)yyleng);
+  				     copyToOutput(yyscanner,yytext,(int)yyleng);
   				   }
 
 %%
 
-void replaceComment(int offset)
+static void replaceCommentMarker(yyscan_t yyscanner,const char *s,int len)
 {
-  if (g_mlBrief || g_skip)
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const char *p=s;
+  char c;
+  // copy leading blanks
+  while ((c=*p) && (c==' ' || c=='\t' || c=='\n')) 
+  {
+    ADDCHAR(c);
+    yyextra->lineNr += c=='\n';
+    p++;
+  }
+  // replace start of comment marker by blanks and the last character by a *
+  int blanks=0;
+  while ((c=*p) && (c=='/' || c=='!' || c=='#')) 
+  {
+    blanks++;
+    p++;
+    if (*p=='<') // comment-after-item marker 
+    { 
+      blanks++;
+      p++; 
+    }
+    if (c=='!') // end after first !
+    {
+      break;
+    }
+  }
+  if (blanks>0)
+  {
+    while (blanks>2)
+    {
+      ADDCHAR(' ');
+      blanks--;
+    }
+    if (blanks>1) ADDCHAR('*');
+    ADDCHAR(' ');
+  }
+  // copy comment line to output
+  ADDARRAY(p,len-(int)(p-s));
+}
+
+static inline int computeIndent(const char *s)
+{
+  int col=0;
+  static int tabSize=Config_getInt(TAB_SIZE);
+  const char *p=s;
+  char c;
+  while ((c=*p++))
+  {
+    if (c==' ') col++;
+    else if (c=='\t') col+=tabSize-(col%tabSize); 
+    else break;
+  }
+  return col;
+}
+
+static inline void copyToOutput(yyscan_t yyscanner,const char *s,int len)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int i;
+  if (yyextra->skip) // only add newlines.
+  {
+    for (i=0;i<len;i++) 
+    {
+      if (s[i]=='\n') 
+      {
+	ADDCHAR('\n');
+	//fprintf(stderr,"---> skip %d\n",g_lineNr);
+	yyextra->lineNr++;
+      }
+    }
+  }
+  else if (len>0)
+  {
+    ADDARRAY(s,len);
+    static int tabSize=Config_getInt(TAB_SIZE);
+    for (i=0;i<len;i++) 
+    {
+      switch (s[i])
+      {
+	case '\n': yyextra->col=0; 
+	           //fprintf(stderr,"---> copy %d\n",g_lineNr);
+		   yyextra->lineNr++; break;
+	case '\t': yyextra->col+=tabSize-(yyextra->col%tabSize); break;
+	default:   yyextra->col++; break;
+      }
+    }
+  }
+}
+
+static void startCondSection(yyscan_t yyscanner,const char *sectId)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("startCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
+  CondParser prs;
+  bool expResult = prs.parse(yyextra->fileName,yyextra->lineNr,sectId);
+  yyextra->condStack.push(new CondCtx(yyextra->lineNr,sectId,yyextra->skip));
+  if (!expResult) // not enabled
   {
-    copyToOutput(yytext,(int)yyleng);
+    yyextra->skip=TRUE;
+  }
+}
+
+static void endCondSection(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->condStack.isEmpty())
+  {
+    warn(yyextra->fileName,yyextra->lineNr,"Found \\endcond command without matching \\cond");
+    yyextra->skip=FALSE;
+  }
+  else
+  {
+    CondCtx *ctx = yyextra->condStack.pop();
+    yyextra->skip=ctx->skip;
+  }
+  //printf("endCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
+}
+
+/** copies string \a s with length \a len to the output, while 
+ *  replacing any alias commands found in the string.
+ */
+static void replaceAliases(yyscan_t yyscanner,const char *s)
+{
+  QCString result = resolveAliasCmd(s);
+  //printf("replaceAliases(%s)->'%s'\n",s,result.data());
+  copyToOutput(yyscanner,result,result.length());
+}
+
+
+static int yyread(yyscan_t yyscanner,char *buf,int max_size)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int bytesInBuf = yyextra->inBuf->curPos()-yyextra->inBufPos;
+  int bytesToCopy = QMIN(max_size,bytesInBuf);
+  memcpy(buf,yyextra->inBuf->data()+yyextra->inBufPos,bytesToCopy);
+  yyextra->inBufPos+=bytesToCopy;
+  return bytesToCopy;
+}
+
+static void replaceComment(yyscan_t yyscanner,int offset)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->mlBrief || yyextra->skip)
+  {
+    copyToOutput(yyscanner,yytext,(int)yyleng);
   }
   else
   {
     //printf("replaceComment(%s)\n",yytext);
     int i=computeIndent(&yytext[offset]);
-    if (i==g_blockHeadCol)
+    if (i==yyextra->blockHeadCol)
     {
-      replaceCommentMarker(yytext,(int)yyleng);
+      replaceCommentMarker(yyscanner,yytext,(int)yyleng);
     }
     else
     {
-      copyToOutput(" */",3);
+      copyToOutput(yyscanner," */",3);
       int i;for (i=(int)yyleng-1;i>=0;i--) unput(yytext[i]);
-      g_inSpecialComment=FALSE;
-      BEGIN(Scan);                                            
-    }                                                         
+      yyextra->inSpecialComment=FALSE;
+      BEGIN(Scan);
+    }
   }
 }
 
@@ -1068,75 +1090,80 @@ static bool recognizeFixedForm(const char* contents)
  */
 void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
 {
+  yyscan_t yyscanner;
+  commentcnvYY_state extra;
+  commentcnvYYlex_init_extra(&extra,&yyscanner);
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf("convertCppComments(%s)\n",fileName);
-  g_inBuf    = inBuf;
-  g_outBuf   = outBuf;
-  g_inBufPos = 0;
-  g_col      = 0;
-  g_mlBrief = Config_getBool(MULTILINE_CPP_IS_BRIEF);
-  g_skip     = FALSE;
-  g_fileName = fileName;
-  g_lang = getLanguageFromFileName(fileName);
-  g_pythonDocString = FALSE;
-  g_lineNr   = 1;
-  g_condStack.clear();
-  g_condStack.setAutoDelete(TRUE);
-  g_commentStack.clear();
-  g_commentStack.setAutoDelete(TRUE);
-  g_vhdl = FALSE;
+  yyextra->inBuf    = inBuf;
+  yyextra->outBuf   = outBuf;
+  yyextra->inBufPos = 0;
+  yyextra->col      = 0;
+  yyextra->mlBrief = Config_getBool(MULTILINE_CPP_IS_BRIEF);
+  yyextra->skip     = FALSE;
+  yyextra->fileName = fileName;
+  yyextra->lang = getLanguageFromFileName(fileName);
+  yyextra->pythonDocString = FALSE;
+  yyextra->lineNr   = 1;
+  yyextra->condStack.clear();
+  yyextra->condStack.setAutoDelete(TRUE);
+  yyextra->commentStack.clear();
+  yyextra->commentStack.setAutoDelete(TRUE);
+  yyextra->vhdl = FALSE;
 
   printlex(yy_flex_debug, TRUE, __FILE__, fileName);
-  isFixedForm = FALSE;
-  if (g_lang==SrcLangExt_Fortran)
+  yyextra->isFixedForm = FALSE;
+  if (yyextra->lang==SrcLangExt_Fortran)
   {
-    isFixedForm = recognizeFixedForm(inBuf->data());
+    yyextra->isFixedForm = recognizeFixedForm(inBuf->data());
   }
 
-  if (g_lang==SrcLangExt_Markdown)
+  if (yyextra->lang==SrcLangExt_Markdown)
   {
-    g_nestingCount=0;
+    yyextra->nestingCount=0;
     BEGIN(CComment);
-    g_commentStack.push(new CommentCtx(g_lineNr));
+    yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
   }
   else
   {
     BEGIN(Scan);
   }
-  yylex();
-  while (!g_condStack.isEmpty())
+  yylex(yyscanner);
+  while (!yyextra->condStack.isEmpty())
   {
-    CondCtx *ctx = g_condStack.pop();
+    CondCtx *ctx = yyextra->condStack.pop();
     QCString sectionInfo = " ";
     if (ctx->sectionId!=" ") sectionInfo.sprintf(" with label '%s' ",ctx->sectionId.stripWhiteSpace().data());
-    warn(g_fileName,ctx->lineNr,"Conditional section%sdoes not have "
+    warn(yyextra->fileName,ctx->lineNr,"Conditional section%sdoes not have "
 	"a corresponding \\endcond command within this file.",sectionInfo.data());
   }
-  if (g_nestingCount>0 && g_lang!=SrcLangExt_Markdown)
+  if (yyextra->nestingCount>0 && yyextra->lang!=SrcLangExt_Markdown)
   {
     QCString tmp= "(probable line reference: ";
     bool first = TRUE;
-    while (!g_commentStack.isEmpty())
+    while (!yyextra->commentStack.isEmpty())
     {
-      CommentCtx *ctx = g_commentStack.pop();
+      CommentCtx *ctx = yyextra->commentStack.pop();
       if (!first) tmp += ", ";
       tmp += QCString().setNum(ctx->lineNr);
       first = FALSE;
       delete ctx;
     }
     tmp += ")";
-    warn(g_fileName,g_lineNr,"Reached end of file while still inside a (nested) comment. "
-        "Nesting level %d %s",g_nestingCount,tmp.data());
+    warn(yyextra->fileName,yyextra->lineNr,"Reached end of file while still inside a (nested) comment. "
+        "Nesting level %d %s",yyextra->nestingCount,tmp.data());
   }
-  g_commentStack.clear();
-  g_nestingCount = 0;
+  yyextra->commentStack.clear();
+  yyextra->nestingCount = 0;
   if (Debug::isFlagSet(Debug::CommentCnv))
   {
-    g_outBuf->at(g_outBuf->curPos())='\0';
+    yyextra->outBuf->at(yyextra->outBuf->curPos())='\0';
     Debug::print(Debug::CommentCnv,0,"-----------\nCommentCnv: %s\n"
-                 "output=[\n%s]\n-----------\n",fileName,g_outBuf->data()
+                 "output=[\n%s]\n-----------\n",fileName,yyextra->outBuf->data()
                 );
   }
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
+  commentcnvYYlex_destroy(yyscanner);
 }
 
 
-- 
cgit v0.12


From c5854f5a8e819de82b73d14bbbd8583a36842fd5 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 18 Nov 2019 20:26:29 +0100
Subject: Replace set of g_inside* booleans with a single g_lang variable

---
 src/code.l | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/code.l b/src/code.l
index c73911a..7c159ec 100644
--- a/src/code.l
+++ b/src/code.l
@@ -116,13 +116,9 @@ static int           g_memCallContext;
 static int	     g_lastCContext;
 static int           g_skipInlineInitContext;
 
-static bool          g_insideCpp;
+static SrcLangExt    g_lang;
 static bool          g_insideObjC;
-static bool          g_insideJava;
-static bool          g_insideCS;
-static bool          g_insidePHP;
 static bool          g_insideProtocolList;
-static bool          g_insideSlice;
 
 static bool          g_lexInit = FALSE;
 
@@ -951,11 +947,11 @@ static void generateClassOrGlobalLink(CodeOutputInterface &ol,const char *clName
   {
     className+="-p";
   }
-  if (g_insidePHP)
+  if (g_lang==SrcLangExt_PHP)
   {
     className = substitute(className,"\\","::"); // for PHP namespaces
   }
-  else if (g_insideCS || g_insideJava)
+  else if (g_lang==SrcLangExt_CSharp || g_lang==SrcLangExt_Java)
   {
     className = substitute(className,".","::"); // for PHP namespaces
   }
@@ -1324,7 +1320,7 @@ static void generateFunctionLink(CodeOutputInterface &ol,const char *funcName)
   ClassDef *ccd=0;
   QCString locScope=g_classScope;
   QCString locFunc=removeRedundantWhiteSpace(funcName);
-  if (g_insidePHP && locFunc.startsWith("self::")) locFunc=locFunc.mid(4);
+  if (g_lang==SrcLangExt_PHP && locFunc.startsWith("self::")) locFunc=locFunc.mid(4);
   QCString funcScope;
   QCString funcWithScope=locFunc;
   QCString funcWithFullScope=locFunc;
@@ -1799,7 +1795,7 @@ static QCString escapeComment(const char *s)
 
 static bool skipLanguageSpecificKeyword(const QCString &kw)
 {
-  return g_insideCpp && (kw == "remove" || kw == "set" || kw == "get");
+  return g_lang==SrcLangExt_Cpp && (kw == "remove" || kw == "set" || kw == "get");
 }
 
 static bool isCastKeyword(const QCString &s)
@@ -2181,7 +2177,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					}
 <ClassName>{ID}("."{ID})*	        |
 <ClassName>{ID}("::"{ID})*	        {
-                                          if(g_insideCS)
+                                          if (g_lang==SrcLangExt_CSharp)
                                             g_curClassName=substitute(yytext,".","::");
                                           else
                                             g_curClassName=yytext;
@@ -2443,7 +2439,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  g_prefixed_with_this_keyword = TRUE;
                                         }
 <Body>{KEYWORD}/([^a-z_A-Z0-9]) 	{
-                                          if (g_insideJava && qstrcmp("internal",yytext) ==0) REJECT;
+                                          if (g_lang==SrcLangExt_Java && qstrcmp("internal",yytext) ==0) REJECT;
                                           if (skipLanguageSpecificKeyword(yytext)) REJECT;
   					  startFontClass("keyword");
   					  codifyLines(yytext);
@@ -2559,7 +2555,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  g_name+=yytext; 
   					}
 <Body,TemplDecl,ObjCMethod>{TYPEKWSL}/{B}* {
-                                          if (!g_insideSlice)
+                                          if (g_lang!=SrcLangExt_Slice)
                                           {
                                             REJECT;
                                           }
@@ -3045,7 +3041,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  endFontClass();
 					}
 <MemberCall2,FuncCall,OldStyleArgs,TemplCast>{TYPEKWSL}/([^a-z_A-Z0-9]) {
-                                          if (!g_insideSlice)
+                                          if (g_lang!=SrcLangExt_Slice)
                                           {
                                             REJECT;
                                           }
@@ -3825,12 +3821,8 @@ void parseCCode(CodeOutputInterface &od,const char *className,const QCString &s,
     g_sourceFileDef = createFileDef("",(exName?exName:"generated"));
     cleanupSourceDef = TRUE;
   }
+  g_lang        = lang;
   g_insideObjC  = lang==SrcLangExt_ObjC;
-  g_insideJava  = lang==SrcLangExt_Java;
-  g_insideCS    = lang==SrcLangExt_CSharp;
-  g_insidePHP   = lang==SrcLangExt_PHP;
-  g_insideCpp   = lang==SrcLangExt_Cpp;
-  g_insideSlice = lang==SrcLangExt_Slice;
   if (g_sourceFileDef) 
   {
     setCurrentDoc("l00001");
-- 
cgit v0.12


From 26f6f1aec1be0361eac7c6ebc4de93904bf42a98 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 18 Nov 2019 20:37:37 +0100
Subject: Remove bogus flex code

---
 src/code.l           | 10 ----------
 src/commentcnv.l     |  5 -----
 src/commentscan.l    |  9 ---------
 src/declinfo.l       | 11 -----------
 src/defargs.l        |  6 ------
 src/doctokenizer.l   |  5 -----
 src/fortrancode.l    | 12 ------------
 src/fortranscanner.l |  7 -------
 src/pre.l            |  6 ------
 src/pycode.l         |  9 ---------
 src/pyscanner.l      |  7 -------
 src/scanner.l        |  7 -------
 src/sqlcode.l        |  8 --------
 src/tclscanner.l     |  7 -------
 src/vhdlcode.l       |  8 --------
 src/xmlcode.l        |  8 --------
 16 files changed, 125 deletions(-)

diff --git a/src/code.l b/src/code.l
index 7c159ec..4998421 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3877,14 +3877,4 @@ void codeFreeScanner()
 #endif
 }
 
-
-
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-  void codeYYdummy() { yy_flex_realloc(0,0); } 
-}
-#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
-#endif
-
 #include "code.l.h"
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 14abb8f..940f1a5 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -1168,10 +1168,5 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
 
 
 //----------------------------------------------------------------------------
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-    void commentcnvYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
 
 #include "commentcnv.l.h"
diff --git a/src/commentscan.l b/src/commentscan.l
index a1ce096..2b10f87 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -3281,13 +3281,4 @@ static void handleGuard(const QCString &expr)
   }
 }
 
-
-
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-//----------------------------------------------------------------------------
-extern "C" { // some bogus code to keep the compiler happy
-  void commentscanYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
-
 #include "commentscan.l.h"
diff --git a/src/declinfo.l b/src/declinfo.l
index c27af39..37d0449 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -347,11 +347,6 @@ void parseFuncDecl(const QCString &decl,const SrcLangExt lang,QCString &cl,QCStr
   return;
 }
 
-//extern "C" { // some bogus code to keep the compiler happy
-//  int  declinfoYYwrap() { return 1 ; }
-//  void declinfoYYdummy() { yy_flex_realloc(0,0); } 
-//}
-
 #if 0
 void dumpDecl(const char *s)
 {
@@ -385,11 +380,5 @@ int main()
 }
 #endif
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-//----------------------------------------------------------------------------
-extern "C" { // some bogus code to keep the compiler happy
-  void declinfoYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
 
 #include "declinfo.l.h"
diff --git a/src/defargs.l b/src/defargs.l
index a213688..eb454ce 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -635,10 +635,4 @@ void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extr
   printlex(yy_flex_debug, FALSE, __FILE__, NULL);
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-  void defargsYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
-
 #include "defargs.l.h"
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index f0a6a83..c079c04 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -1611,10 +1611,5 @@ void doctokenizerYYendAutoList()
 //  printlex(yy_flex_debug, FALSE, __FILE__, g_fileName);
 //  return retval;
 //}
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-    void doctokenizerYYdummy() { yy_flex_realloc(0,0); }
-}
-#endif
 
 #include "doctokenizer.l.h"
diff --git a/src/fortrancode.l b/src/fortrancode.l
index 72feb3d..3bbecd8 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -1395,16 +1395,4 @@ void parseFortranCode(CodeOutputInterface &od,const char *,const QCString &s,
   return;
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION)
-extern "C" { // some bogus code to keep the compiler happy
-  void fortrancodeYYdummy() { yy_flex_realloc(0,0); }
-}
-#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
-#else
-extern "C" { // some bogus code to keep the compiler happy
-  void fortrancodeYYdummy() { yy_top_state(); } 
-}
-#endif
-
 #include "fortrancode.l.h"
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 39c45e7..e0d6d63 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -2836,11 +2836,4 @@ static void scanner_abort()
 
 //----------------------------------------------------------------------------
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-//----------------------------------------------------------------------------
-extern "C" { // some bogus code to keep the compiler happy
-  void fortranscannernerYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
-
 #include "fortranscanner.l.h"
diff --git a/src/pre.l b/src/pre.l
index 8bde725..cf13764 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -3426,11 +3426,5 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-//  int  preYYwrap() { return 1 ; }
-  void preYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
 
 #include "pre.l.h"
diff --git a/src/pycode.l b/src/pycode.l
index 4ff4fc1..4e53a27 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1638,13 +1638,4 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
   return;
 }
 
-
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-  void pycodeYYdummy() { yy_flex_realloc(0,0); } 
-}
-#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
-#endif
-
 #include "pycode.l.h"
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 63f11e3..5d6b303 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -1940,11 +1940,4 @@ void PythonLanguageScanner::resetCodeParserState()
 
 //----------------------------------------------------------------------------
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-//----------------------------------------------------------------------------
-extern "C" { // some bogus code to keep the compiler happy
-  void pyscannerYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
-
 #include "pyscanner.l.h"
diff --git a/src/scanner.l b/src/scanner.l
index 393d6d4..37fcb1c 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -7402,11 +7402,4 @@ void CLanguageScanner::parsePrototype(const char *text)
 
 //----------------------------------------------------------------------------
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-//----------------------------------------------------------------------------
-extern "C" { // some bogus code to keep the compiler happy
-  void scannerYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
-
 #include "scanner.l.h"
diff --git a/src/sqlcode.l b/src/sqlcode.l
index 2685c46..a9e88a7 100644
--- a/src/sqlcode.l
+++ b/src/sqlcode.l
@@ -454,12 +454,4 @@ void resetSqlCodeParserState()
   yyextra->currentMemberDef = 0;
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-  void sqlcodeYYdummy() { yy_flex_realloc(0,0); } 
-}
-#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
-#endif
-
 #include "sqlcode.l.h"
diff --git a/src/tclscanner.l b/src/tclscanner.l
index 37eef0d..d22c5d6 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -3138,11 +3138,4 @@ void tclDummy()
   yy_top_state();
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-//----------------------------------------------------------------------------
-extern "C" { // some bogus code to keep the compiler happy
-  void tclscannerYYdummy() { yy_flex_realloc(0,0); } 
-}
-#endif
-
 #include "tclscanner.l.h"
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index 9f128ea..53e1ed8 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -1634,13 +1634,5 @@ void codeFreeVhdlScanner()
 #endif
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-  void vhdlcodeYYdummy() { yy_flex_realloc(0,0); } 
-}
-#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4 but older than 2.5.33. These versions do NOT work with doxygen! Please use version <=2.5.4 or >=2.5.33 or expect things to be parsed wrongly!"
-#endif
-
 #include "vhdlcode.l.h"
 
diff --git a/src/xmlcode.l b/src/xmlcode.l
index bd6e8a8..2fedf2d 100644
--- a/src/xmlcode.l
+++ b/src/xmlcode.l
@@ -407,12 +407,4 @@ void resetXmlCodeParserState()
   g_currentMemberDef = 0;
 }
 
-#if !defined(YY_FLEX_SUBMINOR_VERSION) 
-extern "C" { // some bogus code to keep the compiler happy
-  void xmlcodeYYdummy() { yy_flex_realloc(0,0); } 
-}
-#elif YY_FLEX_MAJOR_VERSION<=2 && YY_FLEX_MINOR_VERSION<=5 && YY_FLEX_SUBMINOR_VERSION<33
-#error "You seem to be using a version of flex newer than 2.5.4. These are currently incompatible with 2.5.4, and do NOT work with doxygen! Please use version 2.5.4 or expect things to be parsed wrongly! A bug report has been submitted (#732132)."
-#endif
-
 #include "xmlcode.l.h"
-- 
cgit v0.12


From 844159503ac32293f1a11761687843b1ecf5fb3e Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 21 Nov 2019 13:50:03 +0100
Subject: Correct style in table header in case of paragraph is used

In case a paragraph is used in a table header (quite unusual but can happen with 2 lines and an empty line in between), a `<p class="starttd">` tag is added and therewith the layout is incorrect.
This problem was detected based on #7409
This has been corrected (and tested with some available browsers FF, IE, Chrome, Opera).
---
 templates/html/doxygen.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index ffba793..2c9dfd5 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -66,6 +66,11 @@ p.startli, p.startdd {
 	margin-top: 2px;
 }
 
+th p.starttd, p.intertd, p.endtd {
+        font-size: 100%;
+        font-weight: 700;
+}
+
 p.starttd {
 	margin-top: 0px;
 }
-- 
cgit v0.12


From e7d47ec23ba1b109754d6e47b1eb4d341efc3b36 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 21 Nov 2019 20:55:57 +0100
Subject: Made code.l scanner reentrant

---
 src/code.h      |   14 +-
 src/code.l      | 5860 ++++++++++++++++++++++++++++---------------------------
 src/doxygen.cpp |    4 +-
 src/scanner.l   |    7 +-
 4 files changed, 3009 insertions(+), 2876 deletions(-)

diff --git a/src/code.h b/src/code.h
index da6b80e..a86ecc0 100644
--- a/src/code.h
+++ b/src/code.h
@@ -26,12 +26,20 @@ class MemberDef;
 class QCString;
 class Definition;
 
-void parseCCode(CodeOutputInterface &,const char *,const QCString &, 
+class CodeScanner
+{
+  public:
+    CodeScanner();
+    virtual ~CodeScanner();
+    void parseCCode(CodeOutputInterface &,const char *,const QCString &,
             SrcLangExt lang, bool isExample, const char *exName,FileDef *fd,
             int startLine,int endLine,bool inlineFragment,
             const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
             bool collectXRefs);
-void resetCCodeParserState();
-void codeFreeScanner();
+    void reset();
+  private:
+    struct Private;
+    Private *p;
+};
 
 #endif
diff --git a/src/code.l b/src/code.l
index 4998421..32a0f7e 100644
--- a/src/code.l
+++ b/src/code.l
@@ -16,6 +16,8 @@
  */
 %option never-interactive
 %option prefix="codeYY"
+%option reentrant
+%option extra-type="struct codeYY_state *"
 
 %{
 
@@ -28,6 +30,7 @@
 #include <qregexp.h>
 #include <qdir.h>
 
+#include "code.h"
 #include "entry.h"
 #include "doxygen.h"
 #include "message.h"
@@ -58,76 +61,6 @@
  *	statics
  */
   
-static CodeOutputInterface * g_code;
-
-static ClassSDict    *g_codeClassSDict = 0;
-static QCString      g_curClassName;
-static QStrList      g_curClassBases;
-
-static QCString      g_parmType;
-static QCString      g_parmName;
-
-static const char *  g_inputString;     //!< the code fragment as text
-static int	     g_inputPosition;   //!< read offset during parsing 
-static int           g_inputLines;      //!< number of line in the code fragment
-static int	     g_yyLineNr;        //!< current line number
-static int	     g_yyColNr;         //!< current column number
-static bool          g_needsTermination;
-
-static bool          g_exampleBlock;
-static QCString      g_exampleName;
-static QCString      g_exampleFile;
-
-static bool          g_insideTemplate = FALSE;
-static QCString      g_type;
-static QCString      g_name;
-static QCString      g_args;
-static QCString      g_classScope;
-static QCString      g_realScope;
-static QStack<int>   g_scopeStack;      //!< 1 if bracket starts a scope, 
-                                        //   2 for internal blocks 
-static int           g_anchorCount;
-static FileDef *     g_sourceFileDef;
-static bool          g_lineNumbers;
-static Definition *  g_currentDefinition;
-static MemberDef *   g_currentMemberDef;
-static bool          g_includeCodeFragment;
-static const char *  g_currentFontClass;
-static bool          g_searchingForBody;
-static bool          g_insideBody;
-static int           g_bodyCurlyCount;
-static QCString      g_saveName;
-static QCString      g_saveType;
-static QCString      g_delimiter;
-
-static int	     g_bracketCount = 0;
-static int	     g_curlyCount   = 0;
-static int	     g_sharpCount   = 0;
-static bool          g_inFunctionTryBlock = FALSE;
-static bool          g_inForEachExpression = FALSE;
-
-static int           g_lastTemplCastContext;
-static int	     g_lastSpecialCContext;
-static int           g_lastStringContext;
-static int           g_lastSkipCppContext;
-static int           g_lastVerbStringContext;
-static int           g_lastObjCCallContext;
-static int           g_memCallContext;
-static int	     g_lastCContext;
-static int           g_skipInlineInitContext;
-
-static SrcLangExt    g_lang;
-static bool          g_insideObjC;
-static bool          g_insideProtocolList;
-
-static bool          g_lexInit = FALSE;
-
-static QStack<int>   g_classScopeLengthStack;
-
-static int           g_prefixed_with_this_keyword = FALSE;
-static const Definition *g_searchCtx;
-static bool          g_collectXRefs;
-
 // context for an Objective-C method call
 struct ObjCCallCtx
 {
@@ -143,31 +76,6 @@ struct ObjCCallCtx
   int braceCount;
 };
 
-// globals for objective-C method calls 
-static ObjCCallCtx *g_currentCtx=0;
-static int g_currentCtxId=0;
-static int g_currentNameId=0;
-static int g_currentObjId=0;
-static int g_currentWordId=0;
-static int g_currentCommentId=0;
-static QStack<ObjCCallCtx> g_contextStack;
-static QIntDict<ObjCCallCtx> g_contextDict;
-static QIntDict<QCString> g_nameDict;
-static QIntDict<QCString> g_objectDict;
-static QIntDict<QCString> g_wordDict;
-static QIntDict<QCString> g_commentDict;
-static int g_braceCount=0;
-  
-static void saveObjCContext();
-static void restoreObjCContext();
-
-static const char *stateToString(int state);
-
-static QCString g_forceTagReference;
-
-
-//-------------------------------------------------------------------
-
 /*! Represents a stack of variable to class mappings as found in the
  *  code. Each scope is enclosed in pushScope() and popScope() calls.
  *  Variables are added by calling addVariables() and one can search
@@ -223,7 +131,7 @@ class VariableContext
       m_scopes.clear();
     }
 
-    void addVariable(const QCString &type,const QCString &name);
+    void addVariable(yyscan_t yyscanner,const QCString &type,const QCString &name);
     ClassDef *findVariable(const QCString &name);
 
     int count() const { return m_scopes.count(); }
@@ -233,102 +141,6 @@ class VariableContext
     QList<Scope> m_scopes;
 };
 
-void VariableContext::addVariable(const QCString &type,const QCString &name)
-{
-  //printf("VariableContext::addVariable(%s,%s)\n",type.data(),name.data());
-  QCString ltype = type.simplifyWhiteSpace();
-  QCString lname = name.simplifyWhiteSpace();
-  if (ltype.left(7)=="struct ") 
-  {
-    ltype = ltype.right(ltype.length()-7);
-  }
-  else if (ltype.left(6)=="union ")
-  {
-    ltype = ltype.right(ltype.length()-6);
-  }
-  if (ltype.isEmpty() || lname.isEmpty()) return;
-  DBG_CTX((stderr,"** addVariable trying: type='%s' name='%s' g_currentDefinition=%s\n",
-	ltype.data(),lname.data(),g_currentDefinition?g_currentDefinition->name().data():"<none>"));
-  Scope *scope = m_scopes.count()==0 ? &m_globalScope : m_scopes.getLast();
-  const ClassDef *varType;
-  int i=0;
-  if (
-      (varType=g_codeClassSDict->find(ltype)) ||  // look for class definitions inside the code block
-      (varType=getResolvedClass(g_currentDefinition,g_sourceFileDef,ltype)) // look for global class definitions
-     ) 
-  {
-    DBG_CTX((stderr,"** addVariable type='%s' name='%s'\n",ltype.data(),lname.data()));
-    scope->append(lname,varType); // add it to a list
-  }
-  else if ((i=ltype.find('<'))!=-1)
-  {
-    // probably a template class
-    QCString typeName(ltype.left(i));
-    ClassDef* newDef = 0;
-    QCString templateArgs(ltype.right(ltype.length() - i));
-    if ( !typeName.isEmpty() &&
-         ( // look for class definitions inside the code block
-	   (varType=g_codeClassSDict->find(typeName)) ||
-           // otherwise look for global class definitions
-           (varType=getResolvedClass(g_currentDefinition,g_sourceFileDef,typeName,0,0,TRUE,TRUE))
-	 ) && // and it must be a template
-         !varType->templateArguments().empty())
-    {
-      newDef = varType->getVariableInstance( templateArgs );
-    }
-    if (newDef)
-    {
-      DBG_CTX((stderr,"** addVariable type='%s' templ='%s' name='%s'\n",typeName.data(),templateArgs.data(),lname.data()));
-      scope->append(lname, newDef);
-    }
-    else
-    {
-      // Doesn't seem to be a template. Try just the base name.
-      addVariable(typeName,name);
-    }
-  }
-  else 
-  {
-    if (m_scopes.count()>0) // for local variables add a dummy entry so the name 
-                            // is hidden to avoid false links to global variables with the same name
-                            // TODO: make this work for namespaces as well!
-    {
-      DBG_CTX((stderr,"** addVariable: dummy context for '%s'\n",lname.data()));
-      scope->append(lname,dummyContext);
-    }
-    else
-    {
-      DBG_CTX((stderr,"** addVariable: not adding variable!\n"));
-    }
-  }
-}
-
-ClassDef *VariableContext::findVariable(const QCString &name)
-{
-  if (name.isEmpty()) return 0;
-  ClassDef *result = 0;
-  QListIterator<Scope> sli(m_scopes);
-  Scope *scope;
-  QCString key = name;
-  // search from inner to outer scope
-  for (sli.toLast();(scope=sli.current());--sli)
-  {
-    result = scope->find(key);
-    if (result)
-    {
-      DBG_CTX((stderr,"** findVariable(%s)=%p\n",name.data(),result));
-      return result;
-    }
-  }
-  // nothing found -> also try the global scope
-  result=m_globalScope.find(name);
-  DBG_CTX((stderr,"** findVariable(%s)=%p\n",name.data(),result));
-  return result;
-}
-
-static VariableContext g_theVarContext;
-const ClassDef *VariableContext::dummyContext = (ClassDef*)0x8;
-
 //-------------------------------------------------------------------
 
 class CallContext
@@ -396,2266 +208,997 @@ class CallContext
     QList<Ctx> m_defList;
 };
 
-static CallContext g_theCallContext;
-
-//-------------------------------------------------------------------
 
-/*! add class/namespace name s to the scope */
-static void pushScope(const char *s)
+struct codeYY_state
 {
-  g_classScopeLengthStack.push(new int(g_classScope.length()));
-  if (g_classScope.isEmpty() || leftScopeMatch(s,g_classScope))
-  {
-    g_classScope = s;
-  }
-  else
-  {
-    g_classScope += "::";
-    g_classScope += s;
-  }
-  //printf("pushScope(%s) result: '%s'\n",s,g_classScope.data());
-}
+  CodeOutputInterface * code = 0;
+
+  ClassSDict    *codeClassSDict = 0;
+  QCString      curClassName;
+  QStrList      curClassBases;
+
+  QCString      parmType;
+  QCString      parmName;
+
+  const char *  inputString = 0;     //!< the code fragment as text
+  int	        inputPosition = 0;   //!< read offset during parsing 
+  int           inputLines = 0;      //!< number of line in the code fragment
+  int	        yyLineNr = 0;        //!< current line number
+  int	        yyColNr = 0;         //!< current column number
+  bool          needsTermination = FALSE;
+
+  bool          exampleBlock = FALSE;
+  QCString      exampleName;
+  QCString      exampleFile;
+
+  bool          insideTemplate = FALSE;
+  QCString      type;
+  QCString      name;
+  QCString      args;
+  QCString      classScope;
+  QCString      realScope;
+  QStack<int>   scopeStack;      //!< 1 if bracket starts a scope, 
+                                 //   2 for internal blocks 
+  int           anchorCount = 0;
+  FileDef *     sourceFileDef = 0;
+  bool          lineNumbers = FALSE;
+  Definition *  currentDefinition = 0;
+  MemberDef *   currentMemberDef = 0;
+  bool          includeCodeFragment = FALSE;
+  const char *  currentFontClass = 0;
+  bool          searchingForBody = FALSE;
+  bool          insideBody = FALSE;
+  int           bodyCurlyCount = 0;
+  QCString      saveName;
+  QCString      saveType;
+  QCString      delimiter;
+
+  int	        bracketCount = 0;
+  int	        curlyCount   = 0;
+  int	        sharpCount   = 0;
+  bool          inFunctionTryBlock = FALSE;
+  bool          inForEachExpression = FALSE;
+
+  int           lastTemplCastContext = 0;
+  int	        lastSpecialCContext = 0;
+  int           lastStringContext = 0;
+  int           lastSkipCppContext = 0;
+  int           lastVerbStringContext = 0;
+  int           lastObjCCallContext = 0;
+  int           memCallContext = 0;
+  int	        lastCContext = 0;
+  int           skipInlineInitContext = 0;
+
+  SrcLangExt    lang = SrcLangExt_Unknown;
+  bool          insideObjC = FALSE;
+  bool          insideProtocolList = FALSE;
+
+  bool          lexInit = FALSE;
+
+  QStack<int>   classScopeLengthStack;
+
+  int           prefixed_with_this_keyword = FALSE;
+  const Definition *searchCtx = 0;
+  bool          collectXRefs = FALSE;
+
+  ObjCCallCtx * currentCtx=0;
+  int           currentCtxId=0;
+  int           currentNameId=0;
+  int           currentObjId=0;
+  int           currentWordId=0;
+  int           currentCommentId=0;
+  QStack<ObjCCallCtx>   contextStack;
+  QIntDict<ObjCCallCtx> contextDict;
+  QIntDict<QCString>    nameDict;
+  QIntDict<QCString>    objectDict;
+  QIntDict<QCString>    wordDict;
+  QIntDict<QCString>    commentDict;
+  int           braceCount=0;
+
+  QCString        forceTagReference;
+  VariableContext theVarContext;
+  CallContext     theCallContext;
+};
 
-/*! remove the top class/namespace name from the scope */
-static void popScope()
-{
-  if (!g_classScopeLengthStack.isEmpty())
-  {
-    int *pLength = g_classScopeLengthStack.pop();
-    g_classScope.truncate(*pLength);
-    delete pLength;
-  }
-  else
-  {
-    //err("Too many end of scopes found!\n");
-  }
-  //printf("popScope() result: '%s'\n",g_classScope.data());
-}
+static bool isCastKeyword(const QCString &s);
 
-static void setCurrentDoc(const QCString &anchor)
-{
-  if (Doxygen::searchIndex)
-  {
-    if (g_searchCtx)
-    {
-      g_code->setCurrentDoc(g_searchCtx,g_searchCtx->anchor(),FALSE);
-    }
-    else
-    {
-      g_code->setCurrentDoc(g_sourceFileDef,anchor,TRUE);
-    }
-  }
-}
+//-------------------------------------------------------------------
 
-static void addToSearchIndex(const char *text)
-{
-  if (Doxygen::searchIndex)
-  {
-    g_code->addWord(text,FALSE);
-  }
-}
+static void saveObjCContext(yyscan_t yyscanner);
+static void restoreObjCContext(yyscan_t yyscanner);
+static const char *stateToString(yyscan_t yyscanner,int state);
+static void addUsingDirective(yyscan_t yyscanner,const char *name);
+static void pushScope(yyscan_t yyscanner,const char *s);
+static void popScope(yyscan_t yyscanner);
+static void setCurrentDoc(yyscan_t yyscanner,const QCString &anchor);
+static void addToSearchIndex(yyscan_t yyscanner,const char *text);
+static void setClassScope(yyscan_t yyscanner,const QCString &name);
+static void startCodeLine(yyscan_t yyscanner);
+static void endCodeLine(yyscan_t yyscanner);
+static void nextCodeLine(yyscan_t yyscanner);
+static void startFontClass(yyscan_t yyscanner,const char *s);
+static void endFontClass(yyscan_t yyscanner);
+static void codifyLines(yyscan_t yyscanner,const char *text);
+static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol,
+                                   const Definition *d,
+                                   const char *text);
+static void addType(yyscan_t yyscanner);
+static void addParmType(yyscan_t yyscanner);
+static void addUsingDirective(yyscan_t yyscanner,const char *name);
+static void setParameterList(yyscan_t yyscanner,const MemberDef *md);
+static const ClassDef *stripClassName(yyscan_t yyscanner,const char *s,Definition *d);
+static MemberDef *setCallContextForVar(yyscan_t yyscanner,const QCString &name);
+static void updateCallContextForSmartPointer(yyscan_t yyscanner);
+static bool getLinkInScope(yyscan_t yyscanner,const QCString &c,  // scope
+                           const QCString &m,  // member
+			   const char *memberText, // exact text
+			   CodeOutputInterface &ol,
+			   const char *text,
+			   bool varOnly=FALSE
+			  );
+static bool getLink(yyscan_t yyscanner,const char *className,
+                    const char *memberName,
+		    CodeOutputInterface &ol,
+		    const char *text=0,
+		    bool varOnly=FALSE);
+static void generateClassOrGlobalLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *clName,
+                                      bool typeOnly=FALSE,bool varOnly=FALSE);
+static bool generateClassMemberLink(yyscan_t yyscanner,CodeOutputInterface &ol,MemberDef *xmd,const char *memName);
+static bool generateClassMemberLink(yyscan_t yyscanner,CodeOutputInterface &ol,const Definition *def,const char *memName);
+static void generateMemberLink(yyscan_t yyscanner,CodeOutputInterface &ol,const QCString &varName,
+            const char *memName);
+static void generatePHPVariableLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *varName);
+static void generateFunctionLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *funcName);
+static int countLines(yyscan_t yyscanner);
+static void writeObjCMethodCall(yyscan_t yyscanner,ObjCCallCtx *ctx);
+static QCString escapeName(yyscan_t yyscanner,const char *s);
+static QCString escapeObject(yyscan_t yyscanner,const char *s);
+static QCString escapeWord(yyscan_t yyscanner,const char *s);
+static QCString escapeComment(yyscan_t yyscanner,const char *s);
+static bool skipLanguageSpecificKeyword(yyscan_t yyscanner,const QCString &kw);
+static int yyread(yyscan_t yyscanner,char *buf,int max_size);
 
-static void setClassScope(const QCString &name)
-{
-  //printf("setClassScope(%s)\n",name.data());
-  QCString n=name;
-  n=n.simplifyWhiteSpace();
-  int ts=n.find('<'); // start of template
-  int te=n.findRev('>'); // end of template
-  //printf("ts=%d te=%d\n",ts,te);
-  if (ts!=-1 && te!=-1 && te>ts)
-  {
-    // remove template from scope
-    n=n.left(ts)+n.right(n.length()-te-1);
-  }
-  while (!g_classScopeLengthStack.isEmpty())
-  {
-    popScope();
-  }
-  g_classScope.resize(0);
-  int i;
-  while ((i=n.find("::"))!=-1)
-  {
-    pushScope(n.left(i));
-    n = n.mid(i+2);
-  }
-  pushScope(n);
-  //printf("--->New class scope '%s'\n",g_classScope.data());
-}
 
-/*! start a new line of code, inserting a line number if g_sourceFileDef
- * is TRUE. If a definition starts at the current line, then the line
- * number is linked to the documentation of that definition.
+/* -----------------------------------------------------------------
  */
-static void startCodeLine()
-{
-  //if (g_currentFontClass) { g_code->endFontClass(); }
-  if (g_sourceFileDef && g_lineNumbers)
-  {
-    //QCString lineNumber,lineAnchor;
-    //lineNumber.sprintf("%05d",g_yyLineNr);
-    //lineAnchor.sprintf("l%05d",g_yyLineNr);
-   
-    Definition *d   = g_sourceFileDef->getSourceDefinition(g_yyLineNr);
-    //printf("%s:startCodeLine(%d)=%p\n",g_sourceFileDef->name().data(),g_yyLineNr,d);
-    if (!g_includeCodeFragment && d)
-    {
-      g_currentDefinition = d;
-      g_currentMemberDef = g_sourceFileDef->getSourceMember(g_yyLineNr);
-      g_insideBody = FALSE;
-      g_searchingForBody = TRUE;
-      g_realScope = d->name();
-      //g_classScope = "";
-      g_type.resize(0);
-      g_name.resize(0);
-      g_args.resize(0);
-      g_parmType.resize(0);
-      g_parmName.resize(0);
-      //printf("Real scope: '%s'\n",g_realScope.data());
-      g_bodyCurlyCount = 0;
-      QCString lineAnchor;
-      lineAnchor.sprintf("l%05d",g_yyLineNr);
-      if (g_currentMemberDef)
-      {
-        g_code->writeLineNumber(g_currentMemberDef->getReference(),
-	                        g_currentMemberDef->getOutputFileBase(),
-	                        g_currentMemberDef->anchor(),g_yyLineNr);
-        setCurrentDoc(lineAnchor);
-      }
-      else if (d->isLinkableInProject())
-      {
-        g_code->writeLineNumber(d->getReference(),
-	                        d->getOutputFileBase(),
-	                        0,g_yyLineNr);
-        setCurrentDoc(lineAnchor);
-      }
-    }
-    else
-    {
-      g_code->writeLineNumber(0,0,0,g_yyLineNr);
-    }
-  }
-  DBG_CTX((stderr,"startCodeLine(%d)\n",g_yyLineNr));
-  g_code->startCodeLine(g_sourceFileDef && g_lineNumbers); 
-  if (g_currentFontClass)
-  {
-    g_code->startFontClass(g_currentFontClass);
-  }
-}
-
+#undef	YY_INPUT
+#define	YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
 
-static void endFontClass();
-static void startFontClass(const char *s);
 
-static void endCodeLine()
-{
-  DBG_CTX((stderr,"endCodeLine(%d)\n",g_yyLineNr));
-  endFontClass();
-  g_code->endCodeLine();
-}
+%}
 
-static void nextCodeLine()
-{
-  const char * fc = g_currentFontClass;
-  endCodeLine();
-  if (g_yyLineNr<g_inputLines) 
-  {
-    g_currentFontClass = fc;
-    startCodeLine();
-  }
-}
+B       [ \t]
+BN      [ \t\n\r]
+ID	"$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
+SEP     ("::"|"\\")
+SCOPENAME ({SEP}{BN}*)?({ID}{BN}*{SEP}{BN}*)*("~"{BN}*)?{ID}
+TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">"
+SCOPETNAME (((({ID}{TEMPLIST}?){BN}*)?{SEP}{BN}*)*)((~{BN}*)?{ID})
+SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*{SEP}{BN}*)+
+KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property")
+KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"set"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"null"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC})
+FLOWKW  ("break"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"return"|"switch"|"throw"|"throws"|"@catch"|"@finally")
+FLOWCONDITION  ("case"|"for"|"foreach"|"for each"|"goto"|"if"|"try"|"while"|"@try")
+TYPEKW  ("bool"|"byte"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string"|"nullptr")
+TYPEKWSL ("LocalObject"|"Object"|"Value")
+CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast")
+CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
+ARITHOP "+"|"-"|"/"|"*"|"%"|"--"|"++"
+ASSIGNOP "="|"*="|"/="|"%="|"+="|"-="|"<<="|">>="|"&="|"^="|"|="
+LOGICOP "=="|"!="|">"|"<"|">="|"<="|"&&"|"||"|"!"
+BITOP   "&"|"|"|"^"|"<<"|">>"|"~"
+OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
+RAWBEGIN  (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
+RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 
-/*! write a code fragment 'text' that may span multiple lines, inserting
- * line numbers for each line.
- */
-static void codifyLines(const char *text)
-{
-  //printf("codifyLines(%d,\"%s\")\n",g_yyLineNr,text);
-  const char *p=text,*sp=p;
-  char c;
-  bool done=FALSE;
-  while (!done)
-  {
-    sp=p;
-    while ((c=*p++) && c!='\n') { g_yyColNr++; }
-    if (c=='\n')
-    {
-      g_yyLineNr++;
-      g_yyColNr=1;
-      //*(p-1)='\0';
-      int l = (int)(p-sp-1);
-      char *tmp = (char*)malloc(l+1);
-      memcpy(tmp,sp,l);
-      tmp[l]='\0';
-      g_code->codify(tmp);
-      free(tmp);
-      nextCodeLine();
-    }
-    else
-    {
-      g_code->codify(sp);
-      done=TRUE;
-    }
-  }
-}
+%option noyywrap
 
-/*! writes a link to a fragment \a text that may span multiple lines, inserting
- * line numbers for each line. If \a text contains newlines, the link will be 
- * split into multiple links with the same destination, one for each line.
- */
-static void writeMultiLineCodeLink(CodeOutputInterface &ol,
-                                   const Definition *d,
-                                   const char *text)
-{
-  static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS);
-  TooltipManager::instance()->addTooltip(d);
-  QCString ref  = d->getReference();
-  QCString file = d->getOutputFileBase();
-  QCString anchor = d->anchor();
-  QCString tooltip; 
-  if (!sourceTooltips) // fall back to simple "title" tooltips
-  {
-    tooltip = d->briefDescriptionAsTooltip();
-  }
-  bool done=FALSE;
-  char *p=(char *)text;
-  while (!done)
-  {
-    char *sp=p;
-    char c;
-    while ((c=*p++) && c!='\n') { }
-    if (c=='\n')
-    {
-      g_yyLineNr++;
-      *(p-1)='\0';
-      //printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp);
-      ol.writeCodeLink(ref,file,anchor,sp,tooltip);
-      nextCodeLine();
-    }
-    else
-    {
-      //printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp);
-      ol.writeCodeLink(ref,file,anchor,sp,tooltip);
-      done=TRUE;
-    }
-  }
-}
+%x      SkipString
+%x      SkipStringS
+%x      SkipVerbString
+%x	SkipCPP
+%x	SkipComment
+%x	SkipCxxComment
+%x	RemoveSpecialCComment
+%x	StripSpecialCComment
+%x	Body
+%x      FuncCall
+%x      MemberCall
+%x      MemberCall2
+%x      SkipInits
+%x      ClassName
+%x      AlignAs
+%x      AlignAsEnd
+%x      PackageName
+%x      ClassVar
+%x	CppCliTypeModifierFollowup
+%x      Bases
+%x      SkipSharp
+%x      ReadInclude
+%x      TemplDecl
+%x      TemplCast
+%x	CallEnd
+%x      ObjCMethod
+%x	ObjCParams
+%x	ObjCParamType
+%x      ObjCCall
+%x      ObjCMName
+%x      ObjCSkipStr
+%x      ObjCCallComment
+%x      OldStyleArgs
+%x	UsingName
+%x      RawString
+%x      InlineInit
 
-static void addType()
-{
-  if (g_name=="const") { g_name.resize(0); return; }
-  if (!g_type.isEmpty()) g_type += ' ' ;
-  g_type += g_name ;
-  g_name.resize(0) ;
-  if (!g_type.isEmpty()) g_type += ' ' ;
-  g_type += g_args ;
-  g_args.resize(0) ;
-}
+%%
 
-static void addParmType()
-{
-  if (g_parmName=="const") { g_parmName.resize(0); return; }
-  if (!g_parmType.isEmpty()) g_parmType += ' ' ;
-  g_parmType += g_parmName ;
-  g_parmName.resize(0) ;
-}
+<*>\x0d
+<Body>^([ \t]*"#"[ \t]*("include"|"import")[ \t]*)("<"|"\"") {
+  					  startFontClass(yyscanner,"preprocessor");
+					  yyextra->code->codify(yytext);
+  					  BEGIN( ReadInclude ); 
+					}
+<Body>("@interface"|"@implementation"|"@protocol")[ \t\n]+ { 
+                                          yyextra->insideObjC=TRUE;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+  					  if (!yyextra->insideTemplate) 
+					    BEGIN( ClassName ); 
+					}
+<Body>(("public"|"private"){B}+)?("ref"|"value"|"interface"|"enum"){B}+("class"|"struct") {
+  					  if (yyextra->insideTemplate) REJECT;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					  BEGIN( ClassName ); 
+					}
+<Body>"property"|"event"/{BN}*			{ 
+  					  if (yyextra->insideTemplate) REJECT;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					}
+<Body>(KEYWORD_CPPCLI_DATATYPE|("partial"{B}+)?"class"|"struct"|"union"|"namespace"|"interface"){B}+ { 
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+  					  if (!yyextra->insideTemplate) 
+					    BEGIN( ClassName ); 
+					}
+<Body>("package")[ \t\n]+ 		{ 
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					  BEGIN( PackageName ); 
+					}
+<ClassVar>\n				{
+  					  if (!yyextra->insideObjC) REJECT;
+  					  codifyLines(yyscanner,yytext);
+					  BEGIN(Body);
+  					}
+<Body,ClassVar,Bases>"-"|"+"		{
+					  if (!yyextra->insideObjC || yyextra->insideBody)
+					  { 
+  					    yyextra->code->codify(yytext);
+					  }
+					  else // Start of Objective-C method
+					  {
+					    //printf("Method!\n");
+  					    yyextra->code->codify(yytext);
+					    BEGIN(ObjCMethod);
+					  }
+  					}
+<ObjCMethod>":"				{
+  					  yyextra->code->codify(yytext);
+					  BEGIN(ObjCParams);
+  					}
+<ObjCParams>"("				{
+  					  yyextra->code->codify(yytext);
+  					  BEGIN(ObjCParamType);
+					}
+<ObjCParams,ObjCMethod>";"|"{"		{
+  					  yyextra->code->codify(yytext);
+					  if (*yytext=='{')
+					  {
+  					    if (yyextra->searchingForBody)
+					    {
+					      yyextra->searchingForBody=FALSE;
+					      yyextra->insideBody=TRUE;
+					    }
+					    if (yyextra->insideBody) yyextra->bodyCurlyCount++;
+					    if (!yyextra->curClassName.isEmpty()) // valid class name
+					    {
+					      pushScope(yyscanner,yyextra->curClassName);
+                                              DBG_CTX((stderr,"** scope stack push SCOPEBLOCK\n"));
+  					      yyextra->scopeStack.push(SCOPEBLOCK);
+					    }
+					  }
+                                          yyextra->type.resize(0);
+                                          yyextra->name.resize(0);
+					  BEGIN(Body);
+  					}
+<ObjCParams>{ID}{B}*":"			{
+  					  yyextra->code->codify(yytext);
+  					}
+<ObjCParamType>{TYPEKW} 		{
+  					  startFontClass(yyscanner,"keywordtype");
+					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+  					  yyextra->parmType=yytext;
+  					}
+<ObjCParamType>{ID}			{
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->parmType=yytext;
+  					}
+<ObjCParamType>")"			{
+  					  yyextra->code->codify(yytext);
+  					  BEGIN(ObjCParams);
+  					}
+<ObjCParams>{ID}			{
+  					  yyextra->code->codify(yytext);
+  					  yyextra->parmName=yytext;
+					  yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
+					  yyextra->parmType.resize(0);yyextra->parmName.resize(0);
+  					}
+<ObjCMethod,ObjCParams,ObjCParamType>{ID} {
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+  					}
+<ObjCMethod,ObjCParams,ObjCParamType>.	{
+  					  yyextra->code->codify(yytext);
+  					}
+<ObjCMethod,ObjCParams,ObjCParamType>\n	{
+  					  codifyLines(yyscanner,yytext);
+  					}
+<ReadInclude>[^\n\"\>]+/(">"|"\"")  	{
+					  //FileInfo *f;
+					  bool ambig;
+					  bool found=FALSE;
+					  //QCString absPath = yytext;
+					  //if (yyextra->sourceFileDef && QDir::isRelativePath(absPath))
+					  //{
+					  //  absPath = QDir::cleanDirPath(yyextra->sourceFileDef->getPath()+"/"+absPath);
+					  //}
 
-static void addUsingDirective(const char *name)
-{
-  if (g_sourceFileDef && name)
-  {
-    NamespaceDef *nd = Doxygen::namespaceSDict->find(name);
-    if (nd)
-    {
-      g_sourceFileDef->addUsingDirective(nd);
-    }
-  }
-}
+                                          FileDef *fd=findFileDef(Doxygen::inputNameDict,yytext,ambig);
+					  //printf("looking for include %s -> %s fd=%p\n",yytext,absPath.data(),fd);
+					  if (fd && fd->isLinkable())
+					  {
+					    if (ambig) // multiple input files match the name
+					    {
+					      //printf("===== yes %s is ambiguous\n",yytext);
+					      QCString name = QDir::cleanDirPath(yytext).utf8();
+					      if (!name.isEmpty() && yyextra->sourceFileDef)
+					      {
+					        FileName *fn = Doxygen::inputNameDict->find(name);
+						if (fn)
+						{
+						  FileNameIterator fni(*fn);
+						  // for each include name
+						  for (fni.toFirst();!found && (fd=fni.current());++fni)
+						  {
+						    // see if this source file actually includes the file
+						    found = yyextra->sourceFileDef->isIncluded(fd->absFilePath());
+						    //printf("      include file %s found=%d\n",fd->absFilePath().data(),found);
+						  }
+						}
+					      }
+					    }
+					    else // not ambiguous
+					    {
+					      found = TRUE;
+					    }
+					  }
+					  //printf("      include file %s found=%d\n",fd ? fd->absFilePath().data() : "<none>",found);
+					  if (found)
+					  {
+	   	                            writeMultiLineCodeLink(yyscanner,*yyextra->code,fd,yytext);
+					  }
+					  else
+					  {
+					    yyextra->code->codify(yytext);
+					  }
+					  char c=yyinput(yyscanner);
+					  QCString text;
+					  text+=c;
+					  yyextra->code->codify(text);
+					  endFontClass(yyscanner);
+					  BEGIN( Body );
+  					}
+<Body,Bases>^[ \t]*"#"			{ 
+  					  startFontClass(yyscanner,"preprocessor");
+					  yyextra->lastSkipCppContext = YY_START;
+  					  yyextra->code->codify(yytext);
+  					  BEGIN( SkipCPP ) ; 
+					}
+<SkipCPP>.				{ 
+  					  yyextra->code->codify(yytext);
+					}
+<SkipCPP>[^\n\/\\]+			{
+  					  yyextra->code->codify(yytext);
+  					}
+<SkipCPP>\\[\r]?\n			{ 
+  					  codifyLines(yyscanner,yytext);
+					}
+<SkipCPP>"//"				{ 
+  					  yyextra->code->codify(yytext);
+					}
+<Body,FuncCall>"{"			{ 
+                                          yyextra->theVarContext.pushScope();
 
-static void setParameterList(const MemberDef *md)
-{
-  g_classScope = md->getClassDef() ? md->getClassDef()->name().data() : "";
-  for (const Argument &a : md->argumentList())
-  {
-    g_parmName = a.name;
-    g_parmType = a.type;
-    int i = g_parmType.find('*');
-    if (i!=-1) g_parmType = g_parmType.left(i);
-    i = g_parmType.find('&');
-    if (i!=-1) g_parmType = g_parmType.left(i);
-    g_parmType.stripPrefix("const ");
-    g_parmType=g_parmType.stripWhiteSpace();
-    g_theVarContext.addVariable(g_parmType,g_parmName);
-  }
-}
+                                          DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
+  					  yyextra->scopeStack.push(INNERBLOCK);
 
-static const ClassDef *stripClassName(const char *s,Definition *d=g_currentDefinition)
-{
-  int pos=0;
-  QCString type = s;
-  QCString className;
-  QCString templSpec;
-  while (extractClassNameFromType(type,pos,className,templSpec)!=-1)
-  {
-    QCString clName=className+templSpec;
-    const ClassDef *cd=0;
-    if (!g_classScope.isEmpty())
-    {
-      cd=getResolvedClass(d,g_sourceFileDef,g_classScope+"::"+clName);
-    }
-    if (cd==0)
-    {
-      cd=getResolvedClass(d,g_sourceFileDef,clName);
-    }
-    //printf("stripClass trying '%s' = %p\n",clName.data(),cd);
-    if (cd)
-    {
-      return cd;
-    }
-  }
+  					  if (yyextra->searchingForBody)
+					  {
+					    yyextra->searchingForBody=FALSE;
+					    yyextra->insideBody=TRUE;
+					  }
+  					  yyextra->code->codify(yytext);
+					  if (yyextra->insideBody) 
+					  {
+					    yyextra->bodyCurlyCount++;
+					  }
+  					  yyextra->type.resize(0); 
+					  yyextra->name.resize(0);
+					  BEGIN( Body );
+					}
+<Body,FuncCall,MemberCall,MemberCall2>"}"  { 
+                                          yyextra->theVarContext.popScope();
+  					  yyextra->type.resize(0); 
+					  yyextra->name.resize(0);
 
-  return 0;
-}
+					  int *scope = yyextra->scopeStack.pop();
+                                          DBG_CTX((stderr,"** scope stack pop SCOPEBLOCK=%d\n",scope==SCOPEBLOCK));
+  					  if (scope==SCOPEBLOCK || scope==CLASSBLOCK) 
+					  {
+					    popScope(yyscanner);
+					  }
 
-static MemberDef *setCallContextForVar(const QCString &name)
-{
-  if (name.isEmpty()) return 0;
-  DBG_CTX((stderr,"setCallContextForVar(%s) g_classScope=%s\n",name.data(),g_classScope.data()));
+  					  yyextra->code->codify(yytext);
 
-  int scopeEnd = name.findRev("::");
-  if (scopeEnd!=-1) // name with explicit scope
-  {
-    QCString scope   = name.left(scopeEnd);
-    QCString locName = name.right(name.length()-scopeEnd-2);
-    //printf("explicit scope: name=%s scope=%s\n",locName.data(),scope.data());
-    ClassDef *mcd = getClass(scope); 
-    if (mcd && !locName.isEmpty())
-    {
-      MemberDef *md=mcd->getMemberByName(locName);
-      if (md)
-      {
-        //printf("name=%s scope=%s\n",locName.data(),scope.data());
-        g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope()));
-        return md;
-      }
-    }
-    else // check namespace as well
-    {
-      const NamespaceDef *mnd = getResolvedNamespace(scope);
-      if (mnd && !locName.isEmpty())
-      {
-	MemberDef *md=mnd->getMemberByName(locName);
-	if (md)
-	{
-	  //printf("name=%s scope=%s\n",locName.data(),scope.data());
-	  g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope()));
-	  return md;
-	}
-      }
-    }
-  }
-  
-  MemberName *mn;
-  ClassDef *mcd = g_theVarContext.findVariable(name);
-  if (mcd) // local variable
-  {
-    DBG_CTX((stderr,"local variable?\n"));
-    if (mcd!=VariableContext::dummyContext)
-    {
-      DBG_CTX((stderr,"local var '%s' mcd=%s\n",name.data(),mcd->name().data()));
-      g_theCallContext.setScope(mcd);
-    }
-  }
-  else
-  {
-    DBG_CTX((stderr,"class member? scope=%s\n",g_classScope.data()));
-    // look for a class member 
-    mcd = getClass(g_classScope);
-    if (mcd)
-    {
-      DBG_CTX((stderr,"Inside class %s\n",mcd->name().data()));
-      MemberDef *md=mcd->getMemberByName(name);
-      if (md) 
-      {
-        DBG_CTX((stderr,"Found member %s\n",md->name().data()));
-	if (g_scopeStack.top()!=CLASSBLOCK)
-	{
-          DBG_CTX((stderr,"class member '%s' mcd=%s\n",name.data(),mcd->name().data()));
-	  g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope()));
-	}
-	return md;
-      }
-    }
-  }
-
-  // look for a global member
-  if ((mn=Doxygen::functionNameSDict->find(name)))
-  {
-    //printf("global var '%s'\n",name.data());
-    if (mn->count()==1) // global defined only once
-    {
-      MemberDef *md=mn->getFirst();
-      if (!md->isStatic() || md->getBodyDef()==g_sourceFileDef)
-      {
-        g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope()));
-        return md;
-      }
-      return 0;
-    }
-    else if (mn->count()>1) // global defined more than once
-    {
-      MemberNameIterator it(*mn);
-      MemberDef *md;
-      for (;(md=it.current());++it)
-      {
-	//printf("mn=%p md=%p md->getBodyDef()=%p g_sourceFileDef=%p\n",
-	//    mn,md,
-	//    md->getBodyDef(),g_sourceFileDef);
-
-	// in case there are multiple members we could link to, we 
-	// only link to members if defined in the same file or 
-	// defined as external.
-        if ((!md->isStatic() || md->getBodyDef()==g_sourceFileDef) &&
-	    (g_forceTagReference.isEmpty() || g_forceTagReference==md->getReference())
-	   )
-        {
-          g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope()));
-	  //printf("returning member %s in source file %s\n",md->name().data(),g_sourceFileDef->name().data());
-          return md;
-        }
-      }
-      return 0;
-    }
-  }
-  return 0;
-}
-
-static void updateCallContextForSmartPointer()
-{
-  const Definition *d = g_theCallContext.getScope();
-  //printf("updateCallContextForSmartPointer() cd=%s\n",cd ? d->name().data() : "<none>");
-  MemberDef *md;
-  if (d && d->definitionType()==Definition::TypeClass && (md=(dynamic_cast<const ClassDef*>(d))->isSmartPointer()))
-  {
-    const ClassDef *ncd = stripClassName(md->typeString(),md->getOuterScope());
-    if (ncd)
-    {
-      g_theCallContext.setScope(ncd);
-      //printf("Found smart pointer call %s->%s!\n",cd->name().data(),ncd->name().data());
-    }
-  }
-}
+					  DBG_CTX((stderr,"yyextra->bodyCurlyCount=%d\n",yyextra->bodyCurlyCount));
+					  if (--yyextra->bodyCurlyCount<=0)
+					  {
+					    yyextra->insideBody=FALSE;
+					    yyextra->currentMemberDef=0;
+					    if (yyextra->currentDefinition) 
+					      yyextra->currentDefinition=yyextra->currentDefinition->getOuterScope();
+					  }
+					  BEGIN(Body);
+					}
+<Body,ClassVar>"@end"			{ 
+  					  //printf("End of objc scope fd=%s\n",yyextra->sourceFileDef->name().data());
+                                          if (yyextra->sourceFileDef)
+					  {
+					    FileDef *fd=yyextra->sourceFileDef;
+                                            yyextra->insideObjC = fd->name().lower().right(2)==".m" || 
+                                                           fd->name().lower().right(3)==".mm"; 
+					    //printf("insideObjC=%d\n",yyextra->insideObjC);
+					  }
+					  else
+					  {
+					    yyextra->insideObjC = FALSE;
+					  }
+					  if (yyextra->insideBody)
+					  {
+                                            yyextra->theVarContext.popScope();
 
-static bool getLinkInScope(const QCString &c,  // scope
-                           const QCString &m,  // member
-			   const char *memberText, // exact text
-			   CodeOutputInterface &ol,
-			   const char *text,
-			   bool varOnly=FALSE
-			  )
-{
-  const MemberDef    *md = 0;
-  const ClassDef     *cd = 0;
-  const FileDef      *fd = 0;
-  const NamespaceDef *nd = 0;
-  const GroupDef     *gd = 0;
-  DBG_CTX((stderr,"getLinkInScope: trying '%s'::'%s' varOnly=%d\n",c.data(),m.data(),varOnly));
-  if (getDefs(c,m,"()",md,cd,fd,nd,gd,FALSE,g_sourceFileDef,FALSE,g_forceTagReference) && 
-      (!varOnly || md->isVariable()))
-  {
-    if (md->isLinkable())
-    {
-      //printf("found it %s!\n",md->qualifiedName().data());
-      if (g_exampleBlock)
-      {
-        QCString anchor;
-        anchor.sprintf("a%d",g_anchorCount);
-        //printf("addExampleFile(%s,%s,%s)\n",anchor.data(),g_exampleName.data(),
-        //                                  g_exampleFile.data());
-        if (const_cast<MemberDef*>(md)->addExample(anchor,g_exampleName,g_exampleFile))
-        {
-          ol.writeCodeAnchor(anchor);
-          g_anchorCount++;
-        }
-      }
+					    int *scope = yyextra->scopeStack.pop();
+                                            DBG_CTX((stderr,"** scope stack pop SCOPEBLOCK=%d\n",scope==SCOPEBLOCK));
+  					    if (scope==SCOPEBLOCK || scope==CLASSBLOCK) 
+					    {
+					      popScope(yyscanner);
+					    }
+					    yyextra->insideBody=FALSE;
+					  }
 
-      const Definition *d = md->getOuterScope()==Doxygen::globalScope ?
-                            md->resolveAlias()->getFileDef() : md->getOuterScope();
-      if (md->resolveAlias()->getGroupDef()) d = md->resolveAlias()->getGroupDef();
-      if (d && d->isLinkable())
-      {
-        g_theCallContext.setScope(stripClassName(md->typeString(),md->getOuterScope()));
-        //printf("g_currentDefinition=%p g_currentMemberDef=%p g_insideBody=%d\n",
-        //        g_currentDefinition,g_currentMemberDef,g_insideBody);
+					  startFontClass(yyscanner,"keyword");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
 
-        if (g_currentDefinition && g_currentMemberDef &&
-            md!=g_currentMemberDef && g_insideBody && g_collectXRefs)
-        {
-          addDocCrossReference(g_currentMemberDef,const_cast<MemberDef*>(md));
-        }
-        //printf("d->getReference()='%s' d->getOutputBase()='%s' name='%s' member name='%s'\n",d->getReference().data(),d->getOutputFileBase().data(),d->name().data(),md->name().data());
-
-        writeMultiLineCodeLink(ol,md, text ? text : memberText);
-        addToSearchIndex(text ? text : memberText);
-        return TRUE;
-      }
-    }
-    else // found member, but it is not linkable, so make sure content inside is not assigned
-         // to the previous member, see bug762760
-    {
-      DBG_CTX((stderr,"unlinkable member %s\n",md->name().data()));
-      g_currentMemberDef = 0;
-    }
-  }
-  return FALSE;
-}
-
-static bool getLink(const char *className,
-                    const char *memberName,
-		    CodeOutputInterface &ol,
-		    const char *text=0,
-		    bool varOnly=FALSE)
-{
-  //printf("getLink(%s,%s) g_curClassName=%s\n",className,memberName,g_curClassName.data());
-  QCString m=removeRedundantWhiteSpace(memberName);
-  QCString c=className;
-  if (!getLinkInScope(c,m,memberName,ol,text,varOnly))
-  {
-    if (!g_curClassName.isEmpty())
-    {
-      if (!c.isEmpty()) c.prepend("::");
-      c.prepend(g_curClassName);
-      return getLinkInScope(c,m,memberName,ol,text,varOnly);
-    }
-    return FALSE;
-  }
-  return TRUE;
-}
-
-static void generateClassOrGlobalLink(CodeOutputInterface &ol,const char *clName,
-                                      bool typeOnly=FALSE,bool varOnly=FALSE)
-{
-  int i=0;
-  if (*clName=='~') // correct for matching negated values i.s.o. destructors.
-  {
-    g_code->codify("~");
-    clName++;
-  }
-  QCString className=clName;
-  if (className.isEmpty()) return;
-  if (g_insideProtocolList) // for Obj-C
-  {
-    className+="-p";
-  }
-  if (g_lang==SrcLangExt_PHP)
-  {
-    className = substitute(className,"\\","::"); // for PHP namespaces
-  }
-  else if (g_lang==SrcLangExt_CSharp || g_lang==SrcLangExt_Java)
-  {
-    className = substitute(className,".","::"); // for PHP namespaces
-  }
-  const ClassDef *cd=0,*lcd=0;
-  const MemberDef *md=0;
-  bool isLocal=FALSE;
-
-  //printf("generateClassOrGlobalLink(className=%s)\n",className.data());
-  if (!g_prefixed_with_this_keyword || (lcd=g_theVarContext.findVariable(className))==0) // not a local variable
-  {
-    Definition *d = g_currentDefinition;
-    //printf("d=%s g_sourceFileDef=%s\n",d?d->name().data():"<none>",g_sourceFileDef?g_sourceFileDef->name().data():"<none>");
-    cd = getResolvedClass(d,g_sourceFileDef,className,&md);
-    DBG_CTX((stderr,"non-local variable name=%s context=%d cd=%s md=%s!\n",
-    className.data(),g_theVarContext.count(),cd?cd->name().data():"<none>",
-        md?md->name().data():"<none>"));
-    if (cd==0 && md==0 && (i=className.find('<'))!=-1)
-    {
-      QCString bareName = className.left(i); //stripTemplateSpecifiersFromScope(className);
-      DBG_CTX((stderr,"bareName=%s\n",bareName.data()));
-      if (bareName!=className)
-      {
-	cd=getResolvedClass(d,g_sourceFileDef,bareName,&md); // try unspecialized version
-      }
-    }
-    const NamespaceDef *nd = getResolvedNamespace(className);
-    if (nd && nd->isLinkable())
-    {
-      g_theCallContext.setScope(nd);
-      addToSearchIndex(className);
-      writeMultiLineCodeLink(*g_code,nd,clName);
-      return;
-    }
-    //printf("md=%s\n",md?md->name().data():"<none>");
-    DBG_CTX((stderr,"is found as a type cd=%s nd=%s\n",
-          cd?cd->name().data():"<null>",
-          nd?nd->name().data():"<null>"));
-    if (cd==0 && md==0) // also see if it is variable or enum or enum value
-    {
-      if (getLink(g_classScope,clName,ol,clName,varOnly))
-      {
-	return;
-      }
-    }
-  }
-  else
-  {
-    //printf("local variable!\n");
-    if (lcd!=VariableContext::dummyContext) 
-    {
-      //printf("non-dummy context lcd=%s!\n",lcd->name().data());
-      g_theCallContext.setScope(lcd);
-
-      // to following is needed for links to a global variable, but is
-      // no good for a link to a local variable that is also a global symbol.
-       
-      //if (getLink(g_classScope,clName,ol,clName))
-      //{
-	//return;
-      //}
-    }
-    isLocal=TRUE;
-    DBG_CTX((stderr,"is a local variable cd=%p!\n",cd));
-  }
-  g_prefixed_with_this_keyword = FALSE; // discard the "this" prefix for the next calls
-
-  if (cd && cd->isLinkable()) // is it a linkable class
-  {
-    DBG_CTX((stderr,"is linkable class %s\n",clName));
-    if (g_exampleBlock)
-    {
-      QCString anchor;
-      anchor.sprintf("_a%d",g_anchorCount);
-      //printf("addExampleClass(%s,%s,%s)\n",anchor.data(),g_exampleName.data(),
-      //                                   g_exampleFile.data());
-      if (const_cast<ClassDef*>(cd)->addExample(anchor,g_exampleName,g_exampleFile))
-      {
-	ol.writeCodeAnchor(anchor);
-	g_anchorCount++;
-      }
-    }
-    writeMultiLineCodeLink(ol,cd,clName);
-    addToSearchIndex(className);
-    g_theCallContext.setScope(cd);
-    if (md)
-    {
-      const Definition *d = md->getOuterScope()==Doxygen::globalScope ?
-                      md->getFileDef() : md->getOuterScope();
-      if (md->getGroupDef()) d = md->getGroupDef();
-      if (d && d->isLinkable() && md->isLinkable() && 
-          g_currentMemberDef && g_collectXRefs)
-      {
-        addDocCrossReference(g_currentMemberDef,const_cast<MemberDef*>(md));
-      }
-    }
-  }
-  else // not a class, maybe a global member
-  {
-    DBG_CTX((stderr,"class %s not linkable! cd=%p md=%p typeOnly=%d\n",clName,cd,md,typeOnly));
-    if (!isLocal && (md!=0 || (cd==0 && !typeOnly))) // not a class, see if it is a global enum/variable/typedef.
-    {
-      if (md==0) // not found as a typedef
-      {
-	md = setCallContextForVar(clName);
-	//printf("setCallContextForVar(%s) md=%p g_currentDefinition=%p\n",clName,md,g_currentDefinition);
-	if (md && g_currentDefinition)
-	{
-	  DBG_CTX((stderr,"%s accessible from %s? %d md->getOuterScope=%s\n",
-	      md->name().data(),g_currentDefinition->name().data(),
-	      isAccessibleFrom(g_currentDefinition,g_sourceFileDef,md),
-	      md->getOuterScope()->name().data()));
-	}
-	     
-        if (md && g_currentDefinition && 
-	    isAccessibleFrom(g_currentDefinition,g_sourceFileDef,md)==-1)
-	{
-	  md=0; // variable not accessible
-	}
-      }
-      if (md && (!varOnly || md->isVariable()))
-      {
-        DBG_CTX((stderr,"is a global md=%p g_currentDefinition=%s linkable=%d\n",md,g_currentDefinition?g_currentDefinition->name().data():"<none>",md->isLinkable()));
-	if (md->isLinkable())
-	{
-	  QCString text;
-	  if (!g_forceTagReference.isEmpty()) // explicit reference to symbol in tag file
-	  {
-	    text=g_forceTagReference;
-	    if (text.right(4)==".tag") // strip .tag if present
-	    {
-	      text=text.left(text.length()-4);
-	    }
-	    text+=getLanguageSpecificSeparator(md->getLanguage());
-	    text+=clName;
-	    const_cast<MemberDef*>(md)->setName(text);
-            const_cast<MemberDef*>(md)->setLocalName(text);
-	  }
-	  else // normal reference
-	  {
-	    text=clName;
-	  }
-	  writeMultiLineCodeLink(ol,md,text);
-          addToSearchIndex(clName);
-	  if (g_currentMemberDef && g_collectXRefs)
-	  {
-	    addDocCrossReference(g_currentMemberDef,const_cast<MemberDef*>(md));
-	  }
-	  return;
-	}
-      }
-    }
-    
-    // nothing found, just write out the word
-    DBG_CTX((stderr,"not found!\n"));
-    codifyLines(clName);
-    addToSearchIndex(clName);
-  }
-}
-
-static bool generateClassMemberLink(CodeOutputInterface &ol,MemberDef *xmd,const char *memName)
-{
-  // extract class definition of the return type in order to resolve
-  // a->b()->c() like call chains
-
-  //printf("type='%s' args='%s' class=%s\n",
-  //  xmd->typeString(),xmd->argsString(),
-  //  xmd->getClassDef()->name().data());
-
-  if (g_exampleBlock)
-  {
-    QCString anchor;
-    anchor.sprintf("a%d",g_anchorCount);
-    //printf("addExampleFile(%s,%s,%s)\n",anchor.data(),g_exampleName.data(),
-    //                                  g_exampleFile.data());
-    if (xmd->addExample(anchor,g_exampleName,g_exampleFile))
-    {
-      ol.writeCodeAnchor(anchor);
-      g_anchorCount++;
-    }
-  }
-
-  const ClassDef *typeClass = stripClassName(removeAnonymousScopes(xmd->typeString()),xmd->getOuterScope());
-  DBG_CTX((stderr,"%s -> typeName=%p\n",xmd->typeString(),typeClass));
-  g_theCallContext.setScope(typeClass);
-
-  const Definition *xd = xmd->getOuterScope()==Doxygen::globalScope ?
-                   xmd->getFileDef() : xmd->getOuterScope();
-  if (xmd->getGroupDef()) xd = xmd->getGroupDef();
-  if (xd && xd->isLinkable())
-  {
-
-    //printf("g_currentDefinition=%p g_currentMemberDef=%p xmd=%p g_insideBody=%d\n",g_currentDefinition,g_currentMemberDef,xmd,g_insideBody);
-
-    if (xmd->templateMaster()) xmd = xmd->templateMaster();
-
-    if (xmd->isLinkable())
-    {
-      // add usage reference
-      if (g_currentDefinition && g_currentMemberDef &&
-	  /*xmd!=g_currentMemberDef &&*/ g_insideBody && g_collectXRefs)
-      {
-	addDocCrossReference(g_currentMemberDef,xmd);
-      }
-
-      // write the actual link
-      writeMultiLineCodeLink(ol,xmd,memName);
-      addToSearchIndex(memName);
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
-
-static bool generateClassMemberLink(CodeOutputInterface &ol,const Definition *def,const char *memName)
-{
-  if (def && def->definitionType()==Definition::TypeClass)
-  {
-    const ClassDef *cd = dynamic_cast<const ClassDef*>(def);
-    MemberDef *xmd = cd->getMemberByName(memName);
-    //printf("generateClassMemberLink(class=%s,member=%s)=%p\n",def->name().data(),memName,xmd);
-    if (xmd)
-    {
-      return generateClassMemberLink(ol,xmd,memName);
-    }
-    else
-    {
-      Definition *innerDef = cd->findInnerCompound(memName);
-      if (innerDef)
-      {
-        g_theCallContext.setScope(innerDef);
-        addToSearchIndex(memName);
-        writeMultiLineCodeLink(*g_code,innerDef,memName);
-        return TRUE;
-      }
-    }
-  }
-  else if (def && def->definitionType()==Definition::TypeNamespace)
-  {
-    const NamespaceDef *nd = dynamic_cast<const NamespaceDef*>(def);
-    //printf("Looking for %s inside namespace %s\n",memName,nd->name().data());
-    Definition *innerDef = nd->findInnerCompound(memName);
-    if (innerDef)
-    {
-      g_theCallContext.setScope(innerDef);
-      addToSearchIndex(memName);
-      writeMultiLineCodeLink(*g_code,innerDef,memName);
-      return TRUE;
-    }
-  }
-  return FALSE;
-}
-
-static void generateMemberLink(CodeOutputInterface &ol,const QCString &varName,
-            char *memName)
-{
-  //printf("generateMemberLink(object=%s,mem=%s) classScope=%s\n",
-  //    varName.data(),memName,g_classScope.data());
-
-  if (varName.isEmpty()) return;
-
-  // look for the variable in the current context
-  const ClassDef *vcd = g_theVarContext.findVariable(varName);
-  if (vcd) 
-  {
-    if (vcd!=VariableContext::dummyContext)
-    {
-      //printf("Class found!\n");
-      if (getLink(vcd->name(),memName,ol)) 
-      {
-	//printf("Found result!\n");
-	return;
-      }
-      if (vcd->baseClasses())
-      {
-	BaseClassListIterator bcli(*vcd->baseClasses());
-	for ( ; bcli.current() ; ++bcli)
-	{
-	  if (getLink(bcli.current()->classDef->name(),memName,ol)) 
-	  {
-	    //printf("Found result!\n");
-	    return;
-	  }
-	}
-      }
-    }
-  }
-  else // variable not in current context, maybe it is in a parent context
-  {
-    vcd = getResolvedClass(g_currentDefinition,g_sourceFileDef,g_classScope);
-    if (vcd && vcd->isLinkable())
-    {
-      //printf("Found class %s for variable '%s'\n",g_classScope.data(),varName.data());
-      MemberName *vmn=Doxygen::memberNameSDict->find(varName);
-      if (vmn==0)
-      {
-	int vi;
-	QCString vn=varName;
-	if ((vi=vn.findRev("::"))!=-1 || (vi=vn.findRev('.'))!=-1)  // explicit scope A::b(), probably static member
-	{
-	  ClassDef *jcd = getClass(vn.left(vi));
-	  vn=vn.right(vn.length()-vi-2);
-	  vmn=Doxygen::memberNameSDict->find(vn);
-	  //printf("Trying name '%s' scope=%s\n",vn.data(),scope.data());
-	  if (vmn)
-	  {
-	    MemberNameIterator vmni(*vmn);
-	    const MemberDef *vmd;
-	    for (;(vmd=vmni.current());++vmni)
-	    {
-	      if (/*(vmd->isVariable() || vmd->isFunction()) && */
-		  vmd->getClassDef()==jcd)
-	      {
-		//printf("Found variable type=%s\n",vmd->typeString());
-		const ClassDef *mcd=stripClassName(vmd->typeString(),vmd->getOuterScope());
-		if (mcd && mcd->isLinkable())
-		{
-		  if (generateClassMemberLink(ol,mcd,memName)) return;
-		}
-	      }
-	    }
-	  }
-	}
-      }
-      if (vmn)
-      {
-	//printf("There is a variable with name '%s'\n",varName);
-	MemberNameIterator vmni(*vmn);
-	const MemberDef *vmd;
-	for (;(vmd=vmni.current());++vmni)
-	{
-	  if (/*(vmd->isVariable() || vmd->isFunction()) && */
-	      vmd->getClassDef()==vcd)
-	  {
-	    //printf("Found variable type=%s\n",vmd->typeString());
-	    const ClassDef *mcd=stripClassName(vmd->typeString(),vmd->getOuterScope());
-	    if (mcd && mcd->isLinkable())
-	    {
-	      if (generateClassMemberLink(ol,mcd,memName)) return;
-	    }
-	  }
-	}
-      }
-    }
-  }
-  // nothing found -> write result as is
-  codifyLines(memName);
-  addToSearchIndex(memName);
-  return;
-}
-
-static void generatePHPVariableLink(CodeOutputInterface &ol,const char *varName)
-{
-  QCString name = varName+7; // strip $this->
-  name.prepend("$");
-  //printf("generatePHPVariableLink(%s) name=%s scope=%s\n",varName,name.data(),g_classScope.data());
-  if (!getLink(g_classScope,name,ol,varName))
-  {
-    codifyLines(varName);
-  }
-}
-
-static void generateFunctionLink(CodeOutputInterface &ol,const char *funcName)
-{
-  //CodeClassDef *ccd=0;
-  ClassDef *ccd=0;
-  QCString locScope=g_classScope;
-  QCString locFunc=removeRedundantWhiteSpace(funcName);
-  if (g_lang==SrcLangExt_PHP && locFunc.startsWith("self::")) locFunc=locFunc.mid(4);
-  QCString funcScope;
-  QCString funcWithScope=locFunc;
-  QCString funcWithFullScope=locFunc;
-  QCString fullScope=locScope;
-  DBG_CTX((stdout,"*** locScope=%s locFunc=%s\n",locScope.data(),locFunc.data()));
-  int len=2;
-  int i=locFunc.findRev("::");
-  if (g_currentMemberDef && g_currentMemberDef->resolveAlias()->getClassDef() &&
-      funcName==g_currentMemberDef->localName() && 
-      g_currentMemberDef->getDefLine()==g_yyLineNr &&
-      generateClassMemberLink(ol,g_currentMemberDef,funcName)
-     )
-  {
-    // special case where funcName is the name of a method that is also
-    // defined on this line. In this case we can directly link to 
-    // g_currentMemberDef, which is not only faster, but
-    // in case of overloaded methods, this will make sure that we link to
-    // the correct method, and thereby get the correct reimplemented relations.
-    // See also bug 549022.
-    goto exit;
-  }
-  if (i==-1) i=locFunc.findRev("."),len=1;
-  if (i==-1) i=locFunc.findRev("\\"),len=1; // for PHP
-  if (i>0)
-  {
-    funcScope=locFunc.left(i);
-    locFunc=locFunc.right(locFunc.length()-i-len).stripWhiteSpace();
-    int ts=locScope.find('<'); // start of template
-    int te=locScope.findRev('>'); // end of template
-    //printf("ts=%d te=%d\n",ts,te);
-    if (ts!=-1 && te!=-1 && te>ts)
-    {
-      // remove template from scope
-      locScope=locScope.left(ts)+locScope.right(locScope.length()-te-1);
-    }
-    ts=funcScope.find('<'); // start of template
-    te=funcScope.findRev('>'); // end of template
-    //printf("ts=%d te=%d\n",ts,te);
-    if (ts!=-1 && te!=-1 && te>ts)
-    {
-      // remove template from scope
-      funcScope=funcScope.left(ts)+funcScope.right(funcScope.length()-te-1);
-    }
-    if (!funcScope.isEmpty())
-    {
-      funcWithScope = funcScope+"::"+locFunc;
-      if (!locScope.isEmpty())
-      {
-        fullScope=locScope+"::"+funcScope;
-      }
-    }
-    if (!locScope.isEmpty())
-    {
-      funcWithFullScope = locScope+"::"+funcWithScope;
-    }
-  }
-  if (!fullScope.isEmpty() && (ccd=g_codeClassSDict->find(fullScope)))
-  {
-    //printf("using classScope %s\n",g_classScope.data());
-    if (ccd->baseClasses())
-    {
-      BaseClassListIterator bcli(*ccd->baseClasses());
-      for ( ; bcli.current() ; ++bcli)
-      {
-	if (getLink(bcli.current()->classDef->name(),locFunc,ol,funcName)) 
-	{
-	  goto exit;
-	}
-      }
-    }
-  }
-  if (!locScope.isEmpty() && fullScope!=locScope && (ccd=g_codeClassSDict->find(locScope)))
-  {
-    //printf("using classScope %s\n",g_classScope.data());
-    if (ccd->baseClasses())
-    {
-      BaseClassListIterator bcli(*ccd->baseClasses());
-      for ( ; bcli.current() ; ++bcli)
-      {
-	if (getLink(bcli.current()->classDef->name(),funcWithScope,ol,funcName)) 
-	{
-	  goto exit;
-	}
-      }
-    }
-  }
-  if (!getLink(locScope,funcWithScope,ol,funcName))
-  {
-    generateClassOrGlobalLink(ol,funcName);
-  }
-exit:  
-  g_forceTagReference.resize(0);
-  return;
-}
-
-/*! counts the number of lines in the input */
-static int countLines()
-{
-  const char *p=g_inputString;
-  char c;
-  int count=1;
-  while ((c=*p)) 
-  { 
-    p++ ; 
-    if (c=='\n') count++;  
-  }
-  if (p>g_inputString && *(p-1)!='\n') 
-  { // last line does not end with a \n, so we add an extra
-    // line and explicitly terminate the line after parsing.
-    count++, 
-    g_needsTermination=TRUE; 
-  } 
-  return count;
-}
-
-static void endFontClass()
-{
-  if (g_currentFontClass)
-  {
-    g_code->endFontClass();
-    g_currentFontClass=0;
-  }
-}
-
-static void startFontClass(const char *s)
-{
-  endFontClass();
-  g_code->startFontClass(s);
-  g_currentFontClass=s;
-}
-
-//----------------------------------------------------------------------------
-
-// recursively writes a linkified Objective-C method call
-static void writeObjCMethodCall(ObjCCallCtx *ctx)
-{
-  if (ctx==0) return;
-  char c;
-  const char *p = ctx->format.data();
-  if (!ctx->methodName.isEmpty())
-  {
-    //printf("writeObjCMethodCall(%s) obj=%s method=%s\n",
-    //    ctx->format.data(),ctx->objectTypeOrName.data(),ctx->methodName.data());
-    if (!ctx->objectTypeOrName.isEmpty() && ctx->objectTypeOrName.at(0)!='$')
-    {
-      //printf("Looking for object=%s method=%s\n",ctx->objectTypeOrName.data(),
-      //	ctx->methodName.data());
-      ClassDef *cd = g_theVarContext.findVariable(ctx->objectTypeOrName);
-      if (cd==0) // not a local variable
-      {
-	if (ctx->objectTypeOrName=="self")
-	{
-	  if (g_currentDefinition && 
-	      g_currentDefinition->definitionType()==Definition::TypeClass)
-	  {
-	    ctx->objectType = dynamic_cast<ClassDef *>(g_currentDefinition);
-	  }
-	}
-	else
-	{
-	  ctx->objectType = getResolvedClass(
-	      g_currentDefinition,
-	      g_sourceFileDef,
-	      ctx->objectTypeOrName,
-	      &ctx->method);
-	}
-	//printf("  object is class? %p\n",ctx->objectType);
-	if (ctx->objectType) // found class
-	{
-	  ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
-	  //printf("    yes->method=%s\n",ctx->method?ctx->method->name().data():"<none>");
-	}
-	else if (ctx->method==0) // search for class variable with the same name
-	{
-	  //printf("    no\n");
-	  //printf("g_currentDefinition=%p\n",g_currentDefinition);
-	  if (g_currentDefinition && 
-	      g_currentDefinition->definitionType()==Definition::TypeClass)
-	  {
-	    ctx->objectVar = (dynamic_cast<ClassDef *>(g_currentDefinition))->getMemberByName(ctx->objectTypeOrName);
-	    //printf("      ctx->objectVar=%p\n",ctx->objectVar);
-	    if (ctx->objectVar)
-	    {
-	      ctx->objectType = stripClassName(ctx->objectVar->typeString());
-	      //printf("        ctx->objectType=%p\n",ctx->objectType);
-	      if (ctx->objectType && !ctx->methodName.isEmpty())
-	      {
-		ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
-		//printf("          ctx->method=%p\n",ctx->method);
-	      }
-	    }
-	  }
-	}
-      }
-      else // local variable
-      {
-	//printf("  object is local variable\n");
-	if (cd!=VariableContext::dummyContext && !ctx->methodName.isEmpty())
-	{
-	  ctx->method = cd->getMemberByName(ctx->methodName);
-	  //printf("   class=%p method=%p\n",cd,ctx->method);
-	}
-      }
-    }
-  }
-
-  //printf("[");
-  while ((c=*p++)) // for each character in ctx->format
-  {
-    if (c=='$')
-    {
-      char nc=*p++;
-      if (nc=='$') // escaped $
-      {
-	g_code->codify("$");
-      }
-      else // name fragment or reference to a nested call 
-      {
-	if (nc=='n') // name fragment
-	{
-          nc=*p++;
-	  QCString refIdStr;
-	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
-	  p--;
-	  int refId=refIdStr.toInt();
-	  QCString *pName = g_nameDict.find(refId);
-	  if (pName)
-	  {
-	    if (ctx->method && ctx->method->isLinkable())
-	    {
-              writeMultiLineCodeLink(*g_code,ctx->method,pName->data());
-	      if (g_currentMemberDef && g_collectXRefs)
-	      {
-	        addDocCrossReference(g_currentMemberDef,const_cast<MemberDef*>(ctx->method));
-	      }
-	    }
-	    else
-	    {
-   	      codifyLines(pName->data());
-	    }
-	  }
-	  else
-	  {
-	    //printf("Invalid name: id=%d\n",refId);
-	  }
-	}
-	else if (nc=='o') // reference to potential object name
-	{
-          nc=*p++;
-	  QCString refIdStr;
-	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
-	  p--;
-	  int refId=refIdStr.toInt();
-	  QCString *pObject = g_objectDict.find(refId);
-	  if (pObject)
-	  {
-	    if (*pObject=="self")
-	    {
-	      if (g_currentDefinition && 
-		  g_currentDefinition->definitionType()==Definition::TypeClass)
-	      {
-	        ctx->objectType = dynamic_cast<ClassDef *>(g_currentDefinition);
-	        if (ctx->objectType->categoryOf()) 
-	        {
-	          ctx->objectType = ctx->objectType->categoryOf();
-	        }
-	        if (ctx->objectType && !ctx->methodName.isEmpty())
-	        {
-	          ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
-	        }
-	      }
- 	      startFontClass("keyword");
-              codifyLines(pObject->data());
-	      endFontClass();
-	    }
-	    else if (*pObject=="super")
-	    {
-	      if (g_currentDefinition &&
-		  g_currentDefinition->definitionType()==Definition::TypeClass)
-	      {
-		ClassDef *cd = dynamic_cast<ClassDef *>(g_currentDefinition);
-		if (cd->categoryOf()) 
-		{
-		  cd = cd->categoryOf();
-		}
-		BaseClassList *bcd = cd->baseClasses();
-		if (bcd) // get direct base class (there should be only one)
-		{
-		  BaseClassListIterator bli(*bcd);
-		  BaseClassDef *bclass;
-		  for (bli.toFirst();(bclass=bli.current());++bli)
-		  {
-		    if (bclass->classDef->compoundType()!=ClassDef::Protocol)
-		    {
-		      ctx->objectType = bclass->classDef;
-		      if (ctx->objectType && !ctx->methodName.isEmpty())
-		      {
-			ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
-		      }
-		    }
-		  }
-		}
-	      }
- 	      startFontClass("keyword");
-              codifyLines(pObject->data());
-	      endFontClass();
-	    }
-	    else if (ctx->objectVar && ctx->objectVar->isLinkable()) // object is class variable
-	    {
-	      writeMultiLineCodeLink(*g_code,ctx->objectVar,pObject->data());
-	      if (g_currentMemberDef && g_collectXRefs)
-	      {
-	        addDocCrossReference(g_currentMemberDef,const_cast<MemberDef*>(ctx->objectVar));
-	      }
-	    }
-	    else if (ctx->objectType && 
-		     ctx->objectType!=VariableContext::dummyContext && 
-		     ctx->objectType->isLinkable()
-		    ) // object is class name
-	    {
-	      const ClassDef *cd = ctx->objectType;
-	      writeMultiLineCodeLink(*g_code,cd,pObject->data());
-	    }
-	    else // object still needs to be resolved
-	    {
-	      const ClassDef *cd = getResolvedClass(g_currentDefinition, 
-		  g_sourceFileDef, *pObject);
-	      if (cd && cd->isLinkable())
-	      {
-		if (ctx->objectType==0) ctx->objectType=cd;
-	   	writeMultiLineCodeLink(*g_code,cd,pObject->data());
-	      }
-	      else
-	      {
-		codifyLines(pObject->data());
-	      }
-	    }
-	  }
-	  else
-	  {
-	    //printf("Invalid object: id=%d\n",refId);
-	  }
-	}
-	else if (nc=='c') // reference to nested call
-	{
-          nc=*p++;
-	  QCString refIdStr;
-	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
-	  p--;
-	  int refId=refIdStr.toInt();
-	  ObjCCallCtx *ictx = g_contextDict.find(refId);
-	  if (ictx) // recurse into nested call
-	  {
-	    writeObjCMethodCall(ictx);
-	    if (ictx->method) // link to nested call successfully
-	    {
-	      // get the ClassDef representing the method's return type
-	      if (QCString(ictx->method->typeString())=="id")
-	      {
-		// see if the method name is unique, if so we link to it
-		MemberName *mn=Doxygen::memberNameSDict->find(ctx->methodName);
-		//printf("mn->count=%d ictx->method=%s ctx->methodName=%s\n",
-		//    mn==0?-1:(int)mn->count(),
-		//    ictx->method->name().data(),
-		//    ctx->methodName.data());
-		if (mn && mn->count()==1) // member name unique
-		{
-		  ctx->method = mn->getFirst();
-		}
-	      } 
-	      else
-	      {
-		ctx->objectType = stripClassName(ictx->method->typeString());
-		if (ctx->objectType && !ctx->methodName.isEmpty())
-		{
-		  ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
-		}
-	      }
-	      //printf("  ***** method=%s -> object=%p\n",ictx->method->name().data(),ctx->objectType);
-	    }
-	  }
-	  else
-	  {
-	    //printf("Invalid context: id=%d\n",refId);
-	  }
-	}
-	else if (nc=='w') // some word
-	{
-          nc=*p++;
-	  QCString refIdStr;
-	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
-	  p--;
-	  int refId=refIdStr.toInt();
-	  QCString *pWord = g_wordDict.find(refId);
-	  if (pWord)
-	  {
-            codifyLines(pWord->data());
-	  }
-	}
-        else if (nc=='d') // comment block
-        {
-          nc=*p++;
-	  QCString refIdStr;
-	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
-	  p--;
-	  int refId=refIdStr.toInt();
-	  QCString *pComment = g_commentDict.find(refId);
-          if (pComment)
-          {
-            startFontClass("comment");
-	    codifyLines(pComment->data());
-	    endFontClass();
-          }
-        }
-	else // illegal marker
-	{
-	  ASSERT(!"invalid escape sequence");
-	}
-      }
-    }
-    else // normal non-marker character
-    {
-      char s[2];
-      s[0]=c;s[1]=0;
-      codifyLines(s);
-    }
-  }
-  //printf("%s %s]\n",ctx->objectTypeOrName.data(),ctx->methodName.data());
-  //printf("}=(type='%s',name='%s')",
-  //    ctx->objectTypeOrName.data(),
-  //    ctx->methodName.data());
-}
-
-// Replaces an Objective-C method name fragment s by a marker of the form
-// $n12, the number (12) can later be used as a key for obtaining the name 
-// fragment, from g_nameDict
-static QCString escapeName(const char *s)
-{
-  QCString result;
-  result.sprintf("$n%d",g_currentNameId);
-  g_nameDict.insert(g_currentNameId,new QCString(s));
-  g_currentNameId++;
-  return result;
-}
-
-static QCString escapeObject(const char *s)
-{
-  QCString result;
-  result.sprintf("$o%d",g_currentObjId);
-  g_objectDict.insert(g_currentObjId,new QCString(s));
-  g_currentObjId++;
-  return result;
-}
-
-static QCString escapeWord(const char *s)
-{
-  QCString result;
-  result.sprintf("$w%d",g_currentWordId);
-  g_wordDict.insert(g_currentWordId,new QCString(s));
-  g_currentWordId++;
-  return result;
-}
-
-static QCString escapeComment(const char *s)
-{
-  QCString result;
-  result.sprintf("$d%d",g_currentCommentId);
-  g_commentDict.insert(g_currentCommentId,new QCString(s));
-  g_currentCommentId++;
-  return result;
-}
-
-static bool skipLanguageSpecificKeyword(const QCString &kw)
-{
-  return g_lang==SrcLangExt_Cpp && (kw == "remove" || kw == "set" || kw == "get");
-}
-
-static bool isCastKeyword(const QCString &s)
-{
-  int i=s.find('<');
-  if (i==-1) return FALSE;
-  QCString kw = s.left(i).stripWhiteSpace();
-  return kw=="const_cast" || kw=="static_cast" || kw=="dynamic_cast" || kw=="reinterpret_cast";
-}
-
-/* -----------------------------------------------------------------
- */
-#undef	YY_INPUT
-#define	YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
-
-static int yyread(char *buf,int max_size)
-{
-    int c=0;
-    while( c < max_size && g_inputString[g_inputPosition] )
-    {
-	*buf = g_inputString[g_inputPosition++] ;
-	c++; buf++;
-    }
-    return c;
-}
-
-%}
-
-B       [ \t]
-BN      [ \t\n\r]
-ID	"$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
-SEP     ("::"|"\\")
-SCOPENAME ({SEP}{BN}*)?({ID}{BN}*{SEP}{BN}*)*("~"{BN}*)?{ID}
-TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">"
-SCOPETNAME (((({ID}{TEMPLIST}?){BN}*)?{SEP}{BN}*)*)((~{BN}*)?{ID})
-SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*{SEP}{BN}*)+
-KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property")
-KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"set"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"null"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{KEYWORD_OBJC})
-FLOWKW  ("break"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"return"|"switch"|"throw"|"throws"|"@catch"|"@finally")
-FLOWCONDITION  ("case"|"for"|"foreach"|"for each"|"goto"|"if"|"try"|"while"|"@try")
-TYPEKW  ("bool"|"byte"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string"|"nullptr")
-TYPEKWSL ("LocalObject"|"Object"|"Value")
-CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast")
-CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
-ARITHOP "+"|"-"|"/"|"*"|"%"|"--"|"++"
-ASSIGNOP "="|"*="|"/="|"%="|"+="|"-="|"<<="|">>="|"&="|"^="|"|="
-LOGICOP "=="|"!="|">"|"<"|">="|"<="|"&&"|"||"|"!"
-BITOP   "&"|"|"|"^"|"<<"|">>"|"~"
-OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
-RAWBEGIN  (u|U|L|u8)?R\"[^ \t\(\)\\]{0,16}"("
-RAWEND    ")"[^ \t\(\)\\]{0,16}\"
-
-%option noyywrap
-
-%x      SkipString
-%x      SkipStringS
-%x      SkipVerbString
-%x	SkipCPP
-%x	SkipComment
-%x	SkipCxxComment
-%x	RemoveSpecialCComment
-%x	StripSpecialCComment
-%x	Body
-%x      FuncCall
-%x      MemberCall
-%x      MemberCall2
-%x      SkipInits
-%x      ClassName
-%x      AlignAs
-%x      AlignAsEnd
-%x      PackageName
-%x      ClassVar
-%x	CppCliTypeModifierFollowup
-%x      Bases
-%x      SkipSharp
-%x      ReadInclude
-%x      TemplDecl
-%x      TemplCast
-%x	CallEnd
-%x      ObjCMethod
-%x	ObjCParams
-%x	ObjCParamType
-%x      ObjCCall
-%x      ObjCMName
-%x      ObjCSkipStr
-%x      ObjCCallComment
-%x      OldStyleArgs
-%x	UsingName
-%x      RawString
-%x      InlineInit
-
-%%
-
-<*>\x0d
-<Body>^([ \t]*"#"[ \t]*("include"|"import")[ \t]*)("<"|"\"") {
-  					  startFontClass("preprocessor");
-					  g_code->codify(yytext);
-  					  BEGIN( ReadInclude ); 
-					}
-<Body>("@interface"|"@implementation"|"@protocol")[ \t\n]+ { 
-                                          g_insideObjC=TRUE;
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-  					  if (!g_insideTemplate) 
-					    BEGIN( ClassName ); 
-					}
-<Body>(("public"|"private"){B}+)?("ref"|"value"|"interface"|"enum"){B}+("class"|"struct") {
-  					  if (g_insideTemplate) REJECT;
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-					  BEGIN( ClassName ); 
-					}
-<Body>"property"|"event"/{BN}*			{ 
-  					  if (g_insideTemplate) REJECT;
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-					}
-<Body>(KEYWORD_CPPCLI_DATATYPE|("partial"{B}+)?"class"|"struct"|"union"|"namespace"|"interface"){B}+ { 
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-  					  if (!g_insideTemplate) 
-					    BEGIN( ClassName ); 
-					}
-<Body>("package")[ \t\n]+ 		{ 
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-					  BEGIN( PackageName ); 
-					}
-<ClassVar>\n				{
-  					  if (!g_insideObjC) REJECT;
-  					  codifyLines(yytext);
-					  BEGIN(Body);
-  					}
-<Body,ClassVar,Bases>"-"|"+"		{
-					  if (!g_insideObjC || g_insideBody)
-					  { 
-  					    g_code->codify(yytext);
-					  }
-					  else // Start of Objective-C method
-					  {
-					    //printf("Method!\n");
-  					    g_code->codify(yytext);
-					    BEGIN(ObjCMethod);
-					  }
-  					}
-<ObjCMethod>":"				{
-  					  g_code->codify(yytext);
-					  BEGIN(ObjCParams);
-  					}
-<ObjCParams>"("				{
-  					  g_code->codify(yytext);
-  					  BEGIN(ObjCParamType);
-					}
-<ObjCParams,ObjCMethod>";"|"{"		{
-  					  g_code->codify(yytext);
-					  if (*yytext=='{')
-					  {
-  					    if (g_searchingForBody)
-					    {
-					      g_searchingForBody=FALSE;
-					      g_insideBody=TRUE;
-					    }
-					    if (g_insideBody) g_bodyCurlyCount++;
-					    if (!g_curClassName.isEmpty()) // valid class name
-					    {
-					      pushScope(g_curClassName);
-                                              DBG_CTX((stderr,"** scope stack push SCOPEBLOCK\n"));
-  					      g_scopeStack.push(SCOPEBLOCK);
-					    }
-					  }
-                                          g_type.resize(0);
-                                          g_name.resize(0);
-					  BEGIN(Body);
-  					}
-<ObjCParams>{ID}{B}*":"			{
-  					  g_code->codify(yytext);
-  					}
-<ObjCParamType>{TYPEKW} 		{
-  					  startFontClass("keywordtype");
-					  g_code->codify(yytext);
-					  endFontClass();
-  					  g_parmType=yytext;
-  					}
-<ObjCParamType>{ID}			{
-					  generateClassOrGlobalLink(*g_code,yytext);
-  					  g_parmType=yytext;
-  					}
-<ObjCParamType>")"			{
-  					  g_code->codify(yytext);
-  					  BEGIN(ObjCParams);
-  					}
-<ObjCParams>{ID}			{
-  					  g_code->codify(yytext);
-  					  g_parmName=yytext;
-					  g_theVarContext.addVariable(g_parmType,g_parmName);
-					  g_parmType.resize(0);g_parmName.resize(0);
-  					}
-<ObjCMethod,ObjCParams,ObjCParamType>{ID} {
-					  generateClassOrGlobalLink(*g_code,yytext);
-  					}
-<ObjCMethod,ObjCParams,ObjCParamType>.	{
-  					  g_code->codify(yytext);
-  					}
-<ObjCMethod,ObjCParams,ObjCParamType>\n	{
-  					  codifyLines(yytext);
-  					}
-<ReadInclude>[^\n\"\>]+/(">"|"\"")  	{
-					  //FileInfo *f;
-					  bool ambig;
-					  bool found=FALSE;
-					  //QCString absPath = yytext;
-					  //if (g_sourceFileDef && QDir::isRelativePath(absPath))
-					  //{
-					  //  absPath = QDir::cleanDirPath(g_sourceFileDef->getPath()+"/"+absPath);
-					  //}
-
-                                          FileDef *fd=findFileDef(Doxygen::inputNameDict,yytext,ambig);
-					  //printf("looking for include %s -> %s fd=%p\n",yytext,absPath.data(),fd);
-					  if (fd && fd->isLinkable())
-					  {
-					    if (ambig) // multiple input files match the name
-					    {
-					      //printf("===== yes %s is ambiguous\n",yytext);
-					      QCString name = QDir::cleanDirPath(yytext).utf8();
-					      if (!name.isEmpty() && g_sourceFileDef)
-					      {
-					        FileName *fn = Doxygen::inputNameDict->find(name);
-						if (fn)
-						{
-						  FileNameIterator fni(*fn);
-						  // for each include name
-						  for (fni.toFirst();!found && (fd=fni.current());++fni)
-						  {
-						    // see if this source file actually includes the file
-						    found = g_sourceFileDef->isIncluded(fd->absFilePath());
-						    //printf("      include file %s found=%d\n",fd->absFilePath().data(),found);
-						  }
-						}
-					      }
-					    }
-					    else // not ambiguous
-					    {
-					      found = TRUE;
-					    }
-					  }
-					  //printf("      include file %s found=%d\n",fd ? fd->absFilePath().data() : "<none>",found);
-					  if (found)
-					  {
-	   	                            writeMultiLineCodeLink(*g_code,fd,yytext);
-					  }
-					  else
-					  {
-					    g_code->codify(yytext);
-					  }
-					  char c=yyinput();
-					  QCString text;
-					  text+=c;
-					  g_code->codify(text);
-					  endFontClass();
-					  BEGIN( Body );
-  					}
-<Body,Bases>^[ \t]*"#"			{ 
-  					  startFontClass("preprocessor");
-					  g_lastSkipCppContext = YY_START;
-  					  g_code->codify(yytext);
-  					  BEGIN( SkipCPP ) ; 
-					}
-<SkipCPP>.				{ 
-  					  g_code->codify(yytext);
-					}
-<SkipCPP>[^\n\/\\]+			{
-  					  g_code->codify(yytext);
-  					}
-<SkipCPP>\\[\r]?\n			{ 
-  					  codifyLines(yytext);
-					}
-<SkipCPP>"//"				{ 
-  					  g_code->codify(yytext);
-					}
-<Body,FuncCall>"{"			{ 
-                                          g_theVarContext.pushScope();
-
-                                          DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
-  					  g_scopeStack.push(INNERBLOCK);
-
-  					  if (g_searchingForBody)
-					  {
-					    g_searchingForBody=FALSE;
-					    g_insideBody=TRUE;
-					  }
-  					  g_code->codify(yytext);
-					  if (g_insideBody) 
-					  {
-					    g_bodyCurlyCount++;
-					  }
-  					  g_type.resize(0); 
-					  g_name.resize(0);
-					  BEGIN( Body );
-					}
-<Body,FuncCall,MemberCall,MemberCall2>"}"  { 
-                                          g_theVarContext.popScope();
-  					  g_type.resize(0); 
-					  g_name.resize(0);
-
-					  int *scope = g_scopeStack.pop();
-                                          DBG_CTX((stderr,"** scope stack pop SCOPEBLOCK=%d\n",scope==SCOPEBLOCK));
-  					  if (scope==SCOPEBLOCK || scope==CLASSBLOCK) 
-					  {
-					    popScope();
-					  }
-
-  					  g_code->codify(yytext);
-
-					  DBG_CTX((stderr,"g_bodyCurlyCount=%d\n",g_bodyCurlyCount));
-					  if (--g_bodyCurlyCount<=0)
-					  {
-					    g_insideBody=FALSE;
-					    g_currentMemberDef=0;
-					    if (g_currentDefinition) 
-					      g_currentDefinition=g_currentDefinition->getOuterScope();
-					  }
-					  BEGIN(Body);
-					}
-<Body,ClassVar>"@end"			{ 
-  					  //printf("End of objc scope fd=%s\n",g_sourceFileDef->name().data());
-                                          if (g_sourceFileDef)
-					  {
-					    FileDef *fd=g_sourceFileDef;
-                                            g_insideObjC = fd->name().lower().right(2)==".m" || 
-                                                           fd->name().lower().right(3)==".mm"; 
-					    //printf("insideObjC=%d\n",g_insideObjC);
-					  }
-					  else
-					  {
-					    g_insideObjC = FALSE;
-					  }
-					  if (g_insideBody)
-					  {
-                                            g_theVarContext.popScope();
-
-					    int *scope = g_scopeStack.pop();
-                                            DBG_CTX((stderr,"** scope stack pop SCOPEBLOCK=%d\n",scope==SCOPEBLOCK));
-  					    if (scope==SCOPEBLOCK || scope==CLASSBLOCK) 
-					    {
-					      popScope();
-					    }
-					    g_insideBody=FALSE;
-					  }
-
-					  startFontClass("keyword");
-  					  g_code->codify(yytext);
-					  endFontClass();
-
-					  g_currentMemberDef=0;
-					  if (g_currentDefinition) 
-					    g_currentDefinition=g_currentDefinition->getOuterScope();
-					  BEGIN(Body);
-					}
-<ClassName,ClassVar>";"			{ 
-  					  g_code->codify(yytext);
-					  g_searchingForBody=FALSE; 
-  					  BEGIN( Body ); 
-					}
-<ClassName,ClassVar>[*&^%]+       	{
-  					  g_type=g_curClassName.copy();
-  					  g_name.resize(0);
-					  g_code->codify(yytext);
-					  BEGIN( Body ); // variable of type struct *
-					}
-<ClassName>"__declspec"{B}*"("{B}*{ID}{B}*")"	{
-					  startFontClass("keyword");
-  					  g_code->codify(yytext);
-					  endFontClass();
-					}
-<ClassName>{ID}("."{ID})*	        |
-<ClassName>{ID}("::"{ID})*	        {
-                                          if (g_lang==SrcLangExt_CSharp)
-                                            g_curClassName=substitute(yytext,".","::");
-                                          else
-                                            g_curClassName=yytext;
-					  addType();
-                                          if (g_curClassName=="alignas")
-                                          {
-  					    startFontClass("keyword");
-					    g_code->codify(yytext);
-                                            endFontClass();
-                                            BEGIN( AlignAs );
-                                          }
-                                          else
-                                          {
-					    generateClassOrGlobalLink(*g_code,yytext);
-					    BEGIN( ClassVar );
-                                          }
-					}
-<AlignAs>"("                            { 
-                                          g_bracketCount=1;
-					  g_code->codify(yytext);
-                                          BEGIN( AlignAsEnd );
-                                        }
-<AlignAs>\n                             { g_yyLineNr++; 
-                                          codifyLines(yytext);
-                                        }
-<AlignAs>.                              { g_code->codify(yytext); }
-<AlignAsEnd>"("                         { g_code->codify(yytext);
-                                          g_bracketCount++; 
-                                        }
-<AlignAsEnd>")"                         { 
-                                          g_code->codify(yytext);
-                                          if (--g_bracketCount<=0)
-                                          {
-                                            BEGIN(ClassName);
-                                          }
-                                        }
-<AlignAsEnd>\n                          { g_yyLineNr++; 
-                                          codifyLines(yytext); 
-                                        }
-<AlignAsEnd>.                           { g_code->codify(yytext); }
-<ClassName>{ID}("\\"{ID})*		{ // PHP namespace
-                                          g_curClassName=substitute(yytext,"\\","::");
-  					  g_scopeStack.push(CLASSBLOCK);
-					  pushScope(g_curClassName);
-					  addType();
-					  generateClassOrGlobalLink(*g_code,yytext);
-					  BEGIN( ClassVar );
-  					}
-<ClassName>{ID}{B}*"("{ID}")"           { // Obj-C category
-                                          g_curClassName=removeRedundantWhiteSpace(yytext);
-  					  g_scopeStack.push(CLASSBLOCK);
-					  pushScope(g_curClassName);
-					  addType();
-					  generateClassOrGlobalLink(*g_code,yytext);
-					  BEGIN( ClassVar );
-                                        }
-<PackageName>{ID}("."{ID})*		{
-					  g_curClassName=substitute(yytext,".","::");
-					  //printf("found package: %s\n",g_curClassName.data());
-					  addType();
-					  codifyLines(yytext);
-  					}
-<ClassVar>"="				{
-					  unput(*yytext);
-					  BEGIN( Body );
-  					}
-<ClassVar>("extends"|"implements")	{ // Java, Slice
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-					  g_curClassBases.clear();
-  					  BEGIN( Bases ); 
-					}
-<ClassVar>("sealed"|"abstract")/{BN}*(":"|"{") {
-					  DBG_CTX((stderr,"***** C++/CLI modifier %s on g_curClassName=%s\n",yytext,g_curClassName.data()));
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-  					  BEGIN( CppCliTypeModifierFollowup ); 
-					}
-<ClassVar>{ID}				{
-  					  g_type = g_curClassName.copy();
-					  g_name = yytext;
-					  if (g_insideBody)
-					  {
-					    g_theVarContext.addVariable(g_type,g_name);
-					  }
-					  generateClassOrGlobalLink(*g_code,yytext);
-  					}
-<ClassName,ClassVar,CppCliTypeModifierFollowup>{B}*":"{B}*	{
-  					  codifyLines(yytext);
-					  g_curClassBases.clear();
-  					  BEGIN( Bases ); 
-					}
-<PackageName>[ \t]*";"			|
-<Bases>^{B}*/"@"{ID}                    | // Objective-C interface
-<Bases,ClassName,ClassVar,CppCliTypeModifierFollowup>{B}*"{"{B}* {
-                                          g_theVarContext.pushScope();
-  					  g_code->codify(yytext);
-					  if (YY_START==ClassVar && g_curClassName.isEmpty())
-					  {
-					    g_curClassName = g_name.copy();
-					  }
-  					  if (g_searchingForBody)
-					  {
-					    g_searchingForBody=FALSE;
-					    g_insideBody=TRUE;
-					  }
-					  if (g_insideBody) g_bodyCurlyCount++;
-					  if (!g_curClassName.isEmpty()) // valid class name
-					  {
-                                            DBG_CTX((stderr,"** scope stack push CLASSBLOCK\n"));
-  					    g_scopeStack.push(CLASSBLOCK);
-					    pushScope(g_curClassName);
-					    DBG_CTX((stderr,"***** g_curClassName=%s\n",g_curClassName.data()));
-					    if (getResolvedClass(g_currentDefinition,g_sourceFileDef,g_curClassName)==0)
-					    {
-					      DBG_CTX((stderr,"Adding new class %s\n",g_curClassName.data()));
-					      ClassDef *ncd=createClassDef("<code>",1,1,
-				 		  g_curClassName,ClassDef::Class,0,0,FALSE);
-					      g_codeClassSDict->append(g_curClassName,ncd);
-					      // insert base classes.
-					      char *s=g_curClassBases.first();
-					      while (s)
-					      {
-						const ClassDef *bcd=g_codeClassSDict->find(s);
-						if (bcd==0) bcd=getResolvedClass(g_currentDefinition,g_sourceFileDef,s);
-						if (bcd && bcd!=ncd)
-						{
-						  ncd->insertBaseClass(const_cast<ClassDef*>(bcd),s,Public,Normal);
-						}
-						s=g_curClassBases.next();
-					      }
-					    }
-					    //printf("g_codeClassList.count()=%d\n",g_codeClassList.count());
-					  }
-					  else // not a class name -> assume inner block
-					  {
-                                            DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
-  					    g_scopeStack.push(INNERBLOCK);
-					  }
-					  g_curClassName.resize(0);
-					  g_curClassBases.clear();
-					  BEGIN( Body );
- 					}
-<Bases>"virtual"|"public"|"protected"|"private"|"@public"|"@private"|"@protected" { 
-  					  startFontClass("keyword");
-  					  g_code->codify(yytext);
-					  endFontClass();
-					}
-<Bases>{SEP}?({ID}{SEP})*{ID}           { 
-					  DBG_CTX((stderr,"%s:addBase(%s)\n",g_curClassName.data(),yytext));
-  					  g_curClassBases.inSort(yytext); 
-					  generateClassOrGlobalLink(*g_code,yytext);
-					}
-<Bases>"<"                              { 
-  					  g_code->codify(yytext);
-					  if (!g_insideObjC)
-					  {
-  					    g_sharpCount=1;
-					    BEGIN ( SkipSharp );
-					  }
-					  else
-					  {
-					    g_insideProtocolList=TRUE;
-					  }
-					}
-<Bases>">"				{
-  					  g_code->codify(yytext);
-					  g_insideProtocolList=FALSE;
-  					}
-<SkipSharp>"<"                          {
-  					  g_code->codify(yytext);
-  					  ++g_sharpCount; 
-					}
-<SkipSharp>">"                          { 
-  					  g_code->codify(yytext);
-  					  if (--g_sharpCount<=0)
-					  BEGIN ( Bases );
-					}
-<SkipSharp>"\""                         {
-  					  g_code->codify(yytext);
-  					  g_lastStringContext=YY_START;
-                                          BEGIN(SkipString);
-                                        }
-<SkipSharp>"\'"                         {
-  					  g_code->codify(yytext);
-  					  g_lastStringContext=YY_START;
-                                          BEGIN(SkipStringS);
-                                        }
-<Bases>"("                              {
-                                          g_code->codify(yytext);
-                                          g_sharpCount=1;
-                                          BEGIN ( SkipSharp );
-                                        }
-<SkipSharp>"("                          {
-                                          g_code->codify(yytext);
-                                          ++g_sharpCount;
-                                        }
-<SkipSharp>")"                          {
-                                          g_code->codify(yytext);
-                                          if (--g_sharpCount<=0)
-                                            BEGIN ( Bases );
-                                        }
-      
-      
-<Bases>","                              { 
-  					  g_code->codify(yytext);
-					}
-  					
+					  yyextra->currentMemberDef=0;
+					  if (yyextra->currentDefinition) 
+					    yyextra->currentDefinition=yyextra->currentDefinition->getOuterScope();
+					  BEGIN(Body);
+					}
+<ClassName,ClassVar>";"			{ 
+  					  yyextra->code->codify(yytext);
+					  yyextra->searchingForBody=FALSE; 
+  					  BEGIN( Body ); 
+					}
+<ClassName,ClassVar>[*&^%]+       	{
+  					  yyextra->type=yyextra->curClassName.copy();
+  					  yyextra->name.resize(0);
+					  yyextra->code->codify(yytext);
+					  BEGIN( Body ); // variable of type struct *
+					}
+<ClassName>"__declspec"{B}*"("{B}*{ID}{B}*")"	{
+					  startFontClass(yyscanner,"keyword");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					}
+<ClassName>{ID}("."{ID})*	        |
+<ClassName>{ID}("::"{ID})*	        {
+                                          if (yyextra->lang==SrcLangExt_CSharp)
+                                            yyextra->curClassName=substitute(yytext,".","::");
+                                          else
+                                            yyextra->curClassName=yytext;
+					  addType(yyscanner);
+                                          if (yyextra->curClassName=="alignas")
+                                          {
+  					    startFontClass(yyscanner,"keyword");
+					    yyextra->code->codify(yytext);
+                                            endFontClass(yyscanner);
+                                            BEGIN( AlignAs );
+                                          }
+                                          else
+                                          {
+					    generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+					    BEGIN( ClassVar );
+                                          }
+					}
+<AlignAs>"("                            { 
+                                          yyextra->bracketCount=1;
+					  yyextra->code->codify(yytext);
+                                          BEGIN( AlignAsEnd );
+                                        }
+<AlignAs>\n                             { yyextra->yyLineNr++; 
+                                          codifyLines(yyscanner,yytext);
+                                        }
+<AlignAs>.                              { yyextra->code->codify(yytext); }
+<AlignAsEnd>"("                         { yyextra->code->codify(yytext);
+                                          yyextra->bracketCount++; 
+                                        }
+<AlignAsEnd>")"                         { 
+                                          yyextra->code->codify(yytext);
+                                          if (--yyextra->bracketCount<=0)
+                                          {
+                                            BEGIN(ClassName);
+                                          }
+                                        }
+<AlignAsEnd>\n                          { yyextra->yyLineNr++; 
+                                          codifyLines(yyscanner,yytext); 
+                                        }
+<AlignAsEnd>.                           { yyextra->code->codify(yytext); }
+<ClassName>{ID}("\\"{ID})*		{ // PHP namespace
+                                          yyextra->curClassName=substitute(yytext,"\\","::");
+  					  yyextra->scopeStack.push(CLASSBLOCK);
+					  pushScope(yyscanner,yyextra->curClassName);
+					  addType(yyscanner);
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+					  BEGIN( ClassVar );
+  					}
+<ClassName>{ID}{B}*"("{ID}")"           { // Obj-C category
+                                          yyextra->curClassName=removeRedundantWhiteSpace(yytext);
+  					  yyextra->scopeStack.push(CLASSBLOCK);
+					  pushScope(yyscanner,yyextra->curClassName);
+					  addType(yyscanner);
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+					  BEGIN( ClassVar );
+                                        }
+<PackageName>{ID}("."{ID})*		{
+					  yyextra->curClassName=substitute(yytext,".","::");
+					  //printf("found package: %s\n",yyextra->curClassName.data());
+					  addType(yyscanner);
+					  codifyLines(yyscanner,yytext);
+  					}
+<ClassVar>"="				{
+					  unput(*yytext);
+					  BEGIN( Body );
+  					}
+<ClassVar>("extends"|"implements")	{ // Java, Slice
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					  yyextra->curClassBases.clear();
+  					  BEGIN( Bases ); 
+					}
+<ClassVar>("sealed"|"abstract")/{BN}*(":"|"{") {
+					  DBG_CTX((stderr,"***** C++/CLI modifier %s on yyextra->curClassName=%s\n",yytext,yyextra->curClassName.data()));
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+  					  BEGIN( CppCliTypeModifierFollowup ); 
+					}
+<ClassVar>{ID}				{
+  					  yyextra->type = yyextra->curClassName.copy();
+					  yyextra->name = yytext;
+					  if (yyextra->insideBody)
+					  {
+					    yyextra->theVarContext.addVariable(yyscanner,yyextra->type,yyextra->name);
+					  }
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+  					}
+<ClassName,ClassVar,CppCliTypeModifierFollowup>{B}*":"{B}*	{
+  					  codifyLines(yyscanner,yytext);
+					  yyextra->curClassBases.clear();
+  					  BEGIN( Bases ); 
+					}
+<PackageName>[ \t]*";"			|
+<Bases>^{B}*/"@"{ID}                    | // Objective-C interface
+<Bases,ClassName,ClassVar,CppCliTypeModifierFollowup>{B}*"{"{B}* {
+                                          yyextra->theVarContext.pushScope();
+  					  yyextra->code->codify(yytext);
+					  if (YY_START==ClassVar && yyextra->curClassName.isEmpty())
+					  {
+					    yyextra->curClassName = yyextra->name.copy();
+					  }
+  					  if (yyextra->searchingForBody)
+					  {
+					    yyextra->searchingForBody=FALSE;
+					    yyextra->insideBody=TRUE;
+					  }
+					  if (yyextra->insideBody) yyextra->bodyCurlyCount++;
+					  if (!yyextra->curClassName.isEmpty()) // valid class name
+					  {
+                                            DBG_CTX((stderr,"** scope stack push CLASSBLOCK\n"));
+  					    yyextra->scopeStack.push(CLASSBLOCK);
+					    pushScope(yyscanner,yyextra->curClassName);
+					    DBG_CTX((stderr,"***** yyextra->curClassName=%s\n",yyextra->curClassName.data()));
+					    if (getResolvedClass(yyextra->currentDefinition,yyextra->sourceFileDef,yyextra->curClassName)==0)
+					    {
+					      DBG_CTX((stderr,"Adding new class %s\n",yyextra->curClassName.data()));
+					      ClassDef *ncd=createClassDef("<code>",1,1,
+				 		  yyextra->curClassName,ClassDef::Class,0,0,FALSE);
+					      yyextra->codeClassSDict->append(yyextra->curClassName,ncd);
+					      // insert base classes.
+					      char *s=yyextra->curClassBases.first();
+					      while (s)
+					      {
+						const ClassDef *bcd=yyextra->codeClassSDict->find(s);
+						if (bcd==0) bcd=getResolvedClass(yyextra->currentDefinition,yyextra->sourceFileDef,s);
+						if (bcd && bcd!=ncd)
+						{
+						  ncd->insertBaseClass(const_cast<ClassDef*>(bcd),s,Public,Normal);
+						}
+						s=yyextra->curClassBases.next();
+					      }
+					    }
+					    //printf("yyextra->codeClassList.count()=%d\n",yyextra->codeClassList.count());
+					  }
+					  else // not a class name -> assume inner block
+					  {
+                                            DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
+  					    yyextra->scopeStack.push(INNERBLOCK);
+					  }
+					  yyextra->curClassName.resize(0);
+					  yyextra->curClassBases.clear();
+					  BEGIN( Body );
+ 					}
+<Bases>"virtual"|"public"|"protected"|"private"|"@public"|"@private"|"@protected" { 
+  					  startFontClass(yyscanner,"keyword");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					}
+<Bases>{SEP}?({ID}{SEP})*{ID}           { 
+					  DBG_CTX((stderr,"%s:addBase(%s)\n",yyextra->curClassName.data(),yytext));
+  					  yyextra->curClassBases.inSort(yytext); 
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+					}
+<Bases>"<"                              { 
+  					  yyextra->code->codify(yytext);
+					  if (!yyextra->insideObjC)
+					  {
+  					    yyextra->sharpCount=1;
+					    BEGIN ( SkipSharp );
+					  }
+					  else
+					  {
+					    yyextra->insideProtocolList=TRUE;
+					  }
+					}
+<Bases>">"				{
+  					  yyextra->code->codify(yytext);
+					  yyextra->insideProtocolList=FALSE;
+  					}
+<SkipSharp>"<"                          {
+  					  yyextra->code->codify(yytext);
+  					  ++yyextra->sharpCount; 
+					}
+<SkipSharp>">"                          { 
+  					  yyextra->code->codify(yytext);
+  					  if (--yyextra->sharpCount<=0)
+					  BEGIN ( Bases );
+					}
+<SkipSharp>"\""                         {
+  					  yyextra->code->codify(yytext);
+  					  yyextra->lastStringContext=YY_START;
+                                          BEGIN(SkipString);
+                                        }
+<SkipSharp>"\'"                         {
+  					  yyextra->code->codify(yytext);
+  					  yyextra->lastStringContext=YY_START;
+                                          BEGIN(SkipStringS);
+                                        }
+<Bases>"("                              {
+                                          yyextra->code->codify(yytext);
+                                          yyextra->sharpCount=1;
+                                          BEGIN ( SkipSharp );
+                                        }
+<SkipSharp>"("                          {
+                                          yyextra->code->codify(yytext);
+                                          ++yyextra->sharpCount;
+                                        }
+<SkipSharp>")"                          {
+                                          yyextra->code->codify(yytext);
+                                          if (--yyextra->sharpCount<=0)
+                                            BEGIN ( Bases );
+                                        }
+      
+      
+<Bases>","                              { 
+  					  yyextra->code->codify(yytext);
+					}
+  					
 
 <Body>{SCOPEPREFIX}?"operator"{B}*"()"{B}*/"(" {
-  					  addType();
-					  generateFunctionLink(*g_code,yytext);
-  					  g_bracketCount=0;
-					  g_args.resize(0);
-  					  g_name+=yytext; 
+  					  addType(yyscanner);
+					  generateFunctionLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->bracketCount=0;
+					  yyextra->args.resize(0);
+  					  yyextra->name+=yytext; 
   					  BEGIN( FuncCall );
 					}
 <Body>{SCOPEPREFIX}?"operator"/"("      {
-  					  addType();
-					  generateFunctionLink(*g_code,yytext);
-  					  g_bracketCount=0;
-					  g_args.resize(0);
-  					  g_name+=yytext; 
+  					  addType(yyscanner);
+					  generateFunctionLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->bracketCount=0;
+					  yyextra->args.resize(0);
+  					  yyextra->name+=yytext; 
   					  BEGIN( FuncCall );
                                         }
 <Body>{SCOPEPREFIX}?"operator"[^a-z_A-Z0-9\(\n]+/"(" {
-  					  addType();
-					  generateFunctionLink(*g_code,yytext);
-  					  g_bracketCount=0;
-					  g_args.resize(0);
-  					  g_name+=yytext; 
+  					  addType(yyscanner);
+					  generateFunctionLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->bracketCount=0;
+					  yyextra->args.resize(0);
+  					  yyextra->name+=yytext; 
   					  BEGIN( FuncCall );
 					}
 <Body,TemplDecl>("template"|"generic")/([^a-zA-Z0-9])		{
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-					  g_insideTemplate=TRUE;
-					  g_sharpCount=0;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					  yyextra->insideTemplate=TRUE;
+					  yyextra->sharpCount=0;
 					}
 <Body>"using"{BN}+"namespace"{BN}+	{
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
 					  BEGIN(UsingName);
   					}
-<UsingName>{ID}("::"{ID})*		{ addUsingDirective(yytext);
- 					  generateClassOrGlobalLink(*g_code,yytext);
+<UsingName>{ID}("::"{ID})*		{ addUsingDirective(yyscanner,yytext);
+ 					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
                                           DBG_CTX((stderr,"** scope stack push CLASSBLOCK\n"));
-  					  g_scopeStack.push(CLASSBLOCK);
-					  pushScope(yytext);
+  					  yyextra->scopeStack.push(CLASSBLOCK);
+					  pushScope(yyscanner,yytext);
 					  BEGIN(Body);
                                         }
-<UsingName>\n				{ codifyLines(yytext); BEGIN(Body); }
-<UsingName>.				{ codifyLines(yytext); BEGIN(Body); }
-<Body,FuncCall>"$"?"this"("->"|".")	{ g_code->codify(yytext); // this-> for C++, this. for C#
-					  g_prefixed_with_this_keyword = TRUE;
+<UsingName>\n				{ codifyLines(yyscanner,yytext); BEGIN(Body); }
+<UsingName>.				{ codifyLines(yyscanner,yytext); BEGIN(Body); }
+<Body,FuncCall>"$"?"this"("->"|".")	{ yyextra->code->codify(yytext); // this-> for C++, this. for C#
+					  yyextra->prefixed_with_this_keyword = TRUE;
                                         }
 <Body>{KEYWORD}/([^a-z_A-Z0-9]) 	{
-                                          if (g_lang==SrcLangExt_Java && qstrcmp("internal",yytext) ==0) REJECT;
-                                          if (skipLanguageSpecificKeyword(yytext)) REJECT;
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
+                                          if (yyextra->lang==SrcLangExt_Java && qstrcmp("internal",yytext) ==0) REJECT;
+                                          if (skipLanguageSpecificKeyword(yyscanner,yytext)) REJECT;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
 					  if (QCString(yytext)=="typedef")
 					  {
-					    addType();
-  					    g_name+=yytext; 
+					    addType(yyscanner);
+  					    yyextra->name+=yytext; 
 					  }
-					  endFontClass();
+					  endFontClass(yyscanner);
   					}
 <Body>{KEYWORD}/{B}* 			{
-                                          if (skipLanguageSpecificKeyword(yytext)) REJECT;
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
+                                          if (skipLanguageSpecificKeyword(yyscanner,yytext)) REJECT;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
   					}
 <Body>{KEYWORD}/{BN}*"(" 		{
-                                          if (skipLanguageSpecificKeyword(yytext)) REJECT;
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-  				          g_name.resize(0);g_type.resize(0);
+                                          if (skipLanguageSpecificKeyword(yyscanner,yytext)) REJECT;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+  				          yyextra->name.resize(0);yyextra->type.resize(0);
   					}
 <FuncCall>"in"/{BN}*			{
-					  if (!g_inForEachExpression) REJECT;
-  					  startFontClass("keywordflow");
-  					  codifyLines(yytext);
-					  endFontClass();
+					  if (!yyextra->inForEachExpression) REJECT;
+  					  startFontClass(yyscanner,"keywordflow");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
 					  // insert the variable in the parent scope, see bug 546158
-					  g_theVarContext.popScope();
-					  g_theVarContext.addVariable(g_parmType,g_parmName);
-					  g_theVarContext.pushScope();
-  				          g_name.resize(0);g_type.resize(0);
+					  yyextra->theVarContext.popScope();
+					  yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
+					  yyextra->theVarContext.pushScope();
+  				          yyextra->name.resize(0);yyextra->type.resize(0);
 					}
 <Body>{FLOWKW}/{BN}*"(" 			{
-  					  startFontClass("keywordflow");
-  					  codifyLines(yytext);
-					  endFontClass();
-  				          g_name.resize(0);g_type.resize(0);
-					  g_inForEachExpression = (qstrcmp(yytext,"for each")==0 || qstrcmp(yytext, "foreach")==0);
+  					  startFontClass(yyscanner,"keywordflow");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+  				          yyextra->name.resize(0);yyextra->type.resize(0);
+					  yyextra->inForEachExpression = (qstrcmp(yytext,"for each")==0 || qstrcmp(yytext, "foreach")==0);
 					  BEGIN(FuncCall);
   					}
 <Body>{FLOWCONDITION}/{BN}*"("          {
-                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          if (yyextra->currentMemberDef && yyextra->currentMemberDef->isFunction())
                                           {
-                                            g_currentMemberDef->incrementFlowKeyWordCount();
+                                            yyextra->currentMemberDef->incrementFlowKeyWordCount();
                                           }
-                                          startFontClass("keywordflow");
-                                          codifyLines(yytext);
-                                          endFontClass();
-                                          g_name.resize(0);g_type.resize(0);
-                                          g_inForEachExpression = (strcmp(yytext,"for each")==0 || strcmp(yytext, "foreach")==0);
+                                          startFontClass(yyscanner,"keywordflow");
+                                          codifyLines(yyscanner,yytext);
+                                          endFontClass(yyscanner);
+                                          yyextra->name.resize(0);yyextra->type.resize(0);
+                                          yyextra->inForEachExpression = (strcmp(yytext,"for each")==0 || strcmp(yytext, "foreach")==0);
                                           BEGIN(FuncCall);
                                         }
 <Body>{FLOWKW}/([^a-z_A-Z0-9]) 		{
-  					  startFontClass("keywordflow");
-  					  codifyLines(yytext);
-					  endFontClass();
-					  if (g_inFunctionTryBlock && (qstrcmp(yytext,"catch")==0 || qstrcmp(yytext,"finally")==0))
+  					  startFontClass(yyscanner,"keywordflow");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					  if (yyextra->inFunctionTryBlock && (qstrcmp(yytext,"catch")==0 || qstrcmp(yytext,"finally")==0))
 					  {
-					    g_inFunctionTryBlock=FALSE;
+					    yyextra->inFunctionTryBlock=FALSE;
 					  }
   					}
 <Body>{FLOWCONDITION}/([^a-z_A-Z0-9]) 	{
-                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          if (yyextra->currentMemberDef && yyextra->currentMemberDef->isFunction())
                                           {
-                                            g_currentMemberDef->incrementFlowKeyWordCount();
+                                            yyextra->currentMemberDef->incrementFlowKeyWordCount();
                                           }
-                                          startFontClass("keywordflow");
-                                          codifyLines(yytext);
-                                          endFontClass();
-                                          if (g_inFunctionTryBlock && (strcmp(yytext,"catch")==0 || strcmp(yytext,"finally")==0))
+                                          startFontClass(yyscanner,"keywordflow");
+                                          codifyLines(yyscanner,yytext);
+                                          endFontClass(yyscanner);
+                                          if (yyextra->inFunctionTryBlock && (strcmp(yytext,"catch")==0 || strcmp(yytext,"finally")==0))
                                           {
-                                            g_inFunctionTryBlock=FALSE;
+                                            yyextra->inFunctionTryBlock=FALSE;
                                           }
                                         }
 <Body>{FLOWKW}/{B}* 			{
-  					  startFontClass("keywordflow");
-  					  codifyLines(yytext);
-					  endFontClass();
+  					  startFontClass(yyscanner,"keywordflow");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
   					}
 <Body>{FLOWCONDITION}/{B}*              {
-                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          if (yyextra->currentMemberDef && yyextra->currentMemberDef->isFunction())
                                           {
-                                            g_currentMemberDef->incrementFlowKeyWordCount();
+                                            yyextra->currentMemberDef->incrementFlowKeyWordCount();
                                           }
-                                          startFontClass("keywordflow");
-                                          codifyLines(yytext);
-                                          endFontClass();
+                                          startFontClass(yyscanner,"keywordflow");
+                                          codifyLines(yyscanner,yytext);
+                                          endFontClass(yyscanner);
                                         }
 <Body>"*"{B}*")"                        { // end of cast?
-  					  g_code->codify(yytext);
-					  g_theCallContext.popScope(g_name, g_type);
-					  g_bracketCount--;
-                                          g_parmType = g_name;
+  					  yyextra->code->codify(yytext);
+					  yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
+					  yyextra->bracketCount--;
+                                          yyextra->parmType = yyextra->name;
 					  BEGIN(FuncCall);
                                         }
 <Body>[\\|\)\+\-\/\%\~\!]		{
-  					  g_code->codify(yytext);
-  				          g_name.resize(0);g_type.resize(0);
+  					  yyextra->code->codify(yytext);
+  				          yyextra->name.resize(0);yyextra->type.resize(0);
 					  if (*yytext==')')
 					  {
-					    g_theCallContext.popScope(g_name, g_type);
-					    g_bracketCount--;
+					    yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
+					    yyextra->bracketCount--;
 					    BEGIN(FuncCall);
 					  }
   					}
 <Body,TemplDecl,ObjCMethod>{TYPEKW}/{B}* {
-  					  startFontClass("keywordtype");
-					  g_code->codify(yytext);
-					  endFontClass();
-					  addType();
-  					  g_name+=yytext; 
+  					  startFontClass(yyscanner,"keywordtype");
+					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					  addType(yyscanner);
+  					  yyextra->name+=yytext; 
   					}
 <Body,TemplDecl,ObjCMethod>{TYPEKWSL}/{B}* {
-                                          if (g_lang!=SrcLangExt_Slice)
+                                          if (yyextra->lang!=SrcLangExt_Slice)
                                           {
                                             REJECT;
                                           }
                                           else
                                           {
-  					    startFontClass("keywordtype");
-					    g_code->codify(yytext);
-					    endFontClass();
-					    addType();
-  					    g_name+=yytext; 
+  					    startFontClass(yyscanner,"keywordtype");
+					    yyextra->code->codify(yytext);
+					    endFontClass(yyscanner);
+					    addType(yyscanner);
+  					    yyextra->name+=yytext; 
                                           }
   					}
 <Body>"generic"/{B}*"<"[^\n\/\-\.\{\"\>]*">"{B}* {
-  					  startFontClass("keyword");
-					  g_code->codify(yytext);
-					  endFontClass();
-					  g_sharpCount=0;
+  					  startFontClass(yyscanner,"keyword");
+					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					  yyextra->sharpCount=0;
 					  BEGIN(TemplDecl);
 					}
 <Body>"template"/{B}*"<"[^\n\/\-\.\{\"\>]*">"{B}* { // template<...>
-  					  startFontClass("keyword");
-					  g_code->codify(yytext);
-					  endFontClass();
-					  g_sharpCount=0;
+  					  startFontClass(yyscanner,"keyword");
+					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					  yyextra->sharpCount=0;
 					  BEGIN(TemplDecl);
                                         }
 <TemplDecl>"class"|"typename"		{
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
   					}
 <TemplDecl>"<"				{
-                                          g_code->codify(yytext);
-                                          g_sharpCount++;
+                                          yyextra->code->codify(yytext);
+                                          yyextra->sharpCount++;
   					}
 <TemplDecl>">"				{
-                                          g_code->codify(yytext);
-                                          g_sharpCount--;
-					  if (g_sharpCount<=0)
+                                          yyextra->code->codify(yytext);
+                                          yyextra->sharpCount--;
+					  if (yyextra->sharpCount<=0)
 					  {
 					    BEGIN(Body);
 					  }
   					}
 <TemplCast>">"				{
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-					  BEGIN( g_lastTemplCastContext );
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+					  BEGIN( yyextra->lastTemplCastContext );
   					}
 <TemplCast>{ID}("::"{ID})*		{
-					  generateClassOrGlobalLink(*g_code,yytext);
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
 					}
 <TemplCast>("const"|"volatile"){B}*	{
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
 					}
 <TemplCast>[*^]*			{
-  					  codifyLines(yytext);
+  					  codifyLines(yyscanner,yytext);
 					}
 <Body,MemberCall2,FuncCall>{CASTKW}{B}*"<"  { // static_cast<T>(
-  					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
-                                          g_lastTemplCastContext = YY_START;
+  					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
+                                          yyextra->lastTemplCastContext = YY_START;
 					  BEGIN(TemplCast);
 					}
 <Body>"$this->"{SCOPENAME}/{BN}*[;,)\]] { // PHP member variable
-					  addType();
-					  generatePHPVariableLink(*g_code,yytext);
-  					  g_name+=yytext+7; 
+					  addType(yyscanner);
+					  generatePHPVariableLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->name+=yytext+7; 
                                         }
 <Body,TemplCast>{SCOPENAME}{B}*"<"[^\n\/\-\.\{\"\>\(]*">"("::"{ID})*/{B}* { // A<T> *pt;
 					  if (isCastKeyword(yytext) && YY_START==Body)
 					  {
 					    REJECT;
 					  }
-					  addType();
-					  generateClassOrGlobalLink(*g_code,yytext);
-  					  g_name+=yytext; 
+					  addType(yyscanner);
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->name+=yytext; 
 					}
 <Body>{SCOPENAME}/{BN}*[:;,)\]]		{ // "int var;" or "var, var2" or "debug(f) macro" , or int var : 5;
-					  addType();
+					  addType(yyscanner);
 					  // changed this to generateFunctionLink, see bug 624514
-					  //generateClassOrGlobalLink(*g_code,yytext,FALSE,TRUE);
-					  generateFunctionLink(*g_code,yytext);
-  					  g_name+=yytext; 
+					  //generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext,FALSE,TRUE);
+					  generateFunctionLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->name+=yytext; 
 					}
 <Body>{SCOPENAME}/{B}* 			{ // p->func()
-					  addType();
-					  generateClassOrGlobalLink(*g_code,yytext);
-  					  g_name+=yytext; 
+					  addType(yyscanner);
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->name+=yytext; 
 					}
 <Body>"("{B}*("*"{B}*)+{SCOPENAME}*{B}*")"/{B}*	{  // (*p)->func() but not "if (p) ..."
-					  g_code->codify(yytext);
+					  yyextra->code->codify(yytext);
 					  int s=0;while (s<(int)yyleng && !isId(yytext[s])) s++;
                                           int e=(int)yyleng-1;while (e>=0 && !isId(yytext[e])) e--;
 					  QCString varname = ((QCString)yytext).mid(s,e-s+1); 
-					  addType();
-  					  g_name=varname; 
+					  addType(yyscanner);
+  					  yyextra->name=varname; 
 					}
 <Body>{SCOPETNAME}{B}*"<"[^\n\/\-\.\{\"\>]*">"/{BN}*"(" |
 <Body>{SCOPETNAME}/{BN}*"("		{ // a() or c::a() or t<A,B>::a() or A\B\foo()
@@ -2663,223 +1206,223 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  {
 					    REJECT;
 					  }
-  					  addType();
-					  generateFunctionLink(*g_code,yytext);
-  					  g_bracketCount=0;
-					  g_args.resize(0);
-  					  g_name+=yytext; 
+  					  addType(yyscanner);
+					  generateFunctionLink(yyscanner,*yyextra->code,yytext);
+  					  yyextra->bracketCount=0;
+					  yyextra->args.resize(0);
+  					  yyextra->name+=yytext; 
   					  BEGIN( FuncCall );
 					}
 <FuncCall,Body,MemberCall,MemberCall2,SkipInits,InlineInit>{RAWBEGIN}	{
                                           QCString text=yytext;
                                           int i=text.find('R');
-                                          g_code->codify(text.left(i+1));
-					  startFontClass("stringliteral");
-  					  g_code->codify(yytext+i+1);
-  					  g_lastStringContext=YY_START;
-					  g_inForEachExpression = FALSE;
-                                          g_delimiter = yytext+i+2;
-                                          g_delimiter=g_delimiter.left(g_delimiter.length()-1);
+                                          yyextra->code->codify(text.left(i+1));
+					  startFontClass(yyscanner,"stringliteral");
+  					  yyextra->code->codify(yytext+i+1);
+  					  yyextra->lastStringContext=YY_START;
+					  yyextra->inForEachExpression = FALSE;
+                                          yyextra->delimiter = yytext+i+2;
+                                          yyextra->delimiter=yyextra->delimiter.left(yyextra->delimiter.length()-1);
   					  BEGIN( RawString );
                                         }
 <FuncCall,Body,MemberCall,MemberCall2,SkipInits,InlineInit>\"	{
-					  startFontClass("stringliteral");
-  					  g_code->codify(yytext);
-  					  g_lastStringContext=YY_START;
-					  g_inForEachExpression = FALSE;
+					  startFontClass(yyscanner,"stringliteral");
+  					  yyextra->code->codify(yytext);
+  					  yyextra->lastStringContext=YY_START;
+					  yyextra->inForEachExpression = FALSE;
   					  BEGIN( SkipString );
   					}
 <FuncCall,Body,MemberCall,MemberCall2,SkipInits,InlineInit>\'	{
-					  startFontClass("stringliteral");
-  					  g_code->codify(yytext);
-  					  g_lastStringContext=YY_START;
-					  g_inForEachExpression = FALSE;
+					  startFontClass(yyscanner,"stringliteral");
+  					  yyextra->code->codify(yytext);
+  					  yyextra->lastStringContext=YY_START;
+					  yyextra->inForEachExpression = FALSE;
   					  BEGIN( SkipStringS );
   					}
 <SkipString>[^\"\\\r\n]*		{ 
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
 					}
 <SkipStringS>[^\'\\\r\n]*		{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <SkipString,SkipStringS>"//"|"/*"	{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <SkipString>@?\"			{
-  					  g_code->codify(yytext);
-					  endFontClass();
-  					  BEGIN( g_lastStringContext );
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+  					  BEGIN( yyextra->lastStringContext );
   					}
 <SkipStringS>\'				{
-  					  g_code->codify(yytext);
-					  endFontClass();
-  					  BEGIN( g_lastStringContext );
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+  					  BEGIN( yyextra->lastStringContext );
   					}
 <SkipString,SkipStringS>\\.		{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
 					}
 <RawString>{RAWEND}                     { 
-                                          g_code->codify(yytext);
+                                          yyextra->code->codify(yytext);
                                           QCString delimiter = yytext+1;
                                           delimiter=delimiter.left(delimiter.length()-1);
-                                          if (delimiter==g_delimiter)
+                                          if (delimiter==yyextra->delimiter)
                                           {
-					    BEGIN( g_lastStringContext );
+					    BEGIN( yyextra->lastStringContext );
                                           }
                                         }
-<RawString>[^)\n]+                      { g_code->codify(yytext); }
-<RawString>.                            { g_code->codify(yytext); }
-<RawString>\n                           { codifyLines(yytext); }
+<RawString>[^)\n]+                      { yyextra->code->codify(yytext); }
+<RawString>.                            { yyextra->code->codify(yytext); }
+<RawString>\n                           { codifyLines(yyscanner,yytext); }
 <SkipVerbString>[^"\n]+			{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
 					}
 <SkipVerbString>\"\"			{ // escaped quote
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
 					}
 <SkipVerbString>\"			{ // end of string
-  					  g_code->codify(yytext);
-					  endFontClass();
-					  BEGIN( g_lastVerbStringContext );
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					  BEGIN( yyextra->lastVerbStringContext );
 					}
 <SkipVerbString>.			{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <SkipVerbString>\n			{
-  					  codifyLines(yytext);
+  					  codifyLines(yyscanner,yytext);
   					}
 <Body>":"				{
-  					  g_code->codify(yytext);
-  					  g_name.resize(0);g_type.resize(0);
+  					  yyextra->code->codify(yytext);
+  					  yyextra->name.resize(0);yyextra->type.resize(0);
   					}
 <Body>"<"				{
-  					  if (g_insideTemplate)
+  					  if (yyextra->insideTemplate)
 					  {
-					    g_sharpCount++;
+					    yyextra->sharpCount++;
 					  }
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <Body>">"				{
-  					  if (g_insideTemplate)
+  					  if (yyextra->insideTemplate)
 					  {
-					    if (--g_sharpCount<=0)
+					    if (--yyextra->sharpCount<=0)
 					    {
-					      g_insideTemplate=FALSE;
+					      yyextra->insideTemplate=FALSE;
 					    }
 					  }
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <Body,MemberCall,MemberCall2,FuncCall>"'"((\\0[Xx0-9]+)|(\\.)|(.))"'"	{
-  					  startFontClass("charliteral"); 
-  					  g_code->codify(yytext);
-					  endFontClass();
+  					  startFontClass(yyscanner,"charliteral"); 
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
   					}
 <Body>"."|"->"				{ 
   				          if (yytext[0]=='-') // -> could be overloaded
 					  {
-					    updateCallContextForSmartPointer();
+					    updateCallContextForSmartPointer(yyscanner);
 					  }
-  					  g_code->codify(yytext);
-					  g_memCallContext = YY_START;
+  					  yyextra->code->codify(yytext);
+					  yyextra->memCallContext = YY_START;
   					  BEGIN( MemberCall ); 
 					}
 <MemberCall>{SCOPETNAME}/{BN}*"(" 	{
-					  if (g_theCallContext.getScope())
+					  if (yyextra->theCallContext.getScope())
 					  {
-					    if (!generateClassMemberLink(*g_code,g_theCallContext.getScope(),yytext))
+					    if (!generateClassMemberLink(yyscanner,*yyextra->code,yyextra->theCallContext.getScope(),yytext))
 					    {
-					      g_code->codify(yytext);
-					      addToSearchIndex(yytext);
+					      yyextra->code->codify(yytext);
+					      addToSearchIndex(yyscanner,yytext);
 					    }
-  					    g_name.resize(0);
+  					    yyextra->name.resize(0);
 					  }
 					  else
 					  {
-  					    g_code->codify(yytext);
-					    addToSearchIndex(yytext);
-  					    g_name.resize(0);
+  					    yyextra->code->codify(yytext);
+					    addToSearchIndex(yyscanner,yytext);
+  					    yyextra->name.resize(0);
 					  }
-					  g_type.resize(0);
-					  if (g_memCallContext==Body)
+					  yyextra->type.resize(0);
+					  if (yyextra->memCallContext==Body)
 					  {
 					    BEGIN(FuncCall);
 					  }
 					  else
 					  {
-					    BEGIN(g_memCallContext);
+					    BEGIN(yyextra->memCallContext);
 					  }
   					}
 <MemberCall>{SCOPENAME}/{B}*		{
-					  if (g_theCallContext.getScope())
+					  if (yyextra->theCallContext.getScope())
 					  {
-					    DBG_CTX((stderr,"g_theCallContext.getClass()=%p\n",g_theCallContext.getScope()));
-					    if (!generateClassMemberLink(*g_code,g_theCallContext.getScope(),yytext))
+					    DBG_CTX((stderr,"yyextra->theCallContext.getClass()=%p\n",yyextra->theCallContext.getScope()));
+					    if (!generateClassMemberLink(yyscanner,*yyextra->code,yyextra->theCallContext.getScope(),yytext))
 					    {
-					      g_code->codify(yytext);
-					      addToSearchIndex(yytext);
+					      yyextra->code->codify(yytext);
+					      addToSearchIndex(yyscanner,yytext);
 					    }
-  					    g_name.resize(0);
+  					    yyextra->name.resize(0);
 					  }
 					  else
 					  {
 					    DBG_CTX((stderr,"no class context!\n"));
-  					    g_code->codify(yytext);
-					    addToSearchIndex(yytext);
-  					    g_name.resize(0);
+  					    yyextra->code->codify(yytext);
+					    addToSearchIndex(yyscanner,yytext);
+  					    yyextra->name.resize(0);
 					  }
-					  g_type.resize(0);
-  					  BEGIN(g_memCallContext);
+					  yyextra->type.resize(0);
+  					  BEGIN(yyextra->memCallContext);
   					}
 <Body>[,=;\[]				{
-					  if (g_insideObjC && *yytext=='[')
+					  if (yyextra->insideObjC && *yytext=='[')
 					  {
 					    //printf("Found start of ObjC call!\n");
 					    // start of a method call
-					    g_contextDict.setAutoDelete(TRUE);
-					    g_nameDict.setAutoDelete(TRUE);
-					    g_objectDict.setAutoDelete(TRUE);
-					    g_wordDict.setAutoDelete(TRUE);
-                                            g_commentDict.setAutoDelete(TRUE);
-					    g_contextDict.clear();
-					    g_nameDict.clear();
-					    g_objectDict.clear();
-					    g_wordDict.clear();
-                                            g_commentDict.clear();
-					    g_currentCtxId  = 0;
-					    g_currentNameId  = 0;
-					    g_currentObjId  = 0;
-					    g_currentCtx = 0;
-					    g_braceCount = 0;
+					    yyextra->contextDict.setAutoDelete(TRUE);
+					    yyextra->nameDict.setAutoDelete(TRUE);
+					    yyextra->objectDict.setAutoDelete(TRUE);
+					    yyextra->wordDict.setAutoDelete(TRUE);
+                                            yyextra->commentDict.setAutoDelete(TRUE);
+					    yyextra->contextDict.clear();
+					    yyextra->nameDict.clear();
+					    yyextra->objectDict.clear();
+					    yyextra->wordDict.clear();
+                                            yyextra->commentDict.clear();
+					    yyextra->currentCtxId  = 0;
+					    yyextra->currentNameId  = 0;
+					    yyextra->currentObjId  = 0;
+					    yyextra->currentCtx = 0;
+					    yyextra->braceCount = 0;
 					    unput('[');
 					    BEGIN(ObjCCall);
 					  }
 					  else
 					  {
-					    g_code->codify(yytext);
-					    g_saveName = g_name.copy();
-					    g_saveType = g_type.copy();
-					    if (*yytext!='[' && !g_type.isEmpty()) 
+					    yyextra->code->codify(yytext);
+					    yyextra->saveName = yyextra->name.copy();
+					    yyextra->saveType = yyextra->type.copy();
+					    if (*yytext!='[' && !yyextra->type.isEmpty()) 
 					    {
-					      //printf("g_scopeStack.bottom()=%p\n",g_scopeStack.bottom());
-					      //if (g_scopeStack.top()!=CLASSBLOCK) // commented out for bug731363
+					      //printf("yyextra->scopeStack.bottom()=%p\n",yyextra->scopeStack.bottom());
+					      //if (yyextra->scopeStack.top()!=CLASSBLOCK) // commented out for bug731363
 					      {
 						//printf("AddVariable: '%s' '%s' context=%d\n",
-						//    g_type.data(),g_name.data(),g_theVarContext.count());
-					        g_theVarContext.addVariable(g_type,g_name);
+						//    yyextra->type.data(),yyextra->name.data(),yyextra->theVarContext.count());
+					        yyextra->theVarContext.addVariable(yyscanner,yyextra->type,yyextra->name);
 					      }
-					      g_name.resize(0);
+					      yyextra->name.resize(0);
 					    }
 					    if (*yytext==';' || *yytext=='=') 
 					    {
-					      g_type.resize(0);
-					      g_name.resize(0);
+					      yyextra->type.resize(0);
+					      yyextra->name.resize(0);
 					    }
 					    else if (*yytext=='[')
 					    {
-					      g_theCallContext.pushScope(g_name, g_type);
+					      yyextra->theCallContext.pushScope(yyextra->name, yyextra->type);
 					    }
-					    g_args.resize(0);
-                                            g_parmType.resize(0);
-                                            g_parmName.resize(0);
+					    yyextra->args.resize(0);
+                                            yyextra->parmType.resize(0);
+                                            yyextra->parmName.resize(0);
 					  }
   					}
   /*
@@ -2887,216 +1430,216 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  if (qstrcmp(yytext,"self")==0 || qstrcmp(yytext,"super")==0)
 					  {
 					    // TODO: get proper base class for "super"
-					    g_theCallContext.setClass(getClass(g_curClassName));
-					    startFontClass("keyword");
-					    g_code->codify(yytext); 
-					    endFontClass();
+					    yyextra->theCallContext.setClass(getClass(yyextra->curClassName));
+					    startFontClass(yyscanner,"keyword");
+					    yyextra->code->codify(yytext); 
+					    endFontClass(yyscanner);
 					  }
 					  else
 					  {
-					    generateClassOrGlobalLink(*g_code,yytext);
+					    generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
 					  }
-					  g_name.resize(0);
+					  yyextra->name.resize(0);
 					  BEGIN(ObjCMemberCall2);
   					}
 <ObjCMemberCall>"["			{
-					    g_code->codify(yytext);
-					    g_theCallContext.pushScope(g_name, g_type);
+					    yyextra->code->codify(yytext);
+					    yyextra->theCallContext.pushScope(yyscanner,yyextra->name, yyextra->type);
   					}
 <ObjCMemberCall2>{ID}":"?		{
-  					  g_name+=yytext;
-					  if (g_theCallContext.getClass())
+  					  yyextra->name+=yytext;
+					  if (yyextra->theCallContext.getClass())
 					  {
-					    //printf("Calling method %s\n",g_name.data());
-					    if (!generateClassMemberLink(*g_code,g_theCallContext.getClass(),g_name))
+					    //printf("Calling method %s\n",yyextra->name.data());
+					    if (!generateClassMemberLink(yyscanner,*yyextra->code,yyextra->theCallContext.getClass(),yyextra->name))
 					    {
-  					      g_code->codify(yytext);
-					      addToSearchIndex(g_name);
+  					      yyextra->code->codify(yytext);
+					      addToSearchIndex(yyscanner,yyextra->name);
 					    }
 					  }
 					  else
 					  {
-  					    g_code->codify(yytext);
-					    addToSearchIndex(g_name);
+  					    yyextra->code->codify(yytext);
+					    addToSearchIndex(yyscanner,yyextra->name);
 					  }
-  					  g_name.resize(0);
+  					  yyextra->name.resize(0);
 					  BEGIN(ObjCMemberCall3);
   					}
 <ObjCMemberCall2,ObjCMemberCall3>"]"	{
-					  g_theCallContext.popScope(g_name, g_type);
-  					  g_code->codify(yytext);
+					  yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
+  					  yyextra->code->codify(yytext);
 					  BEGIN(Body);
   					}
   */
 <ObjCCall,ObjCMName>"["|"{"       {
-                                    saveObjCContext();
-			            g_currentCtx->format+=*yytext;
+                                    saveObjCContext(yyscanner);
+			            yyextra->currentCtx->format+=*yytext;
 			            BEGIN(ObjCCall);
 		                    //printf("open\n");
                                   }
 <ObjCCall,ObjCMName>"]"|"}"       {
-			            g_currentCtx->format+=*yytext;
-                                    restoreObjCContext();
+			            yyextra->currentCtx->format+=*yytext;
+                                    restoreObjCContext(yyscanner);
 			            BEGIN(ObjCMName);
-		             	    if (g_currentCtx==0)
+		             	    if (yyextra->currentCtx==0)
 				    {
 				      // end of call
-				      writeObjCMethodCall(g_contextDict.find(0));
+				      writeObjCMethodCall(yyscanner,yyextra->contextDict.find(0));
 				      BEGIN(Body);
 				    }
 			            //printf("close\n");
                                   }
 <ObjCCall,ObjCMName>"//".*        {
-                                    g_currentCtx->format+=escapeComment(yytext);
+                                    yyextra->currentCtx->format+=escapeComment(yyscanner,yytext);
                                   }
 <ObjCCall,ObjCMName>"/*"          {
-                                    g_lastObjCCallContext = YY_START;
-                                    g_currentCtx->comment=yytext;
+                                    yyextra->lastObjCCallContext = YY_START;
+                                    yyextra->currentCtx->comment=yytext;
                                     BEGIN(ObjCCallComment);
                                   }
 <ObjCCallComment>"*/"		  {
-                                    g_currentCtx->comment+=yytext;
-                                    g_currentCtx->format+=escapeComment(g_currentCtx->comment);
-  			  	    BEGIN(g_lastObjCCallContext);
+                                    yyextra->currentCtx->comment+=yytext;
+                                    yyextra->currentCtx->format+=escapeComment(yyscanner,yyextra->currentCtx->comment);
+  			  	    BEGIN(yyextra->lastObjCCallContext);
 				  }
-<ObjCCallComment>[^*\n]+          { g_currentCtx->comment+=yytext; }
-<ObjCCallComment>"//"|"/*"        { g_currentCtx->comment+=yytext; }
-<ObjCCallComment>\n               { g_currentCtx->comment+=*yytext; }
-<ObjCCallComment>.                { g_currentCtx->comment+=*yytext; }
+<ObjCCallComment>[^*\n]+          { yyextra->currentCtx->comment+=yytext; }
+<ObjCCallComment>"//"|"/*"        { yyextra->currentCtx->comment+=yytext; }
+<ObjCCallComment>\n               { yyextra->currentCtx->comment+=*yytext; }
+<ObjCCallComment>.                { yyextra->currentCtx->comment+=*yytext; }
 <ObjCCall>{ID}	                  {
-                                    g_currentCtx->format+=escapeObject(yytext);
-			            if (g_braceCount==0)
+                                    yyextra->currentCtx->format+=escapeObject(yyscanner,yytext);
+			            if (yyextra->braceCount==0)
 			            {
-			              g_currentCtx->objectTypeOrName=yytext;
-                                      //printf("new type=%s\n",g_currentCtx->objectTypeOrName.data());
+			              yyextra->currentCtx->objectTypeOrName=yytext;
+                                      //printf("new type=%s\n",yyextra->currentCtx->objectTypeOrName.data());
 			              BEGIN(ObjCMName);
 			            }
   		                  }
 <ObjCMName>{ID}/{BN}*"]"          { 
-                                    if (g_braceCount==0 && 
-					g_currentCtx->methodName.isEmpty())
+                                    if (yyextra->braceCount==0 && 
+					yyextra->currentCtx->methodName.isEmpty())
                                     {
-			              g_currentCtx->methodName=yytext; 
-                                      g_currentCtx->format+=escapeName(yytext);
+			              yyextra->currentCtx->methodName=yytext; 
+                                      yyextra->currentCtx->format+=escapeName(yyscanner,yytext);
 			            }
 				    else
 				    {
-                                      g_currentCtx->format+=escapeWord(yytext);
+                                      yyextra->currentCtx->format+=escapeWord(yyscanner,yytext);
 				    }
                                   }
 <ObjCMName>{ID}/{BN}*":"           { 
-                                     if (g_braceCount==0)
+                                     if (yyextra->braceCount==0)
                                      {
-			               g_currentCtx->methodName+=yytext;
-                                       g_currentCtx->methodName+=":";
+			               yyextra->currentCtx->methodName+=yytext;
+                                       yyextra->currentCtx->methodName+=":";
 			             }
-                                     g_currentCtx->format+=escapeName(yytext);
+                                     yyextra->currentCtx->format+=escapeName(yyscanner,yytext);
                                    }
-<ObjCSkipStr>[^\n\"$\\]*           { g_currentCtx->format+=yytext; }
-<ObjCSkipStr>\\.	           { g_currentCtx->format+=yytext; }
-<ObjCSkipStr>"\""	           { g_currentCtx->format+=yytext; 
-                                      BEGIN(g_lastStringContext); 
+<ObjCSkipStr>[^\n\"$\\]*           { yyextra->currentCtx->format+=yytext; }
+<ObjCSkipStr>\\.	           { yyextra->currentCtx->format+=yytext; }
+<ObjCSkipStr>"\""	           { yyextra->currentCtx->format+=yytext; 
+                                      BEGIN(yyextra->lastStringContext); 
                                    }
-<ObjCCall,ObjCMName>{CHARLIT}      { g_currentCtx->format+=yytext; }
-<ObjCCall,ObjCMName>"@"?"\""       { g_currentCtx->format+=yytext; 
-                                      g_lastStringContext=YY_START;
+<ObjCCall,ObjCMName>{CHARLIT}      { yyextra->currentCtx->format+=yytext; }
+<ObjCCall,ObjCMName>"@"?"\""       { yyextra->currentCtx->format+=yytext; 
+                                      yyextra->lastStringContext=YY_START;
                                       BEGIN(ObjCSkipStr); 
                                    }
-<ObjCCall,ObjCMName,ObjCSkipStr>"$" { g_currentCtx->format+="$$"; }
-<ObjCCall,ObjCMName>"("            { g_currentCtx->format+=*yytext; g_braceCount++; }
-<ObjCCall,ObjCMName>")"            { g_currentCtx->format+=*yytext; g_braceCount--; }
+<ObjCCall,ObjCMName,ObjCSkipStr>"$" { yyextra->currentCtx->format+="$$"; }
+<ObjCCall,ObjCMName>"("            { yyextra->currentCtx->format+=*yytext; yyextra->braceCount++; }
+<ObjCCall,ObjCMName>")"            { yyextra->currentCtx->format+=*yytext; yyextra->braceCount--; }
 <ObjCSkipStr>"@"/"\""		   { // needed to prevent matching the global rule (for C#)
-                                     g_currentCtx->format+=yytext;
+                                     yyextra->currentCtx->format+=yytext;
                                    }
-<ObjCCall,ObjCMName,ObjCSkipStr>{ID} { g_currentCtx->format+=escapeWord(yytext); }
-<ObjCCall,ObjCMName,ObjCSkipStr>.  { g_currentCtx->format+=*yytext; }
-<ObjCCall,ObjCMName,ObjCSkipStr>\n { g_currentCtx->format+=*yytext; }
+<ObjCCall,ObjCMName,ObjCSkipStr>{ID} { yyextra->currentCtx->format+=escapeWord(yyscanner,yytext); }
+<ObjCCall,ObjCMName,ObjCSkipStr>.  { yyextra->currentCtx->format+=*yytext; }
+<ObjCCall,ObjCMName,ObjCSkipStr>\n { yyextra->currentCtx->format+=*yytext; }
 
 <Body>"]"				{
-					  g_theCallContext.popScope(g_name, g_type);
-  					  g_code->codify(yytext);
+					  yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
+  					  yyextra->code->codify(yytext);
 					  // TODO: nested arrays like: a[b[0]->func()]->func()
-					  g_name = g_saveName.copy();
-					  g_type = g_saveType.copy();
+					  yyextra->name = yyextra->saveName.copy();
+					  yyextra->type = yyextra->saveType.copy();
 					}
 <Body>[0-9]+				{
-					  g_code->codify(yytext);
+					  yyextra->code->codify(yytext);
 					}
 <Body>[0-9]+[xX][0-9A-Fa-f]+		{
-					  g_code->codify(yytext);
+					  yyextra->code->codify(yytext);
 					}
 <MemberCall2,FuncCall>{KEYWORD}/([^a-z_A-Z0-9]) {
-					  //addParmType();
-					  //g_parmName=yytext; 
-                                          if (skipLanguageSpecificKeyword(yytext)) REJECT;
-  					  startFontClass("keyword");
-  					  g_code->codify(yytext);
-					  endFontClass();
+					  //addParmType(yyscanner);
+					  //yyextra->parmName=yytext; 
+                                          if (skipLanguageSpecificKeyword(yyscanner,yytext)) REJECT;
+  					  startFontClass(yyscanner,"keyword");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
 					}
 <MemberCall2,FuncCall,OldStyleArgs,TemplCast>{TYPEKW}/([^a-z_A-Z0-9]) {
-					  addParmType();
-					  g_parmName=yytext; 
-  					  startFontClass("keywordtype");
-  					  g_code->codify(yytext);
-					  endFontClass();
+					  addParmType(yyscanner);
+					  yyextra->parmName=yytext; 
+  					  startFontClass(yyscanner,"keywordtype");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
 					}
 <MemberCall2,FuncCall,OldStyleArgs,TemplCast>{TYPEKWSL}/([^a-z_A-Z0-9]) {
-                                          if (g_lang!=SrcLangExt_Slice)
+                                          if (yyextra->lang!=SrcLangExt_Slice)
                                           {
                                             REJECT;
                                           }
                                           else
                                           {
-					    addParmType();
-					    g_parmName=yytext; 
-  					    startFontClass("keywordtype");
-  					    g_code->codify(yytext);
-					    endFontClass();
+					    addParmType(yyscanner);
+					    yyextra->parmName=yytext; 
+  					    startFontClass(yyscanner,"keywordtype");
+  					    yyextra->code->codify(yytext);
+					    endFontClass(yyscanner);
                                           }
 					}
 <MemberCall2,FuncCall>{FLOWKW}/([^a-z_A-Z0-9]) {
-					  addParmType();
-					  g_parmName=yytext; 
-  					  startFontClass("keywordflow");
-  					  g_code->codify(yytext);
-					  endFontClass();
+					  addParmType(yyscanner);
+					  yyextra->parmName=yytext; 
+  					  startFontClass(yyscanner,"keywordflow");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
 					}
 <MemberCall2,FuncCall>{FLOWCONDITION}/([^a-z_A-Z0-9]) {
-                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          if (yyextra->currentMemberDef && yyextra->currentMemberDef->isFunction())
                                           {
-                                            g_currentMemberDef->incrementFlowKeyWordCount();
+                                            yyextra->currentMemberDef->incrementFlowKeyWordCount();
                                           }
-                                          addParmType();
-                                          g_parmName=yytext;
-                                          startFontClass("keywordflow");
-                                          g_code->codify(yytext);
-                                          endFontClass();
+                                          addParmType(yyscanner);
+                                          yyextra->parmName=yytext;
+                                          startFontClass(yyscanner,"keywordflow");
+                                          yyextra->code->codify(yytext);
+                                          endFontClass(yyscanner);
                                         }
 <MemberCall2,FuncCall>{ID}(({B}*"<"[^\n\[\](){}<>]*">")?({B}*"::"{B}*{ID})?)* {
 					  if (isCastKeyword(yytext))
 					  {
 					    REJECT;
 					  }
-					  addParmType();
-					  g_parmName=yytext; 
-					  generateClassOrGlobalLink(*g_code,yytext,!g_insideBody);
+					  addParmType(yyscanner);
+					  yyextra->parmName=yytext; 
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext,!yyextra->insideBody);
 					}
 <FuncCall>";"				{ // probably a cast, not a function call
-  					  g_code->codify(yytext);
-					  g_inForEachExpression = FALSE;
+  					  yyextra->code->codify(yytext);
+					  yyextra->inForEachExpression = FALSE;
 					  BEGIN( Body );
   					}
 <MemberCall2,FuncCall>,			{
-  					  g_code->codify(yytext);
-					  g_theVarContext.addVariable(g_parmType,g_parmName);
-					  g_parmType.resize(0);g_parmName.resize(0);
+  					  yyextra->code->codify(yytext);
+					  yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
+					  yyextra->parmType.resize(0);yyextra->parmName.resize(0);
 					}
 <MemberCall2,FuncCall>"{"		{
-                                          if (g_bracketCount>0)
+                                          if (yyextra->bracketCount>0)
                                           {
-                                            g_code->codify(yytext);
-                                            g_skipInlineInitContext=YY_START;
-                                            g_curlyCount=0;
+                                            yyextra->code->codify(yytext);
+                                            yyextra->skipInlineInitContext=YY_START;
+                                            yyextra->curlyCount=0;
                                             BEGIN(InlineInit);
                                           }
                                           else
@@ -3104,30 +1647,30 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
                                             REJECT;
                                           }
                                         }
-<InlineInit>"{"                         { g_curlyCount++;
-                                          g_code->codify(yytext);
+<InlineInit>"{"                         { yyextra->curlyCount++;
+                                          yyextra->code->codify(yytext);
                                         }
 <InlineInit>"}"                         {
-                                          g_code->codify(yytext);
-                                          if (--g_curlyCount<=0)
+                                          yyextra->code->codify(yytext);
+                                          if (--yyextra->curlyCount<=0)
                                           {
-                                            BEGIN(g_skipInlineInitContext);
+                                            BEGIN(yyextra->skipInlineInitContext);
                                           }
                                         }
 <InlineInit>\n                          {
-                                          codifyLines(yytext);
+                                          codifyLines(yyscanner,yytext);
                                         }
 <InlineInit>.                           {
-                                          g_code->codify(yytext);
+                                          yyextra->code->codify(yytext);
                                         }
 <MemberCall2,FuncCall>"("		{
-					  g_parmType.resize(0);g_parmName.resize(0);
-  					  g_code->codify(yytext);
-  					  g_bracketCount++; 
-					  g_theCallContext.pushScope(g_name, g_type);
-					  if (YY_START==FuncCall && !g_insideBody)
+					  yyextra->parmType.resize(0);yyextra->parmName.resize(0);
+  					  yyextra->code->codify(yytext);
+  					  yyextra->bracketCount++; 
+					  yyextra->theCallContext.pushScope(yyextra->name, yyextra->type);
+					  if (YY_START==FuncCall && !yyextra->insideBody)
 					  {
-					    g_theVarContext.pushScope();
+					    yyextra->theVarContext.pushScope();
 					  }
 					}
 <MemberCall2,FuncCall>{OPERATOR}        { // operator
@@ -3137,34 +1680,34 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					      qstrcmp(yytext,"%")) // typically a pointer or reference
 					  {
 					    // not a * or &, or C++/CLI's ^ or %
-					    g_parmType.resize(0);g_parmName.resize(0);
+					    yyextra->parmType.resize(0);yyextra->parmName.resize(0);
 					  }
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <MemberCall,MemberCall2,FuncCall>("*"{B}*)?")"	{ 
                                           if (yytext[0]==')') // no a pointer cast
                                           {
-                                            //printf("addVariable(%s,%s)\n",g_parmType.data(),g_parmName.data());
-                                            if (g_parmType.isEmpty())
+                                            //printf("addVariable(%s,%s)\n",yyextra->parmType.data(),yyextra->parmName.data());
+                                            if (yyextra->parmType.isEmpty())
                                             {
-                                              g_parmType=g_parmName;
-                                              g_parmName.resize(0);
+                                              yyextra->parmType=yyextra->parmName;
+                                              yyextra->parmName.resize(0);
                                             }
-					    g_theVarContext.addVariable(g_parmType,g_parmName);
+					    yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
                                           }
                                           else
                                           {
-                                            g_parmType = g_parmName;
-                                            g_parmName.resize(0);
-					    g_theVarContext.addVariable(g_parmType,g_parmName);
+                                            yyextra->parmType = yyextra->parmName;
+                                            yyextra->parmName.resize(0);
+					    yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
                                           }
-					  g_theCallContext.popScope(g_name, g_type);
-					  g_inForEachExpression = FALSE;
-					  //g_theCallContext.setClass(0); // commented out, otherwise a()->b() does not work for b().
-  					  g_code->codify(yytext);
-  					  if (--g_bracketCount<=0) 
+					  yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
+					  yyextra->inForEachExpression = FALSE;
+					  //yyextra->theCallContext.setClass(0); // commented out, otherwise a()->b() does not work for b().
+  					  yyextra->code->codify(yytext);
+  					  if (--yyextra->bracketCount<=0) 
 					  {
-					    if (g_name.isEmpty())
+					    if (yyextra->name.isEmpty())
 					    {
 					      BEGIN( Body );
 					    }
@@ -3174,319 +1717,319 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    }
 					  }
 					}
-<CallEnd>[ \t\n]*			{ codifyLines(yytext); }
+<CallEnd>[ \t\n]*			{ codifyLines(yyscanner,yytext); }
   /*
 <MemberCall2,FuncCall>")"[ \t\n]*[;:]	{
   */
 <CallEnd>[;:]				{
-  					  codifyLines(yytext);
-  					  g_bracketCount=0;
-					  if (*yytext==';') g_searchingForBody=FALSE; 
-					  if (!g_type.isEmpty())
+  					  codifyLines(yyscanner,yytext);
+  					  yyextra->bracketCount=0;
+					  if (*yytext==';') yyextra->searchingForBody=FALSE; 
+					  if (!yyextra->type.isEmpty())
 					  {
-					    DBG_CTX((stderr,"add variable g_type=%s g_name=%s)\n",g_type.data(),g_name.data()));
-					    g_theVarContext.addVariable(g_type,g_name);
+					    DBG_CTX((stderr,"add variable yyextra->type=%s yyextra->name=%s)\n",yyextra->type.data(),yyextra->name.data()));
+					    yyextra->theVarContext.addVariable(yyscanner,yyextra->type,yyextra->name);
 					  }
-					  g_parmType.resize(0);g_parmName.resize(0);
-					  g_theCallContext.setScope(0);
-  					  if (*yytext==';' || g_insideBody)
+					  yyextra->parmType.resize(0);yyextra->parmName.resize(0);
+					  yyextra->theCallContext.setScope(0);
+  					  if (*yytext==';' || yyextra->insideBody)
 					  {
-					    if (!g_insideBody)
+					    if (!yyextra->insideBody)
 					    {
-                                              g_theVarContext.popScope();
+                                              yyextra->theVarContext.popScope();
 					    }
-					    g_name.resize(0);g_type.resize(0);
+					    yyextra->name.resize(0);yyextra->type.resize(0);
 					    BEGIN( Body );
 					  }
 					  else
 					  {
-					    g_bracketCount=0;
+					    yyextra->bracketCount=0;
 					    BEGIN( SkipInits );
 					  }
   					}
 <CallEnd>("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"sealed"|"override"))*/{BN}*(";"|"="|"throw"{BN}*"(") {
-					  startFontClass("keyword");
-  					  codifyLines(yytext);
-					  endFontClass();
+					  startFontClass(yyscanner,"keyword");
+  					  codifyLines(yyscanner,yytext);
+					  endFontClass(yyscanner);
   					}
 <CallEnd,OldStyleArgs>("const"|"volatile"|"sealed"|"override")*({BN}+("const"|"volatile"|"sealed"|"override"))*{BN}*"{" {
-                                          if (g_insideBody)
+                                          if (yyextra->insideBody)
 					  {
-					    g_theVarContext.pushScope();
+					    yyextra->theVarContext.pushScope();
 					  }
-					  g_theVarContext.addVariable(g_parmType,g_parmName);
-					  //g_theCallContext.popScope(g_name, g_type);
-					  g_parmType.resize(0);g_parmName.resize(0);
-					  int index = g_name.findRev("::");
-					  DBG_CTX((stderr,"g_name=%s\n",g_name.data()));
+					  yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
+					  //yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
+					  yyextra->parmType.resize(0);yyextra->parmName.resize(0);
+					  int index = yyextra->name.findRev("::");
+					  DBG_CTX((stderr,"yyextra->name=%s\n",yyextra->name.data()));
 					  if (index!=-1) 
 					  {
-					    QCString scope = g_name.left(index);
-					    if (!g_classScope.isEmpty()) scope.prepend(g_classScope+"::");
-					    const ClassDef *cd=getResolvedClass(Doxygen::globalScope,g_sourceFileDef,scope);
+					    QCString scope = yyextra->name.left(index);
+					    if (!yyextra->classScope.isEmpty()) scope.prepend(yyextra->classScope+"::");
+					    const ClassDef *cd=getResolvedClass(Doxygen::globalScope,yyextra->sourceFileDef,scope);
 					    if (cd)
 					    {
-					      setClassScope(cd->name());
-  					      g_scopeStack.push(SCOPEBLOCK);
+					      setClassScope(yyscanner,cd->name());
+  					      yyextra->scopeStack.push(SCOPEBLOCK);
                                               DBG_CTX((stderr,"** scope stack push SCOPEBLOCK\n"));
 					    }
 					    else 
 					    {
-					      //setClassScope(g_realScope);
-  					      g_scopeStack.push(INNERBLOCK);
+					      //setClassScope(yyscanner,yyextra->realScope);
+  					      yyextra->scopeStack.push(INNERBLOCK);
                                               DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
 					    }
 					  }
 					  else
 					  {
                                             DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
-  					    g_scopeStack.push(INNERBLOCK);
+  					    yyextra->scopeStack.push(INNERBLOCK);
 					  }
 					  yytext[yyleng-1]='\0';
 					  QCString cv(yytext);
 					  if (!cv.stripWhiteSpace().isEmpty())
 					  {
-					    startFontClass("keyword");
-  					    codifyLines(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"keyword");
+  					    codifyLines(yyscanner,yytext);
+					    endFontClass(yyscanner);
 					  }
 					  else // just whitespace
 					  {
-  					    codifyLines(yytext);
+  					    codifyLines(yyscanner,yytext);
 					  }
-					  g_code->codify("{");
-  					  if (g_searchingForBody)
+					  yyextra->code->codify("{");
+  					  if (yyextra->searchingForBody)
 					  {
-					    g_searchingForBody=FALSE;
-					    g_insideBody=TRUE;
+					    yyextra->searchingForBody=FALSE;
+					    yyextra->insideBody=TRUE;
 					  }
-					  if (g_insideBody) g_bodyCurlyCount++;
-  					  g_type.resize(0); g_name.resize(0);
+					  if (yyextra->insideBody) yyextra->bodyCurlyCount++;
+  					  yyextra->type.resize(0); yyextra->name.resize(0);
 					  BEGIN( Body );
   					}
 <CallEnd>"try"				{ // function-try-block
-					  startFontClass("keyword");
-  					  g_code->codify(yytext);
-					  endFontClass();
-					  g_inFunctionTryBlock=TRUE;
+					  startFontClass(yyscanner,"keyword");
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+					  yyextra->inFunctionTryBlock=TRUE;
                                         }
 <CallEnd>{ID}				{
-  					  if (g_insideBody || !g_parmType.isEmpty()) 
+  					  if (yyextra->insideBody || !yyextra->parmType.isEmpty()) 
 					  {
 					    REJECT;
 					  }
 					  // could be K&R style definition
-					  addParmType();
-					  g_parmName=yytext; 
-					  generateClassOrGlobalLink(*g_code,yytext,!g_insideBody);
+					  addParmType(yyscanner);
+					  yyextra->parmName=yytext; 
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext,!yyextra->insideBody);
 					  BEGIN(OldStyleArgs);
   					}
 <OldStyleArgs>{ID}			{
-					  addParmType();
-					  g_parmName=yytext; 
-					  generateClassOrGlobalLink(*g_code,yytext,!g_insideBody);
+					  addParmType(yyscanner);
+					  yyextra->parmName=yytext; 
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext,!yyextra->insideBody);
   					}
 <OldStyleArgs>[,;]			{
-  					  g_code->codify(yytext);
-					  g_theVarContext.addVariable(g_parmType,g_parmName);
-					  if (*yytext==';') g_parmType.resize(0);
-					  g_parmName.resize(0);
+  					  yyextra->code->codify(yytext);
+					  yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
+					  if (*yytext==';') yyextra->parmType.resize(0);
+					  yyextra->parmName.resize(0);
   					}
 <CallEnd,OldStyleArgs>"#"		{
-  					  startFontClass("preprocessor");
-					  g_lastSkipCppContext = Body;
-  					  g_code->codify(yytext);
+  					  startFontClass(yyscanner,"preprocessor");
+					  yyextra->lastSkipCppContext = Body;
+  					  yyextra->code->codify(yytext);
 					  BEGIN( SkipCPP );
   					}
 <CallEnd>.				{
   					  unput(*yytext);
-                                          if (!g_insideBody) 
+                                          if (!yyextra->insideBody) 
 					  {
-					    g_theVarContext.popScope();
+					    yyextra->theVarContext.popScope();
 					  }
-					  g_name.resize(0);g_args.resize(0);
-					  g_parmType.resize(0);g_parmName.resize(0);
+					  yyextra->name.resize(0);yyextra->args.resize(0);
+					  yyextra->parmType.resize(0);yyextra->parmName.resize(0);
 					  BEGIN( Body ); 
   					}
 <SkipInits>";"				{
-  					  g_code->codify(yytext);
-  					  g_type.resize(0); g_name.resize(0);
+  					  yyextra->code->codify(yytext);
+  					  yyextra->type.resize(0); yyextra->name.resize(0);
   					  BEGIN( Body );
   					}
 <SkipInits>"{"				{ 
-  					  g_code->codify(yytext);
-  					  if (g_searchingForBody)
+  					  yyextra->code->codify(yytext);
+  					  if (yyextra->searchingForBody)
 					  {
-					    g_searchingForBody=FALSE;
-					    g_insideBody=TRUE;
+					    yyextra->searchingForBody=FALSE;
+					    yyextra->insideBody=TRUE;
 					  }
-					  if (g_insideBody) g_bodyCurlyCount++;
-					  if (g_name.find("::")!=-1) 
+					  if (yyextra->insideBody) yyextra->bodyCurlyCount++;
+					  if (yyextra->name.find("::")!=-1) 
 					  {
                                             DBG_CTX((stderr,"** scope stack push SCOPEBLOCK\n"));
-  					    g_scopeStack.push(SCOPEBLOCK);
-					    setClassScope(g_realScope);
+  					    yyextra->scopeStack.push(SCOPEBLOCK);
+					    setClassScope(yyscanner,yyextra->realScope);
 					  }
 					  else
 					  {
                                             DBG_CTX((stderr,"** scope stack push INNERBLOCK\n"));
-  					    g_scopeStack.push(INNERBLOCK);
+  					    yyextra->scopeStack.push(INNERBLOCK);
 					  }
-  					  g_type.resize(0); g_name.resize(0);
+  					  yyextra->type.resize(0); yyextra->name.resize(0);
 					  BEGIN( Body ); 
 					}
 <SkipInits>{ID}				{
-					  generateClassOrGlobalLink(*g_code,yytext);
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
   					}
 <FuncCall>{ID}/"("			{
-					  generateFunctionLink(*g_code,yytext);
+					  generateFunctionLink(yyscanner,*yyextra->code,yytext);
 					}
 <FuncCall>{ID}/("."|"->")               { 
-					  g_name=yytext; 
-					  generateClassOrGlobalLink(*g_code,yytext);
+					  yyextra->name=yytext; 
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
 					  BEGIN( MemberCall2 ); 
 					}
 <FuncCall,MemberCall2>("("{B}*("*"{B}*)+{ID}*{B}*")"{B}*)/("."|"->") { 
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
 					  int s=0;while (!isId(yytext[s])) s++;
                                           int e=(int)yyleng-1;while (!isId(yytext[e])) e--;
-					  g_name=((QCString)yytext).mid(s,e-s+1); 
+					  yyextra->name=((QCString)yytext).mid(s,e-s+1); 
 					  BEGIN( MemberCall2 ); 
 					}
 <MemberCall2>{ID}/([ \t\n]*"(")         { 
-  					  if (!g_args.isEmpty())
-					    generateMemberLink(*g_code,g_args,yytext);
+  					  if (!yyextra->args.isEmpty())
+					    generateMemberLink(yyscanner,*yyextra->code,yyextra->args,yytext);
 					  else
-					    generateClassOrGlobalLink(*g_code,yytext);
-					  g_args.resize(0);
+					    generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
+					  yyextra->args.resize(0);
 					  BEGIN( FuncCall );
 					}
 <MemberCall2>{ID}/([ \t\n]*("."|"->"))  {
-  					  //g_code->codify(yytext);
-					  g_name=yytext; 
-					  generateClassOrGlobalLink(*g_code,yytext);
+  					  //yyextra->code->codify(yytext);
+					  yyextra->name=yytext; 
+					  generateClassOrGlobalLink(yyscanner,*yyextra->code,yytext);
 					  BEGIN( MemberCall2 ); 
     					}
 <MemberCall2>"->"|"."			{
   				          if (yytext[0]=='-') // -> could be overloaded
 					  {
-					    updateCallContextForSmartPointer();
+					    updateCallContextForSmartPointer(yyscanner);
 					  }
-  					  g_code->codify(yytext);
-					  g_memCallContext = YY_START;
+  					  yyextra->code->codify(yytext);
+					  yyextra->memCallContext = YY_START;
   					  BEGIN( MemberCall ); 
   					}
 <SkipComment>"/*"("!"?)"*/"		{ 
-  					  g_code->codify(yytext);
-					  endFontClass();
-  					  BEGIN( g_lastCContext ) ; 
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+  					  BEGIN( yyextra->lastCContext ) ; 
 					}
 <SkipComment>"//"|"/*"			{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <SkipComment>[^*/\n]+			{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <SkipComment>[ \t]*"*/"			{ 
-  					  g_code->codify(yytext);
-					  endFontClass();
-  					  if (g_lastCContext==SkipCPP)
+  					  yyextra->code->codify(yytext);
+					  endFontClass(yyscanner);
+  					  if (yyextra->lastCContext==SkipCPP)
                                           {
-                                            startFontClass("preprocessor");
+                                            startFontClass(yyscanner,"preprocessor");
                                           }
-  					  BEGIN( g_lastCContext ) ; 
+  					  BEGIN( yyextra->lastCContext ) ; 
 					}
 <SkipCxxComment>[^\r\n]*"\\"[\r]?\n	{ // line continuation
-  					  codifyLines(yytext);
+  					  codifyLines(yyscanner,yytext);
 					}
 <SkipCxxComment>[^\r\n]+		{ 
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
 					}
 <SkipCxxComment>\r			
 <SkipCxxComment>\n			{
   					  unput('\n');
-					  endFontClass();
-					  BEGIN( g_lastCContext ) ;
+					  endFontClass(yyscanner);
+					  BEGIN( yyextra->lastCContext ) ;
   					}
 <SkipCxxComment>.			{
-  					  g_code->codify(yytext);
+  					  yyextra->code->codify(yytext);
   					}
 <RemoveSpecialCComment>"*/"{B}*\n({B}*\n)*({B}*(("//@"[{}])|("/*@"[{}]"*/")){B}*\n)?{B}*"/*"[*!]/[^/*] {
-  					  g_yyLineNr+=QCString(yytext).contains('\n');
+  					  yyextra->yyLineNr+=QCString(yytext).contains('\n');
 					}
 <RemoveSpecialCComment>"*/"{B}*\n({B}*\n)*({B}*(("//@"[{}])|("/*@"[{}]"*/")){B}*\n)? {
-  					  g_yyLineNr+=QCString(yytext).contains('\n');
-					  nextCodeLine();
-					  if (g_lastSpecialCContext==SkipCxxComment)
+  					  yyextra->yyLineNr+=QCString(yytext).contains('\n');
+					  nextCodeLine(yyscanner);
+					  if (yyextra->lastSpecialCContext==SkipCxxComment)
 					  { // force end of C++ comment here
-					    endFontClass();
-					    BEGIN( g_lastCContext ) ;
+					    endFontClass(yyscanner);
+					    BEGIN( yyextra->lastCContext ) ;
 					  }
 					  else
 					  {
-  					    BEGIN(g_lastSpecialCContext);
+  					    BEGIN(yyextra->lastSpecialCContext);
 					  }
   					}
 <RemoveSpecialCComment>"*/"		{
-  					  BEGIN(g_lastSpecialCContext);
+  					  BEGIN(yyextra->lastSpecialCContext);
   					}
 <RemoveSpecialCComment>[^*\n]+
 <RemoveSpecialCComment>"//"|"/*"
-<RemoveSpecialCComment>\n  { g_yyLineNr++; }
+<RemoveSpecialCComment>\n  { yyextra->yyLineNr++; }
 <RemoveSpecialCComment>.
 <MemberCall>[^a-z_A-Z0-9(\n]		{ 
-  					  g_code->codify(yytext);
-    					  g_type.resize(0);
-					  g_name.resize(0);
-					  BEGIN(g_memCallContext); 
+  					  yyextra->code->codify(yytext);
+    					  yyextra->type.resize(0);
+					  yyextra->name.resize(0);
+					  BEGIN(yyextra->memCallContext); 
 					}
 <*>\n({B}*"//"[!/][^\n]*\n)+		{ // remove special one-line comment
 					  if (YY_START==SkipCPP) REJECT;
   					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    g_yyLineNr+=((QCString)yytext).contains('\n');
-					    nextCodeLine();
+					    yyextra->yyLineNr+=((QCString)yytext).contains('\n');
+					    nextCodeLine(yyscanner);
 					  }
 					  else
 					  {
-					    startFontClass("comment");
-					    codifyLines(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
+					    endFontClass(yyscanner);
 					  }
 					  if (YY_START==SkipCxxComment)
 					  {
-					    endFontClass();
-					    BEGIN( g_lastCContext ) ;
+					    endFontClass(yyscanner);
+					    BEGIN( yyextra->lastCContext ) ;
 					  }
   					}
 <SkipCPP>\n/.*\n			{ 
-					  endFontClass();
-  					  codifyLines(yytext);
-					  BEGIN( g_lastSkipCppContext ) ;
+					  endFontClass(yyscanner);
+  					  codifyLines(yyscanner,yytext);
+					  BEGIN( yyextra->lastSkipCppContext ) ;
 					}
 <*>\n{B}*"//@"[{}].*\n			{ // remove one-line group marker
   					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    g_yyLineNr+=2;
-					    nextCodeLine();
+					    yyextra->yyLineNr+=2;
+					    nextCodeLine(yyscanner);
 					  }
 					  else
 					  {
-					    startFontClass("comment");
-					    codifyLines(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
+					    endFontClass(yyscanner);
 					  }
 					  if (YY_START==SkipCxxComment)
 					  {
-					    endFontClass();
-					    BEGIN( g_lastCContext ) ;
+					    endFontClass(yyscanner);
+					    BEGIN( yyextra->lastCContext ) ;
 					  }
   					}
 <*>\n{B}*"/*@"[{}]			{ // remove one-line group marker
 					  if (Config_getBool(STRIP_CODE_COMMENTS))
   					  {
-					    if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
-					    g_yyLineNr++;
+					    if (YY_START != RemoveSpecialCComment) yyextra->lastSpecialCContext = YY_START;
+					    yyextra->yyLineNr++;
 					    BEGIN(RemoveSpecialCComment);
 					  }
 					  else
@@ -3494,30 +2037,30 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    // check is to prevent getting stuck in skipping C++ comments
 					    if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					    {
-  					      g_lastCContext = YY_START ;
+  					      yyextra->lastCContext = YY_START ;
 					    }
-					    startFontClass("comment");
-					    codifyLines(yytext);
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
 					    BEGIN(SkipComment);
   					  }
   					}
 <*>^{B}*"//@"[{}].*\n			{ // remove one-line group marker
   					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    g_yyLineNr++;
-					    nextCodeLine();
+					    yyextra->yyLineNr++;
+					    nextCodeLine(yyscanner);
 					  }
 					  else
 					  {
-					    startFontClass("comment");
-					    codifyLines(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
+					    endFontClass(yyscanner);
 					  }
   					}
 <*>^{B}*"/*@"[{}]			{ // remove multi-line group marker
 					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
+					    if (YY_START != RemoveSpecialCComment) yyextra->lastSpecialCContext = YY_START;
 					    BEGIN(RemoveSpecialCComment);
 					  }
 					  else
@@ -3525,24 +2068,24 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    // check is to prevent getting stuck in skipping C++ comments
 					    if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					    {
-  					      g_lastCContext = YY_START ;
+  					      yyextra->lastCContext = YY_START ;
 					    }
-					    startFontClass("comment");
-					    g_code->codify(yytext);
+					    startFontClass(yyscanner,"comment");
+					    yyextra->code->codify(yytext);
 					    BEGIN(SkipComment);
  					  }
   					}
 <*>^{B}*"//"[!/][^\n]*\n		{ // remove special one-line comment
   					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    g_yyLineNr++;
-					    //nextCodeLine();
+					    yyextra->yyLineNr++;
+					    //nextCodeLine(yyscanner);
 					  }
 					  else
 					  {
-					    startFontClass("comment");
-					    codifyLines(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
+					    endFontClass(yyscanner);
 					  }
   					}
 <*>"//"[!/][^\n]*\n			{ // strip special one-line comment
@@ -3550,26 +2093,26 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
 					    char c[2]; c[0]='\n'; c[1]=0;
-					    codifyLines(c);
+					    codifyLines(yyscanner,c);
 					  }
 					  else
 					  {
-					    startFontClass("comment");
-					    codifyLines(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
+					    endFontClass(yyscanner);
 					  }
   					}
 <*>"/*[tag:"[^\]\n]*"]*/"{B}*		{ // special pattern /*[tag:filename]*/ to force linking to a tag file
-  					  g_forceTagReference=yytext;
-					  int s=g_forceTagReference.find(':');
-					  int e=g_forceTagReference.findRev(']');
-					  g_forceTagReference = g_forceTagReference.mid(s+1,e-s-1);
+  					  yyextra->forceTagReference=yytext;
+					  int s=yyextra->forceTagReference.find(':');
+					  int e=yyextra->forceTagReference.findRev(']');
+					  yyextra->forceTagReference = yyextra->forceTagReference.mid(s+1,e-s-1);
   					}
 <*>\n{B}*"/*"[!*]/[^/*] 		{
 					  if (Config_getBool(STRIP_CODE_COMMENTS))
   					  {
-					    if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
-					    g_yyLineNr++;
+					    if (YY_START != RemoveSpecialCComment) yyextra->lastSpecialCContext = YY_START;
+					    yyextra->yyLineNr++;
 					    BEGIN(RemoveSpecialCComment);
 					  }
 					  else
@@ -3577,17 +2120,17 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    // check is to prevent getting stuck in skipping C++ comments
 					    if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					    {
-  					      g_lastCContext = YY_START ;
+  					      yyextra->lastCContext = YY_START ;
 					    }
-					    startFontClass("comment");
-					    codifyLines(yytext);
+					    startFontClass(yyscanner,"comment");
+					    codifyLines(yyscanner,yytext);
 					    BEGIN(SkipComment);
   					  }
 					}
 <*>^{B}*"/**"[*]+/[^/]			{ // special C "banner" comment block at a new line
 					  if (Config_getBool(JAVADOC_BANNER) && Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
+					    if (YY_START != RemoveSpecialCComment) yyextra->lastSpecialCContext = YY_START;
 					    BEGIN(RemoveSpecialCComment);
 					  }
 					  else
@@ -3595,17 +2138,17 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    // check is to prevent getting stuck in skipping C++ comments
 					    if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					    {
-  					      g_lastCContext = YY_START ;
+  					      yyextra->lastCContext = YY_START ;
 					    }
-					    startFontClass("comment");
-					    g_code->codify(yytext);
+					    startFontClass(yyscanner,"comment");
+					    yyextra->code->codify(yytext);
 					    BEGIN(SkipComment);
  					  }
 					}
 <*>^{B}*"/*"[!*]/[^/*]			{ // special C comment block at a new line
 					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
+					    if (YY_START != RemoveSpecialCComment) yyextra->lastSpecialCContext = YY_START;
 					    BEGIN(RemoveSpecialCComment);
 					  }
 					  else
@@ -3613,10 +2156,10 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    // check is to prevent getting stuck in skipping C++ comments
 					    if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					    {
-  					      g_lastCContext = YY_START ;
+  					      yyextra->lastCContext = YY_START ;
 					    }
-					    startFontClass("comment");
-					    g_code->codify(yytext);
+					    startFontClass(yyscanner,"comment");
+					    yyextra->code->codify(yytext);
 					    BEGIN(SkipComment);
  					  }
 					}
@@ -3624,7 +2167,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
                                           if (YY_START==SkipString) REJECT;
 					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
-					    if (YY_START != RemoveSpecialCComment) g_lastSpecialCContext = YY_START;
+					    if (YY_START != RemoveSpecialCComment) yyextra->lastSpecialCContext = YY_START;
 					    BEGIN(RemoveSpecialCComment);
 					  }
 					  else
@@ -3632,10 +2175,10 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    // check is to prevent getting stuck in skipping C++ comments
 					    if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					    {
-  					      g_lastCContext = YY_START ;
+  					      yyextra->lastCContext = YY_START ;
 					    }
-					    startFontClass("comment");
-					    g_code->codify(yytext);
+					    startFontClass(yyscanner,"comment");
+					    yyextra->code->codify(yytext);
 					    BEGIN(SkipComment);
 					  }
 					}
@@ -3643,134 +2186,1724 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
                                           if (YY_START==SkipString) REJECT;
                                           if (!Config_getBool(STRIP_CODE_COMMENTS))
   					  {
-					    startFontClass("comment");
-					    g_code->codify(yytext);
-					    endFontClass();
+					    startFontClass(yyscanner,"comment");
+					    yyextra->code->codify(yytext);
+					    endFontClass(yyscanner);
 					  }
 					}
 <SkipComment>[^\*\n]+                   {
-                                          g_code->codify(yytext);
+                                          yyextra->code->codify(yytext);
                                         }
 <*>"/*"					{ 
-					  startFontClass("comment");
-  					  g_code->codify(yytext);
+					  startFontClass(yyscanner,"comment");
+  					  yyextra->code->codify(yytext);
 					  // check is to prevent getting stuck in skipping C++ comments
 					  if (YY_START != SkipComment && YY_START != SkipCxxComment)
 					  {
-  					    g_lastCContext = YY_START ;
+  					    yyextra->lastCContext = YY_START ;
 					  }
 					  BEGIN( SkipComment ) ;
 					}
 <*>@\"					{ // C# verbatim string
-					  startFontClass("stringliteral");
-  					  g_code->codify(yytext);
-					  g_lastVerbStringContext=YY_START;
+					  startFontClass(yyscanner,"stringliteral");
+  					  yyextra->code->codify(yytext);
+					  yyextra->lastVerbStringContext=YY_START;
 					  BEGIN(SkipVerbString);
 					}
 <*>"//"					{ 
-  					  startFontClass("comment");
-  					  g_code->codify(yytext);
-  					  g_lastCContext = YY_START ;
+  					  startFontClass(yyscanner,"comment");
+  					  yyextra->code->codify(yytext);
+  					  yyextra->lastCContext = YY_START ;
 					  BEGIN( SkipCxxComment ) ;
 					}
 <*>"("|"["					{
-  					  g_code->codify(yytext);
-					  g_theCallContext.pushScope(g_name, g_type);
+  					  yyextra->code->codify(yytext);
+					  yyextra->theCallContext.pushScope(yyextra->name, yyextra->type);
   					}
 <*>")"|"]"					{
-  					  g_code->codify(yytext);
-					  g_theCallContext.popScope(g_name, g_type);
+  					  yyextra->code->codify(yytext);
+					  yyextra->theCallContext.popScope(yyextra->name, yyextra->type);
   					}
 <*>\n					{
-					  g_yyColNr++;
-  					  codifyLines(yytext); 
+					  yyextra->yyColNr++;
+  					  codifyLines(yyscanner,yytext); 
   					}
 <*>.					{
-					  g_yyColNr++;
-  					  g_code->codify(yytext);
+					  yyextra->yyColNr++;
+  					  yyextra->code->codify(yytext);
 					}
   /*
 <*>([ \t\n]*"\n"){2,}			{ // combine multiple blank lines
   					  //QCString sepLine=yytext;
-  					  //g_code->codify("\n\n");
-  					  //g_yyLineNr+=sepLine.contains('\n'); 
+  					  //yyextra->code->codify("\n\n");
+  					  //yyextra->yyLineNr+=sepLine.contains('\n'); 
   					  //char sepLine[3]="\n\n";
-  					  codifyLines(yytext);
+  					  codifyLines(yyscanner,yytext);
 					}
   */
 
-%%
+%%
+
+/*@ ----------------------------------------------------------------------------
+ */
+
+void VariableContext::addVariable(yyscan_t yyscanner,const QCString &type,const QCString &name)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("VariableContext::addVariable(%s,%s)\n",type.data(),name.data());
+  QCString ltype = type.simplifyWhiteSpace();
+  QCString lname = name.simplifyWhiteSpace();
+  if (ltype.left(7)=="struct ") 
+  {
+    ltype = ltype.right(ltype.length()-7);
+  }
+  else if (ltype.left(6)=="union ")
+  {
+    ltype = ltype.right(ltype.length()-6);
+  }
+  if (ltype.isEmpty() || lname.isEmpty()) return;
+  DBG_CTX((stderr,"** addVariable trying: type='%s' name='%s' g_currentDefinition=%s\n",
+	ltype.data(),lname.data(),g_currentDefinition?g_currentDefinition->name().data():"<none>"));
+  Scope *scope = m_scopes.count()==0 ? &m_globalScope : m_scopes.getLast();
+  const ClassDef *varType;
+  int i=0;
+  if (
+      (varType=yyextra->codeClassSDict->find(ltype)) ||  // look for class definitions inside the code block
+      (varType=getResolvedClass(yyextra->currentDefinition,yyextra->sourceFileDef,ltype)) // look for global class definitions
+     ) 
+  {
+    DBG_CTX((stderr,"** addVariable type='%s' name='%s'\n",ltype.data(),lname.data()));
+    scope->append(lname,varType); // add it to a list
+  }
+  else if ((i=ltype.find('<'))!=-1)
+  {
+    // probably a template class
+    QCString typeName(ltype.left(i));
+    ClassDef* newDef = 0;
+    QCString templateArgs(ltype.right(ltype.length() - i));
+    if ( !typeName.isEmpty() &&
+         ( // look for class definitions inside the code block
+	   (varType=yyextra->codeClassSDict->find(typeName)) ||
+           // otherwise look for global class definitions
+           (varType=getResolvedClass(yyextra->currentDefinition,yyextra->sourceFileDef,typeName,0,0,TRUE,TRUE))
+	 ) && // and it must be a template
+         !varType->templateArguments().empty())
+    {
+      newDef = varType->getVariableInstance( templateArgs );
+    }
+    if (newDef)
+    {
+      DBG_CTX((stderr,"** addVariable type='%s' templ='%s' name='%s'\n",typeName.data(),templateArgs.data(),lname.data()));
+      scope->append(lname, newDef);
+    }
+    else
+    {
+      // Doesn't seem to be a template. Try just the base name.
+      addVariable(yyscanner,typeName,name);
+    }
+  }
+  else 
+  {
+    if (m_scopes.count()>0) // for local variables add a dummy entry so the name 
+                            // is hidden to avoid false links to global variables with the same name
+                            // TODO: make this work for namespaces as well!
+    {
+      DBG_CTX((stderr,"** addVariable: dummy context for '%s'\n",lname.data()));
+      scope->append(lname,dummyContext);
+    }
+    else
+    {
+      DBG_CTX((stderr,"** addVariable: not adding variable!\n"));
+    }
+  }
+}
+
+ClassDef *VariableContext::findVariable(const QCString &name)
+{
+  if (name.isEmpty()) return 0;
+  ClassDef *result = 0;
+  QListIterator<Scope> sli(m_scopes);
+  Scope *scope;
+  QCString key = name;
+  // search from inner to outer scope
+  for (sli.toLast();(scope=sli.current());--sli)
+  {
+    result = scope->find(key);
+    if (result)
+    {
+      DBG_CTX((stderr,"** findVariable(%s)=%p\n",name.data(),result));
+      return result;
+    }
+  }
+  // nothing found -> also try the global scope
+  result=m_globalScope.find(name);
+  DBG_CTX((stderr,"** findVariable(%s)=%p\n",name.data(),result));
+  return result;
+}
+
+const ClassDef *VariableContext::dummyContext = (ClassDef*)0x8;
+
+//-------------------------------------------------------------------
+
+/*! add class/namespace name s to the scope */
+static void pushScope(yyscan_t yyscanner,const char *s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  yyextra->classScopeLengthStack.push(new int(yyextra->classScope.length()));
+  if (yyextra->classScope.isEmpty() || leftScopeMatch(s,yyextra->classScope))
+  {
+    yyextra->classScope = s;
+  }
+  else
+  {
+    yyextra->classScope += "::";
+    yyextra->classScope += s;
+  }
+  //printf("pushScope(%s) result: '%s'\n",s,yyextra->classScope.data());
+}
+
+
+/*! remove the top class/namespace name from the scope */
+static void popScope(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (!yyextra->classScopeLengthStack.isEmpty())
+  {
+    int *pLength = yyextra->classScopeLengthStack.pop();
+    yyextra->classScope.truncate(*pLength);
+    delete pLength;
+  }
+  else
+  {
+    //err("Too many end of scopes found!\n");
+  }
+  //printf("popScope() result: '%s'\n",yyextra->classScope.data());
+}
+
+static void setCurrentDoc(yyscan_t yyscanner,const QCString &anchor)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (Doxygen::searchIndex)
+  {
+    if (yyextra->searchCtx)
+    {
+      yyextra->code->setCurrentDoc(yyextra->searchCtx,yyextra->searchCtx->anchor(),FALSE);
+    }
+    else
+    {
+      yyextra->code->setCurrentDoc(yyextra->sourceFileDef,anchor,TRUE);
+    }
+  }
+}
+
+static void addToSearchIndex(yyscan_t yyscanner,const char *text)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (Doxygen::searchIndex)
+  {
+    yyextra->code->addWord(text,FALSE);
+  }
+}
+
+static void setClassScope(yyscan_t yyscanner,const QCString &name)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("setClassScope(%s)\n",name.data());
+  QCString n=name;
+  n=n.simplifyWhiteSpace();
+  int ts=n.find('<'); // start of template
+  int te=n.findRev('>'); // end of template
+  //printf("ts=%d te=%d\n",ts,te);
+  if (ts!=-1 && te!=-1 && te>ts)
+  {
+    // remove template from scope
+    n=n.left(ts)+n.right(n.length()-te-1);
+  }
+  while (!yyextra->classScopeLengthStack.isEmpty())
+  {
+    popScope(yyscanner);
+  }
+  yyextra->classScope.resize(0);
+  int i;
+  while ((i=n.find("::"))!=-1)
+  {
+    pushScope(yyscanner,n.left(i));
+    n = n.mid(i+2);
+  }
+  pushScope(yyscanner,n);
+  //printf("--->New class scope '%s'\n",yyextra->classScope.data());
+}
+
+/*! start a new line of code, inserting a line number if yyextra->sourceFileDef
+ * is TRUE. If a definition starts at the current line, then the line
+ * number is linked to the documentation of that definition.
+ */
+static void startCodeLine(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //if (yyextra->currentFontClass) { yyextra->code->endFontClass(yyscanner); }
+  if (yyextra->sourceFileDef && yyextra->lineNumbers)
+  {
+    //QCString lineNumber,lineAnchor;
+    //lineNumber.sprintf("%05d",yyextra->yyLineNr);
+    //lineAnchor.sprintf("l%05d",yyextra->yyLineNr);
+   
+    Definition *d   = yyextra->sourceFileDef->getSourceDefinition(yyextra->yyLineNr);
+    //printf("%s:startCodeLine(%d)=%p\n",yyextra->sourceFileDef->name().data(),yyextra->yyLineNr,d);
+    if (!yyextra->includeCodeFragment && d)
+    {
+      yyextra->currentDefinition = d;
+      yyextra->currentMemberDef = yyextra->sourceFileDef->getSourceMember(yyextra->yyLineNr);
+      yyextra->insideBody = FALSE;
+      yyextra->searchingForBody = TRUE;
+      yyextra->realScope = d->name();
+      //yyextra->classScope = "";
+      yyextra->type.resize(0);
+      yyextra->name.resize(0);
+      yyextra->args.resize(0);
+      yyextra->parmType.resize(0);
+      yyextra->parmName.resize(0);
+      //printf("Real scope: '%s'\n",yyextra->realScope.data());
+      yyextra->bodyCurlyCount = 0;
+      QCString lineAnchor;
+      lineAnchor.sprintf("l%05d",yyextra->yyLineNr);
+      if (yyextra->currentMemberDef)
+      {
+        yyextra->code->writeLineNumber(yyextra->currentMemberDef->getReference(),
+	                        yyextra->currentMemberDef->getOutputFileBase(),
+	                        yyextra->currentMemberDef->anchor(),yyextra->yyLineNr);
+        setCurrentDoc(yyscanner,lineAnchor);
+      }
+      else if (d->isLinkableInProject())
+      {
+        yyextra->code->writeLineNumber(d->getReference(),
+	                        d->getOutputFileBase(),
+	                        0,yyextra->yyLineNr);
+        setCurrentDoc(yyscanner,lineAnchor);
+      }
+    }
+    else
+    {
+      yyextra->code->writeLineNumber(0,0,0,yyextra->yyLineNr);
+    }
+  }
+  DBG_CTX((stderr,"startCodeLine(%d)\n",yyextra->yyLineNr));
+  yyextra->code->startCodeLine(yyextra->sourceFileDef && yyextra->lineNumbers); 
+  if (yyextra->currentFontClass)
+  {
+    yyextra->code->startFontClass(yyextra->currentFontClass);
+  }
+}
+
+
+
+static void endCodeLine(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  DBG_CTX((stderr,"endCodeLine(%d)\n",yyextra->yyLineNr));
+  endFontClass(yyscanner);
+  yyextra->code->endCodeLine();
+}
+
+static void nextCodeLine(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const char * fc = yyextra->currentFontClass;
+  endCodeLine(yyscanner);
+  if (yyextra->yyLineNr<yyextra->inputLines) 
+  {
+    yyextra->currentFontClass = fc;
+    startCodeLine(yyscanner);
+  }
+}
+
+/*! write a code fragment 'text' that may span multiple lines, inserting
+ * line numbers for each line.
+ */
+static void codifyLines(yyscan_t yyscanner,const char *text)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("codifyLines(%d,\"%s\")\n",yyextra->yyLineNr,text);
+  const char *p=text,*sp=p;
+  char c;
+  bool done=FALSE;
+  while (!done)
+  {
+    sp=p;
+    while ((c=*p++) && c!='\n') { yyextra->yyColNr++; }
+    if (c=='\n')
+    {
+      yyextra->yyLineNr++;
+      yyextra->yyColNr=1;
+      //*(p-1)='\0';
+      int l = (int)(p-sp-1);
+      char *tmp = (char*)malloc(l+1);
+      memcpy(tmp,sp,l);
+      tmp[l]='\0';
+      yyextra->code->codify(tmp);
+      free(tmp);
+      nextCodeLine(yyscanner);
+    }
+    else
+    {
+      yyextra->code->codify(sp);
+      done=TRUE;
+    }
+  }
+}
+
+/*! writes a link to a fragment \a text that may span multiple lines, inserting
+ * line numbers for each line. If \a text contains newlines, the link will be 
+ * split into multiple links with the same destination, one for each line.
+ */
+static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol,
+                                   const Definition *d,
+                                   const char *text)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS);
+  TooltipManager::instance()->addTooltip(d);
+  QCString ref  = d->getReference();
+  QCString file = d->getOutputFileBase();
+  QCString anchor = d->anchor();
+  QCString tooltip; 
+  if (!sourceTooltips) // fall back to simple "title" tooltips
+  {
+    tooltip = d->briefDescriptionAsTooltip();
+  }
+  bool done=FALSE;
+  char *p=(char *)text;
+  while (!done)
+  {
+    char *sp=p;
+    char c;
+    while ((c=*p++) && c!='\n') { }
+    if (c=='\n')
+    {
+      yyextra->yyLineNr++;
+      *(p-1)='\0';
+      //printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp);
+      ol.writeCodeLink(ref,file,anchor,sp,tooltip);
+      nextCodeLine(yyscanner);
+    }
+    else
+    {
+      //printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp);
+      ol.writeCodeLink(ref,file,anchor,sp,tooltip);
+      done=TRUE;
+    }
+  }
+}
+
+static void addType(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->name=="const") { yyextra->name.resize(0); return; }
+  if (!yyextra->type.isEmpty()) yyextra->type += ' ' ;
+  yyextra->type += yyextra->name ;
+  yyextra->name.resize(0) ;
+  if (!yyextra->type.isEmpty()) yyextra->type += ' ' ;
+  yyextra->type += yyextra->args ;
+  yyextra->args.resize(0) ;
+}
+
+static void addParmType(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->parmName=="const") { yyextra->parmName.resize(0); return; }
+  if (!yyextra->parmType.isEmpty()) yyextra->parmType += ' ' ;
+  yyextra->parmType += yyextra->parmName ;
+  yyextra->parmName.resize(0) ;
+}
+
+static void addUsingDirective(yyscan_t yyscanner,const char *name)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->sourceFileDef && name)
+  {
+    NamespaceDef *nd = Doxygen::namespaceSDict->find(name);
+    if (nd)
+    {
+      yyextra->sourceFileDef->addUsingDirective(nd);
+    }
+  }
+}
+
+static void setParameterList(yyscan_t yyscanner,const MemberDef *md)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  yyextra->classScope = md->getClassDef() ? md->getClassDef()->name().data() : "";
+  for (const Argument &a : md->argumentList())
+  {
+    yyextra->parmName = a.name;
+    yyextra->parmType = a.type;
+    int i = yyextra->parmType.find('*');
+    if (i!=-1) yyextra->parmType = yyextra->parmType.left(i);
+    i = yyextra->parmType.find('&');
+    if (i!=-1) yyextra->parmType = yyextra->parmType.left(i);
+    yyextra->parmType.stripPrefix("const ");
+    yyextra->parmType=yyextra->parmType.stripWhiteSpace();
+    yyextra->theVarContext.addVariable(yyscanner,yyextra->parmType,yyextra->parmName);
+  }
+}
+
+static const ClassDef *stripClassName(yyscan_t yyscanner,const char *s,Definition *d)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int pos=0;
+  QCString type = s;
+  QCString className;
+  QCString templSpec;
+  while (extractClassNameFromType(type,pos,className,templSpec)!=-1)
+  {
+    QCString clName=className+templSpec;
+    const ClassDef *cd=0;
+    if (!yyextra->classScope.isEmpty())
+    {
+      cd=getResolvedClass(d,yyextra->sourceFileDef,yyextra->classScope+"::"+clName);
+    }
+    if (cd==0)
+    {
+      cd=getResolvedClass(d,yyextra->sourceFileDef,clName);
+    }
+    //printf("stripClass trying '%s' = %p\n",clName.data(),cd);
+    if (cd)
+    {
+      return cd;
+    }
+  }
+
+  return 0;
+}
+
+static MemberDef *setCallContextForVar(yyscan_t yyscanner,const QCString &name)
+{
+  if (name.isEmpty()) return 0;
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  DBG_CTX((stderr,"setCallContextForVar(%s) yyextra->classScope=%s\n",name.data(),yyextra->classScope.data()));
+
+  int scopeEnd = name.findRev("::");
+  if (scopeEnd!=-1) // name with explicit scope
+  {
+    QCString scope   = name.left(scopeEnd);
+    QCString locName = name.right(name.length()-scopeEnd-2);
+    //printf("explicit scope: name=%s scope=%s\n",locName.data(),scope.data());
+    ClassDef *mcd = getClass(scope); 
+    if (mcd && !locName.isEmpty())
+    {
+      MemberDef *md=mcd->getMemberByName(locName);
+      if (md)
+      {
+        //printf("name=%s scope=%s\n",locName.data(),scope.data());
+        yyextra->theCallContext.setScope(stripClassName(yyscanner,md->typeString(),md->getOuterScope()));
+        return md;
+      }
+    }
+    else // check namespace as well
+    {
+      const NamespaceDef *mnd = getResolvedNamespace(scope);
+      if (mnd && !locName.isEmpty())
+      {
+	MemberDef *md=mnd->getMemberByName(locName);
+	if (md)
+	{
+	  //printf("name=%s scope=%s\n",locName.data(),scope.data());
+	  yyextra->theCallContext.setScope(stripClassName(yyscanner,md->typeString(),md->getOuterScope()));
+	  return md;
+	}
+      }
+    }
+  }
+  
+  MemberName *mn;
+  ClassDef *mcd = yyextra->theVarContext.findVariable(name);
+  if (mcd) // local variable
+  {
+    DBG_CTX((stderr,"local variable?\n"));
+    if (mcd!=VariableContext::dummyContext)
+    {
+      DBG_CTX((stderr,"local var '%s' mcd=%s\n",name.data(),mcd->name().data()));
+      yyextra->theCallContext.setScope(mcd);
+    }
+  }
+  else
+  {
+    DBG_CTX((stderr,"class member? scope=%s\n",yyextra->classScope.data()));
+    // look for a class member 
+    mcd = getClass(yyextra->classScope);
+    if (mcd)
+    {
+      DBG_CTX((stderr,"Inside class %s\n",mcd->name().data()));
+      MemberDef *md=mcd->getMemberByName(name);
+      if (md) 
+      {
+        DBG_CTX((stderr,"Found member %s\n",md->name().data()));
+	if (yyextra->scopeStack.top()!=CLASSBLOCK)
+	{
+          DBG_CTX((stderr,"class member '%s' mcd=%s\n",name.data(),mcd->name().data()));
+	  yyextra->theCallContext.setScope(stripClassName(yyscanner,md->typeString(),md->getOuterScope()));
+	}
+	return md;
+      }
+    }
+  }
+
+  // look for a global member
+  if ((mn=Doxygen::functionNameSDict->find(name)))
+  {
+    //printf("global var '%s'\n",name.data());
+    if (mn->count()==1) // global defined only once
+    {
+      MemberDef *md=mn->getFirst();
+      if (!md->isStatic() || md->getBodyDef()==yyextra->sourceFileDef)
+      {
+        yyextra->theCallContext.setScope(stripClassName(yyscanner,md->typeString(),md->getOuterScope()));
+        return md;
+      }
+      return 0;
+    }
+    else if (mn->count()>1) // global defined more than once
+    {
+      MemberNameIterator it(*mn);
+      MemberDef *md;
+      for (;(md=it.current());++it)
+      {
+	//printf("mn=%p md=%p md->getBodyDef()=%p yyextra->sourceFileDef=%p\n",
+	//    mn,md,
+	//    md->getBodyDef(),yyextra->sourceFileDef);
+
+	// in case there are multiple members we could link to, we 
+	// only link to members if defined in the same file or 
+	// defined as external.
+        if ((!md->isStatic() || md->getBodyDef()==yyextra->sourceFileDef) &&
+	    (yyextra->forceTagReference.isEmpty() || yyextra->forceTagReference==md->getReference())
+	   )
+        {
+          yyextra->theCallContext.setScope(stripClassName(yyscanner,md->typeString(),md->getOuterScope()));
+	  //printf("returning member %s in source file %s\n",md->name().data(),yyextra->sourceFileDef->name().data());
+          return md;
+        }
+      }
+      return 0;
+    }
+  }
+  return 0;
+}
+
+static void updateCallContextForSmartPointer(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const Definition *d = yyextra->theCallContext.getScope();
+  //printf("updateCallContextForSmartPointer() cd=%s\n",cd ? d->name().data() : "<none>");
+  MemberDef *md;
+  if (d && d->definitionType()==Definition::TypeClass && (md=(dynamic_cast<const ClassDef*>(d))->isSmartPointer()))
+  {
+    const ClassDef *ncd = stripClassName(yyscanner,md->typeString(),md->getOuterScope());
+    if (ncd)
+    {
+      yyextra->theCallContext.setScope(ncd);
+      //printf("Found smart pointer call %s->%s!\n",cd->name().data(),ncd->name().data());
+    }
+  }
+}
+
+static bool getLinkInScope(yyscan_t yyscanner,
+                           const QCString &c,  // scope
+                           const QCString &m,  // member
+			   const char *memberText, // exact text
+			   CodeOutputInterface &ol,
+			   const char *text,
+			   bool varOnly
+			  )
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const MemberDef    *md = 0;
+  const ClassDef     *cd = 0;
+  const FileDef      *fd = 0;
+  const NamespaceDef *nd = 0;
+  const GroupDef     *gd = 0;
+  DBG_CTX((stderr,"getLinkInScope: trying '%s'::'%s' varOnly=%d\n",c.data(),m.data(),varOnly));
+  if (getDefs(c,m,"()",md,cd,fd,nd,gd,FALSE,yyextra->sourceFileDef,FALSE,yyextra->forceTagReference) && 
+      (!varOnly || md->isVariable()))
+  {
+    if (md->isLinkable())
+    {
+      //printf("found it %s!\n",md->qualifiedName().data());
+      if (yyextra->exampleBlock)
+      {
+        QCString anchor;
+        anchor.sprintf("a%d",yyextra->anchorCount);
+        //printf("addExampleFile(%s,%s,%s)\n",anchor.data(),yyextra->exampleName.data(),
+        //                                  yyextra->exampleFile.data());
+        if (const_cast<MemberDef*>(md)->addExample(anchor,yyextra->exampleName,yyextra->exampleFile))
+        {
+          ol.writeCodeAnchor(anchor);
+          yyextra->anchorCount++;
+        }
+      }
+
+      const Definition *d = md->getOuterScope()==Doxygen::globalScope ?
+                            md->resolveAlias()->getFileDef() : md->getOuterScope();
+      if (md->resolveAlias()->getGroupDef()) d = md->resolveAlias()->getGroupDef();
+      if (d && d->isLinkable())
+      {
+        yyextra->theCallContext.setScope(stripClassName(yyscanner,md->typeString(),md->getOuterScope()));
+        //printf("yyextra->currentDefinition=%p yyextra->currentMemberDef=%p yyextra->insideBody=%d\n",
+        //        yyextra->currentDefinition,yyextra->currentMemberDef,yyextra->insideBody);
+
+        if (yyextra->currentDefinition && yyextra->currentMemberDef &&
+            md!=yyextra->currentMemberDef && yyextra->insideBody && yyextra->collectXRefs)
+        {
+          addDocCrossReference(yyextra->currentMemberDef,const_cast<MemberDef*>(md));
+        }
+        //printf("d->getReference()='%s' d->getOutputBase()='%s' name='%s' member name='%s'\n",d->getReference().data(),d->getOutputFileBase().data(),d->name().data(),md->name().data());
+
+        writeMultiLineCodeLink(yyscanner,ol,md, text ? text : memberText);
+        addToSearchIndex(yyscanner,text ? text : memberText);
+        return TRUE;
+      }
+    }
+    else // found member, but it is not linkable, so make sure content inside is not assigned
+         // to the previous member, see bug762760
+    {
+      DBG_CTX((stderr,"unlinkable member %s\n",md->name().data()));
+      yyextra->currentMemberDef = 0;
+    }
+  }
+  return FALSE;
+}
+
+static bool getLink(yyscan_t yyscanner,
+                    const char *className,
+                    const char *memberName,
+		    CodeOutputInterface &ol,
+		    const char *text,
+		    bool varOnly)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("getLink(%s,%s) yyextra->curClassName=%s\n",className,memberName,yyextra->curClassName.data());
+  QCString m=removeRedundantWhiteSpace(memberName);
+  QCString c=className;
+  if (!getLinkInScope(yyscanner,c,m,memberName,ol,text,varOnly))
+  {
+    if (!yyextra->curClassName.isEmpty())
+    {
+      if (!c.isEmpty()) c.prepend("::");
+      c.prepend(yyextra->curClassName);
+      return getLinkInScope(yyscanner,c,m,memberName,ol,text,varOnly);
+    }
+    return FALSE;
+  }
+  return TRUE;
+}
+
+static void generateClassOrGlobalLink(yyscan_t yyscanner,
+                                      CodeOutputInterface &ol,
+                                      const char *clName,
+                                      bool typeOnly,
+                                      bool varOnly)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int i=0;
+  if (*clName=='~') // correct for matching negated values i.s.o. destructors.
+  {
+    yyextra->code->codify("~");
+    clName++;
+  }
+  QCString className=clName;
+  if (className.isEmpty()) return;
+  if (yyextra->insideProtocolList) // for Obj-C
+  {
+    className+="-p";
+  }
+  if (yyextra->lang==SrcLangExt_PHP)
+  {
+    className = substitute(className,"\\","::"); // for PHP namespaces
+  }
+  else if (yyextra->lang==SrcLangExt_CSharp || yyextra->lang==SrcLangExt_Java)
+  {
+    className = substitute(className,".","::"); // for PHP namespaces
+  }
+  const ClassDef *cd=0,*lcd=0;
+  const MemberDef *md=0;
+  bool isLocal=FALSE;
+
+  //printf("generateClassOrGlobalLink(className=%s)\n",className.data());
+  if (!yyextra->prefixed_with_this_keyword || (lcd=yyextra->theVarContext.findVariable(className))==0) // not a local variable
+  {
+    Definition *d = yyextra->currentDefinition;
+    //printf("d=%s yyextra->sourceFileDef=%s\n",d?d->name().data():"<none>",yyextra->sourceFileDef?yyextra->sourceFileDef->name().data():"<none>");
+    cd = getResolvedClass(d,yyextra->sourceFileDef,className,&md);
+    DBG_CTX((stderr,"non-local variable name=%s context=%d cd=%s md=%s!\n",
+    className.data(),yyextra->theVarContext.count(),cd?cd->name().data():"<none>",
+        md?md->name().data():"<none>"));
+    if (cd==0 && md==0 && (i=className.find('<'))!=-1)
+    {
+      QCString bareName = className.left(i); //stripTemplateSpecifiersFromScope(className);
+      DBG_CTX((stderr,"bareName=%s\n",bareName.data()));
+      if (bareName!=className)
+      {
+	cd=getResolvedClass(d,yyextra->sourceFileDef,bareName,&md); // try unspecialized version
+      }
+    }
+    const NamespaceDef *nd = getResolvedNamespace(className);
+    if (nd && nd->isLinkable())
+    {
+      yyextra->theCallContext.setScope(nd);
+      addToSearchIndex(yyscanner,className);
+      writeMultiLineCodeLink(yyscanner,*yyextra->code,nd,clName);
+      return;
+    }
+    //printf("md=%s\n",md?md->name().data():"<none>");
+    DBG_CTX((stderr,"is found as a type cd=%s nd=%s\n",
+          cd?cd->name().data():"<null>",
+          nd?nd->name().data():"<null>"));
+    if (cd==0 && md==0) // also see if it is variable or enum or enum value
+    {
+      if (getLink(yyscanner,yyextra->classScope,clName,ol,clName,varOnly))
+      {
+	return;
+      }
+    }
+  }
+  else
+  {
+    //printf("local variable!\n");
+    if (lcd!=VariableContext::dummyContext) 
+    {
+      //printf("non-dummy context lcd=%s!\n",lcd->name().data());
+      yyextra->theCallContext.setScope(lcd);
+
+      // to following is needed for links to a global variable, but is
+      // no good for a link to a local variable that is also a global symbol.
+       
+      //if (getLink(yyscanner,yyextra->classScope,clName,ol,clName))
+      //{
+	//return;
+      //}
+    }
+    isLocal=TRUE;
+    DBG_CTX((stderr,"is a local variable cd=%p!\n",cd));
+  }
+  yyextra->prefixed_with_this_keyword = FALSE; // discard the "this" prefix for the next calls
+
+  if (cd && cd->isLinkable()) // is it a linkable class
+  {
+    DBG_CTX((stderr,"is linkable class %s\n",clName));
+    if (yyextra->exampleBlock)
+    {
+      QCString anchor;
+      anchor.sprintf("_a%d",yyextra->anchorCount);
+      //printf("addExampleClass(%s,%s,%s)\n",anchor.data(),yyextra->exampleName.data(),
+      //                                   yyextra->exampleFile.data());
+      if (const_cast<ClassDef*>(cd)->addExample(anchor,yyextra->exampleName,yyextra->exampleFile))
+      {
+	ol.writeCodeAnchor(anchor);
+	yyextra->anchorCount++;
+      }
+    }
+    writeMultiLineCodeLink(yyscanner,ol,cd,clName);
+    addToSearchIndex(yyscanner,className);
+    yyextra->theCallContext.setScope(cd);
+    if (md)
+    {
+      const Definition *d = md->getOuterScope()==Doxygen::globalScope ?
+                      md->getFileDef() : md->getOuterScope();
+      if (md->getGroupDef()) d = md->getGroupDef();
+      if (d && d->isLinkable() && md->isLinkable() && 
+          yyextra->currentMemberDef && yyextra->collectXRefs)
+      {
+        addDocCrossReference(yyextra->currentMemberDef,const_cast<MemberDef*>(md));
+      }
+    }
+  }
+  else // not a class, maybe a global member
+  {
+    DBG_CTX((stderr,"class %s not linkable! cd=%p md=%p typeOnly=%d\n",clName,cd,md,typeOnly));
+    if (!isLocal && (md!=0 || (cd==0 && !typeOnly))) // not a class, see if it is a global enum/variable/typedef.
+    {
+      if (md==0) // not found as a typedef
+      {
+	md = setCallContextForVar(yyscanner,clName);
+	//printf("setCallContextForVar(%s) md=%p yyextra->currentDefinition=%p\n",clName,md,yyextra->currentDefinition);
+	if (md && yyextra->currentDefinition)
+	{
+	  DBG_CTX((stderr,"%s accessible from %s? %d md->getOuterScope=%s\n",
+	      md->name().data(),yyextra->currentDefinition->name().data(),
+	      isAccessibleFrom(yyextra->currentDefinition,yyextra->sourceFileDef,md),
+	      md->getOuterScope()->name().data()));
+	}
+	     
+        if (md && yyextra->currentDefinition && 
+	    isAccessibleFrom(yyextra->currentDefinition,yyextra->sourceFileDef,md)==-1)
+	{
+	  md=0; // variable not accessible
+	}
+      }
+      if (md && (!varOnly || md->isVariable()))
+      {
+        DBG_CTX((stderr,"is a global md=%p yyextra->currentDefinition=%s linkable=%d\n",md,yyextra->currentDefinition?yyextra->currentDefinition->name().data():"<none>",md->isLinkable()));
+	if (md->isLinkable())
+	{
+	  QCString text;
+	  if (!yyextra->forceTagReference.isEmpty()) // explicit reference to symbol in tag file
+	  {
+	    text=yyextra->forceTagReference;
+	    if (text.right(4)==".tag") // strip .tag if present
+	    {
+	      text=text.left(text.length()-4);
+	    }
+	    text+=getLanguageSpecificSeparator(md->getLanguage());
+	    text+=clName;
+	    const_cast<MemberDef*>(md)->setName(text);
+            const_cast<MemberDef*>(md)->setLocalName(text);
+	  }
+	  else // normal reference
+	  {
+	    text=clName;
+	  }
+	  writeMultiLineCodeLink(yyscanner,ol,md,text);
+          addToSearchIndex(yyscanner,clName);
+	  if (yyextra->currentMemberDef && yyextra->collectXRefs)
+	  {
+	    addDocCrossReference(yyextra->currentMemberDef,const_cast<MemberDef*>(md));
+	  }
+	  return;
+	}
+      }
+    }
+    
+    // nothing found, just write out the word
+    DBG_CTX((stderr,"not found!\n"));
+    codifyLines(yyscanner,clName);
+    addToSearchIndex(yyscanner,clName);
+  }
+}
+
+static bool generateClassMemberLink(yyscan_t yyscanner,
+                                    CodeOutputInterface &ol,
+                                    MemberDef *xmd,
+                                    const char *memName)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  // extract class definition of the return type in order to resolve
+  // a->b()->c() like call chains
+
+  //printf("type='%s' args='%s' class=%s\n",
+  //  xmd->typeString(),xmd->argsString(),
+  //  xmd->getClassDef()->name().data());
+
+  if (yyextra->exampleBlock)
+  {
+    QCString anchor;
+    anchor.sprintf("a%d",yyextra->anchorCount);
+    //printf("addExampleFile(%s,%s,%s)\n",anchor.data(),yyextra->exampleName.data(),
+    //                                  yyextra->exampleFile.data());
+    if (xmd->addExample(anchor,yyextra->exampleName,yyextra->exampleFile))
+    {
+      ol.writeCodeAnchor(anchor);
+      yyextra->anchorCount++;
+    }
+  }
+
+  const ClassDef *typeClass = stripClassName(yyscanner,removeAnonymousScopes(xmd->typeString()),xmd->getOuterScope());
+  DBG_CTX((stderr,"%s -> typeName=%p\n",xmd->typeString(),typeClass));
+  yyextra->theCallContext.setScope(typeClass);
+
+  const Definition *xd = xmd->getOuterScope()==Doxygen::globalScope ?
+                   xmd->getFileDef() : xmd->getOuterScope();
+  if (xmd->getGroupDef()) xd = xmd->getGroupDef();
+  if (xd && xd->isLinkable())
+  {
+
+    //printf("yyextra->currentDefinition=%p yyextra->currentMemberDef=%p xmd=%p yyextra->insideBody=%d\n",yyextra->currentDefinition,yyextra->currentMemberDef,xmd,yyextra->insideBody);
+
+    if (xmd->templateMaster()) xmd = xmd->templateMaster();
+
+    if (xmd->isLinkable())
+    {
+      // add usage reference
+      if (yyextra->currentDefinition && yyextra->currentMemberDef &&
+	  /*xmd!=yyextra->currentMemberDef &&*/ yyextra->insideBody && yyextra->collectXRefs)
+      {
+	addDocCrossReference(yyextra->currentMemberDef,xmd);
+      }
+
+      // write the actual link
+      writeMultiLineCodeLink(yyscanner,ol,xmd,memName);
+      addToSearchIndex(yyscanner,memName);
+      return TRUE;
+    }
+  }
+
+  return FALSE;
+}
+
+static bool generateClassMemberLink(yyscan_t yyscanner,
+                                    CodeOutputInterface &ol,
+                                    const Definition *def,
+                                    const char *memName)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (def && def->definitionType()==Definition::TypeClass)
+  {
+    const ClassDef *cd = dynamic_cast<const ClassDef*>(def);
+    MemberDef *xmd = cd->getMemberByName(memName);
+    //printf("generateClassMemberLink(class=%s,member=%s)=%p\n",def->name().data(),memName,xmd);
+    if (xmd)
+    {
+      return generateClassMemberLink(yyscanner,ol,xmd,memName);
+    }
+    else
+    {
+      Definition *innerDef = cd->findInnerCompound(memName);
+      if (innerDef)
+      {
+        yyextra->theCallContext.setScope(innerDef);
+        addToSearchIndex(yyscanner,memName);
+        writeMultiLineCodeLink(yyscanner,*yyextra->code,innerDef,memName);
+        return TRUE;
+      }
+    }
+  }
+  else if (def && def->definitionType()==Definition::TypeNamespace)
+  {
+    const NamespaceDef *nd = dynamic_cast<const NamespaceDef*>(def);
+    //printf("Looking for %s inside namespace %s\n",memName,nd->name().data());
+    Definition *innerDef = nd->findInnerCompound(memName);
+    if (innerDef)
+    {
+      yyextra->theCallContext.setScope(innerDef);
+      addToSearchIndex(yyscanner,memName);
+      writeMultiLineCodeLink(yyscanner,*yyextra->code,innerDef,memName);
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
+static void generateMemberLink(yyscan_t yyscanner,
+                               CodeOutputInterface &ol,
+                               const QCString &varName,
+                               const char *memName)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("generateMemberLink(object=%s,mem=%s) classScope=%s\n",
+  //    varName.data(),memName,yyextra->classScope.data());
+
+  if (varName.isEmpty()) return;
+
+  // look for the variable in the current context
+  const ClassDef *vcd = yyextra->theVarContext.findVariable(varName);
+  if (vcd) 
+  {
+    if (vcd!=VariableContext::dummyContext)
+    {
+      //printf("Class found!\n");
+      if (getLink(yyscanner,vcd->name(),memName,ol)) 
+      {
+	//printf("Found result!\n");
+	return;
+      }
+      if (vcd->baseClasses())
+      {
+	BaseClassListIterator bcli(*vcd->baseClasses());
+	for ( ; bcli.current() ; ++bcli)
+	{
+	  if (getLink(yyscanner,bcli.current()->classDef->name(),memName,ol)) 
+	  {
+	    //printf("Found result!\n");
+	    return;
+	  }
+	}
+      }
+    }
+  }
+  else // variable not in current context, maybe it is in a parent context
+  {
+    vcd = getResolvedClass(yyextra->currentDefinition,yyextra->sourceFileDef,yyextra->classScope);
+    if (vcd && vcd->isLinkable())
+    {
+      //printf("Found class %s for variable '%s'\n",yyextra->classScope.data(),varName.data());
+      MemberName *vmn=Doxygen::memberNameSDict->find(varName);
+      if (vmn==0)
+      {
+	int vi;
+	QCString vn=varName;
+	if ((vi=vn.findRev("::"))!=-1 || (vi=vn.findRev('.'))!=-1)  // explicit scope A::b(), probably static member
+	{
+	  ClassDef *jcd = getClass(vn.left(vi));
+	  vn=vn.right(vn.length()-vi-2);
+	  vmn=Doxygen::memberNameSDict->find(vn);
+	  //printf("Trying name '%s' scope=%s\n",vn.data(),scope.data());
+	  if (vmn)
+	  {
+	    MemberNameIterator vmni(*vmn);
+	    const MemberDef *vmd;
+	    for (;(vmd=vmni.current());++vmni)
+	    {
+	      if (/*(vmd->isVariable() || vmd->isFunction()) && */
+		  vmd->getClassDef()==jcd)
+	      {
+		//printf("Found variable type=%s\n",vmd->typeString());
+		const ClassDef *mcd=stripClassName(yyscanner,vmd->typeString(),vmd->getOuterScope());
+		if (mcd && mcd->isLinkable())
+		{
+		  if (generateClassMemberLink(yyscanner,ol,mcd,memName)) return;
+		}
+	      }
+	    }
+	  }
+	}
+      }
+      if (vmn)
+      {
+	//printf("There is a variable with name '%s'\n",varName);
+	MemberNameIterator vmni(*vmn);
+	const MemberDef *vmd;
+	for (;(vmd=vmni.current());++vmni)
+	{
+	  if (/*(vmd->isVariable() || vmd->isFunction()) && */
+	      vmd->getClassDef()==vcd)
+	  {
+	    //printf("Found variable type=%s\n",vmd->typeString());
+	    const ClassDef *mcd=stripClassName(yyscanner,vmd->typeString(),vmd->getOuterScope());
+	    if (mcd && mcd->isLinkable())
+	    {
+	      if (generateClassMemberLink(yyscanner,ol,mcd,memName)) return;
+	    }
+	  }
+	}
+      }
+    }
+  }
+  // nothing found -> write result as is
+  codifyLines(yyscanner,memName);
+  addToSearchIndex(yyscanner,memName);
+  return;
+}
+
+static void generatePHPVariableLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *varName)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  QCString name = varName+7; // strip $this->
+  name.prepend("$");
+  //printf("generatePHPVariableLink(%s) name=%s scope=%s\n",varName,name.data(),yyextra->classScope.data());
+  if (!getLink(yyscanner,yyextra->classScope,name,ol,varName))
+  {
+    codifyLines(yyscanner,varName);
+  }
+}
+
+static void generateFunctionLink(yyscan_t yyscanner,CodeOutputInterface &ol,const char *funcName)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //CodeClassDef *ccd=0;
+  ClassDef *ccd=0;
+  QCString locScope=yyextra->classScope;
+  QCString locFunc=removeRedundantWhiteSpace(funcName);
+  if (yyextra->lang==SrcLangExt_PHP && locFunc.startsWith("self::")) locFunc=locFunc.mid(4);
+  QCString funcScope;
+  QCString funcWithScope=locFunc;
+  QCString funcWithFullScope=locFunc;
+  QCString fullScope=locScope;
+  DBG_CTX((stdout,"*** locScope=%s locFunc=%s\n",locScope.data(),locFunc.data()));
+  int len=2;
+  int i=locFunc.findRev("::");
+  if (yyextra->currentMemberDef && yyextra->currentMemberDef->resolveAlias()->getClassDef() &&
+      funcName==yyextra->currentMemberDef->localName() && 
+      yyextra->currentMemberDef->getDefLine()==yyextra->yyLineNr &&
+      generateClassMemberLink(yyscanner,ol,yyextra->currentMemberDef,funcName)
+     )
+  {
+    // special case where funcName is the name of a method that is also
+    // defined on this line. In this case we can directly link to 
+    // yyextra->currentMemberDef, which is not only faster, but
+    // in case of overloaded methods, this will make sure that we link to
+    // the correct method, and thereby get the correct reimplemented relations.
+    // See also bug 549022.
+    goto exit;
+  }
+  if (i==-1) i=locFunc.findRev("."),len=1;
+  if (i==-1) i=locFunc.findRev("\\"),len=1; // for PHP
+  if (i>0)
+  {
+    funcScope=locFunc.left(i);
+    locFunc=locFunc.right(locFunc.length()-i-len).stripWhiteSpace();
+    int ts=locScope.find('<'); // start of template
+    int te=locScope.findRev('>'); // end of template
+    //printf("ts=%d te=%d\n",ts,te);
+    if (ts!=-1 && te!=-1 && te>ts)
+    {
+      // remove template from scope
+      locScope=locScope.left(ts)+locScope.right(locScope.length()-te-1);
+    }
+    ts=funcScope.find('<'); // start of template
+    te=funcScope.findRev('>'); // end of template
+    //printf("ts=%d te=%d\n",ts,te);
+    if (ts!=-1 && te!=-1 && te>ts)
+    {
+      // remove template from scope
+      funcScope=funcScope.left(ts)+funcScope.right(funcScope.length()-te-1);
+    }
+    if (!funcScope.isEmpty())
+    {
+      funcWithScope = funcScope+"::"+locFunc;
+      if (!locScope.isEmpty())
+      {
+        fullScope=locScope+"::"+funcScope;
+      }
+    }
+    if (!locScope.isEmpty())
+    {
+      funcWithFullScope = locScope+"::"+funcWithScope;
+    }
+  }
+  if (!fullScope.isEmpty() && (ccd=yyextra->codeClassSDict->find(fullScope)))
+  {
+    //printf("using classScope %s\n",yyextra->classScope.data());
+    if (ccd->baseClasses())
+    {
+      BaseClassListIterator bcli(*ccd->baseClasses());
+      for ( ; bcli.current() ; ++bcli)
+      {
+	if (getLink(yyscanner,bcli.current()->classDef->name(),locFunc,ol,funcName)) 
+	{
+	  goto exit;
+	}
+      }
+    }
+  }
+  if (!locScope.isEmpty() && fullScope!=locScope && (ccd=yyextra->codeClassSDict->find(locScope)))
+  {
+    //printf("using classScope %s\n",yyextra->classScope.data());
+    if (ccd->baseClasses())
+    {
+      BaseClassListIterator bcli(*ccd->baseClasses());
+      for ( ; bcli.current() ; ++bcli)
+      {
+	if (getLink(yyscanner,bcli.current()->classDef->name(),funcWithScope,ol,funcName)) 
+	{
+	  goto exit;
+	}
+      }
+    }
+  }
+  if (!getLink(yyscanner,locScope,funcWithScope,ol,funcName))
+  {
+    generateClassOrGlobalLink(yyscanner,ol,funcName);
+  }
+exit:  
+  yyextra->forceTagReference.resize(0);
+  return;
+}
+
+/*! counts the number of lines in the input */
+static int countLines(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  const char *p=yyextra->inputString;
+  char c;
+  int count=1;
+  while ((c=*p)) 
+  { 
+    p++ ; 
+    if (c=='\n') count++;  
+  }
+  if (p>yyextra->inputString && *(p-1)!='\n') 
+  { // last line does not end with a \n, so we add an extra
+    // line and explicitly terminate the line after parsing.
+    count++, 
+    yyextra->needsTermination=TRUE; 
+  } 
+  return count;
+}
+
+static void endFontClass(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->currentFontClass)
+  {
+    yyextra->code->endFontClass();
+    yyextra->currentFontClass=0;
+  }
+}
+
+static void startFontClass(yyscan_t yyscanner,const char *s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  endFontClass(yyscanner);
+  yyextra->code->startFontClass(s);
+  yyextra->currentFontClass=s;
+}
+
+//----------------------------------------------------------------------------
+
+// recursively writes a linkified Objective-C method call
+static void writeObjCMethodCall(yyscan_t yyscanner,ObjCCallCtx *ctx)
+{
+  if (ctx==0) return;
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  char c;
+  const char *p = ctx->format.data();
+  if (!ctx->methodName.isEmpty())
+  {
+    //printf("writeObjCMethodCall(%s) obj=%s method=%s\n",
+    //    ctx->format.data(),ctx->objectTypeOrName.data(),ctx->methodName.data());
+    if (!ctx->objectTypeOrName.isEmpty() && ctx->objectTypeOrName.at(0)!='$')
+    {
+      //printf("Looking for object=%s method=%s\n",ctx->objectTypeOrName.data(),
+      //	ctx->methodName.data());
+      ClassDef *cd = yyextra->theVarContext.findVariable(ctx->objectTypeOrName);
+      if (cd==0) // not a local variable
+      {
+	if (ctx->objectTypeOrName=="self")
+	{
+	  if (yyextra->currentDefinition && 
+	      yyextra->currentDefinition->definitionType()==Definition::TypeClass)
+	  {
+	    ctx->objectType = dynamic_cast<ClassDef *>(yyextra->currentDefinition);
+	  }
+	}
+	else
+	{
+	  ctx->objectType = getResolvedClass(
+	      yyextra->currentDefinition,
+	      yyextra->sourceFileDef,
+	      ctx->objectTypeOrName,
+	      &ctx->method);
+	}
+	//printf("  object is class? %p\n",ctx->objectType);
+	if (ctx->objectType) // found class
+	{
+	  ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
+	  //printf("    yes->method=%s\n",ctx->method?ctx->method->name().data():"<none>");
+	}
+	else if (ctx->method==0) // search for class variable with the same name
+	{
+	  //printf("    no\n");
+	  //printf("yyextra->currentDefinition=%p\n",yyextra->currentDefinition);
+	  if (yyextra->currentDefinition && 
+	      yyextra->currentDefinition->definitionType()==Definition::TypeClass)
+	  {
+	    ctx->objectVar = (dynamic_cast<ClassDef *>(yyextra->currentDefinition))->getMemberByName(ctx->objectTypeOrName);
+	    //printf("      ctx->objectVar=%p\n",ctx->objectVar);
+	    if (ctx->objectVar)
+	    {
+	      ctx->objectType = stripClassName(yyscanner,ctx->objectVar->typeString(),yyextra->currentDefinition);
+	      //printf("        ctx->objectType=%p\n",ctx->objectType);
+	      if (ctx->objectType && !ctx->methodName.isEmpty())
+	      {
+		ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
+		//printf("          ctx->method=%p\n",ctx->method);
+	      }
+	    }
+	  }
+	}
+      }
+      else // local variable
+      {
+	//printf("  object is local variable\n");
+	if (cd!=VariableContext::dummyContext && !ctx->methodName.isEmpty())
+	{
+	  ctx->method = cd->getMemberByName(ctx->methodName);
+	  //printf("   class=%p method=%p\n",cd,ctx->method);
+	}
+      }
+    }
+  }
+
+  //printf("[");
+  while ((c=*p++)) // for each character in ctx->format
+  {
+    if (c=='$')
+    {
+      char nc=*p++;
+      if (nc=='$') // escaped $
+      {
+	yyextra->code->codify("$");
+      }
+      else // name fragment or reference to a nested call 
+      {
+	if (nc=='n') // name fragment
+	{
+          nc=*p++;
+	  QCString refIdStr;
+	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
+	  p--;
+	  int refId=refIdStr.toInt();
+	  QCString *pName = yyextra->nameDict.find(refId);
+	  if (pName)
+	  {
+	    if (ctx->method && ctx->method->isLinkable())
+	    {
+              writeMultiLineCodeLink(yyscanner,*yyextra->code,ctx->method,pName->data());
+	      if (yyextra->currentMemberDef && yyextra->collectXRefs)
+	      {
+	        addDocCrossReference(yyextra->currentMemberDef,const_cast<MemberDef*>(ctx->method));
+	      }
+	    }
+	    else
+	    {
+   	      codifyLines(yyscanner,pName->data());
+	    }
+	  }
+	  else
+	  {
+	    //printf("Invalid name: id=%d\n",refId);
+	  }
+	}
+	else if (nc=='o') // reference to potential object name
+	{
+          nc=*p++;
+	  QCString refIdStr;
+	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
+	  p--;
+	  int refId=refIdStr.toInt();
+	  QCString *pObject = yyextra->objectDict.find(refId);
+	  if (pObject)
+	  {
+	    if (*pObject=="self")
+	    {
+	      if (yyextra->currentDefinition && 
+		  yyextra->currentDefinition->definitionType()==Definition::TypeClass)
+	      {
+	        ctx->objectType = dynamic_cast<ClassDef *>(yyextra->currentDefinition);
+	        if (ctx->objectType->categoryOf()) 
+	        {
+	          ctx->objectType = ctx->objectType->categoryOf();
+	        }
+	        if (ctx->objectType && !ctx->methodName.isEmpty())
+	        {
+	          ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
+	        }
+	      }
+ 	      startFontClass(yyscanner,"keyword");
+              codifyLines(yyscanner,pObject->data());
+	      endFontClass(yyscanner);
+	    }
+	    else if (*pObject=="super")
+	    {
+	      if (yyextra->currentDefinition &&
+		  yyextra->currentDefinition->definitionType()==Definition::TypeClass)
+	      {
+		ClassDef *cd = dynamic_cast<ClassDef *>(yyextra->currentDefinition);
+		if (cd->categoryOf()) 
+		{
+		  cd = cd->categoryOf();
+		}
+		BaseClassList *bcd = cd->baseClasses();
+		if (bcd) // get direct base class (there should be only one)
+		{
+		  BaseClassListIterator bli(*bcd);
+		  BaseClassDef *bclass;
+		  for (bli.toFirst();(bclass=bli.current());++bli)
+		  {
+		    if (bclass->classDef->compoundType()!=ClassDef::Protocol)
+		    {
+		      ctx->objectType = bclass->classDef;
+		      if (ctx->objectType && !ctx->methodName.isEmpty())
+		      {
+			ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
+		      }
+		    }
+		  }
+		}
+	      }
+ 	      startFontClass(yyscanner,"keyword");
+              codifyLines(yyscanner,pObject->data());
+	      endFontClass(yyscanner);
+	    }
+	    else if (ctx->objectVar && ctx->objectVar->isLinkable()) // object is class variable
+	    {
+	      writeMultiLineCodeLink(yyscanner,*yyextra->code,ctx->objectVar,pObject->data());
+	      if (yyextra->currentMemberDef && yyextra->collectXRefs)
+	      {
+	        addDocCrossReference(yyextra->currentMemberDef,const_cast<MemberDef*>(ctx->objectVar));
+	      }
+	    }
+	    else if (ctx->objectType && 
+		     ctx->objectType!=VariableContext::dummyContext && 
+		     ctx->objectType->isLinkable()
+		    ) // object is class name
+	    {
+	      const ClassDef *cd = ctx->objectType;
+	      writeMultiLineCodeLink(yyscanner,*yyextra->code,cd,pObject->data());
+	    }
+	    else // object still needs to be resolved
+	    {
+	      const ClassDef *cd = getResolvedClass(yyextra->currentDefinition, 
+		  yyextra->sourceFileDef, *pObject);
+	      if (cd && cd->isLinkable())
+	      {
+		if (ctx->objectType==0) ctx->objectType=cd;
+	   	writeMultiLineCodeLink(yyscanner,*yyextra->code,cd,pObject->data());
+	      }
+	      else
+	      {
+		codifyLines(yyscanner,pObject->data());
+	      }
+	    }
+	  }
+	  else
+	  {
+	    //printf("Invalid object: id=%d\n",refId);
+	  }
+	}
+	else if (nc=='c') // reference to nested call
+	{
+          nc=*p++;
+	  QCString refIdStr;
+	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
+	  p--;
+	  int refId=refIdStr.toInt();
+	  ObjCCallCtx *ictx = yyextra->contextDict.find(refId);
+	  if (ictx) // recurse into nested call
+	  {
+	    writeObjCMethodCall(yyscanner,ictx);
+	    if (ictx->method) // link to nested call successfully
+	    {
+	      // get the ClassDef representing the method's return type
+	      if (QCString(ictx->method->typeString())=="id")
+	      {
+		// see if the method name is unique, if so we link to it
+		MemberName *mn=Doxygen::memberNameSDict->find(ctx->methodName);
+		//printf("mn->count=%d ictx->method=%s ctx->methodName=%s\n",
+		//    mn==0?-1:(int)mn->count(),
+		//    ictx->method->name().data(),
+		//    ctx->methodName.data());
+		if (mn && mn->count()==1) // member name unique
+		{
+		  ctx->method = mn->getFirst();
+		}
+	      } 
+	      else
+	      {
+		ctx->objectType = stripClassName(yyscanner,ictx->method->typeString(),yyextra->currentDefinition);
+		if (ctx->objectType && !ctx->methodName.isEmpty())
+		{
+		  ctx->method = ctx->objectType->getMemberByName(ctx->methodName);
+		}
+	      }
+	      //printf("  ***** method=%s -> object=%p\n",ictx->method->name().data(),ctx->objectType);
+	    }
+	  }
+	  else
+	  {
+	    //printf("Invalid context: id=%d\n",refId);
+	  }
+	}
+	else if (nc=='w') // some word
+	{
+          nc=*p++;
+	  QCString refIdStr;
+	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
+	  p--;
+	  int refId=refIdStr.toInt();
+	  QCString *pWord = yyextra->wordDict.find(refId);
+	  if (pWord)
+	  {
+            codifyLines(yyscanner,pWord->data());
+	  }
+	}
+        else if (nc=='d') // comment block
+        {
+          nc=*p++;
+	  QCString refIdStr;
+	  while (nc!=0 && isdigit(nc)) { refIdStr+=nc; nc=*p++; }
+	  p--;
+	  int refId=refIdStr.toInt();
+	  QCString *pComment = yyextra->commentDict.find(refId);
+          if (pComment)
+          {
+            startFontClass(yyscanner,"comment");
+	    codifyLines(yyscanner,pComment->data());
+	    endFontClass(yyscanner);
+          }
+        }
+	else // illegal marker
+	{
+	  ASSERT(!"invalid escape sequence");
+	}
+      }
+    }
+    else // normal non-marker character
+    {
+      char s[2];
+      s[0]=c;s[1]=0;
+      codifyLines(yyscanner,s);
+    }
+  }
+  //printf("%s %s]\n",ctx->objectTypeOrName.data(),ctx->methodName.data());
+  //printf("}=(type='%s',name='%s')",
+  //    ctx->objectTypeOrName.data(),
+  //    ctx->methodName.data());
+}
+
+// Replaces an Objective-C method name fragment s by a marker of the form
+// $n12, the number (12) can later be used as a key for obtaining the name 
+// fragment, from yyextra->nameDict
+static QCString escapeName(yyscan_t yyscanner,const char *s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  QCString result;
+  result.sprintf("$n%d",yyextra->currentNameId);
+  yyextra->nameDict.insert(yyextra->currentNameId,new QCString(s));
+  yyextra->currentNameId++;
+  return result;
+}
+
+static QCString escapeObject(yyscan_t yyscanner,const char *s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  QCString result;
+  result.sprintf("$o%d",yyextra->currentObjId);
+  yyextra->objectDict.insert(yyextra->currentObjId,new QCString(s));
+  yyextra->currentObjId++;
+  return result;
+}
+
+static QCString escapeWord(yyscan_t yyscanner,const char *s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  QCString result;
+  result.sprintf("$w%d",yyextra->currentWordId);
+  yyextra->wordDict.insert(yyextra->currentWordId,new QCString(s));
+  yyextra->currentWordId++;
+  return result;
+}
+
+static QCString escapeComment(yyscan_t yyscanner,const char *s)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  QCString result;
+  result.sprintf("$d%d",yyextra->currentCommentId);
+  yyextra->commentDict.insert(yyextra->currentCommentId,new QCString(s));
+  yyextra->currentCommentId++;
+  return result;
+}
+
+static bool skipLanguageSpecificKeyword(yyscan_t yyscanner,const QCString &kw)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  return yyextra->lang==SrcLangExt_Cpp && (kw == "remove" || kw == "set" || kw == "get");
+}
+
+static bool isCastKeyword(const QCString &s)
+{
+  int i=s.find('<');
+  if (i==-1) return FALSE;
+  QCString kw = s.left(i).stripWhiteSpace();
+  return kw=="const_cast" || kw=="static_cast" || kw=="dynamic_cast" || kw=="reinterpret_cast";
+}
+
+static int yyread(yyscan_t yyscanner,char *buf,int max_size)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int inputPosition = yyextra->inputPosition;
+  const char *s = yyextra->inputString + yyextra->inputPosition;
+  int c=0;
+  while( c < max_size && *s )
+  {
+    *buf++ = *s++;
+    c++;
+  }
+  yyextra->inputPosition += c;
+  return c;
+}
 
-/*@ ----------------------------------------------------------------------------
- */
 
-static void saveObjCContext()
+static void saveObjCContext(yyscan_t yyscanner)
 {
-  if (g_currentCtx)
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->currentCtx)
   {
-    g_currentCtx->format+=QCString().sprintf("$c%d",g_currentCtxId);
-    if (g_braceCount==0 && YY_START==ObjCCall)
+    yyextra->currentCtx->format+=QCString().sprintf("$c%d",yyextra->currentCtxId);
+    if (yyextra->braceCount==0 && YY_START==ObjCCall)
     {
-      g_currentCtx->objectTypeOrName=g_currentCtx->format.mid(1);
-      //printf("new type=%s\n",g_currentCtx->objectTypeOrName.data());
+      yyextra->currentCtx->objectTypeOrName=yyextra->currentCtx->format.mid(1);
+      //printf("new type=%s\n",yyextra->currentCtx->objectTypeOrName.data());
     }
-    g_contextStack.push(g_currentCtx);
+    yyextra->contextStack.push(yyextra->currentCtx);
   }
   else
   {
     //printf("Trying to save NULL context!\n");
   }
   ObjCCallCtx *newCtx = new ObjCCallCtx;
-  newCtx->id = g_currentCtxId;
+  newCtx->id = yyextra->currentCtxId;
   newCtx->lexState = YY_START;
-  newCtx->braceCount = g_braceCount;
+  newCtx->braceCount = yyextra->braceCount;
   newCtx->objectType = 0;
   newCtx->objectVar = 0;
   newCtx->method = 0;
   //printf("save state=%d\n",YY_START);
-  g_contextDict.insert(g_currentCtxId,newCtx);
-  g_currentCtx = newCtx;
-  g_braceCount = 0;
-  g_currentCtxId++;
+  yyextra->contextDict.insert(yyextra->currentCtxId,newCtx);
+  yyextra->currentCtx = newCtx;
+  yyextra->braceCount = 0;
+  yyextra->currentCtxId++;
 }
 
-static void restoreObjCContext()
+static void restoreObjCContext(yyscan_t yyscanner)
 {
-  //printf("restore state=%d->%d\n",YY_START,g_currentCtx->lexState);
-  BEGIN(g_currentCtx->lexState);
-  g_braceCount = g_currentCtx->braceCount;
-  if (!g_contextStack.isEmpty())
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  //printf("restore state=%d->%d\n",YY_START,yyextra->currentCtx->lexState);
+  BEGIN(yyextra->currentCtx->lexState);
+  yyextra->braceCount = yyextra->currentCtx->braceCount;
+  if (!yyextra->contextStack.isEmpty())
   {
-    g_currentCtx = g_contextStack.pop();
+    yyextra->currentCtx = yyextra->contextStack.pop();
   }
   else
   {
-    g_currentCtx = 0;
-    //printf("Trying to pop context while g_contextStack is empty!\n");
+    yyextra->currentCtx = 0;
+    //printf("Trying to pop context while yyextra->contextStack is empty!\n");
   }
 }
 
-void resetCCodeParserState()
+struct CodeScanner::Private
+{
+  yyscan_t yyscanner;
+  codeYY_state state;
+};
+
+CodeScanner::CodeScanner()
+{
+  p = new Private;
+  codeYYlex_init_extra(&p->state,&p->yyscanner);
+  YY_EXTRA_TYPE state = codeYYget_extra(p->yyscanner);
+}
+
+CodeScanner::~CodeScanner()
 {
-  //printf("***initParseCodeContext()\n");
-  g_forceTagReference.resize(0);
-  g_theVarContext.clear();
-  g_classScopeLengthStack.setAutoDelete(TRUE);
-  g_classScopeLengthStack.clear();
-  delete g_codeClassSDict;
-  g_codeClassSDict = new ClassSDict(17);
-  g_codeClassSDict->setAutoDelete(TRUE);
-  g_codeClassSDict->clear();
-  g_curClassBases.clear();
-  g_anchorCount = 0;
+  codeYYlex_destroy(p->yyscanner);
+  delete p;
 }
 
-void parseCCode(CodeOutputInterface &od,const char *className,const QCString &s, 
+void CodeScanner::reset()
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  //printf("***CodeParser::reset()\n");
+  yyextra->forceTagReference.resize(0);
+  yyextra->theVarContext.clear();
+  yyextra->classScopeLengthStack.setAutoDelete(TRUE);
+  yyextra->classScopeLengthStack.clear();
+  delete yyextra->codeClassSDict;
+  yyextra->codeClassSDict = new ClassSDict(17);
+  yyextra->codeClassSDict->setAutoDelete(TRUE);
+  yyextra->codeClassSDict->clear();
+  yyextra->curClassBases.clear();
+  yyextra->anchorCount = 0;
+}
+
+void CodeScanner::parseCCode(CodeOutputInterface &od,const char *className,const QCString &s, 
                 SrcLangExt lang,bool exBlock, const char *exName,FileDef *fd,
 		int startLine,int endLine,bool inlineFragment,
 		const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
                 bool collectXRefs)
 {
+  yyscan_t yyscanner = p->yyscanner;
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf("***parseCode() exBlock=%d exName=%s fd=%p className=%s searchCtx=%s\n",
   //      exBlock,exName,fd,className,searchCtx?searchCtx->name().data():"<none>");
 
@@ -3778,103 +3911,92 @@ void parseCCode(CodeOutputInterface &od,const char *className,const QCString &s,
 
   printlex(yy_flex_debug, TRUE, __FILE__, fd ? fd->fileName().data(): NULL);
 
-  if (g_codeClassSDict==0)
+  if (yyextra->codeClassSDict==0)
   {
-    resetCCodeParserState();
+    reset();
   }
-  g_code = &od;
-  g_inputString   = s;
-  g_inputPosition = 0;
-  g_currentFontClass = 0;
-  g_needsTermination = FALSE;
-  g_searchCtx = searchCtx;
-  g_collectXRefs = collectXRefs;
-  g_inFunctionTryBlock = FALSE;
+  yyextra->code = &od;
+  yyextra->inputString   = s;
+  yyextra->inputPosition = 0;
+  yyextra->currentFontClass = 0;
+  yyextra->needsTermination = FALSE;
+  yyextra->searchCtx = searchCtx;
+  yyextra->collectXRefs = collectXRefs;
+  yyextra->inFunctionTryBlock = FALSE;
 
   if (startLine!=-1)
-    g_yyLineNr    = startLine;
+    yyextra->yyLineNr    = startLine;
   else
-    g_yyLineNr    = 1;
+    yyextra->yyLineNr    = 1;
 
   if (endLine!=-1)
-    g_inputLines  = endLine+1;
+    yyextra->inputLines  = endLine+1;
   else
-    g_inputLines  = g_yyLineNr + countLines() - 1;
-
-  g_curlyCount    = 0;
-  g_bodyCurlyCount    = 0;
-  g_bracketCount  = 0;
-  g_sharpCount    = 0;
-  g_insideTemplate = FALSE;
-  g_theCallContext.clear();
-  g_scopeStack.clear();
-  g_classScope    = className;
+    yyextra->inputLines  = yyextra->yyLineNr + countLines(yyscanner) - 1;
+
+  yyextra->curlyCount    = 0;
+  yyextra->bodyCurlyCount    = 0;
+  yyextra->bracketCount  = 0;
+  yyextra->sharpCount    = 0;
+  yyextra->insideTemplate = FALSE;
+  yyextra->theCallContext.clear();
+  yyextra->scopeStack.clear();
+  yyextra->classScope    = className;
   //printf("parseCCode %s\n",className);
-  g_exampleBlock  = exBlock; 
-  g_exampleName   = exName;
-  g_sourceFileDef = fd;
-  g_lineNumbers   = fd!=0 && showLineNumbers;
+  yyextra->exampleBlock  = exBlock; 
+  yyextra->exampleName   = exName;
+  yyextra->sourceFileDef = fd;
+  yyextra->lineNumbers   = fd!=0 && showLineNumbers;
   bool cleanupSourceDef = FALSE;
   if (fd==0)
   {
     // create a dummy filedef for the example
-    g_sourceFileDef = createFileDef("",(exName?exName:"generated"));
+    yyextra->sourceFileDef = createFileDef("",(exName?exName:"generated"));
     cleanupSourceDef = TRUE;
   }
-  g_lang        = lang;
-  g_insideObjC  = lang==SrcLangExt_ObjC;
-  if (g_sourceFileDef) 
+  yyextra->lang        = lang;
+  yyextra->insideObjC  = lang==SrcLangExt_ObjC;
+  if (yyextra->sourceFileDef) 
   {
-    setCurrentDoc("l00001");
+    setCurrentDoc(yyscanner,"l00001");
   }
-  g_currentDefinition = 0;
-  g_currentMemberDef = 0;
-  g_searchingForBody = exBlock;
-  g_insideBody = FALSE;
-  g_bracketCount = 0;
-  if (!g_exampleName.isEmpty())
+  yyextra->currentDefinition = 0;
+  yyextra->currentMemberDef = 0;
+  yyextra->searchingForBody = exBlock;
+  yyextra->insideBody = FALSE;
+  yyextra->bracketCount = 0;
+  if (!yyextra->exampleName.isEmpty())
   {
-    g_exampleFile = convertNameToFile(g_exampleName+"-example",FALSE,TRUE);
-    //printf("g_exampleFile=%s\n",g_exampleFile.data());
+    yyextra->exampleFile = convertNameToFile(yyextra->exampleName+"-example",FALSE,TRUE);
+    //printf("yyextra->exampleFile=%s\n",yyextra->exampleFile.data());
   }
-  g_includeCodeFragment = inlineFragment;
+  yyextra->includeCodeFragment = inlineFragment;
   //printf("** exBlock=%d exName=%s include=%d\n",exBlock,exName,inlineFragment);
-  startCodeLine();
-  g_type.resize(0);
-  g_name.resize(0);
-  g_args.resize(0);
-  g_parmName.resize(0);
-  g_parmType.resize(0);
-  if (memberDef) setParameterList(memberDef);
-  codeYYrestart( codeYYin );
+  startCodeLine(yyscanner);
+  yyextra->type.resize(0);
+  yyextra->name.resize(0);
+  yyextra->args.resize(0);
+  yyextra->parmName.resize(0);
+  yyextra->parmType.resize(0);
+  if (memberDef) setParameterList(yyscanner,memberDef);
   BEGIN( Body );
-  codeYYlex();
-  g_lexInit=TRUE;
-  if (g_needsTermination)
+  codeYYlex(yyscanner);
+  yyextra->lexInit=TRUE;
+  if (yyextra->needsTermination)
   {
-    endFontClass();
-    DBG_CTX((stderr,"endCodeLine(%d)\n",g_yyLineNr));
-    g_code->endCodeLine();
+    endFontClass(yyscanner);
+    DBG_CTX((stderr,"endCodeLine(%d)\n",yyextra->yyLineNr));
+    yyextra->code->endCodeLine();
   }
   if (cleanupSourceDef)
   {
     // delete the temporary file definition used for this example
-    delete g_sourceFileDef;
-    g_sourceFileDef=0;
+    delete yyextra->sourceFileDef;
+    yyextra->sourceFileDef=0;
   }
 
   printlex(yy_flex_debug, FALSE, __FILE__, fd ? fd->fileName().data(): NULL);
   return;
 }
 
-void codeFreeScanner()
-{
-#if defined(YY_FLEX_SUBMINOR_VERSION) 
-  if (g_lexInit)
-  {
-    codeYYlex_destroy();
-  }
-#endif
-}
-
 #include "code.l.h"
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index b4a4deb..d4d55e7 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -8992,7 +8992,8 @@ static void generateExampleDocs()
   for (pdi.toFirst();(pd=pdi.current());++pdi)
   {
     msg("Generating docs for example %s...\n",pd->name().data());
-    resetCCodeParserState();
+    ParserInterface *pIntf = Doxygen::parserManager->getParser(".c"); // TODO: do this on code type
+    pIntf->resetCodeParserState();
     QCString n=pd->getOutputFileBase();
     startFile(*g_outputList,n,n,pd->name());
     startTitle(*g_outputList,n);
@@ -10187,7 +10188,6 @@ void cleanUpDoxygen()
   delete theTranslator;
   delete g_outputList;
   Mappers::freeMappers();
-  codeFreeScanner();
 
   if (Doxygen::symbolMap)
   {
diff --git a/src/scanner.l b/src/scanner.l
index 37fcb1c..2b277db 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -201,6 +201,8 @@ static bool             g_nestedComment=0;
 
 static std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > g_outerScopeEntries;
 
+static CodeScanner g_codeScanner;
+
 static const char *stateToString(int state);
 //-----------------------------------------------------------------------------
 
@@ -7359,6 +7361,7 @@ void CLanguageScanner::parseInput(const char *fileName,
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
 }
 
+
 void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
                    const char * scopeName,
                    const QCString & input,
@@ -7375,7 +7378,7 @@ void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
                    bool collectXRefs
                   )
 {
-  ::parseCCode(codeOutIntf,scopeName,input,lang,isExampleBlock,exampleName,
+  g_codeScanner.parseCCode(codeOutIntf,scopeName,input,lang,isExampleBlock,exampleName,
                fileDef,startLine,endLine,inlineFragment,memberDef,
 	       showLineNumbers,searchCtx,collectXRefs);
 }
@@ -7392,7 +7395,7 @@ bool CLanguageScanner::needsPreprocessing(const QCString &extension) const
 
 void CLanguageScanner::resetCodeParserState()
 {
-  ::resetCCodeParserState();
+  g_codeScanner.reset();
 }
 
 void CLanguageScanner::parsePrototype(const char *text)
-- 
cgit v0.12


From 146bec22e9ff91e8274becd719149f7ab9c7cfb9 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 22 Nov 2019 14:56:50 +0100
Subject: Better termination message

In case a `WARN_LOGFILE` is used it in this file no clear whether doxygen finished correctly or exited beforehand in case a fatal error.
Now a 'Exiting...' is also given in the warning log file in case an error is a fatal error.
---
 src/commentscan.l            |  3 +-
 src/configimpl.l             | 73 +++++++++++++++++++-------------------------
 src/defgen.cpp               |  3 +-
 src/diagram.cpp              |  3 +-
 src/docbookgen.cpp           |  3 +-
 src/docsets.cpp              | 12 +++-----
 src/dot.cpp                  |  4 +--
 src/dotgfxhierarchytable.cpp |  2 +-
 src/dotgraph.cpp             |  2 +-
 src/doxygen.cpp              | 24 +++++----------
 src/eclipsehelp.cpp          |  3 +-
 src/formula.cpp              |  5 ++-
 src/htmlgen.cpp              |  3 +-
 src/htmlhelp.cpp             |  9 ++----
 src/latexgen.cpp             |  9 ++----
 src/mangen.cpp               |  6 ++--
 src/message.cpp              | 28 +++++++++++++++++
 src/message.h                |  2 ++
 src/outputgen.cpp            |  3 +-
 src/perlmodgen.cpp           |  3 +-
 src/qhp.cpp                  |  3 +-
 src/rtfgen.cpp               |  3 +-
 src/util.cpp                 |  6 ++--
 23 files changed, 101 insertions(+), 111 deletions(-)

diff --git a/src/commentscan.l b/src/commentscan.l
index 2b10f87..9d09fa1 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -327,8 +327,7 @@ class DocCmdMapper
       {
 	if (m_map.find(p->cmdName)!=0)
 	{
-	  err("DocCmdMapper: command %s already added\n",p->cmdName);
-	  exit(1);
+	  term(1,"DocCmdMapper: command %s already added\n",p->cmdName);
 	}
 	Cmd *cmd = new Cmd;
 	cmd->func = p->handler;
diff --git a/src/configimpl.l b/src/configimpl.l
index 0cc5c88..ba95dce 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -56,6 +56,16 @@ void config_err(const char *fmt, ...)
   vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
   va_end(args); 
 }
+void config_term(const int exitVal, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
+  va_end(args);
+  fprintf(stderr, "%s\n", "Exiting...");
+  exit(exitVal);
+}
+
 void config_warn(const char *fmt, ...)
 {
   va_list args;
@@ -213,13 +223,11 @@ QCString &ConfigImpl::getString(const char *fileName,int num,const char *name) c
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_String)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of string type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of string type!\n",fileName,num,name);
   }
   return *((ConfigString *)opt)->valueRef();
 }
@@ -229,13 +237,11 @@ QStrList &ConfigImpl::getList(const char *fileName,int num,const char *name) con
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_List)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of list type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of list type!\n",fileName,num,name);
   }
   return *((ConfigList *)opt)->valueRef();
 }
@@ -245,13 +251,11 @@ QCString &ConfigImpl::getEnum(const char *fileName,int num,const char *name) con
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Enum)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of enum type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of enum type!\n",fileName,num,name);
   }
   return *((ConfigEnum *)opt)->valueRef();
 }
@@ -261,13 +265,11 @@ int &ConfigImpl::getInt(const char *fileName,int num,const char *name) const
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Int)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name);
   }
   return *((ConfigInt *)opt)->valueRef();
 }
@@ -277,13 +279,11 @@ bool &ConfigImpl::getBool(const char *fileName,int num,const char *name) const
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_err("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Bool)
   {
-    config_err("%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name);
-    exit(1);
+    config_term(1,"%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name);
   }
   return *((ConfigBool *)opt)->valueRef();
 }
@@ -566,9 +566,8 @@ static QCString configStringRecode(
   void *cd = portable_iconv_open(outputEncoding,inputEncoding);
   if (cd==(void *)(-1)) 
   {
-    fprintf(stderr,"Error: unsupported character conversion: '%s'->'%s'\n",
+    config_term(1,"Error: unsupported character conversion: '%s'->'%s'\n",
         inputEncoding.data(),outputEncoding.data());
-    exit(1);
   }
   size_t iLeft=(size_t)inputSize;
   size_t oLeft=(size_t)outputSize;
@@ -583,9 +582,8 @@ static QCString configStringRecode(
   }
   else
   {
-    fprintf(stderr,"Error: failed to translate characters from %s to %s: %s\n",
+    config_term(1,"Error: failed to translate characters from %s to %s: %s\n",
         inputEncoding.data(),outputEncoding.data(),strerror(errno));
-    exit(1);
   }
   portable_iconv_close(cd);
   return output;
@@ -638,9 +636,8 @@ static FILE *findFile(const char *fileName)
 static void readIncludeFile(const char *incName)
 {
   if (includeDepth==MAX_INCLUDE_DEPTH) {
-    config_err("maximum include depth (%d) reached, %s is not included. Aborting...\n",
+    config_term(1,"maximum include depth (%d) reached, %s is not included. Aborting...\n",
 	MAX_INCLUDE_DEPTH,incName);
-    exit(1);
   } 
 
   QCString inc = incName;
@@ -678,8 +675,7 @@ static void readIncludeFile(const char *incName)
   } 
   else
   {
-    config_err("@INCLUDE = %s: not found!\n",inc.data());
-    exit(1);
+    config_term(1,"@INCLUDE = %s: not found!\n",inc.data());
   }
 }
 
@@ -1161,9 +1157,8 @@ void ConfigImpl::init()
       ConfigOption * opt = ConfigImpl::instance()->get(depName);
       if (opt==0)
       {
-        config_warn("Config option '%s' has invalid depends relation on unknown option '%s'\n",
+        config_term(1,"Config option '%s' has invalid depends relation on unknown option '%s'\n",
             option->name().data(),depName.data());
-        exit(1);
       }
     }
   }
@@ -1229,8 +1224,7 @@ static QCString configFileToString(const char *name)
   }
   if (!fileOpened)  
   {
-    config_err("cannot open file '%s' for reading\n",name);
-    exit(1);
+    config_term(1,"cannot open file '%s' for reading\n",name);
   }
   return "";
 }
@@ -1408,9 +1402,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(headerFile);
     if (!fi.exists())
     {
-      err("tag HTML_HEADER: header file '%s' "
+      term(1,"tag HTML_HEADER: header file '%s' "
 	  "does not exist\n",headerFile.data());
-      exit(1);
     }
   }
   // Test to see if HTML footer is valid
@@ -1420,9 +1413,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(footerFile);
     if (!fi.exists())
     {
-      err("tag HTML_FOOTER: footer file '%s' "
+      term(1,"tag HTML_FOOTER: footer file '%s' "
 	  "does not exist\n",footerFile.data());
-      exit(1);
     }
   }
 
@@ -1435,9 +1427,8 @@ void Config::checkAndCorrect()
       QFileInfo fi(MathJaxCodefile);
       if (!fi.exists())
       {
-        err("tag MATHJAX_CODEFILE file '%s' "
+        term(1,"tag MATHJAX_CODEFILE file '%s' "
 	    "does not exist\n",MathJaxCodefile.data());
-        exit(1);
       }
     }
     QCString &path = Config_getString(MATHJAX_RELPATH);
@@ -1455,9 +1446,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(latexHeaderFile);
     if (!fi.exists())
     {
-      err("tag LATEX_HEADER: header file '%s' "
+      term(1,"tag LATEX_HEADER: header file '%s' "
 	  "does not exist\n",latexHeaderFile.data());
-      exit(1);
     }
   }
   // Test to see if LaTeX footer is valid
@@ -1467,9 +1457,8 @@ void Config::checkAndCorrect()
     QFileInfo fi(latexFooterFile);
     if (!fi.exists())
     {
-      err("tag LATEX_FOOTER: footer file '%s' "
+      term(1,"tag LATEX_FOOTER: footer file '%s' "
 	  "does not exist\n",latexFooterFile.data());
-      exit(1);
     }
   }
 
diff --git a/src/defgen.cpp b/src/defgen.cpp
index f5e12aa..6ae98a6 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -572,9 +572,8 @@ void generateDEF()
       dir.setPath(QDir::currentDirPath());
       if (!dir.mkdir(outputDirectory))
       {
-        err("tag OUTPUT_DIRECTORY: Output directory '%s' does not "
+        term(1,"tag OUTPUT_DIRECTORY: Output directory '%s' does not "
             "exist and cannot be created\n",outputDirectory.data());
-        exit(1);
       }
       else
       {
diff --git a/src/diagram.cpp b/src/diagram.cpp
index edc895d..3d0c22a 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1101,8 +1101,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
   f1.setName(epsName.data());
   if (!f1.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",f1.name().data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",f1.name().data());
   }
   FTextStream t(&f1);
   
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index 083aac3..8040c92 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -289,8 +289,7 @@ void DocbookGenerator::init()
   QDir d(dir);
   if (!d.exists() && !d.mkdir(dir))
   {
-    err("Could not create output directory %s\n",dir.data());
-    exit(1);
+    term(1,"Could not create output directory %s\n",dir.data());
   }
 
   createSubDirs(d);
diff --git a/src/docsets.cpp b/src/docsets.cpp
index 055532a..b33aea5 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -62,8 +62,7 @@ void DocSets::initialize()
   QFile makefile(mfName);
   if (!makefile.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",mfName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",mfName.data());
   }
   FTextStream ts(&makefile);
 
@@ -113,8 +112,7 @@ void DocSets::initialize()
   QFile plist(plName);
   if (!plist.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",plName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",plName.data());
   }
   FTextStream ts(&plist);
 
@@ -149,8 +147,7 @@ void DocSets::initialize()
   m_nf = new QFile(notes);
   if (!m_nf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",notes.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",notes.data());
   }
   //QCString indexName=Config_getBool(GENERATE_TREEVIEW)?"main":"index";
   QCString indexName="index";
@@ -170,8 +167,7 @@ void DocSets::initialize()
   m_tf = new QFile(tokens);
   if (!m_tf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",tokens.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",tokens.data());
   }
   m_tts.setDevice(m_tf);
   m_tts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
diff --git a/src/dot.cpp b/src/dot.cpp
index 5ad3916..2fb3b3e 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -272,7 +272,7 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir,
   QDir d(outDir);
   if (!d.exists())
   {
-    err("Output dir %s does not exist!\n",outDir); exit(1);
+    term(1,"Output dir %s does not exist!\n",outDir);
   }
 
   QCString imgExt = getDotImageExtension();
@@ -325,7 +325,7 @@ void writeDotImageMapFromFile(FTextStream &t,
   QDir d(outDir);
   if (!d.exists())
   {
-    err("Output dir %s does not exist!\n",outDir.data()); exit(1);
+    term(1,"Output dir %s does not exist!\n",outDir.data());
   }
 
   QCString mapName = baseName+".map";
diff --git a/src/dotgfxhierarchytable.cpp b/src/dotgfxhierarchytable.cpp
index 0a7942f..df9f48f 100644
--- a/src/dotgfxhierarchytable.cpp
+++ b/src/dotgfxhierarchytable.cpp
@@ -86,7 +86,7 @@ void DotGfxHierarchyTable::writeGraph(FTextStream &out,
   // store the original directory
   if (!d.exists())
   {
-    err("Output dir %s does not exist!\n",path); exit(1);
+    term(1,"Output dir %s does not exist!\n",path);
   }
 
   // put each connected subgraph of the hierarchy in a row of the HTML output
diff --git a/src/dotgraph.cpp b/src/dotgraph.cpp
index 9b7ddb7..c17523b 100644
--- a/src/dotgraph.cpp
+++ b/src/dotgraph.cpp
@@ -147,7 +147,7 @@ bool DotGraph::prepareDotFile()
 {
   if (!m_dir.exists())
   {
-    err("Output dir %s does not exist!\n", m_dir.path().data()); exit(1);
+    term(1,"Output dir %s does not exist!\n", m_dir.path().data());
   }
 
   QCString sigStr(33);
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d4d55e7..52381b8 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -8800,10 +8800,9 @@ static void computePageRelations(Entry *root)
         PageDef *subPd = Doxygen::pageSDict->find(bi.name);
         if (pd==subPd)
         {
-         err("page defined at line %d of file %s with label %s is a direct "
+         term(1,"page defined at line %d of file %s with label %s is a direct "
              "subpage of itself! Please remove this cyclic dependency.\n",
               pd->docLine(),pd->docFile().data(),pd->name().data());
-          exit(1);
         }
         else if (subPd)
         {
@@ -8828,10 +8827,9 @@ static void checkPageRelations()
     {
       if (ppd==pd)
       {
-        err("page defined at line %d of file %s with label %s is a subpage "
+        term(1,"page defined at line %d of file %s with label %s is a subpage "
             "of itself! Please remove this cyclic dependency.\n",
             pd->docLine(),pd->docFile().data(),pd->name().data());
-        exit(1);
       }
       ppd=ppd->getOuterScope();
     }
@@ -9164,8 +9162,7 @@ static void generateConfigFile(const char *configFile,bool shortList,
   }
   else
   {
-    err("Cannot open file %s for writing\n",configFile);
-    exit(1);
+    term(1,"Cannot open file %s for writing\n",configFile);
   }
 }
 static void compareDoxyfile()
@@ -9182,8 +9179,7 @@ static void compareDoxyfile()
   }
   else
   {
-    err("Cannot open file %s for writing\n",configFile);
-    exit(1);
+    term(1,"Cannot open file %s for writing\n",configFile);
   }
 }
 //----------------------------------------------------------------------------
@@ -9821,17 +9817,15 @@ void readFormulaRepository(QCString dir, bool cmp)
         {
           if ((f=Doxygen::formulaDict->find(formText))==0)
           {
-            err("discrepancy between formula repositories! Remove "
+            term(1,"discrepancy between formula repositories! Remove "
                 "formula.repository and from_* files from output directories.");
-            exit(1);
           }
           QCString formLabel;
           formLabel.sprintf("\\form#%d",f->getId());
           if (formLabel != formName)
           {
-            err("discrepancy between formula repositories! Remove "
+            term(1,"discrepancy between formula repositories! Remove "
                 "formula.repository and from_* files from output directories.");
-            exit(1);
           }
           new_repository++;
         }
@@ -9848,9 +9842,8 @@ void readFormulaRepository(QCString dir, bool cmp)
   }
   if (cmp && (current_repository != new_repository))
   {
-    err("size discrepancy between formula repositories! Remove "
+    term(1,"size discrepancy between formula repositories! Remove "
         "formula.repository and from_* files from output directories.");
-    exit(1);
   }
 }
 
@@ -11661,9 +11654,8 @@ void generateOutput()
     QDir searchDir(searchDirName);
     if (!searchDir.exists() && !searchDir.mkdir(searchDirName))
     {
-      err("Could not create search results directory '%s' $PWD='%s'\n",
+      term(1,"Could not create search results directory '%s' $PWD='%s'\n",
           searchDirName.data(),QDir::currentDirPath().data());
-      exit(1);
     }
     HtmlGenerator::writeSearchData(searchDirName);
     if (!serverBasedSearch) // client side search index
diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp
index 2757308..04f2947 100644
--- a/src/eclipsehelp.cpp
+++ b/src/eclipsehelp.cpp
@@ -72,8 +72,7 @@ void EclipseHelp::initialize()
   m_tocfile = new QFile(name);
   if (!m_tocfile->open(IO_WriteOnly)) 
   {
-    err("Could not open file %s for writing\n", name.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n", name.data());
   }
 
   // -- initialize its text stream
diff --git a/src/formula.cpp b/src/formula.cpp
index 3d8e6ce..a17b9b7 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -51,7 +51,10 @@ void FormulaList::generateBitmaps(const char *path)
   int x1,y1,x2,y2;
   QDir d(path);
   // store the original directory
-  if (!d.exists()) { err("Output dir %s does not exist!\n",path); exit(1); }
+  if (!d.exists())
+  {
+    term(1,"Output dir %s does not exist!\n",path);
+  }
   QCString oldDir = QDir::currentDirPath().utf8();
   // go to the html output directory (i.e. path)
   QDir::setCurrent(d.absPath());
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index df39d32..ab3bfa4 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -733,8 +733,7 @@ void HtmlGenerator::init()
   QDir d(dname);
   if (!d.exists() && !d.mkdir(dname))
   {
-    err("Could not create output directory %s\n",dname.data());
-    exit(1);
+    term(1,"Could not create output directory %s\n",dname.data());
   }
   //writeLogo(dname);
   if (!Config_getString(HTML_HEADER).isEmpty())
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index c514102..6101984 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -308,8 +308,7 @@ void HtmlHelp::initialize()
   m_fromUtf8 = portable_iconv_open(str,"UTF-8"); 
   if (m_fromUtf8==(void *)(-1))
   {
-    err("unsupported character conversion for CHM_INDEX_ENCODING: '%s'->'UTF-8'\n", str);
-    exit(1);
+    term(1,"unsupported character conversion for CHM_INDEX_ENCODING: '%s'->'UTF-8'\n", str);
   }
 
   /* open the contents file */
@@ -317,8 +316,7 @@ void HtmlHelp::initialize()
   cf = new QFile(fName);
   if (!cf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",fName.data());
   }
   /* Write the header of the contents file */
   cts.setDevice(cf);
@@ -334,8 +332,7 @@ void HtmlHelp::initialize()
   kf = new QFile(fName);
   if (!kf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",fName.data());
   }
   /* Write the header of the contents file */
   kts.setDevice(kf);
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 094232f..bd86038 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -288,8 +288,7 @@ static void writeLatexMakefile()
   QFile file(fileName);
   if (!file.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fileName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",fileName.data());
   }
   // inserted by KONNO Akihisa <konno@researchers.jp> 2002-03-05
   QCString latex_command = theTranslator->latexCommandName();
@@ -387,8 +386,7 @@ static void writeMakeBat()
   bool generateBib = !Doxygen::citeDict->isEmpty();
   if (!file.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fileName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",fileName.data());
   }
   FTextStream t(&file);
   t << "set Dir_Old=%cd%\n";
@@ -468,8 +466,7 @@ void LatexGenerator::init()
   QDir d(dir);
   if (!d.exists() && !d.mkdir(dir))
   {
-    err("Could not create output directory %s\n",dir.data());
-    exit(1);
+    term(1,"Could not create output directory %s\n",dir.data());
   }
 
   writeLatexMakefile();
diff --git a/src/mangen.cpp b/src/mangen.cpp
index 06d3c4a..f4eba20 100644
--- a/src/mangen.cpp
+++ b/src/mangen.cpp
@@ -112,14 +112,12 @@ void ManGenerator::init()
   QDir d(manOutput);
   if (!d.exists() && !d.mkdir(manOutput))
   {
-    err("Could not create output directory %s\n",manOutput.data());
-    exit(1);
+    term(1,"Could not create output directory %s\n",manOutput.data());
   }
   d.setPath(manOutput + "/" + getSubdir());
   if (!d.exists() && !d.mkdir(manOutput + "/" + getSubdir()))
   {
-    err("Could not create output directory %s/%s\n",manOutput.data(), getSubdir().data());
-    exit(1);
+    term(1,"Could not create output directory %s/%s\n",manOutput.data(), getSubdir().data());
   }
   createSubDirs(d);
 }
diff --git a/src/message.cpp b/src/message.cpp
index ddf757a..4b430da 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -251,6 +251,34 @@ extern void err_full(const char *file,int line,const char *fmt, ...)
   va_end(args);
 }
 
+void term(const int exitVal, const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  vfprintf(warnFile, (QCString(error_str) + fmt).data(), args);
+  va_end(args);
+  if (warnFile != stderr)
+  {
+    for (int i = 0; i < strlen(error_str); i++) fprintf(warnFile, " ");
+    fprintf(warnFile, "%s\n", "Exiting...");
+  }
+  exit(exitVal);
+}
+
+extern void term_full(const int exitVal, const char *file,int line,const char *fmt, ...)
+{
+  va_list args;
+  va_start(args, fmt);
+  do_warn(TRUE, file, line, error_str, fmt, args);
+  va_end(args);
+  if (warnFile != stderr)
+  {
+    for (int i = 0; i < strlen(error_str); i++) fprintf(warnFile, " ");
+    fprintf(warnFile, "%s\n", "Exiting...");
+  }
+  exit(exitVal);
+}
+
 void printlex(int dbg, bool enter, const char *lexName, const char *fileName)
 {
   const char *enter_txt = "entering";
diff --git a/src/message.h b/src/message.h
index 3b1a294..56e7e27 100644
--- a/src/message.h
+++ b/src/message.h
@@ -30,6 +30,8 @@ extern void warn_doc_error(const char *file,int line,const char *fmt, ...);
 extern void warn_uncond(const char *fmt, ...);
 extern void err(const char *fmt, ...);
 extern void err_full(const char *file,int line,const char *fmt, ...);
+extern void term(const int exitVal, const char *fmt, ...);
+extern void term_full(const int exitVal, const char *file,int line,const char *fmt, ...);
 void initWarningFormat();
 
 extern void printlex(int dbg, bool enter, const char *lexName, const char *fileName);
diff --git a/src/outputgen.cpp b/src/outputgen.cpp
index 53d2d7f..ea8fd5e 100644
--- a/src/outputgen.cpp
+++ b/src/outputgen.cpp
@@ -46,8 +46,7 @@ void OutputGenerator::startPlainFile(const char *name)
   file = new QFile(fileName);
   if (!file->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",fileName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n",fileName.data());
   }
   t.setDevice(file);
 }
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index be226b7..bf20d45 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -2271,9 +2271,8 @@ bool PerlModGenerator::createOutputDir(QDir &perlModDir)
       dir.setPath(QDir::currentDirPath());
       if (!dir.mkdir(outputDirectory))
       {
-	err("tag OUTPUT_DIRECTORY: Output directory '%s' does not "
+	term(1,"tag OUTPUT_DIRECTORY: Output directory '%s' does not "
 	    "exist and cannot be created\n",outputDirectory.data());
-	exit(1);
       }
       else
       {
diff --git a/src/qhp.cpp b/src/qhp.cpp
index 6260d09..484475c 100644
--- a/src/qhp.cpp
+++ b/src/qhp.cpp
@@ -168,8 +168,7 @@ void Qhp::finalize()
   QFile file(fileName);
   if (!file.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n", fileName.data());
-    exit(1);
+    term(1,"Could not open file %s for writing\n", fileName.data());
   }
   m_doc.dumpTo(file);
 }
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 92740f4..2702cca 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -175,8 +175,7 @@ void RTFGenerator::init()
   QDir d(dir);
   if (!d.exists() && !d.mkdir(dir))
   {
-    err("Could not create output directory %s\n",dir.data());
-    exit(1);
+    term(1,"Could not create output directory %s\n",dir.data());
   }
   rtf_Style.setAutoDelete(TRUE);
 
diff --git a/src/util.cpp b/src/util.cpp
index f58a630..92b97b6 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7950,10 +7950,9 @@ static int transcodeCharacterBuffer(const char *fileName,BufStr &srcBuf,int size
   void *cd = portable_iconv_open(outputEncoding,inputEncoding);
   if (cd==(void *)(-1)) 
   {
-    err("unsupported character conversion: '%s'->'%s': %s\n"
+    term(1,"unsupported character conversion: '%s'->'%s': %s\n"
         "Check the INPUT_ENCODING setting in the config file!\n",
         inputEncoding,outputEncoding,strerror(errno));
-    exit(1);
   }
   int tmpBufSize=size*4+1;
   BufStr tmpBuf(tmpBufSize);
@@ -7971,9 +7970,8 @@ static int transcodeCharacterBuffer(const char *fileName,BufStr &srcBuf,int size
   }
   else
   {
-    err("%s: failed to translate characters from %s to %s: check INPUT_ENCODING\n",
+    term(1,"%s: failed to translate characters from %s to %s: check INPUT_ENCODING\n",
         fileName,inputEncoding,outputEncoding);
-    exit(1);
   }
   portable_iconv_close(cd);
   return newSize;
-- 
cgit v0.12


From 42355ace21f6fb72fba49316c73c025a12482b09 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 22 Nov 2019 16:50:03 +0100
Subject: Problem converting UCS big endian file

When having a file with a Big Endian BOM this is not always handled in a correct way when using the generic UCS-2 approach, using the explicit version works well.
(problems see with a gcc (SUSE Linux) 7.4.1 20190905 [gcc-7-branch revision 275407] and glibc-2.26-lp151.18.7.x86_64).
---
 src/util.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/util.cpp b/src/util.cpp
index f58a630..5868b62 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -8033,13 +8033,18 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
 
   int start=0;
   if (size>=2 &&
-      (((uchar)inBuf.at(0)==0xFF && (uchar)inBuf.at(1)==0xFE) || // Little endian BOM
-       ((uchar)inBuf.at(0)==0xFE && (uchar)inBuf.at(1)==0xFF)    // big endian BOM
-      )
-     ) // UCS-2 encoded file
+      ((uchar)inBuf.at(0)==0xFF && (uchar)inBuf.at(1)==0xFE) // Little endian BOM
+     ) // UCS-2LE encoded file
+  {
+    transcodeCharacterBuffer(fileName,inBuf,inBuf.curPos(),
+        "UCS-2LE","UTF-8");
+  }
+  else if (size>=2 &&
+           ((uchar)inBuf.at(0)==0xFE && (uchar)inBuf.at(1)==0xFF) // big endian BOM
+         ) // UCS-2BE encoded file
   {
     transcodeCharacterBuffer(fileName,inBuf,inBuf.curPos(),
-        "UCS-2","UTF-8");
+        "UCS-2BE","UTF-8");
   }
   else if (size>=3 &&
            (uchar)inBuf.at(0)==0xEF &&
-- 
cgit v0.12


From d29c0e80865c70d1afceeef5e611aac8aa4f079f Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 24 Nov 2019 13:28:28 +0100
Subject: Cleanup scanner.l code and naming

---
 src/scanner.l | 5479 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 2723 insertions(+), 2756 deletions(-)

diff --git a/src/scanner.l b/src/scanner.l
index 2b277db..e0095ba 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -59,149 +59,137 @@
  *	statics
  */
 static ParserInterface *g_thisParser;
-static const char *     inputString;
-static int		inputPosition;
-static QFile            inputFile;
-static int		lastContext;
-static int		lastCContext;
-static int              lastDocContext;
-static int              lastCPPContext;
-static int              lastSkipSharpContext;
-static int              lastSkipRoundContext;
-static int              lastStringContext;
-static int              lastCurlyContext;
-static int              lastRoundContext;
-static int              lastSquareContext;
-static int              lastInitializerContext;
-static int              lastClassTemplSpecContext;
-static int              lastPreLineCtrlContext;
-static int              lastSkipVerbStringContext;
-static int              lastCommentInArgContext;
-static int              lastRawStringContext;
-static int              lastCSConstraint;
-static int              lastHereDocContext;
-static int              lastDefineContext;
-static int              lastAlignAsContext;
-static int              lastC11AttributeContext;
-static int              lastModifierContext;
-static Protection	protection;
-static Protection	baseProt;
-static int		sharpCount   = 0 ;
-static int		roundCount   = 0 ;
-static int		curlyCount   = 0 ;
-static int		squareCount  = 0 ;
-static int              padCount     = 0 ;
-static std::unique_ptr<Entry> current;
-static Entry*		current_root = 0 ;
-static Entry*		global_root  = 0 ;
-static Entry*		previous     = 0 ;
-static std::unique_ptr<Entry> tempEntry;
-static Entry*		firstTypedefEntry = 0 ;
-static Entry*		memspecEntry = 0 ;
-static int		yyLineNr     = 1 ;
-static int		yyBegLineNr  = yyLineNr ;
-static int		yyColNr      = 1 ;
-static int		yyBegColNr   = yyColNr ;
-static int              anonCount    = 0 ;        
-static int              anonNSCount  = 0 ;        
-static QCString		yyFileName;
-static MethodTypes 	mtype;
-static bool    		gstat;
-static bool             removeSlashes;
-static Specifier 	virt;
-static Specifier 	baseVirt;
-static QCString         msType,msName,msArgs;
-static bool             isTypedef;
-static int              tmpDocType;
-static QCString         sectionLabel;
-static QCString		sectionTitle;
-static QCString         funcPtrType;
-static QCString         templateStr;
-static QCString         aliasName;
-static QCString         baseName;
-static QCString*        specName;
-static QCString         formulaText;
-static bool             useOverrideCommands = FALSE;
-
-static SrcLangExt       language;
-static bool             insideIDL   = FALSE;		//!< processing IDL code?
-static bool             insideJava  = FALSE;		//!< processing Java code?
-static bool             insideCS    = FALSE;		//!< processing C# code?
-static bool             insideD     = FALSE;		//!< processing D code?
-static bool             insidePHP   = FALSE;		//!< processing PHP code?
-static bool             insideObjC  = FALSE;            //!< processing Objective C code?
-static bool             insideCli   = FALSE;            //!< processing C++/CLI code?
-static bool             insideJS    = FALSE;            //!< processing JavaScript code?
-static bool             insideSlice = FALSE;            //!< processing Slice code?
-static bool             insideCpp   = TRUE;             //!< processing C/C++ code
-
-static bool             sliceOpt = FALSE;
-
-static bool             insideCppQuote = FALSE;
-static bool             insideProtocolList = FALSE;
-
-static int              argRoundCount;
-static int              argSharpCount;
-static int              currentArgumentContext;
-static int              lastCopyArgStringContext;
-static int              lastCopyArgContext;
-static QCString         *copyArgString;
-static QCString         fullArgString;
-static QCString         dummyRawString;
-
-static ArgumentList     *currentArgumentList;
-static char             lastCopyArgChar;
-
-static QCString         *pCopyQuotedString;
-static QCString         *pCopyRoundString;
-static QCString         *pCopyCurlyString;
-static QCString         *pCopyRawString;
-
-static QGString         *pCopyCurlyGString;
-static QGString         *pCopyRoundGString;
-static QGString         *pCopySquareGString;
-static QGString         *pCopyQuotedGString;
-static QGString         *pCopyHereDocGString;
-static QGString         *pCopyRawGString;
-static QGString         *pSkipVerbString;
-static QStack<Grouping> autoGroupStack;
-
-static bool             insideFormula;
-static bool  	        insideTryBlock=FALSE;
-static bool             insideCode;
-static bool             needsSemi;
-
-//static int              depthIf;
-static int  	        initBracketCount;
-
-static QCString         oldStyleArgType;
-static QCString         docBackup;
-static QCString         briefBackup;
-
-static int              docBlockContext;
-static QGString         docBlock;
-static QCString         docBlockName;
-static bool             docBlockInBody;
-static bool             docBlockAutoBrief;
-static char             docBlockTerm;
-
-static QCString         idlAttr;
-static QCString         idlProp;
-static bool             odlProp;
-
-static bool             g_lexInit = FALSE;
-static bool             externC;
+static const char *     g_inputString = 0;
+static int		g_inputPosition = 0;
+static int		g_lastContext = 0;
+static int		g_lastCContext = 0;
+static int              g_lastDocContext = 0;
+static int              g_lastCPPContext = 0;
+static int              g_lastSkipSharpContext = 0;
+static int              g_lastSkipRoundContext = 0;
+static int              g_lastStringContext = 0;
+static int              g_lastCurlyContext = 0;
+static int              g_lastRoundContext = 0;
+static int              g_lastSquareContext = 0;
+static int              g_lastInitializerContext = 0;
+static int              g_lastClassTemplSpecContext = 0;
+static int              g_lastPreLineCtrlContext = 0;
+static int              g_lastSkipVerbStringContext = 0;
+static int              g_lastCommentInArgContext = 0;
+static int              g_lastRawStringContext = 0;
+static int              g_lastCSConstraint = 0;
+static int              g_lastHereDocContext = 0;
+static int              g_lastDefineContext = 0;
+static int              g_lastAlignAsContext = 0;
+static int              g_lastC11AttributeContext = 0;
+static int              g_lastModifierContext = 0;
+static Protection	g_protection = Public;
+static Protection	g_baseProt = Public;
+static int		g_sharpCount   = 0 ;
+static int		g_roundCount   = 0 ;
+static int		g_curlyCount   = 0 ;
+static int		g_squareCount  = 0 ;
+static int              g_padCount     = 0 ;
+static std::unique_ptr<Entry> g_current;
+static Entry*		g_current_root = 0 ;
+static Entry*		g_previous     = 0 ;
+static std::unique_ptr<Entry> g_tempEntry;
+static Entry*		g_firstTypedefEntry = 0 ;
+static Entry*		g_memspecEntry = 0 ;
+static int		g_yyLineNr     = 1 ;
+static int		g_yyBegLineNr  = 1 ;
+static int		g_yyColNr      = 1 ;
+static int		g_yyBegColNr   = 1 ;
+static int              g_anonCount    = 0 ;
+static int              g_anonNSCount  = 0 ;
+static QCString		g_yyFileName;
+static MethodTypes 	g_mtype = Method;
+static bool    		g_stat = false;
+static Specifier 	g_virt = Normal;
+static Specifier 	g_baseVirt = Normal;
+static QCString         g_msType;
+static QCString         g_msName;
+static QCString         g_msArgs;
+static bool             g_isTypedef = false;
+static QCString         g_funcPtrType;
+static QCString         g_templateStr;
+static QCString         g_aliasName;
+static QCString         g_baseName;
+static QCString*        g_specName = 0;
+
+static SrcLangExt       g_language = SrcLangExt_Unknown;
+static bool             g_insideIDL   = false;		//!< processing IDL code?
+static bool             g_insideJava  = false;		//!< processing Java code?
+static bool             g_insideCS    = false;		//!< processing C# code?
+static bool             g_insideD     = false;		//!< processing D code?
+static bool             g_insidePHP   = false;		//!< processing PHP code?
+static bool             g_insideObjC  = false;            //!< processing Objective C code?
+static bool             g_insideCli   = false;            //!< processing C++/CLI code?
+static bool             g_insideJS    = false;            //!< processing JavaScript code?
+static bool             g_insideSlice = false;            //!< processing Slice code?
+static bool             g_insideCpp   = true;             //!< processing C/C++ code
+
+static bool             g_insideCppQuote = false;
+static bool             g_insideProtocolList = false;
+
+static int              g_argRoundCount = 0;
+static int              g_argSharpCount = 0;
+static int              g_currentArgumentContext = 0;
+static int              g_lastCopyArgStringContext = 0;
+static int              g_lastCopyArgContext = 0;
+static QCString        *g_copyArgString = 0;
+static QCString         g_fullArgString;
+static QCString         g_dummyRawString;
+
+static ArgumentList    *g_currentArgumentList = 0;
+static char             g_lastCopyArgChar = '\0';
+
+static QCString        *g_pCopyQuotedString = 0;
+static QCString        *g_pCopyRoundString = 0;
+static QCString        *g_pCopyCurlyString = 0;
+static QCString        *g_pCopyRawString = 0;
+static QGString        *g_pCopyCurlyGString = 0;
+static QGString        *g_pCopyRoundGString = 0;
+static QGString        *g_pCopySquareGString = 0;
+static QGString        *g_pCopyQuotedGString = 0;
+static QGString        *g_pCopyHereDocGString = 0;
+static QGString        *g_pCopyRawGString = 0;
+static QGString        *g_pSkipVerbString = 0;
+static QStack<Grouping> g_autoGroupStack;
+
+static bool             g_insideFormula = false;
+static bool  	        g_insideTryBlock = false;
+static bool             g_insideCode = false;
+static bool             g_needsSemi = false;
+
+static int  	        g_initBracketCount = 0;
+
+static QCString         g_oldStyleArgType;
+static QCString         g_docBackup;
+static QCString         g_briefBackup;
+
+static int              g_docBlockContext = 0;
+static QGString         g_docBlock;
+static QCString         g_docBlockName;
+static bool             g_docBlockInBody = false;
+static bool             g_docBlockAutoBrief = false;
+static char             g_docBlockTerm = '\0';
+
+static QCString         g_idlAttr;
+static QCString         g_idlProp;
+static bool             g_odlProp = false;
+
+static bool             g_lexInit = false;
+static bool             g_externC = false;
 
 static QCString         g_delimiter;
 
-static int              g_column;
-
-static int              g_fencedSize=0;
-static bool             g_nestedComment=0;
+static int              g_column = 0;
 
+static int              g_fencedSize = 0;
+static bool             g_nestedComment = 0;
 static std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > g_outerScopeEntries;
-
-static CodeScanner g_codeScanner;
+static CodeScanner      g_codeScanner;
 
 static const char *stateToString(int state);
 //-----------------------------------------------------------------------------
@@ -215,46 +203,42 @@ static const char *stateToString(int state);
 static void initParser()
 {
   g_outerScopeEntries.clear();
-  sectionLabel.resize(0);
-  sectionTitle.resize(0);
-  baseName.resize(0);
-  formulaText.resize(0);
-  protection = Public;
-  baseProt = Public;
-  sharpCount = 0;
-  roundCount = 0;
-  curlyCount = 0;
-  mtype = Method;
-  gstat = FALSE;
-  virt = Normal;
-  baseVirt = Normal;
-  isTypedef = FALSE;
-  autoGroupStack.clear();
-  insideTryBlock = FALSE;
-  autoGroupStack.setAutoDelete(TRUE);
-  insideFormula = FALSE;
-  insideCode=FALSE;
-  insideCli=Config_getBool(CPP_CLI_SUPPORT);
-  sliceOpt=Config_getBool(OPTIMIZE_OUTPUT_SLICE);
-  previous = 0;
-  firstTypedefEntry = 0;
-  memspecEntry =0;
+  g_baseName.resize(0);
+  g_protection = Public;
+  g_baseProt = Public;
+  g_sharpCount = 0;
+  g_roundCount = 0;
+  g_curlyCount = 0;
+  g_mtype = Method;
+  g_stat = FALSE;
+  g_virt = Normal;
+  g_baseVirt = Normal;
+  g_isTypedef = FALSE;
+  g_autoGroupStack.clear();
+  g_insideTryBlock = FALSE;
+  g_autoGroupStack.setAutoDelete(TRUE);
+  g_insideFormula = FALSE;
+  g_insideCode=FALSE;
+  g_insideCli=Config_getBool(CPP_CLI_SUPPORT);
+  g_previous = 0;
+  g_firstTypedefEntry = 0;
+  g_memspecEntry =0;
 }
 
 static void initEntry()
 {
-  if (insideJava) 
+  if (g_insideJava) 
   {
-    protection = (current_root->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
+    g_protection = (g_current_root->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
   }
-  current->protection = protection ;
-  current->mtype      = mtype;
-  current->virt       = virt;
-  current->stat       = gstat;
-  current->lang       = language;
-  //printf("*** initEntry() language=%d\n",language);
-  Doxygen::docGroup.initGroupInfo(current.get());
-  isTypedef=FALSE;
+  g_current->protection = g_protection ;
+  g_current->mtype      = g_mtype;
+  g_current->virt       = g_virt;
+  g_current->stat       = g_stat;
+  g_current->lang       = g_language;
+  //printf("*** initEntry() g_language=%d\n",g_language);
+  Doxygen::docGroup.initGroupInfo(g_current.get());
+  g_isTypedef=FALSE;
 }
 
 
@@ -268,7 +252,7 @@ static void lineCount()
   {
     if (*p=='\n') 
     {
-      yyLineNr++,g_column=0,yyColNr=1;
+      g_yyLineNr++,g_column=0,g_yyColNr=1;
     }
     else if (*p=='\t') 
     {
@@ -276,7 +260,7 @@ static void lineCount()
     }
     else 
     {
-      g_column++,yyColNr++;
+      g_column++,g_yyColNr++;
     }
   }
   //printf("lineCount()=%d\n",g_column);
@@ -299,21 +283,21 @@ static inline int computeIndent(const char *s,int startIndent)
 
 static void addType()
 {
-    uint tl=current->type.length();
-    if( tl>0 && !current->name.isEmpty() && current->type.at(tl-1)!='.') 
+    uint tl=g_current->type.length();
+    if( tl>0 && !g_current->name.isEmpty() && g_current->type.at(tl-1)!='.') 
     {
-      current->type += ' ' ;
+      g_current->type += ' ' ;
     }
-    current->type += current->name ;
-    current->name.resize(0) ;
-    tl=current->type.length();
-    if( tl>0 && !current->args.isEmpty() && current->type.at(tl-1)!='.') 
+    g_current->type += g_current->name ;
+    g_current->name.resize(0) ;
+    tl=g_current->type.length();
+    if( tl>0 && !g_current->args.isEmpty() && g_current->type.at(tl-1)!='.') 
     {
-      current->type += ' ' ;
+      g_current->type += ' ' ;
     }
-    current->type += current->args ;
-    current->args.resize(0) ;
-    current->argList.clear();
+    g_current->type += g_current->args ;
+    g_current->args.resize(0) ;
+    g_current->argList.clear();
 }
 
 
@@ -350,24 +334,19 @@ static bool nameIsOperator(QCString &name)
 
 static void setContext()
 {
-  QCString fileName = yyFileName;
-  language    = getLanguageFromFileName(fileName);
-  insideIDL   = language==SrcLangExt_IDL;
-  insideJava  = language==SrcLangExt_Java;
-  insideCS    = language==SrcLangExt_CSharp; 
-  insideD     = language==SrcLangExt_D;
-  insidePHP   = language==SrcLangExt_PHP;
-  insideObjC  = language==SrcLangExt_ObjC;
-  insideJS    = language==SrcLangExt_JS;
-  insideSlice = language==SrcLangExt_Slice;
-  insideCpp   = language==SrcLangExt_Cpp;
-  if ( insidePHP )
-  {
-    useOverrideCommands = TRUE;
-  }
-  //printf("setContext(%s) insideIDL=%d insideJava=%d insideCS=%d "
-  //       "insideD=%d insidePHP=%d insideObjC=%d\n",
-  //       yyFileName.data(),insideIDL,insideJava,insideCS,insideD,insidePHP,insideObjC
+  g_language    = getLanguageFromFileName(g_yyFileName);
+  g_insideIDL   = g_language==SrcLangExt_IDL;
+  g_insideJava  = g_language==SrcLangExt_Java;
+  g_insideCS    = g_language==SrcLangExt_CSharp; 
+  g_insideD     = g_language==SrcLangExt_D;
+  g_insidePHP   = g_language==SrcLangExt_PHP;
+  g_insideObjC  = g_language==SrcLangExt_ObjC;
+  g_insideJS    = g_language==SrcLangExt_JS;
+  g_insideSlice = g_language==SrcLangExt_Slice;
+  g_insideCpp   = g_language==SrcLangExt_Cpp;
+  //printf("setContext(%s) g_insideIDL=%d g_insideJava=%d g_insideCS=%d "
+  //       "g_insideD=%d g_insidePHP=%d g_insideObjC=%d\n",
+  //       g_yyFileName.data(),g_insideIDL,g_insideJava,g_insideCS,g_insideD,g_insidePHP,g_insideObjC
   //	);
 }
 
@@ -375,26 +354,26 @@ static void setContext()
 
 static void prependScope()
 {
-  if (current_root->section & Entry::SCOPE_MASK)
+  if (g_current_root->section & Entry::SCOPE_MASK)
   {
-    //printf("--- prependScope %s to %s\n",current_root->name.data(),current->name.data());
-    current->name.prepend(current_root->name+"::");
-    //printf("prependScope #=%d #current=%d\n",current_root->tArgLists->count(),current->tArgLists->count());
-    for (const ArgumentList &srcAl : current_root->tArgLists)
+    //printf("--- prependScope %s to %s\n",g_current_root->name.data(),g_current->name.data());
+    g_current->name.prepend(g_current_root->name+"::");
+    //printf("prependScope #=%d #g_current=%d\n",g_current_root->tArgLists->count(),g_current->tArgLists->count());
+    for (const ArgumentList &srcAl : g_current_root->tArgLists)
     {
-      current->tArgLists.insert(current->tArgLists.begin(),srcAl);
+      g_current->tArgLists.insert(g_current->tArgLists.begin(),srcAl);
     }
   }
 }
 
 //-----------------------------------------------------------------------------
 
-/*! Returns TRUE iff the current entry could be a K&R style C function */
+/*! Returns TRUE iff the g_current entry could be a K&R style C function */
 static bool checkForKnRstyleC()
 {
-  if (((QCString)yyFileName).right(2).lower()!=".c") return FALSE; // must be a C file
-  if (current->argList.empty()) return FALSE; // must have arguments
-  for (const Argument &a : current->argList)
+  if (((QCString)g_yyFileName).right(2).lower()!=".c") return FALSE; // must be a C file
+  if (g_current->argList.empty()) return FALSE; // must have arguments
+  for (const Argument &a : g_current->argList)
   {
     // in K&R style argument do not have a type, but doxygen expects a type
     // so it will think the argument has no name
@@ -407,56 +386,56 @@ static bool checkForKnRstyleC()
 
 static void splitKnRArg(QCString &oldStyleArgPtr,QCString &oldStyleArgName)
 {
-  int si = current->args.length();
-  if (oldStyleArgType.isEmpty()) // new argument
+  int si = g_current->args.length();
+  if (g_oldStyleArgType.isEmpty()) // new argument
   {
     static QRegExp re("([^)]*)");
-    int bi1 = current->args.findRev(re);
-    int bi2 = bi1!=-1 ? current->args.findRev(re,bi1-1) : -1; 
+    int bi1 = g_current->args.findRev(re);
+    int bi2 = bi1!=-1 ? g_current->args.findRev(re,bi1-1) : -1; 
     char c;
     if (bi1!=-1 && bi2!=-1) // found something like "int (*func)(int arg)"
     {
       int s=bi2+1;
-      oldStyleArgType = current->args.left(s);
+      g_oldStyleArgType = g_current->args.left(s);
       int i=s;
-      while (i<si && ((c=current->args.at(i))=='*' || isspace((uchar)c))) i++;
-      oldStyleArgType += current->args.mid(s,i-s);
+      while (i<si && ((c=g_current->args.at(i))=='*' || isspace((uchar)c))) i++;
+      g_oldStyleArgType += g_current->args.mid(s,i-s);
       s=i;
-      while (i<si && isId(current->args.at(i))) i++;
-      oldStyleArgName = current->args.mid(s,i-s);
-      oldStyleArgType+=current->args.mid(i);
+      while (i<si && isId(g_current->args.at(i))) i++;
+      oldStyleArgName = g_current->args.mid(s,i-s);
+      g_oldStyleArgType+=g_current->args.mid(i);
     }
     else if (bi1!=-1) // redundant braces like in "int (*var)"
     {
       int s=bi1;
-      oldStyleArgType = current->args.left(s);
+      g_oldStyleArgType = g_current->args.left(s);
       s++;
       int i=s+1;
-      while (i<si && ((c=current->args.at(i))=='*' || isspace((uchar)c))) i++;
-      oldStyleArgType += current->args.mid(s,i-s);
+      while (i<si && ((c=g_current->args.at(i))=='*' || isspace((uchar)c))) i++;
+      g_oldStyleArgType += g_current->args.mid(s,i-s);
       s=i;
-      while (i<si && isId(current->args.at(i))) i++;
-      oldStyleArgName = current->args.mid(s,i-s);
+      while (i<si && isId(g_current->args.at(i))) i++;
+      oldStyleArgName = g_current->args.mid(s,i-s);
     }
     else // normal "int *var"
     {
       int l=si,i=l-1,j;
       char c;
       // look for start of name in "type *name"
-      while (i>=0 && isId(current->args.at(i))) i--;
+      while (i>=0 && isId(g_current->args.at(i))) i--;
       j=i+1;
       // look for start of *'s
-      while (i>=0 && ((c=current->args.at(i))=='*' || isspace((uchar)c))) i--;
+      while (i>=0 && ((c=g_current->args.at(i))=='*' || isspace((uchar)c))) i--;
       i++;
       if (i!=l)
       {
-	oldStyleArgType=current->args.left(i);
-	oldStyleArgPtr=current->args.mid(i,j-i);
-	oldStyleArgName=current->args.mid(j).stripWhiteSpace();
+	g_oldStyleArgType=g_current->args.left(i);
+	oldStyleArgPtr=g_current->args.mid(i,j-i);
+	oldStyleArgName=g_current->args.mid(j).stripWhiteSpace();
       }
       else
       {
-	oldStyleArgName=current->args.copy().stripWhiteSpace();
+	oldStyleArgName=g_current->args.copy().stripWhiteSpace();
       }
     }
   }
@@ -464,15 +443,15 @@ static void splitKnRArg(QCString &oldStyleArgPtr,QCString &oldStyleArgName)
   {
     int l=si,j=0;
     char c;
-    while (j<l && ((c=current->args.at(j))=='*' || isspace((uchar)c))) j++;
+    while (j<l && ((c=g_current->args.at(j))=='*' || isspace((uchar)c))) j++;
     if (j>0)
     {
-      oldStyleArgPtr=current->args.left(j);
-      oldStyleArgName=current->args.mid(j).stripWhiteSpace();
+      oldStyleArgPtr=g_current->args.left(j);
+      oldStyleArgName=g_current->args.mid(j).stripWhiteSpace();
     }
     else
     {
-      oldStyleArgName=current->args.copy().stripWhiteSpace();
+      oldStyleArgName=g_current->args.copy().stripWhiteSpace();
     }
   }
 }
@@ -486,7 +465,7 @@ static void splitKnRArg(QCString &oldStyleArgPtr,QCString &oldStyleArgName)
 static void addKnRArgInfo(const QCString &type,const QCString &name,
                           const QCString &brief,const QCString &docs)
 {
-  for (Argument &a : current->argList)
+  for (Argument &a : g_current->argList)
   {
     if (a.type==name)
     {
@@ -534,9 +513,9 @@ void fixArgumentListForJavaScript(ArgumentList &al)
 static int yyread(char *buf,int max_size)
 {
     int c=0;
-    while( c < max_size && inputString[inputPosition] )
+    while( c < max_size && g_inputString[g_inputPosition] )
     {
-      *buf = inputString[inputPosition++] ;
+      *buf = g_inputString[g_inputPosition++] ;
       //printf("%d (%c)\n",*buf,*buf);
       c++; buf++;
     }
@@ -738,32 +717,32 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 %%
 
 <NextSemi>"{"				{
-  					  curlyCount=0;
-					  needsSemi = TRUE;
+  					  g_curlyCount=0;
+					  g_needsSemi = TRUE;
   					  BEGIN(SkipCurlyBlock); 
 					}
 <NextSemi>"("				{
-  				 	  roundCount=0;
+  				 	  g_roundCount=0;
   					  BEGIN(SkipRoundBlock);
   					}
 <SkipRoundBlock>"("			{
-					  ++roundCount;
+					  ++g_roundCount;
   					}
 <SkipRoundBlock>")"			{
-  					  if (roundCount )
-					    --roundCount ;
+  					  if (g_roundCount )
+					    --g_roundCount ;
 					  else
 					    BEGIN( NextSemi ) ;
   					}
 <SkipCurlyBlock>"{"			{
-  					  ++curlyCount ; 
+  					  ++g_curlyCount ; 
 					}
 <SkipCurlyBlock>"}"			{ 
-  				          if( curlyCount )
+  				          if( g_curlyCount )
 					  {
-					    --curlyCount ;
+					    --g_curlyCount ;
 					  }
-					  else if (needsSemi)
+					  else if (g_needsSemi)
 					  {
 					    BEGIN( NextSemi );
 					  }
@@ -773,15 +752,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <NextSemi>\'				{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-					    lastStringContext=NextSemi;
+					    g_lastStringContext=NextSemi;
 					    BEGIN(SkipPHPString);
 					  }
   					}
-<NextSemi>{CHARLIT}			{ if (insidePHP) REJECT; }
+<NextSemi>{CHARLIT}			{ if (g_insidePHP) REJECT; }
 <NextSemi>\"				{
-  					  lastStringContext=NextSemi;
+  					  g_lastStringContext=NextSemi;
 					  BEGIN(SkipString);
   					}
 <NextSemi>[;,]				{ 
@@ -793,12 +772,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( FindMembers );
   					}
 <EnumBaseType>[{;,]                     {
-                                          current->args = current->args.simplifyWhiteSpace();
+                                          g_current->args = g_current->args.simplifyWhiteSpace();
   					  unput(*yytext);
 					  BEGIN( ClassVar );
                                         }
 <FindMembers>"<?php"			{ // PHP code with unsupported extension?
-                                          insidePHP = TRUE;
+                                          g_insidePHP = TRUE;
   					}
 <FindMembersPHP>"<?"("php"?)            { // PHP code start
                                            BEGIN( FindMembers );
@@ -808,7 +787,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN( FindMembers );
 					}
 <FindMembers>"?>"|"</script>"           { // PHP code end
-					  if (insidePHP)
+					  if (g_insidePHP)
 					    BEGIN( FindMembersPHP );
 					  else
 					    REJECT;
@@ -820,95 +799,95 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <FindMembersPHP>.                       { // Non-PHP code text, ignore
 				        }
-<FindMembers>{PHPKW}			{ if (insidePHP)
+<FindMembers>{PHPKW}			{ if (g_insidePHP)
 					    BEGIN( NextSemi );
 					  else
 					    REJECT;
 					}
 <FindMembers>"%{"[^\n]*			{ // Mozilla XPIDL lang-specific block
-					  if (!insideIDL)
+					  if (!g_insideIDL)
 					    REJECT;
 					}
 <FindMembers>"%}"			{ // Mozilla XPIDL lang-specific block end
-					  if (!insideIDL)
+					  if (!g_insideIDL)
 					    REJECT;
 					}
 <FindMembers>{B}*("properties"){BN}*":"{BN}*  { // IDL or Borland C++ builder property 
-  					  current->mtype = mtype = Property;
-					  current->protection = protection = Public ;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+  					  g_current->mtype = g_mtype = Property;
+					  g_current->protection = g_protection = Public ;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
 					}
 
-<FindMembers>{B}*"k_dcop"{BN}*":"{BN}*  { current->mtype = mtype = DCOP;
-					  current->protection = protection = Public ;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+<FindMembers>{B}*"k_dcop"{BN}*":"{BN}*  { g_current->mtype = g_mtype = DCOP;
+					  g_current->protection = g_protection = Public ;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
 					}
 
-<FindMembers>{B}*("signals"|"Q_SIGNALS"){BN}*":"{BN}* { current->mtype = mtype = Signal;
+<FindMembers>{B}*("signals"|"Q_SIGNALS"){BN}*":"{BN}* { g_current->mtype = g_mtype = Signal;
   
-					  current->protection = protection = Public ;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+					  g_current->protection = g_protection = Public ;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
 					}
 
 <FindMembers>{B}*"public"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
-					  current->protection = protection = Public ;
-					  current->mtype = mtype = Slot;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+					  g_current->protection = g_protection = Public ;
+					  g_current->mtype = g_mtype = Slot;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount();
 					}
 
 <FindMembers>{B}*"protected"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
-					  current->protection = protection = Protected ;
-					  current->mtype = mtype = Slot;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+					  g_current->protection = g_protection = Protected ;
+					  g_current->mtype = g_mtype = Slot;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount();
 					}
 
 <FindMembers>{B}*"private"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
-					  current->protection = protection = Private ;
-					  current->mtype = mtype = Slot;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+					  g_current->protection = g_protection = Private ;
+					  g_current->mtype = g_mtype = Slot;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount();
 					}
 <FindMembers>{B}*("public"|"methods"|"__published"){BN}*":"{BN}* { 
-					  current->protection = protection = Public ;
-					  current->mtype = mtype = Method;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+					  g_current->protection = g_protection = Public ;
+					  g_current->mtype = g_mtype = Method;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
 					}
 <FindMembers>{B}*"internal"{BN}*":"{BN}* {  // for now treat C++/CLI's internal as package...
-  					  if (insideCli)
-					  {
-					    current->protection = protection = Package ;
-					    current->mtype = mtype = Method;
-					    current->type.resize(0); 
-					    current->name.resize(0); 
-					    current->args.resize(0);
-					    current->argList.clear();
+  					  if (g_insideCli)
+					  {
+					    g_current->protection = g_protection = Package ;
+					    g_current->mtype = g_mtype = Method;
+					    g_current->type.resize(0); 
+					    g_current->name.resize(0); 
+					    g_current->args.resize(0);
+					    g_current->argList.clear();
 					    lineCount() ;
 					  }
 					  else
@@ -917,38 +896,38 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FindMembers>{B}*"protected"{BN}*":"{BN}* {  
-  					  current->protection = protection = Protected ;
-					  current->mtype = mtype = Method;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+  					  g_current->protection = g_protection = Protected ;
+					  g_current->mtype = g_mtype = Method;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
 					}
 <FindMembers>{B}*"private"{BN}*":"{BN}*	{ 
-  					  current->protection = protection = Private ;
-					  current->mtype = mtype = Method;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+  					  g_current->protection = g_protection = Private ;
+					  g_current->mtype = g_mtype = Method;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
 					}
 <FindMembers>{B}*"event"{BN}+           { 
-  					  if (insideCli)
+  					  if (g_insideCli)
 					  {
 					    // C++/CLI event
 					    lineCount() ;
-  					    current->mtype = mtype = Event;
-					    current->bodyLine = yyLineNr;
-					    curlyCount=0;
+  					    g_current->mtype = g_mtype = Event;
+					    g_current->bodyLine = g_yyLineNr;
+					    g_curlyCount=0;
 					    BEGIN( CliPropertyType );
 					  }
-					  else if (insideCS)
+					  else if (g_insideCS)
 					  {
 					    lineCount() ;
-  					    current->mtype = Event;
-					    current->bodyLine = yyLineNr;
+  					    g_current->mtype = Event;
+					    g_current->bodyLine = g_yyLineNr;
 					  }
 					  else
 					  {
@@ -956,13 +935,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
                                         }
 <FindMembers>{B}*"property"{BN}+	{
-  					   if (insideCli)
+  					   if (g_insideCli)
 					   {
 					     // C++/CLI property
 					     lineCount() ;
-  					     current->mtype = mtype = Property;
-					     current->bodyLine = yyLineNr;
-					     curlyCount=0;
+  					     g_current->mtype = g_mtype = Property;
+					     g_current->bodyLine = g_yyLineNr;
+					     g_curlyCount=0;
 					     BEGIN( CliPropertyType );
 					   }
 					   else
@@ -972,15 +951,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <CliPropertyType>{ID}			{
   					  addType();
-  					  current->name = yytext;
+  					  g_current->name = yytext;
   					}
 <CliPropertyType>"["		        { // C++/CLI indexed property
-  					  current->args = "[";
+  					  g_current->args = "[";
 					  BEGIN( CliPropertyIndex );
   					}
 <CliPropertyType>"{"			{
-					  curlyCount=0;
-					  //printf("event: '%s' '%s'\n",current->type.data(),current->name.data());
+					  g_curlyCount=0;
+					  //printf("event: '%s' '%s'\n",g_current->type.data(),g_current->name.data());
   					  BEGIN( CSAccessorDecl );
   					}
 <CliPropertyType>";"			{
@@ -994,78 +973,78 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <CliPropertyType>.			{
   					  addType();
-  					  current->type += yytext;
+  					  g_current->type += yytext;
   					}
 <CliPropertyIndex>"]"			{
                                           BEGIN( CliPropertyType );
-  					  current->args+=yytext;
+  					  g_current->args+=yytext;
   					}
 <CliPropertyIndex>.			{
-  					  current->args+=yytext;
+  					  g_current->args+=yytext;
   					}
   /*
 <FindMembers>{B}*"property"{BN}+        { 
-                                          if (!current->type.isEmpty())
+                                          if (!g_current->type.isEmpty())
 					  {
 					    REJECT;
                                           }
 					  else
 					  { 
-                                            current->mtype = mtype = Property;
+                                            g_current->mtype = g_mtype = Property;
                                             lineCount();
 					  }
                                         }
   */
 <FindMembers>{B}*"@private"{BN}+	{
-  					  current->protection = protection = Private ;
-					  current->mtype = mtype = Method;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+  					  g_current->protection = g_protection = Private ;
+					  g_current->mtype = g_mtype = Method;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
   					}
 <FindMembers>{B}*"@protected"{BN}+	{
-  					  current->protection = protection = Protected ;
-					  current->mtype = mtype = Method;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+  					  g_current->protection = g_protection = Protected ;
+					  g_current->mtype = g_mtype = Method;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
   					}
 <FindMembers>{B}*"@public"{BN}+	{
-  					  current->protection = protection = Public ;
-					  current->mtype = mtype = Method;
-					  current->type.resize(0); 
-					  current->name.resize(0); 
-					  current->args.resize(0);
-					  current->argList.clear();
+  					  g_current->protection = g_protection = Public ;
+					  g_current->mtype = g_mtype = Method;
+					  g_current->type.resize(0); 
+					  g_current->name.resize(0); 
+					  g_current->args.resize(0);
+					  g_current->argList.clear();
 					  lineCount() ;
   					}
 <FindMembers>[\-+]{BN}*			{
-  					  if (!insideObjC) 
+  					  if (!g_insideObjC) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
   					    lineCount();
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->bodyLine  = yyLineNr;
-					    current->section = Entry::FUNCTION_SEC;
-					    current->protection = protection = Public ;
-					    language = current->lang = SrcLangExt_ObjC;
-					    insideObjC = TRUE;
-					    current->virt = Virtual;
-					    current->stat=yytext[0]=='+';
-					    current->mtype = mtype = Method;
-					    current->type.resize(0); 
-					    current->name.resize(0); 
-					    current->args.resize(0);
-					    current->argList.clear();
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->bodyLine  = g_yyLineNr;
+					    g_current->section = Entry::FUNCTION_SEC;
+					    g_current->protection = g_protection = Public ;
+					    g_language = g_current->lang = SrcLangExt_ObjC;
+					    g_insideObjC = TRUE;
+					    g_current->virt = Virtual;
+					    g_current->stat=yytext[0]=='+';
+					    g_current->mtype = g_mtype = Method;
+					    g_current->type.resize(0); 
+					    g_current->name.resize(0); 
+					    g_current->args.resize(0);
+					    g_current->argList.clear();
 					    BEGIN( ObjCMethod );
 					  }
   					}
@@ -1073,24 +1052,24 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN( ObjCReturnType );
   					}
 <ObjCMethod>{ID}			{ // found method name
-  					  if (current->type.isEmpty())
+  					  if (g_current->type.isEmpty())
 					  {
-					    current->type = "id";
+					    g_current->type = "id";
 					  }
-					  current->name = yytext;
-                                          if (insideCpp || insideObjC) 
+					  g_current->name = yytext;
+                                          if (g_insideCpp || g_insideObjC) 
                                           {
-                                            current->id = ClangParser::instance()->lookup(yyLineNr,yytext);
+                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
                                           }
   					}
 <ObjCMethod>":"{B}*			{ // start of parameter list
-  					  current->name += ':';
+  					  g_current->name += ':';
   					  Argument a;
-					  current->argList.push_back(a);
+					  g_current->argList.push_back(a);
   					  BEGIN( ObjCParams );
   					}
 <ObjCReturnType>[^)]*			{ // TODO: check if nested braches are possible.
-  					  current->type = yytext;
+  					  g_current->type = yytext;
   					}
 <ObjCReturnType>")"			{
   					  BEGIN( ObjCMethod );
@@ -1100,119 +1079,119 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  keyw=keyw.left(keyw.length()-1).stripWhiteSpace(); // strip :
 					  if (keyw.isEmpty())
 					  {
-					    current->name += " :";
+					    g_current->name += " :";
 					  }
 					  else
 					  {
-					    current->name += keyw+":";
+					    g_current->name += keyw+":";
 					  }
-					  if (current->argList.back().type.isEmpty())
+					  if (g_current->argList.back().type.isEmpty())
 					  {
-					    current->argList.back().type="id";
+					    g_current->argList.back().type="id";
 					  }
   					  Argument a;
   					  a.attrib=(QCString)"["+keyw+"]";
-					  current->argList.push_back(a);
+					  g_current->argList.push_back(a);
   					}
 <ObjCParams>{ID}{BN}*			{ // name of parameter
   					  lineCount();
-  					  current->argList.back().name=QCString(yytext).stripWhiteSpace();
+  					  g_current->argList.back().name=QCString(yytext).stripWhiteSpace();
   					}
 <ObjCParams>","{BN}*"..."		{ // name of parameter
   					  lineCount();
 					  // do we want the comma as part of the name?
-  					  //current->name += ",";
+  					  //g_current->name += ",";
   					  Argument a;
   					  a.attrib="[,]";
   					  a.type="...";
-					  current->argList.push_back(a);
+					  g_current->argList.push_back(a);
   					}
    /*
 <ObjCParams>":"				{ 
-					  current->name += ':';
+					  g_current->name += ':';
 					}
    */
 <ObjCParams>"("				{
-				 	  roundCount=0;
-					  current->argList.back().type.resize(0);
+				 	  g_roundCount=0;
+					  g_current->argList.back().type.resize(0);
 					  BEGIN( ObjCParamType );
 					}
 <ObjCParamType>"("                      {
-                                          roundCount++;
-  					  current->argList.back().type+=yytext;
+                                          g_roundCount++;
+  					  g_current->argList.back().type+=yytext;
                                         }
 <ObjCParamType>")"/{B}*			{
-                                          if (roundCount<=0)
+                                          if (g_roundCount<=0)
                                           {
                                             BEGIN( ObjCParams );
                                           }
                                           else
                                           {
-                                            current->argList.back().type+=yytext;
-                                            roundCount--;
+                                            g_current->argList.back().type+=yytext;
+                                            g_roundCount--;
                                           }
 					}
 <ObjCParamType>[^()]*			{
-        				  current->argList.back().type+=QCString(yytext).stripWhiteSpace();
+        				  g_current->argList.back().type+=QCString(yytext).stripWhiteSpace();
   					}
 <ObjCMethod,ObjCParams>";"		{ // end of method declaration
-					  if (!current->argList.empty() && current->argList.back().type.isEmpty())
+					  if (!g_current->argList.empty() && g_current->argList.back().type.isEmpty())
 					  {
-					    current->argList.back().type="id";
+					    g_current->argList.back().type="id";
 					  }
-                                          if (current->argList.empty()) // method without parameters
+                                          if (g_current->argList.empty()) // method without parameters
                                           {
-                                            current->argList.noParameters = TRUE;
+                                            g_current->argList.noParameters = TRUE;
                                           }
-  					  current->args = argListToString(current->argList);
-					  //printf("argList=%s\n",current->args.data());
+  					  g_current->args = argListToString(g_current->argList);
+					  //printf("argList=%s\n",g_current->args.data());
   					  unput(';');
   					  BEGIN( Function );
                                         }
 <ObjCMethod,ObjCParams>(";"{BN}+)?"{"	{ // start of a method body
   					  lineCount();
                                           //printf("Type=%s Name=%s args=%s\n",
-					  //    current->type.data(),current->name.data(),argListToString(current->argList).data()
+					  //    g_current->type.data(),g_current->name.data(),argListToString(g_current->argList).data()
 					  //    );
-					  if (!current->argList.empty() && current->argList.back().type.isEmpty())
+					  if (!g_current->argList.empty() && g_current->argList.back().type.isEmpty())
 					  {
-					    current->argList.back().type="id";
+					    g_current->argList.back().type="id";
 					  }
-                                          if (current->argList.empty()) // method without parameters
+                                          if (g_current->argList.empty()) // method without parameters
                                           {
-                                            current->argList.noParameters = TRUE;
+                                            g_current->argList.noParameters = TRUE;
                                           }
-  					  current->args = argListToString(current->argList);
+  					  g_current->args = argListToString(g_current->argList);
                                           unput('{');
   					  BEGIN( Function );
   					}
 <FindMembers>{B}*"sequence"{BN}*"<"{BN}* {
-					  if (insideSlice)
+					  if (g_insideSlice)
 					  {
                                             lineCount();
-					    current->bodyLine = yyLineNr;
-                                            current->fileName = yyFileName ;
-					    current->startLine = yyLineNr ;
-					    current->startColumn = yyColNr;
-                                            current->args.resize(0);
-					    current->section = Entry::TYPEDEF_SEC ;
-                                            isTypedef = TRUE;
+					    g_current->bodyLine = g_yyLineNr;
+                                            g_current->fileName = g_yyFileName ;
+					    g_current->startLine = g_yyLineNr ;
+					    g_current->startColumn = g_yyColNr;
+                                            g_current->args.resize(0);
+					    g_current->section = Entry::TYPEDEF_SEC ;
+                                            g_isTypedef = TRUE;
 					    BEGIN( SliceSequence );
 					  }
 					  else
 					    REJECT;
 					}
 <FindMembers>{B}*"dictionary"{BN}*"<"{BN}* {
-					  if (insideSlice)
+					  if (g_insideSlice)
 					  {
                                             lineCount();
-					    current->bodyLine = yyLineNr;
-                                            current->fileName = yyFileName ;
-					    current->startLine = yyLineNr ;
-					    current->startColumn = yyColNr;
-                                            current->args.resize(0);
-					    current->section = Entry::TYPEDEF_SEC ;
-                                            isTypedef = TRUE;
+					    g_current->bodyLine = g_yyLineNr;
+                                            g_current->fileName = g_yyFileName ;
+					    g_current->startLine = g_yyLineNr ;
+					    g_current->startColumn = g_yyColNr;
+                                            g_current->args.resize(0);
+					    g_current->section = Entry::TYPEDEF_SEC ;
+                                            g_isTypedef = TRUE;
 					    BEGIN( SliceDictionary );
 					  }
 					  else
@@ -1222,18 +1201,18 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  lineCount();
   					}
 <FindMembers>"@"({ID}".")*{ID}{BN}*"("	{
-  					  if (insideJava) // Java annotation
+  					  if (g_insideJava) // Java annotation
 					  {
   					    lineCount();
-					    lastSkipRoundContext = YY_START;
-					    roundCount=0;
+					    g_lastSkipRoundContext = YY_START;
+					    g_roundCount=0;
 					    BEGIN( SkipRound );
 					  }
 					  else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property
 					  {
-  					    current->mtype = mtype = Property;
-					    current->spec|=Entry::Readable | Entry::Writable | Entry::Assign;
-					    current->protection = Public ;
+  					    g_current->mtype = g_mtype = Property;
+					    g_current->spec|=Entry::Readable | Entry::Writable | Entry::Assign;
+					    g_current->protection = Public ;
 					    unput('(');
 					    BEGIN( ObjCPropAttr );
 					  }
@@ -1243,54 +1222,54 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
                                         }
 <ObjCPropAttr>"getter="{ID}		{ 
-                                          current->read = yytext+7;
+                                          g_current->read = yytext+7;
 					}
 <ObjCPropAttr>"setter="{ID}		{ 
-                                          current->write = yytext+7;
+                                          g_current->write = yytext+7;
 					}
 <ObjCPropAttr>"readonly"		{
-					  current->spec&=~Entry::Writable;
+					  g_current->spec&=~Entry::Writable;
   					}
 <ObjCPropAttr>"readwrite"		{ // default
   					}
 <ObjCPropAttr>"assign"			{ // default
   					}
 <ObjCPropAttr>"unsafe_unretained"       {
-					  current->spec&=~Entry::Assign;
-					  current->spec|=Entry::Unretained;
+					  g_current->spec&=~Entry::Assign;
+					  g_current->spec|=Entry::Unretained;
                                         }
 <ObjCPropAttr>"retain"			{
-					  current->spec&=~Entry::Assign;
-					  current->spec|=Entry::Retain;
+					  g_current->spec&=~Entry::Assign;
+					  g_current->spec|=Entry::Retain;
   					}
 <ObjCPropAttr>"copy"			{
-					  current->spec&=~Entry::Assign;
-					  current->spec|=Entry::Copy;
+					  g_current->spec&=~Entry::Assign;
+					  g_current->spec|=Entry::Copy;
   					}
 <ObjCPropAttr>"weak"                    {
-					  current->spec&=~Entry::Assign;
-					  current->spec|=Entry::Weak;
+					  g_current->spec&=~Entry::Assign;
+					  g_current->spec|=Entry::Weak;
                                         }
 <ObjCPropAttr>"strong"                  {
-					  current->spec&=~Entry::Assign;
-					  current->spec|=Entry::Strong;
+					  g_current->spec&=~Entry::Assign;
+					  g_current->spec|=Entry::Strong;
                                         }
 <ObjCPropAttr>"nonatomic"		{
-					  current->spec|=Entry::NonAtomic;
+					  g_current->spec|=Entry::NonAtomic;
   					}
 <ObjCPropAttr>")"			{
   					  BEGIN(FindMembers);
   					}
 <FindMembers>"@"{ID}			{
-  					  if (insideJava) // Java annotation
+  					  if (g_insideJava) // Java annotation
 					  {
 					    // skip annotation
 					  }
 					  else if (qstrcmp(yytext,"@property")==0) // ObjC 2.0 property
 					  {
-  					    current->mtype = mtype = Property;
-					    current->spec|=Entry::Writable | Entry::Readable;
-					    current->protection = Public ;
+  					    g_current->mtype = g_mtype = Property;
+					    g_current->spec|=Entry::Writable | Entry::Readable;
+					    g_current->protection = Public ;
 					  }
 					  else if (qstrcmp(yytext,"@synthesize")==0)
 					  {
@@ -1309,57 +1288,57 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN(FindMembers);
   					}
 <PackageName>{ID}(("."|"\\"){ID})*	{
-  					  isTypedef=FALSE;
-					  //printf("Found namespace %s lang=%d\n",yytext,current->lang);
-					  current->name = yytext;
-					  current->name = substitute(current->name,".","::");
-					  current->name = substitute(current->name,"\\","::");
-					  current->section = Entry::NAMESPACE_SEC;
-					  current->type = "namespace" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+  					  g_isTypedef=FALSE;
+					  //printf("Found namespace %s lang=%d\n",yytext,g_current->lang);
+					  g_current->name = yytext;
+					  g_current->name = substitute(g_current->name,".","::");
+					  g_current->name = substitute(g_current->name,"\\","::");
+					  g_current->section = Entry::NAMESPACE_SEC;
+					  g_current->type = "namespace" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount();
   					}
 <PackageName>";"			{
-                                          Entry *tmp = current.get();
-					  current_root->moveToSubEntryAndRefresh(current);
-                                          current_root = tmp;
+                                          Entry *tmp = g_current.get();
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
+                                          g_current_root = tmp;
 					  initEntry();
   					  BEGIN(FindMembers);
   					}
 <PackageName>"{"			{
-					  curlyCount=0;
+					  g_curlyCount=0;
 					  BEGIN( ReadNSBody );
   					}
 <FindMembers>{B}*"initonly"{BN}+	{
-  					  current->type += " initonly ";
-					  if (insideCli) current->spec |= Entry::Initonly;
+  					  g_current->type += " initonly ";
+					  if (g_insideCli) g_current->spec |= Entry::Initonly;
 					  lineCount();
   					}
-<FindMembers>{B}*"static"{BN}+     	{ current->type += " static ";
-  					  current->stat = TRUE;
+<FindMembers>{B}*"static"{BN}+     	{ g_current->type += " static ";
+  					  g_current->stat = TRUE;
 					  lineCount();
 					}
 <FindMembers>{B}*"extern"{BN}+		{
-  					  current->stat = FALSE;
-					  current->explicitExternal = TRUE;
+  					  g_current->stat = FALSE;
+					  g_current->explicitExternal = TRUE;
 					  lineCount();
   					}
-<FindMembers>{B}*"const"{BN}+    	{ current->type += " const ";
-					  if (insideCS) current->stat = TRUE;
+<FindMembers>{B}*"const"{BN}+    	{ g_current->type += " const ";
+					  if (g_insideCS) g_current->stat = TRUE;
 					  lineCount();
 					}
-<FindMembers>{B}*"virtual"{BN}+    	{ current->type += " virtual ";
-					  current->virt = Virtual;
+<FindMembers>{B}*"virtual"{BN}+    	{ g_current->type += " virtual ";
+					  g_current->virt = Virtual;
 					  lineCount();
 					}
 <FindMembers>{B}*"constexpr"{BN}+    	{ 
-                                          if (insideCpp)
+                                          if (g_insideCpp)
                                           {
-                                            current->type += " constexpr ";
-                                            current->spec |= Entry::ConstExpr;
+                                            g_current->type += " constexpr ";
+                                            g_current->spec |= Entry::ConstExpr;
                                             lineCount();
                                           }
                                           else
@@ -1368,10 +1347,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           }
 					}
 <FindMembers>{B}*"published"{BN}+	{ // UNO IDL published keyword
-					  if (insideIDL)
+					  if (g_insideIDL)
 					  {
 					    lineCount();
-					    current->spec |= Entry::Published;
+					    g_current->spec |= Entry::Published;
 					  }
 					  else
 					  {
@@ -1379,42 +1358,42 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <FindMembers>{B}*"abstract"{BN}+    	{ 
-                                          if (!insidePHP) 
+                                          if (!g_insidePHP) 
 					  {
-					    current->type += " abstract ";
-					    if (!insideJava)
+					    g_current->type += " abstract ";
+					    if (!g_insideJava)
 					    {
-                                              current->virt = Pure;
+                                              g_current->virt = Pure;
 					    }
 					    else
 					    {
-                                              current->spec|=Entry::Abstract;
+                                              g_current->spec|=Entry::Abstract;
 					    }
 					  }
 					  else
 					  {
-					    current->spec|=Entry::Abstract;
+					    g_current->spec|=Entry::Abstract;
 					  }
 					  lineCount();
 					}
-<FindMembers>{B}*"inline"{BN}+		{ current->spec|=Entry::Inline;
+<FindMembers>{B}*"inline"{BN}+		{ g_current->spec|=Entry::Inline;
                                           lineCount(); 
                                         }
-<FindMembers>{B}*"mutable"{BN}+		{ current->spec|=Entry::Mutable;
+<FindMembers>{B}*"mutable"{BN}+		{ g_current->spec|=Entry::Mutable;
                                           lineCount(); 
                                         }
-<FindMembers>{B}*"explicit"{BN}+	{ current->spec|=Entry::Explicit;
+<FindMembers>{B}*"explicit"{BN}+	{ g_current->spec|=Entry::Explicit;
                                           lineCount(); 
                                         }
-<FindMembers>{B}*"local"{BN}+		{ current->spec|=Entry::Local;
+<FindMembers>{B}*"local"{BN}+		{ g_current->spec|=Entry::Local;
                                           lineCount(); 
                                         }
 <FindMembers>{B}*"@required"{BN}+	{ // Objective C 2.0 protocol required section
-                                          current->spec=(current->spec & ~Entry::Optional) | Entry::Required;
+                                          g_current->spec=(g_current->spec & ~Entry::Optional) | Entry::Required;
                                           lineCount(); 
                                         }
 <FindMembers>{B}*"@optional"{BN}+	{  // Objective C 2.0 protocol optional section
-                                          current->spec=(current->spec & ~Entry::Required) | Entry::Optional;
+                                          g_current->spec=(g_current->spec & ~Entry::Required) | Entry::Optional;
                                           lineCount(); 
                                         }
   /*
@@ -1424,15 +1403,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   */
 <FindMembers>{B}*"typename"{BN}+	{ lineCount(); }
 <FindMembers>{B}*"namespace"{BN}*/[^a-z_A-Z0-9]	{ 
-  					  isTypedef=FALSE;
-					  current->section = Entry::NAMESPACE_SEC;
-					  current->type = "namespace" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+  					  g_isTypedef=FALSE;
+					  g_current->section = Entry::NAMESPACE_SEC;
+					  g_current->type = "namespace" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount();
-					  if (insidePHP)
+					  if (g_insidePHP)
 					  {
 					    BEGIN( PackageName );
 					  }
@@ -1443,18 +1422,18 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <FindMembers>{B}*"module"{BN}+		{ 
 					  lineCount();
-                                          if (insideIDL || insideSlice)
-					  {
-  					    isTypedef=FALSE;
-					    current->section = Entry::NAMESPACE_SEC;
-					    current->type = "module" ;
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->bodyLine  = yyLineNr;
+                                          if (g_insideIDL || g_insideSlice)
+					  {
+  					    g_isTypedef=FALSE;
+					    g_current->section = Entry::NAMESPACE_SEC;
+					    g_current->type = "module" ;
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->bodyLine  = g_yyLineNr;
   					    BEGIN( CompoundName ); 
 					  }
-					  else if (insideD)
+					  else if (g_insideD)
 					  {
 					    lineCount();
 					    BEGIN(PackageName);
@@ -1462,175 +1441,175 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
 					    addType();
-					    current->name = QCString(yytext).stripWhiteSpace();
+					    g_current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{B}*"library"{BN}+		{ 
 					  lineCount();
-                                          if (insideIDL)
-					  {
-  					    isTypedef=FALSE;
-					    current->section = Entry::NAMESPACE_SEC;
-					    current->type = "library" ;
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->bodyLine  = yyLineNr;
+                                          if (g_insideIDL)
+					  {
+  					    g_isTypedef=FALSE;
+					    g_current->section = Entry::NAMESPACE_SEC;
+					    g_current->type = "library" ;
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->bodyLine  = g_yyLineNr;
   					    BEGIN( CompoundName ); 
 					  }
 					  else
 					  {
 					    addType();
-					    current->name = QCString(yytext).stripWhiteSpace();
+					    g_current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{B}*"constants"{BN}+	{  // UNO IDL constant group
 					  lineCount();
-					  if (insideIDL)
-					  {
-					    isTypedef=FALSE;
-					    current->section = Entry::NAMESPACE_SEC;
-					    current->type = "constants";
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->bodyLine  = yyLineNr;
+					  if (g_insideIDL)
+					  {
+					    g_isTypedef=FALSE;
+					    g_current->section = Entry::NAMESPACE_SEC;
+					    g_current->type = "constants";
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->bodyLine  = g_yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else
 					  {
 					    addType();
-					    current->name = QCString(yytext).stripWhiteSpace();
+					    g_current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{BN}*("service"){BN}+ 	{ // UNO IDL service
 					  lineCount();
-					  if (insideIDL)
+					  if (g_insideIDL)
 					  {
-					    isTypedef=FALSE;
-					    current->section = Entry::CLASS_SEC;
-					    current->spec = Entry::Service |
+					    g_isTypedef=FALSE;
+					    g_current->section = Entry::CLASS_SEC;
+					    g_current->spec = Entry::Service |
 					      // preserve UNO IDL [optional] or published
-					      (current->spec & (Entry::Optional|Entry::Published));
+					      (g_current->spec & (Entry::Optional|Entry::Published));
 					    addType();
-					    current->type += " service " ;
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->bodyLine  = yyLineNr;
+					    g_current->type += " service " ;
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->bodyLine  = g_yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else // TODO is addType right? just copy/pasted
 					  {
 					    addType();
-					    current->name = QCString(yytext).stripWhiteSpace();
+					    g_current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{BN}*("singleton"){BN}+ 	{ // UNO IDL singleton
 					  lineCount();
-					  if (insideIDL)
+					  if (g_insideIDL)
 					  {
-					    isTypedef=FALSE;
-					    current->section = Entry::CLASS_SEC;
-					    current->spec = Entry::Singleton |
-					      (current->spec & Entry::Published); // preserve
+					    g_isTypedef=FALSE;
+					    g_current->section = Entry::CLASS_SEC;
+					    g_current->spec = Entry::Singleton |
+					      (g_current->spec & Entry::Published); // preserve
 					    addType();
-					    current->type += " singleton " ;
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->bodyLine  = yyLineNr;
+					    g_current->type += " singleton " ;
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->bodyLine  = g_yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else // TODO is addType right? just copy/pasted
 					  {
 					    addType();
-					    current->name = QCString(yytext).stripWhiteSpace();
+					    g_current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{BN}*((("disp")?"interface")|"valuetype"){BN}+ 	{ // M$/Corba/UNO IDL/Java/Slice interface
 					  lineCount();
-                                          if (insideIDL || insideJava || insideCS || insideD || insidePHP || insideSlice)
+                                          if (g_insideIDL || g_insideJava || g_insideCS || g_insideD || g_insidePHP || g_insideSlice)
 					  {
-  					    isTypedef=FALSE;
-					    current->section = Entry::CLASS_SEC;
-                        		    current->spec = Entry::Interface |
+  					    g_isTypedef=FALSE;
+					    g_current->section = Entry::CLASS_SEC;
+                        		    g_current->spec = Entry::Interface |
                                                 // preserve UNO IDL [optional], published, Slice local
-                                                (current->spec & (Entry::Optional|Entry::Published|Entry::Local));
+                                                (g_current->spec & (Entry::Optional|Entry::Published|Entry::Local));
 					    addType();
-					    current->type += " interface" ;
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->bodyLine  = yyLineNr;
+					    g_current->type += " interface" ;
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->bodyLine  = g_yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else
 					  {
 					    addType();
-					    current->name = QCString(yytext).stripWhiteSpace();
+					    g_current->name = QCString(yytext).stripWhiteSpace();
 					  }
   					}
 <FindMembers>{B}*"@implementation"{BN}+	{ // Objective-C class implementation
 					  lineCount();
-  					  isTypedef=FALSE;
-					  current->section = Entry::OBJCIMPL_SEC;
-					  language = current->lang = SrcLangExt_ObjC;
-					  insideObjC = TRUE;
-					  current->protection = protection = Public ;
+  					  g_isTypedef=FALSE;
+					  g_current->section = Entry::OBJCIMPL_SEC;
+					  g_language = g_current->lang = SrcLangExt_ObjC;
+					  g_insideObjC = TRUE;
+					  g_current->protection = g_protection = Public ;
 					  addType();
-					  current->type += " implementation" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " implementation" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  BEGIN( CompoundName );
   					}
 <FindMembers>{B}*"@interface"{BN}+	{ // Objective-C class interface, or Java attribute
 					  lineCount();
-  					  isTypedef=FALSE;
-					  current->section = Entry::CLASS_SEC;
-                                          current->spec = Entry::Interface;
-					  if (!insideJava)
+  					  g_isTypedef=FALSE;
+					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec = Entry::Interface;
+					  if (!g_insideJava)
 					  {
-					    language = current->lang = SrcLangExt_ObjC;
-					    insideObjC = TRUE;
+					    g_language = g_current->lang = SrcLangExt_ObjC;
+					    g_insideObjC = TRUE;
 					  }
-					  current->protection = protection = Public ;
+					  g_current->protection = g_protection = Public ;
 					  addType();
-					  current->type += " interface" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " interface" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  BEGIN( CompoundName );
   					}
 <FindMembers>{B}*"@protocol"{BN}+	{ // Objective-C protocol definition
 					  lineCount();
-  					  isTypedef=FALSE;
-					  current->section = Entry::CLASS_SEC;
-                                          current->spec = Entry::Protocol;
-					  language = current->lang = SrcLangExt_ObjC;
-					  insideObjC = TRUE;
-					  current->protection = protection = Public ;
+  					  g_isTypedef=FALSE;
+					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec = Entry::Protocol;
+					  g_language = g_current->lang = SrcLangExt_ObjC;
+					  g_insideObjC = TRUE;
+					  g_current->protection = g_protection = Public ;
 					  addType();
-					  current->type += " protocol" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " protocol" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  BEGIN( CompoundName );
   					}
 <FindMembers>{B}*"exception"{BN}+ 	{ // Corba IDL/Slice exception
-  					  isTypedef=FALSE;
-					  current->section = Entry::CLASS_SEC;
+  					  g_isTypedef=FALSE;
+					  g_current->section = Entry::CLASS_SEC;
                                           // preserve UNO IDL, Slice local
-					  current->spec    = Entry::Exception |
-					    (current->spec & Entry::Published) |
-					    (current->spec & Entry::Local);
+					  g_current->spec    = Entry::Exception |
+					    (g_current->spec & Entry::Published) |
+					    (g_current->spec & Entry::Local);
 					  addType();
-					  current->type += " exception" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " exception" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount();
 					  BEGIN( CompoundName );
   					}
@@ -1638,38 +1617,38 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers>{B}*{TYPEDEFPREFIX}"class{" |
 <FindMembers>{B}*{TYPEDEFPREFIX}"class"{BN}+ { 
                                           QCString decl = yytext;
-					  isTypedef=decl.find("typedef")!=-1;
+					  g_isTypedef=decl.find("typedef")!=-1;
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
-  					  current->section = Entry::CLASS_SEC;
+  					  g_current->section = Entry::CLASS_SEC;
 					  addType();
-                                          uint64 spec = current->spec;
-					  if (insidePHP && current->spec&Entry::Abstract)
+                                          uint64 spec = g_current->spec;
+					  if (g_insidePHP && g_current->spec&Entry::Abstract)
 					  {
 					    // convert Abstract to AbstractClass
-					    current->spec=(current->spec&~Entry::Abstract)|Entry::AbstractClass;
+					    g_current->spec=(g_current->spec&~Entry::Abstract)|Entry::AbstractClass;
 					  }
-                                          if (insideSlice && spec&Entry::Local)
+                                          if (g_insideSlice && spec&Entry::Local)
                                           {
-                                            current->spec|=Entry::Local;
+                                            g_current->spec|=Entry::Local;
                                           }
                                           if (isConst)
                                           {
-                                            current->type += " const";
+                                            g_current->type += " const";
                                           }
                                           else if (isVolatile)
                                           {
-                                            current->type += " volatile";
+                                            g_current->type += " volatile";
                                           }
-					  current->type += " class" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " class" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  if (yytext[0]=='@')
 					  {
-					    language = current->lang = SrcLangExt_ObjC;
-					    insideObjC = TRUE;
+					    g_language = g_current->lang = SrcLangExt_ObjC;
+					    g_insideObjC = TRUE;
 					  }
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
@@ -1677,145 +1656,145 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <FindMembers>{B}*"value class{" |         // C++/CLI extension
 <FindMembers>{B}*"value class"{BN}+     {
-  					  isTypedef=FALSE;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec = Entry::Value;
+  					  g_isTypedef=FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec = Entry::Value;
 					  addType();
-					  current->type += " value class" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " value class" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"ref class{" |          // C++/CLI extension
 <FindMembers>{B}*"ref class"{BN}+       {
-  					  isTypedef=FALSE;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec = Entry::Ref;
+  					  g_isTypedef=FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec = Entry::Ref;
 					  addType();
-					  current->type += " ref class" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " ref class" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"interface class{" |     // C++/CLI extension
 <FindMembers>{B}*"interface class"{BN}+ {
-  					  isTypedef=FALSE;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec = Entry::Interface;
+  					  g_isTypedef=FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec = Entry::Interface;
 					  addType();
-					  current->type += " interface class" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " interface class" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"coclass"{BN}+		{
-  					  if (insideIDL)
+  					  if (g_insideIDL)
 					  {
-					    isTypedef=FALSE;
-					    current->section = Entry::CLASS_SEC;
+					    g_isTypedef=FALSE;
+					    g_current->section = Entry::CLASS_SEC;
 					    addType();
-					    current->type += " coclass" ;
-					    current->fileName  = yyFileName;
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->bodyLine  = yyLineNr;
+					    g_current->type += " coclass" ;
+					    g_current->fileName  = g_yyFileName;
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->bodyLine  = g_yyLineNr;
 					    lineCount() ;
 					    BEGIN( CompoundName ) ;
 					  }
 					  else
 					  {
   					    addType();
-					    current->name = yytext;
-					    current->name = current->name.stripWhiteSpace();
+					    g_current->name = yytext;
+					    g_current->name = g_current->name.stripWhiteSpace();
 					    lineCount();
 					  }
   					}
 <FindMembers>{B}*{TYPEDEFPREFIX}"struct{" | 
 <FindMembers>{B}*{TYPEDEFPREFIX}"struct"/{BN}+ { 
                                           QCString decl = yytext;
-					  isTypedef=decl.find("typedef")!=-1;
+					  g_isTypedef=decl.find("typedef")!=-1;
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
-                                          uint64 spec = current->spec;
-  					  current->section = Entry::CLASS_SEC ;
+                                          uint64 spec = g_current->spec;
+  					  g_current->section = Entry::CLASS_SEC ;
                                           // preserve UNO IDL & Inline attributes, Slice local
-					  current->spec    = Entry::Struct |
-					    (current->spec & Entry::Published) |
-                                            (current->spec & Entry::Inline) |
-                                            (current->spec & Entry::Local); 
-					  // bug 582676: can be a struct nested in an interface so keep insideObjC state
-					  //current->objc    = insideObjC = FALSE;
+					  g_current->spec    = Entry::Struct |
+					    (g_current->spec & Entry::Published) |
+                                            (g_current->spec & Entry::Inline) |
+                                            (g_current->spec & Entry::Local); 
+					  // bug 582676: can be a struct nested in an interface so keep g_insideObjC state
+					  //g_current->objc    = g_insideObjC = FALSE;
 					  addType();
                                           if (isConst)
                                           {
-                                            current->type += " const";
+                                            g_current->type += " const";
                                           }
                                           else if (isVolatile)
                                           {
-                                            current->type += " volatile";
+                                            g_current->type += " volatile";
                                           }
-					  current->type += " struct" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " struct" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
 					}
 <FindMembers>{B}*"value struct{" |      // C++/CLI extension
 <FindMembers>{B}*"value struct"{BN}+     {
-  					  isTypedef=FALSE;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec    = Entry::Struct | Entry::Value;
+  					  g_isTypedef=FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec    = Entry::Struct | Entry::Value;
 					  addType();
-					  current->type += " value struct" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " value struct" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"ref struct{" |       // C++/CLI extension
 <FindMembers>{B}*"ref struct"{BN}+     {
-  					  isTypedef=FALSE;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec    = Entry::Struct | Entry::Ref;
+  					  g_isTypedef=FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec    = Entry::Struct | Entry::Ref;
 					  addType();
-					  current->type += " ref struct" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " ref struct" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"interface struct{" |     // C++/CLI extension
 <FindMembers>{B}*"interface struct"{BN}+ {
-  					  isTypedef=FALSE;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec    = Entry::Struct | Entry::Interface;
+  					  g_isTypedef=FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec    = Entry::Struct | Entry::Interface;
 					  addType();
-					  current->type += " interface struct";
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " interface struct";
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
@@ -1823,27 +1802,27 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers>{B}*{TYPEDEFPREFIX}"union{" |
 <FindMembers>{B}*{TYPEDEFPREFIX}"union"{BN}+ { 
                                           QCString decl=yytext;
-					  isTypedef=decl.find("typedef")!=-1;
+					  g_isTypedef=decl.find("typedef")!=-1;
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
-  					  current->section = Entry::CLASS_SEC;
-                                          current->spec    = Entry::Union;
-					  // bug 582676: can be a struct nested in an interface so keep insideObjC state
-					  //current->objc    = insideObjC = FALSE;
+  					  g_current->section = Entry::CLASS_SEC;
+                                          g_current->spec    = Entry::Union;
+					  // bug 582676: can be a struct nested in an interface so keep g_insideObjC state
+					  //g_current->objc    = g_insideObjC = FALSE;
 					  addType();
                                           if (isConst)
                                           {
-                                            current->type += " const";
+                                            g_current->type += " const";
                                           }
                                           else if (isVolatile)
                                           {
-                                            current->type += " volatile";
+                                            g_current->type += " volatile";
                                           }
-					  current->type += " union" ;
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->type += " union" ;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
@@ -1851,40 +1830,40 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?"{" |
 <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?{BN}+ { // for IDL: typedef [something] enum
                                           QCString text=yytext;
-					  isTypedef    = text.find("typedef")!=-1;
-                                          bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1 || insideCS;
-					  if (insideJava)
+					  g_isTypedef    = text.find("typedef")!=-1;
+                                          bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1 || g_insideCS;
+					  if (g_insideJava)
 					  {
-					    current->section = Entry::CLASS_SEC;
-					    current->spec    = Entry::Enum;
+					    g_current->section = Entry::CLASS_SEC;
+					    g_current->spec    = Entry::Enum;
 					  }
 					  else
 					  {
-  					    current->section = Entry::ENUM_SEC ;
+  					    g_current->section = Entry::ENUM_SEC ;
 					  }
 					  addType();
-					  current->type += " enum";
+					  g_current->type += " enum";
                                           if (isStrongEnum)
                                           {
-                                            current->spec |= Entry::Strong;
+                                            g_current->spec |= Entry::Strong;
                                           }
-					  current->fileName  = yyFileName;
-					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->bodyLine  = yyLineNr;
+					  g_current->fileName  = g_yyFileName;
+					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->bodyLine  = g_yyLineNr;
 					  lineCount() ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
 					}
 <Operator>"("{BN}*")"({BN}*"<"[^>]*">"){BN}*/"("  {  // A::operator()<int>(int arg)
   					  lineCount();
-					  current->name += "()";
+					  g_current->name += "()";
 					  BEGIN( FindMembers );
 					}
 <Operator>"("{BN}*")"{BN}*/"("		{
   					  lineCount();
-    					  current->name += yytext ;
-					  current->name = current->name.simplifyWhiteSpace();
+    					  g_current->name += yytext ;
+					  g_current->name = g_current->name.simplifyWhiteSpace();
 					  BEGIN( FindMembers ) ;
   					}
 <Operator>";"				{ // can occur when importing members
@@ -1893,24 +1872,24 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <Operator>[^(]				{ 
     					  lineCount();
-    					  current->name += *yytext ;
+    					  g_current->name += *yytext ;
 					}
 <Operator>"<>"				{ /* skip guided templ specifiers */ }
 <Operator>"("				{
-					  current->name = current->name.simplifyWhiteSpace();
+					  g_current->name = g_current->name.simplifyWhiteSpace();
 					  unput(*yytext);
 					  BEGIN( FindMembers ) ;
 					}
 <FindMembers>("template"|"generic")({BN}*)"<"/[>]?	{  // generic is a C++/CLI extension
   					  lineCount();
 					  ArgumentList al;
-					  //current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
-					  current->tArgLists.push_back(al);
-					  currentArgumentList = &current->tArgLists.back();
-					  templateStr="<";
-					  fullArgString = templateStr;
-					  copyArgString = &templateStr;
-					  currentArgumentContext = FindMembers;
+					  //g_current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
+					  g_current->tArgLists.push_back(al);
+					  g_currentArgumentList = &g_current->tArgLists.back();
+					  g_templateStr="<";
+					  g_fullArgString = g_templateStr;
+					  g_copyArgString = &g_templateStr;
+					  g_currentArgumentContext = FindMembers;
 					  BEGIN( ReadTempArgs );
   					}
 <FindMembers>"namespace"{BN}+/{ID}{BN}*"=" { // namespace alias
@@ -1918,21 +1897,21 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN( NSAliasName );
 					}
 <NSAliasName>{ID}			{
-  					  aliasName = yytext;
+  					  g_aliasName = yytext;
 					  BEGIN( NSAliasArg );
   					}
 <NSAliasArg>({ID}"::")*{ID}		{
-  					  //printf("Inserting namespace alias %s::%s->%s\n",current_root->name.data(),aliasName.data(),yytext);
-					  //if (current_root->name.isEmpty())
+  					  //printf("Inserting namespace alias %s::%s->%s\n",g_current_root->name.data(),g_aliasName.data(),yytext);
+					  //if (g_current_root->name.isEmpty())
 					  //{
                                           // TODO: namespace aliases are now treated as global entities
                                           // while they should be aware of the scope they are in
-                                            Doxygen::namespaceAliasDict.insert(aliasName,new QCString(yytext));
+                                            Doxygen::namespaceAliasDict.insert(g_aliasName,new QCString(yytext));
 					  //}
 					  //else
 					  //{
-                                          //  Doxygen::namespaceAliasDict.insert(current_root->name+"::"+aliasName,
-					  //	new QCString(current_root->name+"::"+yytext));
+                                          //  Doxygen::namespaceAliasDict.insert(g_current_root->name+"::"+g_aliasName,
+					  //	new QCString(g_current_root->name+"::"+yytext));
 					  //}
   					}
 <NSAliasArg>";"				{
@@ -1940,22 +1919,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <PHPUse>({ID}{BN}*"\\"{BN}*)*{ID}/{BN}+"as"  {
   					  lineCount();
-					  aliasName=yytext;
+					  g_aliasName=yytext;
 					  BEGIN(PHPUseAs);
 					}
 <PHPUse>({ID}{BN}*"\\"{BN}*)*{ID}	{
   					  lineCount();
-					  current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
-  					  //printf("PHP: adding use relation: %s\n",current->name.data());
-                                          current->fileName = yyFileName; 
+					  g_current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
+  					  //printf("PHP: adding use relation: %s\n",g_current->name.data());
+                                          g_current->fileName = g_yyFileName; 
                                           // add a using declaration
-  					  current->section=Entry::USINGDECL_SEC;
-					  current_root->copyToSubEntry(current);
+  					  g_current->section=Entry::USINGDECL_SEC;
+					  g_current_root->copyToSubEntry(g_current);
                                           // also add it as a using directive
-					  current->section=Entry::USINGDIR_SEC;
-					  current_root->moveToSubEntryAndRefresh(current);
+					  g_current->section=Entry::USINGDIR_SEC;
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
-					  aliasName.resize(0);
+					  g_aliasName.resize(0);
 					}
 <PHPUseAs>{BN}+"as"{BN}+		{
   					  lineCount();
@@ -1963,14 +1942,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <PHPUseAs>{PHPUSEKW}                    {
                                         }
 <PHPUseAs>{ID}				{
-  					  //printf("PHP: adding use as relation: %s->%s\n",yytext,aliasName.data());
-                                          if (!aliasName.isEmpty())
+  					  //printf("PHP: adding use as relation: %s->%s\n",yytext,g_aliasName.data());
+                                          if (!g_aliasName.isEmpty())
                                           {
                                             Doxygen::namespaceAliasDict.insert(yytext,
 					         new QCString(removeRedundantWhiteSpace(
-					  	   substitute(aliasName,"\\","::"))));
+					  	   substitute(g_aliasName,"\\","::"))));
                                           }
-					  aliasName.resize(0);
+					  g_aliasName.resize(0);
   					}
 <PHPUse,PHPUseAs>[,;]			{
 					  if (*yytext==',')
@@ -1985,59 +1964,59 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <JavaImport>({ID}{BN}*"."{BN}*)+"*"	{ // package import => add as a using directive
   					  lineCount();
   					  QCString scope=yytext;
-					  current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
-                                          current->fileName = yyFileName; 
-  					  current->section=Entry::USINGDIR_SEC;
-					  current_root->moveToSubEntryAndRefresh(current);
+					  g_current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
+                                          g_current->fileName = g_yyFileName; 
+  					  g_current->section=Entry::USINGDIR_SEC;
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
 					  BEGIN(Using);
   					}
 <JavaImport>({ID}{BN}*"."{BN}*)+{ID}	{ // class import => add as a using declaration
                                           lineCount();
   					  QCString scope=yytext;
-					  current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
-					  current->fileName = yyFileName; 
-					  if (insideD) 
+					  g_current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
+					  g_current->fileName = g_yyFileName; 
+					  if (g_insideD) 
 					  {
-					    current->section=Entry::USINGDIR_SEC;
+					    g_current->section=Entry::USINGDIR_SEC;
 					  }
 					  else
 					  {
-					    //printf("import name = %s -> %s\n",yytext,current->name.data());
-					    current->section=Entry::USINGDECL_SEC;
+					    //printf("import name = %s -> %s\n",yytext,g_current->name.data());
+					    g_current->section=Entry::USINGDECL_SEC;
 					  }
-                                          previous = current.get();
-					  current_root->moveToSubEntryAndRefresh(current);
+                                          g_previous = g_current.get();
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
 					  BEGIN(Using);
   					}
 <FindMembers>"using"{BN}+		{ 
-					  current->startLine=yyLineNr; 
-					  current->startColumn = yyColNr;
+					  g_current->startLine=g_yyLineNr; 
+					  g_current->startColumn = g_yyColNr;
                                           lineCount(); 
                                           BEGIN(Using); 
                                         }
 <Using>"namespace"{BN}+			{ lineCount(); BEGIN(UsingDirective); }
 <Using>({ID}{BN}*("::"|"."){BN}*)*({ID}|{OPERATOR}) {
                                           lineCount();
-  					  current->name=yytext;
-                                          current->fileName = yyFileName; 
-  					  current->section=Entry::USINGDECL_SEC;
-                                          current->startLine = yyLineNr;
-                                          previous = current.get();
-					  current_root->moveToSubEntryAndRefresh(current);
+  					  g_current->name=yytext;
+                                          g_current->fileName = g_yyFileName; 
+  					  g_current->section=Entry::USINGDECL_SEC;
+                                          g_current->startLine = g_yyLineNr;
+                                          g_previous = g_current.get();
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
-					  if (insideCS) /* Hack: in C# a using declaration and 
+					  if (g_insideCS) /* Hack: in C# a using declaration and 
 							   directive have the same syntax, so we
 							   also add it as a using directive here
 							 */
 					  {
-					    current->name=yytext;
-					    current->fileName = yyFileName; 
-					    current->startLine = yyLineNr;
-					    current->startColumn = yyColNr;
-					    current->section=Entry::USINGDIR_SEC;
-					    current_root->moveToSubEntryAndRefresh(current);
+					    g_current->name=yytext;
+					    g_current->fileName = g_yyFileName; 
+					    g_current->startLine = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    g_current->section=Entry::USINGDIR_SEC;
+					    g_current_root->moveToSubEntryAndRefresh(g_current);
 					    initEntry();
 					  }
 					  BEGIN(Using);
@@ -2046,26 +2025,26 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(UsingAlias);
                                         }
 <UsingAlias>";"                         { 
-                                          previous->section=Entry::VARIABLE_SEC;
-                                          previous->type = "typedef "+previous->args;
-					  previous->type=previous->type.simplifyWhiteSpace();
-                                          previous->args.resize(0);
-					  previous->name=previous->name.stripWhiteSpace();
-					  previous->bodyLine = yyLineNr;
-                                          previous->spec |= Entry::Alias;
+                                          g_previous->section=Entry::VARIABLE_SEC;
+                                          g_previous->type = "typedef "+g_previous->args;
+					  g_previous->type=g_previous->type.simplifyWhiteSpace();
+                                          g_previous->args.resize(0);
+					  g_previous->name=g_previous->name.stripWhiteSpace();
+					  g_previous->bodyLine = g_yyLineNr;
+                                          g_previous->spec |= Entry::Alias;
                                           BEGIN(FindMembers); 
                                         }
 <UsingAlias>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  docBlockContext   = UsingAliasEnd;
-					  docBlockInBody    = FALSE;
-					  docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  g_docBlockContext   = UsingAliasEnd;
+					  g_docBlockInBody    = FALSE;
+					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
   					  lineCount();
 
-					  docBlockTerm = ';';
+					  g_docBlockTerm = ';';
 					  if (yytext[yyleng-3]=='/')
 					  {
 					    startCommentBlock(TRUE);
@@ -2078,27 +2057,27 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <UsingAlias>">>"                        {
-                                          previous->args+="> >"; // see bug769552
+                                          g_previous->args+="> >"; // see bug769552
                                         }
 <UsingAlias>.                           {
-                                          previous->args+=yytext;
+                                          g_previous->args+=yytext;
                                         }
 <UsingAlias>\n                          {
-                                          previous->args+=yytext;
+                                          g_previous->args+=yytext;
                                           lineCount();
                                         }
 <UsingAliasEnd>";"                      {
-                                          previous->doc   = current->doc;
-                                          previous->brief = current->brief;
-                                          current->doc.resize(0);
-                                          current->brief.resize(0);
+                                          g_previous->doc   = g_current->doc;
+                                          g_previous->brief = g_current->brief;
+                                          g_current->doc.resize(0);
+                                          g_current->brief.resize(0);
                                           unput(';');
                                           BEGIN(UsingAlias);
                                         }
-<UsingDirective>{SCOPENAME}		{ current->name=removeRedundantWhiteSpace(yytext);
-                                          current->fileName = yyFileName; 
-  					  current->section=Entry::USINGDIR_SEC;
-					  current_root->moveToSubEntryAndRefresh(current);
+<UsingDirective>{SCOPENAME}		{ g_current->name=removeRedundantWhiteSpace(yytext);
+                                          g_current->fileName = g_yyFileName; 
+  					  g_current->section=Entry::USINGDIR_SEC;
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
 					  BEGIN(Using);
   					}
@@ -2106,59 +2085,59 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembers>{SCOPENAME}{BN}*"<>"	{ // guided template decl
 					  QCString n=yytext;
 					  addType();
-					  current->name=n.left(n.length()-2);
+					  g_current->name=n.left(n.length()-2);
 					}
 <FindMembers>{SCOPENAME}{BN}*/"<"	{ // Note: this could be a return type!
-                                          roundCount=0;
-  					  sharpCount=0;
+                                          g_roundCount=0;
+  					  g_sharpCount=0;
 					  lineCount();
 					  addType();
-  					  current->name=yytext;
-					  current->name=current->name.stripWhiteSpace();
-					  //current->scopeSpec.resize(0);
-					  // currentTemplateSpec = &current->scopeSpec;
-					  if (nameIsOperator(current->name))
+  					  g_current->name=yytext;
+					  g_current->name=g_current->name.stripWhiteSpace();
+					  //g_current->scopeSpec.resize(0);
+					  // g_currentTemplateSpec = &g_current->scopeSpec;
+					  if (nameIsOperator(g_current->name))
 					    BEGIN( Operator );
 					  else
 					    BEGIN( EndTemplate );
 					}
 <FindMemberName>{SCOPENAME}{BN}*/"<"	{
-  					  sharpCount=0;
-					  roundCount=0;
+  					  g_sharpCount=0;
+					  g_roundCount=0;
 					  lineCount();
-  					  current->name+=((QCString)yytext).stripWhiteSpace();
-					  //current->memberSpec.resize(0);
-					  // currentTemplateSpec = &current->memberSpec;
-					  if (nameIsOperator(current->name))
+  					  g_current->name+=((QCString)yytext).stripWhiteSpace();
+					  //g_current->memberSpec.resize(0);
+					  // g_currentTemplateSpec = &g_current->memberSpec;
+					  if (nameIsOperator(g_current->name))
 					    BEGIN( Operator );
 					  else
 					    BEGIN( EndTemplate );
   					}
 <EndTemplate>"<<<"	                {
-  					  if (!insidePHP) 
+  					  if (!g_insidePHP) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            lastHereDocContext = YY_START;
+                                            g_lastHereDocContext = YY_START;
 					    BEGIN(HereDoc);
 					  }
   					}
 <ClassTemplSpec,EndTemplate>"<<"	{
-  					  current->name+=yytext;
-  					  // *currentTemplateSpec+=yytext; 
+  					  g_current->name+=yytext;
+  					  // *g_currentTemplateSpec+=yytext; 
   					}
 <EndTemplate>"<"			{ 
-                                          if (roundCount==0)
+                                          if (g_roundCount==0)
                                           {
-  					    // *currentTemplateSpec+='<'; 
-					    sharpCount++; 
+  					    // *g_currentTemplateSpec+='<'; 
+					    g_sharpCount++; 
                                           }
-  					  current->name+=yytext;
+  					  g_current->name+=yytext;
 					}
 <ClassTemplSpec,EndTemplate>">>"	{
-  					  if (insideJava || insideCS || insideCli || roundCount==0)
+  					  if (g_insideJava || g_insideCS || g_insideCli || g_roundCount==0)
 					  {
 					    unput('>');
 					    unput(' ');
@@ -2166,65 +2145,65 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-  					    current->name+=yytext;
+  					    g_current->name+=yytext;
 					  }
-  					  // *currentTemplateSpec+=yytext; 
+  					  // *g_currentTemplateSpec+=yytext; 
   					}
 <EndTemplate>">"			{
-  					  current->name+='>';
-					  // *currentTemplateSpec+='>';
-					  if (roundCount==0 && --sharpCount<=0)
+  					  g_current->name+='>';
+					  // *g_currentTemplateSpec+='>';
+					  if (g_roundCount==0 && --g_sharpCount<=0)
 					  {  
-					    //printf("Found %s\n",current->name.data());
+					    //printf("Found %s\n",g_current->name.data());
 					    BEGIN(FindMembers);
 					  }
 					}
 <EndTemplate>">"{BN}*"("		{ 
   					  lineCount();
-  					  current->name+='>';
-					  // *currentTemplateSpec+='>';
-					  if (roundCount==0 && --sharpCount<=0)
-					  {
-					    current->bodyLine = yyLineNr;
-					    current->args = "(";
-					    currentArgumentContext = FuncQual;
-					    fullArgString = current->args.copy();
-					    copyArgString = &current->args;
-					    //printf("Found %s\n",current->name.data());
+  					  g_current->name+='>';
+					  // *g_currentTemplateSpec+='>';
+					  if (g_roundCount==0 && --g_sharpCount<=0)
+					  {
+					    g_current->bodyLine = g_yyLineNr;
+					    g_current->args = "(";
+					    g_currentArgumentContext = FuncQual;
+					    g_fullArgString = g_current->args.copy();
+					    g_copyArgString = &g_current->args;
+					    //printf("Found %s\n",g_current->name.data());
 					    BEGIN( ReadFuncArgType ) ;
 					  }
 					}
 <EndTemplate>">"{BN}*/"("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+ { // function pointer returning a template instance
   					  lineCount();
-  					  current->name+='>';
-                                          if (roundCount==0)
+  					  g_current->name+='>';
+                                          if (g_roundCount==0)
                                           {
 					    BEGIN(FindMembers);
                                           }
   					}
 <EndTemplate>">"{BN}*/"::"		{
   					  lineCount();
-  					  current->name+='>';
-  					  // *currentTemplateSpec+='>';
-					  if (roundCount==0 && --sharpCount<=0)
+  					  g_current->name+='>';
+  					  // *g_currentTemplateSpec+='>';
+					  if (g_roundCount==0 && --g_sharpCount<=0)
 					  {
 					    BEGIN(FindMemberName);
 					  }
   					}
-<ClassTemplSpec,EndTemplate>"("         { current->name+=*yytext;
-                                          roundCount++; 
+<ClassTemplSpec,EndTemplate>"("         { g_current->name+=*yytext;
+                                          g_roundCount++; 
                                         }
-<ClassTemplSpec,EndTemplate>")"         { current->name+=*yytext;
-                                          if (roundCount>0) roundCount--; 
+<ClassTemplSpec,EndTemplate>")"         { g_current->name+=*yytext;
+                                          if (g_roundCount>0) g_roundCount--; 
                                         }
 <EndTemplate>.				{ 
-  					  current->name+=*yytext;
-  					  // *currentTemplateSpec+=*yytext; 
+  					  g_current->name+=*yytext;
+  					  // *g_currentTemplateSpec+=*yytext; 
 					}
 <FindMembers>"define"{BN}*"("{BN}*["']	{
-					  if (insidePHP)
+					  if (g_insidePHP)
 					  {
-					    current->bodyLine = yyLineNr;
+					    g_current->bodyLine = g_yyLineNr;
 					    BEGIN( DefinePHP );
 					  }
 					  else
@@ -2232,12 +2211,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <CopyHereDoc>{ID}                       { // PHP heredoc
   					  g_delimiter = yytext;
-                                          *pCopyHereDocGString += yytext;
+                                          *g_pCopyHereDocGString += yytext;
 					  BEGIN(CopyHereDocEnd);
                                         }
 <CopyHereDoc>"'"{ID}/"'"		{ // PHP nowdoc
   					  g_delimiter = &yytext[1];
-                                          *pCopyHereDocGString += yytext;
+                                          *g_pCopyHereDocGString += yytext;
 					  BEGIN(CopyHereDocEnd);
                                         }
 <HereDoc>{ID}				{ // PHP heredoc
@@ -2251,32 +2230,32 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <HereDocEnd>^{ID}			{ // id at start of the line could mark the end of the block
   					  if (g_delimiter==yytext) // it is the end marker
 					  {
-  					    BEGIN(lastHereDocContext);
+  					    BEGIN(g_lastHereDocContext);
 					  }
   					}
 <HereDocEnd>.				{ }
 <CopyHereDocEnd>^{ID}			{ // id at start of the line could mark the end of the block
-                                          *pCopyHereDocGString += yytext;
+                                          *g_pCopyHereDocGString += yytext;
   					  if (g_delimiter==yytext) // it is the end marker
 					  {
-  					    BEGIN(lastHereDocContext);
+  					    BEGIN(g_lastHereDocContext);
 					  }
   					}
 <CopyHereDocEnd>\n			{ 
-                                          *pCopyHereDocGString += yytext;
+                                          *g_pCopyHereDocGString += yytext;
                                         }
 <CopyHereDocEnd>{ID}			{ 
-                                          *pCopyHereDocGString += yytext;
+                                          *g_pCopyHereDocGString += yytext;
                                         }
 <CopyHereDocEnd>.			{ 
-                                          *pCopyHereDocGString += yytext;
+                                          *g_pCopyHereDocGString += yytext;
                                         }
 <FindMembers>"Q_OBJECT"			{ // Qt object macro
   					}
 <FindMembers>"Q_PROPERTY"		{ // Qt property declaration
-					  current->protection = Public ; // see bug734245 & bug735462
-  					  current->mtype = mtype = Property;
-					  current->type.resize(0);
+					  g_current->protection = Public ; // see bug734245 & bug735462
+  					  g_current->mtype = g_mtype = Property;
+					  g_current->type.resize(0);
   					  BEGIN(QtPropType);
   					}
 <QtPropType>"("				{ // start of property arguments
@@ -2286,25 +2265,25 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(FindMembers);
   					}
 <QtPropType>"const"|"volatile"|"unsigned"|"signed"|"long"|"short" {
-  				          current->type+=yytext;
+  				          g_current->type+=yytext;
   					}
 <QtPropType>{B}+			{
-  				          current->type+=yytext;
+  				          g_current->type+=yytext;
   					}
 <QtPropType>({TSCOPE}"::")*{TSCOPE}	{
-  					  current->type+=yytext;
+  					  g_current->type+=yytext;
                                           BEGIN(QtPropName);
   					}
 <QtPropName>{ID}			{
-  					  current->name=yytext;
+  					  g_current->name=yytext;
   					  BEGIN(QtPropAttr);
   					}
 <QtPropAttr>"READ"			{
-  					  current->spec |= Entry::Readable;
+  					  g_current->spec |= Entry::Readable;
 					  BEGIN(QtPropRead);
   					}
 <QtPropAttr>"WRITE"			{
-  					  current->spec |= Entry::Writable;
+  					  g_current->spec |= Entry::Writable;
 					  BEGIN(QtPropWrite);
   					}
 <QtPropAttr>"RESET"{B}+{ID}		{ // reset method => not supported yet
@@ -2314,96 +2293,96 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <QtPropAttr>"DESIGNABLE"{B}+{ID}	{ // designable property => not supported yet
   					}
 <QtPropRead>{ID}			{
-  					  current->read = yytext;
+  					  g_current->read = yytext;
   					  BEGIN(QtPropAttr);
   					}
 <QtPropWrite>{ID}			{
-  					  current->write = yytext;
+  					  g_current->write = yytext;
 					  BEGIN(QtPropAttr);
   					}
 <FindMembers>"friend"{BN}+("class"|"union"|"struct"){BN}+ {
-  					  current->name=yytext;
+  					  g_current->name=yytext;
 				          BEGIN(FindMembers);
 			 	        }
 <FindMembers,FindMemberName>{SCOPENAME}	{
-                                          if (insideCpp || insideObjC) 
+                                          if (g_insideCpp || g_insideObjC) 
                                           {
-                                            current->id = ClangParser::instance()->lookup(yyLineNr,yytext);
+                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
                                           }
-					  yyBegColNr=yyColNr;
-					  yyBegLineNr=yyLineNr;
+					  g_yyBegColNr=g_yyColNr;
+					  g_yyBegLineNr=g_yyLineNr;
 					  lineCount();
-                                          if (insideIDL && yyleng==9 && qstrcmp(yytext,"cpp_quote")==0)
+                                          if (g_insideIDL && yyleng==9 && qstrcmp(yytext,"cpp_quote")==0)
 					  {
 					    BEGIN(CppQuote);
 					  }
-					  else if ((insideIDL || insideJava || insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
+					  else if ((g_insideIDL || g_insideJava || g_insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
 					  {
-					    if (insideIDL)
+					    if (g_insideIDL)
 					      BEGIN(NextSemi);
-					    else // insideJava or insideD
+					    else // g_insideJava or g_insideD
 					      BEGIN(JavaImport);
 					  }
-					  else if (insidePHP && qstrcmp(yytext,"use")==0)
+					  else if (g_insidePHP && qstrcmp(yytext,"use")==0)
 					  {
 					    BEGIN(PHPUse);
 					  }
-					  else if (insideJava && qstrcmp(yytext,"package")==0)
+					  else if (g_insideJava && qstrcmp(yytext,"package")==0)
 					  {
   					    lineCount();
 					    BEGIN(PackageName);
 					  }
-					  else if (insideIDL && qstrcmp(yytext,"case")==0)
+					  else if (g_insideIDL && qstrcmp(yytext,"case")==0)
 					  {
 					    BEGIN(IDLUnionCase);
 					  }
-					  else if (insideTryBlock && qstrcmp(yytext,"catch")==0)
+					  else if (g_insideTryBlock && qstrcmp(yytext,"catch")==0)
 					  {
-					    insideTryBlock=FALSE;
+					    g_insideTryBlock=FALSE;
 					    BEGIN(TryFunctionBlock);
 					  }
-                                          else if (insideCpp && qstrcmp(yytext,"alignas")==0)
+                                          else if (g_insideCpp && qstrcmp(yytext,"alignas")==0)
                                           {
-                                            lastAlignAsContext = YY_START;
+                                            g_lastAlignAsContext = YY_START;
                                             BEGIN(AlignAs);
                                           }
-					  else if (insideJS && qstrcmp(yytext,"var")==0)
+					  else if (g_insideJS && qstrcmp(yytext,"var")==0)
 					  { // javascript variable
-					    current->type="var";
+					    g_current->type="var";
 					  }
-					  else if (insideJS && qstrcmp(yytext,"function")==0)
+					  else if (g_insideJS && qstrcmp(yytext,"function")==0)
 					  { // javascript function
-					    current->type="function";
+					    g_current->type="function";
 					  }
-					  else if (insideCS && qstrcmp(yytext,"this")==0)
+					  else if (g_insideCS && qstrcmp(yytext,"this")==0)
 					  {
 					    // C# indexer
 					    addType();
-					    current->name="this";
+					    g_current->name="this";
 					    BEGIN(CSIndexer);
 					  }
-                                          else if (insideCpp && qstrcmp(yytext,"static_assert")==0)
+                                          else if (g_insideCpp && qstrcmp(yytext,"static_assert")==0)
                                           {
                                             // C++11 static_assert
                                             BEGIN(StaticAssert);
                                           }
-                                          else if (insideCpp && qstrcmp(yytext,"decltype")==0)
+                                          else if (g_insideCpp && qstrcmp(yytext,"decltype")==0)
                                           {
                                             // C++11 decltype(x)
-					    current->type+=yytext;
+					    g_current->type+=yytext;
                                             BEGIN(DeclType);
                                           }
-                                          else if (insideSlice && qstrcmp(yytext,"optional")==0)
+                                          else if (g_insideSlice && qstrcmp(yytext,"optional")==0)
                                           {
-                                            if (current->type.isEmpty())
+                                            if (g_current->type.isEmpty())
                                             {
-                                              current->type = "optional";
+                                              g_current->type = "optional";
                                             }
                                             else
                                             {
-                                              current->type += " optional";
+                                              g_current->type += " optional";
                                             }
-                                            lastModifierContext = YY_START;
+                                            g_lastModifierContext = YY_START;
                                             BEGIN(SliceOptional);
                                           }
 					  else
@@ -2412,65 +2391,65 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      addType();
 					    }
-					    bool javaLike = insideJava || insideCS || insideD || insidePHP || insideJS;
+					    bool javaLike = g_insideJava || g_insideCS || g_insideD || g_insidePHP || g_insideJS;
 					    if (javaLike && qstrcmp(yytext,"public")==0)
 					    {
-					      current->protection = Public;
+					      g_current->protection = Public;
 					    }
 					    else if (javaLike && qstrcmp(yytext,"protected")==0)
 					    {
-					      current->protection = Protected;
+					      g_current->protection = Protected;
 					    }
-					    else if ((insideCS || insideD || insidePHP || insideJS) && qstrcmp(yytext,"internal")==0)
+					    else if ((g_insideCS || g_insideD || g_insidePHP || g_insideJS) && qstrcmp(yytext,"internal")==0)
 					    {
-					      current->protection = Package;
+					      g_current->protection = Package;
 					    }
 					    else if (javaLike && qstrcmp(yytext,"private")==0)
 					    {
-					      current->protection = Private;
+					      g_current->protection = Private;
 					    }
 					    else if (javaLike && qstrcmp(yytext,"static")==0)
 					    {
 					      if (YY_START==FindMembers)
-					        current->name  = yytext;
+					        g_current->name  = yytext;
 					      else
-						current->name += yytext;
-			 		      current->stat = TRUE;
+						g_current->name += yytext;
+			 		      g_current->stat = TRUE;
 					    }
 					    else
 					    {
 					      if (YY_START==FindMembers)
-					        current->name  = yytext;
+					        g_current->name  = yytext;
 					      else
-						current->name += yytext;
-					      if (current->name.left(7)=="static ")
+						g_current->name += yytext;
+					      if (g_current->name.left(7)=="static ")
 					      {
-						current->stat = TRUE;
-						current->name= current->name.mid(7);
+						g_current->stat = TRUE;
+						g_current->name= g_current->name.mid(7);
 					      }
-					      else if (current->name.left(7)=="inline ")
+					      else if (g_current->name.left(7)=="inline ")
 					      {
-						if (current->type.isEmpty())
+						if (g_current->type.isEmpty())
 						{
-						  current->type="inline";
+						  g_current->type="inline";
 						}
 						else
 						{
-						  current->type+="inline ";
+						  g_current->type+="inline ";
 						}
-						current->name= current->name.mid(7);
+						g_current->name= g_current->name.mid(7);
 					      }
-					      else if (current->name.left(6)=="const ")
+					      else if (g_current->name.left(6)=="const ")
 					      {
-						if (current->type.isEmpty())
+						if (g_current->type.isEmpty())
 						{
-						  current->type="const";
+						  g_current->type="const";
 						}
 						else
 						{
-						  current->type+="const ";
+						  g_current->type+="const ";
 						}
-						current->name=current->name.mid(6);
+						g_current->name=g_current->name.mid(6);
 					      }
 					    }
 					    QCString tmp=yytext;
@@ -2480,14 +2459,14 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             }
 					    else
                                             {
-					      externC=FALSE; // see bug759247
+					      g_externC=FALSE; // see bug759247
 		 			      BEGIN(FindMembers);
                                             }
 					  }
 					}
 <StaticAssert>"("                       {
-					  lastSkipRoundContext = FindMembers;
-					  roundCount=0;
+					  g_lastSkipRoundContext = FindMembers;
+					  g_roundCount=0;
                                           BEGIN(SkipRound);
                                         }
 <StaticAssert>{BN}+                     { lineCount(); }
@@ -2496,10 +2475,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(FindMembers);
                                         }
 <DeclType>"("                           {
-					  current->type+=yytext;
-  					  lastRoundContext=FindMembers;
-  					  pCopyRoundString=&current->type;
-					  roundCount=0;
+					  g_current->type+=yytext;
+  					  g_lastRoundContext=FindMembers;
+  					  g_pCopyRoundString=&g_current->type;
+					  g_roundCount=0;
                                           BEGIN(CopyRound);
                                         }
 <DeclType>{BN}+                         { lineCount(); }
@@ -2508,22 +2487,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(FindMembers);
                                         }
 <CSIndexer>"["[^\n\]]*"]"		{
-					  current->name+=removeRedundantWhiteSpace(yytext);
+					  g_current->name+=removeRedundantWhiteSpace(yytext);
   					  BEGIN(FindMembers);
   					}
 <FindMembers>[0-9]{ID}			{ // some number where we did not expect one
   					}
 <FindMembers>"."			{
-  					  if (insideJava || insideCS || insideD)
+  					  if (g_insideJava || g_insideCS || g_insideD)
 					  {
-					    current->name+=".";
+					    g_current->name+=".";
 					  }
   					}
 <FindMembers>"::"			{
-					  current->name+=yytext;
+					  g_current->name+=yytext;
   					}
 <CppQuote>"("{B}*"\""			{
-  					  insideCppQuote=TRUE;
+  					  g_insideCppQuote=TRUE;
   					  BEGIN(FindMembers);
   					}
 <IDLUnionCase>"::"
@@ -2532,8 +2511,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <IDLUnionCase>.
 <TryFunctionBlock>\n			{ lineCount(); }
 <TryFunctionBlock>"{"			{ 
-					  curlyCount=0;
-					  lastCurlyContext = TryFunctionBlockEnd ;
+					  g_curlyCount=0;
+					  g_lastCurlyContext = TryFunctionBlockEnd ;
   					  BEGIN( SkipCurly );
 					}
 <TryFunctionBlock>.
@@ -2546,123 +2525,123 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN( FindMembers );
 					}
 <EndCppQuote>")"			{
-  					  insideCppQuote=FALSE;
+  					  g_insideCppQuote=FALSE;
 					  BEGIN(FindMembers);
   					}
-<FindMembers,FindFields>{B}*"#"		{ if (insidePHP)
+<FindMembers,FindFields>{B}*"#"		{ if (g_insidePHP)
 					    REJECT;
-					  lastCPPContext = YY_START;
+					  g_lastCPPContext = YY_START;
 					  BEGIN( SkipCPP ) ;
 					}
 <FindMembers,FindFields>{B}*"#"{B}*("cmake")?"define"	{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					    REJECT;
-  					  current->bodyLine = yyLineNr;
-                                          lastDefineContext = YY_START;
+  					  g_current->bodyLine = g_yyLineNr;
+                                          g_lastDefineContext = YY_START;
   					  BEGIN( Define );
   					}
 <FindMembers,ReadBody,ReadNSBody,ReadBodyIntf,SkipCurly,SkipCurlyCpp>{B}*"#"{B}+[0-9]+{B}+/"\""	{ /* line control directive */
-                                          yyLineNr = atoi(&yytext[1]);
-					  //printf("setting line number to %d\n",yyLineNr);
-					  lastPreLineCtrlContext = YY_START;
+                                          g_yyLineNr = atoi(&yytext[1]);
+					  //printf("setting line number to %d\n",g_yyLineNr);
+					  g_lastPreLineCtrlContext = YY_START;
 					  if (YY_START==ReadBody || 
 					      YY_START==ReadNSBody ||
 					      YY_START==ReadBodyIntf)
 					  {
-  					    current->program+=yytext;
+  					    g_current->program+=yytext;
 					  }
   					  BEGIN( PreLineCtrl );
   					}
 <PreLineCtrl>"\""[^\n\"]*"\""		{
-				          yyFileName = stripQuotes(yytext);
-					  if (lastPreLineCtrlContext==ReadBody || 
-					      lastPreLineCtrlContext==ReadNSBody ||
-					      lastPreLineCtrlContext==ReadBodyIntf)
+				          g_yyFileName = stripQuotes(yytext);
+					  if (g_lastPreLineCtrlContext==ReadBody || 
+					      g_lastPreLineCtrlContext==ReadNSBody ||
+					      g_lastPreLineCtrlContext==ReadBodyIntf)
 					  {
-					    current->program+=yytext;
+					    g_current->program+=yytext;
 					  }
   					}
 <PreLineCtrl>.				{
-					  if (lastPreLineCtrlContext==ReadBody || 
-					      lastPreLineCtrlContext==ReadNSBody ||
-					      lastPreLineCtrlContext==ReadBodyIntf)
+					  if (g_lastPreLineCtrlContext==ReadBody || 
+					      g_lastPreLineCtrlContext==ReadNSBody ||
+					      g_lastPreLineCtrlContext==ReadBodyIntf)
 					  {
-  					    current->program+=yytext;
+  					    g_current->program+=yytext;
 					  }
                                         }
 <PreLineCtrl>\n				{
-					  if (lastPreLineCtrlContext==ReadBody || 
-					      lastPreLineCtrlContext==ReadNSBody ||
-					      lastPreLineCtrlContext==ReadBodyIntf)
+					  if (g_lastPreLineCtrlContext==ReadBody || 
+					      g_lastPreLineCtrlContext==ReadNSBody ||
+					      g_lastPreLineCtrlContext==ReadBodyIntf)
 					  {
-  					    current->program+=yytext;
+  					    g_current->program+=yytext;
 					  }
                                           lineCount();
-  					  BEGIN( lastPreLineCtrlContext );
+  					  BEGIN( g_lastPreLineCtrlContext );
   					}
 <SkipCPP>.
 <SkipCPP>\\[\r]*"\n"[\r]*		{ lineCount(); }
 <SkipCPP>[\r]*\n[\r]*			{ lineCount();
-					  BEGIN( lastCPPContext) ;
+					  BEGIN( g_lastCPPContext) ;
 					}
 <Define>{ID}{B}*"("			{
-  					  current->name = yytext;
-					  current->name = current->name.left(current->name.length()-1).stripWhiteSpace();
-					  current->args = "(";
-  					  current->bodyLine = yyLineNr;
-					  currentArgumentContext = DefineEnd;
-					  fullArgString=current->args.copy();
-					  copyArgString=&current->args;
+  					  g_current->name = yytext;
+					  g_current->name = g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
+					  g_current->args = "(";
+  					  g_current->bodyLine = g_yyLineNr;
+					  g_currentArgumentContext = DefineEnd;
+					  g_fullArgString=g_current->args.copy();
+					  g_copyArgString=&g_current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
  /*
 <DefineArg>")"				{
   					  //printf("Define with args\n");
-  					  current->args += ')';
+  					  g_current->args += ')';
   					  BEGIN( DefineEnd );
   					}
 <DefineArg>.				{
-  					  current->args += *yytext;
+  					  g_current->args += *yytext;
   					}
   */
 <Define>{ID}				{
   					  //printf("Define '%s' without args\n",yytext);
-                                          if (insideCpp || insideObjC) 
+                                          if (g_insideCpp || g_insideObjC) 
                                           {
-                                            current->id = ClangParser::instance()->lookup(yyLineNr,yytext);
+                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
                                           }
-  					  current->bodyLine = yyLineNr;
-  					  current->name = yytext;
+  					  g_current->bodyLine = g_yyLineNr;
+  					  g_current->name = yytext;
 					  BEGIN(DefineEnd);
   					}
 <DefineEnd>\n				{
-  					  //printf("End define: doc=%s docFile=%s docLine=%d\n",current->doc.data(),current->docFile.data(),current->docLine);
+  					  //printf("End define: doc=%s docFile=%s docLine=%d\n",g_current->doc.data(),g_current->docFile.data(),g_current->docLine);
                                           lineCount();
-					  current->fileName   = yyFileName;
-					  current->startLine  = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->type.resize(0);
-  					  current->args       = current->args.simplifyWhiteSpace();
-  					  current->name       = current->name.stripWhiteSpace();
-					  current->section    = Entry::DEFINE_SEC;
-					  current_root->moveToSubEntryAndRefresh(current);
+					  g_current->fileName   = g_yyFileName;
+					  g_current->startLine  = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->type.resize(0);
+  					  g_current->args       = g_current->args.simplifyWhiteSpace();
+  					  g_current->name       = g_current->name.stripWhiteSpace();
+					  g_current->section    = Entry::DEFINE_SEC;
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
-					  BEGIN(lastDefineContext);
+					  BEGIN(g_lastDefineContext);
   					}
 <DefinePHPEnd>";"			{
   					  //printf("End define\n");
-					  current->fileName   = yyFileName;
-					  current->startLine  = yyLineNr;
-					  current->startColumn = yyColNr;
-					  current->type.resize(0);
-                                          current->type       = "const";
-                                          QCString init = current->initializer.data();
+					  g_current->fileName   = g_yyFileName;
+					  g_current->startLine  = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->type.resize(0);
+                                          g_current->type       = "const";
+                                          QCString init = g_current->initializer.data();
   					  init = init.simplifyWhiteSpace();
   					  init = init.left(init.length()-1);
-                                          current->initializer = init;
-  					  current->name       = current->name.stripWhiteSpace();
-					  current->section    = Entry::VARIABLE_SEC; 
-					  current_root->moveToSubEntryAndRefresh(current);
+                                          g_current->initializer = init;
+  					  g_current->name       = g_current->name.stripWhiteSpace();
+					  g_current->section    = Entry::VARIABLE_SEC; 
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
 					  BEGIN(FindMembers);
   					}
@@ -2671,34 +2650,34 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           lineCount();
   					}
 <DefineEnd>\"				{
-					  if (insideIDL && insideCppQuote)
+					  if (g_insideIDL && g_insideCppQuote)
 					  {
 					    BEGIN(EndCppQuote);
 					  }
 					  else
 					  {
-					    lastStringContext=DefineEnd;
+					    g_lastStringContext=DefineEnd;
 					    BEGIN(SkipString);
 					  }
   					}
 <DefineEnd>.				
 <DefinePHP>{ID}["']{BN}*","{BN}*	{
-  					  current->name = yytext;
-					  current->name = current->name.stripWhiteSpace();
-					  current->name = current->name.left(current->name.length()-1).stripWhiteSpace();
-					  current->name = current->name.left(current->name.length()-1);
-  					  current->bodyLine = yyLineNr;
-  					  lastRoundContext = DefinePHPEnd;
-  					  pCopyRoundGString = &current->initializer;
-					  roundCount = 0;
+  					  g_current->name = yytext;
+					  g_current->name = g_current->name.stripWhiteSpace();
+					  g_current->name = g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
+					  g_current->name = g_current->name.left(g_current->name.length()-1);
+  					  g_current->bodyLine = g_yyLineNr;
+  					  g_lastRoundContext = DefinePHPEnd;
+  					  g_pCopyRoundGString = &g_current->initializer;
+					  g_roundCount = 0;
   					  BEGIN( GCopyRound );
 					}
 
 <FindMembers>[\^%]			{  // ^ and % are C++/CLI extensions
-  					  if (insideCli)
+  					  if (g_insideCli)
 					  {
   					    addType();
-                                            current->name = yytext ; 
+                                            g_current->name = yytext ; 
 					  }
 					  else
 					  {
@@ -2706,31 +2685,31 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FindMembers>[*&]+			{ 
-                                          current->name += yytext ;  
+                                          g_current->name += yytext ;  
   					  addType();
 					}
 <FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs,DefinePHPEnd>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  if (current->bodyLine==-1)
+					  if (g_current->bodyLine==-1)
 					  {
-					    current->bodyLine=yyLineNr;
+					    g_current->bodyLine=g_yyLineNr;
 					  }
-					  docBlockContext   = YY_START;
-					  docBlockInBody    = FALSE;
-					  docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  g_docBlockContext   = YY_START;
+					  g_docBlockInBody    = FALSE;
+					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
 
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
                                           //printf("indent=%d\n",computeIndent(yytext+1,g_column));
   					  lineCount();
 
-					  docBlockTerm = ';';
-                                          if (YY_START==EnumBaseType && current->section==Entry::ENUM_SEC)
+					  g_docBlockTerm = ';';
+                                          if (YY_START==EnumBaseType && g_current->section==Entry::ENUM_SEC)
                                           {
-                                            current->bitfields = ":"+current->args;
-                                            current->args.resize(0);
-                                            current->section=Entry::VARIABLE_SEC;
+                                            g_current->bitfields = ":"+g_current->args;
+                                            g_current->args.resize(0);
+                                            g_current->section=Entry::VARIABLE_SEC;
                                           }
 					  if (yytext[yyleng-3]=='/')
 					  {
@@ -2744,22 +2723,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <MemberSpec,FindFields,FindMembers,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>","{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  docBlockContext   = YY_START;
-					  docBlockInBody    = FALSE;
-					  docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  g_docBlockContext   = YY_START;
+					  g_docBlockInBody    = FALSE;
+					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
 
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
   					  lineCount();
 
-					  docBlockTerm = ',';
-                                          if (YY_START==EnumBaseType && current->section==Entry::ENUM_SEC)
+					  g_docBlockTerm = ',';
+                                          if (YY_START==EnumBaseType && g_current->section==Entry::ENUM_SEC)
                                           {
-                                            current->bitfields = ":"+current->args;
-                                            current->args.resize(0);
-                                            current->section=Entry::VARIABLE_SEC;
+                                            g_current->bitfields = ":"+g_current->args;
+                                            g_current->args.resize(0);
+                                            g_current->section=Entry::VARIABLE_SEC;
                                           }
 					  if (yytext[yyleng-3]=='/')
 					  {
@@ -2773,20 +2752,20 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DefineEnd,FindFields,FindFieldArg,ReadInitializer,OldStyleArgs>{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  if (current->bodyLine==-1)
+					  if (g_current->bodyLine==-1)
 					  {
-					    current->bodyLine=yyLineNr;
+					    g_current->bodyLine=g_yyLineNr;
 					  }
-					  docBlockContext   = YY_START;
-					  docBlockInBody    = FALSE;
-					  docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  g_docBlockContext   = YY_START;
+					  g_docBlockInBody    = FALSE;
+					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
   					  lineCount();
 
-					  docBlockTerm = 0;
+					  g_docBlockTerm = 0;
 					  if (yytext[yyleng-3]=='/')
 					  {
 					    startCommentBlock(TRUE);
@@ -2800,34 +2779,34 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
    
 <FindMembers,FindFields>("//"([!/]){B}*{CMD}"{")|("/*"([!*]){B}*{CMD}"{")	{
-  					  //handleGroupStartCommand(current->name);
-                                          if (previous && previous->section==Entry::GROUPDOC_SEC)
+  					  //handleGroupStartCommand(g_current->name);
+                                          if (g_previous && g_previous->section==Entry::GROUPDOC_SEC)
 					  {
-					    // link open command to the group defined in the previous entry
-					    Doxygen::docGroup.open(previous,yyFileName,yyLineNr);
+					    // link open command to the group defined in the g_previous entry
+					    Doxygen::docGroup.open(g_previous,g_yyFileName,g_yyLineNr);
 					  }
 					  else
 					  {
-					    // link open command to the current entry
-					    Doxygen::docGroup.open(current.get(),yyFileName,yyLineNr);
+					    // link open command to the g_current entry
+					    Doxygen::docGroup.open(g_current.get(),g_yyFileName,g_yyLineNr);
 					  }
-					  //current = tmp;
+					  //g_current = tmp;
 					  initEntry();
 					  if (yytext[1]=='/')
 					  {
 					    if (yytext[2]=='!' || yytext[2]=='/')
 					    {
-					      docBlockContext   = YY_START;
-					      docBlockInBody    = FALSE;
-					      docBlockAutoBrief = FALSE;
-					      docBlock.resize(0);
-					      docBlockTerm = 0;
+					      g_docBlockContext   = YY_START;
+					      g_docBlockInBody    = FALSE;
+					      g_docBlockAutoBrief = FALSE;
+					      g_docBlock.resize(0);
+					      g_docBlockTerm = 0;
 					      startCommentBlock(TRUE);
 					      BEGIN(DocLine);
 					    }
 					    else
 					    {
-					      lastCContext=YY_START;
+					      g_lastCContext=YY_START;
 					      BEGIN(SkipCxxComment);
 					    }
 					  }
@@ -2835,498 +2814,498 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    if (yytext[2]=='!' || yytext[2]=='*')
 					    {
-					      docBlockContext   = YY_START;
-					      docBlockInBody    = FALSE;
-					      docBlock.resize(0);
-					      docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					      g_docBlockContext   = YY_START;
+					      g_docBlockInBody    = FALSE;
+					      g_docBlock.resize(0);
+					      g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                          ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
-					      docBlockTerm = 0;
+					      g_docBlockTerm = 0;
 					      startCommentBlock(FALSE);
 					      BEGIN(DocBlock);
 					    }
 					    else
 					    {
-					      lastCContext=YY_START;
+					      g_lastCContext=YY_START;
 					      BEGIN(SkipComment);
 					    }
 					  }
   					}
 <FindMembers,FindFields,ReadInitializer>"//"([!/]){B}*{CMD}"}".*|"/*"([!*]){B}*{CMD}"}"[^*]*"*/"	{
-                                          bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && lastInitializerContext==FindFields); // see bug746226
-  					  Doxygen::docGroup.close(current.get(),yyFileName,yyLineNr,insideEnum);
+                                          bool g_insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && g_lastInitializerContext==FindFields); // see bug746226
+  					  Doxygen::docGroup.close(g_current.get(),g_yyFileName,g_yyLineNr,g_insideEnum);
   					  lineCount();
   					}
 <FindMembers>"="			{ // in PHP code this could also be due to "<?="
-  					  current->bodyLine = yyLineNr;
-                                          current->initializer = yytext;
-					  lastInitializerContext = YY_START;
-					  initBracketCount=0;
+  					  g_current->bodyLine = g_yyLineNr;
+                                          g_current->initializer = yytext;
+					  g_lastInitializerContext = YY_START;
+					  g_initBracketCount=0;
 					  BEGIN(ReadInitializer);
   					}
 <UNOIDLAttributeBlock>{BN}*[gs]"et"{BN}+"raises"{BN}*"("{BN}*{SCOPENAME}{BN}*(","{BN}*{SCOPENAME}{BN}*)*")"{BN}*";"	{
 					  lineCount();
-					  current->exception += " ";
-					  current->exception += removeRedundantWhiteSpace(yytext);
+					  g_current->exception += " ";
+					  g_current->exception += removeRedundantWhiteSpace(yytext);
 					}
 <UNOIDLAttributeBlock>"}"		{
-					  current->exception += " }";
+					  g_current->exception += " }";
 					  BEGIN(FindMembers);
 					}
   /* Read initializer rules */
 <ReadInitializer>"("			{
-  					  lastRoundContext=YY_START;
-  					  pCopyRoundGString=&current->initializer;
-					  roundCount=0;
-  					  current->initializer+=*yytext; 
+  					  g_lastRoundContext=YY_START;
+  					  g_pCopyRoundGString=&g_current->initializer;
+					  g_roundCount=0;
+  					  g_current->initializer+=*yytext; 
   					  BEGIN(GCopyRound);
   					}
 <ReadInitializer>"["                    {
-                                          if (!insidePHP) REJECT;
-                                          lastSquareContext=YY_START;
-                                          pCopySquareGString=&current->initializer;
-                                          squareCount=0;
-                                          current->initializer+=*yytext; 
+                                          if (!g_insidePHP) REJECT;
+                                          g_lastSquareContext=YY_START;
+                                          g_pCopySquareGString=&g_current->initializer;
+                                          g_squareCount=0;
+                                          g_current->initializer+=*yytext; 
                                           BEGIN(GCopySquare);
                                         }
 <ReadInitializer>"{"			{
-  					  lastCurlyContext=YY_START;
-  					  pCopyCurlyGString=&current->initializer;
-					  curlyCount=0;
-  					  current->initializer+=*yytext; 
+  					  g_lastCurlyContext=YY_START;
+  					  g_pCopyCurlyGString=&g_current->initializer;
+					  g_curlyCount=0;
+  					  g_current->initializer+=*yytext; 
   					  BEGIN(GCopyCurly);
   					}
 <ReadInitializer>[;,]			{
-  					  //printf(">> initializer '%s' <<\n",current->initializer.data());
-                                          if (*yytext==';' && (current_root->spec&Entry::Enum))
-					  {
-					    current->fileName   = yyFileName;
-					    current->startLine  = yyLineNr;
-					    current->startColumn = yyColNr;
-  					    current->args       = current->args.simplifyWhiteSpace();
-  					    current->name       = current->name.stripWhiteSpace();
-					    current->section    = Entry::VARIABLE_SEC;
-					    current_root->moveToSubEntryAndRefresh(current);
+  					  //printf(">> initializer '%s' <<\n",g_current->initializer.data());
+                                          if (*yytext==';' && (g_current_root->spec&Entry::Enum))
+					  {
+					    g_current->fileName   = g_yyFileName;
+					    g_current->startLine  = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+  					    g_current->args       = g_current->args.simplifyWhiteSpace();
+  					    g_current->name       = g_current->name.stripWhiteSpace();
+					    g_current->section    = Entry::VARIABLE_SEC;
+					    g_current_root->moveToSubEntryAndRefresh(g_current);
 					    initEntry();
 					    BEGIN(FindMembers);
 					  }
-					  else if (*yytext==';' || (lastInitializerContext==FindFields && initBracketCount==0)) // initBracketCount==0 was added for bug 665778
+					  else if (*yytext==';' || (g_lastInitializerContext==FindFields && g_initBracketCount==0)) // g_initBracketCount==0 was added for bug 665778
 					  {
   					    unput(*yytext);
-  					    BEGIN(lastInitializerContext);
+  					    BEGIN(g_lastInitializerContext);
 					  }
-					  else if (*yytext==',' && initBracketCount==0) // for "int a=0,b=0"
+					  else if (*yytext==',' && g_initBracketCount==0) // for "int a=0,b=0"
 					  {
   					    unput(*yytext);
-  					    BEGIN(lastInitializerContext);
+  					    BEGIN(g_lastInitializerContext);
 					  }
 					  else
 					  {
-  					    current->initializer+=*yytext; 
+  					    g_current->initializer+=*yytext; 
 					  }
   					}
 <ReadInitializer>{RAWBEGIN}             { // C++11 raw string
-                                          if (!insideCpp)
+                                          if (!g_insideCpp)
                                           { 
                                             REJECT;
                                           }
                                           else
                                           {
                                             QCString text=yytext;
-                                            current->initializer+=text;
+                                            g_current->initializer+=text;
                                             int i=text.find('"');
                                             g_delimiter = yytext+i+1;
                                             g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-                                            lastRawStringContext = YY_START;
-                                            pCopyRawGString = &current->initializer;
+                                            g_lastRawStringContext = YY_START;
+                                            g_pCopyRawGString = &g_current->initializer;
                                             BEGIN(RawGString);
                                             //printf("RawGString delimiter='%s'\n",delimiter.data());
                                           }
                                         }
 <RawGString>{RAWEND}                    {
-                                          *pCopyRawGString+=yytext;
+                                          *g_pCopyRawGString+=yytext;
                                           QCString delimiter = yytext+1;
                                           delimiter=delimiter.left(delimiter.length()-1);
                                           if (delimiter==g_delimiter)
                                           {
-                                            BEGIN(lastRawStringContext);
+                                            BEGIN(g_lastRawStringContext);
                                           }
                                         }
 <RawGString>[^)\n]+                     {
-                                          *pCopyRawGString+=yytext;
+                                          *g_pCopyRawGString+=yytext;
                                         }
 <RawGString>.                           {
-                                          *pCopyRawGString+=yytext;
+                                          *g_pCopyRawGString+=yytext;
                                         }
 <RawGString>\n                          {
-                                          *pCopyRawGString+=yytext;
+                                          *g_pCopyRawGString+=yytext;
                                           lineCount();
                                         }
 <RawString>{RAWEND}                     {
-                                          *pCopyRawString+=yytext;
-  					  fullArgString+=yytext;
+                                          *g_pCopyRawString+=yytext;
+  					  g_fullArgString+=yytext;
                                           QCString delimiter = yytext+1;
                                           delimiter=delimiter.left(delimiter.length()-1);
                                           if (delimiter==g_delimiter)
                                           {
-                                            BEGIN(lastRawStringContext);
+                                            BEGIN(g_lastRawStringContext);
                                           }
                                         }
 <RawString>[^)]+                        {
-                                          *pCopyRawString+=yytext;
-  					  fullArgString+=yytext;
+                                          *g_pCopyRawString+=yytext;
+  					  g_fullArgString+=yytext;
                                         }
 <RawString>.                            {
-                                          *pCopyRawString+=yytext;
-  					  fullArgString+=yytext;
+                                          *g_pCopyRawString+=yytext;
+  					  g_fullArgString+=yytext;
                                         }
 <RawString>\n                           {
-                                          *pCopyRawString+=yytext;
-  					  fullArgString+=yytext;
+                                          *g_pCopyRawString+=yytext;
+  					  g_fullArgString+=yytext;
                                           lineCount();
                                         }
 <ReadInitializer>\"			{
-					  if (insideIDL && insideCppQuote)
+					  if (g_insideIDL && g_insideCppQuote)
   					  {
 					    BEGIN(EndCppQuote);
 					  }
 					  else
 					  {
-                                            lastStringContext=YY_START;
-  					    current->initializer+=yytext; 
-  					    pCopyQuotedGString=&current->initializer;
+                                            g_lastStringContext=YY_START;
+  					    g_current->initializer+=yytext; 
+  					    g_pCopyQuotedGString=&g_current->initializer;
 					    BEGIN(CopyGString);
 					  }
 					}
 <ReadInitializer>"->"			{
-  					  current->initializer+=yytext; 
+  					  g_current->initializer+=yytext; 
 					}
 <ReadInitializer>"<<"			{
-  					  current->initializer+=yytext; 
+  					  g_current->initializer+=yytext; 
 					}
 <ReadInitializer>">>"			{
-  					  current->initializer+=yytext; 
+  					  g_current->initializer+=yytext; 
   					}
 <ReadInitializer>[<\[{(]		{
-  					  initBracketCount++;
-  					  current->initializer+=*yytext; 
+  					  g_initBracketCount++;
+  					  g_current->initializer+=*yytext; 
   					}
 <ReadInitializer>[>\]})]		{
-  					  initBracketCount--;
-  					  current->initializer+=*yytext; 
+  					  g_initBracketCount--;
+  					  g_current->initializer+=*yytext; 
   					}
 <ReadInitializer>\'			{	
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-					    current->initializer+=yytext; 
-                                            pCopyQuotedGString = &current->initializer;
-                                            lastStringContext=YY_START;
+					    g_current->initializer+=yytext; 
+                                            g_pCopyQuotedGString = &g_current->initializer;
+                                            g_lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
 					  else
 					  {
-					    current->initializer+=yytext; 
+					    g_current->initializer+=yytext; 
 					  }
   					}
 <ReadInitializer>{CHARLIT}              { 
-                                          if (insidePHP) 
+                                          if (g_insidePHP) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {  
-					    current->initializer+=yytext; 
+					    g_current->initializer+=yytext; 
 					  }
                                         } 
 <ReadInitializer>\n			{
-  					  current->initializer+=*yytext;
+  					  g_current->initializer+=*yytext;
                                           lineCount();
   					}
 <ReadInitializer>"@\""			{ 
-  					  //printf("insideCS=%d\n",insideCS);
-  					  current->initializer+=yytext;
-                                          if (!insideCS && !insideObjC) 
+  					  //printf("g_insideCS=%d\n",g_insideCS);
+  					  g_current->initializer+=yytext;
+                                          if (!g_insideCS && !g_insideObjC) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
 					    // C#/ObjC verbatim string
-					    lastSkipVerbStringContext=YY_START;
-					    pSkipVerbString=&current->initializer;
+					    g_lastSkipVerbStringContext=YY_START;
+					    g_pSkipVerbString=&g_current->initializer;
 					    BEGIN(SkipVerbString);
 					  }
 					}
 <SkipVerbString>[^\n"]+			{
-					  *pSkipVerbString+=yytext;
+					  *g_pSkipVerbString+=yytext;
 					}
 <SkipVerbString>"\"\""			{ // quote escape
-					  *pSkipVerbString+=yytext;
+					  *g_pSkipVerbString+=yytext;
 					}
 <SkipVerbString>"\""			{
-					  *pSkipVerbString+=*yytext;
-					  BEGIN(lastSkipVerbStringContext);
+					  *g_pSkipVerbString+=*yytext;
+					  BEGIN(g_lastSkipVerbStringContext);
 					}
 <SkipVerbString>\n			{
-					  *pSkipVerbString+=*yytext;
+					  *g_pSkipVerbString+=*yytext;
                                           lineCount();
   					}
 <SkipVerbString>.			{
-					  *pSkipVerbString+=*yytext;
+					  *g_pSkipVerbString+=*yytext;
   					}
 <ReadInitializer>"?>"			{
-					  if (insidePHP)
+					  if (g_insidePHP)
 					    BEGIN( FindMembersPHP );
 					  else
-					    current->initializer+=yytext;
+					    g_current->initializer+=yytext;
   					}
 <ReadInitializer>.			{ 
-  					  current->initializer+=*yytext; 
+  					  g_current->initializer+=*yytext; 
 					}
 
   /* generic quoted string copy rules */
 <CopyString,CopyPHPString>\\.		{
-  					  *pCopyQuotedString+=yytext;
+  					  *g_pCopyQuotedString+=yytext;
   					}
 <CopyString>\"				{ 
-  					  *pCopyQuotedString+=*yytext;
-  					  BEGIN( lastStringContext ); 
+  					  *g_pCopyQuotedString+=*yytext;
+  					  BEGIN( g_lastStringContext ); 
 					}
 <CopyPHPString>\'			{ 
-  					  *pCopyQuotedString+=*yytext;
-  					  BEGIN( lastStringContext ); 
+  					  *g_pCopyQuotedString+=*yytext;
+  					  BEGIN( g_lastStringContext ); 
 					}
 <CopyString,CopyPHPString>"/*"|"*/"|"//" {
-  					  *pCopyQuotedString+=yytext;
+  					  *g_pCopyQuotedString+=yytext;
   					}
 <CopyString,CopyPHPString>\n		{
-  					  *pCopyQuotedString+=*yytext;
+  					  *g_pCopyQuotedString+=*yytext;
                                           lineCount();
   					}
 <CopyString,CopyPHPString>.		{
-  					  *pCopyQuotedString+=*yytext;
+  					  *g_pCopyQuotedString+=*yytext;
   					}
 
   /* generic quoted growable string copy rules */
 <CopyGString,CopyPHPGString>\\.		{
-  					  *pCopyQuotedGString+=yytext;
+  					  *g_pCopyQuotedGString+=yytext;
   					}
 <CopyGString>\"				{ 
-  					  *pCopyQuotedGString+=*yytext;
-  					  BEGIN( lastStringContext ); 
+  					  *g_pCopyQuotedGString+=*yytext;
+  					  BEGIN( g_lastStringContext ); 
 					}
 <CopyPHPGString>\'			{ 
-  					  *pCopyQuotedGString+=*yytext;
-  					  BEGIN( lastStringContext ); 
+  					  *g_pCopyQuotedGString+=*yytext;
+  					  BEGIN( g_lastStringContext ); 
 					}
 <CopyGString,CopyPHPGString>"<?php"	{ // we had an odd number of quotes.
-					  *pCopyQuotedGString += yytext;
-  					  BEGIN( lastStringContext ); 
+					  *g_pCopyQuotedGString += yytext;
+  					  BEGIN( g_lastStringContext ); 
 					}
 <CopyGString,CopyPHPGString>"/*"|"*/"|"//" {
-  					  *pCopyQuotedGString+=yytext;
+  					  *g_pCopyQuotedGString+=yytext;
   					}
 <CopyGString,CopyPHPGString>\n		{
-  					  *pCopyQuotedGString+=*yytext;
+  					  *g_pCopyQuotedGString+=*yytext;
                                           lineCount();
   					}
 <CopyGString,CopyPHPGString>.		{
-  					  *pCopyQuotedGString+=*yytext;
+  					  *g_pCopyQuotedGString+=*yytext;
   					}
 
   /* generic round bracket list copy rules */
 <CopyRound>\"				{
-					  *pCopyRoundString+=*yytext;
-  					  pCopyQuotedString=pCopyRoundString;
-					  lastStringContext=YY_START;
+					  *g_pCopyRoundString+=*yytext;
+  					  g_pCopyQuotedString=g_pCopyRoundString;
+					  g_lastStringContext=YY_START;
 					  BEGIN(CopyString);
 					}
 <CopyRound>"("				{
-  					  *pCopyRoundString+=*yytext;
-  					  roundCount++;
+  					  *g_pCopyRoundString+=*yytext;
+  					  g_roundCount++;
   					}
 <CopyRound>")"				{
-  					  *pCopyRoundString+=*yytext;
-					  if (--roundCount<0)
-					    BEGIN(lastRoundContext);
+  					  *g_pCopyRoundString+=*yytext;
+					  if (--g_roundCount<0)
+					    BEGIN(g_lastRoundContext);
   					}
 <CopyRound>\n				{
                                           lineCount();
-  					  *pCopyRoundString+=*yytext;
+  					  *g_pCopyRoundString+=*yytext;
   					}
 <CopyRound>\'				{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-					    current->initializer+=yytext; 
-                                            pCopyQuotedString = pCopyRoundString;
-                                            lastStringContext=YY_START;
+					    g_current->initializer+=yytext; 
+                                            g_pCopyQuotedString = g_pCopyRoundString;
+                                            g_lastStringContext=YY_START;
 					    BEGIN(CopyPHPString);
 					  }
 					  else
 					  {
-					    *pCopyRoundString+=yytext;
+					    *g_pCopyRoundString+=yytext;
 					  }
   					}
 <CopyRound>{CHARLIT}		        { 
-                                          if (insidePHP)
+                                          if (g_insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            *pCopyRoundString+=yytext; 
+                                            *g_pCopyRoundString+=yytext; 
 					  }
                                         }
 <CopyRound>[^"'()\n]+			{
-  					  *pCopyRoundString+=yytext;
+  					  *g_pCopyRoundString+=yytext;
   					}
 <CopyRound>.				{
-  					  *pCopyRoundString+=*yytext;
+  					  *g_pCopyRoundString+=*yytext;
   					}
 
   /* generic round bracket list copy rules for growable strings */
 <GCopyRound>\"				{
-					  *pCopyRoundGString+=*yytext;
-  					  pCopyQuotedGString=pCopyRoundGString;
-					  lastStringContext=YY_START;
+					  *g_pCopyRoundGString+=*yytext;
+  					  g_pCopyQuotedGString=g_pCopyRoundGString;
+					  g_lastStringContext=YY_START;
 					  BEGIN(CopyGString);
 					}
 <GCopyRound>"("				{
-  					  *pCopyRoundGString+=*yytext;
-  					  roundCount++;
+  					  *g_pCopyRoundGString+=*yytext;
+  					  g_roundCount++;
   					}
 <GCopyRound>")"				{
-  					  *pCopyRoundGString+=*yytext;
-					  if (--roundCount<0)
-					    BEGIN(lastRoundContext);
+  					  *g_pCopyRoundGString+=*yytext;
+					  if (--g_roundCount<0)
+					    BEGIN(g_lastRoundContext);
   					}
 <GCopyRound>\n				{
                                           lineCount();
-  					  *pCopyRoundGString+=*yytext;
+  					  *g_pCopyRoundGString+=*yytext;
   					}
 <GCopyRound>\'				{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-					    current->initializer+=yytext; 
-                                            pCopyQuotedGString = pCopyRoundGString;
-                                            lastStringContext=YY_START;
+					    g_current->initializer+=yytext; 
+                                            g_pCopyQuotedGString = g_pCopyRoundGString;
+                                            g_lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
 					  else
 					  {
-					    *pCopyRoundGString+=yytext;
+					    *g_pCopyRoundGString+=yytext;
 					  }
   					}
 <GCopyRound>{CHARLIT}		        { 
-                                          if (insidePHP)
+                                          if (g_insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            *pCopyRoundGString+=yytext; 
+                                            *g_pCopyRoundGString+=yytext; 
 					  }
                                         }
 <GCopyRound>[^"'()\n/]+			{
-  					  *pCopyRoundGString+=yytext;
+  					  *g_pCopyRoundGString+=yytext;
   					}
 <GCopyRound>.				{
-  					  *pCopyRoundGString+=*yytext;
+  					  *g_pCopyRoundGString+=*yytext;
   					}
 
   /* generic square bracket list copy rules for growable strings, we should only enter here in case of php, left the test part as in GCopyRound to keep it compatible with the round bracket version */
 <GCopySquare>\"                         {
-                                          *pCopySquareGString+=*yytext;
-                                            pCopyQuotedGString=pCopySquareGString;
-                                          lastStringContext=YY_START;
+                                          *g_pCopySquareGString+=*yytext;
+                                            g_pCopyQuotedGString=g_pCopySquareGString;
+                                          g_lastStringContext=YY_START;
                                           BEGIN(CopyGString);
                                         }
 <GCopySquare>"["                        {
-                                          *pCopySquareGString+=*yytext;
-                                          squareCount++;
+                                          *g_pCopySquareGString+=*yytext;
+                                          g_squareCount++;
                                         }
 <GCopySquare>"]"                        {
-                                          *pCopySquareGString+=*yytext;
-                                          if (--squareCount<0)
-                                          BEGIN(lastSquareContext);
+                                          *g_pCopySquareGString+=*yytext;
+                                          if (--g_squareCount<0)
+                                          BEGIN(g_lastSquareContext);
                                         }
 <GCopySquare>\n                         {
                                           lineCount();
-                                          *pCopySquareGString+=*yytext;
+                                          *g_pCopySquareGString+=*yytext;
                                         }
 <GCopySquare>\'                         {
-                                          if (insidePHP)
+                                          if (g_insidePHP)
                                           {
-                                            current->initializer+=yytext; 
-                                            pCopyQuotedGString = pCopySquareGString;
-                                            lastStringContext=YY_START;
+                                            g_current->initializer+=yytext; 
+                                            g_pCopyQuotedGString = g_pCopySquareGString;
+                                            g_lastStringContext=YY_START;
                                             BEGIN(CopyPHPGString);
                                           }
                                           else
                                           {
-                                            *pCopySquareGString+=yytext;
+                                            *g_pCopySquareGString+=yytext;
                                           }
                                         }
 <GCopySquare>{CHARLIT}                  { 
-                                          if (insidePHP)
+                                          if (g_insidePHP)
                                           {
                                             REJECT;
                                           }
                                           else
                                           {
-                                            *pCopySquareGString+=yytext; 
+                                            *g_pCopySquareGString+=yytext; 
                                           }
                                         }
 <GCopySquare>[^"\[\]\n/]+               {
-                                          *pCopySquareGString+=yytext;
+                                          *g_pCopySquareGString+=yytext;
                                         }
 <GCopySquare>.                          {
-                                          *pCopySquareGString+=*yytext;
+                                          *g_pCopySquareGString+=*yytext;
                                         }
 
   /* generic curly bracket list copy rules */
 <CopyCurly>\"				{
-					  *pCopyCurlyString+=*yytext;
-  					  pCopyQuotedString=pCopyCurlyString;
-					  lastStringContext=YY_START;
+					  *g_pCopyCurlyString+=*yytext;
+  					  g_pCopyQuotedString=g_pCopyCurlyString;
+					  g_lastStringContext=YY_START;
 					  BEGIN(CopyString);
 					}
 <CopyCurly>\'				{
-					  *pCopyCurlyString+=*yytext;
-  					  if (insidePHP)
+					  *g_pCopyCurlyString+=*yytext;
+  					  if (g_insidePHP)
 					  {
-					    pCopyQuotedString=pCopyCurlyString;
-					    lastStringContext=YY_START;
+					    g_pCopyQuotedString=g_pCopyCurlyString;
+					    g_lastStringContext=YY_START;
 					    BEGIN(CopyPHPString);
 					  }
 					}
 <CopyCurly>"{"				{
-  					  *pCopyCurlyString+=*yytext;
-					  curlyCount++;
+  					  *g_pCopyCurlyString+=*yytext;
+					  g_curlyCount++;
   					}
 <CopyCurly>"}"				{
-					  *pCopyCurlyString+=*yytext;
-					  if (--curlyCount<0)
-					    BEGIN(lastCurlyContext); 
+					  *g_pCopyCurlyString+=*yytext;
+					  if (--g_curlyCount<0)
+					    BEGIN(g_lastCurlyContext); 
   					}
-<CopyCurly>{CHARLIT}                    { if (insidePHP) 
+<CopyCurly>{CHARLIT}                    { if (g_insidePHP) 
                                           { 
 					    REJECT; 
 					  } 
 					  else 
 					  {
-					    *pCopyCurlyString+=yytext; 
+					    *g_pCopyCurlyString+=yytext; 
 					  }
                                         }
 <CopyCurly>[^"'{}\/\n]+			{
-  					  *pCopyCurlyString+=yytext;
+  					  *g_pCopyCurlyString+=yytext;
   					}
-<CopyCurly>"/"				{ *pCopyCurlyString+=yytext; }
+<CopyCurly>"/"				{ *g_pCopyCurlyString+=yytext; }
 <CopyCurly>\n				{
                                           lineCount();
-					  *pCopyCurlyString+=*yytext;
+					  *g_pCopyCurlyString+=*yytext;
   					}
 <CopyCurly>.				{
-					  *pCopyCurlyString+=*yytext;
+					  *g_pCopyCurlyString+=*yytext;
   					}
 
   /* generic curly bracket list copy rules for growable strings */
@@ -3336,7 +3315,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  QCString line = QCString(yytext);
 					  int s = line.find(' ');
 					  int e = line.find('"',s);
-					  yyLineNr = line.mid(s,e-s).toInt();
+					  g_yyLineNr = line.mid(s,e-s).toInt();
 					  if (yytext[yyleng-1]=='\n')
 					  {
                                             lineCount();
@@ -3344,435 +3323,435 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <GCopyCurly>\"				{
-					  *pCopyCurlyGString+=*yytext;
-  					  pCopyQuotedGString=pCopyCurlyGString;
-					  lastStringContext=YY_START;
+					  *g_pCopyCurlyGString+=*yytext;
+  					  g_pCopyQuotedGString=g_pCopyCurlyGString;
+					  g_lastStringContext=YY_START;
 					  BEGIN(CopyGString);
 					}
 <GCopyCurly>\'				{
-					  *pCopyCurlyGString+=*yytext;
-  					  if (insidePHP)
+					  *g_pCopyCurlyGString+=*yytext;
+  					  if (g_insidePHP)
 					  {
-					    pCopyQuotedGString=pCopyCurlyGString;
-					    lastStringContext=YY_START;
+					    g_pCopyQuotedGString=g_pCopyCurlyGString;
+					    g_lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
 					}
 <GCopyCurly>"{"				{
-  					  *pCopyCurlyGString+=*yytext;
-					  curlyCount++;
+  					  *g_pCopyCurlyGString+=*yytext;
+					  g_curlyCount++;
   					}
 <GCopyCurly>"}"				{
-					  *pCopyCurlyGString+=*yytext;
-					  if (--curlyCount<0)
-					    BEGIN(lastCurlyContext); 
+					  *g_pCopyCurlyGString+=*yytext;
+					  if (--g_curlyCount<0)
+					    BEGIN(g_lastCurlyContext); 
   					}
-<GCopyCurly>{CHARLIT}                    { if (insidePHP) 
+<GCopyCurly>{CHARLIT}                    { if (g_insidePHP) 
                                           { 
 					    REJECT; 
 					  } 
 					  else 
 					  {
-					    *pCopyCurlyGString+=yytext; 
+					    *g_pCopyCurlyGString+=yytext; 
 					  }
                                         }
 <GCopyCurly>[^"'{}\/\n,]+		{
-  					  *pCopyCurlyGString+=yytext;
+  					  *g_pCopyCurlyGString+=yytext;
   					}
 <GCopyCurly>[,]+		        {
-  					  *pCopyCurlyGString+=yytext;
+  					  *g_pCopyCurlyGString+=yytext;
   					}
-<GCopyCurly>"/"				{ *pCopyCurlyGString+=yytext; }
+<GCopyCurly>"/"				{ *g_pCopyCurlyGString+=yytext; }
 <GCopyCurly>\n				{
                                           lineCount();
-					  *pCopyCurlyGString+=*yytext;
+					  *g_pCopyCurlyGString+=*yytext;
   					}
 <GCopyCurly>.				{
-					  *pCopyCurlyGString+=*yytext;
+					  *g_pCopyCurlyGString+=*yytext;
   					}
 
   /* ---------------------- */
 
 
 <FindMembers>":"			{
-					  if (current->type.isEmpty() &&
-                                              current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}'
+					  if (g_current->type.isEmpty() &&
+                                              g_current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}'
 					  {
-                                            current->section=Entry::ENUM_SEC;
-					    current->name.resize(0);
-                                            current->args.resize(0);
+                                            g_current->section=Entry::ENUM_SEC;
+					    g_current->name.resize(0);
+                                            g_current->args.resize(0);
   					    BEGIN(EnumBaseType);
 					  }
                                           else 
                                           {
-                                            if (current->type.isEmpty()) // anonymous padding field, e.g. "int :7;"
+                                            if (g_current->type.isEmpty()) // anonymous padding field, e.g. "int :7;"
 					    {
 					      addType();
-					      current->name.sprintf("__pad%d__",padCount++);
+					      g_current->name.sprintf("__pad%d__",g_padCount++);
 					    }
   					    BEGIN(BitFields);
-					    current->bitfields+=":";
+					    g_current->bitfields+=":";
                                           }
   					}
 <BitFields>.				{
-  					  current->bitfields+=*yytext;
+  					  g_current->bitfields+=*yytext;
   					}
 <EnumBaseType>.				{
-  					  current->args+=*yytext;
+  					  g_current->args+=*yytext;
   					}
 <EnumBaseType>\n			{
                                           lineCount();
-  					  current->args+=' ';
+  					  g_current->args+=' ';
   					}
 <FindMembers>[;,]			{ 
-  					  QCString oldType = current->type;
-					  if (current->bodyLine==-1)
+  					  QCString oldType = g_current->type;
+					  if (g_current->bodyLine==-1)
 					  {
-					    current->bodyLine = yyLineNr;
+					    g_current->bodyLine = g_yyLineNr;
 					  }
-                                          if ( insidePHP && current->type.left(3) == "var" )
+                                          if ( g_insidePHP && g_current->type.left(3) == "var" )
                                           {
-                                            current->type = current->type.mid(3);
+                                            g_current->type = g_current->type.mid(3);
                                           }
-					  if (isTypedef && current->type.left(8)!="typedef ")
+					  if (g_isTypedef && g_current->type.left(8)!="typedef ")
 					  {
-					    current->type.prepend("typedef ");
+					    g_current->type.prepend("typedef ");
 					  }
-					  bool stat = current->stat;
-					  if (!current->name.isEmpty() && current->section!=Entry::ENUM_SEC)
+					  bool stat = g_current->stat;
+					  if (!g_current->name.isEmpty() && g_current->section!=Entry::ENUM_SEC)
 					  {
-					    current->type=current->type.simplifyWhiteSpace();
-					    current->args=removeRedundantWhiteSpace(current->args);
-					    current->name=current->name.stripWhiteSpace();
-					    if (current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;"
+					    g_current->type=g_current->type.simplifyWhiteSpace();
+					    g_current->args=removeRedundantWhiteSpace(g_current->args);
+					    g_current->name=g_current->name.stripWhiteSpace();
+					    if (g_current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;"
 					    {
-					    	current->spec = 0;
+					    	g_current->spec = 0;
 					    }
-					    current->section = Entry::VARIABLE_SEC ;
-					    current->fileName = yyFileName;
-					    current->startLine = yyBegLineNr;
-					    current->startColumn = yyBegColNr;
-					    current_root->moveToSubEntryAndRefresh( current ) ;
+					    g_current->section = Entry::VARIABLE_SEC ;
+					    g_current->fileName = g_yyFileName;
+					    g_current->startLine = g_yyBegLineNr;
+					    g_current->startColumn = g_yyBegColNr;
+					    g_current_root->moveToSubEntryAndRefresh( g_current ) ;
                                             initEntry();
 					  }
 					  if ( *yytext == ',')
 					  {
-					    current->stat = stat; // the static attribute holds for all variables
-					    current->name.resize(0);
-					    current->args.resize(0);
-					    current->brief.resize(0);
-					    current->doc.resize(0);
-					    current->initializer.resize(0);
-					    current->bitfields.resize(0);
+					    g_current->stat = stat; // the static attribute holds for all variables
+					    g_current->name.resize(0);
+					    g_current->args.resize(0);
+					    g_current->brief.resize(0);
+					    g_current->doc.resize(0);
+					    g_current->initializer.resize(0);
+					    g_current->bitfields.resize(0);
 					    int i=oldType.length(); 
 					    while (i>0 && (oldType[i-1]=='*' || oldType[i-1]=='&' || oldType[i-1]==' ')) i--;
-					    current->type = oldType.left(i);
+					    g_current->type = oldType.left(i);
 					  }
 					  else
 					  {
-                                            mtype = Method;
-                                            virt = Normal;
-					    current->groups.clear();
+                                            g_mtype = Method;
+                                            g_virt = Normal;
+					    g_current->groups.clear();
 					    initEntry();
 					  }
 					}
 
 <FindMembers>"["			{ 
-                                          if (insideSlice)
+                                          if (g_insideSlice)
                                           {
-          				    squareCount=1;
-                                            lastSquareContext = YY_START;
-                                            current->metaData += "[";
+          				    g_squareCount=1;
+                                            g_lastSquareContext = YY_START;
+                                            g_current->metaData += "[";
                                             BEGIN( SliceMetadata );
                                           }
-                                          else if (!insideCS &&  
-					      (current->name.isEmpty() || 
-					       current->name=="typedef"
+                                          else if (!g_insideCS &&  
+					      (g_current->name.isEmpty() || 
+					       g_current->name=="typedef"
 					      )
 					     ) // IDL function property
  					  {
-          				    squareCount=1;
-					    lastSquareContext = YY_START;
-					    idlAttr.resize(0);
-					    idlProp.resize(0);
-					    current->mtype = mtype;
+          				    g_squareCount=1;
+					    g_lastSquareContext = YY_START;
+					    g_idlAttr.resize(0);
+					    g_idlProp.resize(0);
+					    g_current->mtype = g_mtype;
 
 					    if (Config_getBool(IDL_PROPERTY_SUPPORT) &&
-					         current->mtype == Property)
-					    { // we are inside the properties section of a dispinterface
-					      odlProp = true;
-					      current->spec |= Entry::Gettable;
-					      current->spec |= Entry::Settable;
+					         g_current->mtype == Property)
+					    { // we are g_inside the properties section of a dispinterface
+					      g_odlProp = true;
+					      g_current->spec |= Entry::Gettable;
+					      g_current->spec |= Entry::Settable;
 					    }
 
 					    BEGIN( IDLAttribute );
 					  }
-                                          else if (insideCS &&
-                                                  current->name.isEmpty())
+                                          else if (g_insideCS &&
+                                                  g_current->name.isEmpty())
                                           {
-                                            squareCount=1;
-                                            lastSquareContext = YY_START;
+                                            g_squareCount=1;
+                                            g_lastSquareContext = YY_START;
                                             // Skip the C# attribute
                                             // for this member
-                                            current->args.resize(0);
+                                            g_current->args.resize(0);
                                             BEGIN( SkipSquare );
                                           }
 					  else
 					  {
-  					    current->args += yytext ;
-					    squareCount=1;
-					    externC=FALSE; // see bug759247
+  					    g_current->args += yytext ;
+					    g_squareCount=1;
+					    g_externC=FALSE; // see bug759247
 					    BEGIN( Array ) ;
 					  }
 					}
 <SliceMetadata>"["                      { // Global metadata.
-          				  squareCount++;
-                                          current->metaData += "[";
+          				  g_squareCount++;
+                                          g_current->metaData += "[";
                                         }
 <SliceMetadata>{BN}*                    {
           				  lineCount();
                                         }
 <SliceMetadata>\"[^\"]*\"               {
-                                          current->metaData += yytext;
+                                          g_current->metaData += yytext;
                                         }
 <SliceMetadata>","                      {
-                                          current->metaData += yytext;
+                                          g_current->metaData += yytext;
                                         }
 <SliceMetadata>"]"                      {
-                                          current->metaData += yytext;
-                                          if (--squareCount<=0)
+                                          g_current->metaData += yytext;
+                                          if (--g_squareCount<=0)
                                           {
-                                            BEGIN (lastSquareContext);
+                                            BEGIN (g_lastSquareContext);
                                           }
                                         }
 <SliceOptional>"("                      {
-                                          current->type += "(";
-                                          roundCount++;
+                                          g_current->type += "(";
+                                          g_roundCount++;
                                         }
 <SliceOptional>[0-9]+                   {
-                                          current->type += yytext;
+                                          g_current->type += yytext;
                                         }
 <SliceOptional>")"                      {
-                                          current->type += ")";
-                                          if(--roundCount<=0)
+                                          g_current->type += ")";
+                                          if(--g_roundCount<=0)
                                           {
-                                            BEGIN (lastModifierContext);
+                                            BEGIN (g_lastModifierContext);
                                           }
                                         }
 <IDLAttribute>"]"			{
   					  // end of IDL function attribute
-					  if (--squareCount<=0)
+					  if (--g_squareCount<=0)
 					  {
 					    lineCount();
-					    if (current->mtype == Property)
+					    if (g_current->mtype == Property)
 					      BEGIN( IDLPropName );
 					    else
-					      BEGIN( lastSquareContext );
+					      BEGIN( g_lastSquareContext );
 					  }
 					}
 <IDLAttribute>"propput"	                {
                                           if (Config_getBool(IDL_PROPERTY_SUPPORT))
 					  {
-					    current->mtype = Property;
+					    g_current->mtype = Property;
 					  }
-					  current->spec |= Entry::Settable;
+					  g_current->spec |= Entry::Settable;
 					}
 <IDLAttribute>"propget" 		{
                                           if (Config_getBool(IDL_PROPERTY_SUPPORT))
 					  {
-					    current->mtype = Property;
+					    g_current->mtype = Property;
 					  }
-					  current->spec |= Entry::Gettable;
+					  g_current->spec |= Entry::Gettable;
 					}
 <IDLAttribute>"property" { // UNO IDL property
-					  current->spec |= Entry::Property;
+					  g_current->spec |= Entry::Property;
 					}
 <IDLAttribute>"attribute" { // UNO IDL attribute
-					  current->spec |= Entry::Attribute;
+					  g_current->spec |= Entry::Attribute;
 					}
 <IDLAttribute>"optional" { // on UNO IDL interface/service/attribute/property
-                           current->spec |= Entry::Optional;
+                           g_current->spec |= Entry::Optional;
                          }
 <IDLAttribute>"readonly" { // on UNO IDL attribute or property
-					  if (Config_getBool(IDL_PROPERTY_SUPPORT) && odlProp)
+					  if (Config_getBool(IDL_PROPERTY_SUPPORT) && g_odlProp)
 					  {
-					    current->spec ^= Entry::Settable;
+					    g_current->spec ^= Entry::Settable;
 					  }
 					  else
 					  {
-					    current->spec |= Entry::Readonly;
+					    g_current->spec |= Entry::Readonly;
 					  }
 					}
 <IDLAttribute>"bound" { // on UNO IDL attribute or property
-					  current->spec |= Entry::Bound;
+					  g_current->spec |= Entry::Bound;
 					}
 <IDLAttribute>"removable" { // on UNO IDL property
-					  current->spec |= Entry::Removable;
+					  g_current->spec |= Entry::Removable;
 					}
 <IDLAttribute>"constrained" { // on UNO IDL property
-					  current->spec |= Entry::Constrained;
+					  g_current->spec |= Entry::Constrained;
 					}
 <IDLAttribute>"transient" { // on UNO IDL property
-					  current->spec |= Entry::Transient;
+					  g_current->spec |= Entry::Transient;
 					}
 <IDLAttribute>"maybevoid" { // on UNO IDL property
-					  current->spec |= Entry::MaybeVoid;
+					  g_current->spec |= Entry::MaybeVoid;
 					}
 <IDLAttribute>"maybedefault" { // on UNO IDL property
-					  current->spec |= Entry::MaybeDefault;
+					  g_current->spec |= Entry::MaybeDefault;
 					}
 <IDLAttribute>"maybeambiguous" { // on UNO IDL property
-					  current->spec |= Entry::MaybeAmbiguous;
+					  g_current->spec |= Entry::MaybeAmbiguous;
 					}
 <IDLAttribute>.				{
 					}
 <IDLPropName>{BN}*{ID}{BN}*		{
 					  // return type (probably HRESULT) - skip it
 
-					  if (odlProp)
+					  if (g_odlProp)
 					  { // property type
-					    idlProp = yytext;
+					    g_idlProp = yytext;
 					  }
 					}
 <IDLPropName>{ID}{BN}*"("		{
-  					  current->name = yytext;
-					  current->name = current->name.left(current->name.length()-1).stripWhiteSpace();
-  					  current->startLine = yyLineNr;
-					  current->startColumn = yyColNr;
+  					  g_current->name = yytext;
+					  g_current->name = g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
+  					  g_current->startLine = g_yyLineNr;
+					  g_current->startColumn = g_yyColNr;
 					  BEGIN( IDLProp );
 					}
 <IDLPropName>{BN}*"("{BN}*{ID}{BN}*")"{BN}*	{
-					   if (odlProp)
+					   if (g_odlProp)
 					   {
-					     idlProp += yytext;
+					     g_idlProp += yytext;
 					   }
 					}
 <IDLPropName>{ID}{BN}*/";"		{
-					   if (odlProp)
+					   if (g_odlProp)
 					   {
-					     current->name = yytext;
-					     idlProp = idlProp.stripWhiteSpace();
-					     odlProp = false;
+					     g_current->name = yytext;
+					     g_idlProp = g_idlProp.stripWhiteSpace();
+					     g_odlProp = false;
 
 					     BEGIN( IDLProp );
 					   }
 					}
 <IDLProp>{BN}*"["[^\]]*"]"{BN}*		{  // attribute of a parameter
-					   idlAttr = yytext;
-					   idlAttr=idlAttr.stripWhiteSpace();
+					   g_idlAttr = yytext;
+					   g_idlAttr=g_idlAttr.stripWhiteSpace();
 					}
 <IDLProp>{ID}				{  // property type
-					   idlProp = yytext;
+					   g_idlProp = yytext;
 					}
 <IDLProp>{BN}*{ID}{BN}*"," 		{  // Rare: Another parameter ([propput] HRESULT Item(int index, [in] Type theRealProperty);)
-					  if (!current->args)
-					    current->args = "(";
+					  if (!g_current->args)
+					    g_current->args = "(";
 					  else
-					    current->args += ", ";
-					  current->args += idlAttr;
-					  current->args += " ";
-					  current->args += idlProp;	// prop was actually type of extra parameter
-					  current->args += " ";
-					  current->args += yytext;
-					  current->args = current->args.left(current->args.length() - 1);	// strip comma
-					  idlProp.resize(0);
-					  idlAttr.resize(0);
+					    g_current->args += ", ";
+					  g_current->args += g_idlAttr;
+					  g_current->args += " ";
+					  g_current->args += g_idlProp;	// prop was actually type of extra parameter
+					  g_current->args += " ";
+					  g_current->args += yytext;
+					  g_current->args = g_current->args.left(g_current->args.length() - 1);	// strip comma
+					  g_idlProp.resize(0);
+					  g_idlAttr.resize(0);
 					  BEGIN( IDLProp );
 					}
 <IDLProp>{BN}*{ID}{BN}*")"{BN}*		{
 					  // the parameter name for the property - just skip.
 					}
 <IDLProp>";"				{
-					  current->fileName   = yyFileName;
-					  current->type		= idlProp;
-  					  current->args       = current->args.simplifyWhiteSpace();
-  					  if (current->args)
-  					    current->args += ")";
-  					  current->name       = current->name.stripWhiteSpace();
-					  current->section    = Entry::VARIABLE_SEC;
-					  current_root->moveToSubEntryAndRefresh(current);
+					  g_current->fileName   = g_yyFileName;
+					  g_current->type		= g_idlProp;
+  					  g_current->args       = g_current->args.simplifyWhiteSpace();
+  					  if (g_current->args)
+  					    g_current->args += ")";
+  					  g_current->name       = g_current->name.stripWhiteSpace();
+					  g_current->section    = Entry::VARIABLE_SEC;
+					  g_current_root->moveToSubEntryAndRefresh(g_current);
 					  initEntry();
 					  BEGIN( FindMembers );
 					}
 <IDLProp>.				{ // spaces, *, or other stuff
-  					  //idlProp+=yytext;
+  					  //g_idlProp+=yytext;
  					}
-<Array>"]"		                { current->args += *yytext ;
-					  if (--squareCount<=0)
+<Array>"]"		                { g_current->args += *yytext ;
+					  if (--g_squareCount<=0)
 	                                     BEGIN( FindMembers ) ;
 					}
-<FuncFuncArray>"]"		        { current->args += *yytext ;
-					  if (--squareCount<=0)
+<FuncFuncArray>"]"		        { g_current->args += *yytext ;
+					  if (--g_squareCount<=0)
 	                                     BEGIN( Function ) ;
 					}
-<Array,FuncFuncArray>"["		{ current->args += *yytext ;
-					  squareCount++;	
+<Array,FuncFuncArray>"["		{ g_current->args += *yytext ;
+					  g_squareCount++;	
 					}
-<Array,FuncFuncArray>.			{ current->args += *yytext ; }
-<SkipSquare>"["				{ squareCount++; }
+<Array,FuncFuncArray>.			{ g_current->args += *yytext ; }
+<SkipSquare>"["				{ g_squareCount++; }
 <SkipSquare>"]"				{
-  					  if (--squareCount<=0)
-					    BEGIN( lastSquareContext );
+  					  if (--g_squareCount<=0)
+					    BEGIN( g_lastSquareContext );
   					}
 <SkipSquare>\"				{
-  					  lastStringContext=YY_START;
+  					  g_lastStringContext=YY_START;
   				          BEGIN( SkipString ); 
 					}
 <SkipSquare>[^\n\[\]\"]+
 <FindMembers>"<"			{ addType();
-					  current->type += yytext ;
+					  g_current->type += yytext ;
 					  BEGIN( Sharp ) ;
 					}
-<Sharp>">"				{ current->type += *yytext ;
-					  if (--sharpCount<=0)
+<Sharp>">"				{ g_current->type += *yytext ;
+					  if (--g_sharpCount<=0)
 	                                     BEGIN( FindMembers ) ;
 					}
-<Sharp>"<"				{ current->type += *yytext ;
-					  sharpCount++;	
+<Sharp>"<"				{ g_current->type += *yytext ;
+					  g_sharpCount++;	
 					}
 <Sharp>{BN}+				{
-                                          current->type += ' ';
+                                          g_current->type += ' ';
   					  lineCount();
 					}
-<Sharp>.				{ current->type += *yytext ; }
+<Sharp>.				{ g_current->type += *yytext ; }
 <FindFields>{ID}			{
-                                          if (insideCpp || insideObjC) 
+                                          if (g_insideCpp || g_insideObjC) 
                                           {
-                                            current->id = ClangParser::instance()->lookup(yyLineNr,yytext);
+                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
                                           }
-  					  current->bodyLine = yyLineNr;
-  					  current->name     = yytext;
+  					  g_current->bodyLine = g_yyLineNr;
+  					  g_current->name     = yytext;
 					}
 <FindFields>"("				{
   					  // Java enum initializer
   					  unput('(');
-  					  lastInitializerContext = YY_START;
-					  initBracketCount=0;
-                                          current->initializer = "=";
+  					  g_lastInitializerContext = YY_START;
+					  g_initBracketCount=0;
+                                          g_current->initializer = "=";
   					  BEGIN(ReadInitializer);
   					}
 <FindFields>"="				{
-  					  lastInitializerContext = YY_START;
-					  initBracketCount=0;
-                                          current->initializer = yytext;
+  					  g_lastInitializerContext = YY_START;
+					  g_initBracketCount=0;
+                                          g_current->initializer = yytext;
   					  BEGIN(ReadInitializer);
   					}
 <FindFields>";"                         {
-  					  if (insideJava)  // last enum field in Java class
+  					  if (g_insideJava)  // g_last enum field in Java class
 					  {
-					    if (!current->name.isEmpty())
+					    if (!g_current->name.isEmpty())
 					    {
-					      current->fileName   = yyFileName;
-					      current->startLine  = yyLineNr;
-					      current->startColumn = yyColNr;
-					      if (!(current_root->spec&Entry::Enum))
+					      g_current->fileName   = g_yyFileName;
+					      g_current->startLine  = g_yyLineNr;
+					      g_current->startColumn = g_yyColNr;
+					      if (!(g_current_root->spec&Entry::Enum))
 					      {
-					        current->type       = "@"; // enum marker
+					        g_current->type       = "@"; // enum marker
 					      }
-					      current->args       = current->args.simplifyWhiteSpace();
-					      current->name       = current->name.stripWhiteSpace();
-					      current->section    = Entry::VARIABLE_SEC;
-					      current_root->moveToSubEntryAndRefresh(current);
+					      g_current->args       = g_current->args.simplifyWhiteSpace();
+					      g_current->name       = g_current->name.stripWhiteSpace();
+					      g_current->section    = Entry::VARIABLE_SEC;
+					      g_current_root->moveToSubEntryAndRefresh(g_current);
 					      initEntry();
 					    }
 
@@ -3789,65 +3768,65 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <SkipRemainder>[^\n]*
 <FindFields>","				{
 					  //printf("adding '%s' '%s' '%s' to enum '%s' (mGrpId=%d)\n",
-					  //     current->type.data(), current->name.data(),
-					  //     current->args.data(), current_root->name.data(),current->mGrpId);
-  					  if (!current->name.isEmpty())
-					  {
-					    current->fileName   = yyFileName;
-					    current->startLine  = yyLineNr;
-					    current->startColumn = yyColNr;
-					    if (!(current_root->spec&Entry::Enum))
+					  //     g_current->type.data(), g_current->name.data(),
+					  //     g_current->args.data(), g_current_root->name.data(),g_current->mGrpId);
+  					  if (!g_current->name.isEmpty())
+					  {
+					    g_current->fileName   = g_yyFileName;
+					    g_current->startLine  = g_yyLineNr;
+					    g_current->startColumn = g_yyColNr;
+					    if (!(g_current_root->spec&Entry::Enum))
 					    {
-					      current->type       = "@"; // enum marker
+					      g_current->type       = "@"; // enum marker
 					    }
-  					    current->args       = current->args.simplifyWhiteSpace();
-  					    current->name       = current->name.stripWhiteSpace();
-					    current->section    = Entry::VARIABLE_SEC;
+  					    g_current->args       = g_current->args.simplifyWhiteSpace();
+  					    g_current->name       = g_current->name.stripWhiteSpace();
+					    g_current->section    = Entry::VARIABLE_SEC;
 					    // add to the scope of the enum
-					    if (!insideCS && !insideJava &&
-                                                !(current_root->spec&Entry::Strong)) 
+					    if (!g_insideCS && !g_insideJava &&
+                                                !(g_current_root->spec&Entry::Strong)) 
                                                 // for C# and Java 1.5+ enum values always have to be explicitly qualified,
                                                 // same for C++11 style enums (enum class Name {})
 					    {
 					      // add to the scope surrounding the enum (copy!)
                                               // we cannot during it directly as that would invalidate the iterator in parseCompounds.
-                                              //printf("*** adding outer scope entry for %s\n",current->name.data());
-                                              g_outerScopeEntries.emplace_back(current_root->parent(), std::make_unique<Entry>(*current));
+                                              //printf("*** adding outer scope entry for %s\n",g_current->name.data());
+                                              g_outerScopeEntries.emplace_back(g_current_root->parent(), std::make_unique<Entry>(*g_current));
 					    }
-					    current_root->moveToSubEntryAndRefresh(current);
+					    g_current_root->moveToSubEntryAndRefresh(g_current);
 					    initEntry();
 					  }
 					  else // probably a redundant , 
 					  {
-				     	    current->reset();
+				     	    g_current->reset();
 					    initEntry();
 					  }
   					}
 <FindFields>"["				{ // attribute list in IDL
-					  squareCount=1;
-					  lastSquareContext = YY_START;
+					  g_squareCount=1;
+					  g_lastSquareContext = YY_START;
 					  BEGIN(SkipSquare);
   					}
   /*
 <FindFieldArg>","			{ unput(*yytext); BEGIN(FindFields); }
   */
-<ReadBody,ReadNSBody,ReadBodyIntf>[^\r\n\#{}"@'/<]*	{ current->program += yytext ; }
-<ReadBody,ReadNSBody,ReadBodyIntf>"//".*		{ current->program += yytext ; }
-<ReadBody,ReadNSBody,ReadBodyIntf>"#".*	{ if (!insidePHP) 
+<ReadBody,ReadNSBody,ReadBodyIntf>[^\r\n\#{}"@'/<]*	{ g_current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>"//".*		{ g_current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>"#".*	{ if (!g_insidePHP) 
 					    REJECT;
 					  // append PHP comment.
-					  current->program += yytext ;
+					  g_current->program += yytext ;
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>@\"	{ current->program += yytext ; 
-                                          pSkipVerbString = &current->program;
-                                          lastSkipVerbStringContext=YY_START;
+<ReadBody,ReadNSBody,ReadBodyIntf>@\"	{ g_current->program += yytext ; 
+                                          g_pSkipVerbString = &g_current->program;
+                                          g_lastSkipVerbStringContext=YY_START;
                                           BEGIN( SkipVerbString );
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>"<<<"	{ if (insidePHP)
+<ReadBody,ReadNSBody,ReadBodyIntf>"<<<"	{ if (g_insidePHP)
                                           {
-                                            current->program += yytext ; 
-                                            pCopyHereDocGString = &current->program;
-                                            lastHereDocContext=YY_START;
+                                            g_current->program += yytext ; 
+                                            g_pCopyHereDocGString = &g_current->program;
+                                            g_lastHereDocContext=YY_START;
                                             BEGIN( CopyHereDoc );
                                           }
                                           else
@@ -3855,154 +3834,154 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             REJECT;
                                           }
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>\"	{ current->program += yytext ; 
-                                          pCopyQuotedGString = &current->program;
-                                          lastStringContext=YY_START;
+<ReadBody,ReadNSBody,ReadBodyIntf>\"	{ g_current->program += yytext ; 
+                                          g_pCopyQuotedGString = &g_current->program;
+                                          g_lastStringContext=YY_START;
                                           BEGIN( CopyGString );
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{B}*		{ current->program += yytext ;
-					  lastContext = YY_START ;
+<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{B}*		{ g_current->program += yytext ;
+					  g_lastContext = YY_START ;
 					  BEGIN( Comment ) ;
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{BL}		{ current->program += yytext ;
-					  ++yyLineNr ;
-					  lastContext = YY_START ;
+<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{BL}		{ g_current->program += yytext ;
+					  ++g_yyLineNr ;
+					  g_lastContext = YY_START ;
 					  BEGIN( Comment ) ;
 					}
 <ReadBody,ReadNSBody,ReadBodyIntf>"'"	{
-  					  if (!insidePHP)
+  					  if (!g_insidePHP)
 					  {
-					    current->program += yytext;
+					    g_current->program += yytext;
 					  }
 					  else
 					  { // begin of single quoted string
-					    current->program += yytext;
-                                            pCopyQuotedGString = &current->program;
-                                            lastStringContext=YY_START;
+					    g_current->program += yytext;
+                                            g_pCopyQuotedGString = &g_current->program;
+                                            g_lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
   					}
 <ReadBody,ReadNSBody,ReadBodyIntf>{CHARLIT} { 
-                                              if (insidePHP) 
+                                              if (g_insidePHP) 
 					      {
 						REJECT; // for PHP code single quotes 
 					                // are used for strings of arbitrary length
 					      }
 					      else
 					      {
-                                                current->program += yytext; 
+                                                g_current->program += yytext; 
 					      }
                                             }
-<ReadBody,ReadNSBody,ReadBodyIntf>"{"   { current->program += yytext ;
-					  ++curlyCount ;
+<ReadBody,ReadNSBody,ReadBodyIntf>"{"   { g_current->program += yytext ;
+					  ++g_curlyCount ;
 					}
 <ReadBodyIntf>"}"			{
-					  current->program += yytext ;
-					  --curlyCount ;
+					  g_current->program += yytext ;
+					  --g_curlyCount ;
   					}
-<ReadBody,ReadNSBody>"}"		{ //err("ReadBody count=%d\n",curlyCount);
-  					  if ( curlyCount>0 )
+<ReadBody,ReadNSBody>"}"		{ //err("ReadBody count=%d\n",g_curlyCount);
+  					  if ( g_curlyCount>0 )
 					  {
-					    current->program += yytext ;
-					    --curlyCount ;
+					    g_current->program += yytext ;
+					    --g_curlyCount ;
 					  }
 					  else
 					  {
-					    current->endBodyLine = yyLineNr;
-                                            Entry * original_root = current_root; // save root this namespace is in
-                                            if (current->section == Entry::NAMESPACE_SEC && current->type == "namespace")
+					    g_current->endBodyLine = g_yyLineNr;
+                                            Entry * original_root = g_current_root; // save root this namespace is in
+                                            if (g_current->section == Entry::NAMESPACE_SEC && g_current->type == "namespace")
                                             {
                                               int split_point;
                                               // save documentation values
-                                              QCString doc       = current->doc;
-                                              int      docLine   = current->docLine;
-                                              QCString docFile   = current->docFile;
-                                              QCString brief     = current->brief;
-                                              int      briefLine = current->briefLine;
-                                              QCString briefFile = current->briefFile;
+                                              QCString doc       = g_current->doc;
+                                              int      docLine   = g_current->docLine;
+                                              QCString docFile   = g_current->docFile;
+                                              QCString brief     = g_current->brief;
+                                              int      briefLine = g_current->briefLine;
+                                              QCString briefFile = g_current->briefFile;
                                               // reset documentation values
-                                              current->doc       = "";
-                                              current->docLine   = 0;
-                                              current->docFile   = "";
-                                              current->brief     = "";
-                                              current->briefLine = 0;
-                                              current->briefFile = "";
-                                              while ((split_point = current->name.find("::")) != -1)
+                                              g_current->doc       = "";
+                                              g_current->docLine   = 0;
+                                              g_current->docFile   = "";
+                                              g_current->brief     = "";
+                                              g_current->briefLine = 0;
+                                              g_current->briefFile = "";
+                                              while ((split_point = g_current->name.find("::")) != -1)
                                               {
-                                                std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*current);
-                                                current->program = "";
-                                                new_current->name  = current->name.mid(split_point + 2);
-                                                current->name  = current->name.left(split_point);
-                                                if (!current_root->name.isEmpty()) current->name.prepend(current_root->name+"::");
-
-                                                Entry *tmp = current.get();
-                                                current_root->moveToSubEntryAndKeep(current);
-                                                current_root = tmp;
-                                                current.swap(new_current);
+                                                std::unique_ptr<Entry> new_g_current = std::make_unique<Entry>(*g_current);
+                                                g_current->program = "";
+                                                new_g_current->name  = g_current->name.mid(split_point + 2);
+                                                g_current->name  = g_current->name.left(split_point);
+                                                if (!g_current_root->name.isEmpty()) g_current->name.prepend(g_current_root->name+"::");
+
+                                                Entry *tmp = g_current.get();
+                                                g_current_root->moveToSubEntryAndKeep(g_current);
+                                                g_current_root = tmp;
+                                                g_current.swap(new_g_current);
                                               }
                                               // restore documentation values
-                                              current->doc       = doc;
-                                              current->docLine   = docLine;
-                                              current->docFile   = docFile;
-                                              current->brief     = brief;
-                                              current->briefLine = briefLine;
-                                              current->briefFile = briefFile;
+                                              g_current->doc       = doc;
+                                              g_current->docLine   = docLine;
+                                              g_current->docFile   = docFile;
+                                              g_current->brief     = brief;
+                                              g_current->briefLine = briefLine;
+                                              g_current->briefFile = briefFile;
                                             }
-					    QCString &cn = current->name;
-					    QCString rn = current_root->name.copy();
-					    //printf("cn='%s' rn='%s' isTypedef=%d\n",cn.data(),rn.data(),isTypedef);
+					    QCString &cn = g_current->name;
+					    QCString rn = g_current_root->name.copy();
+					    //printf("cn='%s' rn='%s' g_isTypedef=%d\n",cn.data(),rn.data(),g_isTypedef);
 					    if (!cn.isEmpty() && !rn.isEmpty())
 					    {
 					      prependScope();
 					    }
-					    if (isTypedef && cn.isEmpty())
+					    if (g_isTypedef && cn.isEmpty())
 					    {
 					      //printf("Typedef Name\n");
 					      BEGIN( TypedefName );
 					    }
 					    else
 					    {
-					      if ((current->section == Entry::ENUM_SEC) || (current->spec&Entry::Enum))
+					      if ((g_current->section == Entry::ENUM_SEC) || (g_current->spec&Entry::Enum))
 					      {
-					        current->program+=','; // add field terminator
+					        g_current->program+=','; // add field terminator
 					      }
 					      // add compound definition to the tree
-					      current->args=removeRedundantWhiteSpace(current->args);
-					                // was: current->args.simplifyWhiteSpace();
-  					      current->type = current->type.simplifyWhiteSpace();
-  					      current->name = current->name.stripWhiteSpace();
-					      //printf("adding '%s' '%s' '%s' brief=%s insideObjC=%d %x\n",current->type.data(),current->name.data(),current->args.data(),current->brief.data(),insideObjC,current->section);
-					      if (insideObjC && 
-						  ((current->spec&Entry::Interface) || (current->spec==Entry::Category))
+					      g_current->args=removeRedundantWhiteSpace(g_current->args);
+					                // was: g_current->args.simplifyWhiteSpace();
+  					      g_current->type = g_current->type.simplifyWhiteSpace();
+  					      g_current->name = g_current->name.stripWhiteSpace();
+					      //printf("adding '%s' '%s' '%s' brief=%s g_insideObjC=%d %x\n",g_current->type.data(),g_current->name.data(),g_current->args.data(),g_current->brief.data(),g_insideObjC,g_current->section);
+					      if (g_insideObjC && 
+						  ((g_current->spec&Entry::Interface) || (g_current->spec==Entry::Category))
 						 ) // method definition follows
 					      {
 				                BEGIN( ReadBodyIntf ) ;
 					      }
 					      else
 					      {
-					        memspecEntry = current.get();
-					        current_root->copyToSubEntry( current ) ;
-						if (current->section==Entry::NAMESPACE_SEC ||
-						    (current->spec==Entry::Interface) ||
-						    insideJava || insidePHP || insideCS || insideD || insideJS ||
-                                                    insideSlice
+					        g_memspecEntry = g_current.get();
+					        g_current_root->copyToSubEntry( g_current ) ;
+						if (g_current->section==Entry::NAMESPACE_SEC ||
+						    (g_current->spec==Entry::Interface) ||
+						    g_insideJava || g_insidePHP || g_insideCS || g_insideD || g_insideJS ||
+                                                    g_insideSlice
 						   )
 						{ // namespaces and interfaces and java classes ends with a closing bracket without semicolon
-                                                  current->reset();
-                                                  current_root = original_root; // restore scope from before namespace descent
+                                                  g_current->reset();
+                                                  g_current_root = original_root; // restore scope from before namespace descent
 						  initEntry();
-						  memspecEntry = 0;
+						  g_memspecEntry = 0;
 						  BEGIN( FindMembers ) ;
 						}
 						else
 						{
                                                   static QRegExp re("@[0-9]+$");
-						  if (!isTypedef && memspecEntry &&
-                                                      memspecEntry->name.find(re)==-1) // not typedef or anonymous type (see bug691071)
+						  if (!g_isTypedef && g_memspecEntry &&
+                                                      g_memspecEntry->name.find(re)==-1) // not typedef or anonymous type (see bug691071)
 						  {
 						    // enabled the next two lines for bug 623424
-						    current->doc.resize(0);
-						    current->brief.resize(0);
+						    g_current->doc.resize(0);
+						    g_current->brief.resize(0);
 						  }
 						  BEGIN( MemberSpec ) ;
 						}
@@ -4010,19 +3989,19 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    }
 					  }
 					}
-<ReadBody>"}"{BN}+"typedef"{BN}+	{ //err("ReadBody count=%d\n",curlyCount);
+<ReadBody>"}"{BN}+"typedef"{BN}+	{ //err("ReadBody count=%d\n",g_curlyCount);
 					  lineCount();
-  					  if ( curlyCount>0 )
+  					  if ( g_curlyCount>0 )
 					  {
-					    current->program += yytext ;
-					    --curlyCount ;
+					    g_current->program += yytext ;
+					    --g_curlyCount ;
 					  }
 					  else
 					  {
-					    isTypedef = TRUE;
-					    current->endBodyLine = yyLineNr;
-					    QCString &cn = current->name;
-					    QCString rn = current_root->name.copy();
+					    g_isTypedef = TRUE;
+					    g_current->endBodyLine = g_yyLineNr;
+					    QCString &cn = g_current->name;
+					    QCString rn = g_current_root->name.copy();
 					    if (!cn.isEmpty() && !rn.isEmpty())
 					    {
 					      prependScope();
@@ -4032,38 +4011,38 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <TypedefName>("const"|"volatile"){BN}	{ // late "const" or "volatile" keyword
 					  lineCount();
-  					  current->type.prepend(yytext);
+  					  g_current->type.prepend(yytext);
   					}
 <TypedefName>{ID}			{
-					  if ((current->section == Entry::ENUM_SEC) || (current->spec&Entry::Enum))
+					  if ((g_current->section == Entry::ENUM_SEC) || (g_current->spec&Entry::Enum))
 					  {
-					    current->program+=","; // add field terminator
+					    g_current->program+=","; // add field terminator
 					  }
-  				          current->name=yytext;
+  				          g_current->name=yytext;
 					  prependScope();
-  					  current->args = current->args.simplifyWhiteSpace();
-  					  current->type = current->type.simplifyWhiteSpace();
-					  //printf("Adding compound %s %s %s\n",current->type.data(),current->name.data(),current->args.data());
-					  if (!firstTypedefEntry)
+  					  g_current->args = g_current->args.simplifyWhiteSpace();
+  					  g_current->type = g_current->type.simplifyWhiteSpace();
+					  //printf("Adding compound %s %s %s\n",g_current->type.data(),g_current->name.data(),g_current->args.data());
+					  if (!g_firstTypedefEntry)
 					  {
-					    firstTypedefEntry = current.get();
+					    g_firstTypedefEntry = g_current.get();
 					  }
-					  current_root->moveToSubEntryAndRefresh( current ) ;
+					  g_current_root->moveToSubEntryAndRefresh( g_current ) ;
 					  initEntry();
-					  isTypedef=TRUE; // to undo reset by initEntry()
+					  g_isTypedef=TRUE; // to undo reset by initEntry()
   					  BEGIN(MemberSpecSkip); 
   					}
 <TypedefName>";"			{ /* typedef of anonymous type */
-					  current->name.sprintf("@%d",anonCount++);
-					  if ((current->section == Entry::ENUM_SEC) || (current->spec&Entry::Enum))
+					  g_current->name.sprintf("@%d",g_anonCount++);
+					  if ((g_current->section == Entry::ENUM_SEC) || (g_current->spec&Entry::Enum))
 					  {
-					    current->program+=','; // add field terminator
+					    g_current->program+=','; // add field terminator
 					  }
 					  // add compound definition to the tree
-  					  current->args = current->args.simplifyWhiteSpace();
-  					  current->type = current->type.simplifyWhiteSpace();
-					  memspecEntry = current.get();
-					  current_root->moveToSubEntryAndRefresh( current ) ;
+  					  g_current->args = g_current->args.simplifyWhiteSpace();
+  					  g_current->type = g_current->type.simplifyWhiteSpace();
+					  g_memspecEntry = g_current.get();
+					  g_current_root->moveToSubEntryAndRefresh( g_current ) ;
 					  initEntry();
 					  unput(';');
 					  BEGIN( MemberSpec ) ;
@@ -4072,51 +4051,51 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  lineCount();
   					  int i=0,l=(int)yyleng,j;
 					  while (i<l && (!isId(yytext[i]))) i++;
-					  msName = QCString(yytext).right(l-i).stripWhiteSpace();
-					  j=msName.find("[");
+					  g_msName = QCString(yytext).right(l-i).stripWhiteSpace();
+					  j=g_msName.find("[");
 					  if (j!=-1) 
 					  {
-					    msArgs=msName.right(msName.length()-j);
-					    msName=msName.left(j);
+					    g_msArgs=g_msName.right(g_msName.length()-j);
+					    g_msName=g_msName.left(j);
 					  }
-					  msType=QCString(yytext).left(i);
+					  g_msType=QCString(yytext).left(i);
 
 					  // handle *pName in: typedef { ... } name, *pName;
-					  if (firstTypedefEntry) 
+					  if (g_firstTypedefEntry) 
 					  {
-					    if (firstTypedefEntry->spec&Entry::Struct)
+					    if (g_firstTypedefEntry->spec&Entry::Struct)
 					    {
-					      msType.prepend("struct "+firstTypedefEntry->name);
+					      g_msType.prepend("struct "+g_firstTypedefEntry->name);
 					    }
-					    else if (firstTypedefEntry->spec&Entry::Union)
+					    else if (g_firstTypedefEntry->spec&Entry::Union)
 					    {
-					      msType.prepend("union "+firstTypedefEntry->name);
+					      g_msType.prepend("union "+g_firstTypedefEntry->name);
 					    }
-					    else if (firstTypedefEntry->section==Entry::ENUM_SEC)
+					    else if (g_firstTypedefEntry->section==Entry::ENUM_SEC)
 					    {
-					      msType.prepend("enum "+firstTypedefEntry->name);
+					      g_msType.prepend("enum "+g_firstTypedefEntry->name);
 					    }
 					    else
 					    {
-					      msType.prepend(firstTypedefEntry->name);
+					      g_msType.prepend(g_firstTypedefEntry->name);
 					    }
 					  }
 					}
 <MemberSpec>"("				{ // function with struct return type
   					  addType();
-  					  current->name = msName;
-					  current->spec = 0;
+  					  g_current->name = g_msName;
+					  g_current->spec = 0;
   					  unput('(');
 					  BEGIN(FindMembers);
   					}
 <MemberSpec>[,;]			{
-  					  if (msName.isEmpty() && !current->name.isEmpty())
+  					  if (g_msName.isEmpty() && !g_current->name.isEmpty())
 					  { 
-					    // see if the compound does not have a name or is inside another
+					    // see if the compound does not have a name or is g_inside another
 					    // anonymous compound. If so we insert a 
 					    // special 'anonymous' variable.
-					    //Entry *p=current_root;
-					    const Entry *p=current.get();
+					    //Entry *p=g_current_root;
+					    const Entry *p=g_current.get();
 					    while (p)
 					    {
 					      // only look for class scopes, not namespace scopes
@@ -4127,164 +4106,164 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 						int pi = (i==-1) ? 0 : i+2;
 						if (p->name.at(pi)=='@')
 						{
-						  // anonymous compound inside -> insert dummy variable name
+						  // anonymous compound g_inside -> insert dummy variable name
 						  //printf("Adding anonymous variable for scope %s\n",p->name.data());
-						  msName.sprintf("@%d",anonCount++); 
+						  g_msName.sprintf("@%d",g_anonCount++); 
 						  break;
 						}
 					      }
 					      //p=p->parent;
-					      if (p==current.get()) p=current_root; else p=p->parent();
+					      if (p==g_current.get()) p=g_current_root; else p=p->parent();
 					    }
 					  }
-					  //printf("msName=%s current->name=%s\n",msName.data(),current->name.data());
-					  if (!msName.isEmpty() 
-					      /*&& msName!=current->name*/) // skip typedef T {} T;, removed due to bug608493
+					  //printf("g_msName=%s g_current->name=%s\n",g_msName.data(),g_current->name.data());
+					  if (!g_msName.isEmpty() 
+					      /*&& g_msName!=g_current->name*/) // skip typedef T {} T;, removed due to bug608493
 					  {
 					    static bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT);
 					    // case 1: typedef struct _S { ... } S_t; 
 					    // -> omit typedef and use S_t as the struct name
 					    if (typedefHidesStruct && 
-						isTypedef && 
-						((current->spec&(Entry::Struct|Entry::Union)) ||
-						 current->section==Entry::ENUM_SEC )&&
-						msType.stripWhiteSpace().isEmpty() && 
-						memspecEntry)
+						g_isTypedef && 
+						((g_current->spec&(Entry::Struct|Entry::Union)) ||
+						 g_current->section==Entry::ENUM_SEC )&&
+						g_msType.stripWhiteSpace().isEmpty() && 
+						g_memspecEntry)
 					    {
-					      memspecEntry->name=msName;
+					      g_memspecEntry->name=g_msName;
 					    }
 					    else // case 2: create a typedef field
 					    {
                                               std::unique_ptr<Entry> varEntry=std::make_unique<Entry>();
-					      varEntry->lang = language;
-					      varEntry->protection = current->protection ;
-					      varEntry->mtype = current->mtype;
-					      varEntry->virt = current->virt;
-					      varEntry->stat = current->stat;
+					      varEntry->lang = g_language;
+					      varEntry->protection = g_current->protection ;
+					      varEntry->mtype = g_current->mtype;
+					      varEntry->virt = g_current->virt;
+					      varEntry->stat = g_current->stat;
 					      varEntry->section = Entry::VARIABLE_SEC;
-					      varEntry->name = msName.stripWhiteSpace();
-					      varEntry->type = current->type.simplifyWhiteSpace()+" ";
-					      varEntry->args = msArgs; 
-					      if (isTypedef)
+					      varEntry->name = g_msName.stripWhiteSpace();
+					      varEntry->type = g_current->type.simplifyWhiteSpace()+" ";
+					      varEntry->args = g_msArgs; 
+					      if (g_isTypedef)
 					      {
 						varEntry->type.prepend("typedef ");
-						//  //printf("current->name = %s %s\n",current->name.data(),msName.data());
+						//  //printf("g_current->name = %s %s\n",g_current->name.data(),g_msName.data());
 					      }
 					      if (typedefHidesStruct &&
-						  isTypedef &&
-						  (current->spec&(Entry::Struct|Entry::Union)) &&
-						  memspecEntry
+						  g_isTypedef &&
+						  (g_current->spec&(Entry::Struct|Entry::Union)) &&
+						  g_memspecEntry
 						 ) // case 1: use S_t as type for pS_t in "typedef struct _S {} S_t, *pS_t;"
 					      {
-						varEntry->type+=memspecEntry->name+msType;
+						varEntry->type+=g_memspecEntry->name+g_msType;
 					      }
 					      else // case 2: use _S as type for for pS_t
 					      {
-						varEntry->type+=current->name+msType;
+						varEntry->type+=g_current->name+g_msType;
 					      }
-					      varEntry->fileName = yyFileName;
-					      varEntry->startLine = yyLineNr;
-					      varEntry->startColumn = yyColNr;
-					      varEntry->doc = current->doc.copy();
-					      varEntry->brief = current->brief.copy();
-					      varEntry->mGrpId = current->mGrpId;
-                                              varEntry->initializer = current->initializer;
-                                              varEntry->groups = current->groups;
-                                              varEntry->sli = current->sli;
+					      varEntry->fileName = g_yyFileName;
+					      varEntry->startLine = g_yyLineNr;
+					      varEntry->startColumn = g_yyColNr;
+					      varEntry->doc = g_current->doc.copy();
+					      varEntry->brief = g_current->brief.copy();
+					      varEntry->mGrpId = g_current->mGrpId;
+                                              varEntry->initializer = g_current->initializer;
+                                              varEntry->groups = g_current->groups;
+                                              varEntry->sli = g_current->sli;
 
 					      //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n",
 					      //      varEntry->type.data(),varEntry->name.data(),
 					      //      varEntry->args.data(),varEntry->brief.data(),varEntry->doc.data());
-					      current_root->moveToSubEntryAndKeep(varEntry);
+					      g_current_root->moveToSubEntryAndKeep(varEntry);
 					    }
 					  }
 					  if (*yytext==';') // end of a struct/class ...
 					  {
-					    if (!isTypedef && msName.isEmpty() && memspecEntry && (current->section&Entry::COMPOUND_MASK))
+					    if (!g_isTypedef && g_msName.isEmpty() && g_memspecEntry && (g_current->section&Entry::COMPOUND_MASK))
 					    { // case where a class/struct has a doc block after it
-					      if (!current->doc.isEmpty())
+					      if (!g_current->doc.isEmpty())
 					      {
-					        memspecEntry->doc += current->doc;
+					        g_memspecEntry->doc += g_current->doc;
 					      }
-					      if (!current->brief.isEmpty())
+					      if (!g_current->brief.isEmpty())
 					      {
-					        memspecEntry->brief += current->brief;
+					        g_memspecEntry->brief += g_current->brief;
 					      }
 				  	    }
-					    msType.resize(0);
-					    msName.resize(0);
-					    msArgs.resize(0);
-					    isTypedef=FALSE;
-					    firstTypedefEntry=0;
-					    memspecEntry=0;
-					    current->reset();
+					    g_msType.resize(0);
+					    g_msName.resize(0);
+					    g_msArgs.resize(0);
+					    g_isTypedef=FALSE;
+					    g_firstTypedefEntry=0;
+					    g_memspecEntry=0;
+					    g_current->reset();
 					    initEntry();
 					    BEGIN( FindMembers );
 					  }
 					  else
 					  {
-					    current->doc.resize(0);
-					    current->brief.resize(0);
+					    g_current->doc.resize(0);
+					    g_current->brief.resize(0);
 					  }
 
   					}
 <MemberSpec>"="				{ 
-  					  lastInitializerContext=YY_START;
-					  initBracketCount=0;
-                                          current->initializer = yytext;
+  					  g_lastInitializerContext=YY_START;
+					  g_initBracketCount=0;
+                                          g_current->initializer = yytext;
   					  BEGIN(ReadInitializer);
   					  /* BEGIN(MemberSpecSkip); */
 					}
   /*
 <MemberSpecSkip>"{"			{
-  					  curlyCount=0;
-					  lastCurlyContext = MemberSpecSkip;
-					  previous = current;
+  					  g_curlyCount=0;
+					  g_lastCurlyContext = MemberSpecSkip;
+					  g_previous = g_current;
   					  BEGIN(SkipCurly);
   					}
   */
 <MemberSpecSkip>","			{ BEGIN(MemberSpec); }
 <MemberSpecSkip>";"		        { unput(';'); BEGIN(MemberSpec); }
-<ReadBody,ReadNSBody,ReadBodyIntf>{BN}{1,80} { current->program += yytext ;
+<ReadBody,ReadNSBody,ReadBodyIntf>{BN}{1,80} { g_current->program += yytext ;
 					  lineCount() ;
 					}
 <ReadBodyIntf>"@end"/[^a-z_A-Z0-9]	{ // end of Objective C block
-					  current_root->moveToSubEntryAndRefresh( current ) ;
+					  g_current_root->moveToSubEntryAndRefresh( g_current ) ;
 					  initEntry();
-					  language = current->lang = SrcLangExt_Cpp; // see bug746361
-					  insideObjC=FALSE;
+					  g_language = g_current->lang = SrcLangExt_Cpp; // see bug746361
+					  g_insideObjC=FALSE;
 					  BEGIN( FindMembers ); 
   					}
-<ReadBody,ReadNSBody,ReadBodyIntf>.	{ current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>.	{ g_current->program += yytext ; }
 
 <FindMembers>"("/{BN}*"::"*{BN}*({TSCOPE}{BN}*"::")*{TSCOPE}{BN}*")"{BN}*"(" | /* typedef void (A<int>::func_t)(args...) */
 <FindMembers>("("({BN}*"::"*{BN}*{TSCOPE}{BN}*"::")*({BN}*[*&\^]{BN}*)+)+ {   /* typedef void (A::*ptr_t)(args...) or int (*func(int))[], the ^ is for Obj-C blocks */
-  					  if (insidePHP) // reference parameter
+  					  if (g_insidePHP) // reference parameter
 					  {
 					    REJECT
 					  }
 					  else
 					  {
-					    current->bodyLine = yyLineNr;
+					    g_current->bodyLine = g_yyLineNr;
 					    lineCount();
 					    addType();
-					    funcPtrType=yytext;
-					    roundCount=0;
-					    //current->type += yytext;
+					    g_funcPtrType=yytext;
+					    g_roundCount=0;
+					    //g_current->type += yytext;
 					    BEGIN( FuncPtr );
 					  }
   					}
 <FuncPtr>{SCOPENAME}			{
-  					  current->name = yytext;
-					  if (nameIsOperator(current->name))
+  					  g_current->name = yytext;
+					  if (nameIsOperator(g_current->name))
 					  {
 					    BEGIN( FuncPtrOperator );
 					  }
 					  else
 					  {
-					    if (current->name=="const" || current->name=="volatile")
+					    if (g_current->name=="const" || g_current->name=="volatile")
 					    {
-					      funcPtrType += current->name;
+					      g_funcPtrType += g_current->name;
 					    }
 					    else
 					    {
@@ -4293,65 +4272,65 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FuncPtr>.				{
-  					  //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,yyLineNr,yyFileName);
+  					  //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,g_yyLineNr,g_yyFileName);
   					}
 <FuncPtrOperator>"("{BN}*")"{BN}*/"("	{
-  					  current->name += yytext;
-					  current->name = current->name.simplifyWhiteSpace();
+  					  g_current->name += yytext;
+					  g_current->name = g_current->name.simplifyWhiteSpace();
 					  lineCount();
   					}
 <FuncPtrOperator>\n			{
                                           lineCount();
-  					  current->name += *yytext;
+  					  g_current->name += *yytext;
   					}
 <FuncPtrOperator>"("			{
   					  unput(*yytext);
 					  BEGIN( EndFuncPtr );
                                         }
 <FuncPtrOperator>.			{
-  					  current->name += *yytext;
+  					  g_current->name += *yytext;
   					}
 <EndFuncPtr>")"{BN}*/";"		{ // a variable with extra braces
  					  lineCount();
-					  current->type+=funcPtrType.data()+1;
+					  g_current->type+=g_funcPtrType.data()+1;
   					  BEGIN(FindMembers);
   					}
 <EndFuncPtr>")"{BN}*/"("		{ // a function pointer
   					  lineCount();
-					  current->type+=funcPtrType+")";
+					  g_current->type+=g_funcPtrType+")";
 					  BEGIN(FindMembers);
   					}
 <EndFuncPtr>")"{BN}*/"["		{ // an array of variables
   					  lineCount();
-					  current->type+=funcPtrType.data();
-					  current->args += ")";
+					  g_current->type+=g_funcPtrType.data();
+					  g_current->args += ")";
 					  BEGIN(FindMembers);
   					}
 <EndFuncPtr>"("				{ // a function returning a function or 
                                           // a function returning a pointer to an array
-  					  current->args += *yytext ;
-					  //roundCount=0;
+  					  g_current->args += *yytext ;
+					  //g_roundCount=0;
 					  //BEGIN( FuncFunc );
-					  current->bodyLine = yyLineNr;
-					  currentArgumentContext = FuncFuncEnd;
-					  fullArgString=current->args.copy();
-					  copyArgString=&current->args;
+					  g_current->bodyLine = g_yyLineNr;
+					  g_currentArgumentContext = FuncFuncEnd;
+					  g_fullArgString=g_current->args.copy();
+					  g_copyArgString=&g_current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
 <EndFuncPtr>"["[^\n\]]*"]"		{
-  					  funcPtrType+=yytext;
+  					  g_funcPtrType+=yytext;
   					}
 <EndFuncPtr>")"				{
   					  BEGIN(FindMembers);
   					}
 <FuncFunc>"("				{
-  					  current->args += *yytext ;
-  					  ++roundCount;
+  					  g_current->args += *yytext ;
+  					  ++g_roundCount;
 					}
 <FuncFunc>")"				{
-  					  current->args += *yytext ;
-  					  if ( roundCount )
-					    --roundCount;
+  					  g_current->args += *yytext ;
+  					  if ( g_roundCount )
+					    --g_roundCount;
 					  else
 					  {
 					    BEGIN(FuncFuncEnd);
@@ -4359,53 +4338,53 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <FuncFuncEnd>")"{BN}*"("		{
   					  lineCount();
-					  current->type+=funcPtrType+")(";
+					  g_current->type+=g_funcPtrType+")(";
 					  BEGIN(FuncFuncType);
   					}
 <FuncFuncEnd>")"{BN}*/[;{]		{
   					  lineCount();
-					  current->type+=funcPtrType.data()+1;
+					  g_current->type+=g_funcPtrType.data()+1;
   					  BEGIN(Function);
   					}
 <FuncFuncEnd>")"{BN}*/"["		{ // function returning a pointer to an array
                                           lineCount();
-					  current->type+=funcPtrType;
-					  current->args+=")";
+					  g_current->type+=g_funcPtrType;
+					  g_current->args+=")";
 					  BEGIN(FuncFuncArray);
   					}
 <FuncFuncEnd>.				{
-  					  current->args += *yytext;
+  					  g_current->args += *yytext;
   					}
 <FuncFuncType>"("			{
-  					  current->type += *yytext;
-					  roundCount++;
+  					  g_current->type += *yytext;
+					  g_roundCount++;
   					}
 <FuncFuncType>")"			{
-  					  current->type += *yytext;
-  					  if (roundCount)
-					    --roundCount;
+  					  g_current->type += *yytext;
+  					  if (g_roundCount)
+					    --g_roundCount;
 					  else
 					    BEGIN(Function);
 					}
-<FuncFuncType>{BN}*","{BN}*		{ lineCount() ; current->type += ", " ; }
-<FuncFuncType>{BN}+			{ lineCount() ; current->type += ' ' ; }
+<FuncFuncType>{BN}*","{BN}*		{ lineCount() ; g_current->type += ", " ; }
+<FuncFuncType>{BN}+			{ lineCount() ; g_current->type += ' ' ; }
 <FuncFuncType>.				{
-  					  current->type += *yytext;
+  					  g_current->type += *yytext;
   					}
 <FindMembers>"("/{BN}*{ID}{BN}*"*"{BN}*{ID}*")"{BN}*"(" { // for catching typedef void (__stdcall *f)() like definitions
-                                          if (current->type.left(7)=="typedef" && current->bodyLine==-1) 
+                                          if (g_current->type.left(7)=="typedef" && g_current->bodyLine==-1) 
 					    // the bodyLine check is to prevent this guard to be true more than once
 					  {
-  					    current->bodyLine = yyLineNr;
+  					    g_current->bodyLine = g_yyLineNr;
 					    BEGIN( GetCallType );
 					  }
-					  else if (!current->name.isEmpty()) // normal function
+					  else if (!g_current->name.isEmpty()) // normal function
 					  {
-					    current->args = yytext;
-					    current->bodyLine = yyLineNr;
-					    currentArgumentContext = FuncQual;
-					    fullArgString=current->args.copy();
-					    copyArgString=&current->args;
+					    g_current->args = yytext;
+					    g_current->bodyLine = g_yyLineNr;
+					    g_currentArgumentContext = FuncQual;
+					    g_fullArgString=g_current->args.copy();
+					    g_copyArgString=&g_current->args;
 					    BEGIN( ReadFuncArgType ) ;
 					    //printf(">>> Read function arguments!\n");
 					  }
@@ -4413,93 +4392,93 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <GetCallType>{BN}*{ID}{BN}*"*"		{
   					  lineCount();
   					  addType();
-					  funcPtrType="(";
-					  funcPtrType+=yytext;
-					  roundCount=0;
+					  g_funcPtrType="(";
+					  g_funcPtrType+=yytext;
+					  g_roundCount=0;
 					  BEGIN( FuncPtr );
   					}
 <FindMembers>"("			{ 
-                                          if (!current->name.isEmpty())
+                                          if (!g_current->name.isEmpty())
 					  {
-					    current->args = yytext;
-					    current->bodyLine = yyLineNr;
-					    currentArgumentContext = FuncQual;
-					    fullArgString=current->args.copy();
-					    copyArgString=&current->args;
+					    g_current->args = yytext;
+					    g_current->bodyLine = g_yyLineNr;
+					    g_currentArgumentContext = FuncQual;
+					    g_fullArgString=g_current->args.copy();
+					    g_copyArgString=&g_current->args;
 					    BEGIN( ReadFuncArgType ) ;
-					    //printf(">>> Read function arguments current->argList.size()=%d\n",current->argList.size());
+					    //printf(">>> Read function arguments g_current->argList.size()=%d\n",g_current->argList.size());
 					  }
 					}
   /*
 <FindMembers>"("{BN}*("void"{BN}*)?")"	{
   					  lineCount();
-  					  current->args = "()"; 
+  					  g_current->args = "()"; 
   					  BEGIN( FuncQual );
   					}
   */
 
   /*- Function argument reading rules ---------------------------------------*/
 
-<ReadFuncArgType>[^ \/\r\t\n\)\(\"\'#]+ { *copyArgString+=yytext; 
-  					  fullArgString+=yytext;
+<ReadFuncArgType>[^ \/\r\t\n\)\(\"\'#]+ { *g_copyArgString+=yytext; 
+  					  g_fullArgString+=yytext;
   					}
-<CopyArgString,CopyArgPHPString>[^\n\\\"\']+		{ *copyArgString+=yytext; 
-					  fullArgString+=yytext;
+<CopyArgString,CopyArgPHPString>[^\n\\\"\']+		{ *g_copyArgString+=yytext; 
+					  g_fullArgString+=yytext;
 					}
 <CopyArgRound>[^\/\n\)\(\"\']+		{ 
-  					  *copyArgString+=yytext; 
-  					  fullArgString+=yytext;
+  					  *g_copyArgString+=yytext; 
+  					  g_fullArgString+=yytext;
   					}
 <ReadFuncArgType,ReadTempArgs>{BN}*	{
-  					  *copyArgString+=" ";
-  					  fullArgString+=" ";
+  					  *g_copyArgString+=" ";
+  					  g_fullArgString+=" ";
   					  lineCount();
   					}
 <ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>{RAWBEGIN}	{
                                           g_delimiter = yytext+2;
                                           g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-                                          lastRawStringContext = YY_START;
-                                          pCopyRawString = copyArgString;
-                                          *pCopyRawString+=yytext;
-  					  fullArgString+=yytext;
+                                          g_lastRawStringContext = YY_START;
+                                          g_pCopyRawString = g_copyArgString;
+                                          *g_pCopyRawString+=yytext;
+  					  g_fullArgString+=yytext;
                                           BEGIN(RawString);
                                         }
 <ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>\"	{
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-					  lastCopyArgStringContext = YY_START;
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+					  g_lastCopyArgStringContext = YY_START;
   					  BEGIN( CopyArgString );
   					}
 <ReadFuncArgType,ReadTempArgs>"("	{
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-  					  argRoundCount=0; 
-					  lastCopyArgContext = YY_START;
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+  					  g_argRoundCount=0; 
+					  g_lastCopyArgContext = YY_START;
 					  BEGIN( CopyArgRound ); 
   					}
 <ReadFuncArgType>")"			{ 
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-					  stringToArgumentList(fullArgString,current->argList);
-					  if (insideJS)
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+					  stringToArgumentList(g_fullArgString,g_current->argList);
+					  if (g_insideJS)
 					  {
-					    fixArgumentListForJavaScript(current->argList);
+					    fixArgumentListForJavaScript(g_current->argList);
 					  }
-                                          handleParametersCommentBlocks(current->argList);
+                                          handleParametersCommentBlocks(g_current->argList);
 
-					  /* remember the current documentation block, since
+					  /* remember the g_current documentation block, since
 					     we could overwrite it with the documentation of
 					     a function argument, which we then have to correct later
 					     on
 					   */
-					  docBackup = current->doc;
-					  briefBackup = current->brief;
+					  g_docBackup = g_current->doc;
+					  g_briefBackup = g_current->brief;
 
-					  BEGIN( currentArgumentContext );
+					  BEGIN( g_currentArgumentContext );
 					}
 	/* a special comment */
 <ReadFuncArgType,ReadTempArgs>("/*"[*!]|"//"[/!])("<"?)	{ 
-                                          if (currentArgumentContext==DefineEnd)
+                                          if (g_currentArgumentContext==DefineEnd)
 					  {
 					    // for defines we interpret a comment
 					    // as documentation for the define 
@@ -4507,17 +4486,17 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      unput(yytext[i]);
 					    }
-					    stringToArgumentList(fullArgString,current->argList);
-                                            handleParametersCommentBlocks(current->argList);
-					    BEGIN( currentArgumentContext );
+					    stringToArgumentList(g_fullArgString,g_current->argList);
+                                            handleParametersCommentBlocks(g_current->argList);
+					    BEGIN( g_currentArgumentContext );
 					  }
 					  else // not a define
 					  {
 					    // for functions we interpret a comment
 					    // as documentation for the argument
-					    fullArgString+=yytext;
-					    lastCopyArgChar=0;
-					    lastCommentInArgContext=YY_START;
+					    g_fullArgString+=yytext;
+					    g_lastCopyArgChar=0;
+					    g_lastCommentInArgContext=YY_START;
 					    if (yytext[1]=='/')
 					      BEGIN( CopyArgCommentLine );
 					    else
@@ -4527,30 +4506,30 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 	/* a non-special comment */
 <ReadFuncArgType,ReadTempArgs>"/**/"	{ /* empty comment */ }
 <ReadFuncArgType,ReadTempArgs>"/*"	{
-  					  lastCContext = YY_START;
+  					  g_lastCContext = YY_START;
 					  BEGIN( SkipComment );
   					}
 <ReadFuncArgType,ReadTempArgs>"//"	{
-  					  lastCContext = YY_START;
+  					  g_lastCContext = YY_START;
 					  BEGIN( SkipCxxComment );
   					}
   /*
-<ReadFuncArgType,ReadTempArgs>"'#"	{ if (insidePHP)
+<ReadFuncArgType,ReadTempArgs>"'#"	{ if (g_insidePHP)
                                             REJECT;
-  					  *copyArgString+=yytext; 
-  					  fullArgString+=yytext; 
+  					  *g_copyArgString+=yytext; 
+  					  g_fullArgString+=yytext; 
 					}
 <ReadFuncArgType,ReadTempArgs>"#"	{
-  					  if (!insidePHP)
+  					  if (!g_insidePHP)
   					    REJECT;
-  					  lastCContext = YY_START;
+  					  g_lastCContext = YY_START;
 					  BEGIN( SkipCxxComment );
   					}
   */
 	/* ')' followed by a special comment */
 <ReadFuncArgType>")"{BN}*("/*"[*!]|"//"[/!])"<"	{
   					  lineCount();
-                                          if (currentArgumentContext==DefineEnd)
+                                          if (g_currentArgumentContext==DefineEnd)
 					  {
 					    // for defines we interpret a comment
 					    // as documentation for the define 
@@ -4558,21 +4537,21 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      unput(yytext[i]);
 					    }
-					    *copyArgString+=*yytext;
-					    fullArgString+=*yytext;
-					    stringToArgumentList(fullArgString,current->argList);
-                                            handleParametersCommentBlocks(current->argList);
-					    BEGIN( currentArgumentContext );
+					    *g_copyArgString+=*yytext;
+					    g_fullArgString+=*yytext;
+					    stringToArgumentList(g_fullArgString,g_current->argList);
+                                            handleParametersCommentBlocks(g_current->argList);
+					    BEGIN( g_currentArgumentContext );
 					  }
 					  else
 					  {
 					    // for functions we interpret a comment
-					    // as documentation for the last argument
-					    lastCopyArgChar=*yytext;
+					    // as documentation for the g_last argument
+					    g_lastCopyArgChar=*yytext;
 					    QCString text=&yytext[1];
 					    text=text.stripWhiteSpace();
-					    lastCommentInArgContext=YY_START;
-					    fullArgString+=text;
+					    g_lastCommentInArgContext=YY_START;
+					    g_fullArgString+=text;
 					    if (text.find("//")!=-1)
 					      BEGIN( CopyArgCommentLine );
 					    else
@@ -4580,152 +4559,152 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <CopyArgComment>^{B}*"*"+/{BN}+		
-<CopyArgComment>[^\n\\\@\*]+		{ fullArgString+=yytext; }
-<CopyArgComment>"*/"			{ fullArgString+=yytext; 
-  					  if (lastCopyArgChar!=0)
-					    unput(lastCopyArgChar); 
-                                          BEGIN( lastCommentInArgContext ); 
+<CopyArgComment>[^\n\\\@\*]+		{ g_fullArgString+=yytext; }
+<CopyArgComment>"*/"			{ g_fullArgString+=yytext; 
+  					  if (g_lastCopyArgChar!=0)
+					    unput(g_lastCopyArgChar); 
+                                          BEGIN( g_lastCommentInArgContext ); 
 					}
-<CopyArgCommentLine>\n			{ fullArgString+=yytext;
+<CopyArgCommentLine>\n			{ g_fullArgString+=yytext;
                                           lineCount();
-  					  if (lastCopyArgChar!=0)
-					    unput(lastCopyArgChar);
-					  BEGIN( lastCommentInArgContext );
+  					  if (g_lastCopyArgChar!=0)
+					    unput(g_lastCopyArgChar);
+					  BEGIN( g_lastCommentInArgContext );
   					}
 <CopyArgCommentLine>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"dot"|"code")/[^a-z_A-Z0-9\-]	{ // verbatim command (which could contain nested comments!)
-				          docBlockName=&yytext[1];
-  					  fullArgString+=yytext;
+				          g_docBlockName=&yytext[1];
+  					  g_fullArgString+=yytext;
 					  BEGIN(CopyArgVerbatim);
   					}
 <CopyArgCommentLine>{CMD}("f$"|"f["|"f{")	        {
-				          docBlockName=&yytext[1];
-					  if (docBlockName.at(1)=='[')
+				          g_docBlockName=&yytext[1];
+					  if (g_docBlockName.at(1)=='[')
 					  {
-				            docBlockName.at(1)='}';
+				            g_docBlockName.at(1)='}';
 					  }
-					  if (docBlockName.at(1)=='{')
+					  if (g_docBlockName.at(1)=='{')
 					  {
-				            docBlockName.at(1)='}';
+				            g_docBlockName.at(1)='}';
 					  }
-  					  fullArgString+=yytext;
+  					  g_fullArgString+=yytext;
   					  BEGIN(CopyArgVerbatim);
                                         }
 <CopyArgVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"enddot"|"endcode"|"f$"|"f]"|"f}")/[^a-z_A-Z0-9\-] { // end of verbatim block
-  					  fullArgString+=yytext;
+  					  g_fullArgString+=yytext;
 				          if (yytext[1]=='f') // end of formula
 				          {
 				            BEGIN(CopyArgCommentLine);
 				          }
-					  if (&yytext[4]==docBlockName)
+					  if (&yytext[4]==g_docBlockName)
 					  {
   					    BEGIN(CopyArgCommentLine);
 					  }
   					}
-<CopyArgCommentLine>[^\\\@\n]+		{ fullArgString+=yytext; }
-<CopyArgCommentLine>.			{ fullArgString+=*yytext; }
-<CopyArgComment,CopyArgVerbatim>\n	{ fullArgString+=*yytext; lineCount(); }
-<CopyArgComment,CopyArgVerbatim>.	{ fullArgString+=*yytext; }
+<CopyArgCommentLine>[^\\\@\n]+		{ g_fullArgString+=yytext; }
+<CopyArgCommentLine>.			{ g_fullArgString+=*yytext; }
+<CopyArgComment,CopyArgVerbatim>\n	{ g_fullArgString+=*yytext; lineCount(); }
+<CopyArgComment,CopyArgVerbatim>.	{ g_fullArgString+=*yytext; }
 <CopyArgComment>{CMD}("brief"|"short"){B}+ {
-  					  warn(yyFileName,yyLineNr,
-					      "Ignoring %cbrief command inside argument documentation",*yytext
+  					  warn(g_yyFileName,g_yyLineNr,
+					      "Ignoring %cbrief command g_inside argument documentation",*yytext
 					     );
-                                          fullArgString+=' ';
+                                          g_fullArgString+=' ';
                                         }
 <ReadTempArgs>"<"			{
-					  *copyArgString+=*yytext;
-					  fullArgString+=*yytext;
-					  argSharpCount=1;
+					  *g_copyArgString+=*yytext;
+					  g_fullArgString+=*yytext;
+					  g_argSharpCount=1;
 					  BEGIN( CopyArgSharp );
 					}
 <ReadTempArgs>">"			{
-					  *copyArgString+=*yytext;
-					  fullArgString+=*yytext;
-					  //printf("end template list '%s'\n",copyArgString->data());
-					  stringToArgumentList(fullArgString,*currentArgumentList);
-					  BEGIN( currentArgumentContext );
+					  *g_copyArgString+=*yytext;
+					  g_fullArgString+=*yytext;
+					  //printf("end template list '%s'\n",g_copyArgString->data());
+					  stringToArgumentList(g_fullArgString,*g_currentArgumentList);
+					  BEGIN( g_currentArgumentContext );
 					}
 <CopyArgRound>"("			{
-  					  argRoundCount++;
-					  *copyArgString+=*yytext;
-					  fullArgString+=*yytext;
+  					  g_argRoundCount++;
+					  *g_copyArgString+=*yytext;
+					  g_fullArgString+=*yytext;
   					}
 <CopyArgRound>")"			{
-					  *copyArgString+=*yytext;
-					  fullArgString+=*yytext;
-					  if (argRoundCount>0) 
-					    argRoundCount--;
+					  *g_copyArgString+=*yytext;
+					  g_fullArgString+=*yytext;
+					  if (g_argRoundCount>0) 
+					    g_argRoundCount--;
 					  else 
-					    BEGIN( lastCopyArgContext );
+					    BEGIN( g_lastCopyArgContext );
   					}
 <CopyArgSharp>"("                       {
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-  					  argRoundCount=0; 
-					  lastCopyArgContext = YY_START;
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+  					  g_argRoundCount=0; 
+					  g_lastCopyArgContext = YY_START;
 					  BEGIN( CopyArgRound ); 
                                         }
 <CopyArgSharp>"<"			{
-  					  argSharpCount++;
-					  //printf("argSharpCount++=%d  copy\n",argSharpCount);
-					  *copyArgString+=*yytext;
-					  fullArgString+=*yytext;
+  					  g_argSharpCount++;
+					  //printf("g_argSharpCount++=%d  copy\n",g_argSharpCount);
+					  *g_copyArgString+=*yytext;
+					  g_fullArgString+=*yytext;
   					}
 <CopyArgSharp>">"			{
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-					  argSharpCount--;
-					  if (argSharpCount>0)
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+					  g_argSharpCount--;
+					  if (g_argSharpCount>0)
 					  {
-					    //printf("argSharpCount--=%d copy\n",argSharpCount);
+					    //printf("g_argSharpCount--=%d copy\n",g_argSharpCount);
 					  }
 					  else
 					  {
 					    BEGIN( ReadTempArgs );
-					    //printf("end of argSharpCount\n");
+					    //printf("end of g_argSharpCount\n");
 					  }
   					}
 <CopyArgString,CopyArgPHPString>\\.	{
-  					  *copyArgString+=yytext;
-  					  fullArgString+=yytext;
+  					  *g_copyArgString+=yytext;
+  					  g_fullArgString+=yytext;
   					}
 <CopyArgString>\"			{
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-					  BEGIN( lastCopyArgStringContext );
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+					  BEGIN( g_lastCopyArgStringContext );
   					}
 <CopyArgPHPString>\'			{
-  					  *copyArgString+=*yytext;
-  					  fullArgString+=*yytext;
-					  BEGIN( lastCopyArgStringContext );
+  					  *g_copyArgString+=*yytext;
+  					  g_fullArgString+=*yytext;
+					  BEGIN( g_lastCopyArgStringContext );
   					}
 <ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>{CHARLIT}     { 
-                                          if (insidePHP)
+                                          if (g_insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-  					    *copyArgString+=yytext; 
-  					    fullArgString+=yytext; 
+  					    *g_copyArgString+=yytext; 
+  					    g_fullArgString+=yytext; 
 					  }
 					}
 <ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>\'     { 
-  					  *copyArgString+=yytext; 
-  					  fullArgString+=yytext; 
-					  if (insidePHP)
+  					  *g_copyArgString+=yytext; 
+  					  g_fullArgString+=yytext; 
+					  if (g_insidePHP)
 					  {
-					    lastCopyArgStringContext=YY_START;
+					    g_lastCopyArgStringContext=YY_START;
 					    BEGIN(CopyArgPHPString);
 					  }
   					}
 <ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>\n  { 
                                           lineCount();
-					  *copyArgString+=*yytext; 
-					  fullArgString+=*yytext; 
+					  *g_copyArgString+=*yytext; 
+					  g_fullArgString+=*yytext; 
 					}
 <ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>.	  { 
-  					  *copyArgString+=*yytext; 
-  					  fullArgString+=*yytext; 
+  					  *g_copyArgString+=*yytext; 
+  					  g_fullArgString+=*yytext; 
 					}
 
 
@@ -4733,28 +4712,28 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   /*------------------------------------------------------------------------*/
 
 
-<FuncRound>"("				{ current->args += *yytext ;
-					  ++roundCount ;
+<FuncRound>"("				{ g_current->args += *yytext ;
+					  ++g_roundCount ;
 					}
-<FuncRound>")"                          { current->args += *yytext ; 
-					  if ( roundCount )
-					    --roundCount ;
+<FuncRound>")"                          { g_current->args += *yytext ; 
+					  if ( g_roundCount )
+					    --g_roundCount ;
 				          else
 					    BEGIN( FuncQual ) ;
 					}
   /*
-<FuncQual>"#"				{ if (insidePHP)
+<FuncQual>"#"				{ if (g_insidePHP)
   					    REJECT;
-  					  lastCPPContext = YY_START;
+  					  g_lastCPPContext = YY_START;
   					  BEGIN(SkipCPP);
 					}
   */
 <FuncQual>[{:;,]                        {
                                           if ( qstrcmp(yytext,";")==0 && 
-					       insidePHP && 
-					       !containsWord(current->type,"function") )
+					       g_insidePHP && 
+					       !containsWord(g_current->type,"function") )
                                           {
-                                            current->reset();
+                                            g_current->reset();
                                             initEntry();
                                             BEGIN( FindMembers );
                                           }
@@ -4765,88 +4744,88 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                         }
 <FuncQual>{BN}*"abstract"{BN}*          { // pure virtual member function
                                           lineCount() ; 
-                                          current->virt = Pure;
-                                          current->args += " override "; 
+                                          g_current->virt = Pure;
+                                          g_current->args += " override "; 
                                         }
 <FuncQual,TrailingReturn>{BN}*"override"{BN}*          { // C++11 overridden virtual member function
                                           lineCount() ; 
-                                          current->spec |= Entry::Override;
-                                          current->args += " override "; 
+                                          g_current->spec |= Entry::Override;
+                                          g_current->args += " override "; 
                                           BEGIN(FuncQual);
                                         }
 <FuncQual,TrailingReturn>{BN}*"final"{BN}*             { // C++11 final method
                                           lineCount() ; 
-                                          current->spec |= Entry::Final;
-                                          current->args += " final "; 
+                                          g_current->spec |= Entry::Final;
+                                          g_current->args += " final "; 
                                           BEGIN(FuncQual);
                                         }
 <FuncQual>{BN}*"sealed"{BN}*            { // sealed member function
                                           lineCount() ; 
-                                          current->spec |= Entry::Sealed;
-                                          current->args += " sealed "; 
+                                          g_current->spec |= Entry::Sealed;
+                                          g_current->args += " sealed "; 
                                         }
 <FuncQual>{BN}*"new"{BN}*               { // new member function
                                           lineCount() ; 
-                                          current->spec |= Entry::New;
-                                          current->args += " new "; 
+                                          g_current->spec |= Entry::New;
+                                          g_current->args += " new "; 
                                         }
 <FuncQual>{BN}*"const"{BN}*       	{ // const member function
   					  lineCount() ; 
-  					  current->args += " const "; 
-					  current->argList.constSpecifier=TRUE;
+  					  g_current->args += " const "; 
+					  g_current->argList.constSpecifier=TRUE;
 					}
 <FuncQual>{BN}*"volatile"{BN}*    	{ // volatile member function
   					  lineCount() ; 
-  					  current->args += " volatile "; 
-					  current->argList.volatileSpecifier=TRUE;
+  					  g_current->args += " volatile "; 
+					  g_current->argList.volatileSpecifier=TRUE;
 					}
 <FuncQual>{BN}*"noexcept"{BN}*    	{ // noexcept qualifier
   					  lineCount() ; 
-  					  current->args += " noexcept "; 
-					  current->spec |= Entry::NoExcept;
+  					  g_current->args += " noexcept "; 
+					  g_current->spec |= Entry::NoExcept;
 					}
 <FuncQual>{BN}*"noexcept"{BN}*"("    	{ // noexcept expression
   					  lineCount() ; 
-  					  current->args += " noexcept("; 
-					  current->spec |= Entry::NoExcept;
-  					  lastRoundContext=FuncQual;
-  					  pCopyRoundString=&current->args;
-					  roundCount=0;
+  					  g_current->args += " noexcept("; 
+					  g_current->spec |= Entry::NoExcept;
+  					  g_lastRoundContext=FuncQual;
+  					  g_pCopyRoundString=&g_current->args;
+					  g_roundCount=0;
                                           BEGIN(CopyRound);
                                         }
 <FuncQual>{BN}*"&"                      {
-                                          current->args += " &";
-                                          current->argList.refQualifier=RefQualifierLValue;
+                                          g_current->args += " &";
+                                          g_current->argList.refQualifier=RefQualifierLValue;
                                         }
 <FuncQual>{BN}*"&&"                     {
-                                          current->args += " &&";
-                                          current->argList.refQualifier=RefQualifierRValue;
+                                          g_current->args += " &&";
+                                          g_current->argList.refQualifier=RefQualifierRValue;
                                         }
 
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"0"{BN}*  	{ // pure virtual member function
   					  lineCount() ; 
-					  current->args += " = 0"; 
-					  current->virt = Pure; 
-					  current->argList.pureSpecifier=TRUE;
+					  g_current->args += " = 0"; 
+					  g_current->virt = Pure; 
+					  g_current->argList.pureSpecifier=TRUE;
                                           BEGIN(FuncQual);
 					}
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"delete"{BN}*     { // C++11 explicitly delete member
                                           lineCount();
-                                          current->args += " = delete";
-					  current->spec |= Entry::Delete;
-					  current->argList.isDeleted=TRUE;
+                                          g_current->args += " = delete";
+					  g_current->spec |= Entry::Delete;
+					  g_current->argList.isDeleted=TRUE;
                                           BEGIN(FuncQual);
                                         }
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"default"{BN}*     { // C++11 explicitly defaulted constructor/assignment operator
                                           lineCount();
-                                          current->args += " = default";
-					  current->spec |= Entry::Default;
+                                          g_current->args += " = default";
+					  g_current->spec |= Entry::Default;
                                           BEGIN(FuncQual);
                                         }
 <FuncQual>{BN}*"->"{BN}*                {
                                           lineCount();
-                                          current->argList.trailingReturnType = " -> ";
-                                          current->args += " -> ";
+                                          g_current->argList.trailingReturnType = " -> ";
+                                          g_current->args += " -> ";
                                           BEGIN(TrailingReturn);
                                         }
 <TrailingReturn>[{;]                    {
@@ -4854,30 +4833,30 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(FuncQual);
                                         }
 <TrailingReturn>.                       {
-                                          current->argList.trailingReturnType+=yytext;
-                                          current->args+=yytext;
+                                          g_current->argList.trailingReturnType+=yytext;
+                                          g_current->args+=yytext;
                                         }
 <TrailingReturn>\n                      {
                                           lineCount();
-                                          current->argList.trailingReturnType+=yytext;
-                                          current->args+=' ';
+                                          g_current->argList.trailingReturnType+=yytext;
+                                          g_current->args+=' ';
                                         }
 <FuncRound,FuncFunc>{BN}*","{BN}*	{ 
   					  lineCount() ; 
-					  current->args += ", " ; 
+					  g_current->args += ", " ; 
 					}
 <FuncQual,FuncRound,FuncFunc>{BN}+   	{ 
   					  lineCount() ; 
-					  current->args += ' ' ; 
+					  g_current->args += ' ' ; 
 					}
-<Function,FuncQual,FuncRound,FuncFunc>"#" { if (insidePHP)
+<Function,FuncQual,FuncRound,FuncFunc>"#" { if (g_insidePHP)
   					    REJECT;
-  					  lastCPPContext = YY_START;
+  					  g_lastCPPContext = YY_START;
   					  BEGIN(SkipCPP);
 					}	
 <FuncQual>"="				{ 
-                                          if (insideCli && 
-					      (current_root->section&Entry::COMPOUND_MASK) 
+                                          if (g_insideCli && 
+					      (g_current_root->section&Entry::COMPOUND_MASK) 
 					     )
 					  {
 					    BEGIN(CliOverride);
@@ -4885,9 +4864,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
                                             // typically an initialized function pointer
-  					    lastInitializerContext=YY_START;
-					    initBracketCount=0;
-                                            current->initializer = yytext;
+  					    g_lastInitializerContext=YY_START;
+					    g_initBracketCount=0;
+                                            g_current->initializer = yytext;
   					    BEGIN(ReadInitializer);
 					  }
   					}
@@ -4907,58 +4886,58 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(FuncQual);
   					}
 <FuncPtrInit>\"				{
-                                          current->args += *yytext; 
-  					  pCopyQuotedString=&current->args;
-					  lastStringContext=FuncPtrInit;
+                                          g_current->args += *yytext; 
+  					  g_pCopyQuotedString=&g_current->args;
+					  g_lastStringContext=FuncPtrInit;
 					  BEGIN(CopyString);
 					}
 <FuncPtrInit>\'				{
-                                          current->args += *yytext; 
-					  if (insidePHP)
+                                          g_current->args += *yytext; 
+					  if (g_insidePHP)
 					  {
-					    pCopyQuotedString=&current->args;
-					    lastStringContext=FuncPtrInit;
+					    g_pCopyQuotedString=&g_current->args;
+					    g_lastStringContext=FuncPtrInit;
 					    BEGIN(CopyPHPString);
 					  }
 					}
 <FuncPtrInit>{CHARLIT}			{
-                                          if (insidePHP)
+                                          if (g_insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            current->args += yytext; 
+                                            g_current->args += yytext; 
 					  }
   					}
 <FuncPtrInit>{ID}			{
-                                          current->args += yytext; 
+                                          g_current->args += yytext; 
 					}
 <FuncPtrInit>.				{
-                                          current->args += *yytext; 
+                                          g_current->args += *yytext; 
   					}
 <FuncPtrInit>\n				{
-                                          current->args += *yytext; 
+                                          g_current->args += *yytext; 
                                           lineCount();
   					}
 <FuncQual>{ID}				{ // typically a K&R style C function
-                                          if (insideCS && qstrcmp(yytext,"where")==0)
+                                          if (g_insideCS && qstrcmp(yytext,"where")==0)
 					  { 
 					    // type constraint for a method
-					    current->typeConstr.clear();
-					    current->typeConstr.push_back(Argument());
-					    lastCSConstraint = YY_START;
+					    g_current->typeConstr.clear();
+					    g_current->typeConstr.push_back(Argument());
+					    g_lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
 					  else if (checkForKnRstyleC())
 					  {
-                                            current->args = yytext; 
-					    oldStyleArgType.resize(0);
+                                            g_current->args = yytext; 
+					    g_oldStyleArgType.resize(0);
 					    BEGIN(OldStyleArgs);
 					  }
 					  else
 					  {
-                                            current->args += yytext; 
+                                            g_current->args += yytext; 
 					  }
   					}
 <OldStyleArgs>[,;]			{
@@ -4966,36 +4945,36 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  QCString oldStyleArgName;
 					  splitKnRArg(oldStyleArgPtr,oldStyleArgName);
 					  QCString doc,brief;
-					  if (current->doc!=docBackup)
+					  if (g_current->doc!=g_docBackup)
 					  {
-                                            doc=current->doc.copy();
-					    current->doc=docBackup;
+                                            doc=g_current->doc.copy();
+					    g_current->doc=g_docBackup;
 					  }
-					  if (current->brief!=briefBackup)
+					  if (g_current->brief!=g_briefBackup)
 					  {
-                                            brief=current->brief.copy();
-					    current->brief=briefBackup;
+                                            brief=g_current->brief.copy();
+					    g_current->brief=g_briefBackup;
 					  }
-					  addKnRArgInfo(oldStyleArgType+oldStyleArgPtr,
+					  addKnRArgInfo(g_oldStyleArgType+oldStyleArgPtr,
 					                oldStyleArgName,brief,doc);
-					  current->args.resize(0);
-					  if (*yytext==';') oldStyleArgType.resize(0);
+					  g_current->args.resize(0);
+					  if (*yytext==';') g_oldStyleArgType.resize(0);
   					}
-<OldStyleArgs>{ID} 			{ current->args += yytext; }
+<OldStyleArgs>{ID} 			{ g_current->args += yytext; }
 <OldStyleArgs>"{"			{
-                                          if (current->argList.empty())
+                                          if (g_current->argList.empty())
                                           {
-                                            current->argList.noParameters=TRUE;
+                                            g_current->argList.noParameters=TRUE;
                                           }
-  					  current->args = argListToString(current->argList);
+  					  g_current->args = argListToString(g_current->argList);
   					  unput('{');
 					  BEGIN(FuncQual);
   					}
-<OldStyleArgs>.	 			{ current->args += *yytext; }
-<FuncQual,FuncRound,FuncFunc>.		{ current->args += *yytext; }
+<OldStyleArgs>.	 			{ g_current->args += *yytext; }
+<FuncQual,FuncRound,FuncFunc>.		{ g_current->args += *yytext; }
 <FuncQual>{BN}*"try:"			|
 <FuncQual>{BN}*"try"{BN}+		{ /* try-function-block */ 
-					  insideTryBlock=TRUE;
+					  g_insideTryBlock=TRUE;
 					  lineCount();
   					  if (yytext[yyleng-1]==':')
 					  {
@@ -5004,33 +4983,33 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <FuncQual>{BN}*"throw"{BN}*"("		{ // C++ style throw clause
-  					  current->exception = " throw (" ;
-					  roundCount=0;
+  					  g_current->exception = " throw (" ;
+					  g_roundCount=0;
 					  lineCount() ;
 					  BEGIN( ExcpRound ) ;
 					}
 <FuncQual>{BN}*"raises"{BN}*"("         {
-  					  current->exception = " raises (" ;
+  					  g_current->exception = " raises (" ;
 					  lineCount() ;
-					  roundCount=0;
+					  g_roundCount=0;
 					  BEGIN( ExcpRound ) ;
   					}
 <FuncQual>{BN}*"throws"{BN}+		{ // Java style throw clause
-  					  current->exception = " throws " ;
+  					  g_current->exception = " throws " ;
 					  lineCount() ;
 					  BEGIN( ExcpList );
   					}
-<ExcpRound>"("				{ current->exception += *yytext ;
-					  ++roundCount ;
+<ExcpRound>"("				{ g_current->exception += *yytext ;
+					  ++g_roundCount ;
 					}
-<ExcpRound>")"                          { current->exception += *yytext ; 
-					  if ( roundCount )
-					    --roundCount ;
+<ExcpRound>")"                          { g_current->exception += *yytext ; 
+					  if ( g_roundCount )
+					    --g_roundCount ;
 				          else
 					    BEGIN( FuncQual ) ;
 					}
 <ExcpRound>.				{
-  					  current->exception += *yytext;
+  					  g_current->exception += *yytext;
   					}
 <ExcpList>"{"				{
   					  unput('{'); BEGIN( FuncQual );
@@ -5039,101 +5018,101 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  unput(';'); BEGIN( FuncQual );
   					}
 <ExcpList>"\n"				{
-  					  current->exception += ' ';
+  					  g_current->exception += ' ';
                                           lineCount();
   					}
 <ExcpList>.				{
-  					  current->exception += *yytext;
+  					  g_current->exception += *yytext;
   					}
-<Function>"("				{ current->type += current->name ;
-					  current->name  = current->args ;
-					  current->args  = yytext ;
-					  roundCount=0;
+<Function>"("				{ g_current->type += g_current->name ;
+					  g_current->name  = g_current->args ;
+					  g_current->args  = yytext ;
+					  g_roundCount=0;
 					  BEGIN( FuncRound ) ;
 					}
 <Function>":"				{
-  					  if (!insidePHP) BEGIN(SkipInits);
+  					  if (!g_insidePHP) BEGIN(SkipInits);
   					}
 <Function>[;{,]				{ 
-					  current->name=current->name.simplifyWhiteSpace();
-  					  current->type=current->type.simplifyWhiteSpace();
-					  current->args=removeRedundantWhiteSpace(current->args);
-					                // was: current->args.simplifyWhiteSpace();
-					  current->fileName = yyFileName;
-					  current->startLine = yyBegLineNr;
-					  current->startColumn = yyBegColNr;
+					  g_current->name=g_current->name.simplifyWhiteSpace();
+  					  g_current->type=g_current->type.simplifyWhiteSpace();
+					  g_current->args=removeRedundantWhiteSpace(g_current->args);
+					                // was: g_current->args.simplifyWhiteSpace();
+					  g_current->fileName = g_yyFileName;
+					  g_current->startLine = g_yyBegLineNr;
+					  g_current->startColumn = g_yyBegColNr;
 					  static QRegExp re("([^)]*[*&][^)]*)"); // (...*...)
-					  if (*yytext!=';' || (current_root->section&Entry::COMPOUND_MASK) )
+					  if (*yytext!=';' || (g_current_root->section&Entry::COMPOUND_MASK) )
 					  {
-					    int tempArg=current->name.find('<');
-                                            int ts=current->type.find('<');
-                                            int te=current->type.findRev('>');
-                                            int ti=current->type.find(re,0);
+					    int tempArg=g_current->name.find('<');
+                                            int ts=g_current->type.find('<');
+                                            int te=g_current->type.findRev('>');
+                                            int ti=g_current->type.find(re,0);
 
                                             // bug677315: A<int(void *, char *)> get(); is not a function pointer
                                             bool isFunction = ti==-1 || // not a (...*...) pattern
                                                               (ts!=-1 && ts<te && ts<ti && ti<te); // (...*...) is part of a template argument list
                                                               
                                             //printf("type=%s ts=%d te=%d ti=%d isFunction=%d\n",
-                                            //    current->type.data(),ts,te,ti,isFunction);
+                                            //    g_current->type.data(),ts,te,ti,isFunction);
 					    QCString tempName;
-					    if (tempArg==-1) tempName=current->name; else tempName=current->name.left(tempArg);
-					    if (!current->type.isEmpty() &&
-						(!isFunction || current->type.left(8)=="typedef "))
+					    if (tempArg==-1) tempName=g_current->name; else tempName=g_current->name.left(tempArg);
+					    if (!g_current->type.isEmpty() &&
+						(!isFunction || g_current->type.left(8)=="typedef "))
 					    {
-					      //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", current->type.data(),current->name.data(),current->args.data());
-					      if (isTypedef && current->type.left(8)!="typedef ")
+					      //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", g_current->type.data(),g_current->name.data(),g_current->args.data());
+					      if (g_isTypedef && g_current->type.left(8)!="typedef ")
 					      {
-						current->type.prepend("typedef ");
+						g_current->type.prepend("typedef ");
 					      }
-					      current->section = Entry::VARIABLE_SEC ;
+					      g_current->section = Entry::VARIABLE_SEC ;
 					    }
 					    else	      
 					    {
-					      //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", current->type.data(),current->name.data(),current->args.data());
-					      current->section = Entry::FUNCTION_SEC ;
-			                      current->proto = *yytext==';';
+					      //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", g_current->type.data(),g_current->name.data(),g_current->args.data());
+					      g_current->section = Entry::FUNCTION_SEC ;
+			                      g_current->proto = *yytext==';';
 					    }
 					  }
 					  else // a global function prototype or function variable
 					  {
-					    //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",current->type.data(),current->name.data(),current->args.data());
-					    if (!current->type.isEmpty() && 
-						(current->type.find(re,0)!=-1 || current->type.left(8)=="typedef "))
+					    //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",g_current->type.data(),g_current->name.data(),g_current->args.data());
+					    if (!g_current->type.isEmpty() && 
+						(g_current->type.find(re,0)!=-1 || g_current->type.left(8)=="typedef "))
 					    {
-					      if (isTypedef && current->type.left(8)!="typedef ")
+					      if (g_isTypedef && g_current->type.left(8)!="typedef ")
 					      {
-						current->type.prepend("typedef ");
+						g_current->type.prepend("typedef ");
 					      }
 					      //printf("Scanner.l: found function variable!\n");
-					      current->section = Entry::VARIABLE_SEC;
+					      g_current->section = Entry::VARIABLE_SEC;
 					    }
 					    else
 					    {
 					      //printf("Scanner.l: found prototype\n");
-					      current->section = Entry::FUNCTION_SEC;
-					      current->proto = TRUE;
+					      g_current->section = Entry::FUNCTION_SEC;
+					      g_current->proto = TRUE;
 					    }
 					  }
-					  //printf("Adding entry '%s'\n",current->name.data());
-					  if ( insidePHP)
+					  //printf("Adding entry '%s'\n",g_current->name.data());
+					  if ( g_insidePHP)
 					  {
-					    if (findAndRemoveWord(current->type,"final"))
+					    if (findAndRemoveWord(g_current->type,"final"))
 					    {
-					      current->spec |= Entry::Final;
+					      g_current->spec |= Entry::Final;
 					    }
-					    if (findAndRemoveWord(current->type,"abstract"))
+					    if (findAndRemoveWord(g_current->type,"abstract"))
 					    {
-					      current->spec |= Entry::Abstract;
+					      g_current->spec |= Entry::Abstract;
 					    }
 					  }
-					  if ( insidePHP && !containsWord(current->type,"function"))
+					  if ( g_insidePHP && !containsWord(g_current->type,"function"))
 					  {
 					    initEntry();
 					    if ( *yytext == '{' )
 					    {
-					      lastCurlyContext = FindMembers;
-					      curlyCount=0;
+					      g_lastCurlyContext = FindMembers;
+					      g_curlyCount=0;
 					      BEGIN( SkipCurly );
 					    }
 					    else
@@ -5143,66 +5122,66 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    if ( insidePHP)
+					    if ( g_insidePHP)
 					    {
-					      findAndRemoveWord(current->type,"function");
+					      findAndRemoveWord(g_current->type,"function");
 					    }
-					    previous = current.get();
-					    current_root->moveToSubEntryAndRefresh(current);
+					    g_previous = g_current.get();
+					    g_current_root->moveToSubEntryAndRefresh(g_current);
 					    initEntry();
 					    // Objective C 2.0: Required/Optional section
-					    if (previous->spec & (Entry::Optional | Entry::Required))
+					    if (g_previous->spec & (Entry::Optional | Entry::Required))
 					    {
-					      current->spec |= previous->spec & (Entry::Optional|Entry::Required);
+					      g_current->spec |= g_previous->spec & (Entry::Optional|Entry::Required);
 					    }
-					    lastCurlyContext = FindMembers;
+					    g_lastCurlyContext = FindMembers;
 					    if ( *yytext == ',' )
 					    {
-					      current->type = previous->type;
+					      g_current->type = g_previous->type;
 					      // we need to strip any trailing * and & (see bugs 623023 and 649103 for test cases)
-					      int i=current->type.length(); 
-					      while (i>0 && (current->type[i-1]=='*' || current->type[i-1]=='&' || current->type[i-1]==' ')) i--;
-					      current->type = current->type.left(i);
+					      int i=g_current->type.length(); 
+					      while (i>0 && (g_current->type[i-1]=='*' || g_current->type[i-1]=='&' || g_current->type[i-1]==' ')) i--;
+					      g_current->type = g_current->type.left(i);
 					    }
 					    if ( *yytext == '{' )
 					    {
-					      if ( !insidePHP && (current_root->section & Entry::COMPOUND_MASK) )
+					      if ( !g_insidePHP && (g_current_root->section & Entry::COMPOUND_MASK) )
 					      {
-						previous->spec |= Entry::Inline;
+						g_previous->spec |= Entry::Inline;
 					      }
 					      //addToBody(yytext);
-					      curlyCount=0;
+					      g_curlyCount=0;
 					      BEGIN( SkipCurly ) ;
 					    }
 					    else
 					    {
-					      if (previous->section!=Entry::VARIABLE_SEC)
-						previous->bodyLine=-1; // a function/member declaration
+					      if (g_previous->section!=Entry::VARIABLE_SEC)
+						g_previous->bodyLine=-1; // a function/member declaration
 					      BEGIN( FindMembers ) ;
 					    }
 					  }
                                         }
 <SkipInits>">"{BN}*"{"                  { // C++11 style initializer (see bug 790788)
                                           lineCount();
-                                          curlyCount=1;
+                                          g_curlyCount=1;
                                           BEGIN(SkipC11Inits);
                                         }
 <SkipInits>{ID}{BN}*"{"                 { // C++11 style initializer (see bug 688647)
                                           lineCount();
-                                          curlyCount=1;
+                                          g_curlyCount=1;
                                           BEGIN(SkipC11Inits);
                                         }
 <SkipC11Inits>"{"                       {
-                                          ++curlyCount;
+                                          ++g_curlyCount;
                                         }
 <SkipC11Inits>"}"                       {
-  					  if ( --curlyCount<=0 )
+  					  if ( --g_curlyCount<=0 )
                                           {
                                             BEGIN(SkipInits);
                                           }
                                         }
 <SkipC11Attribute>"]]"                 {
-                                          BEGIN(lastC11AttributeContext);
+                                          BEGIN(g_lastC11AttributeContext);
                                         }
 <SkipInits>"{"				{ // C++11 style initializer
   					  unput('{');
@@ -5210,47 +5189,47 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <SkipCurly>"{"				{ 
   				          //addToBody(yytext);
-  					  ++curlyCount ; 
+  					  ++g_curlyCount ; 
 					}
 <SkipCurly>"}"/{BN}*("/*!"|"/**"|"//!"|"///")"<!--" | /* see bug710917 */
 <SkipCurly>"}"				{ 
   				          //addToBody(yytext);
-  					  if( curlyCount )
+  					  if( g_curlyCount )
 					  {
-					    --curlyCount ;
+					    --g_curlyCount ;
 					  }
 					  else
 					  {
-					    if (!current->sli.empty() && previous) // copy special list items
+					    if (!g_current->sli.empty() && g_previous) // copy special list items
 					    {
-                                              previous->sli = current->sli;
-					      current->sli.clear();
+                                              g_previous->sli = g_current->sli;
+					      g_current->sli.clear();
 					    }
-					    if (previous) previous->endBodyLine=yyLineNr;
-					    BEGIN( lastCurlyContext ) ;
+					    if (g_previous) g_previous->endBodyLine=g_yyLineNr;
+					    BEGIN( g_lastCurlyContext ) ;
 					  }
 					}
 <SkipCurly>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" { 
 					  lineCount();
-  					  if ( curlyCount )
+  					  if ( g_curlyCount )
 					  {
 					    //addToBody(yytext);
-					    --curlyCount ;
+					    --g_curlyCount ;
 					  }
 					  else
 					  {
-					    current->endBodyLine=yyLineNr;
-                                            // take previous out of current_root and move it into current
-					    current.swap(tempEntry); // remember current
-                                            current_root->moveFromSubEntry(previous,current);
-					    previous = 0;
+					    g_current->endBodyLine=g_yyLineNr;
+                                            // take g_previous out of g_current_root and move it into g_current
+					    g_current.swap(g_tempEntry); // remember g_current
+                                            g_current_root->moveFromSubEntry(g_previous,g_current);
+					    g_previous = 0;
 
-					    docBlockContext   = SkipCurlyEndDoc;
-					    docBlockInBody    = FALSE;
-					    docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					    g_docBlockContext   = SkipCurlyEndDoc;
+					    g_docBlockInBody    = FALSE;
+					    g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                        ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
-					    docBlock.resize(0);
-					    docBlockTerm = '}';
+					    g_docBlock.resize(0);
+					    g_docBlockTerm = '}';
 					    if (yytext[yyleng-3]=='/')
 					    {
 					      startCommentBlock(TRUE);
@@ -5264,12 +5243,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <SkipCurlyEndDoc>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" { // desc is followed by another one
-					  docBlockContext   = SkipCurlyEndDoc;
-					  docBlockInBody    = FALSE;
-					  docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  g_docBlockContext   = SkipCurlyEndDoc;
+					  g_docBlockInBody    = FALSE;
+					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
-					  docBlock.resize(0);
-					  docBlockTerm = '}';
+					  g_docBlock.resize(0);
+					  g_docBlockTerm = '}';
 					  if (yytext[yyleng-3]=='/')
 					  {
 					    startCommentBlock(TRUE);
@@ -5283,20 +5262,20 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <SkipCurlyEndDoc>"}"			{
   				          //addToBody("}");
-                                          if (tempEntry) // we can only switch back to current if no new item was created
+                                          if (g_tempEntry) // we can only switch back to g_current if no new item was created
 					  {
-					    tempEntry.swap(current);
-					    tempEntry.reset();
+					    g_tempEntry.swap(g_current);
+					    g_tempEntry.reset();
 					  }
-  					  BEGIN( lastCurlyContext );
+  					  BEGIN( g_lastCurlyContext );
   					}
 <SkipCurly>\"			        { 
   				          //addToBody(yytext);
-  					  lastStringContext=SkipCurly;
+  					  g_lastStringContext=SkipCurly;
   				          BEGIN( SkipString ); 
 					}
 <SkipCurly>^{B}*"#"			{ 
-  				          if (insidePHP)
+  				          if (g_insidePHP)
   				            REJECT;
   				          //addToBody(yytext);
   					  BEGIN( SkipCurlyCpp );
@@ -5306,13 +5285,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   				          //addToBody(yytext);
   					}
 <SkipCurly,SkipCurlyCpp,ReadInitializer>"<<<"	        {
-  					  if (!insidePHP) 
+  					  if (!g_insidePHP) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            lastHereDocContext = YY_START;
+                                            g_lastHereDocContext = YY_START;
 					    BEGIN(HereDoc);
 					  }
   					}
@@ -5320,10 +5299,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           QCString raw=QCString(yytext).stripWhiteSpace();
                                           g_delimiter = raw.data()+2;
                                           g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-                                          lastRawStringContext = YY_START;
-                                          dummyRawString.resize(0);
-                                          pCopyRawString = &dummyRawString;
-                                          *pCopyRawString+=yytext;
+                                          g_lastRawStringContext = YY_START;
+                                          g_dummyRawString.resize(0);
+                                          g_pCopyRawString = &g_dummyRawString;
+                                          *g_pCopyRawString+=yytext;
                                           BEGIN(RawString);
                                         }
 <SkipCurly,SkipCurlyCpp>[^\n#"'@\\/{}<]+ {
@@ -5333,7 +5312,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <SkipCurlyCpp>\n			{ 
   				          //addToBody(yytext);
                                           lineCount();
-  					  lastCurlyContext = FindMembers;
+  					  g_lastCurlyContext = FindMembers;
   					  BEGIN( SkipCurly ); 
 					}
 <SkipCurlyCpp>\\[\r]*"\n"[\r]*		{ 
@@ -5342,61 +5321,61 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"/*"	{
   				          //addToBody(yytext);
-  					  lastCContext = YY_START;
+  					  g_lastCContext = YY_START;
 					  BEGIN(SkipComment);
   					}
 <SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"//"  {
   				          //addToBody(yytext);
-  					  lastCContext = YY_START;
+  					  g_lastCContext = YY_START;
 					  BEGIN(SkipCxxComment);
   					}
 <SkipInits,SkipC11Inits,SkipC11Attribute>"("             {
-                                          roundCount=0;
-                                          lastSkipRoundContext=YY_START;
+                                          g_roundCount=0;
+                                          g_lastSkipRoundContext=YY_START;
                                           BEGIN(SkipRound);
                                         }
 <SkipInits,SkipC11Inits,SkipC11Attribute>\"	        {
-  					  lastStringContext=YY_START;
+  					  g_lastStringContext=YY_START;
   				          BEGIN( SkipString ); 
 					}
 <SkipInits>;	                        {
-  					  warn(yyFileName,yyLineNr,
+  					  warn(g_yyFileName,g_yyLineNr,
 					      "Found ';' while parsing initializer list! "
 					      "(doxygen could be confused by a macro call without semicolon)"
 					     );
 					  BEGIN( FindMembers );
   					}
 <SkipInits,SkipCurly,SkipCurlyCpp>"#"   {
-  				          if (!insidePHP)
+  				          if (!g_insidePHP)
   				            REJECT;
   				          //addToBody(yytext);
-  					  lastCContext = YY_START;
+  					  g_lastCContext = YY_START;
 					  BEGIN(SkipCxxComment);
   					}
 <SkipInits,SkipCurly,SkipCurlyCpp>@\"   {
-  				          if (!insideCS) REJECT;
+  				          if (!g_insideCS) REJECT;
 					  // C# verbatim string
-					  lastSkipVerbStringContext=YY_START;
-					  pSkipVerbString=&current->initializer;
+					  g_lastSkipVerbStringContext=YY_START;
+					  g_pSkipVerbString=&g_current->initializer;
 					  BEGIN(SkipVerbString);
   					}
 <SkipInits,SkipCurly,SkipCurlyCpp>{CHARLIT}	{
-                                          if (insidePHP) REJECT;
+                                          if (g_insidePHP) REJECT;
                                         }
 <SkipInits,SkipCurly,SkipCurlyCpp>\'	{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-					    lastStringContext=YY_START;
+					    g_lastStringContext=YY_START;
 					    BEGIN(SkipPHPString);
 					  }
 					}
 <SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>.	{ }
 <SkipString,SkipPHPString>\\.		{ }
 <SkipString>\"				{ 
-  					  BEGIN( lastStringContext ); 
+  					  BEGIN( g_lastStringContext ); 
 					}
 <SkipPHPString>\'			{ 
-  					  BEGIN( lastStringContext ); 
+  					  BEGIN( g_lastStringContext ); 
 					}
 <SkipString,SkipPHPString>"/*"|"*/"|"//" { }
 <SkipString,SkipPHPString>\n		{
@@ -5408,243 +5387,243 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(ClassVar);
   					}
 <CompoundName>";"			{
-					  current->section = Entry::EMPTY_SEC ;
-					  current->type.resize(0) ;
-					  current->name.resize(0) ;
-					  current->args.resize(0) ;
-					  current->argList.clear();
+					  g_current->section = Entry::EMPTY_SEC ;
+					  g_current->type.resize(0) ;
+					  g_current->name.resize(0) ;
+					  g_current->args.resize(0) ;
+					  g_current->argList.clear();
 					  BEGIN( FindMembers ) ;
 					}
 <Bases>";"			{
-					  if (insideIDL && (current->spec & (Entry::Singleton |
+					  if (g_insideIDL && (g_current->spec & (Entry::Singleton |
 					                                     Entry::Service)))
 					  {
 					    // in UNO IDL a service or singleton may be defined
 					    // completely like this: "service Foo : XFoo;"
-					    if (!current->name.isEmpty() && !current_root->name.isEmpty())
+					    if (!g_current->name.isEmpty() && !g_current_root->name.isEmpty())
 					    {
 					      prependScope();
 					    }
-					    current->name = current->name.stripWhiteSpace();
+					    g_current->name = g_current->name.stripWhiteSpace();
 					    // there can be only one base class here
-					    if (!baseName.isEmpty())
+					    if (!g_baseName.isEmpty())
 					    {
-					      current->extends.push_back(
-					        BaseInfo(baseName,Public,Normal));
-					      baseName.resize(0);
+					      g_current->extends.push_back(
+					        BaseInfo(g_baseName,Public,Normal));
+					      g_baseName.resize(0);
 					    }
-					    current_root->moveToSubEntryAndRefresh( current ) ;
+					    g_current_root->moveToSubEntryAndRefresh( g_current ) ;
                                             initEntry();
 					  }
 					  else
 					  {
-					    current->section = Entry::EMPTY_SEC ;
-					    current->type.resize(0) ;
-					    current->name.resize(0) ;
-					    current->args.resize(0) ;
-					    current->argList.clear();
+					    g_current->section = Entry::EMPTY_SEC ;
+					    g_current->type.resize(0) ;
+					    g_current->name.resize(0) ;
+					    g_current->args.resize(0) ;
+					    g_current->argList.clear();
 					  }
 					  BEGIN( FindMembers ) ;
 					}
 <CompoundName>{SCOPENAME}/{BN}*"<"	{
-  					  sharpCount = 0;
-  					  current->name = yytext ;
-					  if (current->spec & Entry::Protocol)
+  					  g_sharpCount = 0;
+  					  g_current->name = yytext ;
+					  if (g_current->spec & Entry::Protocol)
 					  {
-					    current->name+="-p";
+					    g_current->name+="-p";
 					  }
 					  lineCount();
-					  lastClassTemplSpecContext = ClassVar;
-					  if (insideObjC) // protocol list
+					  g_lastClassTemplSpecContext = ClassVar;
+					  if (g_insideObjC) // protocol list
 					  {
 					    BEGIN( ObjCProtocolList );
 					  }
-					  else if (insideCS) // C# generic class
+					  else if (g_insideCS) // C# generic class
 					  {
-                                            //current->name+="-g";
+                                            //g_current->name+="-g";
 					    BEGIN( CSGeneric );
 					  }
 					  else // C++ template specialization
 					  {
-					    roundCount=0;
+					    g_roundCount=0;
 					    BEGIN( ClassTemplSpec );
 					  }
 					}
 <CSGeneric>"<"				{
 					  ArgumentList al;
 					  // check bug 612858 before enabling the next line
-					  //current->spec |= Entry::Template;
-					  current->tArgLists.push_back(al);
-					  currentArgumentList = &current->tArgLists.back();
-					  templateStr="<";
-					  current->name += "<";
-					  fullArgString = templateStr;
-					  copyArgString = &current->name;
-					  //copyArgString = &templateStr;
-					  currentArgumentContext = ClassVar;
+					  //g_current->spec |= Entry::Template;
+					  g_current->tArgLists.push_back(al);
+					  g_currentArgumentList = &g_current->tArgLists.back();
+					  g_templateStr="<";
+					  g_current->name += "<";
+					  g_fullArgString = g_templateStr;
+					  g_copyArgString = &g_current->name;
+					  //g_copyArgString = &g_templateStr;
+					  g_currentArgumentContext = ClassVar;
 					  BEGIN( ReadTempArgs );
   					}
 <ObjCProtocolList>"<"			{
-  					  insideProtocolList=TRUE;
+  					  g_insideProtocolList=TRUE;
   					  BEGIN( Bases );
   					}
 <ClassTemplSpec>">"({BN}*"::"{BN}*{SCOPENAME})?	{
-					  current->name += yytext;
+					  g_current->name += yytext;
 					  lineCount();
-  					  if (roundCount==0 && --sharpCount<=0)
+  					  if (g_roundCount==0 && --g_sharpCount<=0)
 					  {
-					    current->name = removeRedundantWhiteSpace(current->name);
-					    if (current->spec & Entry::Protocol)
+					    g_current->name = removeRedundantWhiteSpace(g_current->name);
+					    if (g_current->spec & Entry::Protocol)
 					    { // Objective-C protocol
 					      unput('{'); // fake start of body
 					      BEGIN( ClassVar );
 					    }
 					    else
 					    {
-					      BEGIN( lastClassTemplSpecContext );
+					      BEGIN( g_lastClassTemplSpecContext );
 					    }
 					  }
 					}
 <ClassTemplSpec>"<"			{
-					  current->name += yytext;
-					  if (roundCount==0) sharpCount++;
+					  g_current->name += yytext;
+					  if (g_roundCount==0) g_sharpCount++;
   					}
 <ClassTemplSpec>.			{
-  					  current->name += yytext;
+  					  g_current->name += yytext;
 					}
 <CompoundName>{SCOPENAME}{BN}*";"	{ // forward declaration
-                                          if (!current->tArgLists.empty())
+                                          if (!g_current->tArgLists.empty())
                                           {
                                             // found a forward template declaration, this has
                                             // a purpose of its own
-                                            current->name = yytext;
-                                            current->name=current->name.left(current->name.length()-1).stripWhiteSpace();
-                                            //printf("template class declaration for %s!\n",current->name.data());
-					    QCString rn = current_root->name.copy();
-					    //printf("cn='%s' rn='%s' isTypedef=%d\n",cn.data(),rn.data(),isTypedef);
-					    if (!current->name.isEmpty() && !rn.isEmpty())
+                                            g_current->name = yytext;
+                                            g_current->name=g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
+                                            //printf("template class declaration for %s!\n",g_current->name.data());
+					    QCString rn = g_current_root->name.copy();
+					    //printf("cn='%s' rn='%s' g_isTypedef=%d\n",cn.data(),rn.data(),g_isTypedef);
+					    if (!g_current->name.isEmpty() && !rn.isEmpty())
 					    {
 					      prependScope();
 					    }
-                                            current->spec|=Entry::ForwardDecl;
-                                            current_root->moveToSubEntryAndRefresh(current);
+                                            g_current->spec|=Entry::ForwardDecl;
+                                            g_current_root->moveToSubEntryAndRefresh(g_current);
                                           }
-					  else if (insideIDL &&
-					           (((current_root->spec & (Entry::Interface |
+					  else if (g_insideIDL &&
+					           (((g_current_root->spec & (Entry::Interface |
 					                                    Entry::Service)) &&
-					             (current->spec & Entry::Interface)) ||
-					            ((current_root->spec & (Entry::Service |
+					             (g_current->spec & Entry::Interface)) ||
+					            ((g_current_root->spec & (Entry::Service |
 					                                    Entry::Singleton)) &&
-					             (current->spec & Entry::Service))))
+					             (g_current->spec & Entry::Service))))
 					  {
-					    // interface inside of UNO IDL service or interface
-					    // service inside of UNO IDL service or singleton
+					    // interface g_inside of UNO IDL service or interface
+					    // service g_inside of UNO IDL service or singleton
 					    // there may be documentation on the member,
 					    // so do not throw it away...
-					    current->name = yytext;
-					    current->name=current->name.left(current->name.length()-1).stripWhiteSpace();
-					    current->section = (current->spec & Entry::Interface)
+					    g_current->name = yytext;
+					    g_current->name=g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
+					    g_current->section = (g_current->spec & Entry::Interface)
 					        ? Entry::EXPORTED_INTERFACE_SEC
 					        : Entry::INCLUDED_SERVICE_SEC;
-//					    current->section = Entry::MEMBERDOC_SEC;
-					    current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
-					    current_root->moveToSubEntryAndRefresh(current);
+//					    g_current->section = Entry::MEMBERDOC_SEC;
+					    g_current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
+					    g_current_root->moveToSubEntryAndRefresh(g_current);
 					  }
 
     					  unput(';');
-					  current->reset();
+					  g_current->reset();
 					  initEntry();
-                                          if (insideObjC) // see bug746361
+                                          if (g_insideObjC) // see bug746361
                                           {
-					    language = current->lang = SrcLangExt_Cpp;
-                                            insideObjC = FALSE;
+					    g_language = g_current->lang = SrcLangExt_Cpp;
+                                            g_insideObjC = FALSE;
                                           }
-					  if (isTypedef) // typedef of a class, put typedef keyword back
+					  if (g_isTypedef) // typedef of a class, put typedef keyword back
 					  {
-					    current->type.prepend("typedef");
+					    g_current->type.prepend("typedef");
 					  }
 					  BEGIN( FindMembers );
 					}
 <CompoundName>{SCOPENAME}/{BN}*"("	{ 
-					  current->name = yytext ;
+					  g_current->name = yytext ;
 					  lineCount();
-                                          if (insideCpp && current->name=="alignas") // C++11
+                                          if (g_insideCpp && g_current->name=="alignas") // C++11
                                           {
-                                            lastAlignAsContext = YY_START;
+                                            g_lastAlignAsContext = YY_START;
                                             BEGIN( AlignAs );
                                           }
                                           else
                                           {
-                                            if (current->spec & Entry::Protocol)
+                                            if (g_current->spec & Entry::Protocol)
                                             {
-                                              current->name += "-p";
+                                              g_current->name += "-p";
                                             }
                                             BEGIN( ClassVar );
                                           }
 					}
-<AlignAs>"("                            { roundCount=0; 
+<AlignAs>"("                            { g_roundCount=0; 
                                           BEGIN( AlignAsEnd ); 
                                         }
 <AlignAs>\n                             { lineCount(); }
 <AlignAs>.
-<AlignAsEnd>"("                         { roundCount++; }
-<AlignAsEnd>")"                         { if (--roundCount<0) 
+<AlignAsEnd>"("                         { g_roundCount++; }
+<AlignAsEnd>")"                         { if (--g_roundCount<0) 
                                           {
-                                            BEGIN( lastAlignAsContext ); 
+                                            BEGIN( g_lastAlignAsContext ); 
                                           }
                                         }
 <AlignAsEnd>\n                          { lineCount(); }
 <AlignAsEnd>.
 <CompoundName>{SCOPENAME}/{BN}*","	{  // multiple forward declarations on one line
                                            // e.g. @protocol A,B;
-					  current->reset();
+					  g_current->reset();
 					  initEntry();
   					}
 <CompoundName>{SCOPENAME}		{ 
-					  current->name = yytext ;
-                                          if (insideCpp || insideObjC) 
+					  g_current->name = yytext ;
+                                          if (g_insideCpp || g_insideObjC) 
                                           {
-                                            current->id = ClangParser::instance()->lookup(yyLineNr,yytext);
+                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
                                           }
 					  lineCount();
-					  if (current->spec & Entry::Protocol)
+					  if (g_current->spec & Entry::Protocol)
 					  {
-					    current->name += "-p";
+					    g_current->name += "-p";
 					  }
-					  if ((current->spec & Entry::Protocol) ||
-					      current->section == Entry::OBJCIMPL_SEC)
+					  if ((g_current->spec & Entry::Protocol) ||
+					      g_current->section == Entry::OBJCIMPL_SEC)
 					  {
 					    unput('{'); // fake start of body
 					  }
 					  BEGIN( ClassVar );
 					}
 <CompoundName>{CSSCOPENAME}	        { // C# style scope
-					  current->name = substitute(yytext,".","::");
+					  g_current->name = substitute(yytext,".","::");
 					  lineCount();
 					  BEGIN( ClassVar );
                                         }
 <ClassVar>{SCOPENAME}{BN}*/"("		{
-  					  if (insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
+  					  if (g_insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
 					  {
 					    // Corba IDL style union
-					    roundCount=0;
+					    g_roundCount=0;
 					    BEGIN(SkipUnionSwitch);
 					  }
 					  else
 					  {
   					    addType();
-					    current->name = yytext;
-					    current->name = current->name.stripWhiteSpace();
+					    g_current->name = yytext;
+					    g_current->name = g_current->name.stripWhiteSpace();
 					    lineCount();
   					    BEGIN( FindMembers );
 					  }
   					}
 <ClassVar>","				{
- 					  if (isTypedef)
+ 					  if (g_isTypedef)
 					  {
 					    // multiple types in one typedef
 					    unput(',');
-					    current->type.prepend("typedef ");
+					    g_current->type.prepend("typedef ");
 					    BEGIN(FindMembers);
 					  }
 					  else
@@ -5653,12 +5632,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <ClassVar>("sealed"|"abstract")/{BN}*(":"|"{") {
-  					  if (insideCli)
+  					  if (g_insideCli)
 					  {
 					    if (yytext[0]=='s') // sealed
-					      current->spec |= Entry::SealedClass;
+					      g_current->spec |= Entry::SealedClass;
 					    else // abstract
-					      current->spec |= Entry::AbstractClass;
+					      g_current->spec |= Entry::AbstractClass;
 					    BEGIN( ClassVar ); 
 					  }
 					  else
@@ -5667,66 +5646,66 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <ClassVar>{ID}				{
-                                          if (insideCpp || insideObjC) 
+                                          if (g_insideCpp || g_insideObjC) 
                                           {
-                                            current->id = ClangParser::instance()->lookup(yyLineNr,yytext);
+                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
                                           }
-  					  if (insideIDL && qstrcmp(yytext,"switch")==0)
+  					  if (g_insideIDL && qstrcmp(yytext,"switch")==0)
 					  {
 					    // Corba IDL style union
-					    roundCount=0;
+					    g_roundCount=0;
 					    BEGIN(SkipUnionSwitch);
 					  }
-					  else if ((insideJava || insidePHP || insideJS || insideSlice) && (qstrcmp(yytext,"implements")==0 || qstrcmp(yytext,"extends")==0))
+					  else if ((g_insideJava || g_insidePHP || g_insideJS || g_insideSlice) && (qstrcmp(yytext,"implements")==0 || qstrcmp(yytext,"extends")==0))
 					  {
-  					    current->type.resize(0);
-					    baseProt=Public;
-                                            baseVirt=Normal;
-					    baseName.resize(0);
+  					    g_current->type.resize(0);
+					    g_baseProt=Public;
+                                            g_baseVirt=Normal;
+					    g_baseName.resize(0);
 					    BEGIN( BasesProt ) ;
 					  }
-					  else if (insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
+					  else if (g_insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
 					  {
-                                            current->typeConstr.clear();
-					    current->typeConstr.push_back(Argument());
-					    lastCSConstraint = YY_START;
+                                            g_current->typeConstr.clear();
+					    g_current->typeConstr.push_back(Argument());
+					    g_lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
-					  else if (insideCli &&  qstrcmp(yytext,"abstract")==0)
+					  else if (g_insideCli &&  qstrcmp(yytext,"abstract")==0)
 					  {
-					    current->spec|=Entry::Abstract;
+					    g_current->spec|=Entry::Abstract;
 					  }
-					  else if (insideCli &&  qstrcmp(yytext,"sealed")==0)
+					  else if (g_insideCli &&  qstrcmp(yytext,"sealed")==0)
 					  {
-					    current->spec|=Entry::Sealed;
+					    g_current->spec|=Entry::Sealed;
 					  }
                                           else if (qstrcmp(yytext,"final")==0)
                                           {
-                                            current->spec|=Entry::Final;
+                                            g_current->spec|=Entry::Final;
                                           }
 					  else
 					  {
-					    if (current->section == Entry::ENUM_SEC)
+					    if (g_current->section == Entry::ENUM_SEC)
 					    { // found "enum a b" -> variable
-					      current->section = Entry::VARIABLE_SEC ;
+					      g_current->section = Entry::VARIABLE_SEC ;
 					    }
-					    current->type += ' ' ;
-					    current->type += current->name ;
-					    current->name = yytext ;
+					    g_current->type += ' ' ;
+					    g_current->type += g_current->name ;
+					    g_current->name = yytext ;
 					    
-					    if (nameIsOperator(current->name))
+					    if (nameIsOperator(g_current->name))
 					    {
 				              BEGIN( Operator );
 					    }
 					  }
   					}
 <ClassVar>[(\[]				{
-    					  if (insideObjC && *yytext=='(') // class category
+    					  if (g_insideObjC && *yytext=='(') // class category
 					  {
-					    current->name+='(';
-                                            //if (current->section!=Entry::OBJCIMPL_SEC)
+					    g_current->name+='(';
+                                            //if (g_current->section!=Entry::OBJCIMPL_SEC)
                                             //{
-					      current->spec|=Entry::Category;
+					      g_current->spec|=Entry::Category;
                                             //}
 					    BEGIN( ClassCategory );
 					  }
@@ -5739,51 +5718,51 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <CSConstraintType,CSConstraintName>"/**/" { /* empty comment */ }
 <CSConstraintType,CSConstraintName>("/*"[*!]|"//"[/!])("<"?)	{ // special comment
-                                          fullArgString.resize(0);
-					  lastCopyArgChar='#'; // end marker
-					  lastCommentInArgContext=YY_START;
+                                          g_fullArgString.resize(0);
+					  g_lastCopyArgChar='#'; // end marker
+					  g_lastCommentInArgContext=YY_START;
 					  if (yytext[1]=='/')
 					    BEGIN( CopyArgCommentLine );
 					  else
 					    BEGIN( CopyArgComment );
 					}
 <CSConstraintType,CSConstraintName>"#"	{ // artificially inserted token to signal end of comment block
-                                          current->typeConstr.back().docs = fullArgString;
+                                          g_current->typeConstr.back().docs = g_fullArgString;
   					}
 <CSConstraintType>"{"			{ // end of type constraint reached
                                           // parse documentation of the constraints
-                                          handleParametersCommentBlocks(current->typeConstr);
+                                          handleParametersCommentBlocks(g_current->typeConstr);
 					  unput('{');
-					  BEGIN( lastCSConstraint );
+					  BEGIN( g_lastCSConstraint );
 					}
 <CSConstraintType,CSConstraintName>";"  {
-                                          handleParametersCommentBlocks(current->typeConstr);
+                                          handleParametersCommentBlocks(g_current->typeConstr);
 					  unput(';');
-					  BEGIN( lastCSConstraint );
+					  BEGIN( g_lastCSConstraint );
   					}
 <CSConstraintName>":"                   {
                                           BEGIN( CSConstraintType );
                                         }
 <CSConstraintName>{ID}                  {
                                           // parameter name
-                                          current->typeConstr.back().name=yytext;
+                                          g_current->typeConstr.back().name=yytext;
                                         }
 <CSConstraintType>"where"		{ // another constraint for a different param
-					  current->typeConstr.push_back(Argument());
+					  g_current->typeConstr.push_back(Argument());
                                           BEGIN( CSConstraintName );
   					}
 <CSConstraintType>({ID}".")*{ID}("<"{ID}">")?("()")?  {
-                                          if (current->typeConstr.back().type.isEmpty())
+                                          if (g_current->typeConstr.back().type.isEmpty())
                                               // first type constraint for this parameter
                                           {
-                                            current->typeConstr.back().type=yytext;
+                                            g_current->typeConstr.back().type=yytext;
                                           }
                                           else // new type constraint for same parameter
                                           {
-                                            QCString name = current->typeConstr.back().name;
-                                            current->typeConstr.push_back(Argument());
-                                            current->typeConstr.back().name=name;
-                                            current->typeConstr.back().type=yytext;
+                                            QCString name = g_current->typeConstr.back().name;
+                                            g_current->typeConstr.push_back(Argument());
+                                            g_current->typeConstr.back().name=name;
+                                            g_current->typeConstr.back().type=yytext;
                                           }
                                         }
 <CSConstraintName,CSConstraintType>\n	{
@@ -5792,20 +5771,20 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <CSConstraintName,CSConstraintType>.	{
 					}
 <ClassCategory>{ID}			{
-					  current->name+=yytext;
+					  g_current->name+=yytext;
 					}
 <ClassCategory>")"/{BN}*"{"		{
-					  current->name+=')';
+					  g_current->name+=')';
 					  BEGIN( ClassVar );
                                         }
 <ClassCategory>")"/{BN}*"<"		{
-					  current->name+=')';
+					  g_current->name+=')';
 					  BEGIN( ObjCProtocolList );
                                         }
 <ClassCategory>")"			{
-					  current->name+=')';
-					  if ((current->section & Entry::Protocol) ||
-					      current->section == Entry::OBJCIMPL_SEC)
+					  g_current->name+=')';
+					  if ((g_current->section & Entry::Protocol) ||
+					      g_current->section == Entry::OBJCIMPL_SEC)
 					  {
 					    unput('{'); // fake start of body
 					  }
@@ -5817,61 +5796,61 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( ClassVar );
 					}
 <ClassVar>":"				{ 
-                                          if (current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
+                                          if (g_current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
                                           {
-                                            current->bitfields+=":";
-                                            current->args.resize(0);
+                                            g_current->bitfields+=":";
+                                            g_current->args.resize(0);
                                             BEGIN(BitFields);
                                           }
-                                          else if (current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, 
+                                          else if (g_current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, 
                                                                                  // or C++11 style enum: 'E : unsigned int {...}'
 					  {
-					    current->args.resize(0);
+					    g_current->args.resize(0);
   					    BEGIN(EnumBaseType);
 					  }
 					  else
 					  {
-					    current->type.resize(0);
-					    if ((current->spec & Entry::Interface) || 
-						(current->spec & Entry::Struct)    || 
-						(current->spec & Entry::Ref)       || 
-						(current->spec & Entry::Value)     || 
-						insidePHP || insideCS || insideD || insideObjC || insideIDL
+					    g_current->type.resize(0);
+					    if ((g_current->spec & Entry::Interface) || 
+						(g_current->spec & Entry::Struct)    || 
+						(g_current->spec & Entry::Ref)       || 
+						(g_current->spec & Entry::Value)     || 
+						g_insidePHP || g_insideCS || g_insideD || g_insideObjC || g_insideIDL
 					       )
-					      baseProt=Public;
+					      g_baseProt=Public;
 					    else
-					      baseProt=Private;
-					    baseVirt=Normal;
-					    baseName.resize(0);
+					      g_baseProt=Private;
+					    g_baseVirt=Normal;
+					    g_baseName.resize(0);
 					    BEGIN( BasesProt ) ;
 					  }
 					}
 <ClassVar>[;=*&]			{
     					  unput(*yytext);
-					  if (isTypedef) // typedef of a class, put typedef keyword back
+					  if (g_isTypedef) // typedef of a class, put typedef keyword back
 					  {
-					    current->type.prepend("typedef");
+					    g_current->type.prepend("typedef");
 					  }
 					  if ((yytext[0]=='*' || yytext[0]=='&') && 
-					      current->section == Entry::ENUM_SEC)
+					      g_current->section == Entry::ENUM_SEC)
 					  { // found "enum a *b" -> variable
-					    current->section = Entry::VARIABLE_SEC ;
+					    g_current->section = Entry::VARIABLE_SEC ;
 					  }
 					  BEGIN( FindMembers );
     					}
 <Bases,ClassVar>"///"/[^/]              {
-  					  if (!insideObjC)
+  					  if (!g_insideObjC)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
 					    lineCount();
-					    current->program+=yytext;
-                                            current->fileName = yyFileName ;
-					    current->startLine = yyLineNr ;
-					    current->startColumn = yyColNr;
-					    curlyCount=0;
+					    g_current->program+=yytext;
+                                            g_current->fileName = g_yyFileName ;
+					    g_current->startLine = g_yyLineNr ;
+					    g_current->startColumn = g_yyColNr;
+					    g_curlyCount=0;
 					    BEGIN( ReadBodyIntf );
 					  }
   					}
@@ -5879,56 +5858,56 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <Bases,ClassVar>("//"{B}*)?"/*!"        |
 <Bases,ClassVar>"//!"                   |
 <Bases,ClassVar>[\-+]{BN}*		{
-  					  if (!insideObjC)
+  					  if (!g_insideObjC)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
 					    lineCount();
-					    current->program+=yytext;
-                                            current->fileName = yyFileName ;
-					    current->startLine = yyLineNr ;
-					    current->startColumn = yyColNr;
-					    curlyCount=0;
+					    g_current->program+=yytext;
+                                            g_current->fileName = g_yyFileName ;
+					    g_current->startLine = g_yyLineNr ;
+					    g_current->startColumn = g_yyColNr;
+					    g_curlyCount=0;
 					    BEGIN( ReadBodyIntf );
 					  }
   					}
 <CompoundName,ClassVar>{B}*"{"{B}*	{ 
-                                          current->fileName = yyFileName ;
-					  current->startLine = yyLineNr ;
-					  current->startColumn = yyColNr;
-					  current->name = removeRedundantWhiteSpace(current->name);
-					  if (current->name.isEmpty() && !isTypedef) // anonymous compound
+                                          g_current->fileName = g_yyFileName ;
+					  g_current->startLine = g_yyLineNr ;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->name = removeRedundantWhiteSpace(g_current->name);
+					  if (g_current->name.isEmpty() && !g_isTypedef) // anonymous compound
 					  {
-					    if (current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces
+					    if (g_current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces
 					    {
 					      if (Config_getBool(EXTRACT_ANON_NSPACES)) // use visible name
 					      {
-					        current->name="anonymous_namespace{"+stripPath(current->fileName)+"}";
+					        g_current->name="anonymous_namespace{"+stripPath(g_current->fileName)+"}";
 					      }
 					      else // use invisible name
 					      {
-					        current->name.sprintf("@%d",anonNSCount);
+					        g_current->name.sprintf("@%d",g_anonNSCount);
 					      }
 					    }
 					    else
 					    {
-					      current->name.sprintf("@%d",anonCount++);
+					      g_current->name.sprintf("@%d",g_anonCount++);
 					    }
 					  }
-					  curlyCount=0;
-					  if (current_root && // not a nested struct inside an @interface section
-					      !(current_root->spec & Entry::Interface) &&
-					      ((current->spec & (Entry::Interface | Entry::Protocol | Entry::Category) ||
-					        current->section==Entry::OBJCIMPL_SEC)
+					  g_curlyCount=0;
+					  if (g_current_root && // not a nested struct g_inside an @interface section
+					      !(g_current_root->spec & Entry::Interface) &&
+					      ((g_current->spec & (Entry::Interface | Entry::Protocol | Entry::Category) ||
+					        g_current->section==Entry::OBJCIMPL_SEC)
 					      ) &&
-					      insideObjC
+					      g_insideObjC
 					     )
 					  { // ObjC body that ends with @end
 					    BEGIN( ReadBodyIntf );
 					  }
-					  else if (current->section==Entry::NAMESPACE_SEC)
+					  else if (g_current->section==Entry::NAMESPACE_SEC)
 					  { // namespace body
 					    BEGIN( ReadNSBody );
 					  }
@@ -5937,15 +5916,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    BEGIN( ReadBody ) ;
 					  }
 					}
-<BasesProt>"virtual"{BN}+               { lineCount(); baseVirt = Virtual; }
-<BasesProt>"public"{BN}+                { lineCount(); baseProt = Public; }
-<BasesProt>"protected"{BN}+             { lineCount(); baseProt = Protected; }
-<BasesProt>"internal"{BN}+              { if (!insideCli) REJECT ; lineCount(); baseProt = Package; }
-<BasesProt>"private"{BN}+               { lineCount(); baseProt = Private; }
+<BasesProt>"virtual"{BN}+               { lineCount(); g_baseVirt = Virtual; }
+<BasesProt>"public"{BN}+                { lineCount(); g_baseProt = Public; }
+<BasesProt>"protected"{BN}+             { lineCount(); g_baseProt = Protected; }
+<BasesProt>"internal"{BN}+              { if (!g_insideCli) REJECT ; lineCount(); g_baseProt = Package; }
+<BasesProt>"private"{BN}+               { lineCount(); g_baseProt = Private; }
 <BasesProt>{BN}				{ lineCount(); }
 <BasesProt>.				{ unput(*yytext); BEGIN(Bases); }
 <Bases>("\\")?({ID}"\\")*{ID}		{ // PHP namespace token, not sure if interspacing is allowed but it gives problems (see bug 640847)
-                                          if (!insidePHP)
+                                          if (!g_insidePHP)
 					  {
 					    REJECT;
 					  }
@@ -5954,37 +5933,37 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					    lineCount();
 					    QCString bn=yytext;
 					    bn = substitute(bn,"\\","::");
-					    baseName += bn;
-					    current->args += ' ';
-					    current->args += yytext;
+					    g_baseName += bn;
+					    g_current->args += ' ';
+					    g_current->args += yytext;
 					  }
                                         }
 <Bases>("::")?{BN}*({ID}{BN}*"::"{BN}*)*{ID}	{ 
   					  lineCount();
                                           QCString baseScope = yytext;
-                                          if (insideCS && baseScope.stripWhiteSpace()=="where")
+                                          if (g_insideCS && baseScope.stripWhiteSpace()=="where")
 					  { 
 					    // type constraint for a class
-                                            current->typeConstr.clear();
-					    current->typeConstr.push_back(Argument());
-					    lastCSConstraint = YY_START;
+                                            g_current->typeConstr.clear();
+					    g_current->typeConstr.push_back(Argument());
+					    g_lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
 					  else
 					  {
-  					    baseName+=yytext;
-					    current->args += ' ';
-					    current->args += yytext;
+  					    g_baseName+=yytext;
+					    g_current->args += ' ';
+					    g_current->args += yytext;
 					  }
 					}
 <Bases>{BN}*{ID}("."{ID})*		{ // Java style class
     					  QCString name = substitute(yytext,".","::");
-					  baseName += name;
-					  current->args += ' ';
-					  current->args += name;
+					  g_baseName += name;
+					  g_current->args += ' ';
+					  g_current->args += name;
     					}
 <ClassVar,Bases>\n/{BN}*[^{, \t\n]	{
-                                          if (!insideObjC) 
+                                          if (!g_insideObjC) 
 					  {
 					    REJECT;
 					  }
@@ -6002,53 +5981,53 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  unput('}'); 
   					  unput('{');
 					}
-<ClassVar>"<"   	                { current->name += *yytext;
-  					  sharpCount=1; 
-					  roundCount=0;
-					  lastSkipSharpContext = YY_START;
-					  specName = &current->name;
+<ClassVar>"<"   	                { g_current->name += *yytext;
+  					  g_sharpCount=1; 
+					  g_roundCount=0;
+					  g_lastSkipSharpContext = YY_START;
+					  g_specName = &g_current->name;
 					  BEGIN ( Specialization );
 					}
 <Bases>{BN}*"<"                         {
                                           lineCount();
-  					  sharpCount=1; 
-					  roundCount=0;
-					  lastSkipSharpContext = YY_START;
-					  if (insideObjC) // start of protocol list
+  					  g_sharpCount=1; 
+					  g_roundCount=0;
+					  g_lastSkipSharpContext = YY_START;
+					  if (g_insideObjC) // start of protocol list
 					  {
 					    unput(',');
 					  }
 					  else // template specialization
 					  {
-					    //if (insideCS) // generic
+					    //if (g_insideCS) // generic
 					    //{
-					    //  baseName+="-g";
+					    //  g_baseName+="-g";
 					    //}
-                                            templateStr = yytext;
-					    specName = &templateStr;
+                                            g_templateStr = yytext;
+					    g_specName = &g_templateStr;
 					    BEGIN ( Specialization );
 					  }
 					}
-<Specialization>"<"			{ *specName += *yytext;
-  					  if (roundCount==0) sharpCount++;
+<Specialization>"<"			{ *g_specName += *yytext;
+  					  if (g_roundCount==0) g_sharpCount++;
   					}
 <Specialization>">"			{
-  					  *specName += *yytext;
-  					  if (roundCount==0 && --sharpCount<=0)
+  					  *g_specName += *yytext;
+  					  if (g_roundCount==0 && --g_sharpCount<=0)
 					  {
-					    baseName+=removeRedundantWhiteSpace(*specName);
-					    BEGIN(lastSkipSharpContext);
+					    g_baseName+=removeRedundantWhiteSpace(*g_specName);
+					    BEGIN(g_lastSkipSharpContext);
 					  }
   					}
-<Specialization>{BN}+			{ lineCount(); *specName +=' '; }
-<Specialization>"<<"			{ *specName += yytext; }
+<Specialization>{BN}+			{ lineCount(); *g_specName +=' '; }
+<Specialization>"<<"			{ *g_specName += yytext; }
 <Specialization>">>"/{B}*"::"		{ // M$ C++ extension to allow >> to close a template...
   					  unput('>');
   					  unput(' ');
   					  unput('>');
                                         }
 <Specialization>">>"			{
-                                          if (insideCS) // for C# >> ends a nested template
+                                          if (g_insideCS) // for C# >> ends a nested template
 					  {
 					    REJECT;
 					  }
@@ -6058,9 +6037,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					       // We require the bitshift to be enclosed in braces.
 					       // See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1757.html
 					  {
-					    if (roundCount>0)
+					    if (g_roundCount>0)
 					    {
-                                              *specName += yytext; 
+                                              *g_specName += yytext; 
 					    }
 					    else
 					    {
@@ -6071,63 +6050,63 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
                                         }
 <Specialization>"typename"{BN}+		{ lineCount(); }
-<Specialization>"("			{ *specName += *yytext; roundCount++; }
-<Specialization>")"			{ *specName += *yytext; roundCount--; }
-
-<Specialization>"\\\\"			{ *specName += *yytext;}
-<Specialization>"\\'"			{ *specName += *yytext;}
-<Specialization>"\\\""			{ *specName += *yytext;}
-<Specialization>"'"			{ *specName += *yytext;BEGIN(SpecializationSingleQuote);}
-<Specialization>"\""			{ *specName += *yytext;BEGIN(SpecializationDoubleQuote);}
-<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\"       { *specName += *yytext;}
-<SpecializationSingleQuote>"\\'"        { *specName += *yytext;}
-<SpecializationSingleQuote>"'"          { *specName += *yytext; BEGIN(Specialization);}
-<SpecializationDoubleQuote>"\\\""       { *specName += *yytext;}
-<SpecializationDoubleQuote>"\""         { *specName += *yytext; BEGIN(Specialization);}
-<SpecializationSingleQuote,SpecializationDoubleQuote>.          { *specName += *yytext;}
+<Specialization>"("			{ *g_specName += *yytext; g_roundCount++; }
+<Specialization>")"			{ *g_specName += *yytext; g_roundCount--; }
+
+<Specialization>"\\\\"			{ *g_specName += *yytext;}
+<Specialization>"\\'"			{ *g_specName += *yytext;}
+<Specialization>"\\\""			{ *g_specName += *yytext;}
+<Specialization>"'"			{ *g_specName += *yytext;BEGIN(SpecializationSingleQuote);}
+<Specialization>"\""			{ *g_specName += *yytext;BEGIN(SpecializationDoubleQuote);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\"       { *g_specName += *yytext;}
+<SpecializationSingleQuote>"\\'"        { *g_specName += *yytext;}
+<SpecializationSingleQuote>"'"          { *g_specName += *yytext; BEGIN(Specialization);}
+<SpecializationDoubleQuote>"\\\""       { *g_specName += *yytext;}
+<SpecializationDoubleQuote>"\""         { *g_specName += *yytext; BEGIN(Specialization);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>.          { *g_specName += *yytext;}
 
 <Specialization>.			{
-  					  *specName += *yytext;
+  					  *g_specName += *yytext;
   					}
-<SkipRound>"("				{ ++roundCount; }
-<SkipRound>")"				{ if (--roundCount<0)
-					    BEGIN ( lastSkipRoundContext );
+<SkipRound>"("				{ ++g_roundCount; }
+<SkipRound>")"				{ if (--g_roundCount<0)
+					    BEGIN ( g_lastSkipRoundContext );
 					}
 <SkipRound>\"				{
-  					  lastStringContext=SkipRound;
+  					  g_lastStringContext=SkipRound;
 					  BEGIN(SkipString);
   					}
 <Bases>","|(">"({BN}*"{")?)|({BN}+"implements"{BN}*)	{ lineCount();
-                                          if (insideProtocolList)
+                                          if (g_insideProtocolList)
 					  {
-					    baseName+="-p";
+					    g_baseName+="-p";
 					  }
 					  else
 					  {
-                                            current->args += ',' ; 
+                                            g_current->args += ',' ; 
 					  }
-					  current->name = removeRedundantWhiteSpace(current->name);
-  					  if (!baseName.isEmpty())
+					  g_current->name = removeRedundantWhiteSpace(g_current->name);
+  					  if (!g_baseName.isEmpty())
 					  {
-  					    current->extends.push_back(
-					      BaseInfo(baseName,baseProt,baseVirt)
+  					    g_current->extends.push_back(
+					      BaseInfo(g_baseName,g_baseProt,g_baseVirt)
 					    );
 					  }
-					  if ((current->spec & (Entry::Interface|Entry::Struct)) || 
-					      insideJava || insidePHP || insideCS || 
-					      insideD || insideObjC || insideIDL || insideSlice)
+					  if ((g_current->spec & (Entry::Interface|Entry::Struct)) || 
+					      g_insideJava || g_insidePHP || g_insideCS || 
+					      g_insideD || g_insideObjC || g_insideIDL || g_insideSlice)
 					  {
-					    baseProt=Public;
+					    g_baseProt=Public;
 					  }
 					  else
 					  {
-					    baseProt=Private;
+					    g_baseProt=Private;
 					  }
-					  baseVirt=Normal;
-					  baseName.resize(0);
+					  g_baseVirt=Normal;
+					  g_baseName.resize(0);
                                           if (*yytext=='>')
 					  { // end of a ObjC protocol list
-  					    insideProtocolList=FALSE;
+  					    g_insideProtocolList=FALSE;
 					    if (yyleng==1)
 					    {
 					      unput('{'); // dummy start body
@@ -6139,23 +6118,23 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    if (*yytext==',' && insideObjC) // Begin of protocol list
+					    if (*yytext==',' && g_insideObjC) // Begin of protocol list
 					    {
-  					      insideProtocolList=TRUE;
+  					      g_insideProtocolList=TRUE;
 					    }
 					    BEGIN(BasesProt);
 					  }
 					}
-<Bases>{B}*"{"{B}*			{ current->fileName = yyFileName ;
-					  current->startLine = yyLineNr ;
-					  current->startColumn = yyColNr;
-					  current->name = removeRedundantWhiteSpace(current->name);
-  					  if (!baseName.isEmpty())
-  					    current->extends.push_back(
-					       BaseInfo(baseName,baseProt,baseVirt)
+<Bases>{B}*"{"{B}*			{ g_current->fileName = g_yyFileName ;
+					  g_current->startLine = g_yyLineNr ;
+					  g_current->startColumn = g_yyColNr;
+					  g_current->name = removeRedundantWhiteSpace(g_current->name);
+  					  if (!g_baseName.isEmpty())
+  					    g_current->extends.push_back(
+					       BaseInfo(g_baseName,g_baseProt,g_baseVirt)
 					    );
-					  curlyCount=0;
-					  if (insideObjC)
+					  g_curlyCount=0;
+					  if (g_insideObjC)
 					  {
 					    BEGIN( ReadBodyIntf );
 					  }
@@ -6165,66 +6144,64 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <SkipUnionSwitch>{B}*"("		{
-  					  roundCount++;
+  					  g_roundCount++;
   					}
 <SkipUnionSwitch>")"			{
-  					  if (--roundCount==0)
+  					  if (--g_roundCount==0)
 					  {
 					    BEGIN(ClassVar);
 					  }
   					}
 <SkipUnionSwitch>\n			{ lineCount(); }
 <SkipUnionSwitch>.			
-<Comment>{BN}+				{ current->program += yytext ;
+<Comment>{BN}+				{ g_current->program += yytext ;
 					  lineCount() ;
 					}
-<Comment>"/*"				{ current->program += yytext ; } 
-<Comment>"//"				{ current->program += yytext ; }
+<Comment>"/*"				{ g_current->program += yytext ; } 
+<Comment>"//"				{ g_current->program += yytext ; }
 <Comment>{CMD}("code"|"verbatim")	{
-                                          insideCode=TRUE;
-  					  current->program += yytext ;
+                                          g_insideCode=TRUE;
+  					  g_current->program += yytext ;
   					}
 <Comment>{CMD}("endcode"|"endverbatim")	{
-                                          insideCode=FALSE;
-  					  current->program += yytext ;
+                                          g_insideCode=FALSE;
+  					  g_current->program += yytext ;
   					}
-<Comment>[^ \.\t\r\n\/\*]+		{ current->program += yytext ; }
-<Comment>"*/"				{ current->program += yytext ;
-					  if (!insideCode) BEGIN( lastContext ) ;
+<Comment>[^ \.\t\r\n\/\*]+		{ g_current->program += yytext ; }
+<Comment>"*/"				{ g_current->program += yytext ;
+					  if (!g_insideCode) BEGIN( g_lastContext ) ;
 					}
-<Comment>.				{ current->program += *yytext ; }
+<Comment>.				{ g_current->program += *yytext ; }
 
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,SkipC11Inits,SkipC11Attribute,Bases,OldStyleArgs>("//"{B}*)?"/*!" { 
-  					  //printf("Start doc block at %d\n",yyLineNr);
-					  removeSlashes=(yytext[1]=='/');
-					  tmpDocType=-1;
-					  if (!current->doc.isEmpty())
+  					  //printf("Start doc block at %d\n",g_yyLineNr);
+					  if (!g_current->doc.isEmpty())
 					  {
-					    current->doc+="\n\n";
+					    g_current->doc+="\n\n";
 					  }
 					  else
 					  {
-					    current->docLine = yyLineNr;
-					    current->docFile = yyFileName;
+					    g_current->docLine = g_yyLineNr;
+					    g_current->docFile = g_yyFileName;
 					  }
 
-					  lastDocContext = YY_START;
-					  if (current_root->section & Entry::SCOPE_MASK)
+					  g_lastDocContext = YY_START;
+					  if (g_current_root->section & Entry::SCOPE_MASK)
                                           {
-					    current->inside = current_root->name+"::";
+					    g_current->inside = g_current_root->name+"::";
                                           }
-					  docBlockContext   = YY_START;
-					  docBlockInBody    = YY_START==SkipCurly;
-					  docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF);
+					  g_docBlockContext   = YY_START;
+					  g_docBlockInBody    = YY_START==SkipCurly;
+					  g_docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF);
 
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
 
-					  if (docBlockAutoBrief)
+					  if (g_docBlockAutoBrief)
 					  {
-					    current->briefLine = yyLineNr;
-					    current->briefFile = yyFileName;
+					    g_current->briefLine = g_yyLineNr;
+					    g_current->briefFile = g_yyFileName;
 					  }
 					  startCommentBlock(FALSE);
 					  BEGIN( DocBlock );
@@ -6234,148 +6211,145 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  static bool javadocBanner = Config_getBool(JAVADOC_BANNER);
 
 					  if( javadocBanner ) {
-						  lastDocContext = YY_START;
+						  g_lastDocContext = YY_START;
 
-						  //printf("Found comment banner at %s:%d\n",yyFileName,yyLineNr);
-						  if (current_root->section & Entry::SCOPE_MASK)
+						  //printf("Found comment banner at %s:%d\n",g_yyFileName,g_yyLineNr);
+						  if (g_current_root->section & Entry::SCOPE_MASK)
 	                                          {
-						    current->inside = current_root->name+"::";
+						    g_current->inside = g_current_root->name+"::";
 	                                          }
-						  current->docLine = yyLineNr;
-						  current->docFile = yyFileName;
-						  docBlockContext = YY_START;
-						  docBlockInBody  = YY_START==SkipCurly;
+						  g_current->docLine = g_yyLineNr;
+						  g_current->docFile = g_yyFileName;
+						  g_docBlockContext = YY_START;
+						  g_docBlockInBody  = YY_START==SkipCurly;
 	                                          static bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
-						  docBlockAutoBrief = javadocAutoBrief;
+						  g_docBlockAutoBrief = javadocAutoBrief;
 
 	                                          QCString indent;
 	                                          indent.fill(' ',computeIndent(yytext,g_column));
-	                                          docBlock=indent;
+	                                          g_docBlock=indent;
 
-						  if (docBlockAutoBrief)
+						  if (g_docBlockAutoBrief)
 						  {
-						    current->briefLine = yyLineNr;
-						    current->briefFile = yyFileName;
+						    g_current->briefLine = g_yyLineNr;
+						    g_current->briefFile = g_yyFileName;
 						  }
 						  startCommentBlock(FALSE);
 						  BEGIN( DocBlock );
 					  } else {
-						  current->program += yytext ;
-						  lastContext = YY_START ;
+						  g_current->program += yytext ;
+						  g_lastContext = YY_START ;
 						  BEGIN( Comment ) ;
 					  }
 
 					}
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/**"/[^/*] {
-  					  removeSlashes=(yytext[1]=='/');
-					  lastDocContext = YY_START;
+					  g_lastDocContext = YY_START;
 
-					  //printf("Found comment block at %s:%d\n",yyFileName,yyLineNr);
-					  if (current_root->section & Entry::SCOPE_MASK)
+					  //printf("Found comment block at %s:%d\n",g_yyFileName,g_yyLineNr);
+					  if (g_current_root->section & Entry::SCOPE_MASK)
                                           {
-					    current->inside = current_root->name+"::";
+					    g_current->inside = g_current_root->name+"::";
                                           }
-					  current->docLine = yyLineNr;
-					  current->docFile = yyFileName;
-					  docBlockContext = YY_START;
-					  docBlockInBody  = YY_START==SkipCurly;
+					  g_current->docLine = g_yyLineNr;
+					  g_current->docFile = g_yyFileName;
+					  g_docBlockContext = YY_START;
+					  g_docBlockInBody  = YY_START==SkipCurly;
                                           static bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
-					  docBlockAutoBrief = javadocAutoBrief;
+					  g_docBlockAutoBrief = javadocAutoBrief;
 
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
 
-					  if (docBlockAutoBrief)
+					  if (g_docBlockAutoBrief)
 					  {
-					    current->briefLine = yyLineNr;
-					    current->briefFile = yyFileName;
+					    g_current->briefLine = g_yyLineNr;
+					    g_current->briefFile = g_yyFileName;
 					  }
 					  startCommentBlock(FALSE);
 					  BEGIN( DocBlock );
   					}
 <FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"//!" { 
-					  tmpDocType=-1;
-					  lastDocContext = YY_START;
-					  if (current_root->section & Entry::SCOPE_MASK)
+					  g_lastDocContext = YY_START;
+					  if (g_current_root->section & Entry::SCOPE_MASK)
                                           {
-					    current->inside = current_root->name+"::";
+					    g_current->inside = g_current_root->name+"::";
                                           }
-					  docBlockContext   = YY_START;
-					  docBlockInBody    = YY_START==SkipCurly;
-					  docBlockAutoBrief = FALSE;
+					  g_docBlockContext   = YY_START;
+					  g_docBlockInBody    = YY_START==SkipCurly;
+					  g_docBlockAutoBrief = FALSE;
 
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
+                                          g_docBlock=indent;
 
-					  startCommentBlock(current->brief.isEmpty());
+					  startCommentBlock(g_current->brief.isEmpty());
 					  BEGIN( DocLine );
 					}
 <FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"///"/[^/] { 
-					  tmpDocType=-1;
-					  lastDocContext = YY_START;
-					  if (current_root->section & Entry::SCOPE_MASK)
+					  g_lastDocContext = YY_START;
+					  if (g_current_root->section & Entry::SCOPE_MASK)
                                           {
-					    current->inside = current_root->name+"::";
+					    g_current->inside = g_current_root->name+"::";
                                           }
-					  docBlockContext   = YY_START;
-					  docBlockInBody    = YY_START==SkipCurly;
-					  docBlockAutoBrief = FALSE;
+					  g_docBlockContext   = YY_START;
+					  g_docBlockInBody    = YY_START==SkipCurly;
+					  g_docBlockAutoBrief = FALSE;
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock=indent;
-					  startCommentBlock(current->brief.isEmpty());
+                                          g_docBlock=indent;
+					  startCommentBlock(g_current->brief.isEmpty());
 					  BEGIN( DocLine );
 					}
 <FindMembers>"extern"{BN}*"\"C"("++")?"\""{BN}*("{")?  {
 					  lineCount();
-					  externC=TRUE;
+					  g_externC=TRUE;
 					}
 <FindMembers>"{"			{
-                                          if (externC) 
+                                          if (g_externC) 
 					  {
-					    externC=FALSE;
+					    g_externC=FALSE;
 					  }
-                                          else if (insideCS &&    
-					      !current->name.isEmpty() && 
-					      !current->type.isEmpty())
+                                          else if (g_insideCS &&    
+					      !g_current->name.isEmpty() && 
+					      !g_current->type.isEmpty())
 					  {
-					    if (containsWord(current->type,"event")) // event
+					    if (containsWord(g_current->type,"event")) // event
 					    {
-  					      current->mtype = mtype = Event;
+  					      g_current->mtype = g_mtype = Event;
 					    }
 					    else // property
 					    {				
-  					      current->mtype = mtype = Property;
+  					      g_current->mtype = g_mtype = Property;
 					    }
-					    current->bodyLine = yyLineNr;
-					    curlyCount=0;
+					    g_current->bodyLine = g_yyLineNr;
+					    g_curlyCount=0;
 					    BEGIN( CSAccessorDecl );
 					  }
-					  else if (insideIDL && (current->spec & Entry::Attribute))
+					  else if (g_insideIDL && (g_current->spec & Entry::Attribute))
 					  {
 					    // UNO IDL: attributes may have setter and getter
 					    // exception specifications
-					    current->exception = " {";
+					    g_current->exception = " {";
 					    BEGIN(UNOIDLAttributeBlock);
 					  }
 					  else
 					  {
-					    if ((insideJava || insideCS || insideD) &&
-						current->name.isEmpty()
+					    if ((g_insideJava || g_insideCS || g_insideD) &&
+						g_current->name.isEmpty()
 					       )
 					    {
 					      // static Java initializer
-					      needsSemi = FALSE;
-					      if (current->stat)
+					      g_needsSemi = FALSE;
+					      if (g_current->stat)
 					      {
-						current->name="[static initializer]";
-						current->type.resize(0);
+						g_current->name="[static initializer]";
+						g_current->type.resize(0);
 					      }
 					      else
 					      {
-						current->name="[instance initializer]";
+						g_current->name="[instance initializer]";
 					      }
                                               unput(*yytext); 
 					      BEGIN( Function );
@@ -6383,56 +6357,56 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    else
 					    {
 					      // pre C++11 code -> ignore the initializer
-                                              //needsSemi = TRUE;
-					      //current->type.resize(0);
-					      //current->name.resize(0);
-					      //current->args.resize(0);
-					      //current->argList.clear();
-					      //curlyCount=0;
+                                              //g_needsSemi = TRUE;
+					      //g_current->type.resize(0);
+					      //g_current->name.resize(0);
+					      //g_current->args.resize(0);
+					      //g_current->argList.clear();
+					      //g_curlyCount=0;
 					      //BEGIN( SkipCurlyBlock );
 
                                               // C++11 style initializer list
-  					      current->bodyLine = yyLineNr;
-                                              current->initializer = yytext;
-					      lastInitializerContext = YY_START;
-					      initBracketCount=1;
+  					      g_current->bodyLine = g_yyLineNr;
+                                              g_current->initializer = yytext;
+					      g_lastInitializerContext = YY_START;
+					      g_initBracketCount=1;
 					      BEGIN(ReadInitializer);
 					    }
 					  }
   					}
-<CSAccessorDecl>"{"			{ curlyCount++; }
+<CSAccessorDecl>"{"			{ g_curlyCount++; }
 <CSAccessorDecl>"}"{B}*"="		{
 					  // fall back to next rule if it's not the right bracket
-					  if (curlyCount != 0) REJECT;
-					  current->initializer = "=";
-					  current->endBodyLine=yyLineNr;
-					  lastInitializerContext = FindMembers;
+					  if (g_curlyCount != 0) REJECT;
+					  g_current->initializer = "=";
+					  g_current->endBodyLine=g_yyLineNr;
+					  g_lastInitializerContext = FindMembers;
 					  BEGIN(ReadInitializer);
 					}
 <CSAccessorDecl>"}"			{ 
-                                          if (curlyCount) 
+                                          if (g_curlyCount) 
                                           {
-                                            curlyCount--; 
+                                            g_curlyCount--; 
 					  }
 					  else
 					  {
-  					    mtype = Method;
-                                            virt = Normal;
+  					    g_mtype = Method;
+                                            g_virt = Normal;
 					    // not really important, but while we are at it
-					    current->endBodyLine=yyLineNr;
+					    g_current->endBodyLine=g_yyLineNr;
                                             unput(';');
 					    BEGIN(FindMembers);
 					  }
                                         }
-<CSAccessorDecl>"private "{BN}*"set"	{ if (curlyCount==0) current->spec |= Entry::PrivateSettable;   }
-<CSAccessorDecl>"protected "{BN}*"set"	{ if (curlyCount==0) current->spec |= Entry::ProtectedSettable; }
-<CSAccessorDecl>"private "{BN}*"get"	{ if (curlyCount==0) current->spec |= Entry::PrivateGettable;  	}
-<CSAccessorDecl>"protected "{BN}*"get"	{ if (curlyCount==0) current->spec |= Entry::ProtectedGettable; }
-<CSAccessorDecl>"set"			{ if (curlyCount==0) current->spec |= Entry::Settable;  }
-<CSAccessorDecl>"get"			{ if (curlyCount==0) current->spec |= Entry::Gettable;  }
-<CSAccessorDecl>"add"			{ if (curlyCount==0) current->spec |= Entry::Addable;   }
-<CSAccessorDecl>"remove"		{ if (curlyCount==0) current->spec |= Entry::Removable; }
-<CSAccessorDecl>"raise"			{ if (curlyCount==0) current->spec |= Entry::Raisable;  }
+<CSAccessorDecl>"private "{BN}*"set"	{ if (g_curlyCount==0) g_current->spec |= Entry::PrivateSettable;   }
+<CSAccessorDecl>"protected "{BN}*"set"	{ if (g_curlyCount==0) g_current->spec |= Entry::ProtectedSettable; }
+<CSAccessorDecl>"private "{BN}*"get"	{ if (g_curlyCount==0) g_current->spec |= Entry::PrivateGettable;  	}
+<CSAccessorDecl>"protected "{BN}*"get"	{ if (g_curlyCount==0) g_current->spec |= Entry::ProtectedGettable; }
+<CSAccessorDecl>"set"			{ if (g_curlyCount==0) g_current->spec |= Entry::Settable;  }
+<CSAccessorDecl>"get"			{ if (g_curlyCount==0) g_current->spec |= Entry::Gettable;  }
+<CSAccessorDecl>"add"			{ if (g_curlyCount==0) g_current->spec |= Entry::Addable;   }
+<CSAccessorDecl>"remove"		{ if (g_curlyCount==0) g_current->spec |= Entry::Removable; }
+<CSAccessorDecl>"raise"			{ if (g_curlyCount==0) g_current->spec |= Entry::Raisable;  }
 <CSAccessorDecl>"\""			{ BEGIN(CSString);}
 <CSAccessorDecl>"."			{}
 <CSAccessorDecl>\n			{ lineCount(); }
@@ -6445,13 +6419,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
  /* ---- Slice-specific rules ------ */
 
 <SliceSequence>{SCOPENAME}              {
-                                          if (current->spec&Entry::Local)
+                                          if (g_current->spec&Entry::Local)
                                           {
-                                            current->type = "local ";
+                                            g_current->type = "local ";
                                           }
-                                          current->type += "sequence<";
-                                          current->type += yytext;
-                                          current->type += ">";
+                                          g_current->type += "sequence<";
+                                          g_current->type += yytext;
+                                          g_current->type += ">";
                                         }
 
 <SliceSequence>{BN}*">"{BN}*            {
@@ -6461,27 +6435,27 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
 <SliceSequenceName>{ID}{BN}*            {
                                           lineCount();
-                                          current->name = yytext ;
-                                          current->name = current->name.stripWhiteSpace();
+                                          g_current->name = yytext ;
+                                          g_current->name = g_current->name.stripWhiteSpace();
                                         }
 
 <SliceSequenceName>";"                  {
-                                          current->section = Entry::VARIABLE_SEC;
-                                          current_root->moveToSubEntryAndRefresh(current);
+                                          g_current->section = Entry::VARIABLE_SEC;
+                                          g_current_root->moveToSubEntryAndRefresh(g_current);
                                           initEntry();
                                           BEGIN(FindMembers);
                                         }
 
 <SliceDictionary>{SCOPENAME}{BN}*","{BN}*{SCOPENAME} {
                                           lineCount();
-                                          if (current->spec&Entry::Local)
+                                          if (g_current->spec&Entry::Local)
                                           {
-                                            current->type = "local ";
+                                            g_current->type = "local ";
                                           }
-                                          current->type += "dictionary<";
-                                          current->type += yytext;
-                                          current->type += ">";
-                                          current->type = current->type.simplifyWhiteSpace();
+                                          g_current->type += "dictionary<";
+                                          g_current->type += yytext;
+                                          g_current->type += ">";
+                                          g_current->type = g_current->type.simplifyWhiteSpace();
                                         }
 
 <SliceDictionary>{BN}*">"{BN}*          {
@@ -6491,13 +6465,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
 <SliceDictionaryName>{ID}{BN}*          {
                                           lineCount();
-                                          current->name = yytext ;
-                                          current->name = current->name.stripWhiteSpace();
+                                          g_current->name = yytext ;
+                                          g_current->name = g_current->name.stripWhiteSpace();
                                         }
 
 <SliceDictionaryName>";"                {
-                                          current->section = Entry::VARIABLE_SEC;
-                                          current_root->moveToSubEntryAndRefresh(current);
+                                          g_current->section = Entry::VARIABLE_SEC;
+                                          g_current_root->moveToSubEntryAndRefresh(g_current);
                                           initEntry();
                                           BEGIN(FindMembers);
                                         }
@@ -6508,99 +6482,99 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
  /* ---- Single line comments ------ */
 <DocLine>[^\n]*"\n"[ \t]*"//"[/!][<]?   { // continuation of multiline C++-style comment
-				           docBlock+=yytext;
+				           g_docBlock+=yytext;
                                            int markerLen = yytext[yyleng-1]=='<' ? 4 : 3;
-          		                   docBlock.resize(docBlock.length() - markerLen);
+          		                   g_docBlock.resize(g_docBlock.length() - markerLen);
                                            lineCount();
                                         }
 <DocLine>{B}*"///"[/]+{B}*/"\n"		{ // ignore marker line (see bug700345)
-					  handleCommentBlock(docBlock.data(),current->brief.isEmpty());
-					  BEGIN( docBlockContext );
+					  handleCommentBlock(g_docBlock.data(),g_current->brief.isEmpty());
+					  BEGIN( g_docBlockContext );
   					}
 <DocLine>[^\n]*/"\n"{B}*"//"[!/]{B}*{CMD}"}"	{ // next line is an end group marker, see bug 752712
-  					  docBlock+=yytext;
-					  handleCommentBlock(docBlock.data(),current->brief.isEmpty());
-					  BEGIN( docBlockContext );
+  					  g_docBlock+=yytext;
+					  handleCommentBlock(g_docBlock.data(),g_current->brief.isEmpty());
+					  BEGIN( g_docBlockContext );
   					}
 <DocLine>[^\n]*/"\n"			{ // whole line
-  					  docBlock+=yytext;
-					  handleCommentBlock(docBlock.data(),current->brief.isEmpty());
-					  BEGIN( docBlockContext );
+  					  g_docBlock+=yytext;
+					  handleCommentBlock(g_docBlock.data(),g_current->brief.isEmpty());
+					  BEGIN( g_docBlockContext );
   					}
 
  /* ---- Comments blocks ------ */
 
 <DocBlock>"*"*"*/"			{ // end of comment block
-  				          handleCommentBlock(docBlock.data(),FALSE);
-					  BEGIN(docBlockContext);
+  				          handleCommentBlock(g_docBlock.data(),FALSE);
+					  BEGIN(g_docBlockContext);
   					}
 <DocBlock>^{B}*"*"+/[^/]		{ 
 
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock+=indent;
+                                          g_docBlock+=indent;
   					}
 <DocBlock>^{B}*("//")?{B}*"*"+/[^//a-z_A-Z0-9*]	{ // start of a comment line
                                           QCString indent;
                                           indent.fill(' ',computeIndent(yytext,g_column));
-                                          docBlock+=indent;
+                                          g_docBlock+=indent;
   					}
 <DocBlock>^{B}*("//"){B}*		{ // strip embedded C++ comments if at the start of a line
   					}
 <DocBlock>"//"				{ // slashes in the middle of a comment block
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
   					}
 <DocBlock>"/*"				{ // start of a new comment in the 
                                           // middle of a comment block
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
   					}
 <DocBlock>({CMD}{CMD}){ID}/[^a-z_A-Z0-9] { // escaped command
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
   					}
 <DocBlock>{CMD}("f$"|"f["|"f{")	        {
-                                          docBlock+=yytext;
-				          docBlockName=&yytext[1];
-					  if (docBlockName.at(1)=='{')
+                                          g_docBlock+=yytext;
+				          g_docBlockName=&yytext[1];
+					  if (g_docBlockName.at(1)=='{')
 					  {
-				            docBlockName.at(1)='}';
+				            g_docBlockName.at(1)='}';
 					  }
                                           g_fencedSize=0;
                                           g_nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
                                         }
 <DocBlock>{B}*"<"{PRE}">"		{
-                                          docBlock+=yytext;
-				          docBlockName="<pre>";
+                                          g_docBlock+=yytext;
+				          g_docBlockName="<pre>";
                                           g_fencedSize=0;
                                           g_nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
   					}
 <DocBlock>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"dot"|"code")/[^a-z_A-Z0-9\-]	{ // verbatim command (which could contain nested comments!)
-                                          docBlock+=yytext;
-				          docBlockName=&yytext[1];
+                                          g_docBlock+=yytext;
+				          g_docBlockName=&yytext[1];
                                           g_fencedSize=0;
                                           g_nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
   					}
 <DocBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                {
-                                          docBlock+=substitute(yytext,"*"," ");
-                                          docBlockName="~~~";
+                                          g_docBlock+=substitute(yytext,"*"," ");
+                                          g_docBlockName="~~~";
                                           g_fencedSize=yyleng;
                                           g_nestedComment=FALSE;
                                           BEGIN(DocCopyBlock);
                                         }
 <DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                {
-                                          docBlock+=substitute(yytext,"*"," ");
-                                          docBlockName="```";
+                                          g_docBlock+=substitute(yytext,"*"," ");
+                                          g_docBlockName="```";
                                           g_fencedSize=yyleng;
                                           g_nestedComment=FALSE;
                                           BEGIN(DocCopyBlock);
                                         }
 <DocBlock>{B}*"<code>"                  {
-  					  if (insideCS)
+  					  if (g_insideCS)
 					  {
-					    docBlock+=yytext;
-					    docBlockName="<code>";
+					    g_docBlock+=yytext;
+					    g_docBlockName="<code>";
                                             g_nestedComment=FALSE;
 					    BEGIN(DocCopyBlock);
 					  }
@@ -6610,49 +6584,49 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DocBlock>[^@*~\/\\\n]+			{ // any character that isn't special
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
   					}
 <DocBlock>\n				{ // newline
                                           lineCount();
-					  docBlock+=*yytext;
+					  g_docBlock+=*yytext;
   					}
 <DocBlock>.				{ // command block
-					  docBlock+=*yytext;
+					  g_docBlock+=*yytext;
   					}
 
  /* ---- Copy verbatim sections ------ */
 
 <DocCopyBlock>"</"{PRE}">"		{ // end of a <pre> block
-  					  docBlock+=yytext;
-					  if (docBlockName=="<pre>")
+  					  g_docBlock+=yytext;
+					  if (g_docBlockName=="<pre>")
 					  {
   					    BEGIN(DocBlock);
 					  }
   					}
 <DocCopyBlock>"</"{CODE}">"		{ // end of a <code> block
-  					  docBlock+=yytext;
-					  if (docBlockName=="<code>")
+  					  g_docBlock+=yytext;
+					  if (g_docBlockName=="<code>")
 					  {
   					    BEGIN(DocBlock);
 					  }
   					}
 <DocCopyBlock>[\\@]("f$"|"f]"|"f}")     {
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
 					  BEGIN(DocBlock);
   					}
 <DocCopyBlock>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"enddot"|"endcode")/[^a-z_A-Z0-9] { // end of verbatim block
-  					  docBlock+=yytext;
-					  if (&yytext[4]==docBlockName)
+  					  g_docBlock+=yytext;
+					  if (&yytext[4]==g_docBlockName)
 					  {
   					    BEGIN(DocBlock);
 					  }
   					}
 <DocCopyBlock>^{B}*"*"+/{BN}+		{ // start of a comment line
-  					  if (docBlockName=="verbatim")
+  					  if (g_docBlockName=="verbatim")
 					  {
 					    REJECT;
 					  }
-  					  else if (docBlockName=="code")
+  					  else if (g_docBlockName=="code")
 					  {
 					    REJECT;
 					  }
@@ -6660,15 +6634,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           {
                                             QCString indent;
                                             indent.fill(' ',computeIndent(yytext,0));
-                                            docBlock+=indent;
+                                            g_docBlock+=indent;
                                           }
   					}
 <DocCopyBlock>^{B}*"*"+/{B}+"*"{BN}*	{ // start of a comment line with two *'s
-  					  if (docBlockName=="code")
+  					  if (g_docBlockName=="code")
                                           {
                                             QCString indent;
                                             indent.fill(' ',computeIndent(yytext,0));
-                                            docBlock+=indent;
+                                            g_docBlock+=indent;
                                           }
                                           else
 					  {
@@ -6676,11 +6650,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DocCopyBlock>^{B}*"*"+/({ID}|"(")	{ // Assume *var or *(... is part of source code (see bug723516)
-					  if (docBlockName=="code")
+					  if (g_docBlockName=="code")
                                           {
                                             QCString indent;
                                             indent.fill(' ',computeIndent(yytext,-1));
-                                            docBlock+=indent+"*";
+                                            g_docBlock+=indent+"*";
                                           }
                                           else
                                           {
@@ -6688,18 +6662,18 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           }
                                         }
 <DocCopyBlock>^{B}*"*"+/{BN}*		{ // start of a comment line with one *
-  					  if (docBlockName=="code")
+  					  if (g_docBlockName=="code")
                                           {
                                             QCString indent;
                                             if (g_nestedComment) // keep * it is part of the code
                                             {
                                               indent.fill(' ',computeIndent(yytext,-1));
-                                              docBlock+=indent+"*";
+                                              g_docBlock+=indent+"*";
                                             }
                                             else // remove * it is part of the comment block
                                             {
                                               indent.fill(' ',computeIndent(yytext,0));
-                                              docBlock+=indent;
+                                              g_docBlock+=indent;
                                             }
                                           }
                                           else
@@ -6708,21 +6682,21 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DocCopyBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* {
-                                          docBlock+=substitute(yytext,"*"," ");
+                                          g_docBlock+=substitute(yytext,"*"," ");
                                           if (g_fencedSize==yyleng)
                                           {
                                             BEGIN(DocBlock);
                                           }
                                         }
 <DocCopyBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
-                                          docBlock+=substitute(yytext,"*"," ");
+                                          g_docBlock+=substitute(yytext,"*"," ");
                                           if (g_fencedSize==yyleng)
                                           {
                                             BEGIN(DocBlock);
                                           }
                                         }
 <DocCopyBlock>[^\<@/*\]~\$\\\n]+	{ // any character that is not special
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
   					}
 <DocCopyBlock>"/*"|"*/"|"//"		{
                                           if (yytext[1]=='*')
@@ -6733,20 +6707,20 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           {
                                             g_nestedComment=FALSE;
                                           }
-  					  docBlock+=yytext;
+  					  g_docBlock+=yytext;
 					}
 <DocCopyBlock>\n			{ // newline
-  					  docBlock+=*yytext;
+  					  g_docBlock+=*yytext;
                                           lineCount();
   					}
 <DocCopyBlock>.				{ // any other character
-  					  docBlock+=*yytext;
+  					  g_docBlock+=*yytext;
   					}
 <DocCopyBlock><<EOF>>			{
-  					  warn(yyFileName,yyLineNr,
-					      "reached end of file while inside a '%s' block!\n"
+  					  warn(g_yyFileName,g_yyLineNr,
+					      "reached end of file while g_inside a '%s' block!\n"
 					      "The command that should end the block seems to be missing!\n",
-					      docBlockName.data());
+					      g_docBlockName.data());
   					  yyterminate();
   					}
 
@@ -6754,69 +6728,69 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
     /* ------------- Prototype parser -------------- */
 
 <Prototype>"operator"{B}*"("{B}*")"	{
-  					  current->name+=yytext;
+  					  g_current->name+=yytext;
   					}
 <Prototype>"("			       {
-  					  current->args+=*yytext;
-					  currentArgumentContext = PrototypeQual;
-					  fullArgString = current->args.copy();
-					  copyArgString = &current->args;
+  					  g_current->args+=*yytext;
+					  g_currentArgumentContext = PrototypeQual;
+					  g_fullArgString = g_current->args.copy();
+					  g_copyArgString = &g_current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
 <Prototype>"("({ID}"::")*({B}*[&*])+	{
-  					  current->type+=current->name+yytext;
-					  current->name.resize(0);
+  					  g_current->type+=g_current->name+yytext;
+					  g_current->name.resize(0);
   					  BEGIN( PrototypePtr );
   					}
 <PrototypePtr>{SCOPENAME}		{
-  					  current->name+=yytext;
+  					  g_current->name+=yytext;
   					}
 <PrototypePtr>"("			{
-  					  current->args+=*yytext;
-					  currentArgumentContext = PrototypeQual;
-					  fullArgString = current->args.copy();
-					  copyArgString = &current->args;
+  					  g_current->args+=*yytext;
+					  g_currentArgumentContext = PrototypeQual;
+					  g_fullArgString = g_current->args.copy();
+					  g_copyArgString = &g_current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
 <PrototypePtr>")"			{
-  					  current->type+=')';
+  					  g_current->type+=')';
   					  BEGIN( Prototype );
   					}
 <PrototypePtr>.				{
-  					  current->name+=yytext;
+  					  g_current->name+=yytext;
   					}
 <PrototypeQual>"{"			{
   					  BEGIN( PrototypeSkipLine);
   					}
 <PrototypeQual>{B}*"const"{B}*    	{ 
-  					  current->args += " const "; 
-					  current->argList.constSpecifier=TRUE;
+  					  g_current->args += " const "; 
+					  g_current->argList.constSpecifier=TRUE;
 					}
 <PrototypeQual>{B}*"volatile"{B}* 	{ 
-  					  current->args += " volatile "; 
-					  current->argList.volatileSpecifier=TRUE;
+  					  g_current->args += " volatile "; 
+					  g_current->argList.volatileSpecifier=TRUE;
 					}
 <PrototypeQual>{B}*"="{B}*"0"{B}*	{ 
-					  current->args += " = 0"; 
-					  current->virt = Pure; 
-					  current->argList.pureSpecifier=TRUE;
+					  g_current->args += " = 0"; 
+					  g_current->virt = Pure; 
+					  g_current->argList.pureSpecifier=TRUE;
 					}
 <PrototypeQual>"throw"{B}*"("	        {
-  					  current->exception = "throw(";
+  					  g_current->exception = "throw(";
 					  BEGIN(PrototypeExc);
   					}
 <PrototypeExc>")"			{
-  					  current->exception += ')';
+  					  g_current->exception += ')';
 					  BEGIN(PrototypeQual);
   					}
 <PrototypeExc>.			        {
-  					  current->exception += *yytext;
+  					  g_current->exception += *yytext;
   					}
 <PrototypeQual>.			{
-  					  current->args += *yytext;
+  					  g_current->args += *yytext;
   					}
 <Prototype>.	                        {
-  					  current->name += *yytext;
+  					  g_current->name += *yytext;
   					}
 <PrototypeSkipLine>.			{
   					}
@@ -6825,7 +6799,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
 
 <SkipCxxComment>.*"\\\n"		{  // line continuation
-  					  if (insideCS) 
+  					  if (g_insideCS) 
 					  {
 					    REJECT;
 					  }
@@ -6835,70 +6809,70 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <SkipCxxComment>.*/\n			{ 
-					  BEGIN( lastCContext ) ;
+					  BEGIN( g_lastCContext ) ;
 					}
 <SkipComment>[^\*\n]+
 
   /* ------------ Generic rules -------------- */
 
 <*>"[["                                 { // C++11 attribute
-                                          if (!insideCpp) REJECT;
+                                          if (!g_insideCpp) REJECT;
                                           if (YY_START == CopyGString || YY_START == CopyGString) REJECT;
-                                          lastC11AttributeContext = YY_START;
+                                          g_lastC11AttributeContext = YY_START;
                                           BEGIN( SkipC11Attribute );
                                         }
 
 <*>\n					{ lineCount(); }
 <*>\"					{
-					  if (insideIDL && insideCppQuote)
+					  if (g_insideIDL && g_insideCppQuote)
 					  {
 					    BEGIN(EndCppQuote);
 					  }
 					}
 <*>"#"				        {	
-  					  if (!insidePHP)
+  					  if (!g_insidePHP)
   					    REJECT;
-  					  lastCContext = YY_START ;
+  					  g_lastCContext = YY_START ;
 					  BEGIN( SkipCxxComment ) ;
 					}
 <*>\'					{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-  					    lastStringContext=YY_START;
+  					    g_lastStringContext=YY_START;
 					    BEGIN(SkipPHPString);
 					  }
   					}
 <*>\"					{
-  					  if (insidePHP)
+  					  if (g_insidePHP)
 					  {
-  					    lastStringContext=YY_START;
+  					    g_lastStringContext=YY_START;
 					    BEGIN(SkipString);
 					  }
   					}
 <*>\?                                   {
-  					  if (insideCS && (YY_START != SkipRound)) 
+  					  if (g_insideCS && (YY_START != SkipRound)) 
 					  {
-					    if (current->type.isEmpty())
+					    if (g_current->type.isEmpty())
 					    {
-					      if (current->name.isEmpty())
-					        current->name="?";
+					      if (g_current->name.isEmpty())
+					        g_current->name="?";
 					      else
-					        current->name+="?";
+					        g_current->name+="?";
 					    }
 					    else
 					    {
-					      current->type+="?";
+					      g_current->type+="?";
 					    }
 					  }
   					}
 <*>.
 <SkipComment>"//"|"/*"
-<*>"/*"					{ lastCContext = YY_START ;
+<*>"/*"					{ g_lastCContext = YY_START ;
 					  BEGIN( SkipComment ) ;
 					}
-<SkipComment>{B}*"*/"			{ BEGIN( lastCContext ) ; }
+<SkipComment>{B}*"*/"			{ BEGIN( g_lastCContext ) ; }
 <*>"//"				        {	
-  					  lastCContext = YY_START ;
+  					  g_lastCContext = YY_START ;
 					  BEGIN( SkipCxxComment ) ;
 					}
 %%
@@ -6909,13 +6883,13 @@ static void startCommentBlock(bool brief)
 {
   if (brief)
   {
-    current->briefFile = yyFileName;
-    current->briefLine = yyLineNr;
+    g_current->briefFile = g_yyFileName;
+    g_current->briefLine = g_yyLineNr;
   }
   else
   {
-    current->docFile = yyFileName;
-    current->docLine = yyLineNr;
+    g_current->docFile = g_yyFileName;
+    g_current->docLine = g_yyLineNr;
   }
 }
   
@@ -6923,19 +6897,19 @@ static void startCommentBlock(bool brief)
 
 static void newEntry()
 {
-  if (tempEntry==0) // if temp entry is not 0, it holds current, 
-                    // and current is actually replaced by previous which was 
-                    // already added to current_root, so we should not add it again 
+  if (g_tempEntry==0) // if temp entry is not 0, it holds g_current, 
+                    // and g_current is actually replaced by g_previous which was 
+                    // already added to g_current_root, so we should not add it again 
                     // (see bug723314)
   {
-    previous = current.get();
-    current_root->moveToSubEntryAndRefresh(current);
+    g_previous = g_current.get();
+    g_current_root->moveToSubEntryAndRefresh(g_current);
   }
   else
   {
-    previous = current.get();
-    tempEntry.swap(current);
-    tempEntry.reset();
+    g_previous = g_current.get();
+    g_tempEntry.swap(g_current);
+    g_tempEntry.reset();
   }
   initEntry();
 }
@@ -6943,31 +6917,31 @@ static void newEntry()
 static void handleCommentBlock(const QCString &doc,bool brief)
 {
   static bool hideInBodyDocs = Config_getBool(HIDE_IN_BODY_DOCS);
-  if (docBlockInBody && hideInBodyDocs) return;
+  if (g_docBlockInBody && hideInBodyDocs) return;
   //printf("parseCommentBlock [%s] brief=%d\n",doc.data(),brief);
-  int lineNr = brief ? current->briefLine : current->docLine;   // line of block start
+  int lineNr = brief ? g_current->briefLine : g_current->docLine;   // line of block start
 
   // fill in inbodyFile && inbodyLine the first time, see bug 633891
-  Entry *docEntry = docBlockInBody && previous ? previous : current.get();
-  if (docBlockInBody && docEntry && docEntry->inbodyLine==-1)
+  Entry *docEntry = g_docBlockInBody && g_previous ? g_previous : g_current.get();
+  if (g_docBlockInBody && docEntry && docEntry->inbodyLine==-1)
   {
-    docEntry->inbodyFile = yyFileName;
+    docEntry->inbodyFile = g_yyFileName;
     docEntry->inbodyLine = lineNr;
   }
 
   int position=0;
   bool needsEntry=FALSE;
-  QCString processedDoc = preprocessCommentBlock(stripIndentation(doc),yyFileName,lineNr);
+  QCString processedDoc = preprocessCommentBlock(stripIndentation(doc),g_yyFileName,lineNr);
   while (parseCommentBlock(
 	g_thisParser,
-	docBlockInBody && previous ? previous : current.get(),
+	g_docBlockInBody && g_previous ? g_previous : g_current.get(),
 	processedDoc, // text
-	yyFileName,   // file
+	g_yyFileName,   // file
 	lineNr,       // line of block start
-	docBlockInBody ? FALSE : brief,               // isBrief
-	docBlockInBody ? FALSE : docBlockAutoBrief,   // isJavaDocStyle
-	docBlockInBody,                               // isInBody
-	protection,
+	g_docBlockInBody ? FALSE : brief,               // isBrief
+	g_docBlockInBody ? FALSE : g_docBlockAutoBrief,   // isJavaDocStyle
+	g_docBlockInBody,                               // isInBody
+	g_protection,
         position,
         needsEntry
         )
@@ -6976,10 +6950,10 @@ static void handleCommentBlock(const QCString &doc,bool brief)
     //printf("parseCommentBlock position=%d [%s]\n",position,doc.data()+position);
     if (needsEntry) 
     {
-      QCString docFile = current->docFile;
+      QCString docFile = g_current->docFile;
       newEntry();
-      current->docFile = docFile;
-      current->docLine = lineNr;
+      g_current->docFile = docFile;
+      g_current->docLine = lineNr;
     }
   }
   if (needsEntry)
@@ -6987,10 +6961,10 @@ static void handleCommentBlock(const QCString &doc,bool brief)
     newEntry();
   }
 
-  if (docBlockTerm)
+  if (g_docBlockTerm)
   {
-    unput(docBlockTerm);
-    docBlockTerm=0;
+    unput(g_docBlockTerm);
+    g_docBlockTerm=0;
   }
 }
 
@@ -7007,25 +6981,25 @@ static void handleParametersCommentBlocks(ArgumentList &al)
       bool needsEntry;
 
       // save context
-      QCString orgDoc   = current->doc;
-      QCString orgBrief = current->brief;
-      int orgDocLine    = current->docLine;
-      int orgBriefLine  = current->briefLine;
+      QCString orgDoc   = g_current->doc;
+      QCString orgBrief = g_current->brief;
+      int orgDocLine    = g_current->docLine;
+      int orgBriefLine  = g_current->briefLine;
 
-      current->doc.resize(0);
-      current->brief.resize(0);
+      g_current->doc.resize(0);
+      g_current->brief.resize(0);
 
       //printf("handleParametersCommentBlock [%s]\n",doc.data());
       while (parseCommentBlock(
 	     g_thisParser,
-	     current.get(),
+	     g_current.get(),
 	     a.docs,             // text
-	     yyFileName,         // file
-	     current->docLine,   // line of block start
+	     g_yyFileName,         // file
+	     g_current->docLine,   // line of block start
 	     FALSE, 
 	     FALSE,
 	     FALSE,
-	     protection,
+	     g_protection,
 	     position,
 	     needsEntry
 	    )
@@ -7038,13 +7012,13 @@ static void handleParametersCommentBlocks(ArgumentList &al)
       {
 	newEntry();
       }
-      a.docs = current->doc;
+      a.docs = g_current->doc;
 
       // restore context
-      current->doc       = orgDoc;
-      current->brief     = orgBrief;
-      current->docLine   = orgDocLine;
-      current->briefLine = orgBriefLine;
+      g_current->doc       = orgDoc;
+      g_current->brief     = orgBrief;
+      g_current->docLine   = orgDocLine;
+      g_current->briefLine = orgBriefLine;
     }
   }
 }
@@ -7062,25 +7036,25 @@ static void parseCompounds(const std::unique_ptr<Entry> &rt)
       //printf("-- %s ---------\n%s\n---------------\n",
       //  ce->name.data(),ce->program.data());
       // init scanner state
-      padCount=0;
+      g_padCount=0;
       //depthIf = 0;
       g_column=0;
-      inputString = ce->program;
-      inputPosition = 0;
+      g_inputString = ce->program;
+      g_inputPosition = 0;
       scannerYYrestart( scannerYYin ) ;
       if (ce->section==Entry::ENUM_SEC || (ce->spec&Entry::Enum))
 	BEGIN( FindFields ) ;
       else
 	BEGIN( FindMembers ) ;
-      current_root = ce.get() ;
-      yyFileName = ce->fileName;
+      g_current_root = ce.get() ;
+      g_yyFileName = ce->fileName;
       //setContext();
-      yyLineNr = ce->startLine ;
-      yyColNr = ce->startColumn ;
-      insideObjC = ce->lang==SrcLangExt_ObjC;
-      //printf("---> Inner block starts at line %d objC=%d\n",yyLineNr,insideObjC);
-      current = std::make_unique<Entry>();
-      gstat = FALSE;
+      g_yyLineNr = ce->startLine ;
+      g_yyColNr = ce->startColumn ;
+      g_insideObjC = ce->lang==SrcLangExt_ObjC;
+      //printf("---> Inner block starts at line %d objC=%d\n",g_yyLineNr,g_insideObjC);
+      g_current = std::make_unique<Entry>();
+      g_stat = FALSE;
       initEntry();
 
       // deep copy group list from parent (see bug 727732)
@@ -7094,68 +7068,68 @@ static void parseCompounds(const std::unique_ptr<Entry> &rt)
       // set default protection based on the compound type
       if( ce->section==Entry::CLASS_SEC ) // class
       {
-        if (insidePHP || insideD || insideJS || insideIDL || insideSlice)
+        if (g_insidePHP || g_insideD || g_insideJS || g_insideIDL || g_insideSlice)
 	{
-          current->protection = protection = Public ; 
+          g_current->protection = g_protection = Public ; 
 	}
-	else if (insideJava)
+	else if (g_insideJava)
 	{
-          current->protection = protection = (ce->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
+          g_current->protection = g_protection = (ce->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
 	}
 	else if (ce->spec&(Entry::Interface | Entry::Ref | Entry::Value | Entry::Struct | Entry::Union))
 	{
 	  if (ce->lang==SrcLangExt_ObjC)
 	  {
-	    current->protection = protection = Protected ;
+	    g_current->protection = g_protection = Protected ;
 	  }
 	  else
 	  {
-	    current->protection = protection = Public ;
+	    g_current->protection = g_protection = Public ;
 	  }
 	}
 	else 
 	{
-          current->protection = protection = Private ;
+          g_current->protection = g_protection = Private ;
 	}
       }
       else if (ce->section == Entry::ENUM_SEC ) // enum
       {
-	current->protection = protection = ce->protection;
+	g_current->protection = g_protection = ce->protection;
       }
       else if (!ce->name.isEmpty() && ce->name.at(ni)=='@') // unnamed union or namespace
       {
 	if (ce->section == Entry::NAMESPACE_SEC ) // unnamed namespace
 	{
-          current->stat = gstat = TRUE;
+          g_current->stat = g_stat = TRUE;
 	}
-	current->protection = protection = ce->protection;
+	g_current->protection = g_protection = ce->protection;
       }
       else // named struct, union, protocol, category
       {
-	current->protection = protection = Public ;
+	g_current->protection = g_protection = Public ;
       }
-      mtype = Method;
-      virt = Normal;
-      //printf("name=%s current->stat=%d gstat=%d\n",ce->name.data(),current->stat,gstat);
+      g_mtype = Method;
+      g_virt = Normal;
+      //printf("name=%s g_current->stat=%d g_stat=%d\n",ce->name.data(),g_current->stat,g_stat);
 
       //memberGroupId = DOX_NOGROUP;
       //memberGroupRelates.resize(0);
       //memberGroupInside.resize(0);
       QCString name = ce->name;
-      Doxygen::docGroup.enterCompound(yyFileName,yyLineNr,name);
+      Doxygen::docGroup.enterCompound(g_yyFileName,g_yyLineNr,name);
       
       scannerYYlex() ;
       g_lexInit=TRUE;
       //forceEndGroup();
 
-      Doxygen::docGroup.leaveCompound(yyFileName,yyLineNr,name);
+      Doxygen::docGroup.leaveCompound(g_yyFileName,g_yyLineNr,name);
       
       ce->program.resize(0);
 
 
       //if (depthIf>0)
       //{
-      //	warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
+      //	warn(g_yyFileName,g_yyLineNr,"Documentation block ended in the middle of a conditional section!");
       //}
     }
     parseCompounds(ce);
@@ -7172,91 +7146,84 @@ static void parseMain(const char *fileName,
 {
   initParser();
 
-  inputString = fileBuf;
-  inputPosition = 0;
+  g_inputString = fileBuf;
+  g_inputPosition = 0;
   g_column = 0;
 
-  //anonCount     = 0;  // don't reset per file
+  //g_anonCount     = 0;  // don't reset per file
   //depthIf       = 0;
-  protection    = Public;
-  mtype         = Method;
-  gstat         = FALSE;
-  virt          = Normal;
-  current_root  = rt.get();
-  global_root   = rt.get();
-  inputFile.setName(fileName);
-  if (inputFile.open(IO_ReadOnly))
+  g_protection    = Public;
+  g_mtype         = Method;
+  g_stat         = FALSE;
+  g_virt          = Normal;
+  g_current_root  = rt.get();
+  g_yyLineNr= 1 ; 
+  g_yyFileName = fileName;
+  setContext();
+  bool processWithClang = g_insideCpp || g_insideObjC;
+  if (processWithClang)
   {
-    yyLineNr= 1 ; 
-    yyFileName = fileName;
-    setContext();
-    bool processWithClang = insideCpp || insideObjC;
-    if (processWithClang)
+    if (!sameTranslationUnit) // new file
     {
-      if (!sameTranslationUnit) // new file
-      {
-        ClangParser::instance()->start(fileName,filesInSameTranslationUnit);
-      }
-      else
-      {
-        ClangParser::instance()->switchToFile(fileName);
-      }
-    }
-    rt->lang = language;
-    msg("Parsing file %s...\n",yyFileName.data());
-
-    current_root  = rt.get() ;
-    initParser();
-    Doxygen::docGroup.enterFile(yyFileName,yyLineNr);
-    current = std::make_unique<Entry>();
-    //printf("current=%p current_root=%p\n",current,current_root);
-    int sec=guessSection(yyFileName);
-    if (sec)
-    {
-      current->name    = yyFileName;
-      current->section = sec;
-      current_root->moveToSubEntryAndRefresh(current);
-    }
-    current->reset();
-    initEntry();
-    scannerYYrestart( scannerYYin );
-    if ( insidePHP )
-    {
-      BEGIN( FindMembersPHP );
+      ClangParser::instance()->start(fileName,filesInSameTranslationUnit);
     }
     else
     {
-      BEGIN( FindMembers );
+      ClangParser::instance()->switchToFile(fileName);
     }
+  }
+  rt->lang = g_language;
+  msg("Parsing file %s...\n",g_yyFileName.data());
 
-    scannerYYlex();
-    g_lexInit=TRUE;
-
-    if (YY_START==Comment)
-    {
-      warn(yyFileName,yyLineNr,"File ended in the middle of a comment block! Perhaps a missing \\endcode?");
-    }
+  g_current_root  = rt.get() ;
+  initParser();
+  Doxygen::docGroup.enterFile(g_yyFileName,g_yyLineNr);
+  g_current = std::make_unique<Entry>();
+  //printf("g_current=%p g_current_root=%p\n",g_current,g_current_root);
+  int sec=guessSection(g_yyFileName);
+  if (sec)
+  {
+    g_current->name    = g_yyFileName;
+    g_current->section = sec;
+    g_current_root->moveToSubEntryAndRefresh(g_current);
+  }
+  g_current->reset();
+  initEntry();
+  scannerYYrestart( scannerYYin );
+  if ( g_insidePHP )
+  {
+    BEGIN( FindMembersPHP );
+  }
+  else
+  {
+    BEGIN( FindMembers );
+  }
 
-    //forceEndGroup();
-    Doxygen::docGroup.leaveFile(yyFileName,yyLineNr);
+  scannerYYlex();
+  g_lexInit=TRUE;
 
-    rt->program.resize(0);
+  if (YY_START==Comment)
+  {
+    warn(g_yyFileName,g_yyLineNr,"File ended in the middle of a comment block! Perhaps a missing \\endcode?");
+  }
 
-    parseCompounds(rt);
+  //forceEndGroup();
+  Doxygen::docGroup.leaveFile(g_yyFileName,g_yyLineNr);
 
-    inputFile.close();
+  rt->program.resize(0);
 
-    anonNSCount++;
+  parseCompounds(rt);
 
-    // add additional entries that were created during processing
-    for (auto &kv: g_outerScopeEntries)
-    {
-      //printf(">>> adding '%s' to scope '%s'\n",kv.second->name.data(),kv.first->name.data());
-      kv.first->moveToSubEntryAndKeep(kv.second);
-    }
-    g_outerScopeEntries.clear();
+  g_anonNSCount++;
 
+  // add additional entries that were created during processing
+  for (auto &kv: g_outerScopeEntries)
+  {
+    //printf(">>> adding '%s' to scope '%s'\n",kv.second->name.data(),kv.first->name.data());
+    kv.first->moveToSubEntryAndKeep(kv.second);
   }
+  g_outerScopeEntries.clear();
+
 }
 
 //----------------------------------------------------------------------------
@@ -7266,10 +7233,10 @@ static void parsePrototype(const QCString &text)
   //printf("**** parsePrototype(%s) begin\n",text.data());
   if (text.isEmpty()) 
   {
-    warn(yyFileName,yyLineNr,"Empty prototype found!");
+    warn(g_yyFileName,g_yyLineNr,"Empty prototype found!");
     return;
   }
-  if (!current) // nothing to store (see bug683516)
+  if (!g_current) // nothing to store (see bug683516)
   {
     return;
   }
@@ -7281,28 +7248,28 @@ static void parsePrototype(const QCString &text)
   // save scanner state
   orgState = YY_CURRENT_BUFFER;
   yy_switch_to_buffer(yy_create_buffer(scannerYYin, YY_BUF_SIZE));
-  orgInputString = inputString; 
-  orgInputPosition = inputPosition;
+  orgInputString = g_inputString; 
+  orgInputPosition = g_inputPosition;
 
   // set new string
-  inputString = text;
-  inputPosition = 0;
+  g_inputString = text;
+  g_inputPosition = 0;
   g_column = 0;
   scannerYYrestart( scannerYYin );
   BEGIN(Prototype);
   scannerYYlex();
   g_lexInit=TRUE;
 
-  current->name = current->name.stripWhiteSpace();
-  if (current->section == Entry::MEMBERDOC_SEC && current->args.isEmpty())
-    current->section = Entry::VARIABLEDOC_SEC;
+  g_current->name = g_current->name.stripWhiteSpace();
+  if (g_current->section == Entry::MEMBERDOC_SEC && g_current->args.isEmpty())
+    g_current->section = Entry::VARIABLEDOC_SEC;
 
   // restore original scanner state
   YY_BUFFER_STATE tmpState = YY_CURRENT_BUFFER;
   yy_switch_to_buffer(orgState);
   yy_delete_buffer(tmpState);
-  inputString = orgInputString; 
-  inputPosition = orgInputPosition;
+  g_inputString = orgInputString; 
+  g_inputPosition = orgInputPosition;
 
 
   //printf("**** parsePrototype end\n");
@@ -7327,7 +7294,7 @@ void scanFreeScanner()
 //static void handleGroupEndCommand()
 //{
 //  endGroup();
-//  previous=0;
+//  g_previous=0;
 //}
 
 //----------------------------------------------------------------------------
@@ -7338,7 +7305,7 @@ void CLanguageScanner::startTranslationUnit(const char *)
 
 void CLanguageScanner::finishTranslationUnit()
 {
-  bool processWithClang = insideCpp || insideObjC;
+  bool processWithClang = g_insideCpp || g_insideObjC;
   if (processWithClang)
   {
     ClangParser::instance()->finish();
-- 
cgit v0.12


From 26a634f60f53987d4d8b1f94259cc0a94e2414c3 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 24 Nov 2019 13:41:37 +0100
Subject: Fixed line count misaligned introduced with JAVADOC_BANNER

---
 src/scanner.l | 74 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/scanner.l b/src/scanner.l
index e0095ba..3e48916 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -246,7 +246,7 @@ static void initEntry()
 
 static void lineCount()
 {
-  static int tabSize = Config_getInt(TAB_SIZE);
+  int tabSize = Config_getInt(TAB_SIZE);
   const char *p;
   for (p = yytext ; *p ; ++p )
   {
@@ -269,7 +269,7 @@ static void lineCount()
 static inline int computeIndent(const char *s,int startIndent)
 {
   int col=startIndent;
-  static int tabSize=Config_getInt(TAB_SIZE);
+  int tabSize=Config_getInt(TAB_SIZE);
   const char *p=s;
   char c;
   while ((c=*p++))
@@ -4120,7 +4120,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  if (!g_msName.isEmpty() 
 					      /*&& g_msName!=g_current->name*/) // skip typedef T {} T;, removed due to bug608493
 					  {
-					    static bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT);
+					    bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT);
 					    // case 1: typedef struct _S { ... } S_t; 
 					    // -> omit typedef and use S_t as the struct name
 					    if (typedefHidesStruct && 
@@ -6207,41 +6207,43 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( DocBlock );
 					}
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>"/**"[*]+{BL} {
+					  bool javadocBanner = Config_getBool(JAVADOC_BANNER);
+                                          lineCount();
 
-					  static bool javadocBanner = Config_getBool(JAVADOC_BANNER);
-
-					  if( javadocBanner ) {
-						  g_lastDocContext = YY_START;
+					  if( javadocBanner )
+                                          {
+                                            g_lastDocContext = YY_START;
 
-						  //printf("Found comment banner at %s:%d\n",g_yyFileName,g_yyLineNr);
-						  if (g_current_root->section & Entry::SCOPE_MASK)
-	                                          {
-						    g_current->inside = g_current_root->name+"::";
-	                                          }
-						  g_current->docLine = g_yyLineNr;
-						  g_current->docFile = g_yyFileName;
-						  g_docBlockContext = YY_START;
-						  g_docBlockInBody  = YY_START==SkipCurly;
-	                                          static bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
-						  g_docBlockAutoBrief = javadocAutoBrief;
+                                            //printf("Found comment banner at %s:%d\n",g_yyFileName,g_yyLineNr);
+                                            if (g_current_root->section & Entry::SCOPE_MASK)
+                                            {
+                                              g_current->inside = g_current_root->name+"::";
+                                            }
+                                            g_current->docLine = g_yyLineNr;
+                                            g_current->docFile = g_yyFileName;
+                                            g_docBlockContext = YY_START;
+                                            g_docBlockInBody  = YY_START==SkipCurly;
+                                            bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
+                                            g_docBlockAutoBrief = javadocAutoBrief;
 
-	                                          QCString indent;
-	                                          indent.fill(' ',computeIndent(yytext,g_column));
-	                                          g_docBlock=indent;
+                                            QCString indent;
+                                            indent.fill(' ',computeIndent(yytext,g_column));
+                                            g_docBlock=indent;
 
-						  if (g_docBlockAutoBrief)
-						  {
-						    g_current->briefLine = g_yyLineNr;
-						    g_current->briefFile = g_yyFileName;
-						  }
-						  startCommentBlock(FALSE);
-						  BEGIN( DocBlock );
-					  } else {
-						  g_current->program += yytext ;
-						  g_lastContext = YY_START ;
-						  BEGIN( Comment ) ;
+                                            if (g_docBlockAutoBrief)
+                                            {
+                                              g_current->briefLine = g_yyLineNr;
+                                              g_current->briefFile = g_yyFileName;
+                                            }
+                                            startCommentBlock(FALSE);
+                                            BEGIN( DocBlock );
+                                          }
+                                          else
+                                          {
+					    g_current->program += yytext ;
+					    g_lastContext = YY_START ;
+					    BEGIN( Comment ) ;
 					  }
-
 					}
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/**"/[^/*] {
 					  g_lastDocContext = YY_START;
@@ -6255,7 +6257,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  g_current->docFile = g_yyFileName;
 					  g_docBlockContext = YY_START;
 					  g_docBlockInBody  = YY_START==SkipCurly;
-                                          static bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
+                                          bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
 					  g_docBlockAutoBrief = javadocAutoBrief;
 
                                           QCString indent;
@@ -6916,7 +6918,7 @@ static void newEntry()
 
 static void handleCommentBlock(const QCString &doc,bool brief)
 {
-  static bool hideInBodyDocs = Config_getBool(HIDE_IN_BODY_DOCS);
+  bool hideInBodyDocs = Config_getBool(HIDE_IN_BODY_DOCS);
   if (g_docBlockInBody && hideInBodyDocs) return;
   //printf("parseCommentBlock [%s] brief=%d\n",doc.data(),brief);
   int lineNr = brief ? g_current->briefLine : g_current->docLine;   // line of block start
@@ -7058,7 +7060,7 @@ static void parseCompounds(const std::unique_ptr<Entry> &rt)
       initEntry();
 
       // deep copy group list from parent (see bug 727732)
-      static bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS);
+      bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS);
       if (autoGroupNested && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum))
       {
         ce->groups = rt->groups;
-- 
cgit v0.12


From 73a410a00efb17ab7bc673bf2e3ecdc45eb876f4 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 24 Nov 2019 19:10:02 +0100
Subject: Fixed endless loop during preprocessing

---
 src/pre.l | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pre.l b/src/pre.l
index cf13764..abc9df9 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2391,10 +2391,13 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
   //printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos, level);
   if (expr.isEmpty())
   {
+    //printf("<expandExpression: empty\n");
     return;
   }
   if (state->expansionDict.find(expr)!=0) // check for recursive expansions
   {
+    expr=expr.left(pos)+"@-"+expr.right(expr.length()-pos);
+    //printf("<expandExpression: already expanded expr='%s'\n",expr.data());
     return;
   }
   else
-- 
cgit v0.12


From e6d4940246e42bedca2c4faa925ddfa2813d7f01 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 25 Nov 2019 10:59:05 +0100
Subject: Adding some links in search documentation

The search chapter was missing some links
---
 doc/extsearch.doc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/extsearch.doc b/doc/extsearch.doc
index ead7ea8..e139408 100644
--- a/doc/extsearch.doc
+++ b/doc/extsearch.doc
@@ -77,7 +77,7 @@ Since we didn't create or install a doxysearch.db it is OK for the test to
 fail for this reason. How to correct this is discussed in the next section.
 
 Before continuing with the next section add the above 
-URL (without the `?test` part) to the `SEARCHENGINE_URL` tag in
+URL (without the `?test` part) to the \ref cfg_searchengine_url "SEARCHENGINE_URL" tag in
 doxygen's configuration file:
 
     SEARCHENGINE_URL = http://yoursite.com/path/to/cgi/doxysearch.cgi
@@ -135,7 +135,8 @@ and then copy the resulting `doxysearch.db` to the directory where also
 
 The `searchdata.xml` file doesn't contain any absolute paths or links, 
 so how can the search results from multiple projects be linked back to the right documentation set?
-This is where the `EXTERNAL_SEARCH_ID` and `EXTRA_SEARCH_MAPPINGS` options come into play.
+This is where the \ref cfg_external_search_id "EXTERNAL_SEARCH_ID" and
+\ref cfg_extra_search_mappings "EXTRA_SEARCH_MAPPINGS" options come into play.
 
 To be able to identify the different projects, one needs to
 set a unique ID using \ref cfg_external_search_id "EXTERNAL_SEARCH_ID"
@@ -168,8 +169,8 @@ and the search results will link to the right documentation set.
 
 When you modify the source code, you should re-run doxygen to get up to date
 documentation again. When using external searching you also need to update the
-search index by re-running `doxyindexer`. You could wrap the call to doxygen
-and doxyindexer together in a script to make this process easier.
+search index by re-running `doxyindexer`. You could wrap the call to `doxygen`
+and `doxyindexer` together in a script to make this process easier.
 
 \section extsearch_api Programming interface
 
-- 
cgit v0.12


From b007be7c1671661f31f056b7b7b5f480279ddbd6 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 25 Nov 2019 11:28:45 +0100
Subject: Checking of right usage of configuration list items

In case of a configuration list item has an equal sign in it ('=') some extra restriction are imposed / made more understandable.
---
 src/configimpl.l | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/doxygen.cpp  |  21 +++++--
 src/pre.l        |   5 +-
 3 files changed, 203 insertions(+), 9 deletions(-)

diff --git a/src/configimpl.l b/src/configimpl.l
index 0cc5c88..351337e 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -1484,23 +1484,203 @@ void Config::checkAndCorrect()
     s=includePath.next();
   }
 
-  // check aliases
+  // check EXTENSION_MAPPING
+  QStrList &extmapList = Config_getList(EXTENSION_MAPPING);
+  s=extmapList.first();
+  while (s)
+  {
+    QCString extmap=s;
+    extmap=extmap.stripWhiteSpace();
+    int i_equals=extmap.find('=');
+    if (i_equals==-1)
+    {
+      err("Illegal EXTENSION_MAPPING format '%s', no equal sign specified use 'ext=language'\n",extmap.data());
+    }
+    else
+    {
+      QCString ext = extmap.left(i_equals);
+      QCString lang = extmap.mid(i_equals+1);
+      if (ext.isEmpty())
+      {
+        err("Illegal EXTENSION_MAPPING format '%s', no extension to replace specified use 'ext=language'\n",extmap.data());
+      }
+      else if (lang.isEmpty())
+      {
+        err("Illegal EXTENSION_MAPPING format '%s', no replacement language specified use 'ext=language'\n",extmap.data());
+      }
+    }
+    s=extmapList.next();
+  }
+
+  // check PREDEFINED
+  if (Config_getBool(ENABLE_PREPROCESSING))
+  {
+    QStrList &predefList = Config_getList(PREDEFINED);
+    s=predefList.first();
+    while (s)
+    {
+      QCString predef=s;
+      predef=predef.stripWhiteSpace();
+      int i_equals=predef.find('=');
+      int i_obrace=predef.find('(');
+      if ((i_obrace==0) || (i_equals==0) || (i_equals==1 && predef.at(i_equals-1)==':'))
+      {
+        err("Illegal PREDEFINED format '%s', no define name specified\n",predef.data());
+      }
+      s=predefList.next();
+    }
+  }
+
+  // check ALIASES
   QStrList &aliasList = Config_getList(ALIASES);
   s=aliasList.first();
   while (s)
   {
     QRegExp re1("[a-z_A-Z][a-z_A-Z0-9]*[ \t]*=");         // alias without argument
-    QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]*}[ \t]*="); // alias with argument
+    QRegExp re2("[a-z_A-Z][a-z_A-Z0-9]*{[0-9]+}[ \t]*="); // alias with argument
     QCString alias=s;
     alias=alias.stripWhiteSpace();
     if (alias.find(re1)!=0 && alias.find(re2)!=0)
     {
-      err("Illegal alias format '%s'. Use \"name=value\" or \"name{n}=value\", where n is the number of arguments\n",
+      err("Illegal ALIASES format '%s'. Use \"name=value\" or \"name{n}=value\", where n is the number of arguments\n",
 	  alias.data());
     }
     s=aliasList.next();
   }
 
+  // check FILTER_PATTERNS
+  QStrList& filterList    = Config_getList(FILTER_PATTERNS);
+  s=filterList.first();
+  while (s)
+  {
+    QCString filter=s;
+    filter=filter.stripWhiteSpace();
+    int i=filter.find('=');
+    if (i==-1)
+    {
+      err("Illegal FILTER_PATTERNS format, no equal sign specified in '%s'\n",filter.data());
+    }
+    else
+    {
+      QCString myName=filter.left(i).stripWhiteSpace();
+      QCString myValue=filter.right(filter.length()-i-1).stripWhiteSpace();
+      if (myName.isEmpty())
+      {
+        err("Illegal FILTER_PATTERNS format '%s', no name specified\n",filter.data());
+      }
+      else if (myValue.isEmpty())
+      {
+        err("Illegal FILTER_PATTERNS format '%s', no filter specified\n",filter.data());
+      }
+    }
+    s=filterList.next();
+  }
+
+  // check FILTER_SOURCE_PATTERNS
+  QStrList& filterSrcList = Config_getList(FILTER_SOURCE_PATTERNS);
+  s=filterSrcList.first();
+  while (s)
+  {
+    QCString filterSrc=s;
+    filterSrc=filterSrc.stripWhiteSpace();
+    int i=filterSrc.find('=');
+    if (i==-1)
+    {
+      err("Illegal FILTER_SOURCE_PATTERNS format, no name specified in '%s'\n",filterSrc.data());
+    }
+    else
+    {
+      QCString myName=filterSrc.left(i).stripWhiteSpace();
+      if (myName.isEmpty())
+      {
+        err("Illegal FILTER_SOURCE_PATTERNS format '%s', no name specified\n",filterSrc.data());
+      }
+    }
+    s=filterSrcList.next();
+  }
+
+  // check TAGFILES
+  QStrList& tagfilesList    = Config_getList(TAGFILES);
+  s=tagfilesList.first();
+  while (s)
+  {
+    QCString tagfiles=s;
+    tagfiles=tagfiles.stripWhiteSpace();
+    int i=tagfiles.find('=');
+    if (i!=-1)
+    {
+      QCString myName=tagfiles.left(i).stripWhiteSpace();
+      QCString myValue=tagfiles.right(tagfiles.length()-i-1).stripWhiteSpace();
+      if (myName.isEmpty())
+      {
+        err("Illegal TAGFILES format '%s', no name specified\n",tagfiles.data());
+      }
+      else if (myValue.isEmpty())
+      {
+        err("Illegal TAGFILES format '%s', no tagfiles specified\n",tagfiles.data());
+      }
+    }
+    s=tagfilesList.next();
+  }
+
+  // check EXTRA_SEARCH_MAPPINGS
+  if (Config_getBool(SEARCHENGINE) && Config_getBool(GENERATE_HTML))
+  {
+    QStrList& searchList = Config_getList(EXTRA_SEARCH_MAPPINGS);
+    s=searchList.first();
+    while (s)
+    {
+      QCString search=s;
+      search=search.stripWhiteSpace();
+      int i=search.find('=');
+      if (i==-1)
+      {
+        err("Illegal EXTRA_SEARCH_MAPPINGS format, no equal sign specified in '%s'\n",search.data());
+      }
+      else
+      {
+        QCString myName=search.left(i).stripWhiteSpace();
+        QCString myValue=search.right(search.length()-i-1).stripWhiteSpace();
+        if (myName.isEmpty())
+        {
+          err("Illegal EXTRA_SEARCH_MAPPINGS format '%s', no tagname specified\n",search.data());
+        }
+        else if (myValue.isEmpty())
+        {
+          err("Illegal EXTRA_SEARCH_MAPPINGS format '%s', no location specified\n",search.data());
+        }
+      }
+      s=searchList.next();
+    }
+  }
+
+  // check TCL_SUBST
+  QStrList tclsubstList = Config_getList(TCL_SUBST);
+  s=tclsubstList.first();
+  while (s)
+  {
+    QCString tclsubst=s;
+    int i=tclsubst.find('=');
+    if (i==-1)
+    {
+      err("Illegal TCL_SUBST format, no equal sign specified in '%s'\n",tclsubst.data());
+    }
+    else
+    {
+      QCString myName=tclsubst.left(i).stripWhiteSpace();
+      QCString myValue=tclsubst.right(tclsubst.length()-i-1).stripWhiteSpace();
+      if (myName.isEmpty())
+      {
+        err("Illegal TCL_SUBST format '%s', no name to replace specified\n",tclsubst.data());
+      }
+      else if (myValue.isEmpty())
+      {
+        err("Illegal TCL_SUBST format '%s', no replacement value specified\n",tclsubst.data());
+      }
+    }
+    s = tclsubstList.next();
+  }
+
   // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled
   if (Config_getBool(GENERATE_TREEVIEW) && Config_getBool(GENERATE_HTMLHELP))
   {
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d4d55e7..3b37567 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9209,6 +9209,7 @@ static void readTagFile(const std::unique_ptr<Entry> &root,const char *tl)
   {
     fileName = tagLine.left(eqPos).stripWhiteSpace();
     destName = tagLine.right(tagLine.length()-eqPos-1).stripWhiteSpace();
+    if (fileName.isEmpty() || destName.isEmpty()) return;
     QFileInfo fi(fileName);
     Doxygen::tagDestinationDict.insert(fi.absFilePath().utf8(),new QCString(destName));
     //printf("insert tagDestination %s->%s\n",fi.fileName().data(),destName.data());
@@ -10689,11 +10690,22 @@ void adjustConfiguration()
   while (mapping)
   {
     QCString mapStr = mapping;
-    int i;
-    if ((i=mapStr.find('='))!=-1)
+    int i=mapStr.find('=');
+    if (i==-1)
+    {
+      mapping = extMaps.next();
+      continue;
+    }
+    else
     {
-      QCString ext=mapStr.left(i).stripWhiteSpace().lower();
-      QCString language=mapStr.mid(i+1).stripWhiteSpace().lower();
+      QCString ext = mapStr.left(i).stripWhiteSpace().lower();
+      QCString language = mapStr.mid(i+1).stripWhiteSpace().lower();
+      if (ext.isEmpty() || language.isEmpty())
+      {
+        mapping = extMaps.next();
+        continue;
+      }
+
       if (!updateLanguageMapping(ext,language))
       {
         err("Failed to map file extension '%s' to unsupported language '%s'.\n"
@@ -10709,7 +10721,6 @@ void adjustConfiguration()
     mapping = extMaps.next();
   }
 
-
   // add predefined macro name to a dictionary
   QStrList &expandAsDefinedList =Config_getList(EXPAND_AS_DEFINED);
   s=expandAsDefinedList.first();
diff --git a/src/pre.l b/src/pre.l
index abc9df9..9d27e6f 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -3250,7 +3250,10 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output
       int i_cbrace=ds.find(')');
       bool nonRecursive = i_equals>0 && ds.at(i_equals-1)==':';
 
-      if (i_obrace==0) continue; // no define name
+      if ((i_obrace==0) || (i_equals==0) || (i_equals==1 && ds.at(i_equals-1)==':'))
+      {
+         continue; // no define name
+      }
 
       if (i_obrace<i_equals && i_cbrace<i_equals && 
 	  i_obrace!=-1      && i_cbrace!=-1      && 
-- 
cgit v0.12


From 5fe991236c9042a1ea75d6693aca41b3256a0d89 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 25 Nov 2019 21:02:53 +0100
Subject: Fixed preprocessor issue that resulted in "More #endif's than #if's
 found." warning.

---
 src/pre.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pre.l b/src/pre.l
index abc9df9..85a5728 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2084,7 +2084,7 @@ static bool replaceFunctionMacro(yyscan_t yyscanner,const QCString &expr,QCStrin
   }
   if (cc!='(') 
   { 
-    unputChar(yyscanner,expr,rest,j,' '); 
+    unputChar(yyscanner,expr,rest,j,cc); 
     return FALSE; 
   }
   getNextChar(yyscanner,expr,rest,j); // eat the '(' character
-- 
cgit v0.12


From dbd8ceb8efa2e7b413780a43e74b30f039670a72 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Mon, 25 Nov 2019 21:29:51 +0100
Subject: Fixed preprocessor hangup regression

---
 src/pre.l | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pre.l b/src/pre.l
index 85a5728..fe06b6c 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1934,7 +1934,7 @@ static QCString extractTrailingComment(const char *s)
 static int getNextChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos);
 static int getCurrentChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint pos);
 static void unputChar(yyscan_t yyscanner,const QCString &expr,QCString *rest,uint &pos,char c);
-static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level);
+static bool expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level);
 
 static QCString stringize(const QCString &s)
 {
@@ -2385,20 +2385,19 @@ static int getNextId(const QCString &expr,int p,int *l)
  *  starting at position \a pos.
  *  May read additional characters from the input while re-scanning!
  */
-static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level)
+static bool expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,int pos,int level)
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
-  //printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos, level);
+  //printf(">expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : "", pos, level);
   if (expr.isEmpty())
   {
     //printf("<expandExpression: empty\n");
-    return;
+    return FALSE;
   }
   if (state->expansionDict.find(expr)!=0) // check for recursive expansions
   {
-    expr=expr.left(pos)+"@-"+expr.right(expr.length()-pos);
     //printf("<expandExpression: already expanded expr='%s'\n",expr.data());
-    return;
+    return FALSE;
   }
   else
   {
@@ -2462,16 +2461,25 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
 	  QCString resultExpr=expMacro;
 	  QCString restExpr=expr.right(expr.length()-len-p);
 	  processConcatOperators(resultExpr);
-          //printf(" macroName=%s def->nonRecursive=%d\n",macroName.data(),def->nonRecursive);
+          //printf(" macroName=%s restExpr='%s' def->nonRecursive=%d\n",macroName.data(),restExpr.data(),def->nonRecursive);
+          bool expanded=false;
 	  if (def && !def->nonRecursive)
 	  {
 	    state->expandedDict->insert(macroName,def);
-	    expandExpression(yyscanner,resultExpr,&restExpr,0,level+1);
+	    expanded = expandExpression(yyscanner,resultExpr,&restExpr,0,level+1);
 	    state->expandedDict->remove(macroName);
 	  }
-	  expr=expr.left(p)+resultExpr+restExpr;
-	  //printf(" new expression: '%s' old i=%d new i=%d\n",expr.data(),i,p);
-	  i=p;
+          if (expanded)
+          {
+	    expr=expr.left(p)+resultExpr+restExpr;
+	    //printf(" new expression: '%s' old i=%d new i=%d\n",expr.data(),i,p);
+	    i=p;
+          }
+          else
+          {
+	    expr=expr.left(p)+"@-"+expr.right(expr.length()-p);
+            i=p+l+2;
+          }
 	}
 	else // move to the next macro name
 	{
@@ -2494,6 +2502,7 @@ static void expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
     }
   }
   //printf("<expandExpression(expr='%s',rest='%s',pos=%d,level=%d)\n",expr.data(),rest ? rest->data() : 0, pos,level);
+  return TRUE;
 }
 
 /*! @brief Process string or character literal.
-- 
cgit v0.12


From 6382986b77d302be187d95aaa850eff132ec1d7d Mon Sep 17 00:00:00 2001
From: Tobias Off <tobias.off@redheads.de>
Date: Tue, 19 Nov 2019 13:01:27 +0100
Subject: Refactoring of portable.h and portable.cpp functions to be contained
 in a namespace Fixing some memory issues caused by not correctly freed
 pointers

---
 src/cite.cpp                  |   6 +-
 src/config.xml                |   2 +-
 src/configimpl.l              |  16 +--
 src/context.cpp               |  34 +++---
 src/definition.cpp            |  16 +--
 src/dia.cpp                   |  18 ++--
 src/diagram.cpp               |   8 +-
 src/docparser.cpp             |  10 +-
 src/doctokenizer.l            |   2 +-
 src/dot.cpp                   |  18 ++--
 src/dotgroupcollaboration.cpp |  10 ++
 src/dotrunner.cpp             |  14 +--
 src/doxygen.cpp               |  34 +++---
 src/filedef.cpp               |   4 +-
 src/formula.cpp               |  32 +++---
 src/htags.cpp                 |   6 +-
 src/message.cpp               |   2 +-
 src/msc.cpp                   |   8 +-
 src/plantuml.cpp              |  16 +--
 src/portable.cpp              | 234 +++++++++++++++++++-----------------------
 src/portable.h                |  57 +++++-----
 src/pre.l                     |   2 +-
 src/util.cpp                  |  20 ++--
 src/vhdldocgen.cpp            |   4 +-
 24 files changed, 288 insertions(+), 285 deletions(-)

diff --git a/src/cite.cpp b/src/cite.cpp
index f15f595..40084b6 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -235,14 +235,14 @@ void CiteDict::generatePage() const
   // 5. run bib2xhtml perl script on the generated file which will insert the
   //    bibliography in citelist.doc
   int exitCode;
-  portable_sysTimerStop();
-  if ((exitCode=portable_system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
+  Portables::sysTimerStop();
+  if ((exitCode=Portables::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
                          citeListFile+"\"")) != 0)
   {
     err("Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: %d\n",
         exitCode);
   }
-  portable_sysTimerStop();
+  Portables::sysTimerStop();
 
   QDir::setCurrent(oldDir);
 
diff --git a/src/config.xml b/src/config.xml
index d206203..fb0e01a 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -953,7 +953,7 @@ Go to the <a href="commands.html">next</a> section or return to the
 ]]>
       </docs>
     </option>
-    <option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='portable_fileSystemIsCaseSensitive()'>
+    <option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portables::fileSystemIsCaseSensitive()'>
       <docs>
 <![CDATA[
  If the \c CASE_SENSE_NAMES tag is set to \c NO then doxygen
diff --git a/src/configimpl.l b/src/configimpl.l
index 0cc5c88..0da6e68 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -603,7 +603,7 @@ static FILE *tryPath(const char *path,const char *fileName)
   QFileInfo fi(absName);
   if (fi.exists() && fi.isFile())
   {
-    FILE *f=portable_fopen(absName,"r");
+    FILE *f=Portables::fopen(absName,"r");
     if (!f) config_err("could not open file %s for reading\n",absName.data());
     return f;
   }
@@ -619,7 +619,7 @@ static FILE *findFile(const char *fileName)
   {
     return 0;
   }
-  if (portable_isAbsolutePath(fileName))
+  if (Portables::isAbsolutePath(fileName))
   {
     return tryPath(NULL, fileName);
   }
@@ -1012,7 +1012,7 @@ static void substEnvVarsInString(QCString &s)
   while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1)
   {
     //printf("Found environment var s.mid(%d,%d)='%s'\n",i+2,l-3,s.mid(i+2,l-3).data());
-    QCString env=portable_getenv(s.mid(i+2,l-3));
+    QCString env=Portables::getenv(s.mid(i+2,l-3));
     substEnvVarsInString(env); // recursively expand variables if needed.
     s = s.left(i)+env+s.right(s.length()-i-l);
     p=i+env.length(); // next time start at the end of the expanded string
@@ -1579,7 +1579,7 @@ void Config::checkAndCorrect()
     }
     else
     {
-      QFileInfo dp(dotPath+"/dot"+portable_commandExtension());
+      QFileInfo dp(dotPath+"/dot"+Portables::commandExtension());
       if (!dp.exists() || !dp.isFile())
       {
 	warn_uncond("the dot tool could not be found at %s\n",dotPath.data());
@@ -1607,10 +1607,10 @@ void Config::checkAndCorrect()
     QFileInfo pu(plantumlJarPath);
     if (pu.exists() && pu.isDir()) // PLANTUML_JAR_PATH is directory
     {
-      QFileInfo jar(plantumlJarPath+portable_pathSeparator()+"plantuml.jar");
+      QFileInfo jar(plantumlJarPath+Portables::pathSeparator()+"plantuml.jar");
       if (jar.exists() && jar.isFile())
       {
-        plantumlJarPath = jar.dirPath(TRUE).utf8()+portable_pathSeparator();
+        plantumlJarPath = jar.dirPath(TRUE).utf8()+Portables::pathSeparator();
       }
       else
       {
@@ -1621,7 +1621,7 @@ void Config::checkAndCorrect()
     }
     else if (pu.exists() && pu.isFile() && plantumlJarPath.right(4)==".jar") // PLANTUML_JAR_PATH is file
     {
-      plantumlJarPath = pu.dirPath(TRUE).utf8()+portable_pathSeparator();
+      plantumlJarPath = pu.dirPath(TRUE).utf8()+Portables::pathSeparator();
     }
     else
     {
@@ -1635,7 +1635,7 @@ void Config::checkAndCorrect()
   QCString &diaPath = Config_getString(DIA_PATH);
   if (!diaPath.isEmpty())
   {
-    QFileInfo dp(diaPath+"/dia"+portable_commandExtension());
+    QFileInfo dp(diaPath+"/dia"+Portables::commandExtension());
     if (!dp.exists() || !dp.isFile())
     {
       warn_uncond("dia could not be found at %s\n",diaPath.data());
diff --git a/src/context.cpp b/src/context.cpp
index ebe6857..9fdc597 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1978,7 +1978,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+portable_pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -1987,7 +1987,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                              g_globals.outputDir,
-                             g_globals.outputDir+portable_pathSeparator()+m_classDef->getOutputFileBase()+".tex",
+                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2077,7 +2077,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+portable_pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2086,7 +2086,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                              g_globals.outputDir,
-                             g_globals.outputDir+portable_pathSeparator()+m_classDef->getOutputFileBase()+".tex",
+                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -3123,7 +3123,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3132,7 +3132,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3175,7 +3175,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3184,7 +3184,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3613,7 +3613,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+portable_pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -3625,7 +3625,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_EPS,
                                 EOF_LaTeX,
                                 g_globals.outputDir,
-                                g_globals.outputDir+portable_pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
+                                g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -5026,7 +5026,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5035,7 +5035,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5098,7 +5098,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5107,7 +5107,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+portable_pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5368,7 +5368,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+portable_pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
@@ -5379,7 +5379,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_EPS,
                                 EOF_LaTeX,
                                 g_globals.outputDir,
-                                g_globals.outputDir+portable_pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
+                                g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
@@ -8461,7 +8461,7 @@ class InheritanceGraphContext::Private
                           /*GOF_BITMAP,
                           EOF_Html,*/
                           g_globals.outputDir,
-                          g_globals.outputDir+portable_pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
+                          g_globals.outputDir+Portables::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
                           m_id);
       }
       return TemplateVariant(result.data(),TRUE);
diff --git a/src/definition.cpp b/src/definition.cpp
index 80060ba..734d949 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -744,12 +744,12 @@ class FilterCache
         // file already processed, get the results after filtering from the tmp file
         Debug::print(Debug::FilterOutput,0,"Reusing filter result for %s from %s at offset=%d size=%d\n",
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
-        f = portable_fopen(Doxygen::filterDBFileName,"rb");
+        f = Portables::fopen(Doxygen::filterDBFileName,"rb");
         if (f)
         {
           bool success=TRUE;
           str.resize(item->fileSize+1);
-          if (portable_fseek(f,item->filePos,SEEK_SET)==-1)
+          if (Portables::fseek(f,item->filePos,SEEK_SET)==-1)
           {
             err("Failed to seek to position %d in filter database file %s\n",(int)item->filePos,qPrint(Doxygen::filterDBFileName));
             success=FALSE;
@@ -780,8 +780,8 @@ class FilterCache
         // filter file
         QCString cmd=filter+" \""+fileName+"\"";
         Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-        f = portable_popen(cmd,"r");
-        FILE *bf = portable_fopen(Doxygen::filterDBFileName,"a+b");
+        f = Portables::popen(cmd,"r");
+        FILE *bf = Portables::fopen(Doxygen::filterDBFileName,"a+b");
         FilterCacheItem *item = new FilterCacheItem;
         item->filePos = m_endPos;
         if (bf==0)
@@ -790,7 +790,7 @@ class FilterCache
           err("Error opening filter database file %s\n",qPrint(Doxygen::filterDBFileName));
           str.addChar('\0');
           delete item;
-          portable_pclose(f);
+          Portables::pclose(f);
           return FALSE;
         }
         // append the filtered output to the database file
@@ -806,7 +806,7 @@ class FilterCache
                 qPrint(Doxygen::filterDBFileName),bytesWritten,bytesRead);
             str.addChar('\0');
             delete item;
-            portable_pclose(f);
+            Portables::pclose(f);
             fclose(bf);
             return FALSE;
           }
@@ -821,14 +821,14 @@ class FilterCache
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
         // update end of file position
         m_endPos += size;
-        portable_pclose(f);
+        Portables::pclose(f);
         fclose(bf);
       }
       else // no filtering
       {
         // normal file
         //printf("getFileContents(%s): no filter\n",qPrint(fileName));
-        f = portable_fopen(fileName,"r");
+        f = Portables::fopen(fileName,"r");
         while (!feof(f))
         {
           int bytesRead = fread(buf,1,blockSize,f);
diff --git a/src/dia.cpp b/src/dia.cpp
index 8dab5b0..39ba2f8 100644
--- a/src/dia.cpp
+++ b/src/dia.cpp
@@ -29,7 +29,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,DiaOutputFormat format)
 {
   QCString absOutFile = outDir;
-  absOutFile+=portable_pathSeparator();
+  absOutFile+=Portables::pathSeparator();
   absOutFile+=outFile;
 
   // chdir to the output dir, so dot can find the font file.
@@ -37,7 +37,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
   // go to the html output directory (i.e. path)
   QDir::setCurrent(outDir);
   //printf("Going to dir %s\n",QDir::currentDirPath().data());
-  QCString diaExe = Config_getString(DIA_PATH)+"dia"+portable_commandExtension();
+  QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portables::commandExtension();
   QCString diaArgs;
   QCString extension;
   diaArgs+="-n ";
@@ -62,26 +62,26 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
 
   int exitCode;
   //printf("*** running: %s %s outDir:%s %s\n",diaExe.data(),diaArgs.data(),outDir,outFile);
-  portable_sysTimerStart();
-  if ((exitCode=portable_system(diaExe,diaArgs,FALSE))!=0)
+  Portables::sysTimerStart();
+  if ((exitCode=Portables::system(diaExe,diaArgs,FALSE))!=0)
   {
     err("Problems running %s. Check your installation or look typos in you dia file %s\n",
         diaExe.data(),inFile);
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
     goto error;
   }
-  portable_sysTimerStop();
+  Portables::sysTimerStop();
   if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) )
   {
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          outFile,outFile);
-    portable_sysTimerStart();
-    if (portable_system("epstopdf",epstopdfArgs)!=0)
+    Portables::sysTimerStart();
+    if (Portables::system("epstopdf",epstopdfArgs)!=0)
     {
       err("Problems running epstopdf. Check your TeX installation!\n");
     }
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
   }
 
 error:
diff --git a/src/diagram.cpp b/src/diagram.cpp
index edc895d..09e74c7 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1338,14 +1338,14 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                    epsBaseName.data(),epsBaseName.data());
     //printf("Converting eps using '%s'\n",epstopdfArgs.data());
-    portable_sysTimerStart();
-    if (portable_system("epstopdf",epstopdfArgs)!=0)
+    Portables::sysTimerStart();
+    if (Portables::system("epstopdf",epstopdfArgs)!=0)
     {
        err("Problems running epstopdf. Check your TeX installation!\n");
-       portable_sysTimerStop();
+       Portables::sysTimerStop();
        return;
     }
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
   }
 }
 
diff --git a/src/docparser.cpp b/src/docparser.cpp
index 77e086f..cd71937 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -369,12 +369,12 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type, bool
       epstopdfArgs.sprintf("\"%s/%s.eps\" --outfile=\"%s/%s.pdf\"",
                            outputDir.data(), baseName.data(),
 			   outputDir.data(), baseName.data());
-      portable_sysTimerStart();
-      if (portable_system("epstopdf",epstopdfArgs)!=0)
+      Portables::sysTimerStart();
+      if (Portables::system("epstopdf",epstopdfArgs)!=0)
       {
 	err("Problems running epstopdf. Check your TeX installation!\n");
       }
-      portable_sysTimerStop();
+      Portables::sysTimerStop();
       return baseName;
     }
   }
@@ -1818,7 +1818,7 @@ static int internalValidatingParseDoc(DocNode *parent,QList<DocNode> &children,
 
 static void readTextFileByName(const QCString &file,QCString &text)
 {
-  if (portable_isAbsolutePath(file.data()))
+  if (Portables::isAbsolutePath(file.data()))
   {
     QFileInfo fi(file);
     if (fi.exists())
@@ -1831,7 +1831,7 @@ static void readTextFileByName(const QCString &file,QCString &text)
   char *s=examplePathList.first();
   while (s)
   {
-    QCString absFileName = QCString(s)+portable_pathSeparator()+file;
+    QCString absFileName = QCString(s)+Portables::pathSeparator()+file;
     QFileInfo fi(absFileName);
     if (fi.exists())
     {
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index f0a6a83..ff6c38d 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -674,7 +674,7 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
 <St_Para,St_HtmlOnly,St_ManOnly,St_LatexOnly,St_RtfOnly,St_XmlOnly,St_DbOnly>"$("{ID}"("{ID}"))"   { /* environment variable */
                          QCString name = &yytext[2];
 			 name = name.left(name.length()-1);
-			 QCString value = portable_getenv(name);
+			 QCString value = Portables::getenv(name);
 			 for (int i=value.length()-1;i>=0;i--) unput(value.at(i));
                        }
 <St_Para>{HTMLTAG}     { /* html tag */ 
diff --git a/src/dot.cpp b/src/dot.cpp
index 5ad3916..124870c 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -38,12 +38,12 @@ static QCString g_dotFontPath;
 static void setDotFontPath(const char *path)
 {
   ASSERT(g_dotFontPath.isEmpty());
-  g_dotFontPath = portable_getenv("DOTFONTPATH");
+  g_dotFontPath = Portables::getenv("DOTFONTPATH");
   QCString newFontPath = Config_getString(DOT_FONTPATH);
   QCString spath = path;
   if (!newFontPath.isEmpty() && !spath.isEmpty())
   {
-    newFontPath.prepend(spath+portable_pathListSeparator());
+    newFontPath.prepend(spath+Portables::pathListSeparator());
   }
   else if (newFontPath.isEmpty() && !spath.isEmpty())
   {
@@ -51,21 +51,21 @@ static void setDotFontPath(const char *path)
   }
   else
   {
-    portable_unsetenv("DOTFONTPATH");
+    Portables::unsetenv("DOTFONTPATH");
     return;
   }
-  portable_setenv("DOTFONTPATH",newFontPath);
+  Portables::setenv("DOTFONTPATH",newFontPath);
 }
 
 static void unsetDotFontPath()
 {
   if (g_dotFontPath.isEmpty())
   {
-    portable_unsetenv("DOTFONTPATH");
+    Portables::unsetenv("DOTFONTPATH");
   }
   else
   {
-    portable_setenv("DOTFONTPATH",g_dotFontPath);
+    Portables::setenv("DOTFONTPATH",g_dotFontPath);
   }
   g_dotFontPath="";
 }
@@ -183,7 +183,7 @@ bool DotManager::run() const
     setDotFontPath(Config_getString(DOCBOOK_OUTPUT));
     setPath=TRUE;
   }
-  portable_sysTimerStart();
+  Portables::sysTimerStart();
   // fill work queue with dot operations
   DotRunner *dr;
   int prev=1;
@@ -211,7 +211,7 @@ bool DotManager::run() const
         msg("Running dot for graph %d/%d\n",prev,numDotRuns);
         prev++;
       }
-      portable_sleep(100);
+      Portables::sleep(100);
     }
     while ((int)numDotRuns>=prev)
     {
@@ -229,7 +229,7 @@ bool DotManager::run() const
       m_workers.at(i)->wait();
     }
   }
-  portable_sysTimerStop();
+  Portables::sysTimerStop();
   if (setPath)
   {
     unsetDotFontPath();
diff --git a/src/dotgroupcollaboration.cpp b/src/dotgroupcollaboration.cpp
index f9a11e7..0a56460 100644
--- a/src/dotgroupcollaboration.cpp
+++ b/src/dotgroupcollaboration.cpp
@@ -42,6 +42,16 @@ DotGroupCollaboration::DotGroupCollaboration(const GroupDef* gd)
 
 DotGroupCollaboration::~DotGroupCollaboration()
 {
+  // delete all created Nodes saved in m_usedNodes:QDict
+  if(m_usedNodes != NULL)
+  {
+    QDictIterator<DotNode> it(*m_usedNodes);
+    for(;it.current(); ++it)
+    {
+      delete it.current();
+    }
+  }
+
   delete m_usedNodes;
 }
 
diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp
index a97d8af..07a5d3f 100644
--- a/src/dotrunner.cpp
+++ b/src/dotrunner.cpp
@@ -34,7 +34,7 @@
 // support the PNG format, we need to check the result.
 static void checkPngResult(const char *imgName)
 {
-  FILE *f = portable_fopen(imgName,"rb");
+  FILE *f = Portables::fopen(imgName,"rb");
   if (f)
   {
     char data[4];
@@ -115,7 +115,7 @@ bool DotRunner::readBoundingBox(const char *fileName,int *width,int *height,bool
 {
   const char *bb = isEps ? "%%PageBoundingBox:" : "/MediaBox [";
   int bblen = strlen(bb);
-  FILE *f = portable_fopen(fileName,"rb");
+  FILE *f = Portables::fopen(fileName,"rb");
   if (!f) 
   {
     //printf("readBoundingBox: could not open %s\n",fileName);
@@ -191,14 +191,14 @@ bool DotRunner::run()
       dotArgs+=' ';
       dotArgs+=s->args.data();
     }
-    if ((exitCode=portable_system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+    if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
   }
   else
   {
     for (li.toFirst();(s=li.current());++li)
     {
       dotArgs=QCString("\"")+m_file.data()+"\" "+s->args.data();
-      if ((exitCode=portable_system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+      if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
     }
   }
 
@@ -214,7 +214,7 @@ bool DotRunner::run()
       {
         if (!resetPDFSize(width,height,getBaseNameOfOutput(s->output.data()))) goto error;
         dotArgs=QCString("\"")+m_file.data()+"\" "+s->args.data();
-        if ((exitCode=portable_system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+        if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
       }
     }
 
@@ -228,14 +228,14 @@ bool DotRunner::run()
   if (m_cleanUp) 
   {
     //printf("removing dot file %s\n",m_file.data());
-    portable_unlink(m_file.data());
+    Portables::unlink(m_file.data());
   }
 
   // create checksum file
   if (!m_md5Hash.isEmpty()) 
   {
     QCString md5Name = getBaseNameOfOutput(m_file.data()) + ".md5";
-    FILE *f = portable_fopen(md5Name,"w");
+    FILE *f = Portables::fopen(md5Name,"w");
     if (f)
     {
       fwrite(m_md5Hash.data(),1,32,f); 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index b4a4deb..31d0f5c 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10070,13 +10070,13 @@ static const char *getArg(int argc,char **argv,int &optind)
 void initDoxygen()
 {
   initResources();
-  const char *lang = portable_getenv("LC_ALL");
-  if (lang) portable_setenv("LANG",lang);
+  const char *lang = Portables::getenv("LC_ALL");
+  if (lang) Portables::setenv("LANG",lang);
   setlocale(LC_ALL,"");
   setlocale(LC_CTYPE,"C"); // to get isspace(0xA0)==0, needed for UTF-8
   setlocale(LC_NUMERIC,"C");
 
-  portable_correct_path();
+  Portables::correct_path();
 
   Doxygen::runningTime.start();
   Doxygen::preprocessor = new Preprocessor();
@@ -11103,7 +11103,7 @@ void parseInput()
   signal(SIGINT, stopDoxygen);
 #endif
 
-  uint pid = portable_pid();
+  uint pid = Portables::pid();
   Doxygen::objDBFileName.sprintf("doxygen_objdb_%d.tmp",pid);
   Doxygen::objDBFileName.prepend(outputDirectory+"/");
   Doxygen::entryDBFileName.sprintf("doxygen_entrydb_%d.tmp",pid);
@@ -11163,18 +11163,18 @@ void parseInput()
     QCString curFontPath = Config_getString(DOT_FONTPATH);
     if (curFontPath.isEmpty())
     {
-      portable_getenv("DOTFONTPATH");
+      Portables::getenv("DOTFONTPATH");
       QCString newFontPath = ".";
       if (!curFontPath.isEmpty())
       {
-        newFontPath+=portable_pathListSeparator();
+        newFontPath+=Portables::pathListSeparator();
         newFontPath+=curFontPath;
       }
-      portable_setenv("DOTFONTPATH",newFontPath);
+      Portables::setenv("DOTFONTPATH",newFontPath);
     }
     else
     {
-      portable_setenv("DOTFONTPATH",curFontPath);
+      Portables::setenv("DOTFONTPATH",curFontPath);
     }
   }
 
@@ -11800,7 +11800,7 @@ void generateOutput()
       {
         searchDataFile="searchdata.xml";
       }
-      if (!portable_isAbsolutePath(searchDataFile))
+      if (!Portables::isAbsolutePath(searchDataFile))
       {
         searchDataFile.prepend(Config_getString(OUTPUT_DIRECTORY)+"/");
       }
@@ -11862,13 +11862,13 @@ void generateOutput()
     g_s.begin("Running html help compiler...\n");
     QString oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
-    portable_setShortDir();
-    portable_sysTimerStart();
-    if (portable_system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
+    Portables::setShortDir();
+    Portables::sysTimerStart();
+    if (Portables::system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
     {
       err("failed to run html help compiler on index.hhp\n");
     }
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
     QDir::setCurrent(oldDir);
     g_s.end();
   }
@@ -11883,12 +11883,12 @@ void generateOutput()
     QCString const args = QCString().sprintf("%s -o \"%s\"", qhpFileName.data(), qchFileName.data());
     QString const oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
-    portable_sysTimerStart();
-    if (portable_system(Config_getString(QHG_LOCATION), args.data(), FALSE))
+    Portables::sysTimerStart();
+    if (Portables::system(Config_getString(QHG_LOCATION), args.data(), FALSE))
     {
       err("failed to run qhelpgenerator on index.qhp\n");
     }
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
     QDir::setCurrent(oldDir);
     g_s.end();
   }
@@ -11909,7 +11909,7 @@ void generateOutput()
   {
     msg("Total elapsed time: %.3f seconds\n(of which %.3f seconds waiting for external tools to finish)\n",
          ((double)Doxygen::runningTime.elapsed())/1000.0,
-         portable_getSysElapsedTime()
+         Portables::getSysElapsedTime()
         );
     g_s.print();
   }
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 346fb62..43a2c84 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -2015,7 +2015,7 @@ void FileDefImpl::acquireFileVersion()
     msg("Version of %s : ",m_filePath.data());
     QCString cmd = vercmd+" \""+m_filePath+"\"";
     Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-    FILE *f=portable_popen(cmd,"r");
+    FILE *f=Portables::popen(cmd,"r");
     if (!f)
     {
       err("could not execute %s\n",vercmd.data());
@@ -2024,7 +2024,7 @@ void FileDefImpl::acquireFileVersion()
     const int bufSize=1024;
     char buf[bufSize];
     int numRead = (int)fread(buf,1,bufSize-1,f);
-    portable_pclose(f);
+    Portables::pclose(f);
     if (numRead>0 && numRead<bufSize)
     {
       buf[numRead]='\0';
diff --git a/src/formula.cpp b/src/formula.cpp
index 3d8e6ce..9224c56 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -100,15 +100,15 @@ void FormulaList::generateBitmaps(const char *path)
     //printf("Running latex...\n");
     //system("latex _formulas.tex </dev/null >/dev/null");
     QCString latexCmd = "latex";
-    portable_sysTimerStart();
-    if (portable_system(latexCmd,"_formulas.tex")!=0)
+    Portables::sysTimerStart();
+    if (Portables::system(latexCmd,"_formulas.tex")!=0)
     {
       err("Problems running latex. Check your installation or look "
           "for typos in _formulas.tex and check _formulas.log!\n");
       formulaError=TRUE;
       //return;
     }
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
     //printf("Running dvips...\n");
     QListIterator<int> pli(pagesToGenerate);
     int *pagePtr;
@@ -125,27 +125,27 @@ void FormulaList::generateBitmaps(const char *path)
       // postscript file.
       sprintf(dviArgs,"-q -D 600 -n 1 -p %d -o %s_tmp.ps _formulas.dvi",
           pageIndex,formBase.data());
-      portable_sysTimerStart();
-      if (portable_system("dvips",dviArgs)!=0)
+      Portables::sysTimerStart();
+      if (Portables::system("dvips",dviArgs)!=0)
       {
         err("Problems running dvips. Check your installation!\n");
-        portable_sysTimerStop();
+        Portables::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      portable_sysTimerStop();
+      Portables::sysTimerStop();
       // run ps2epsi to convert to an encapsulated postscript file with
       // boundingbox (dvips with -E has some problems here).
       sprintf(psArgs,"%s_tmp.ps %s.eps",formBase.data(),formBase.data()); 
-      portable_sysTimerStart();
-      if (portable_system("ps2epsi",psArgs)!=0)
+      Portables::sysTimerStart();
+      if (Portables::system("ps2epsi",psArgs)!=0)
       {
         err("Problems running ps2epsi. Check your installation!\n");
-        portable_sysTimerStop();
+        Portables::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      portable_sysTimerStop();
+      Portables::sysTimerStop();
       // now we read the generated postscript file to extract the bounding box
       QFileInfo fi(formBase+".eps");
       if (fi.exists())
@@ -198,15 +198,15 @@ void FormulaList::generateBitmaps(const char *path)
                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
                     formBase.data(),formBase.data()
              );
-      portable_sysTimerStart();
-      if (portable_system(portable_ghostScriptCommand(),gsArgs)!=0)
+      Portables::sysTimerStart();
+      if (Portables::system(Portables::ghostScriptCommand(),gsArgs)!=0)
       {
-        err("Problem running ghostscript %s %s. Check your installation!\n",portable_ghostScriptCommand(),gsArgs);
-        portable_sysTimerStop();
+        err("Problem running ghostscript %s %s. Check your installation!\n",Portables::ghostScriptCommand(),gsArgs);
+        Portables::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      portable_sysTimerStop();
+      Portables::sysTimerStop();
       f.setName(formBase+".pnm");
       uint imageX=0,imageY=0;
       // we read the generated image again, to obtain the pixel data.
diff --git a/src/htags.cpp b/src/htags.cpp
index 51cd6d9..56840e0 100644
--- a/src/htags.cpp
+++ b/src/htags.cpp
@@ -89,13 +89,13 @@ bool Htags::execute(const QCString &htmldir)
   QCString oldDir = QDir::currentDirPath().utf8();
   QDir::setCurrent(g_inputDir.absPath());
   //printf("CommandLine=[%s]\n",commandLine.data());
-  portable_sysTimerStart();
-  bool result=portable_system("htags",commandLine,FALSE)==0;
+  Portables::sysTimerStart();
+  bool result=Portables::system("htags",commandLine,FALSE)==0;
   if (!result)
   {
     err("Problems running %s. Check your installation\n", "htags");
   }
-  portable_sysTimerStop();
+  Portables::sysTimerStop();
   QDir::setCurrent(oldDir);
   return result;
 }
diff --git a/src/message.cpp b/src/message.cpp
index ddf757a..283ddfd 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -90,7 +90,7 @@ void initWarningFormat()
 
   if (!Config_getString(WARN_LOGFILE).isEmpty())
   {
-    warnFile = portable_fopen(Config_getString(WARN_LOGFILE),"w");
+    warnFile = Portables::fopen(Config_getString(WARN_LOGFILE),"w");
   }
   if (!warnFile) // point it to something valid, because warn() relies on it
   {
diff --git a/src/msc.cpp b/src/msc.cpp
index 51e23fa..9b80c53 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -95,7 +95,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,MscOutputFormat format)
 {
   QCString absOutFile = outDir;
-  absOutFile+=portable_pathSeparator();
+  absOutFile+=Portables::pathSeparator();
   absOutFile+=outFile;
 
   mscgen_format_t msc_format;
@@ -130,12 +130,12 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          absOutFile.data(),absOutFile.data());
-    portable_sysTimerStart();
-    if (portable_system("epstopdf",epstopdfArgs)!=0)
+    Portables::sysTimerStart();
+    if (Portables::system("epstopdf",epstopdfArgs)!=0)
     {
       err("Problems running epstopdf. Check your TeX installation!\n");
     }
-    portable_sysTimerStop();
+    Portables::sysTimerStop();
   }
 
   Doxygen::indexList->addImageFile(imgName);
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index ff4ebd3..bad89e3 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -210,7 +210,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
   }
   while (s)
   {
-    pumlArgs += portable_pathListSeparator();
+    pumlArgs += Portables::pathListSeparator();
     pumlArgs += s;
     s = pumlIncludePathList.next(); 
   }
@@ -227,7 +227,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
     pumlArgs += "-graphvizdot \"";
     pumlArgs += dotPath;
     pumlArgs += "dot";
-    pumlArgs += portable_commandExtension();
+    pumlArgs += Portables::commandExtension();
     pumlArgs += "\" ";
   }
   switch (format)
@@ -283,8 +283,8 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
       file.close();
       Debug::print(Debug::Plantuml,0,"*** %s Running Plantuml arguments:%s\n","PlantumlManager::runPlantumlContent",qPrint(pumlArguments));
 
-      portable_sysTimerStart();
-      if ((exitCode=portable_system(pumlExe,pumlArguments,TRUE))!=0)
+      Portables::sysTimerStart();
+      if ((exitCode=Portables::system(pumlExe,pumlArguments,TRUE))!=0)
       {
         err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
             plantumlJarPath.data(),exitCode);
@@ -294,7 +294,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
         Debug::print(Debug::Plantuml,0,"*** %s Remove %s file\n","PlantumlManager::runPlantumlContent",qPrint(puFileName));
         file.remove();
       }
-      portable_sysTimerStop();
+      Portables::sysTimerStop();
 
       if ( (format==PlantumlManager::PUML_EPS) && (Config_getBool(USE_PDFLATEX)) )
       {
@@ -309,12 +309,12 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
             const int maxCmdLine = 40960;
             QCString epstopdfArgs(maxCmdLine);
             epstopdfArgs.sprintf("\"%s%s.eps\" --outfile=\"%s%s.pdf\"",qPrint(pumlOutDir),qPrint(*nb),qPrint(pumlOutDir),qPrint(*nb));
-            portable_sysTimerStart();
-            if ((exitCode=portable_system("epstopdf",epstopdfArgs))!=0)
+            Portables::sysTimerStart();
+            if ((exitCode=Portables::system("epstopdf",epstopdfArgs))!=0)
             {
               err("Problems running epstopdf. Check your TeX installation! Exit code: %d\n",exitCode);
             }
-            portable_sysTimerStop();
+            Portables::sysTimerStop();
           }
         }
       }
diff --git a/src/portable.cpp b/src/portable.cpp
index b447adc..99e54fd 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -1,36 +1,43 @@
+#include "portable.h"
+
 #include <stdlib.h>
-#include <ctype.h>
+#include <stdio.h>
+
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #undef UNICODE
 #define _WIN32_DCOM
 #include <windows.h>
 #else
 #include <unistd.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
 extern char **environ;
 #endif
 
+#include <ctype.h>
 #include <qglobal.h>
 #include <qdatetime.h>
+#include <qglobal.h>
+#include <qdir.h>
+#include <map>
+#include <string>
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define popen _popen
-#define pclose _pclose
-#endif
-
-#include "portable.h"
 #include "util.h"
 #ifndef NODEBUG
 #include "debug.h"
 #endif
 
+#if !defined(_WIN32) || defined(__CYGWIN__)
+static bool environmentLoaded = false;
+static std::map<std::string,std::string> proc_env = std::map<std::string,std::string>();
+#endif
+
 static double  g_sysElapsedTime;
 static QTime   g_time;
 
-int portable_system(const char *command,const char *args,bool commandHasConsole)
+
+int Portables::system(const char *command,const char *args,bool commandHasConsole)
 {
 
   if (command==0) return 1;
@@ -127,7 +134,7 @@ int portable_system(const char *command,const char *args,bool commandHasConsole)
 #else // Win32 specific
   if (commandHasConsole)
   {
-    return system(fullCmd);
+    return ::system(fullCmd);
   }
   else
   {
@@ -189,13 +196,13 @@ int portable_system(const char *command,const char *args,bool commandHasConsole)
 
 }
 
-uint portable_pid()
+unsigned int Portables::pid(void)
 {
-  uint pid;
+  unsigned int pid;
 #if !defined(_WIN32) || defined(__CYGWIN__)
-  pid = (uint)getpid();
+  pid = (unsigned int)getpid();
 #else
-  pid = (uint)GetCurrentProcessId();
+  pid = (unsigned int)GetCurrentProcessId();
 #endif
   return pid;
 }
@@ -205,88 +212,50 @@ uint portable_pid()
   static char **last_environ;
 #endif
 
-void portable_setenv(const char *name,const char *value)
+#if !defined(_WIN32) || defined(__CYGWIN__)
+void loadEnvironment()
 {
-    if (value==0) value="";
-#if defined(_WIN32) && !defined(__CYGWIN__)
-    SetEnvironmentVariable(name,value);
-#else
-    char **ep = 0;
-    size_t size;
-    const size_t namelen=qstrlen(name);
-    const size_t vallen=qstrlen(value) + 1;
+  if(environ != NULL)
+  {
+    unsigned int i = 0;
+    char* current = environ[i];
 
-    size = 0;
-    if (environ!=0)
+    while(current != NULL)                            // parse all strings contained by environ til the last element (NULL)
     {
-      for (ep = environ; *ep; ++ep)
-      {
-        if (!qstrncmp (*ep, name, (uint)namelen) &&
-            (*ep)[namelen] == '=')
-          break;
-        else
-          ++size;
+      std::string env_var(current);                   // load current environment variable string
+      size_t pos = env_var.find("=");
+      if(pos != std::string::npos)                    // only parse the variable, if it is a valid environment variable...
+      {                                               // ...which has to contain an equal sign as delimiter by definition
+        std::string name = env_var.substr(0,pos);     // the string til the equal sign contains the name
+        std::string value = env_var.substr(pos + 1);  // the string from the equal sign contains the value
+
+        proc_env[name] = value;                       // save the value by the name as its key in the classes map
       }
+      i++;
+      current = environ[i];
     }
+  }
 
-    if (environ==0 || *ep==0) /* add new string */
-    {
-      char **new_environ;
-      if (environ == last_environ && environ!=0)
-      {
-        // We allocated this space; we can extend it. 
-        new_environ = (char **) realloc (last_environ, (size + 2) * sizeof (char *));
-      }
-      else
-      {
-        new_environ = (char **) malloc ((size + 2) * sizeof (char *));
-      }
-
-      if (new_environ==0) // no more memory 
-      {
-        return;
-      }
-
-      new_environ[size] = (char *)malloc (namelen + 1 + vallen);
-      if (new_environ[size]==0)
-      {
-        free (new_environ);
-        return;
-      }
-
-      if (environ != last_environ)
-      {
-        memcpy ((char *) new_environ, environ, size * sizeof (char *));
-      }
+  environmentLoaded = true;
+}
+#endif
 
-      memcpy(new_environ[size], name, namelen);
-      new_environ[size][namelen] = '=';
-      memcpy(&new_environ[size][namelen + 1], value, vallen);
-      new_environ[size + 1] = 0;
-      last_environ = environ = new_environ;
-    }
-    else /* replace existing string */
-    {
-      size_t len = qstrlen (*ep);
-      if (len + 1 < namelen + 1 + vallen)
-      {
-        /* The existing string is too short; malloc a new one.  */
-        char *newString = (char *)malloc(namelen + 1 + vallen);
-        if (newString==0)
-        {
-          return;
-        }
-        *ep = newString;
-      }
-      memcpy(*ep, name, namelen);
-      (*ep)[namelen] = '=';
-      memcpy(&(*ep)[namelen + 1], value, vallen);
+void Portables::setenv(const char *name,const char *value)
+{
+    if (value==0) value="";
+#if defined(_WIN32) && !defined(__CYGWIN__)
+    SetEnvironmentVariable(name,value);
+#else
+    if(!environmentLoaded) // if the environment variables are not loaded already...
+    {                                 // ...call loadEnvironment to store them in class
+      loadEnvironment();
     }
 
+    proc_env[name] = std::string(value); // create or replace exisiting value
 #endif
 }
 
-void portable_unsetenv(const char *variable)
+void Portables::unsetenv(const char *variable)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     SetEnvironmentVariable(variable,0);
@@ -300,32 +269,35 @@ void portable_unsetenv(const char *variable)
       return; // not properly formatted
     }
 
-    len = qstrlen(variable);
-
-    ep = environ;
-    while (*ep != NULL)
+    if(proc_env.find(variable) != proc_env.end())
     {
-      if (!qstrncmp(*ep, variable, (uint)len) && (*ep)[len]=='=')
-      {
-        /* Found it.  Remove this pointer by moving later ones back.  */
-        char **dp = ep;
-        do dp[0] = dp[1]; while (*dp++);
-        /* Continue the loop in case NAME appears again.  */
-      }
-      else
-      {
-        ++ep;
-      }
+      proc_env[variable].erase();
     }
 #endif
 }
 
-const char *portable_getenv(const char *variable)
-{
-  return getenv(variable);
+const char *Portables::getenv(const char *variable)
+{  
+#if defined(_WIN32) && !defined(__CYGWIN__)
+    return ::getenv(variable);
+#else
+    if(!environmentLoaded) // if the environment variables are not loaded already...
+    {                                 // ...call loadEnvironment to store them in class
+      loadEnvironment();
+    }
+
+    if(proc_env.find(variable) != proc_env.end())
+    {
+      return proc_env[variable].c_str();
+    }
+    else
+    {
+      return NULL;
+    }
+#endif
 }
 
-portable_off_t portable_fseek(FILE *f,portable_off_t offset, int whence)
+portable_off_t Portables::fseek(FILE *f,portable_off_t offset, int whence)
 {
 #if defined(__MINGW32__)
   return fseeko64(f,offset,whence);
@@ -336,7 +308,7 @@ portable_off_t portable_fseek(FILE *f,portable_off_t offset, int whence)
 #endif
 }
 
-portable_off_t portable_ftell(FILE *f)
+portable_off_t Portables::ftell(FILE *f)
 {
 #if defined(__MINGW32__)
   return ftello64(f);  
@@ -347,18 +319,18 @@ portable_off_t portable_ftell(FILE *f)
 #endif
 }
 
-FILE *portable_fopen(const char *fileName,const char *mode)
+FILE *Portables::fopen(const char *fileName,const char *mode)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   QString fn(fileName);
   QString m(mode);
   return _wfopen((wchar_t*)fn.ucs2(),(wchar_t*)m.ucs2());
 #else
-  return fopen(fileName,mode);
+  return ::fopen(fileName,mode);
 #endif
 }
 
-char  portable_pathSeparator()
+char  Portables::pathSeparator(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return '\\';
@@ -367,7 +339,7 @@ char  portable_pathSeparator()
 #endif
 }
 
-char  portable_pathListSeparator()
+char  Portables::pathListSeparator(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return ';';
@@ -376,7 +348,7 @@ char  portable_pathListSeparator()
 #endif
 }
 
-const char *portable_ghostScriptCommand()
+const char *Portables::ghostScriptCommand(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return "gswin32c.exe";
@@ -385,7 +357,7 @@ const char *portable_ghostScriptCommand()
 #endif
 }
 
-const char *portable_commandExtension()
+const char *Portables::commandExtension(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return ".exe";
@@ -394,7 +366,7 @@ const char *portable_commandExtension()
 #endif
 }
 
-bool portable_fileSystemIsCaseSensitive()
+bool Portables::fileSystemIsCaseSensitive(void)
 {
 #if defined(_WIN32) || defined(macintosh) || defined(__MACOSX__) || defined(__APPLE__) || defined(__CYGWIN__)
   return FALSE;
@@ -403,32 +375,40 @@ bool portable_fileSystemIsCaseSensitive()
 #endif
 }
 
-FILE * portable_popen(const char *name,const char *type)
+FILE * Portables::popen(const char *name,const char *type)
 {
-  return popen(name,type);
+  #if defined(_MSC_VER) || defined(__BORLANDC__)
+  return ::_popen(name,type);
+  #else
+  return ::popen(name,type);
+  #endif
 }
 
-int portable_pclose(FILE *stream)
+int Portables::pclose(FILE *stream)
 {
-  return pclose(stream);
+  #if defined(_MSC_VER) || defined(__BORLANDC__)
+  return ::_pclose(stream);
+  #else
+  return ::pclose(stream);
+  #endif
 }
 
-void portable_sysTimerStart()
+void Portables::sysTimerStart(void)
 {
   g_time.start();
 }
 
-void portable_sysTimerStop()
+void Portables::sysTimerStop(void)
 {
   g_sysElapsedTime+=((double)g_time.elapsed())/1000.0;
 }
 
-double portable_getSysElapsedTime()
+double Portables::getSysElapsedTime(void)
 {
   return g_sysElapsedTime;
 }
 
-void portable_sleep(int ms)
+void Portables::sleep(int ms)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   Sleep(ms);
@@ -437,7 +417,7 @@ void portable_sleep(int ms)
 #endif
 }
 
-bool portable_isAbsolutePath(const char *fileName)
+bool Portables::isAbsolutePath(const char *fileName)
 {
 # ifdef _WIN32
   if (isalpha (fileName [0]) && fileName[1] == ':')
@@ -459,26 +439,26 @@ bool portable_isAbsolutePath(const char *fileName)
  *
  * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slashes.
  */
-void portable_correct_path(void)
+void Portables::correct_path(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  const char *p = portable_getenv("PATH");
+  const char *p = Portables::getenv("PATH");
   if (!p) return; // no path nothing to correct
   QCString result = substitute(p,'/','\\');
-  if (result!=p) portable_setenv("PATH",result.data());
+  if (result!=p) Portables::setenv("PATH",result.data());
 #endif
 }
 
-void portable_unlink(const char *fileName)
+void Portables::unlink(const char *fileName)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   _unlink(fileName);
 #else
-  unlink(fileName);
+  ::unlink(fileName);
 #endif
 }
 
-void portable_setShortDir(void)
+void Portables::setShortDir(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   long     length = 0;
@@ -494,4 +474,4 @@ void portable_setShortDir(void)
   QDir::setCurrent(buffer);
   delete [] buffer;
 #endif
-}
+}
\ No newline at end of file
diff --git a/src/portable.h b/src/portable.h
index c1b8c29..7160d61 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -1,10 +1,11 @@
 #ifndef PORTABLE_H
 #define PORTABLE_H
 
-#include <sys/types.h>
 #include <stdio.h>
-#include <qglobal.h>
-#include <qdir.h>
+#include <sys/types.h>
+
+
+
 
 #if defined(_WIN32)
 typedef __int64 portable_off_t;
@@ -16,29 +17,33 @@ typedef off_t portable_off_t;
  *  @brief Portable versions of functions that are platform dependent.
  */
 
-int            portable_system(const char *command,const char *args,bool commandHasConsole=TRUE);
-uint           portable_pid();
-const char *   portable_getenv(const char *variable);
-void           portable_setenv(const char *variable,const char *value);
-void           portable_unsetenv(const char *variable);
-portable_off_t portable_fseek(FILE *f,portable_off_t offset, int whence);
-portable_off_t portable_ftell(FILE *f);
-FILE *         portable_fopen(const char *fileName,const char *mode);
-void           portable_unlink(const char *fileName);
-char           portable_pathSeparator();
-char           portable_pathListSeparator();
-const char *   portable_ghostScriptCommand();
-const char *   portable_commandExtension();
-bool           portable_fileSystemIsCaseSensitive();
-FILE *         portable_popen(const char *name,const char *type);
-int            portable_pclose(FILE *stream);
-void           portable_sysTimerStart();
-void           portable_sysTimerStop();
-double         portable_getSysElapsedTime();
-void           portable_sleep(int ms);
-bool           portable_isAbsolutePath(const char *fileName);
-void           portable_correct_path(void);
-void           portable_setShortDir(void);
+namespace Portables
+{
+  int            system(const char *command,const char *args,bool commandHasConsole=true);
+  unsigned int   pid(void);
+  const char *   getenv(const char *variable);
+  void           setenv(const char *variable,const char *value);
+  void           unsetenv(const char *variable);
+  portable_off_t fseek(FILE *f,portable_off_t offset, int whence);
+  portable_off_t ftell(FILE *f);
+  FILE *         fopen(const char *fileName,const char *mode);
+  void           unlink(const char *fileName);
+  char           pathSeparator(void);
+  char           pathListSeparator(void);
+  const char *   ghostScriptCommand(void);
+  const char *   commandExtension(void);
+  bool           fileSystemIsCaseSensitive();
+  FILE *         popen(const char *name,const char *type);
+  int            pclose(FILE *stream);
+  void           sysTimerStart(void);
+  void           sysTimerStop(void);
+  double         getSysElapsedTime(void);
+  void           sleep(int ms);
+  bool           isAbsolutePath(const char *fileName);
+  void           correct_path(void);
+  void           setShortDir(void);
+}
+
 
 extern "C" {
   void *         portable_iconv_open(const char* tocode, const char* fromcode);
diff --git a/src/pre.l b/src/pre.l
index 8bde725..53ad293 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1826,7 +1826,7 @@ static FileState *findFile(yyscan_t yyscanner, const char *fileName,bool localIn
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
   //printf("** findFile(%s,%d) state->yyFileName=%s\n",fileName,localInclude,state->yyFileName.data());
-  if (portable_isAbsolutePath(fileName))
+  if (Portables::isAbsolutePath(fileName))
   {
     FileState *fs = checkAndOpenFile(yyscanner,fileName,alreadyIncluded);
     if (fs)
diff --git a/src/util.cpp b/src/util.cpp
index f58a630..1d72405 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2428,7 +2428,7 @@ static QCString getFilterFromList(const char *name,const QStrList &filterList,bo
     if (i_equals!=-1)
     {
       QCString filterPattern = fs.left(i_equals);
-      QRegExp fpat(filterPattern,portable_fileSystemIsCaseSensitive(),TRUE); 
+      QRegExp fpat(filterPattern,Portables::fileSystemIsCaseSensitive(),TRUE); 
       if (fpat.match(name)!=-1) 
       {
         // found a match!
@@ -2589,7 +2589,7 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode)
 static QDateTime getCurrentDateTime()
 {
   QDateTime current = QDateTime::currentDateTime();
-  QCString sourceDateEpoch = portable_getenv("SOURCE_DATE_EPOCH");
+  QCString sourceDateEpoch = Portables::getenv("SOURCE_DATE_EPOCH");
   if (!sourceDateEpoch.isEmpty())
   {
     bool ok;
@@ -7928,14 +7928,22 @@ void stackTrace()
     p += sprintf(p,"%p ", backtraceFrames[x]);
   }
   fprintf(stderr,"========== STACKTRACE START ==============\n");
-  if (FILE *fp = popen(cmd, "r"))
+  #if defined(_WIN32) && !defined(__CYGWIN__)
+  if (FILE *fp = _popen(cmd, "r"))
+  #else
+  if (FILE *fp = ::popen(cmd, "r"))
+  #endif
   {
     char resBuf[512];
     while (size_t len = fread(resBuf, 1, sizeof(resBuf), fp))
     {
       fwrite(resBuf, 1, len, stderr);
     }
-    pclose(fp);
+    #if defined(_WIN32) && !defined(__CYGWIN__)
+    _pclose(fp);
+    #else
+    ::pclose(fp);
+    #endif
   }
   fprintf(stderr,"============ STACKTRACE END ==============\n");
   //fprintf(stderr,"%s\n", frameStrings[x]);
@@ -8011,7 +8019,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
   {
     QCString cmd=filterName+" \""+fileName+"\"";
     Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-    FILE *f=portable_popen(cmd,"r");
+    FILE *f=Portables::popen(cmd,"r");
     if (!f)
     {
       err("could not execute filter %s\n",filterName.data());
@@ -8025,7 +8033,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
       //printf(">>>>>>>>Reading %d bytes\n",numRead);
       inBuf.addArray(buf,numRead),size+=numRead;
     }
-    portable_pclose(f);
+    Portables::pclose(f);
     inBuf.at(inBuf.curPos()) ='\0';
     Debug::print(Debug::FilterOutput, 0, "Filter output\n");
     Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",qPrint(inBuf));
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 90d4829..d452960 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -169,7 +169,7 @@ static void createSVG()
 
     QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
-    if (portable_system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
+    if (Portables::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
     {
       err("could not create dot file");
     }
@@ -3796,7 +3796,7 @@ void FlowChart::createSVG()
 
   QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
-  if (portable_system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
+  if (Portables::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
   {
     err("could not create dot file");
   }
-- 
cgit v0.12


From 15c1a199b08063d5fc31d0429e61019a162ee5c6 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 1 Dec 2019 14:26:37 +0100
Subject: Fix regression when expanding macro to an empty string

---
 src/pre.l | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pre.l b/src/pre.l
index fe06b6c..af0bb44 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2392,7 +2392,7 @@ static bool expandExpression(yyscan_t yyscanner,QCString &expr,QCString *rest,in
   if (expr.isEmpty())
   {
     //printf("<expandExpression: empty\n");
-    return FALSE;
+    return TRUE;
   }
   if (state->expansionDict.find(expr)!=0) // check for recursive expansions
   {
@@ -3321,10 +3321,11 @@ void Preprocessor::processFile(const char *fileName,BufStr &input,BufStr &output
 	  def->fileDef      = state->yyFileDef;
 	  def->fileName     = fileName;
 	  state->defineManager.addDefine(state->yyFileName,def);
+
+	  //printf("#define '%s' '%s' #nargs=%d\n",
+	  //  def->name.data(),def->definition.data(),def->nargs);
 	}
 
-	//printf("#define '%s' '%s' #nargs=%d\n",
-	//  def->name.data(),def->definition.data(),def->nargs);
       }
       else if ((i_obrace==-1 || i_obrace>i_equals) &&
 	  (i_cbrace==-1 || i_cbrace>i_equals) &&
-- 
cgit v0.12


From ded73e043b0479451f0d9b5c0eee5ecab07a87e5 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 1 Dec 2019 14:27:27 +0100
Subject: Made scanner.l reentrant

---
 src/code.l      |    2 +-
 src/doxygen.cpp |    1 -
 src/scanner.h   |    8 +-
 src/scanner.l   | 6700 ++++++++++++++++++++++++++++---------------------------
 4 files changed, 3377 insertions(+), 3334 deletions(-)

diff --git a/src/code.l b/src/code.l
index 32a0f7e..bab6b0c 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3871,7 +3871,6 @@ CodeScanner::CodeScanner()
 {
   p = new Private;
   codeYYlex_init_extra(&p->state,&p->yyscanner);
-  YY_EXTRA_TYPE state = codeYYget_extra(p->yyscanner);
 }
 
 CodeScanner::~CodeScanner()
@@ -3918,6 +3917,7 @@ void CodeScanner::parseCCode(CodeOutputInterface &od,const char *className,const
   yyextra->code = &od;
   yyextra->inputString   = s;
   yyextra->inputPosition = 0;
+  codeYYrestart(0,yyscanner);
   yyextra->currentFontClass = 0;
   yyextra->needsTermination = FALSE;
   yyextra->searchCtx = searchCtx;
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index d4d55e7..3277bbe 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11267,7 +11267,6 @@ void parseInput()
 
   // we are done with input scanning now, so free up the buffers used by flex
   // (can be around 4MB)
-  scanFreeScanner();
   pyscanFreeScanner();
 
   /**************************************************************************
diff --git a/src/scanner.h b/src/scanner.h
index 65206be..fd40485 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -29,7 +29,8 @@
 class CLanguageScanner : public ParserInterface
 {
   public:
-    virtual ~CLanguageScanner() {}
+    CLanguageScanner();
+    virtual ~CLanguageScanner();
     void startTranslationUnit(const char *fileName);
     void finishTranslationUnit();
     void parseInput(const char *fileName,
@@ -55,8 +56,9 @@ class CLanguageScanner : public ParserInterface
                   );
     void resetCodeParserState();
     void parsePrototype(const char *text);
+  private:
+    struct Private;
+    Private *p;
 };
 
-void scanFreeScanner();
-
 #endif
diff --git a/src/scanner.l b/src/scanner.l
index 3e48916..3a71535 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -16,6 +16,8 @@
  */
 %option never-interactive
 %option prefix="scannerYY"
+%option reentrant
+%option extra-type="struct scannerYY_state *"
 
 %{
 
@@ -54,473 +56,171 @@
 #define YY_NO_INPUT 1
 #define YY_NO_UNISTD_H 1
 
-/* -----------------------------------------------------------------
- *
- *	statics
- */
-static ParserInterface *g_thisParser;
-static const char *     g_inputString = 0;
-static int		g_inputPosition = 0;
-static int		g_lastContext = 0;
-static int		g_lastCContext = 0;
-static int              g_lastDocContext = 0;
-static int              g_lastCPPContext = 0;
-static int              g_lastSkipSharpContext = 0;
-static int              g_lastSkipRoundContext = 0;
-static int              g_lastStringContext = 0;
-static int              g_lastCurlyContext = 0;
-static int              g_lastRoundContext = 0;
-static int              g_lastSquareContext = 0;
-static int              g_lastInitializerContext = 0;
-static int              g_lastClassTemplSpecContext = 0;
-static int              g_lastPreLineCtrlContext = 0;
-static int              g_lastSkipVerbStringContext = 0;
-static int              g_lastCommentInArgContext = 0;
-static int              g_lastRawStringContext = 0;
-static int              g_lastCSConstraint = 0;
-static int              g_lastHereDocContext = 0;
-static int              g_lastDefineContext = 0;
-static int              g_lastAlignAsContext = 0;
-static int              g_lastC11AttributeContext = 0;
-static int              g_lastModifierContext = 0;
-static Protection	g_protection = Public;
-static Protection	g_baseProt = Public;
-static int		g_sharpCount   = 0 ;
-static int		g_roundCount   = 0 ;
-static int		g_curlyCount   = 0 ;
-static int		g_squareCount  = 0 ;
-static int              g_padCount     = 0 ;
-static std::unique_ptr<Entry> g_current;
-static Entry*		g_current_root = 0 ;
-static Entry*		g_previous     = 0 ;
-static std::unique_ptr<Entry> g_tempEntry;
-static Entry*		g_firstTypedefEntry = 0 ;
-static Entry*		g_memspecEntry = 0 ;
-static int		g_yyLineNr     = 1 ;
-static int		g_yyBegLineNr  = 1 ;
-static int		g_yyColNr      = 1 ;
-static int		g_yyBegColNr   = 1 ;
-static int              g_anonCount    = 0 ;
-static int              g_anonNSCount  = 0 ;
-static QCString		g_yyFileName;
-static MethodTypes 	g_mtype = Method;
-static bool    		g_stat = false;
-static Specifier 	g_virt = Normal;
-static Specifier 	g_baseVirt = Normal;
-static QCString         g_msType;
-static QCString         g_msName;
-static QCString         g_msArgs;
-static bool             g_isTypedef = false;
-static QCString         g_funcPtrType;
-static QCString         g_templateStr;
-static QCString         g_aliasName;
-static QCString         g_baseName;
-static QCString*        g_specName = 0;
-
-static SrcLangExt       g_language = SrcLangExt_Unknown;
-static bool             g_insideIDL   = false;		//!< processing IDL code?
-static bool             g_insideJava  = false;		//!< processing Java code?
-static bool             g_insideCS    = false;		//!< processing C# code?
-static bool             g_insideD     = false;		//!< processing D code?
-static bool             g_insidePHP   = false;		//!< processing PHP code?
-static bool             g_insideObjC  = false;            //!< processing Objective C code?
-static bool             g_insideCli   = false;            //!< processing C++/CLI code?
-static bool             g_insideJS    = false;            //!< processing JavaScript code?
-static bool             g_insideSlice = false;            //!< processing Slice code?
-static bool             g_insideCpp   = true;             //!< processing C/C++ code
-
-static bool             g_insideCppQuote = false;
-static bool             g_insideProtocolList = false;
-
-static int              g_argRoundCount = 0;
-static int              g_argSharpCount = 0;
-static int              g_currentArgumentContext = 0;
-static int              g_lastCopyArgStringContext = 0;
-static int              g_lastCopyArgContext = 0;
-static QCString        *g_copyArgString = 0;
-static QCString         g_fullArgString;
-static QCString         g_dummyRawString;
-
-static ArgumentList    *g_currentArgumentList = 0;
-static char             g_lastCopyArgChar = '\0';
-
-static QCString        *g_pCopyQuotedString = 0;
-static QCString        *g_pCopyRoundString = 0;
-static QCString        *g_pCopyCurlyString = 0;
-static QCString        *g_pCopyRawString = 0;
-static QGString        *g_pCopyCurlyGString = 0;
-static QGString        *g_pCopyRoundGString = 0;
-static QGString        *g_pCopySquareGString = 0;
-static QGString        *g_pCopyQuotedGString = 0;
-static QGString        *g_pCopyHereDocGString = 0;
-static QGString        *g_pCopyRawGString = 0;
-static QGString        *g_pSkipVerbString = 0;
-static QStack<Grouping> g_autoGroupStack;
-
-static bool             g_insideFormula = false;
-static bool  	        g_insideTryBlock = false;
-static bool             g_insideCode = false;
-static bool             g_needsSemi = false;
-
-static int  	        g_initBracketCount = 0;
-
-static QCString         g_oldStyleArgType;
-static QCString         g_docBackup;
-static QCString         g_briefBackup;
-
-static int              g_docBlockContext = 0;
-static QGString         g_docBlock;
-static QCString         g_docBlockName;
-static bool             g_docBlockInBody = false;
-static bool             g_docBlockAutoBrief = false;
-static char             g_docBlockTerm = '\0';
-
-static QCString         g_idlAttr;
-static QCString         g_idlProp;
-static bool             g_odlProp = false;
-
-static bool             g_lexInit = false;
-static bool             g_externC = false;
-
-static QCString         g_delimiter;
-
-static int              g_column = 0;
-
-static int              g_fencedSize = 0;
-static bool             g_nestedComment = 0;
-static std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > g_outerScopeEntries;
-static CodeScanner      g_codeScanner;
-
-static const char *stateToString(int state);
-//-----------------------------------------------------------------------------
-
-// forward declarations
-//static void handleGroupStartCommand(const char *header);
-//static void handleGroupEndCommand();
-
-//-----------------------------------------------------------------------------
-
-static void initParser()
-{
-  g_outerScopeEntries.clear();
-  g_baseName.resize(0);
-  g_protection = Public;
-  g_baseProt = Public;
-  g_sharpCount = 0;
-  g_roundCount = 0;
-  g_curlyCount = 0;
-  g_mtype = Method;
-  g_stat = FALSE;
-  g_virt = Normal;
-  g_baseVirt = Normal;
-  g_isTypedef = FALSE;
-  g_autoGroupStack.clear();
-  g_insideTryBlock = FALSE;
-  g_autoGroupStack.setAutoDelete(TRUE);
-  g_insideFormula = FALSE;
-  g_insideCode=FALSE;
-  g_insideCli=Config_getBool(CPP_CLI_SUPPORT);
-  g_previous = 0;
-  g_firstTypedefEntry = 0;
-  g_memspecEntry =0;
-}
-
-static void initEntry()
-{
-  if (g_insideJava) 
-  {
-    g_protection = (g_current_root->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
-  }
-  g_current->protection = g_protection ;
-  g_current->mtype      = g_mtype;
-  g_current->virt       = g_virt;
-  g_current->stat       = g_stat;
-  g_current->lang       = g_language;
-  //printf("*** initEntry() g_language=%d\n",g_language);
-  Doxygen::docGroup.initGroupInfo(g_current.get());
-  g_isTypedef=FALSE;
-}
-
-
-//-----------------------------------------------------------------------------
-
-static void lineCount()
-{
-  int tabSize = Config_getInt(TAB_SIZE);
-  const char *p;
-  for (p = yytext ; *p ; ++p )
-  {
-    if (*p=='\n') 
-    {
-      g_yyLineNr++,g_column=0,g_yyColNr=1;
-    }
-    else if (*p=='\t') 
-    {
-      g_column+=tabSize - (g_column%tabSize);
-    }
-    else 
-    {
-      g_column++,g_yyColNr++;
-    }
-  }
-  //printf("lineCount()=%d\n",g_column);
-}
-
-static inline int computeIndent(const char *s,int startIndent)
-{
-  int col=startIndent;
-  int tabSize=Config_getInt(TAB_SIZE);
-  const char *p=s;
-  char c;
-  while ((c=*p++))
-  {
-    if (c=='\t') col+=tabSize-(col%tabSize);
-    else if (c=='\n') col=0;
-    else col++;
-  }
-  return col;
-}
-
-static void addType()
-{
-    uint tl=g_current->type.length();
-    if( tl>0 && !g_current->name.isEmpty() && g_current->type.at(tl-1)!='.') 
-    {
-      g_current->type += ' ' ;
-    }
-    g_current->type += g_current->name ;
-    g_current->name.resize(0) ;
-    tl=g_current->type.length();
-    if( tl>0 && !g_current->args.isEmpty() && g_current->type.at(tl-1)!='.') 
-    {
-      g_current->type += ' ' ;
-    }
-    g_current->type += g_current->args ;
-    g_current->args.resize(0) ;
-    g_current->argList.clear();
-}
-
-
-static QCString stripQuotes(const char *s)
-{
-  QCString name;
-  if (s==0 || *s==0) return name;
-  name=s;
-  if (name.at(0)=='"' && name.at(name.length()-1)=='"')
-  {
-    name=name.mid(1,name.length()-2);
-  }
-  return name;
-}
-
-//-----------------------------------------------------------------
-
-static void startCommentBlock(bool);
-static void handleCommentBlock(const QCString &doc,bool brief);
-static void handleParametersCommentBlocks(ArgumentList &al);
-
-//-----------------------------------------------------------------
-
-static bool nameIsOperator(QCString &name)
-{
-  int i=name.find("operator");
-  if (i==-1) return FALSE;
-  if (i==0 && !isId(name.at(8))) return TRUE; // case operator ::X
-  if (i>0 && !isId(name.at(i-1)) && !isId(name.at(i+8))) return TRUE; // case X::operator
-  return FALSE; // case TEXToperatorTEXT
-}
-
-//-----------------------------------------------------------------------------
-
-static void setContext()
-{
-  g_language    = getLanguageFromFileName(g_yyFileName);
-  g_insideIDL   = g_language==SrcLangExt_IDL;
-  g_insideJava  = g_language==SrcLangExt_Java;
-  g_insideCS    = g_language==SrcLangExt_CSharp; 
-  g_insideD     = g_language==SrcLangExt_D;
-  g_insidePHP   = g_language==SrcLangExt_PHP;
-  g_insideObjC  = g_language==SrcLangExt_ObjC;
-  g_insideJS    = g_language==SrcLangExt_JS;
-  g_insideSlice = g_language==SrcLangExt_Slice;
-  g_insideCpp   = g_language==SrcLangExt_Cpp;
-  //printf("setContext(%s) g_insideIDL=%d g_insideJava=%d g_insideCS=%d "
-  //       "g_insideD=%d g_insidePHP=%d g_insideObjC=%d\n",
-  //       g_yyFileName.data(),g_insideIDL,g_insideJava,g_insideCS,g_insideD,g_insidePHP,g_insideObjC
-  //	);
-}
-
-//-----------------------------------------------------------------------------
-
-static void prependScope()
-{
-  if (g_current_root->section & Entry::SCOPE_MASK)
-  {
-    //printf("--- prependScope %s to %s\n",g_current_root->name.data(),g_current->name.data());
-    g_current->name.prepend(g_current_root->name+"::");
-    //printf("prependScope #=%d #g_current=%d\n",g_current_root->tArgLists->count(),g_current->tArgLists->count());
-    for (const ArgumentList &srcAl : g_current_root->tArgLists)
-    {
-      g_current->tArgLists.insert(g_current->tArgLists.begin(),srcAl);
-    }
-  }
-}
-
-//-----------------------------------------------------------------------------
-
-/*! Returns TRUE iff the g_current entry could be a K&R style C function */
-static bool checkForKnRstyleC()
-{
-  if (((QCString)g_yyFileName).right(2).lower()!=".c") return FALSE; // must be a C file
-  if (g_current->argList.empty()) return FALSE; // must have arguments
-  for (const Argument &a : g_current->argList)
-  {
-    // in K&R style argument do not have a type, but doxygen expects a type
-    // so it will think the argument has no name
-    if (a.type.isEmpty() || !a.name.isEmpty()) return FALSE;
-  }
-  return TRUE;
-}
-
-//-----------------------------------------------------------------------------
-
-static void splitKnRArg(QCString &oldStyleArgPtr,QCString &oldStyleArgName)
-{
-  int si = g_current->args.length();
-  if (g_oldStyleArgType.isEmpty()) // new argument
-  {
-    static QRegExp re("([^)]*)");
-    int bi1 = g_current->args.findRev(re);
-    int bi2 = bi1!=-1 ? g_current->args.findRev(re,bi1-1) : -1; 
-    char c;
-    if (bi1!=-1 && bi2!=-1) // found something like "int (*func)(int arg)"
-    {
-      int s=bi2+1;
-      g_oldStyleArgType = g_current->args.left(s);
-      int i=s;
-      while (i<si && ((c=g_current->args.at(i))=='*' || isspace((uchar)c))) i++;
-      g_oldStyleArgType += g_current->args.mid(s,i-s);
-      s=i;
-      while (i<si && isId(g_current->args.at(i))) i++;
-      oldStyleArgName = g_current->args.mid(s,i-s);
-      g_oldStyleArgType+=g_current->args.mid(i);
-    }
-    else if (bi1!=-1) // redundant braces like in "int (*var)"
-    {
-      int s=bi1;
-      g_oldStyleArgType = g_current->args.left(s);
-      s++;
-      int i=s+1;
-      while (i<si && ((c=g_current->args.at(i))=='*' || isspace((uchar)c))) i++;
-      g_oldStyleArgType += g_current->args.mid(s,i-s);
-      s=i;
-      while (i<si && isId(g_current->args.at(i))) i++;
-      oldStyleArgName = g_current->args.mid(s,i-s);
-    }
-    else // normal "int *var"
-    {
-      int l=si,i=l-1,j;
-      char c;
-      // look for start of name in "type *name"
-      while (i>=0 && isId(g_current->args.at(i))) i--;
-      j=i+1;
-      // look for start of *'s
-      while (i>=0 && ((c=g_current->args.at(i))=='*' || isspace((uchar)c))) i--;
-      i++;
-      if (i!=l)
-      {
-	g_oldStyleArgType=g_current->args.left(i);
-	oldStyleArgPtr=g_current->args.mid(i,j-i);
-	oldStyleArgName=g_current->args.mid(j).stripWhiteSpace();
-      }
-      else
-      {
-	oldStyleArgName=g_current->args.copy().stripWhiteSpace();
-      }
-    }
-  }
-  else // continuation like *arg2 in "int *args,*arg2"
-  {
-    int l=si,j=0;
-    char c;
-    while (j<l && ((c=g_current->args.at(j))=='*' || isspace((uchar)c))) j++;
-    if (j>0)
-    {
-      oldStyleArgPtr=g_current->args.left(j);
-      oldStyleArgName=g_current->args.mid(j).stripWhiteSpace();
-    }
-    else
-    {
-      oldStyleArgName=g_current->args.copy().stripWhiteSpace();
-    }
-  }
-}
-
-//-----------------------------------------------------------------------------
-
-/*! Update the argument \a name with additional \a type info. For K&R style
- *  function the type is found \e after the argument list, so this routine
- *  in needed to fix up.
- */
-static void addKnRArgInfo(const QCString &type,const QCString &name,
-                          const QCString &brief,const QCString &docs)
+struct scannerYY_state
 {
-  for (Argument &a : g_current->argList)
-  {
-    if (a.type==name)
-    {
-      a.type=type.stripWhiteSpace();
-      if (a.type.left(9)=="register ") // strip keyword
-      {
-	a.type=a.type.mid(9);
-      }
-      a.name=name.stripWhiteSpace();
-      if (!brief.isEmpty() && !docs.isEmpty())
-      {
-        a.docs=brief+"\n\n"+docs;
-      }
-      else if (!brief.isEmpty())
-      {
-        a.docs=brief;
-      }
-      else
-      {
-	a.docs=docs;
-      }
-    }
-  }
-}
+  ParserInterface *thisParser;
+  const char *     inputString = 0;
+  int              inputPosition = 0;
+  int              lastContext = 0;
+  int              lastCContext = 0;
+  int              lastDocContext = 0;
+  int              lastCPPContext = 0;
+  int              lastSkipSharpContext = 0;
+  int              lastSkipRoundContext = 0;
+  int              lastStringContext = 0;
+  int              lastCurlyContext = 0;
+  int              lastRoundContext = 0;
+  int              lastSquareContext = 0;
+  int              lastInitializerContext = 0;
+  int              lastClassTemplSpecContext = 0;
+  int              lastPreLineCtrlContext = 0;
+  int              lastSkipVerbStringContext = 0;
+  int              lastCommentInArgContext = 0;
+  int              lastRawStringContext = 0;
+  int              lastCSConstraint = 0;
+  int              lastHereDocContext = 0;
+  int              lastDefineContext = 0;
+  int              lastAlignAsContext = 0;
+  int              lastC11AttributeContext = 0;
+  int              lastModifierContext = 0;
+  Protection       protection = Public;
+  Protection       baseProt = Public;
+  int              sharpCount   = 0 ;
+  int              roundCount   = 0 ;
+  int              curlyCount   = 0 ;
+  int              squareCount  = 0 ;
+  int              padCount     = 0 ;
+  std::unique_ptr<Entry> current;
+  Entry*           current_root = 0 ;
+  Entry*           previous     = 0 ;
+  std::unique_ptr<Entry> tempEntry;
+  Entry*           firstTypedefEntry = 0 ;
+  Entry*           memspecEntry = 0 ;
+  int              yyLineNr     = 1 ;
+  int              yyBegLineNr  = 1 ;
+  int              yyColNr      = 1 ;
+  int              yyBegColNr   = 1 ;
+  int              anonCount    = 0 ;
+  int              anonNSCount  = 0 ;
+  QCString         yyFileName;
+  MethodTypes      mtype = Method;
+  bool             stat = false;
+  Specifier        virt = Normal;
+  Specifier        baseVirt = Normal;
+  QCString         msType;
+  QCString         msName;
+  QCString         msArgs;
+  bool             isTypedef = false;
+  QCString         funcPtrType;
+  QCString         templateStr;
+  QCString         aliasName;
+  QCString         baseName;
+  QCString*        specName = 0;
+
+  SrcLangExt       language = SrcLangExt_Unknown;
+  bool             insideIDL   = false;                //!< processing IDL code?
+  bool             insideJava  = false;                //!< processing Java code?
+  bool             insideCS    = false;                //!< processing C# code?
+  bool             insideD     = false;                //!< processing D code?
+  bool             insidePHP   = false;                //!< processing PHP code?
+  bool             insideObjC  = false;            //!< processing Objective C code?
+  bool             insideCli   = false;            //!< processing C++/CLI code?
+  bool             insideJS    = false;            //!< processing JavaScript code?
+  bool             insideSlice = false;            //!< processing Slice code?
+  bool             insideCpp   = true;             //!< processing C/C++ code
+
+  bool             insideCppQuote = false;
+  bool             insideProtocolList = false;
+
+  int              argRoundCount = 0;
+  int              argSharpCount = 0;
+  int              currentArgumentContext = 0;
+  int              lastCopyArgStringContext = 0;
+  int              lastCopyArgContext = 0;
+  QCString        *copyArgString = 0;
+  QCString         fullArgString;
+  QCString         dummyRawString;
+
+  ArgumentList    *currentArgumentList = 0;
+  char             lastCopyArgChar = '\0';
+
+  QCString        *pCopyQuotedString = 0;
+  QCString        *pCopyRoundString = 0;
+  QCString        *pCopyCurlyString = 0;
+  QCString        *pCopyRawString = 0;
+  QGString        *pCopyCurlyGString = 0;
+  QGString        *pCopyRoundGString = 0;
+  QGString        *pCopySquareGString = 0;
+  QGString        *pCopyQuotedGString = 0;
+  QGString        *pCopyHereDocGString = 0;
+  QGString        *pCopyRawGString = 0;
+  QGString        *pSkipVerbString = 0;
+  QStack<Grouping> autoGroupStack;
+
+  bool             insideFormula = false;
+  bool             insideTryBlock = false;
+  bool             insideCode = false;
+  bool             needsSemi = false;
+
+  int              initBracketCount = 0;
+
+  QCString         oldStyleArgType;
+  QCString         docBackup;
+  QCString         briefBackup;
+
+  int              docBlockContext = 0;
+  QGString         docBlock;
+  QCString         docBlockName;
+  bool             docBlockInBody = false;
+  bool             docBlockAutoBrief = false;
+  char             docBlockTerm = '\0';
+
+  QCString         idlAttr;
+  QCString         idlProp;
+  bool             odlProp = false;
+
+  bool             lexInit = false;
+  bool             externC = false;
+
+  QCString         delimiter;
+
+  int              column = 0;
+
+  int              fencedSize = 0;
+  bool             nestedComment = 0;
+  std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > outerScopeEntries;
+  CodeScanner      codeScanner;
+};
 
+static const char *stateToString(int state);
 //-----------------------------------------------------------------------------
 
+// forward declarations for stateless functions
+static inline int computeIndent(const char *s,int startIndent);
+static QCString stripQuotes(const char *s);
+static bool nameIsOperator(QCString &name);
+void fixArgumentListForJavaScript(ArgumentList &al);
+
+// forward declarations for statefull functions
+static void initParser(yyscan_t yyscanner);
+static void initEntry(yyscan_t yyscanner);
+static void lineCount(yyscan_t yyscanner);
+static void addType(yyscan_t yyscanner);
+static void setContext(yyscan_t yyscanner);
+static void prependScope(yyscan_t yyscanner);
+static void startCommentBlock(yyscan_t yyscanner,bool);
+static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief);
+static void handleParametersCommentBlocks(yyscan_t yyscanner,ArgumentList &al);
+static bool checkForKnRstyleC(yyscan_t yyscanner);
+static void splitKnRArg(yyscan_t yyscanner,QCString &oldStyleArgPtr,QCString &oldStyleArgName);
+static void addKnRArgInfo(yyscan_t yyscanner,const QCString &type,const QCString &name,
+                          const QCString &brief,const QCString &docs);
+static int yyread(yyscan_t yyscanner,char *buf,int max_size);
 
-void fixArgumentListForJavaScript(ArgumentList &al)
-{
-  for (Argument &a : al)
-  {
-    if (!a.type.isEmpty() && a.name.isEmpty())
-    { // a->type is actually the (typeless) parameter name, so move it
-      a.name=a.type;
-      a.type.resize(0);
-    }
-  }
-}
 
 /* ----------------------------------------------------------------- */
 #undef	YY_INPUT
-#define	YY_INPUT(buf,result,max_size) result=yyread(buf,max_size);
-
-static int yyread(char *buf,int max_size)
-{
-    int c=0;
-    while( c < max_size && g_inputString[g_inputPosition] )
-    {
-      *buf = g_inputString[g_inputPosition++] ;
-      //printf("%d (%c)\n",*buf,*buf);
-      c++; buf++;
-    }
-    return c;
-}
+#define	YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
 
 %}
 
@@ -717,32 +417,32 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 %%
 
 <NextSemi>"{"				{
-  					  g_curlyCount=0;
-					  g_needsSemi = TRUE;
+  					  yyextra->curlyCount=0;
+					  yyextra->needsSemi = TRUE;
   					  BEGIN(SkipCurlyBlock); 
 					}
 <NextSemi>"("				{
-  				 	  g_roundCount=0;
+  				 	  yyextra->roundCount=0;
   					  BEGIN(SkipRoundBlock);
   					}
 <SkipRoundBlock>"("			{
-					  ++g_roundCount;
+					  ++yyextra->roundCount;
   					}
 <SkipRoundBlock>")"			{
-  					  if (g_roundCount )
-					    --g_roundCount ;
+  					  if (yyextra->roundCount )
+					    --yyextra->roundCount ;
 					  else
 					    BEGIN( NextSemi ) ;
   					}
 <SkipCurlyBlock>"{"			{
-  					  ++g_curlyCount ; 
+  					  ++yyextra->curlyCount ; 
 					}
 <SkipCurlyBlock>"}"			{ 
-  				          if( g_curlyCount )
+  				          if( yyextra->curlyCount )
 					  {
-					    --g_curlyCount ;
+					    --yyextra->curlyCount ;
 					  }
-					  else if (g_needsSemi)
+					  else if (yyextra->needsSemi)
 					  {
 					    BEGIN( NextSemi );
 					  }
@@ -752,15 +452,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <NextSemi>\'				{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-					    g_lastStringContext=NextSemi;
+					    yyextra->lastStringContext=NextSemi;
 					    BEGIN(SkipPHPString);
 					  }
   					}
-<NextSemi>{CHARLIT}			{ if (g_insidePHP) REJECT; }
+<NextSemi>{CHARLIT}			{ if (yyextra->insidePHP) REJECT; }
 <NextSemi>\"				{
-  					  g_lastStringContext=NextSemi;
+  					  yyextra->lastStringContext=NextSemi;
 					  BEGIN(SkipString);
   					}
 <NextSemi>[;,]				{ 
@@ -772,22 +472,22 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( FindMembers );
   					}
 <EnumBaseType>[{;,]                     {
-                                          g_current->args = g_current->args.simplifyWhiteSpace();
+                                          yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
   					  unput(*yytext);
 					  BEGIN( ClassVar );
                                         }
 <FindMembers>"<?php"			{ // PHP code with unsupported extension?
-                                          g_insidePHP = TRUE;
+                                          yyextra->insidePHP = TRUE;
   					}
 <FindMembersPHP>"<?"("php"?)            { // PHP code start
                                            BEGIN( FindMembers );
 					}
 <FindMembersPHP>"<script"{BN}+"language"{BN}*"="{BN}*['"]?"php"['"]?{BN}*">" { // PHP code start
-					  lineCount() ;
+					  lineCount(yyscanner) ;
                                           BEGIN( FindMembers );
 					}
 <FindMembers>"?>"|"</script>"           { // PHP code end
-					  if (g_insidePHP)
+					  if (yyextra->insidePHP)
 					    BEGIN( FindMembersPHP );
 					  else
 					    REJECT;
@@ -795,100 +495,100 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FindMembersPHP>[^\n<]+                 { // Non-PHP code text, ignore
   					}
 <FindMembersPHP>\n                      { // Non-PHP code text, ignore
-                                          lineCount();
+                                          lineCount(yyscanner);
   					}
 <FindMembersPHP>.                       { // Non-PHP code text, ignore
 				        }
-<FindMembers>{PHPKW}			{ if (g_insidePHP)
+<FindMembers>{PHPKW}			{ if (yyextra->insidePHP)
 					    BEGIN( NextSemi );
 					  else
 					    REJECT;
 					}
 <FindMembers>"%{"[^\n]*			{ // Mozilla XPIDL lang-specific block
-					  if (!g_insideIDL)
+					  if (!yyextra->insideIDL)
 					    REJECT;
 					}
 <FindMembers>"%}"			{ // Mozilla XPIDL lang-specific block end
-					  if (!g_insideIDL)
+					  if (!yyextra->insideIDL)
 					    REJECT;
 					}
 <FindMembers>{B}*("properties"){BN}*":"{BN}*  { // IDL or Borland C++ builder property 
-  					  g_current->mtype = g_mtype = Property;
-					  g_current->protection = g_protection = Public ;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+  					  yyextra->current->mtype = yyextra->mtype = Property;
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
 					}
 
-<FindMembers>{B}*"k_dcop"{BN}*":"{BN}*  { g_current->mtype = g_mtype = DCOP;
-					  g_current->protection = g_protection = Public ;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+<FindMembers>{B}*"k_dcop"{BN}*":"{BN}*  { yyextra->current->mtype = yyextra->mtype = DCOP;
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
 					}
 
-<FindMembers>{B}*("signals"|"Q_SIGNALS"){BN}*":"{BN}* { g_current->mtype = g_mtype = Signal;
+<FindMembers>{B}*("signals"|"Q_SIGNALS"){BN}*":"{BN}* { yyextra->current->mtype = yyextra->mtype = Signal;
   
-					  g_current->protection = g_protection = Public ;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
 					}
 
 <FindMembers>{B}*"public"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
-					  g_current->protection = g_protection = Public ;
-					  g_current->mtype = g_mtype = Slot;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount();
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  yyextra->current->mtype = yyextra->mtype = Slot;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner);
 					}
 
 <FindMembers>{B}*"protected"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
-					  g_current->protection = g_protection = Protected ;
-					  g_current->mtype = g_mtype = Slot;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount();
+					  yyextra->current->protection = yyextra->protection = Protected ;
+					  yyextra->current->mtype = yyextra->mtype = Slot;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner);
 					}
 
 <FindMembers>{B}*"private"{BN}*("slots"|"Q_SLOTS"){BN}*":"{BN}* {
-					  g_current->protection = g_protection = Private ;
-					  g_current->mtype = g_mtype = Slot;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount();
+					  yyextra->current->protection = yyextra->protection = Private ;
+					  yyextra->current->mtype = yyextra->mtype = Slot;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner);
 					}
 <FindMembers>{B}*("public"|"methods"|"__published"){BN}*":"{BN}* { 
-					  g_current->protection = g_protection = Public ;
-					  g_current->mtype = g_mtype = Method;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  yyextra->current->mtype = yyextra->mtype = Method;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
 					}
 <FindMembers>{B}*"internal"{BN}*":"{BN}* {  // for now treat C++/CLI's internal as package...
-  					  if (g_insideCli)
+  					  if (yyextra->insideCli)
 					  {
-					    g_current->protection = g_protection = Package ;
-					    g_current->mtype = g_mtype = Method;
-					    g_current->type.resize(0); 
-					    g_current->name.resize(0); 
-					    g_current->args.resize(0);
-					    g_current->argList.clear();
-					    lineCount() ;
+					    yyextra->current->protection = yyextra->protection = Package ;
+					    yyextra->current->mtype = yyextra->mtype = Method;
+					    yyextra->current->type.resize(0); 
+					    yyextra->current->name.resize(0); 
+					    yyextra->current->args.resize(0);
+					    yyextra->current->argList.clear();
+					    lineCount(yyscanner) ;
 					  }
 					  else
 					  {
@@ -896,38 +596,38 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FindMembers>{B}*"protected"{BN}*":"{BN}* {  
-  					  g_current->protection = g_protection = Protected ;
-					  g_current->mtype = g_mtype = Method;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+  					  yyextra->current->protection = yyextra->protection = Protected ;
+					  yyextra->current->mtype = yyextra->mtype = Method;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
 					}
 <FindMembers>{B}*"private"{BN}*":"{BN}*	{ 
-  					  g_current->protection = g_protection = Private ;
-					  g_current->mtype = g_mtype = Method;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+  					  yyextra->current->protection = yyextra->protection = Private ;
+					  yyextra->current->mtype = yyextra->mtype = Method;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
 					}
 <FindMembers>{B}*"event"{BN}+           { 
-  					  if (g_insideCli)
+  					  if (yyextra->insideCli)
 					  {
 					    // C++/CLI event
-					    lineCount() ;
-  					    g_current->mtype = g_mtype = Event;
-					    g_current->bodyLine = g_yyLineNr;
-					    g_curlyCount=0;
+					    lineCount(yyscanner) ;
+  					    yyextra->current->mtype = yyextra->mtype = Event;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+					    yyextra->curlyCount=0;
 					    BEGIN( CliPropertyType );
 					  }
-					  else if (g_insideCS)
+					  else if (yyextra->insideCS)
 					  {
-					    lineCount() ;
-  					    g_current->mtype = Event;
-					    g_current->bodyLine = g_yyLineNr;
+					    lineCount(yyscanner) ;
+  					    yyextra->current->mtype = Event;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
 					  }
 					  else
 					  {
@@ -935,13 +635,13 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
                                         }
 <FindMembers>{B}*"property"{BN}+	{
-  					   if (g_insideCli)
+  					   if (yyextra->insideCli)
 					   {
 					     // C++/CLI property
-					     lineCount() ;
-  					     g_current->mtype = g_mtype = Property;
-					     g_current->bodyLine = g_yyLineNr;
-					     g_curlyCount=0;
+					     lineCount(yyscanner) ;
+  					     yyextra->current->mtype = yyextra->mtype = Property;
+					     yyextra->current->bodyLine = yyextra->yyLineNr;
+					     yyextra->curlyCount=0;
 					     BEGIN( CliPropertyType );
 					   }
 					   else
@@ -950,16 +650,16 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					   }
 					}
 <CliPropertyType>{ID}			{
-  					  addType();
-  					  g_current->name = yytext;
+  					  addType(yyscanner);
+  					  yyextra->current->name = yytext;
   					}
 <CliPropertyType>"["		        { // C++/CLI indexed property
-  					  g_current->args = "[";
+  					  yyextra->current->args = "[";
 					  BEGIN( CliPropertyIndex );
   					}
 <CliPropertyType>"{"			{
-					  g_curlyCount=0;
-					  //printf("event: '%s' '%s'\n",g_current->type.data(),g_current->name.data());
+					  yyextra->curlyCount=0;
+					  //printf("event: '%s' '%s'\n",yyextra->current->type.data(),yyextra->current->name.data());
   					  BEGIN( CSAccessorDecl );
   					}
 <CliPropertyType>";"			{
@@ -967,84 +667,84 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( FindMembers );
   					}
 <CliPropertyType>\n			{
-                                          lineCount();
+                                          lineCount(yyscanner);
   					}
 <CliPropertyType>{B}*			{
   					}
 <CliPropertyType>.			{
-  					  addType();
-  					  g_current->type += yytext;
+  					  addType(yyscanner);
+  					  yyextra->current->type += yytext;
   					}
 <CliPropertyIndex>"]"			{
                                           BEGIN( CliPropertyType );
-  					  g_current->args+=yytext;
+  					  yyextra->current->args+=yytext;
   					}
 <CliPropertyIndex>.			{
-  					  g_current->args+=yytext;
+  					  yyextra->current->args+=yytext;
   					}
   /*
 <FindMembers>{B}*"property"{BN}+        { 
-                                          if (!g_current->type.isEmpty())
+                                          if (!yyextra->current->type.isEmpty())
 					  {
 					    REJECT;
                                           }
 					  else
 					  { 
-                                            g_current->mtype = g_mtype = Property;
-                                            lineCount();
+                                            yyextra->current->mtype = yyextra->mtype = Property;
+                                            lineCount(yyscanner);
 					  }
                                         }
   */
 <FindMembers>{B}*"@private"{BN}+	{
-  					  g_current->protection = g_protection = Private ;
-					  g_current->mtype = g_mtype = Method;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+  					  yyextra->current->protection = yyextra->protection = Private ;
+					  yyextra->current->mtype = yyextra->mtype = Method;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
   					}
 <FindMembers>{B}*"@protected"{BN}+	{
-  					  g_current->protection = g_protection = Protected ;
-					  g_current->mtype = g_mtype = Method;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+  					  yyextra->current->protection = yyextra->protection = Protected ;
+					  yyextra->current->mtype = yyextra->mtype = Method;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
   					}
 <FindMembers>{B}*"@public"{BN}+	{
-  					  g_current->protection = g_protection = Public ;
-					  g_current->mtype = g_mtype = Method;
-					  g_current->type.resize(0); 
-					  g_current->name.resize(0); 
-					  g_current->args.resize(0);
-					  g_current->argList.clear();
-					  lineCount() ;
+  					  yyextra->current->protection = yyextra->protection = Public ;
+					  yyextra->current->mtype = yyextra->mtype = Method;
+					  yyextra->current->type.resize(0); 
+					  yyextra->current->name.resize(0); 
+					  yyextra->current->args.resize(0);
+					  yyextra->current->argList.clear();
+					  lineCount(yyscanner) ;
   					}
 <FindMembers>[\-+]{BN}*			{
-  					  if (!g_insideObjC) 
+  					  if (!yyextra->insideObjC) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-  					    lineCount();
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->bodyLine  = g_yyLineNr;
-					    g_current->section = Entry::FUNCTION_SEC;
-					    g_current->protection = g_protection = Public ;
-					    g_language = g_current->lang = SrcLangExt_ObjC;
-					    g_insideObjC = TRUE;
-					    g_current->virt = Virtual;
-					    g_current->stat=yytext[0]=='+';
-					    g_current->mtype = g_mtype = Method;
-					    g_current->type.resize(0); 
-					    g_current->name.resize(0); 
-					    g_current->args.resize(0);
-					    g_current->argList.clear();
+  					    lineCount(yyscanner);
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
+					    yyextra->current->section = Entry::FUNCTION_SEC;
+					    yyextra->current->protection = yyextra->protection = Public ;
+					    yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+					    yyextra->insideObjC = TRUE;
+					    yyextra->current->virt = Virtual;
+					    yyextra->current->stat=yytext[0]=='+';
+					    yyextra->current->mtype = yyextra->mtype = Method;
+					    yyextra->current->type.resize(0); 
+					    yyextra->current->name.resize(0); 
+					    yyextra->current->args.resize(0);
+					    yyextra->current->argList.clear();
 					    BEGIN( ObjCMethod );
 					  }
   					}
@@ -1052,24 +752,24 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN( ObjCReturnType );
   					}
 <ObjCMethod>{ID}			{ // found method name
-  					  if (g_current->type.isEmpty())
+  					  if (yyextra->current->type.isEmpty())
 					  {
-					    g_current->type = "id";
+					    yyextra->current->type = "id";
 					  }
-					  g_current->name = yytext;
-                                          if (g_insideCpp || g_insideObjC) 
+					  yyextra->current->name = yytext;
+                                          if (yyextra->insideCpp || yyextra->insideObjC) 
                                           {
-                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
+                                            yyextra->current->id = ClangParser::instance()->lookup(yyextra->yyLineNr,yytext);
                                           }
   					}
 <ObjCMethod>":"{B}*			{ // start of parameter list
-  					  g_current->name += ':';
+  					  yyextra->current->name += ':';
   					  Argument a;
-					  g_current->argList.push_back(a);
+					  yyextra->current->argList.push_back(a);
   					  BEGIN( ObjCParams );
   					}
 <ObjCReturnType>[^)]*			{ // TODO: check if nested braches are possible.
-  					  g_current->type = yytext;
+  					  yyextra->current->type = yytext;
   					}
 <ObjCReturnType>")"			{
   					  BEGIN( ObjCMethod );
@@ -1079,140 +779,140 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  keyw=keyw.left(keyw.length()-1).stripWhiteSpace(); // strip :
 					  if (keyw.isEmpty())
 					  {
-					    g_current->name += " :";
+					    yyextra->current->name += " :";
 					  }
 					  else
 					  {
-					    g_current->name += keyw+":";
+					    yyextra->current->name += keyw+":";
 					  }
-					  if (g_current->argList.back().type.isEmpty())
+					  if (yyextra->current->argList.back().type.isEmpty())
 					  {
-					    g_current->argList.back().type="id";
+					    yyextra->current->argList.back().type="id";
 					  }
   					  Argument a;
   					  a.attrib=(QCString)"["+keyw+"]";
-					  g_current->argList.push_back(a);
+					  yyextra->current->argList.push_back(a);
   					}
 <ObjCParams>{ID}{BN}*			{ // name of parameter
-  					  lineCount();
-  					  g_current->argList.back().name=QCString(yytext).stripWhiteSpace();
+  					  lineCount(yyscanner);
+  					  yyextra->current->argList.back().name=QCString(yytext).stripWhiteSpace();
   					}
 <ObjCParams>","{BN}*"..."		{ // name of parameter
-  					  lineCount();
+  					  lineCount(yyscanner);
 					  // do we want the comma as part of the name?
-  					  //g_current->name += ",";
+  					  //yyextra->current->name += ",";
   					  Argument a;
   					  a.attrib="[,]";
   					  a.type="...";
-					  g_current->argList.push_back(a);
+					  yyextra->current->argList.push_back(a);
   					}
    /*
 <ObjCParams>":"				{ 
-					  g_current->name += ':';
+					  yyextra->current->name += ':';
 					}
    */
 <ObjCParams>"("				{
-				 	  g_roundCount=0;
-					  g_current->argList.back().type.resize(0);
+				 	  yyextra->roundCount=0;
+					  yyextra->current->argList.back().type.resize(0);
 					  BEGIN( ObjCParamType );
 					}
 <ObjCParamType>"("                      {
-                                          g_roundCount++;
-  					  g_current->argList.back().type+=yytext;
+                                          yyextra->roundCount++;
+  					  yyextra->current->argList.back().type+=yytext;
                                         }
 <ObjCParamType>")"/{B}*			{
-                                          if (g_roundCount<=0)
+                                          if (yyextra->roundCount<=0)
                                           {
                                             BEGIN( ObjCParams );
                                           }
                                           else
                                           {
-                                            g_current->argList.back().type+=yytext;
-                                            g_roundCount--;
+                                            yyextra->current->argList.back().type+=yytext;
+                                            yyextra->roundCount--;
                                           }
 					}
 <ObjCParamType>[^()]*			{
-        				  g_current->argList.back().type+=QCString(yytext).stripWhiteSpace();
+        				  yyextra->current->argList.back().type+=QCString(yytext).stripWhiteSpace();
   					}
 <ObjCMethod,ObjCParams>";"		{ // end of method declaration
-					  if (!g_current->argList.empty() && g_current->argList.back().type.isEmpty())
+					  if (!yyextra->current->argList.empty() && yyextra->current->argList.back().type.isEmpty())
 					  {
-					    g_current->argList.back().type="id";
+					    yyextra->current->argList.back().type="id";
 					  }
-                                          if (g_current->argList.empty()) // method without parameters
+                                          if (yyextra->current->argList.empty()) // method without parameters
                                           {
-                                            g_current->argList.noParameters = TRUE;
+                                            yyextra->current->argList.noParameters = TRUE;
                                           }
-  					  g_current->args = argListToString(g_current->argList);
-					  //printf("argList=%s\n",g_current->args.data());
+  					  yyextra->current->args = argListToString(yyextra->current->argList);
+					  //printf("argList=%s\n",yyextra->current->args.data());
   					  unput(';');
   					  BEGIN( Function );
                                         }
 <ObjCMethod,ObjCParams>(";"{BN}+)?"{"	{ // start of a method body
-  					  lineCount();
+  					  lineCount(yyscanner);
                                           //printf("Type=%s Name=%s args=%s\n",
-					  //    g_current->type.data(),g_current->name.data(),argListToString(g_current->argList).data()
+					  //    yyextra->current->type.data(),yyextra->current->name.data(),argListToString(yyextra->current->argList).data()
 					  //    );
-					  if (!g_current->argList.empty() && g_current->argList.back().type.isEmpty())
+					  if (!yyextra->current->argList.empty() && yyextra->current->argList.back().type.isEmpty())
 					  {
-					    g_current->argList.back().type="id";
+					    yyextra->current->argList.back().type="id";
 					  }
-                                          if (g_current->argList.empty()) // method without parameters
+                                          if (yyextra->current->argList.empty()) // method without parameters
                                           {
-                                            g_current->argList.noParameters = TRUE;
+                                            yyextra->current->argList.noParameters = TRUE;
                                           }
-  					  g_current->args = argListToString(g_current->argList);
+  					  yyextra->current->args = argListToString(yyextra->current->argList);
                                           unput('{');
   					  BEGIN( Function );
   					}
 <FindMembers>{B}*"sequence"{BN}*"<"{BN}* {
-					  if (g_insideSlice)
-					  {
-                                            lineCount();
-					    g_current->bodyLine = g_yyLineNr;
-                                            g_current->fileName = g_yyFileName ;
-					    g_current->startLine = g_yyLineNr ;
-					    g_current->startColumn = g_yyColNr;
-                                            g_current->args.resize(0);
-					    g_current->section = Entry::TYPEDEF_SEC ;
-                                            g_isTypedef = TRUE;
+					  if (yyextra->insideSlice)
+					  {
+                                            lineCount(yyscanner);
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+                                            yyextra->current->fileName = yyextra->yyFileName ;
+					    yyextra->current->startLine = yyextra->yyLineNr ;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+                                            yyextra->current->args.resize(0);
+					    yyextra->current->section = Entry::TYPEDEF_SEC ;
+                                            yyextra->isTypedef = TRUE;
 					    BEGIN( SliceSequence );
 					  }
 					  else
 					    REJECT;
 					}
 <FindMembers>{B}*"dictionary"{BN}*"<"{BN}* {
-					  if (g_insideSlice)
-					  {
-                                            lineCount();
-					    g_current->bodyLine = g_yyLineNr;
-                                            g_current->fileName = g_yyFileName ;
-					    g_current->startLine = g_yyLineNr ;
-					    g_current->startColumn = g_yyColNr;
-                                            g_current->args.resize(0);
-					    g_current->section = Entry::TYPEDEF_SEC ;
-                                            g_isTypedef = TRUE;
+					  if (yyextra->insideSlice)
+					  {
+                                            lineCount(yyscanner);
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+                                            yyextra->current->fileName = yyextra->yyFileName ;
+					    yyextra->current->startLine = yyextra->yyLineNr ;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+                                            yyextra->current->args.resize(0);
+					    yyextra->current->section = Entry::TYPEDEF_SEC ;
+                                            yyextra->isTypedef = TRUE;
 					    BEGIN( SliceDictionary );
 					  }
 					  else
 					    REJECT;
 					}
 <FindMembers>{BN}{1,80}		        {
-  					  lineCount();
+  					  lineCount(yyscanner);
   					}
 <FindMembers>"@"({ID}".")*{ID}{BN}*"("	{
-  					  if (g_insideJava) // Java annotation
+  					  if (yyextra->insideJava) // Java annotation
 					  {
-  					    lineCount();
-					    g_lastSkipRoundContext = YY_START;
-					    g_roundCount=0;
+  					    lineCount(yyscanner);
+					    yyextra->lastSkipRoundContext = YY_START;
+					    yyextra->roundCount=0;
 					    BEGIN( SkipRound );
 					  }
 					  else if (qstrncmp(yytext,"@property",9)==0) // ObjC 2.0 property
 					  {
-  					    g_current->mtype = g_mtype = Property;
-					    g_current->spec|=Entry::Readable | Entry::Writable | Entry::Assign;
-					    g_current->protection = Public ;
+  					    yyextra->current->mtype = yyextra->mtype = Property;
+					    yyextra->current->spec|=Entry::Readable | Entry::Writable | Entry::Assign;
+					    yyextra->current->protection = Public ;
 					    unput('(');
 					    BEGIN( ObjCPropAttr );
 					  }
@@ -1222,54 +922,54 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
                                         }
 <ObjCPropAttr>"getter="{ID}		{ 
-                                          g_current->read = yytext+7;
+                                          yyextra->current->read = yytext+7;
 					}
 <ObjCPropAttr>"setter="{ID}		{ 
-                                          g_current->write = yytext+7;
+                                          yyextra->current->write = yytext+7;
 					}
 <ObjCPropAttr>"readonly"		{
-					  g_current->spec&=~Entry::Writable;
+					  yyextra->current->spec&=~Entry::Writable;
   					}
 <ObjCPropAttr>"readwrite"		{ // default
   					}
 <ObjCPropAttr>"assign"			{ // default
   					}
 <ObjCPropAttr>"unsafe_unretained"       {
-					  g_current->spec&=~Entry::Assign;
-					  g_current->spec|=Entry::Unretained;
+					  yyextra->current->spec&=~Entry::Assign;
+					  yyextra->current->spec|=Entry::Unretained;
                                         }
 <ObjCPropAttr>"retain"			{
-					  g_current->spec&=~Entry::Assign;
-					  g_current->spec|=Entry::Retain;
+					  yyextra->current->spec&=~Entry::Assign;
+					  yyextra->current->spec|=Entry::Retain;
   					}
 <ObjCPropAttr>"copy"			{
-					  g_current->spec&=~Entry::Assign;
-					  g_current->spec|=Entry::Copy;
+					  yyextra->current->spec&=~Entry::Assign;
+					  yyextra->current->spec|=Entry::Copy;
   					}
 <ObjCPropAttr>"weak"                    {
-					  g_current->spec&=~Entry::Assign;
-					  g_current->spec|=Entry::Weak;
+					  yyextra->current->spec&=~Entry::Assign;
+					  yyextra->current->spec|=Entry::Weak;
                                         }
 <ObjCPropAttr>"strong"                  {
-					  g_current->spec&=~Entry::Assign;
-					  g_current->spec|=Entry::Strong;
+					  yyextra->current->spec&=~Entry::Assign;
+					  yyextra->current->spec|=Entry::Strong;
                                         }
 <ObjCPropAttr>"nonatomic"		{
-					  g_current->spec|=Entry::NonAtomic;
+					  yyextra->current->spec|=Entry::NonAtomic;
   					}
 <ObjCPropAttr>")"			{
   					  BEGIN(FindMembers);
   					}
 <FindMembers>"@"{ID}			{
-  					  if (g_insideJava) // Java annotation
+  					  if (yyextra->insideJava) // Java annotation
 					  {
 					    // skip annotation
 					  }
 					  else if (qstrcmp(yytext,"@property")==0) // ObjC 2.0 property
 					  {
-  					    g_current->mtype = g_mtype = Property;
-					    g_current->spec|=Entry::Writable | Entry::Readable;
-					    g_current->protection = Public ;
+  					    yyextra->current->mtype = yyextra->mtype = Property;
+					    yyextra->current->spec|=Entry::Writable | Entry::Readable;
+					    yyextra->current->protection = Public ;
 					  }
 					  else if (qstrcmp(yytext,"@synthesize")==0)
 					  {
@@ -1288,58 +988,58 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN(FindMembers);
   					}
 <PackageName>{ID}(("."|"\\"){ID})*	{
-  					  g_isTypedef=FALSE;
-					  //printf("Found namespace %s lang=%d\n",yytext,g_current->lang);
-					  g_current->name = yytext;
-					  g_current->name = substitute(g_current->name,".","::");
-					  g_current->name = substitute(g_current->name,"\\","::");
-					  g_current->section = Entry::NAMESPACE_SEC;
-					  g_current->type = "namespace" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount();
+  					  yyextra->isTypedef=FALSE;
+					  //printf("Found namespace %s lang=%d\n",yytext,yyextra->current->lang);
+					  yyextra->current->name = yytext;
+					  yyextra->current->name = substitute(yyextra->current->name,".","::");
+					  yyextra->current->name = substitute(yyextra->current->name,"\\","::");
+					  yyextra->current->section = Entry::NAMESPACE_SEC;
+					  yyextra->current->type = "namespace" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner);
   					}
 <PackageName>";"			{
-                                          Entry *tmp = g_current.get();
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-                                          g_current_root = tmp;
-					  initEntry();
+                                          Entry *tmp = yyextra->current.get();
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+                                          yyextra->current_root = tmp;
+					  initEntry(yyscanner);
   					  BEGIN(FindMembers);
   					}
 <PackageName>"{"			{
-					  g_curlyCount=0;
+					  yyextra->curlyCount=0;
 					  BEGIN( ReadNSBody );
   					}
 <FindMembers>{B}*"initonly"{BN}+	{
-  					  g_current->type += " initonly ";
-					  if (g_insideCli) g_current->spec |= Entry::Initonly;
-					  lineCount();
+  					  yyextra->current->type += " initonly ";
+					  if (yyextra->insideCli) yyextra->current->spec |= Entry::Initonly;
+					  lineCount(yyscanner);
   					}
-<FindMembers>{B}*"static"{BN}+     	{ g_current->type += " static ";
-  					  g_current->stat = TRUE;
-					  lineCount();
+<FindMembers>{B}*"static"{BN}+     	{ yyextra->current->type += " static ";
+  					  yyextra->current->stat = TRUE;
+					  lineCount(yyscanner);
 					}
 <FindMembers>{B}*"extern"{BN}+		{
-  					  g_current->stat = FALSE;
-					  g_current->explicitExternal = TRUE;
-					  lineCount();
+  					  yyextra->current->stat = FALSE;
+					  yyextra->current->explicitExternal = TRUE;
+					  lineCount(yyscanner);
   					}
-<FindMembers>{B}*"const"{BN}+    	{ g_current->type += " const ";
-					  if (g_insideCS) g_current->stat = TRUE;
-					  lineCount();
+<FindMembers>{B}*"const"{BN}+    	{ yyextra->current->type += " const ";
+					  if (yyextra->insideCS) yyextra->current->stat = TRUE;
+					  lineCount(yyscanner);
 					}
-<FindMembers>{B}*"virtual"{BN}+    	{ g_current->type += " virtual ";
-					  g_current->virt = Virtual;
-					  lineCount();
+<FindMembers>{B}*"virtual"{BN}+    	{ yyextra->current->type += " virtual ";
+					  yyextra->current->virt = Virtual;
+					  lineCount(yyscanner);
 					}
 <FindMembers>{B}*"constexpr"{BN}+    	{ 
-                                          if (g_insideCpp)
+                                          if (yyextra->insideCpp)
                                           {
-                                            g_current->type += " constexpr ";
-                                            g_current->spec |= Entry::ConstExpr;
-                                            lineCount();
+                                            yyextra->current->type += " constexpr ";
+                                            yyextra->current->spec |= Entry::ConstExpr;
+                                            lineCount(yyscanner);
                                           }
                                           else
                                           {
@@ -1347,10 +1047,10 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           }
 					}
 <FindMembers>{B}*"published"{BN}+	{ // UNO IDL published keyword
-					  if (g_insideIDL)
+					  if (yyextra->insideIDL)
 					  {
-					    lineCount();
-					    g_current->spec |= Entry::Published;
+					    lineCount(yyscanner);
+					    yyextra->current->spec |= Entry::Published;
 					  }
 					  else
 					  {
@@ -1358,60 +1058,60 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <FindMembers>{B}*"abstract"{BN}+    	{ 
-                                          if (!g_insidePHP) 
+                                          if (!yyextra->insidePHP) 
 					  {
-					    g_current->type += " abstract ";
-					    if (!g_insideJava)
+					    yyextra->current->type += " abstract ";
+					    if (!yyextra->insideJava)
 					    {
-                                              g_current->virt = Pure;
+                                              yyextra->current->virt = Pure;
 					    }
 					    else
 					    {
-                                              g_current->spec|=Entry::Abstract;
+                                              yyextra->current->spec|=Entry::Abstract;
 					    }
 					  }
 					  else
 					  {
-					    g_current->spec|=Entry::Abstract;
+					    yyextra->current->spec|=Entry::Abstract;
 					  }
-					  lineCount();
+					  lineCount(yyscanner);
 					}
-<FindMembers>{B}*"inline"{BN}+		{ g_current->spec|=Entry::Inline;
-                                          lineCount(); 
+<FindMembers>{B}*"inline"{BN}+		{ yyextra->current->spec|=Entry::Inline;
+                                          lineCount(yyscanner); 
                                         }
-<FindMembers>{B}*"mutable"{BN}+		{ g_current->spec|=Entry::Mutable;
-                                          lineCount(); 
+<FindMembers>{B}*"mutable"{BN}+		{ yyextra->current->spec|=Entry::Mutable;
+                                          lineCount(yyscanner); 
                                         }
-<FindMembers>{B}*"explicit"{BN}+	{ g_current->spec|=Entry::Explicit;
-                                          lineCount(); 
+<FindMembers>{B}*"explicit"{BN}+	{ yyextra->current->spec|=Entry::Explicit;
+                                          lineCount(yyscanner); 
                                         }
-<FindMembers>{B}*"local"{BN}+		{ g_current->spec|=Entry::Local;
-                                          lineCount(); 
+<FindMembers>{B}*"local"{BN}+		{ yyextra->current->spec|=Entry::Local;
+                                          lineCount(yyscanner); 
                                         }
 <FindMembers>{B}*"@required"{BN}+	{ // Objective C 2.0 protocol required section
-                                          g_current->spec=(g_current->spec & ~Entry::Optional) | Entry::Required;
-                                          lineCount(); 
+                                          yyextra->current->spec=(yyextra->current->spec & ~Entry::Optional) | Entry::Required;
+                                          lineCount(yyscanner); 
                                         }
 <FindMembers>{B}*"@optional"{BN}+	{  // Objective C 2.0 protocol optional section
-                                          g_current->spec=(g_current->spec & ~Entry::Required) | Entry::Optional;
-                                          lineCount(); 
+                                          yyextra->current->spec=(yyextra->current->spec & ~Entry::Required) | Entry::Optional;
+                                          lineCount(yyscanner); 
                                         }
   /*
 <FindMembers>{B}*"import"{BN}+		{ // IDL import keyword
   					  BEGIN( NextSemi );
   					}
   */
-<FindMembers>{B}*"typename"{BN}+	{ lineCount(); }
+<FindMembers>{B}*"typename"{BN}+	{ lineCount(yyscanner); }
 <FindMembers>{B}*"namespace"{BN}*/[^a-z_A-Z0-9]	{ 
-  					  g_isTypedef=FALSE;
-					  g_current->section = Entry::NAMESPACE_SEC;
-					  g_current->type = "namespace" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount();
-					  if (g_insidePHP)
+  					  yyextra->isTypedef=FALSE;
+					  yyextra->current->section = Entry::NAMESPACE_SEC;
+					  yyextra->current->type = "namespace" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner);
+					  if (yyextra->insidePHP)
 					  {
 					    BEGIN( PackageName );
 					  }
@@ -1421,449 +1121,449 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <FindMembers>{B}*"module"{BN}+		{ 
-					  lineCount();
-                                          if (g_insideIDL || g_insideSlice)
-					  {
-  					    g_isTypedef=FALSE;
-					    g_current->section = Entry::NAMESPACE_SEC;
-					    g_current->type = "module" ;
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+                                          if (yyextra->insideIDL || yyextra->insideSlice)
+					  {
+  					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::NAMESPACE_SEC;
+					    yyextra->current->type = "module" ;
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
   					    BEGIN( CompoundName ); 
 					  }
-					  else if (g_insideD)
+					  else if (yyextra->insideD)
 					  {
-					    lineCount();
+					    lineCount(yyscanner);
 					    BEGIN(PackageName);
 					  }
 					  else
 					  {
-					    addType();
-					    g_current->name = QCString(yytext).stripWhiteSpace();
+					    addType(yyscanner);
+					    yyextra->current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{B}*"library"{BN}+		{ 
-					  lineCount();
-                                          if (g_insideIDL)
-					  {
-  					    g_isTypedef=FALSE;
-					    g_current->section = Entry::NAMESPACE_SEC;
-					    g_current->type = "library" ;
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+                                          if (yyextra->insideIDL)
+					  {
+  					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::NAMESPACE_SEC;
+					    yyextra->current->type = "library" ;
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
   					    BEGIN( CompoundName ); 
 					  }
 					  else
 					  {
-					    addType();
-					    g_current->name = QCString(yytext).stripWhiteSpace();
+					    addType(yyscanner);
+					    yyextra->current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{B}*"constants"{BN}+	{  // UNO IDL constant group
-					  lineCount();
-					  if (g_insideIDL)
-					  {
-					    g_isTypedef=FALSE;
-					    g_current->section = Entry::NAMESPACE_SEC;
-					    g_current->type = "constants";
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+					  if (yyextra->insideIDL)
+					  {
+					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::NAMESPACE_SEC;
+					    yyextra->current->type = "constants";
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else
 					  {
-					    addType();
-					    g_current->name = QCString(yytext).stripWhiteSpace();
+					    addType(yyscanner);
+					    yyextra->current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{BN}*("service"){BN}+ 	{ // UNO IDL service
-					  lineCount();
-					  if (g_insideIDL)
+					  lineCount(yyscanner);
+					  if (yyextra->insideIDL)
 					  {
-					    g_isTypedef=FALSE;
-					    g_current->section = Entry::CLASS_SEC;
-					    g_current->spec = Entry::Service |
+					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::CLASS_SEC;
+					    yyextra->current->spec = Entry::Service |
 					      // preserve UNO IDL [optional] or published
-					      (g_current->spec & (Entry::Optional|Entry::Published));
-					    addType();
-					    g_current->type += " service " ;
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->bodyLine  = g_yyLineNr;
+					      (yyextra->current->spec & (Entry::Optional|Entry::Published));
+					    addType(yyscanner);
+					    yyextra->current->type += " service " ;
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else // TODO is addType right? just copy/pasted
 					  {
-					    addType();
-					    g_current->name = QCString(yytext).stripWhiteSpace();
+					    addType(yyscanner);
+					    yyextra->current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{BN}*("singleton"){BN}+ 	{ // UNO IDL singleton
-					  lineCount();
-					  if (g_insideIDL)
-					  {
-					    g_isTypedef=FALSE;
-					    g_current->section = Entry::CLASS_SEC;
-					    g_current->spec = Entry::Singleton |
-					      (g_current->spec & Entry::Published); // preserve
-					    addType();
-					    g_current->type += " singleton " ;
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+					  if (yyextra->insideIDL)
+					  {
+					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::CLASS_SEC;
+					    yyextra->current->spec = Entry::Singleton |
+					      (yyextra->current->spec & Entry::Published); // preserve
+					    addType(yyscanner);
+					    yyextra->current->type += " singleton " ;
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else // TODO is addType right? just copy/pasted
 					  {
-					    addType();
-					    g_current->name = QCString(yytext).stripWhiteSpace();
+					    addType(yyscanner);
+					    yyextra->current->name = QCString(yytext).stripWhiteSpace();
 					  }
 					}
 <FindMembers>{BN}*((("disp")?"interface")|"valuetype"){BN}+ 	{ // M$/Corba/UNO IDL/Java/Slice interface
-					  lineCount();
-                                          if (g_insideIDL || g_insideJava || g_insideCS || g_insideD || g_insidePHP || g_insideSlice)
+					  lineCount(yyscanner);
+                                          if (yyextra->insideIDL || yyextra->insideJava || yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideSlice)
 					  {
-  					    g_isTypedef=FALSE;
-					    g_current->section = Entry::CLASS_SEC;
-                        		    g_current->spec = Entry::Interface |
+  					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::CLASS_SEC;
+                        		    yyextra->current->spec = Entry::Interface |
                                                 // preserve UNO IDL [optional], published, Slice local
-                                                (g_current->spec & (Entry::Optional|Entry::Published|Entry::Local));
-					    addType();
-					    g_current->type += " interface" ;
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->bodyLine  = g_yyLineNr;
+                                                (yyextra->current->spec & (Entry::Optional|Entry::Published|Entry::Local));
+					    addType(yyscanner);
+					    yyextra->current->type += " interface" ;
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
 					    BEGIN( CompoundName );
 					  }
 					  else
 					  {
-					    addType();
-					    g_current->name = QCString(yytext).stripWhiteSpace();
+					    addType(yyscanner);
+					    yyextra->current->name = QCString(yytext).stripWhiteSpace();
 					  }
   					}
 <FindMembers>{B}*"@implementation"{BN}+	{ // Objective-C class implementation
-					  lineCount();
-  					  g_isTypedef=FALSE;
-					  g_current->section = Entry::OBJCIMPL_SEC;
-					  g_language = g_current->lang = SrcLangExt_ObjC;
-					  g_insideObjC = TRUE;
-					  g_current->protection = g_protection = Public ;
-					  addType();
-					  g_current->type += " implementation" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+  					  yyextra->isTypedef=FALSE;
+					  yyextra->current->section = Entry::OBJCIMPL_SEC;
+					  yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+					  yyextra->insideObjC = TRUE;
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  addType(yyscanner);
+					  yyextra->current->type += " implementation" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
 					  BEGIN( CompoundName );
   					}
 <FindMembers>{B}*"@interface"{BN}+	{ // Objective-C class interface, or Java attribute
-					  lineCount();
-  					  g_isTypedef=FALSE;
-					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec = Entry::Interface;
-					  if (!g_insideJava)
-					  {
-					    g_language = g_current->lang = SrcLangExt_ObjC;
-					    g_insideObjC = TRUE;
-					  }
-					  g_current->protection = g_protection = Public ;
-					  addType();
-					  g_current->type += " interface" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+  					  yyextra->isTypedef=FALSE;
+					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec = Entry::Interface;
+					  if (!yyextra->insideJava)
+					  {
+					    yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+					    yyextra->insideObjC = TRUE;
+					  }
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  addType(yyscanner);
+					  yyextra->current->type += " interface" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
 					  BEGIN( CompoundName );
   					}
 <FindMembers>{B}*"@protocol"{BN}+	{ // Objective-C protocol definition
-					  lineCount();
-  					  g_isTypedef=FALSE;
-					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec = Entry::Protocol;
-					  g_language = g_current->lang = SrcLangExt_ObjC;
-					  g_insideObjC = TRUE;
-					  g_current->protection = g_protection = Public ;
-					  addType();
-					  g_current->type += " protocol" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
+					  lineCount(yyscanner);
+  					  yyextra->isTypedef=FALSE;
+					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec = Entry::Protocol;
+					  yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+					  yyextra->insideObjC = TRUE;
+					  yyextra->current->protection = yyextra->protection = Public ;
+					  addType(yyscanner);
+					  yyextra->current->type += " protocol" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
 					  BEGIN( CompoundName );
   					}
 <FindMembers>{B}*"exception"{BN}+ 	{ // Corba IDL/Slice exception
-  					  g_isTypedef=FALSE;
-					  g_current->section = Entry::CLASS_SEC;
+  					  yyextra->isTypedef=FALSE;
+					  yyextra->current->section = Entry::CLASS_SEC;
                                           // preserve UNO IDL, Slice local
-					  g_current->spec    = Entry::Exception |
-					    (g_current->spec & Entry::Published) |
-					    (g_current->spec & Entry::Local);
-					  addType();
-					  g_current->type += " exception" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount();
+					  yyextra->current->spec    = Entry::Exception |
+					    (yyextra->current->spec & Entry::Published) |
+					    (yyextra->current->spec & Entry::Local);
+					  addType(yyscanner);
+					  yyextra->current->type += " exception" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner);
 					  BEGIN( CompoundName );
   					}
 <FindMembers>"@class" | // for Objective C class declarations
 <FindMembers>{B}*{TYPEDEFPREFIX}"class{" |
 <FindMembers>{B}*{TYPEDEFPREFIX}"class"{BN}+ { 
                                           QCString decl = yytext;
-					  g_isTypedef=decl.find("typedef")!=-1;
+					  yyextra->isTypedef=decl.find("typedef")!=-1;
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
-  					  g_current->section = Entry::CLASS_SEC;
-					  addType();
-                                          uint64 spec = g_current->spec;
-					  if (g_insidePHP && g_current->spec&Entry::Abstract)
+  					  yyextra->current->section = Entry::CLASS_SEC;
+					  addType(yyscanner);
+                                          uint64 spec = yyextra->current->spec;
+					  if (yyextra->insidePHP && yyextra->current->spec&Entry::Abstract)
 					  {
 					    // convert Abstract to AbstractClass
-					    g_current->spec=(g_current->spec&~Entry::Abstract)|Entry::AbstractClass;
+					    yyextra->current->spec=(yyextra->current->spec&~Entry::Abstract)|Entry::AbstractClass;
 					  }
-                                          if (g_insideSlice && spec&Entry::Local)
+                                          if (yyextra->insideSlice && spec&Entry::Local)
                                           {
-                                            g_current->spec|=Entry::Local;
+                                            yyextra->current->spec|=Entry::Local;
                                           }
                                           if (isConst)
                                           {
-                                            g_current->type += " const";
+                                            yyextra->current->type += " const";
                                           }
                                           else if (isVolatile)
                                           {
-                                            g_current->type += " volatile";
+                                            yyextra->current->type += " volatile";
                                           }
-					  g_current->type += " class" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
+					  yyextra->current->type += " class" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
 					  if (yytext[0]=='@')
 					  {
-					    g_language = g_current->lang = SrcLangExt_ObjC;
-					    g_insideObjC = TRUE;
+					    yyextra->language = yyextra->current->lang = SrcLangExt_ObjC;
+					    yyextra->insideObjC = TRUE;
 					  }
-					  lineCount() ;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
 					}
 <FindMembers>{B}*"value class{" |         // C++/CLI extension
 <FindMembers>{B}*"value class"{BN}+     {
-  					  g_isTypedef=FALSE;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec = Entry::Value;
-					  addType();
-					  g_current->type += " value class" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+  					  yyextra->isTypedef=FALSE;
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec = Entry::Value;
+					  addType(yyscanner);
+					  yyextra->current->type += " value class" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"ref class{" |          // C++/CLI extension
 <FindMembers>{B}*"ref class"{BN}+       {
-  					  g_isTypedef=FALSE;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec = Entry::Ref;
-					  addType();
-					  g_current->type += " ref class" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+  					  yyextra->isTypedef=FALSE;
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec = Entry::Ref;
+					  addType(yyscanner);
+					  yyextra->current->type += " ref class" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"interface class{" |     // C++/CLI extension
 <FindMembers>{B}*"interface class"{BN}+ {
-  					  g_isTypedef=FALSE;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec = Entry::Interface;
-					  addType();
-					  g_current->type += " interface class" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+  					  yyextra->isTypedef=FALSE;
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec = Entry::Interface;
+					  addType(yyscanner);
+					  yyextra->current->type += " interface class" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"coclass"{BN}+		{
-  					  if (g_insideIDL)
-					  {
-					    g_isTypedef=FALSE;
-					    g_current->section = Entry::CLASS_SEC;
-					    addType();
-					    g_current->type += " coclass" ;
-					    g_current->fileName  = g_yyFileName;
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->bodyLine  = g_yyLineNr;
-					    lineCount() ;
+  					  if (yyextra->insideIDL)
+					  {
+					    yyextra->isTypedef=FALSE;
+					    yyextra->current->section = Entry::CLASS_SEC;
+					    addType(yyscanner);
+					    yyextra->current->type += " coclass" ;
+					    yyextra->current->fileName  = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->bodyLine  = yyextra->yyLineNr;
+					    lineCount(yyscanner) ;
 					    BEGIN( CompoundName ) ;
 					  }
 					  else
 					  {
-  					    addType();
-					    g_current->name = yytext;
-					    g_current->name = g_current->name.stripWhiteSpace();
-					    lineCount();
+  					    addType(yyscanner);
+					    yyextra->current->name = yytext;
+					    yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+					    lineCount(yyscanner);
 					  }
   					}
 <FindMembers>{B}*{TYPEDEFPREFIX}"struct{" | 
 <FindMembers>{B}*{TYPEDEFPREFIX}"struct"/{BN}+ { 
                                           QCString decl = yytext;
-					  g_isTypedef=decl.find("typedef")!=-1;
+					  yyextra->isTypedef=decl.find("typedef")!=-1;
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
-                                          uint64 spec = g_current->spec;
-  					  g_current->section = Entry::CLASS_SEC ;
+                                          uint64 spec = yyextra->current->spec;
+  					  yyextra->current->section = Entry::CLASS_SEC ;
                                           // preserve UNO IDL & Inline attributes, Slice local
-					  g_current->spec    = Entry::Struct |
-					    (g_current->spec & Entry::Published) |
-                                            (g_current->spec & Entry::Inline) |
-                                            (g_current->spec & Entry::Local); 
-					  // bug 582676: can be a struct nested in an interface so keep g_insideObjC state
-					  //g_current->objc    = g_insideObjC = FALSE;
-					  addType();
+					  yyextra->current->spec    = Entry::Struct |
+					    (yyextra->current->spec & Entry::Published) |
+                                            (yyextra->current->spec & Entry::Inline) |
+                                            (yyextra->current->spec & Entry::Local); 
+					  // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state
+					  //yyextra->current->objc    = yyextra->insideObjC = FALSE;
+					  addType(yyscanner);
                                           if (isConst)
                                           {
-                                            g_current->type += " const";
+                                            yyextra->current->type += " const";
                                           }
                                           else if (isVolatile)
                                           {
-                                            g_current->type += " volatile";
+                                            yyextra->current->type += " volatile";
                                           }
-					  g_current->type += " struct" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+					  yyextra->current->type += " struct" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
 					}
 <FindMembers>{B}*"value struct{" |      // C++/CLI extension
 <FindMembers>{B}*"value struct"{BN}+     {
-  					  g_isTypedef=FALSE;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec    = Entry::Struct | Entry::Value;
-					  addType();
-					  g_current->type += " value struct" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+  					  yyextra->isTypedef=FALSE;
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec    = Entry::Struct | Entry::Value;
+					  addType(yyscanner);
+					  yyextra->current->type += " value struct" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"ref struct{" |       // C++/CLI extension
 <FindMembers>{B}*"ref struct"{BN}+     {
-  					  g_isTypedef=FALSE;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec    = Entry::Struct | Entry::Ref;
-					  addType();
-					  g_current->type += " ref struct" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+  					  yyextra->isTypedef=FALSE;
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec    = Entry::Struct | Entry::Ref;
+					  addType(yyscanner);
+					  yyextra->current->type += " ref struct" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*"interface struct{" |     // C++/CLI extension
 <FindMembers>{B}*"interface struct"{BN}+ {
-  					  g_isTypedef=FALSE;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec    = Entry::Struct | Entry::Interface;
-					  addType();
-					  g_current->type += " interface struct";
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+  					  yyextra->isTypedef=FALSE;
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec    = Entry::Struct | Entry::Interface;
+					  addType(yyscanner);
+					  yyextra->current->type += " interface struct";
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
   					}
 <FindMembers>{B}*{TYPEDEFPREFIX}"union{" |
 <FindMembers>{B}*{TYPEDEFPREFIX}"union"{BN}+ { 
                                           QCString decl=yytext;
-					  g_isTypedef=decl.find("typedef")!=-1;
+					  yyextra->isTypedef=decl.find("typedef")!=-1;
                                           bool isConst=decl.find("const")!=-1;
                                           bool isVolatile=decl.find("volatile")!=-1;
-  					  g_current->section = Entry::CLASS_SEC;
-                                          g_current->spec    = Entry::Union;
-					  // bug 582676: can be a struct nested in an interface so keep g_insideObjC state
-					  //g_current->objc    = g_insideObjC = FALSE;
-					  addType();
+  					  yyextra->current->section = Entry::CLASS_SEC;
+                                          yyextra->current->spec    = Entry::Union;
+					  // bug 582676: can be a struct nested in an interface so keep yyextra->insideObjC state
+					  //yyextra->current->objc    = yyextra->insideObjC = FALSE;
+					  addType(yyscanner);
                                           if (isConst)
                                           {
-                                            g_current->type += " const";
+                                            yyextra->current->type += " const";
                                           }
                                           else if (isVolatile)
                                           {
-                                            g_current->type += " volatile";
+                                            yyextra->current->type += " volatile";
                                           }
-					  g_current->type += " union" ;
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+					  yyextra->current->type += " union" ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
 					}
 <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?"{" |
 <FindMembers>{B}*{TYPEDEFPREFIX}{IDLATTR}?"enum"({BN}+("class"|"struct"))?{BN}+ { // for IDL: typedef [something] enum
                                           QCString text=yytext;
-					  g_isTypedef    = text.find("typedef")!=-1;
-                                          bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1 || g_insideCS;
-					  if (g_insideJava)
+					  yyextra->isTypedef    = text.find("typedef")!=-1;
+                                          bool isStrongEnum = text.find("struct")!=-1 || text.find("class")!=-1 || yyextra->insideCS;
+					  if (yyextra->insideJava)
 					  {
-					    g_current->section = Entry::CLASS_SEC;
-					    g_current->spec    = Entry::Enum;
+					    yyextra->current->section = Entry::CLASS_SEC;
+					    yyextra->current->spec    = Entry::Enum;
 					  }
 					  else
 					  {
-  					    g_current->section = Entry::ENUM_SEC ;
+  					    yyextra->current->section = Entry::ENUM_SEC ;
 					  }
-					  addType();
-					  g_current->type += " enum";
+					  addType(yyscanner);
+					  yyextra->current->type += " enum";
                                           if (isStrongEnum)
                                           {
-                                            g_current->spec |= Entry::Strong;
+                                            yyextra->current->spec |= Entry::Strong;
                                           }
-					  g_current->fileName  = g_yyFileName;
-					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->bodyLine  = g_yyLineNr;
-					  lineCount() ;
+					  yyextra->current->fileName  = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->bodyLine  = yyextra->yyLineNr;
+					  lineCount(yyscanner) ;
 					  if (yytext[yyleng-1]=='{') unput('{');
 					  BEGIN( CompoundName ) ;
 					}
 <Operator>"("{BN}*")"({BN}*"<"[^>]*">"){BN}*/"("  {  // A::operator()<int>(int arg)
-  					  lineCount();
-					  g_current->name += "()";
+  					  lineCount(yyscanner);
+					  yyextra->current->name += "()";
 					  BEGIN( FindMembers );
 					}
 <Operator>"("{BN}*")"{BN}*/"("		{
-  					  lineCount();
-    					  g_current->name += yytext ;
-					  g_current->name = g_current->name.simplifyWhiteSpace();
+  					  lineCount(yyscanner);
+    					  yyextra->current->name += yytext ;
+					  yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
 					  BEGIN( FindMembers ) ;
   					}
 <Operator>";"				{ // can occur when importing members
@@ -1871,85 +1571,85 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( FindMembers ) ;
   					}
 <Operator>[^(]				{ 
-    					  lineCount();
-    					  g_current->name += *yytext ;
+    					  lineCount(yyscanner);
+    					  yyextra->current->name += *yytext ;
 					}
 <Operator>"<>"				{ /* skip guided templ specifiers */ }
 <Operator>"("				{
-					  g_current->name = g_current->name.simplifyWhiteSpace();
+					  yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
 					  unput(*yytext);
 					  BEGIN( FindMembers ) ;
 					}
 <FindMembers>("template"|"generic")({BN}*)"<"/[>]?	{  // generic is a C++/CLI extension
-  					  lineCount();
+  					  lineCount(yyscanner);
 					  ArgumentList al;
-					  //g_current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
-					  g_current->tArgLists.push_back(al);
-					  g_currentArgumentList = &g_current->tArgLists.back();
-					  g_templateStr="<";
-					  g_fullArgString = g_templateStr;
-					  g_copyArgString = &g_templateStr;
-					  g_currentArgumentContext = FindMembers;
+					  //yyextra->current->spec |= (yytext[0]=='g') ? Entry::Generic : Entry::Template;
+					  yyextra->current->tArgLists.push_back(al);
+					  yyextra->currentArgumentList = &yyextra->current->tArgLists.back();
+					  yyextra->templateStr="<";
+					  yyextra->fullArgString = yyextra->templateStr;
+					  yyextra->copyArgString = &yyextra->templateStr;
+					  yyextra->currentArgumentContext = FindMembers;
 					  BEGIN( ReadTempArgs );
   					}
 <FindMembers>"namespace"{BN}+/{ID}{BN}*"=" { // namespace alias
-                                          lineCount(); 
+                                          lineCount(yyscanner); 
   					  BEGIN( NSAliasName );
 					}
 <NSAliasName>{ID}			{
-  					  g_aliasName = yytext;
+  					  yyextra->aliasName = yytext;
 					  BEGIN( NSAliasArg );
   					}
 <NSAliasArg>({ID}"::")*{ID}		{
-  					  //printf("Inserting namespace alias %s::%s->%s\n",g_current_root->name.data(),g_aliasName.data(),yytext);
-					  //if (g_current_root->name.isEmpty())
+  					  //printf("Inserting namespace alias %s::%s->%s\n",yyextra->current_root->name.data(),yyextra->aliasName.data(),yytext);
+					  //if (yyextra->current_root->name.isEmpty())
 					  //{
                                           // TODO: namespace aliases are now treated as global entities
                                           // while they should be aware of the scope they are in
-                                            Doxygen::namespaceAliasDict.insert(g_aliasName,new QCString(yytext));
+                                            Doxygen::namespaceAliasDict.insert(yyextra->aliasName,new QCString(yytext));
 					  //}
 					  //else
 					  //{
-                                          //  Doxygen::namespaceAliasDict.insert(g_current_root->name+"::"+g_aliasName,
-					  //	new QCString(g_current_root->name+"::"+yytext));
+                                          //  Doxygen::namespaceAliasDict.insert(yyextra->current_root->name+"::"+yyextra->aliasName,
+					  //	new QCString(yyextra->current_root->name+"::"+yytext));
 					  //}
   					}
 <NSAliasArg>";"				{
   					  BEGIN( FindMembers );
   					}
 <PHPUse>({ID}{BN}*"\\"{BN}*)*{ID}/{BN}+"as"  {
-  					  lineCount();
-					  g_aliasName=yytext;
+  					  lineCount(yyscanner);
+					  yyextra->aliasName=yytext;
 					  BEGIN(PHPUseAs);
 					}
 <PHPUse>({ID}{BN}*"\\"{BN}*)*{ID}	{
-  					  lineCount();
-					  g_current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
-  					  //printf("PHP: adding use relation: %s\n",g_current->name.data());
-                                          g_current->fileName = g_yyFileName; 
+  					  lineCount(yyscanner);
+					  yyextra->current->name=removeRedundantWhiteSpace(substitute(yytext,"\\","::"));
+  					  //printf("PHP: adding use relation: %s\n",yyextra->current->name.data());
+                                          yyextra->current->fileName = yyextra->yyFileName; 
                                           // add a using declaration
-  					  g_current->section=Entry::USINGDECL_SEC;
-					  g_current_root->copyToSubEntry(g_current);
+  					  yyextra->current->section=Entry::USINGDECL_SEC;
+					  yyextra->current_root->copyToSubEntry(yyextra->current);
                                           // also add it as a using directive
-					  g_current->section=Entry::USINGDIR_SEC;
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
-					  g_aliasName.resize(0);
+					  yyextra->current->section=Entry::USINGDIR_SEC;
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
+					  yyextra->aliasName.resize(0);
 					}
 <PHPUseAs>{BN}+"as"{BN}+		{
-  					  lineCount();
+  					  lineCount(yyscanner);
   					}
 <PHPUseAs>{PHPUSEKW}                    {
                                         }
 <PHPUseAs>{ID}				{
-  					  //printf("PHP: adding use as relation: %s->%s\n",yytext,g_aliasName.data());
-                                          if (!g_aliasName.isEmpty())
+  					  //printf("PHP: adding use as relation: %s->%s\n",yytext,yyextra->aliasName.data());
+                                          if (!yyextra->aliasName.isEmpty())
                                           {
                                             Doxygen::namespaceAliasDict.insert(yytext,
 					         new QCString(removeRedundantWhiteSpace(
-					  	   substitute(g_aliasName,"\\","::"))));
+					  	   substitute(yyextra->aliasName,"\\","::"))));
                                           }
-					  g_aliasName.resize(0);
+					  yyextra->aliasName.resize(0);
   					}
 <PHPUse,PHPUseAs>[,;]			{
 					  if (*yytext==',')
@@ -1962,62 +1662,62 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <JavaImport>({ID}{BN}*"."{BN}*)+"*"	{ // package import => add as a using directive
-  					  lineCount();
+  					  lineCount(yyscanner);
   					  QCString scope=yytext;
-					  g_current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
-                                          g_current->fileName = g_yyFileName; 
-  					  g_current->section=Entry::USINGDIR_SEC;
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
+					  yyextra->current->name=removeRedundantWhiteSpace(substitute(scope.left(scope.length()-1),".","::"));
+                                          yyextra->current->fileName = yyextra->yyFileName; 
+  					  yyextra->current->section=Entry::USINGDIR_SEC;
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
 					  BEGIN(Using);
   					}
 <JavaImport>({ID}{BN}*"."{BN}*)+{ID}	{ // class import => add as a using declaration
-                                          lineCount();
+                                          lineCount(yyscanner);
   					  QCString scope=yytext;
-					  g_current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
-					  g_current->fileName = g_yyFileName; 
-					  if (g_insideD) 
+					  yyextra->current->name=removeRedundantWhiteSpace(substitute(scope,".","::"));
+					  yyextra->current->fileName = yyextra->yyFileName; 
+					  if (yyextra->insideD) 
 					  {
-					    g_current->section=Entry::USINGDIR_SEC;
+					    yyextra->current->section=Entry::USINGDIR_SEC;
 					  }
 					  else
 					  {
-					    //printf("import name = %s -> %s\n",yytext,g_current->name.data());
-					    g_current->section=Entry::USINGDECL_SEC;
+					    //printf("import name = %s -> %s\n",yytext,yyextra->current->name.data());
+					    yyextra->current->section=Entry::USINGDECL_SEC;
 					  }
-                                          g_previous = g_current.get();
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
+                                          yyextra->previous = yyextra->current.get();
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
 					  BEGIN(Using);
   					}
 <FindMembers>"using"{BN}+		{ 
-					  g_current->startLine=g_yyLineNr; 
-					  g_current->startColumn = g_yyColNr;
-                                          lineCount(); 
+					  yyextra->current->startLine=yyextra->yyLineNr; 
+					  yyextra->current->startColumn = yyextra->yyColNr;
+                                          lineCount(yyscanner); 
                                           BEGIN(Using); 
                                         }
-<Using>"namespace"{BN}+			{ lineCount(); BEGIN(UsingDirective); }
+<Using>"namespace"{BN}+			{ lineCount(yyscanner); BEGIN(UsingDirective); }
 <Using>({ID}{BN}*("::"|"."){BN}*)*({ID}|{OPERATOR}) {
-                                          lineCount();
-  					  g_current->name=yytext;
-                                          g_current->fileName = g_yyFileName; 
-  					  g_current->section=Entry::USINGDECL_SEC;
-                                          g_current->startLine = g_yyLineNr;
-                                          g_previous = g_current.get();
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
-					  if (g_insideCS) /* Hack: in C# a using declaration and 
+                                          lineCount(yyscanner);
+  					  yyextra->current->name=yytext;
+                                          yyextra->current->fileName = yyextra->yyFileName; 
+  					  yyextra->current->section=Entry::USINGDECL_SEC;
+                                          yyextra->current->startLine = yyextra->yyLineNr;
+                                          yyextra->previous = yyextra->current.get();
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
+					  if (yyextra->insideCS) /* Hack: in C# a using declaration and 
 							   directive have the same syntax, so we
 							   also add it as a using directive here
 							 */
 					  {
-					    g_current->name=yytext;
-					    g_current->fileName = g_yyFileName; 
-					    g_current->startLine = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    g_current->section=Entry::USINGDIR_SEC;
-					    g_current_root->moveToSubEntryAndRefresh(g_current);
-					    initEntry();
+					    yyextra->current->name=yytext;
+					    yyextra->current->fileName = yyextra->yyFileName; 
+					    yyextra->current->startLine = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->current->section=Entry::USINGDIR_SEC;
+					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					    initEntry(yyscanner);
 					  }
 					  BEGIN(Using);
   					}
@@ -2025,119 +1725,119 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(UsingAlias);
                                         }
 <UsingAlias>";"                         { 
-                                          g_previous->section=Entry::VARIABLE_SEC;
-                                          g_previous->type = "typedef "+g_previous->args;
-					  g_previous->type=g_previous->type.simplifyWhiteSpace();
-                                          g_previous->args.resize(0);
-					  g_previous->name=g_previous->name.stripWhiteSpace();
-					  g_previous->bodyLine = g_yyLineNr;
-                                          g_previous->spec |= Entry::Alias;
+                                          yyextra->previous->section=Entry::VARIABLE_SEC;
+                                          yyextra->previous->type = "typedef "+yyextra->previous->args;
+					  yyextra->previous->type=yyextra->previous->type.simplifyWhiteSpace();
+                                          yyextra->previous->args.resize(0);
+					  yyextra->previous->name=yyextra->previous->name.stripWhiteSpace();
+					  yyextra->previous->bodyLine = yyextra->yyLineNr;
+                                          yyextra->previous->spec |= Entry::Alias;
                                           BEGIN(FindMembers); 
                                         }
 <UsingAlias>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  g_docBlockContext   = UsingAliasEnd;
-					  g_docBlockInBody    = FALSE;
-					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  yyextra->docBlockContext   = UsingAliasEnd;
+					  yyextra->docBlockInBody    = FALSE;
+					  yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
-  					  lineCount();
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
+  					  lineCount(yyscanner);
 
-					  g_docBlockTerm = ';';
+					  yyextra->docBlockTerm = ';';
 					  if (yytext[yyleng-3]=='/')
 					  {
-					    startCommentBlock(TRUE);
+					    startCommentBlock(yyscanner,TRUE);
 					    BEGIN( DocLine );
 					  }
 					  else
 					  {
-					    startCommentBlock(FALSE);
+					    startCommentBlock(yyscanner,FALSE);
 					    BEGIN( DocBlock );
 					  }
   					}
 <UsingAlias>">>"                        {
-                                          g_previous->args+="> >"; // see bug769552
+                                          yyextra->previous->args+="> >"; // see bug769552
                                         }
 <UsingAlias>.                           {
-                                          g_previous->args+=yytext;
+                                          yyextra->previous->args+=yytext;
                                         }
 <UsingAlias>\n                          {
-                                          g_previous->args+=yytext;
-                                          lineCount();
+                                          yyextra->previous->args+=yytext;
+                                          lineCount(yyscanner);
                                         }
 <UsingAliasEnd>";"                      {
-                                          g_previous->doc   = g_current->doc;
-                                          g_previous->brief = g_current->brief;
-                                          g_current->doc.resize(0);
-                                          g_current->brief.resize(0);
+                                          yyextra->previous->doc   = yyextra->current->doc;
+                                          yyextra->previous->brief = yyextra->current->brief;
+                                          yyextra->current->doc.resize(0);
+                                          yyextra->current->brief.resize(0);
                                           unput(';');
                                           BEGIN(UsingAlias);
                                         }
-<UsingDirective>{SCOPENAME}		{ g_current->name=removeRedundantWhiteSpace(yytext);
-                                          g_current->fileName = g_yyFileName; 
-  					  g_current->section=Entry::USINGDIR_SEC;
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
+<UsingDirective>{SCOPENAME}		{ yyextra->current->name=removeRedundantWhiteSpace(yytext);
+                                          yyextra->current->fileName = yyextra->yyFileName; 
+  					  yyextra->current->section=Entry::USINGDIR_SEC;
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
 					  BEGIN(Using);
   					}
 <Using>";"				{ BEGIN(FindMembers); }
 <FindMembers>{SCOPENAME}{BN}*"<>"	{ // guided template decl
 					  QCString n=yytext;
-					  addType();
-					  g_current->name=n.left(n.length()-2);
+					  addType(yyscanner);
+					  yyextra->current->name=n.left(n.length()-2);
 					}
 <FindMembers>{SCOPENAME}{BN}*/"<"	{ // Note: this could be a return type!
-                                          g_roundCount=0;
-  					  g_sharpCount=0;
-					  lineCount();
-					  addType();
-  					  g_current->name=yytext;
-					  g_current->name=g_current->name.stripWhiteSpace();
-					  //g_current->scopeSpec.resize(0);
-					  // g_currentTemplateSpec = &g_current->scopeSpec;
-					  if (nameIsOperator(g_current->name))
+                                          yyextra->roundCount=0;
+  					  yyextra->sharpCount=0;
+					  lineCount(yyscanner);
+					  addType(yyscanner);
+  					  yyextra->current->name=yytext;
+					  yyextra->current->name=yyextra->current->name.stripWhiteSpace();
+					  //yyextra->current->scopeSpec.resize(0);
+					  // yyextra->currentTemplateSpec = &yyextra->current->scopeSpec;
+					  if (nameIsOperator(yyextra->current->name))
 					    BEGIN( Operator );
 					  else
 					    BEGIN( EndTemplate );
 					}
 <FindMemberName>{SCOPENAME}{BN}*/"<"	{
-  					  g_sharpCount=0;
-					  g_roundCount=0;
-					  lineCount();
-  					  g_current->name+=((QCString)yytext).stripWhiteSpace();
-					  //g_current->memberSpec.resize(0);
-					  // g_currentTemplateSpec = &g_current->memberSpec;
-					  if (nameIsOperator(g_current->name))
+  					  yyextra->sharpCount=0;
+					  yyextra->roundCount=0;
+					  lineCount(yyscanner);
+  					  yyextra->current->name+=((QCString)yytext).stripWhiteSpace();
+					  //yyextra->current->memberSpec.resize(0);
+					  // yyextra->currentTemplateSpec = &yyextra->current->memberSpec;
+					  if (nameIsOperator(yyextra->current->name))
 					    BEGIN( Operator );
 					  else
 					    BEGIN( EndTemplate );
   					}
 <EndTemplate>"<<<"	                {
-  					  if (!g_insidePHP) 
+  					  if (!yyextra->insidePHP) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            g_lastHereDocContext = YY_START;
+                                            yyextra->lastHereDocContext = YY_START;
 					    BEGIN(HereDoc);
 					  }
   					}
 <ClassTemplSpec,EndTemplate>"<<"	{
-  					  g_current->name+=yytext;
-  					  // *g_currentTemplateSpec+=yytext; 
+  					  yyextra->current->name+=yytext;
+  					  // *yyextra->currentTemplateSpec+=yytext; 
   					}
 <EndTemplate>"<"			{ 
-                                          if (g_roundCount==0)
+                                          if (yyextra->roundCount==0)
                                           {
-  					    // *g_currentTemplateSpec+='<'; 
-					    g_sharpCount++; 
+  					    // *yyextra->currentTemplateSpec+='<'; 
+					    yyextra->sharpCount++; 
                                           }
-  					  g_current->name+=yytext;
+  					  yyextra->current->name+=yytext;
 					}
 <ClassTemplSpec,EndTemplate>">>"	{
-  					  if (g_insideJava || g_insideCS || g_insideCli || g_roundCount==0)
+  					  if (yyextra->insideJava || yyextra->insideCS || yyextra->insideCli || yyextra->roundCount==0)
 					  {
 					    unput('>');
 					    unput(' ');
@@ -2145,117 +1845,117 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-  					    g_current->name+=yytext;
+  					    yyextra->current->name+=yytext;
 					  }
-  					  // *g_currentTemplateSpec+=yytext; 
+  					  // *yyextra->currentTemplateSpec+=yytext; 
   					}
 <EndTemplate>">"			{
-  					  g_current->name+='>';
-					  // *g_currentTemplateSpec+='>';
-					  if (g_roundCount==0 && --g_sharpCount<=0)
+  					  yyextra->current->name+='>';
+					  // *yyextra->currentTemplateSpec+='>';
+					  if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
 					  {  
-					    //printf("Found %s\n",g_current->name.data());
+					    //printf("Found %s\n",yyextra->current->name.data());
 					    BEGIN(FindMembers);
 					  }
 					}
 <EndTemplate>">"{BN}*"("		{ 
-  					  lineCount();
-  					  g_current->name+='>';
-					  // *g_currentTemplateSpec+='>';
-					  if (g_roundCount==0 && --g_sharpCount<=0)
-					  {
-					    g_current->bodyLine = g_yyLineNr;
-					    g_current->args = "(";
-					    g_currentArgumentContext = FuncQual;
-					    g_fullArgString = g_current->args.copy();
-					    g_copyArgString = &g_current->args;
-					    //printf("Found %s\n",g_current->name.data());
+  					  lineCount(yyscanner);
+  					  yyextra->current->name+='>';
+					  // *yyextra->currentTemplateSpec+='>';
+					  if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
+					  {
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+					    yyextra->current->args = "(";
+					    yyextra->currentArgumentContext = FuncQual;
+					    yyextra->fullArgString = yyextra->current->args.copy();
+					    yyextra->copyArgString = &yyextra->current->args;
+					    //printf("Found %s\n",yyextra->current->name.data());
 					    BEGIN( ReadFuncArgType ) ;
 					  }
 					}
 <EndTemplate>">"{BN}*/"("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+ { // function pointer returning a template instance
-  					  lineCount();
-  					  g_current->name+='>';
-                                          if (g_roundCount==0)
+  					  lineCount(yyscanner);
+  					  yyextra->current->name+='>';
+                                          if (yyextra->roundCount==0)
                                           {
 					    BEGIN(FindMembers);
                                           }
   					}
 <EndTemplate>">"{BN}*/"::"		{
-  					  lineCount();
-  					  g_current->name+='>';
-  					  // *g_currentTemplateSpec+='>';
-					  if (g_roundCount==0 && --g_sharpCount<=0)
+  					  lineCount(yyscanner);
+  					  yyextra->current->name+='>';
+  					  // *yyextra->currentTemplateSpec+='>';
+					  if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
 					  {
 					    BEGIN(FindMemberName);
 					  }
   					}
-<ClassTemplSpec,EndTemplate>"("         { g_current->name+=*yytext;
-                                          g_roundCount++; 
+<ClassTemplSpec,EndTemplate>"("         { yyextra->current->name+=*yytext;
+                                          yyextra->roundCount++; 
                                         }
-<ClassTemplSpec,EndTemplate>")"         { g_current->name+=*yytext;
-                                          if (g_roundCount>0) g_roundCount--; 
+<ClassTemplSpec,EndTemplate>")"         { yyextra->current->name+=*yytext;
+                                          if (yyextra->roundCount>0) yyextra->roundCount--; 
                                         }
 <EndTemplate>.				{ 
-  					  g_current->name+=*yytext;
-  					  // *g_currentTemplateSpec+=*yytext; 
+  					  yyextra->current->name+=*yytext;
+  					  // *yyextra->currentTemplateSpec+=*yytext; 
 					}
 <FindMembers>"define"{BN}*"("{BN}*["']	{
-					  if (g_insidePHP)
+					  if (yyextra->insidePHP)
 					  {
-					    g_current->bodyLine = g_yyLineNr;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
 					    BEGIN( DefinePHP );
 					  }
 					  else
 					    REJECT;
 					}
 <CopyHereDoc>{ID}                       { // PHP heredoc
-  					  g_delimiter = yytext;
-                                          *g_pCopyHereDocGString += yytext;
+  					  yyextra->delimiter = yytext;
+                                          *yyextra->pCopyHereDocGString += yytext;
 					  BEGIN(CopyHereDocEnd);
                                         }
 <CopyHereDoc>"'"{ID}/"'"		{ // PHP nowdoc
-  					  g_delimiter = &yytext[1];
-                                          *g_pCopyHereDocGString += yytext;
+  					  yyextra->delimiter = &yytext[1];
+                                          *yyextra->pCopyHereDocGString += yytext;
 					  BEGIN(CopyHereDocEnd);
                                         }
 <HereDoc>{ID}				{ // PHP heredoc
-  					  g_delimiter = yytext;
+  					  yyextra->delimiter = yytext;
 					  BEGIN(HereDocEnd);
   					}
 <HereDoc>"'"{ID}/"'"			{ // PHP nowdoc
-  					  g_delimiter = &yytext[1];
+  					  yyextra->delimiter = &yytext[1];
 					  BEGIN(HereDocEnd);
   					}
 <HereDocEnd>^{ID}			{ // id at start of the line could mark the end of the block
-  					  if (g_delimiter==yytext) // it is the end marker
+  					  if (yyextra->delimiter==yytext) // it is the end marker
 					  {
-  					    BEGIN(g_lastHereDocContext);
+  					    BEGIN(yyextra->lastHereDocContext);
 					  }
   					}
 <HereDocEnd>.				{ }
 <CopyHereDocEnd>^{ID}			{ // id at start of the line could mark the end of the block
-                                          *g_pCopyHereDocGString += yytext;
-  					  if (g_delimiter==yytext) // it is the end marker
+                                          *yyextra->pCopyHereDocGString += yytext;
+  					  if (yyextra->delimiter==yytext) // it is the end marker
 					  {
-  					    BEGIN(g_lastHereDocContext);
+  					    BEGIN(yyextra->lastHereDocContext);
 					  }
   					}
 <CopyHereDocEnd>\n			{ 
-                                          *g_pCopyHereDocGString += yytext;
+                                          *yyextra->pCopyHereDocGString += yytext;
                                         }
 <CopyHereDocEnd>{ID}			{ 
-                                          *g_pCopyHereDocGString += yytext;
+                                          *yyextra->pCopyHereDocGString += yytext;
                                         }
 <CopyHereDocEnd>.			{ 
-                                          *g_pCopyHereDocGString += yytext;
+                                          *yyextra->pCopyHereDocGString += yytext;
                                         }
 <FindMembers>"Q_OBJECT"			{ // Qt object macro
   					}
 <FindMembers>"Q_PROPERTY"		{ // Qt property declaration
-					  g_current->protection = Public ; // see bug734245 & bug735462
-  					  g_current->mtype = g_mtype = Property;
-					  g_current->type.resize(0);
+					  yyextra->current->protection = Public ; // see bug734245 & bug735462
+  					  yyextra->current->mtype = yyextra->mtype = Property;
+					  yyextra->current->type.resize(0);
   					  BEGIN(QtPropType);
   					}
 <QtPropType>"("				{ // start of property arguments
@@ -2265,25 +1965,25 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(FindMembers);
   					}
 <QtPropType>"const"|"volatile"|"unsigned"|"signed"|"long"|"short" {
-  				          g_current->type+=yytext;
+  				          yyextra->current->type+=yytext;
   					}
 <QtPropType>{B}+			{
-  				          g_current->type+=yytext;
+  				          yyextra->current->type+=yytext;
   					}
 <QtPropType>({TSCOPE}"::")*{TSCOPE}	{
-  					  g_current->type+=yytext;
+  					  yyextra->current->type+=yytext;
                                           BEGIN(QtPropName);
   					}
 <QtPropName>{ID}			{
-  					  g_current->name=yytext;
+  					  yyextra->current->name=yytext;
   					  BEGIN(QtPropAttr);
   					}
 <QtPropAttr>"READ"			{
-  					  g_current->spec |= Entry::Readable;
+  					  yyextra->current->spec |= Entry::Readable;
 					  BEGIN(QtPropRead);
   					}
 <QtPropAttr>"WRITE"			{
-  					  g_current->spec |= Entry::Writable;
+  					  yyextra->current->spec |= Entry::Writable;
 					  BEGIN(QtPropWrite);
   					}
 <QtPropAttr>"RESET"{B}+{ID}		{ // reset method => not supported yet
@@ -2293,163 +1993,163 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <QtPropAttr>"DESIGNABLE"{B}+{ID}	{ // designable property => not supported yet
   					}
 <QtPropRead>{ID}			{
-  					  g_current->read = yytext;
+  					  yyextra->current->read = yytext;
   					  BEGIN(QtPropAttr);
   					}
 <QtPropWrite>{ID}			{
-  					  g_current->write = yytext;
+  					  yyextra->current->write = yytext;
 					  BEGIN(QtPropAttr);
   					}
 <FindMembers>"friend"{BN}+("class"|"union"|"struct"){BN}+ {
-  					  g_current->name=yytext;
+  					  yyextra->current->name=yytext;
 				          BEGIN(FindMembers);
 			 	        }
 <FindMembers,FindMemberName>{SCOPENAME}	{
-                                          if (g_insideCpp || g_insideObjC) 
+                                          if (yyextra->insideCpp || yyextra->insideObjC) 
                                           {
-                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
+                                            yyextra->current->id = ClangParser::instance()->lookup(yyextra->yyLineNr,yytext);
                                           }
-					  g_yyBegColNr=g_yyColNr;
-					  g_yyBegLineNr=g_yyLineNr;
-					  lineCount();
-                                          if (g_insideIDL && yyleng==9 && qstrcmp(yytext,"cpp_quote")==0)
+					  yyextra->yyBegColNr=yyextra->yyColNr;
+					  yyextra->yyBegLineNr=yyextra->yyLineNr;
+					  lineCount(yyscanner);
+                                          if (yyextra->insideIDL && yyleng==9 && qstrcmp(yytext,"cpp_quote")==0)
 					  {
 					    BEGIN(CppQuote);
 					  }
-					  else if ((g_insideIDL || g_insideJava || g_insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
+					  else if ((yyextra->insideIDL || yyextra->insideJava || yyextra->insideD) && yyleng==6 && qstrcmp(yytext,"import")==0)
 					  {
-					    if (g_insideIDL)
+					    if (yyextra->insideIDL)
 					      BEGIN(NextSemi);
-					    else // g_insideJava or g_insideD
+					    else // yyextra->insideJava or yyextra->insideD
 					      BEGIN(JavaImport);
 					  }
-					  else if (g_insidePHP && qstrcmp(yytext,"use")==0)
+					  else if (yyextra->insidePHP && qstrcmp(yytext,"use")==0)
 					  {
 					    BEGIN(PHPUse);
 					  }
-					  else if (g_insideJava && qstrcmp(yytext,"package")==0)
+					  else if (yyextra->insideJava && qstrcmp(yytext,"package")==0)
 					  {
-  					    lineCount();
+  					    lineCount(yyscanner);
 					    BEGIN(PackageName);
 					  }
-					  else if (g_insideIDL && qstrcmp(yytext,"case")==0)
+					  else if (yyextra->insideIDL && qstrcmp(yytext,"case")==0)
 					  {
 					    BEGIN(IDLUnionCase);
 					  }
-					  else if (g_insideTryBlock && qstrcmp(yytext,"catch")==0)
+					  else if (yyextra->insideTryBlock && qstrcmp(yytext,"catch")==0)
 					  {
-					    g_insideTryBlock=FALSE;
+					    yyextra->insideTryBlock=FALSE;
 					    BEGIN(TryFunctionBlock);
 					  }
-                                          else if (g_insideCpp && qstrcmp(yytext,"alignas")==0)
+                                          else if (yyextra->insideCpp && qstrcmp(yytext,"alignas")==0)
                                           {
-                                            g_lastAlignAsContext = YY_START;
+                                            yyextra->lastAlignAsContext = YY_START;
                                             BEGIN(AlignAs);
                                           }
-					  else if (g_insideJS && qstrcmp(yytext,"var")==0)
+					  else if (yyextra->insideJS && qstrcmp(yytext,"var")==0)
 					  { // javascript variable
-					    g_current->type="var";
+					    yyextra->current->type="var";
 					  }
-					  else if (g_insideJS && qstrcmp(yytext,"function")==0)
+					  else if (yyextra->insideJS && qstrcmp(yytext,"function")==0)
 					  { // javascript function
-					    g_current->type="function";
+					    yyextra->current->type="function";
 					  }
-					  else if (g_insideCS && qstrcmp(yytext,"this")==0)
+					  else if (yyextra->insideCS && qstrcmp(yytext,"this")==0)
 					  {
 					    // C# indexer
-					    addType();
-					    g_current->name="this";
+					    addType(yyscanner);
+					    yyextra->current->name="this";
 					    BEGIN(CSIndexer);
 					  }
-                                          else if (g_insideCpp && qstrcmp(yytext,"static_assert")==0)
+                                          else if (yyextra->insideCpp && qstrcmp(yytext,"static_assert")==0)
                                           {
                                             // C++11 static_assert
                                             BEGIN(StaticAssert);
                                           }
-                                          else if (g_insideCpp && qstrcmp(yytext,"decltype")==0)
+                                          else if (yyextra->insideCpp && qstrcmp(yytext,"decltype")==0)
                                           {
                                             // C++11 decltype(x)
-					    g_current->type+=yytext;
+					    yyextra->current->type+=yytext;
                                             BEGIN(DeclType);
                                           }
-                                          else if (g_insideSlice && qstrcmp(yytext,"optional")==0)
+                                          else if (yyextra->insideSlice && qstrcmp(yytext,"optional")==0)
                                           {
-                                            if (g_current->type.isEmpty())
+                                            if (yyextra->current->type.isEmpty())
                                             {
-                                              g_current->type = "optional";
+                                              yyextra->current->type = "optional";
                                             }
                                             else
                                             {
-                                              g_current->type += " optional";
+                                              yyextra->current->type += " optional";
                                             }
-                                            g_lastModifierContext = YY_START;
+                                            yyextra->lastModifierContext = YY_START;
                                             BEGIN(SliceOptional);
                                           }
 					  else
 					  {
 					    if (YY_START==FindMembers)
 					    {
-					      addType();
+					      addType(yyscanner);
 					    }
-					    bool javaLike = g_insideJava || g_insideCS || g_insideD || g_insidePHP || g_insideJS;
+					    bool javaLike = yyextra->insideJava || yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideJS;
 					    if (javaLike && qstrcmp(yytext,"public")==0)
 					    {
-					      g_current->protection = Public;
+					      yyextra->current->protection = Public;
 					    }
 					    else if (javaLike && qstrcmp(yytext,"protected")==0)
 					    {
-					      g_current->protection = Protected;
+					      yyextra->current->protection = Protected;
 					    }
-					    else if ((g_insideCS || g_insideD || g_insidePHP || g_insideJS) && qstrcmp(yytext,"internal")==0)
+					    else if ((yyextra->insideCS || yyextra->insideD || yyextra->insidePHP || yyextra->insideJS) && qstrcmp(yytext,"internal")==0)
 					    {
-					      g_current->protection = Package;
+					      yyextra->current->protection = Package;
 					    }
 					    else if (javaLike && qstrcmp(yytext,"private")==0)
 					    {
-					      g_current->protection = Private;
+					      yyextra->current->protection = Private;
 					    }
 					    else if (javaLike && qstrcmp(yytext,"static")==0)
 					    {
 					      if (YY_START==FindMembers)
-					        g_current->name  = yytext;
+					        yyextra->current->name  = yytext;
 					      else
-						g_current->name += yytext;
-			 		      g_current->stat = TRUE;
+						yyextra->current->name += yytext;
+			 		      yyextra->current->stat = TRUE;
 					    }
 					    else
 					    {
 					      if (YY_START==FindMembers)
-					        g_current->name  = yytext;
+					        yyextra->current->name  = yytext;
 					      else
-						g_current->name += yytext;
-					      if (g_current->name.left(7)=="static ")
+						yyextra->current->name += yytext;
+					      if (yyextra->current->name.left(7)=="static ")
 					      {
-						g_current->stat = TRUE;
-						g_current->name= g_current->name.mid(7);
+						yyextra->current->stat = TRUE;
+						yyextra->current->name= yyextra->current->name.mid(7);
 					      }
-					      else if (g_current->name.left(7)=="inline ")
+					      else if (yyextra->current->name.left(7)=="inline ")
 					      {
-						if (g_current->type.isEmpty())
+						if (yyextra->current->type.isEmpty())
 						{
-						  g_current->type="inline";
+						  yyextra->current->type="inline";
 						}
 						else
 						{
-						  g_current->type+="inline ";
+						  yyextra->current->type+="inline ";
 						}
-						g_current->name= g_current->name.mid(7);
+						yyextra->current->name= yyextra->current->name.mid(7);
 					      }
-					      else if (g_current->name.left(6)=="const ")
+					      else if (yyextra->current->name.left(6)=="const ")
 					      {
-						if (g_current->type.isEmpty())
+						if (yyextra->current->type.isEmpty())
 						{
-						  g_current->type="const";
+						  yyextra->current->type="const";
 						}
 						else
 						{
-						  g_current->type+="const ";
+						  yyextra->current->type+="const ";
 						}
-						g_current->name=g_current->name.mid(6);
+						yyextra->current->name=yyextra->current->name.mid(6);
 					      }
 					    }
 					    QCString tmp=yytext;
@@ -2459,64 +2159,64 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             }
 					    else
                                             {
-					      g_externC=FALSE; // see bug759247
+					      yyextra->externC=FALSE; // see bug759247
 		 			      BEGIN(FindMembers);
                                             }
 					  }
 					}
 <StaticAssert>"("                       {
-					  g_lastSkipRoundContext = FindMembers;
-					  g_roundCount=0;
+					  yyextra->lastSkipRoundContext = FindMembers;
+					  yyextra->roundCount=0;
                                           BEGIN(SkipRound);
                                         }
-<StaticAssert>{BN}+                     { lineCount(); }
+<StaticAssert>{BN}+                     { lineCount(yyscanner); }
 <StaticAssert>.                         { // variable with static_assert as name?
                                           unput(*yytext);
                                           BEGIN(FindMembers);
                                         }
 <DeclType>"("                           {
-					  g_current->type+=yytext;
-  					  g_lastRoundContext=FindMembers;
-  					  g_pCopyRoundString=&g_current->type;
-					  g_roundCount=0;
+					  yyextra->current->type+=yytext;
+  					  yyextra->lastRoundContext=FindMembers;
+  					  yyextra->pCopyRoundString=&yyextra->current->type;
+					  yyextra->roundCount=0;
                                           BEGIN(CopyRound);
                                         }
-<DeclType>{BN}+                         { lineCount(); }
+<DeclType>{BN}+                         { lineCount(yyscanner); }
 <DeclType>.                             {
                                           unput(*yytext);
                                           BEGIN(FindMembers);
                                         }
 <CSIndexer>"["[^\n\]]*"]"		{
-					  g_current->name+=removeRedundantWhiteSpace(yytext);
+					  yyextra->current->name+=removeRedundantWhiteSpace(yytext);
   					  BEGIN(FindMembers);
   					}
 <FindMembers>[0-9]{ID}			{ // some number where we did not expect one
   					}
 <FindMembers>"."			{
-  					  if (g_insideJava || g_insideCS || g_insideD)
+  					  if (yyextra->insideJava || yyextra->insideCS || yyextra->insideD)
 					  {
-					    g_current->name+=".";
+					    yyextra->current->name+=".";
 					  }
   					}
 <FindMembers>"::"			{
-					  g_current->name+=yytext;
+					  yyextra->current->name+=yytext;
   					}
 <CppQuote>"("{B}*"\""			{
-  					  g_insideCppQuote=TRUE;
+  					  yyextra->insideCppQuote=TRUE;
   					  BEGIN(FindMembers);
   					}
 <IDLUnionCase>"::"
 <IDLUnionCase>":"			{ BEGIN(FindMembers); }
-<IDLUnionCase>\n			{ lineCount(); }
+<IDLUnionCase>\n			{ lineCount(yyscanner); }
 <IDLUnionCase>.
-<TryFunctionBlock>\n			{ lineCount(); }
+<TryFunctionBlock>\n			{ lineCount(yyscanner); }
 <TryFunctionBlock>"{"			{ 
-					  g_curlyCount=0;
-					  g_lastCurlyContext = TryFunctionBlockEnd ;
+					  yyextra->curlyCount=0;
+					  yyextra->lastCurlyContext = TryFunctionBlockEnd ;
   					  BEGIN( SkipCurly );
 					}
 <TryFunctionBlock>.
-<TryFunctionBlockEnd>{BN}*"catch"	{ lineCount(); BEGIN(TryFunctionBlock); // {BN}* added to fix bug 611193
+<TryFunctionBlockEnd>{BN}*"catch"	{ lineCount(yyscanner); BEGIN(TryFunctionBlock); // {BN}* added to fix bug 611193
 					}
 <TryFunctionBlockEnd>\n			{ unput(*yytext); // rule added to fix bug id 601138
   					  BEGIN( FindMembers );
@@ -2525,159 +2225,159 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  BEGIN( FindMembers );
 					}
 <EndCppQuote>")"			{
-  					  g_insideCppQuote=FALSE;
+  					  yyextra->insideCppQuote=FALSE;
 					  BEGIN(FindMembers);
   					}
-<FindMembers,FindFields>{B}*"#"		{ if (g_insidePHP)
+<FindMembers,FindFields>{B}*"#"		{ if (yyextra->insidePHP)
 					    REJECT;
-					  g_lastCPPContext = YY_START;
+					  yyextra->lastCPPContext = YY_START;
 					  BEGIN( SkipCPP ) ;
 					}
 <FindMembers,FindFields>{B}*"#"{B}*("cmake")?"define"	{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					    REJECT;
-  					  g_current->bodyLine = g_yyLineNr;
-                                          g_lastDefineContext = YY_START;
+  					  yyextra->current->bodyLine = yyextra->yyLineNr;
+                                          yyextra->lastDefineContext = YY_START;
   					  BEGIN( Define );
   					}
 <FindMembers,ReadBody,ReadNSBody,ReadBodyIntf,SkipCurly,SkipCurlyCpp>{B}*"#"{B}+[0-9]+{B}+/"\""	{ /* line control directive */
-                                          g_yyLineNr = atoi(&yytext[1]);
-					  //printf("setting line number to %d\n",g_yyLineNr);
-					  g_lastPreLineCtrlContext = YY_START;
+                                          yyextra->yyLineNr = atoi(&yytext[1]);
+					  //printf("setting line number to %d\n",yyextra->yyLineNr);
+					  yyextra->lastPreLineCtrlContext = YY_START;
 					  if (YY_START==ReadBody || 
 					      YY_START==ReadNSBody ||
 					      YY_START==ReadBodyIntf)
 					  {
-  					    g_current->program+=yytext;
+  					    yyextra->current->program+=yytext;
 					  }
   					  BEGIN( PreLineCtrl );
   					}
 <PreLineCtrl>"\""[^\n\"]*"\""		{
-				          g_yyFileName = stripQuotes(yytext);
-					  if (g_lastPreLineCtrlContext==ReadBody || 
-					      g_lastPreLineCtrlContext==ReadNSBody ||
-					      g_lastPreLineCtrlContext==ReadBodyIntf)
+				          yyextra->yyFileName = stripQuotes(yytext);
+					  if (yyextra->lastPreLineCtrlContext==ReadBody || 
+					      yyextra->lastPreLineCtrlContext==ReadNSBody ||
+					      yyextra->lastPreLineCtrlContext==ReadBodyIntf)
 					  {
-					    g_current->program+=yytext;
+					    yyextra->current->program+=yytext;
 					  }
   					}
 <PreLineCtrl>.				{
-					  if (g_lastPreLineCtrlContext==ReadBody || 
-					      g_lastPreLineCtrlContext==ReadNSBody ||
-					      g_lastPreLineCtrlContext==ReadBodyIntf)
+					  if (yyextra->lastPreLineCtrlContext==ReadBody || 
+					      yyextra->lastPreLineCtrlContext==ReadNSBody ||
+					      yyextra->lastPreLineCtrlContext==ReadBodyIntf)
 					  {
-  					    g_current->program+=yytext;
+  					    yyextra->current->program+=yytext;
 					  }
                                         }
 <PreLineCtrl>\n				{
-					  if (g_lastPreLineCtrlContext==ReadBody || 
-					      g_lastPreLineCtrlContext==ReadNSBody ||
-					      g_lastPreLineCtrlContext==ReadBodyIntf)
+					  if (yyextra->lastPreLineCtrlContext==ReadBody || 
+					      yyextra->lastPreLineCtrlContext==ReadNSBody ||
+					      yyextra->lastPreLineCtrlContext==ReadBodyIntf)
 					  {
-  					    g_current->program+=yytext;
+  					    yyextra->current->program+=yytext;
 					  }
-                                          lineCount();
-  					  BEGIN( g_lastPreLineCtrlContext );
+                                          lineCount(yyscanner);
+  					  BEGIN( yyextra->lastPreLineCtrlContext );
   					}
 <SkipCPP>.
-<SkipCPP>\\[\r]*"\n"[\r]*		{ lineCount(); }
-<SkipCPP>[\r]*\n[\r]*			{ lineCount();
-					  BEGIN( g_lastCPPContext) ;
+<SkipCPP>\\[\r]*"\n"[\r]*		{ lineCount(yyscanner); }
+<SkipCPP>[\r]*\n[\r]*			{ lineCount(yyscanner);
+					  BEGIN( yyextra->lastCPPContext) ;
 					}
 <Define>{ID}{B}*"("			{
-  					  g_current->name = yytext;
-					  g_current->name = g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
-					  g_current->args = "(";
-  					  g_current->bodyLine = g_yyLineNr;
-					  g_currentArgumentContext = DefineEnd;
-					  g_fullArgString=g_current->args.copy();
-					  g_copyArgString=&g_current->args;
+  					  yyextra->current->name = yytext;
+					  yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+					  yyextra->current->args = "(";
+  					  yyextra->current->bodyLine = yyextra->yyLineNr;
+					  yyextra->currentArgumentContext = DefineEnd;
+					  yyextra->fullArgString=yyextra->current->args.copy();
+					  yyextra->copyArgString=&yyextra->current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
  /*
 <DefineArg>")"				{
   					  //printf("Define with args\n");
-  					  g_current->args += ')';
+  					  yyextra->current->args += ')';
   					  BEGIN( DefineEnd );
   					}
 <DefineArg>.				{
-  					  g_current->args += *yytext;
+  					  yyextra->current->args += *yytext;
   					}
   */
 <Define>{ID}				{
   					  //printf("Define '%s' without args\n",yytext);
-                                          if (g_insideCpp || g_insideObjC) 
+                                          if (yyextra->insideCpp || yyextra->insideObjC) 
                                           {
-                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
+                                            yyextra->current->id = ClangParser::instance()->lookup(yyextra->yyLineNr,yytext);
                                           }
-  					  g_current->bodyLine = g_yyLineNr;
-  					  g_current->name = yytext;
+  					  yyextra->current->bodyLine = yyextra->yyLineNr;
+  					  yyextra->current->name = yytext;
 					  BEGIN(DefineEnd);
   					}
 <DefineEnd>\n				{
-  					  //printf("End define: doc=%s docFile=%s docLine=%d\n",g_current->doc.data(),g_current->docFile.data(),g_current->docLine);
-                                          lineCount();
-					  g_current->fileName   = g_yyFileName;
-					  g_current->startLine  = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->type.resize(0);
-  					  g_current->args       = g_current->args.simplifyWhiteSpace();
-  					  g_current->name       = g_current->name.stripWhiteSpace();
-					  g_current->section    = Entry::DEFINE_SEC;
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
-					  BEGIN(g_lastDefineContext);
+  					  //printf("End define: doc=%s docFile=%s docLine=%d\n",yyextra->current->doc.data(),yyextra->current->docFile.data(),yyextra->current->docLine);
+                                          lineCount(yyscanner);
+					  yyextra->current->fileName   = yyextra->yyFileName;
+					  yyextra->current->startLine  = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->type.resize(0);
+  					  yyextra->current->args       = yyextra->current->args.simplifyWhiteSpace();
+  					  yyextra->current->name       = yyextra->current->name.stripWhiteSpace();
+					  yyextra->current->section    = Entry::DEFINE_SEC;
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
+					  BEGIN(yyextra->lastDefineContext);
   					}
 <DefinePHPEnd>";"			{
   					  //printf("End define\n");
-					  g_current->fileName   = g_yyFileName;
-					  g_current->startLine  = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->type.resize(0);
-                                          g_current->type       = "const";
-                                          QCString init = g_current->initializer.data();
+					  yyextra->current->fileName   = yyextra->yyFileName;
+					  yyextra->current->startLine  = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->type.resize(0);
+                                          yyextra->current->type       = "const";
+                                          QCString init = yyextra->current->initializer.data();
   					  init = init.simplifyWhiteSpace();
   					  init = init.left(init.length()-1);
-                                          g_current->initializer = init;
-  					  g_current->name       = g_current->name.stripWhiteSpace();
-					  g_current->section    = Entry::VARIABLE_SEC; 
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
+                                          yyextra->current->initializer = init;
+  					  yyextra->current->name       = yyextra->current->name.stripWhiteSpace();
+					  yyextra->current->section    = Entry::VARIABLE_SEC; 
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
 					  BEGIN(FindMembers);
   					}
 <DefinePHPEnd>.
 <DefineEnd>\\[\r]?\n			{
-                                          lineCount();
+                                          lineCount(yyscanner);
   					}
 <DefineEnd>\"				{
-					  if (g_insideIDL && g_insideCppQuote)
+					  if (yyextra->insideIDL && yyextra->insideCppQuote)
 					  {
 					    BEGIN(EndCppQuote);
 					  }
 					  else
 					  {
-					    g_lastStringContext=DefineEnd;
+					    yyextra->lastStringContext=DefineEnd;
 					    BEGIN(SkipString);
 					  }
   					}
 <DefineEnd>.				
 <DefinePHP>{ID}["']{BN}*","{BN}*	{
-  					  g_current->name = yytext;
-					  g_current->name = g_current->name.stripWhiteSpace();
-					  g_current->name = g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
-					  g_current->name = g_current->name.left(g_current->name.length()-1);
-  					  g_current->bodyLine = g_yyLineNr;
-  					  g_lastRoundContext = DefinePHPEnd;
-  					  g_pCopyRoundGString = &g_current->initializer;
-					  g_roundCount = 0;
+  					  yyextra->current->name = yytext;
+					  yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+					  yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+					  yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1);
+  					  yyextra->current->bodyLine = yyextra->yyLineNr;
+  					  yyextra->lastRoundContext = DefinePHPEnd;
+  					  yyextra->pCopyRoundGString = &yyextra->current->initializer;
+					  yyextra->roundCount = 0;
   					  BEGIN( GCopyRound );
 					}
 
 <FindMembers>[\^%]			{  // ^ and % are C++/CLI extensions
-  					  if (g_insideCli)
+  					  if (yyextra->insideCli)
 					  {
-  					    addType();
-                                            g_current->name = yytext ; 
+  					    addType(yyscanner);
+                                            yyextra->current->name = yytext ; 
 					  }
 					  else
 					  {
@@ -2685,128 +2385,128 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FindMembers>[*&]+			{ 
-                                          g_current->name += yytext ;  
-  					  addType();
+                                          yyextra->current->name += yytext ;  
+  					  addType(yyscanner);
 					}
 <FindMembers,MemberSpec,Function,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs,DefinePHPEnd>";"{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  if (g_current->bodyLine==-1)
+					  if (yyextra->current->bodyLine==-1)
 					  {
-					    g_current->bodyLine=g_yyLineNr;
+					    yyextra->current->bodyLine=yyextra->yyLineNr;
 					  }
-					  g_docBlockContext   = YY_START;
-					  g_docBlockInBody    = FALSE;
-					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  yyextra->docBlockContext   = YY_START;
+					  yyextra->docBlockInBody    = FALSE;
+					  yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
 
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
-                                          //printf("indent=%d\n",computeIndent(yytext+1,g_column));
-  					  lineCount();
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
+                                          //printf("indent=%d\n",computeIndent(yytext+1,yyextra->column));
+  					  lineCount(yyscanner);
 
-					  g_docBlockTerm = ';';
-                                          if (YY_START==EnumBaseType && g_current->section==Entry::ENUM_SEC)
+					  yyextra->docBlockTerm = ';';
+                                          if (YY_START==EnumBaseType && yyextra->current->section==Entry::ENUM_SEC)
                                           {
-                                            g_current->bitfields = ":"+g_current->args;
-                                            g_current->args.resize(0);
-                                            g_current->section=Entry::VARIABLE_SEC;
+                                            yyextra->current->bitfields = ":"+yyextra->current->args;
+                                            yyextra->current->args.resize(0);
+                                            yyextra->current->section=Entry::VARIABLE_SEC;
                                           }
 					  if (yytext[yyleng-3]=='/')
 					  {
-					    startCommentBlock(TRUE);
+					    startCommentBlock(yyscanner,TRUE);
 					    BEGIN( DocLine );
 					  }
 					  else
 					  {
-					    startCommentBlock(FALSE);
+					    startCommentBlock(yyscanner,FALSE);
 					    BEGIN( DocBlock );
 					  }
   					}
 <MemberSpec,FindFields,FindMembers,NextSemi,EnumBaseType,BitFields,ReadInitializer,OldStyleArgs>","{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  g_docBlockContext   = YY_START;
-					  g_docBlockInBody    = FALSE;
-					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  yyextra->docBlockContext   = YY_START;
+					  yyextra->docBlockInBody    = FALSE;
+					  yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
 
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
-  					  lineCount();
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
+  					  lineCount(yyscanner);
 
-					  g_docBlockTerm = ',';
-                                          if (YY_START==EnumBaseType && g_current->section==Entry::ENUM_SEC)
+					  yyextra->docBlockTerm = ',';
+                                          if (YY_START==EnumBaseType && yyextra->current->section==Entry::ENUM_SEC)
                                           {
-                                            g_current->bitfields = ":"+g_current->args;
-                                            g_current->args.resize(0);
-                                            g_current->section=Entry::VARIABLE_SEC;
+                                            yyextra->current->bitfields = ":"+yyextra->current->args;
+                                            yyextra->current->args.resize(0);
+                                            yyextra->current->section=Entry::VARIABLE_SEC;
                                           }
 					  if (yytext[yyleng-3]=='/')
 					  {
-					    startCommentBlock(TRUE);
+					    startCommentBlock(yyscanner,TRUE);
 					    BEGIN( DocLine );
 					  }
 					  else
 					  {
-					    startCommentBlock(FALSE);
+					    startCommentBlock(yyscanner,FALSE);
 					    BEGIN( DocBlock );
 					  }
   					}
 <DefineEnd,FindFields,FindFieldArg,ReadInitializer,OldStyleArgs>{BN}*("/**"|"//!"|"/*!"|"///")"<" {
-					  if (g_current->bodyLine==-1)
+					  if (yyextra->current->bodyLine==-1)
 					  {
-					    g_current->bodyLine=g_yyLineNr;
+					    yyextra->current->bodyLine=yyextra->yyLineNr;
 					  }
-					  g_docBlockContext   = YY_START;
-					  g_docBlockInBody    = FALSE;
-					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  yyextra->docBlockContext   = YY_START;
+					  yyextra->docBlockInBody    = FALSE;
+					  yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
-  					  lineCount();
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
+  					  lineCount(yyscanner);
 
-					  g_docBlockTerm = 0;
+					  yyextra->docBlockTerm = 0;
 					  if (yytext[yyleng-3]=='/')
 					  {
-					    startCommentBlock(TRUE);
+					    startCommentBlock(yyscanner,TRUE);
 					    BEGIN( DocLine );
 					  }
 					  else
 					  {
-					    startCommentBlock(FALSE);
+					    startCommentBlock(yyscanner,FALSE);
 					    BEGIN( DocBlock );
 					  }
   					}
    
 <FindMembers,FindFields>("//"([!/]){B}*{CMD}"{")|("/*"([!*]){B}*{CMD}"{")	{
-  					  //handleGroupStartCommand(g_current->name);
-                                          if (g_previous && g_previous->section==Entry::GROUPDOC_SEC)
+  					  //handleGroupStartCommand(yyextra->current->name);
+                                          if (yyextra->previous && yyextra->previous->section==Entry::GROUPDOC_SEC)
 					  {
-					    // link open command to the group defined in the g_previous entry
-					    Doxygen::docGroup.open(g_previous,g_yyFileName,g_yyLineNr);
+					    // link open command to the group defined in the yyextra->previous entry
+					    Doxygen::docGroup.open(yyextra->previous,yyextra->yyFileName,yyextra->yyLineNr);
 					  }
 					  else
 					  {
-					    // link open command to the g_current entry
-					    Doxygen::docGroup.open(g_current.get(),g_yyFileName,g_yyLineNr);
+					    // link open command to the yyextra->current entry
+					    Doxygen::docGroup.open(yyextra->current.get(),yyextra->yyFileName,yyextra->yyLineNr);
 					  }
-					  //g_current = tmp;
-					  initEntry();
+					  //yyextra->current = tmp;
+					  initEntry(yyscanner);
 					  if (yytext[1]=='/')
 					  {
 					    if (yytext[2]=='!' || yytext[2]=='/')
 					    {
-					      g_docBlockContext   = YY_START;
-					      g_docBlockInBody    = FALSE;
-					      g_docBlockAutoBrief = FALSE;
-					      g_docBlock.resize(0);
-					      g_docBlockTerm = 0;
-					      startCommentBlock(TRUE);
+					      yyextra->docBlockContext   = YY_START;
+					      yyextra->docBlockInBody    = FALSE;
+					      yyextra->docBlockAutoBrief = FALSE;
+					      yyextra->docBlock.resize(0);
+					      yyextra->docBlockTerm = 0;
+					      startCommentBlock(yyscanner,TRUE);
 					      BEGIN(DocLine);
 					    }
 					    else
 					    {
-					      g_lastCContext=YY_START;
+					      yyextra->lastCContext=YY_START;
 					      BEGIN(SkipCxxComment);
 					    }
 					  }
@@ -2814,498 +2514,498 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    if (yytext[2]=='!' || yytext[2]=='*')
 					    {
-					      g_docBlockContext   = YY_START;
-					      g_docBlockInBody    = FALSE;
-					      g_docBlock.resize(0);
-					      g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					      yyextra->docBlockContext   = YY_START;
+					      yyextra->docBlockInBody    = FALSE;
+					      yyextra->docBlock.resize(0);
+					      yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                          ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
-					      g_docBlockTerm = 0;
-					      startCommentBlock(FALSE);
+					      yyextra->docBlockTerm = 0;
+					      startCommentBlock(yyscanner,FALSE);
 					      BEGIN(DocBlock);
 					    }
 					    else
 					    {
-					      g_lastCContext=YY_START;
+					      yyextra->lastCContext=YY_START;
 					      BEGIN(SkipComment);
 					    }
 					  }
   					}
 <FindMembers,FindFields,ReadInitializer>"//"([!/]){B}*{CMD}"}".*|"/*"([!*]){B}*{CMD}"}"[^*]*"*/"	{
-                                          bool g_insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && g_lastInitializerContext==FindFields); // see bug746226
-  					  Doxygen::docGroup.close(g_current.get(),g_yyFileName,g_yyLineNr,g_insideEnum);
-  					  lineCount();
+                                          bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && yyextra->lastInitializerContext==FindFields); // see bug746226
+  					  Doxygen::docGroup.close(yyextra->current.get(),yyextra->yyFileName,yyextra->yyLineNr,insideEnum);
+  					  lineCount(yyscanner);
   					}
 <FindMembers>"="			{ // in PHP code this could also be due to "<?="
-  					  g_current->bodyLine = g_yyLineNr;
-                                          g_current->initializer = yytext;
-					  g_lastInitializerContext = YY_START;
-					  g_initBracketCount=0;
+  					  yyextra->current->bodyLine = yyextra->yyLineNr;
+                                          yyextra->current->initializer = yytext;
+					  yyextra->lastInitializerContext = YY_START;
+					  yyextra->initBracketCount=0;
 					  BEGIN(ReadInitializer);
   					}
 <UNOIDLAttributeBlock>{BN}*[gs]"et"{BN}+"raises"{BN}*"("{BN}*{SCOPENAME}{BN}*(","{BN}*{SCOPENAME}{BN}*)*")"{BN}*";"	{
-					  lineCount();
-					  g_current->exception += " ";
-					  g_current->exception += removeRedundantWhiteSpace(yytext);
+					  lineCount(yyscanner);
+					  yyextra->current->exception += " ";
+					  yyextra->current->exception += removeRedundantWhiteSpace(yytext);
 					}
 <UNOIDLAttributeBlock>"}"		{
-					  g_current->exception += " }";
+					  yyextra->current->exception += " }";
 					  BEGIN(FindMembers);
 					}
   /* Read initializer rules */
 <ReadInitializer>"("			{
-  					  g_lastRoundContext=YY_START;
-  					  g_pCopyRoundGString=&g_current->initializer;
-					  g_roundCount=0;
-  					  g_current->initializer+=*yytext; 
+  					  yyextra->lastRoundContext=YY_START;
+  					  yyextra->pCopyRoundGString=&yyextra->current->initializer;
+					  yyextra->roundCount=0;
+  					  yyextra->current->initializer+=*yytext; 
   					  BEGIN(GCopyRound);
   					}
 <ReadInitializer>"["                    {
-                                          if (!g_insidePHP) REJECT;
-                                          g_lastSquareContext=YY_START;
-                                          g_pCopySquareGString=&g_current->initializer;
-                                          g_squareCount=0;
-                                          g_current->initializer+=*yytext; 
+                                          if (!yyextra->insidePHP) REJECT;
+                                          yyextra->lastSquareContext=YY_START;
+                                          yyextra->pCopySquareGString=&yyextra->current->initializer;
+                                          yyextra->squareCount=0;
+                                          yyextra->current->initializer+=*yytext; 
                                           BEGIN(GCopySquare);
                                         }
 <ReadInitializer>"{"			{
-  					  g_lastCurlyContext=YY_START;
-  					  g_pCopyCurlyGString=&g_current->initializer;
-					  g_curlyCount=0;
-  					  g_current->initializer+=*yytext; 
+  					  yyextra->lastCurlyContext=YY_START;
+  					  yyextra->pCopyCurlyGString=&yyextra->current->initializer;
+					  yyextra->curlyCount=0;
+  					  yyextra->current->initializer+=*yytext; 
   					  BEGIN(GCopyCurly);
   					}
 <ReadInitializer>[;,]			{
-  					  //printf(">> initializer '%s' <<\n",g_current->initializer.data());
-                                          if (*yytext==';' && (g_current_root->spec&Entry::Enum))
-					  {
-					    g_current->fileName   = g_yyFileName;
-					    g_current->startLine  = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-  					    g_current->args       = g_current->args.simplifyWhiteSpace();
-  					    g_current->name       = g_current->name.stripWhiteSpace();
-					    g_current->section    = Entry::VARIABLE_SEC;
-					    g_current_root->moveToSubEntryAndRefresh(g_current);
-					    initEntry();
+  					  //printf(">> initializer '%s' <<\n",yyextra->current->initializer.data());
+                                          if (*yytext==';' && (yyextra->current_root->spec&Entry::Enum))
+					  {
+					    yyextra->current->fileName   = yyextra->yyFileName;
+					    yyextra->current->startLine  = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+  					    yyextra->current->args       = yyextra->current->args.simplifyWhiteSpace();
+  					    yyextra->current->name       = yyextra->current->name.stripWhiteSpace();
+					    yyextra->current->section    = Entry::VARIABLE_SEC;
+					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					    initEntry(yyscanner);
 					    BEGIN(FindMembers);
 					  }
-					  else if (*yytext==';' || (g_lastInitializerContext==FindFields && g_initBracketCount==0)) // g_initBracketCount==0 was added for bug 665778
+					  else if (*yytext==';' || (yyextra->lastInitializerContext==FindFields && yyextra->initBracketCount==0)) // yyextra->initBracketCount==0 was added for bug 665778
 					  {
   					    unput(*yytext);
-  					    BEGIN(g_lastInitializerContext);
+  					    BEGIN(yyextra->lastInitializerContext);
 					  }
-					  else if (*yytext==',' && g_initBracketCount==0) // for "int a=0,b=0"
+					  else if (*yytext==',' && yyextra->initBracketCount==0) // for "int a=0,b=0"
 					  {
   					    unput(*yytext);
-  					    BEGIN(g_lastInitializerContext);
+  					    BEGIN(yyextra->lastInitializerContext);
 					  }
 					  else
 					  {
-  					    g_current->initializer+=*yytext; 
+  					    yyextra->current->initializer+=*yytext; 
 					  }
   					}
 <ReadInitializer>{RAWBEGIN}             { // C++11 raw string
-                                          if (!g_insideCpp)
+                                          if (!yyextra->insideCpp)
                                           { 
                                             REJECT;
                                           }
                                           else
                                           {
                                             QCString text=yytext;
-                                            g_current->initializer+=text;
+                                            yyextra->current->initializer+=text;
                                             int i=text.find('"');
-                                            g_delimiter = yytext+i+1;
-                                            g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-                                            g_lastRawStringContext = YY_START;
-                                            g_pCopyRawGString = &g_current->initializer;
+                                            yyextra->delimiter = yytext+i+1;
+                                            yyextra->delimiter=yyextra->delimiter.left(yyextra->delimiter.length()-1);
+                                            yyextra->lastRawStringContext = YY_START;
+                                            yyextra->pCopyRawGString = &yyextra->current->initializer;
                                             BEGIN(RawGString);
                                             //printf("RawGString delimiter='%s'\n",delimiter.data());
                                           }
                                         }
 <RawGString>{RAWEND}                    {
-                                          *g_pCopyRawGString+=yytext;
+                                          *yyextra->pCopyRawGString+=yytext;
                                           QCString delimiter = yytext+1;
                                           delimiter=delimiter.left(delimiter.length()-1);
-                                          if (delimiter==g_delimiter)
+                                          if (delimiter==yyextra->delimiter)
                                           {
-                                            BEGIN(g_lastRawStringContext);
+                                            BEGIN(yyextra->lastRawStringContext);
                                           }
                                         }
 <RawGString>[^)\n]+                     {
-                                          *g_pCopyRawGString+=yytext;
+                                          *yyextra->pCopyRawGString+=yytext;
                                         }
 <RawGString>.                           {
-                                          *g_pCopyRawGString+=yytext;
+                                          *yyextra->pCopyRawGString+=yytext;
                                         }
 <RawGString>\n                          {
-                                          *g_pCopyRawGString+=yytext;
-                                          lineCount();
+                                          *yyextra->pCopyRawGString+=yytext;
+                                          lineCount(yyscanner);
                                         }
 <RawString>{RAWEND}                     {
-                                          *g_pCopyRawString+=yytext;
-  					  g_fullArgString+=yytext;
+                                          *yyextra->pCopyRawString+=yytext;
+  					  yyextra->fullArgString+=yytext;
                                           QCString delimiter = yytext+1;
                                           delimiter=delimiter.left(delimiter.length()-1);
-                                          if (delimiter==g_delimiter)
+                                          if (delimiter==yyextra->delimiter)
                                           {
-                                            BEGIN(g_lastRawStringContext);
+                                            BEGIN(yyextra->lastRawStringContext);
                                           }
                                         }
 <RawString>[^)]+                        {
-                                          *g_pCopyRawString+=yytext;
-  					  g_fullArgString+=yytext;
+                                          *yyextra->pCopyRawString+=yytext;
+  					  yyextra->fullArgString+=yytext;
                                         }
 <RawString>.                            {
-                                          *g_pCopyRawString+=yytext;
-  					  g_fullArgString+=yytext;
+                                          *yyextra->pCopyRawString+=yytext;
+  					  yyextra->fullArgString+=yytext;
                                         }
 <RawString>\n                           {
-                                          *g_pCopyRawString+=yytext;
-  					  g_fullArgString+=yytext;
-                                          lineCount();
+                                          *yyextra->pCopyRawString+=yytext;
+  					  yyextra->fullArgString+=yytext;
+                                          lineCount(yyscanner);
                                         }
 <ReadInitializer>\"			{
-					  if (g_insideIDL && g_insideCppQuote)
+					  if (yyextra->insideIDL && yyextra->insideCppQuote)
   					  {
 					    BEGIN(EndCppQuote);
 					  }
 					  else
 					  {
-                                            g_lastStringContext=YY_START;
-  					    g_current->initializer+=yytext; 
-  					    g_pCopyQuotedGString=&g_current->initializer;
+                                            yyextra->lastStringContext=YY_START;
+  					    yyextra->current->initializer+=yytext; 
+  					    yyextra->pCopyQuotedGString=&yyextra->current->initializer;
 					    BEGIN(CopyGString);
 					  }
 					}
 <ReadInitializer>"->"			{
-  					  g_current->initializer+=yytext; 
+  					  yyextra->current->initializer+=yytext; 
 					}
 <ReadInitializer>"<<"			{
-  					  g_current->initializer+=yytext; 
+  					  yyextra->current->initializer+=yytext; 
 					}
 <ReadInitializer>">>"			{
-  					  g_current->initializer+=yytext; 
+  					  yyextra->current->initializer+=yytext; 
   					}
 <ReadInitializer>[<\[{(]		{
-  					  g_initBracketCount++;
-  					  g_current->initializer+=*yytext; 
+  					  yyextra->initBracketCount++;
+  					  yyextra->current->initializer+=*yytext; 
   					}
 <ReadInitializer>[>\]})]		{
-  					  g_initBracketCount--;
-  					  g_current->initializer+=*yytext; 
+  					  yyextra->initBracketCount--;
+  					  yyextra->current->initializer+=*yytext; 
   					}
 <ReadInitializer>\'			{	
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-					    g_current->initializer+=yytext; 
-                                            g_pCopyQuotedGString = &g_current->initializer;
-                                            g_lastStringContext=YY_START;
+					    yyextra->current->initializer+=yytext; 
+                                            yyextra->pCopyQuotedGString = &yyextra->current->initializer;
+                                            yyextra->lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
 					  else
 					  {
-					    g_current->initializer+=yytext; 
+					    yyextra->current->initializer+=yytext; 
 					  }
   					}
 <ReadInitializer>{CHARLIT}              { 
-                                          if (g_insidePHP) 
+                                          if (yyextra->insidePHP) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {  
-					    g_current->initializer+=yytext; 
+					    yyextra->current->initializer+=yytext; 
 					  }
                                         } 
 <ReadInitializer>\n			{
-  					  g_current->initializer+=*yytext;
-                                          lineCount();
+  					  yyextra->current->initializer+=*yytext;
+                                          lineCount(yyscanner);
   					}
 <ReadInitializer>"@\""			{ 
-  					  //printf("g_insideCS=%d\n",g_insideCS);
-  					  g_current->initializer+=yytext;
-                                          if (!g_insideCS && !g_insideObjC) 
+  					  //printf("yyextra->insideCS=%d\n",yyextra->insideCS);
+  					  yyextra->current->initializer+=yytext;
+                                          if (!yyextra->insideCS && !yyextra->insideObjC) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
 					    // C#/ObjC verbatim string
-					    g_lastSkipVerbStringContext=YY_START;
-					    g_pSkipVerbString=&g_current->initializer;
+					    yyextra->lastSkipVerbStringContext=YY_START;
+					    yyextra->pSkipVerbString=&yyextra->current->initializer;
 					    BEGIN(SkipVerbString);
 					  }
 					}
 <SkipVerbString>[^\n"]+			{
-					  *g_pSkipVerbString+=yytext;
+					  *yyextra->pSkipVerbString+=yytext;
 					}
 <SkipVerbString>"\"\""			{ // quote escape
-					  *g_pSkipVerbString+=yytext;
+					  *yyextra->pSkipVerbString+=yytext;
 					}
 <SkipVerbString>"\""			{
-					  *g_pSkipVerbString+=*yytext;
-					  BEGIN(g_lastSkipVerbStringContext);
+					  *yyextra->pSkipVerbString+=*yytext;
+					  BEGIN(yyextra->lastSkipVerbStringContext);
 					}
 <SkipVerbString>\n			{
-					  *g_pSkipVerbString+=*yytext;
-                                          lineCount();
+					  *yyextra->pSkipVerbString+=*yytext;
+                                          lineCount(yyscanner);
   					}
 <SkipVerbString>.			{
-					  *g_pSkipVerbString+=*yytext;
+					  *yyextra->pSkipVerbString+=*yytext;
   					}
 <ReadInitializer>"?>"			{
-					  if (g_insidePHP)
+					  if (yyextra->insidePHP)
 					    BEGIN( FindMembersPHP );
 					  else
-					    g_current->initializer+=yytext;
+					    yyextra->current->initializer+=yytext;
   					}
 <ReadInitializer>.			{ 
-  					  g_current->initializer+=*yytext; 
+  					  yyextra->current->initializer+=*yytext; 
 					}
 
   /* generic quoted string copy rules */
 <CopyString,CopyPHPString>\\.		{
-  					  *g_pCopyQuotedString+=yytext;
+  					  *yyextra->pCopyQuotedString+=yytext;
   					}
 <CopyString>\"				{ 
-  					  *g_pCopyQuotedString+=*yytext;
-  					  BEGIN( g_lastStringContext ); 
+  					  *yyextra->pCopyQuotedString+=*yytext;
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <CopyPHPString>\'			{ 
-  					  *g_pCopyQuotedString+=*yytext;
-  					  BEGIN( g_lastStringContext ); 
+  					  *yyextra->pCopyQuotedString+=*yytext;
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <CopyString,CopyPHPString>"/*"|"*/"|"//" {
-  					  *g_pCopyQuotedString+=yytext;
+  					  *yyextra->pCopyQuotedString+=yytext;
   					}
 <CopyString,CopyPHPString>\n		{
-  					  *g_pCopyQuotedString+=*yytext;
-                                          lineCount();
+  					  *yyextra->pCopyQuotedString+=*yytext;
+                                          lineCount(yyscanner);
   					}
 <CopyString,CopyPHPString>.		{
-  					  *g_pCopyQuotedString+=*yytext;
+  					  *yyextra->pCopyQuotedString+=*yytext;
   					}
 
   /* generic quoted growable string copy rules */
 <CopyGString,CopyPHPGString>\\.		{
-  					  *g_pCopyQuotedGString+=yytext;
+  					  *yyextra->pCopyQuotedGString+=yytext;
   					}
 <CopyGString>\"				{ 
-  					  *g_pCopyQuotedGString+=*yytext;
-  					  BEGIN( g_lastStringContext ); 
+  					  *yyextra->pCopyQuotedGString+=*yytext;
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <CopyPHPGString>\'			{ 
-  					  *g_pCopyQuotedGString+=*yytext;
-  					  BEGIN( g_lastStringContext ); 
+  					  *yyextra->pCopyQuotedGString+=*yytext;
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <CopyGString,CopyPHPGString>"<?php"	{ // we had an odd number of quotes.
-					  *g_pCopyQuotedGString += yytext;
-  					  BEGIN( g_lastStringContext ); 
+					  *yyextra->pCopyQuotedGString += yytext;
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <CopyGString,CopyPHPGString>"/*"|"*/"|"//" {
-  					  *g_pCopyQuotedGString+=yytext;
+  					  *yyextra->pCopyQuotedGString+=yytext;
   					}
 <CopyGString,CopyPHPGString>\n		{
-  					  *g_pCopyQuotedGString+=*yytext;
-                                          lineCount();
+  					  *yyextra->pCopyQuotedGString+=*yytext;
+                                          lineCount(yyscanner);
   					}
 <CopyGString,CopyPHPGString>.		{
-  					  *g_pCopyQuotedGString+=*yytext;
+  					  *yyextra->pCopyQuotedGString+=*yytext;
   					}
 
   /* generic round bracket list copy rules */
 <CopyRound>\"				{
-					  *g_pCopyRoundString+=*yytext;
-  					  g_pCopyQuotedString=g_pCopyRoundString;
-					  g_lastStringContext=YY_START;
+					  *yyextra->pCopyRoundString+=*yytext;
+  					  yyextra->pCopyQuotedString=yyextra->pCopyRoundString;
+					  yyextra->lastStringContext=YY_START;
 					  BEGIN(CopyString);
 					}
 <CopyRound>"("				{
-  					  *g_pCopyRoundString+=*yytext;
-  					  g_roundCount++;
+  					  *yyextra->pCopyRoundString+=*yytext;
+  					  yyextra->roundCount++;
   					}
 <CopyRound>")"				{
-  					  *g_pCopyRoundString+=*yytext;
-					  if (--g_roundCount<0)
-					    BEGIN(g_lastRoundContext);
+  					  *yyextra->pCopyRoundString+=*yytext;
+					  if (--yyextra->roundCount<0)
+					    BEGIN(yyextra->lastRoundContext);
   					}
 <CopyRound>\n				{
-                                          lineCount();
-  					  *g_pCopyRoundString+=*yytext;
+                                          lineCount(yyscanner);
+  					  *yyextra->pCopyRoundString+=*yytext;
   					}
 <CopyRound>\'				{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-					    g_current->initializer+=yytext; 
-                                            g_pCopyQuotedString = g_pCopyRoundString;
-                                            g_lastStringContext=YY_START;
+					    yyextra->current->initializer+=yytext; 
+                                            yyextra->pCopyQuotedString = yyextra->pCopyRoundString;
+                                            yyextra->lastStringContext=YY_START;
 					    BEGIN(CopyPHPString);
 					  }
 					  else
 					  {
-					    *g_pCopyRoundString+=yytext;
+					    *yyextra->pCopyRoundString+=yytext;
 					  }
   					}
 <CopyRound>{CHARLIT}		        { 
-                                          if (g_insidePHP)
+                                          if (yyextra->insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            *g_pCopyRoundString+=yytext; 
+                                            *yyextra->pCopyRoundString+=yytext; 
 					  }
                                         }
 <CopyRound>[^"'()\n]+			{
-  					  *g_pCopyRoundString+=yytext;
+  					  *yyextra->pCopyRoundString+=yytext;
   					}
 <CopyRound>.				{
-  					  *g_pCopyRoundString+=*yytext;
+  					  *yyextra->pCopyRoundString+=*yytext;
   					}
 
   /* generic round bracket list copy rules for growable strings */
 <GCopyRound>\"				{
-					  *g_pCopyRoundGString+=*yytext;
-  					  g_pCopyQuotedGString=g_pCopyRoundGString;
-					  g_lastStringContext=YY_START;
+					  *yyextra->pCopyRoundGString+=*yytext;
+  					  yyextra->pCopyQuotedGString=yyextra->pCopyRoundGString;
+					  yyextra->lastStringContext=YY_START;
 					  BEGIN(CopyGString);
 					}
 <GCopyRound>"("				{
-  					  *g_pCopyRoundGString+=*yytext;
-  					  g_roundCount++;
+  					  *yyextra->pCopyRoundGString+=*yytext;
+  					  yyextra->roundCount++;
   					}
 <GCopyRound>")"				{
-  					  *g_pCopyRoundGString+=*yytext;
-					  if (--g_roundCount<0)
-					    BEGIN(g_lastRoundContext);
+  					  *yyextra->pCopyRoundGString+=*yytext;
+					  if (--yyextra->roundCount<0)
+					    BEGIN(yyextra->lastRoundContext);
   					}
 <GCopyRound>\n				{
-                                          lineCount();
-  					  *g_pCopyRoundGString+=*yytext;
+                                          lineCount(yyscanner);
+  					  *yyextra->pCopyRoundGString+=*yytext;
   					}
 <GCopyRound>\'				{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-					    g_current->initializer+=yytext; 
-                                            g_pCopyQuotedGString = g_pCopyRoundGString;
-                                            g_lastStringContext=YY_START;
+					    yyextra->current->initializer+=yytext; 
+                                            yyextra->pCopyQuotedGString = yyextra->pCopyRoundGString;
+                                            yyextra->lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
 					  else
 					  {
-					    *g_pCopyRoundGString+=yytext;
+					    *yyextra->pCopyRoundGString+=yytext;
 					  }
   					}
 <GCopyRound>{CHARLIT}		        { 
-                                          if (g_insidePHP)
+                                          if (yyextra->insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            *g_pCopyRoundGString+=yytext; 
+                                            *yyextra->pCopyRoundGString+=yytext; 
 					  }
                                         }
 <GCopyRound>[^"'()\n/]+			{
-  					  *g_pCopyRoundGString+=yytext;
+  					  *yyextra->pCopyRoundGString+=yytext;
   					}
 <GCopyRound>.				{
-  					  *g_pCopyRoundGString+=*yytext;
+  					  *yyextra->pCopyRoundGString+=*yytext;
   					}
 
   /* generic square bracket list copy rules for growable strings, we should only enter here in case of php, left the test part as in GCopyRound to keep it compatible with the round bracket version */
 <GCopySquare>\"                         {
-                                          *g_pCopySquareGString+=*yytext;
-                                            g_pCopyQuotedGString=g_pCopySquareGString;
-                                          g_lastStringContext=YY_START;
+                                          *yyextra->pCopySquareGString+=*yytext;
+                                            yyextra->pCopyQuotedGString=yyextra->pCopySquareGString;
+                                          yyextra->lastStringContext=YY_START;
                                           BEGIN(CopyGString);
                                         }
 <GCopySquare>"["                        {
-                                          *g_pCopySquareGString+=*yytext;
-                                          g_squareCount++;
+                                          *yyextra->pCopySquareGString+=*yytext;
+                                          yyextra->squareCount++;
                                         }
 <GCopySquare>"]"                        {
-                                          *g_pCopySquareGString+=*yytext;
-                                          if (--g_squareCount<0)
-                                          BEGIN(g_lastSquareContext);
+                                          *yyextra->pCopySquareGString+=*yytext;
+                                          if (--yyextra->squareCount<0)
+                                          BEGIN(yyextra->lastSquareContext);
                                         }
 <GCopySquare>\n                         {
-                                          lineCount();
-                                          *g_pCopySquareGString+=*yytext;
+                                          lineCount(yyscanner);
+                                          *yyextra->pCopySquareGString+=*yytext;
                                         }
 <GCopySquare>\'                         {
-                                          if (g_insidePHP)
+                                          if (yyextra->insidePHP)
                                           {
-                                            g_current->initializer+=yytext; 
-                                            g_pCopyQuotedGString = g_pCopySquareGString;
-                                            g_lastStringContext=YY_START;
+                                            yyextra->current->initializer+=yytext; 
+                                            yyextra->pCopyQuotedGString = yyextra->pCopySquareGString;
+                                            yyextra->lastStringContext=YY_START;
                                             BEGIN(CopyPHPGString);
                                           }
                                           else
                                           {
-                                            *g_pCopySquareGString+=yytext;
+                                            *yyextra->pCopySquareGString+=yytext;
                                           }
                                         }
 <GCopySquare>{CHARLIT}                  { 
-                                          if (g_insidePHP)
+                                          if (yyextra->insidePHP)
                                           {
                                             REJECT;
                                           }
                                           else
                                           {
-                                            *g_pCopySquareGString+=yytext; 
+                                            *yyextra->pCopySquareGString+=yytext; 
                                           }
                                         }
 <GCopySquare>[^"\[\]\n/]+               {
-                                          *g_pCopySquareGString+=yytext;
+                                          *yyextra->pCopySquareGString+=yytext;
                                         }
 <GCopySquare>.                          {
-                                          *g_pCopySquareGString+=*yytext;
+                                          *yyextra->pCopySquareGString+=*yytext;
                                         }
 
   /* generic curly bracket list copy rules */
 <CopyCurly>\"				{
-					  *g_pCopyCurlyString+=*yytext;
-  					  g_pCopyQuotedString=g_pCopyCurlyString;
-					  g_lastStringContext=YY_START;
+					  *yyextra->pCopyCurlyString+=*yytext;
+  					  yyextra->pCopyQuotedString=yyextra->pCopyCurlyString;
+					  yyextra->lastStringContext=YY_START;
 					  BEGIN(CopyString);
 					}
 <CopyCurly>\'				{
-					  *g_pCopyCurlyString+=*yytext;
-  					  if (g_insidePHP)
+					  *yyextra->pCopyCurlyString+=*yytext;
+  					  if (yyextra->insidePHP)
 					  {
-					    g_pCopyQuotedString=g_pCopyCurlyString;
-					    g_lastStringContext=YY_START;
+					    yyextra->pCopyQuotedString=yyextra->pCopyCurlyString;
+					    yyextra->lastStringContext=YY_START;
 					    BEGIN(CopyPHPString);
 					  }
 					}
 <CopyCurly>"{"				{
-  					  *g_pCopyCurlyString+=*yytext;
-					  g_curlyCount++;
+  					  *yyextra->pCopyCurlyString+=*yytext;
+					  yyextra->curlyCount++;
   					}
 <CopyCurly>"}"				{
-					  *g_pCopyCurlyString+=*yytext;
-					  if (--g_curlyCount<0)
-					    BEGIN(g_lastCurlyContext); 
+					  *yyextra->pCopyCurlyString+=*yytext;
+					  if (--yyextra->curlyCount<0)
+					    BEGIN(yyextra->lastCurlyContext); 
   					}
-<CopyCurly>{CHARLIT}                    { if (g_insidePHP) 
+<CopyCurly>{CHARLIT}                    { if (yyextra->insidePHP) 
                                           { 
 					    REJECT; 
 					  } 
 					  else 
 					  {
-					    *g_pCopyCurlyString+=yytext; 
+					    *yyextra->pCopyCurlyString+=yytext; 
 					  }
                                         }
 <CopyCurly>[^"'{}\/\n]+			{
-  					  *g_pCopyCurlyString+=yytext;
+  					  *yyextra->pCopyCurlyString+=yytext;
   					}
-<CopyCurly>"/"				{ *g_pCopyCurlyString+=yytext; }
+<CopyCurly>"/"				{ *yyextra->pCopyCurlyString+=yytext; }
 <CopyCurly>\n				{
-                                          lineCount();
-					  *g_pCopyCurlyString+=*yytext;
+                                          lineCount(yyscanner);
+					  *yyextra->pCopyCurlyString+=*yytext;
   					}
 <CopyCurly>.				{
-					  *g_pCopyCurlyString+=*yytext;
+					  *yyextra->pCopyCurlyString+=*yytext;
   					}
 
   /* generic curly bracket list copy rules for growable strings */
@@ -3315,444 +3015,444 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  QCString line = QCString(yytext);
 					  int s = line.find(' ');
 					  int e = line.find('"',s);
-					  g_yyLineNr = line.mid(s,e-s).toInt();
+					  yyextra->yyLineNr = line.mid(s,e-s).toInt();
 					  if (yytext[yyleng-1]=='\n')
 					  {
-                                            lineCount();
-                                            g_column=0;
+                                            lineCount(yyscanner);
+                                            yyextra->column=0;
 					  }
   					}
 <GCopyCurly>\"				{
-					  *g_pCopyCurlyGString+=*yytext;
-  					  g_pCopyQuotedGString=g_pCopyCurlyGString;
-					  g_lastStringContext=YY_START;
+					  *yyextra->pCopyCurlyGString+=*yytext;
+  					  yyextra->pCopyQuotedGString=yyextra->pCopyCurlyGString;
+					  yyextra->lastStringContext=YY_START;
 					  BEGIN(CopyGString);
 					}
 <GCopyCurly>\'				{
-					  *g_pCopyCurlyGString+=*yytext;
-  					  if (g_insidePHP)
+					  *yyextra->pCopyCurlyGString+=*yytext;
+  					  if (yyextra->insidePHP)
 					  {
-					    g_pCopyQuotedGString=g_pCopyCurlyGString;
-					    g_lastStringContext=YY_START;
+					    yyextra->pCopyQuotedGString=yyextra->pCopyCurlyGString;
+					    yyextra->lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
 					}
 <GCopyCurly>"{"				{
-  					  *g_pCopyCurlyGString+=*yytext;
-					  g_curlyCount++;
+  					  *yyextra->pCopyCurlyGString+=*yytext;
+					  yyextra->curlyCount++;
   					}
 <GCopyCurly>"}"				{
-					  *g_pCopyCurlyGString+=*yytext;
-					  if (--g_curlyCount<0)
-					    BEGIN(g_lastCurlyContext); 
+					  *yyextra->pCopyCurlyGString+=*yytext;
+					  if (--yyextra->curlyCount<0)
+					    BEGIN(yyextra->lastCurlyContext); 
   					}
-<GCopyCurly>{CHARLIT}                    { if (g_insidePHP) 
+<GCopyCurly>{CHARLIT}                    { if (yyextra->insidePHP) 
                                           { 
 					    REJECT; 
 					  } 
 					  else 
 					  {
-					    *g_pCopyCurlyGString+=yytext; 
+					    *yyextra->pCopyCurlyGString+=yytext; 
 					  }
                                         }
 <GCopyCurly>[^"'{}\/\n,]+		{
-  					  *g_pCopyCurlyGString+=yytext;
+  					  *yyextra->pCopyCurlyGString+=yytext;
   					}
 <GCopyCurly>[,]+		        {
-  					  *g_pCopyCurlyGString+=yytext;
+  					  *yyextra->pCopyCurlyGString+=yytext;
   					}
-<GCopyCurly>"/"				{ *g_pCopyCurlyGString+=yytext; }
+<GCopyCurly>"/"				{ *yyextra->pCopyCurlyGString+=yytext; }
 <GCopyCurly>\n				{
-                                          lineCount();
-					  *g_pCopyCurlyGString+=*yytext;
+                                          lineCount(yyscanner);
+					  *yyextra->pCopyCurlyGString+=*yytext;
   					}
 <GCopyCurly>.				{
-					  *g_pCopyCurlyGString+=*yytext;
+					  *yyextra->pCopyCurlyGString+=*yytext;
   					}
 
   /* ---------------------- */
 
 
 <FindMembers>":"			{
-					  if (g_current->type.isEmpty() &&
-                                              g_current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}'
+					  if (yyextra->current->type.isEmpty() &&
+                                              yyextra->current->name=="enum") // see bug 69041, C++11 style anon enum: 'enum : unsigned int {...}'
 					  {
-                                            g_current->section=Entry::ENUM_SEC;
-					    g_current->name.resize(0);
-                                            g_current->args.resize(0);
+                                            yyextra->current->section=Entry::ENUM_SEC;
+					    yyextra->current->name.resize(0);
+                                            yyextra->current->args.resize(0);
   					    BEGIN(EnumBaseType);
 					  }
                                           else 
                                           {
-                                            if (g_current->type.isEmpty()) // anonymous padding field, e.g. "int :7;"
+                                            if (yyextra->current->type.isEmpty()) // anonymous padding field, e.g. "int :7;"
 					    {
-					      addType();
-					      g_current->name.sprintf("__pad%d__",g_padCount++);
+					      addType(yyscanner);
+					      yyextra->current->name.sprintf("__pad%d__",yyextra->padCount++);
 					    }
   					    BEGIN(BitFields);
-					    g_current->bitfields+=":";
+					    yyextra->current->bitfields+=":";
                                           }
   					}
 <BitFields>.				{
-  					  g_current->bitfields+=*yytext;
+  					  yyextra->current->bitfields+=*yytext;
   					}
 <EnumBaseType>.				{
-  					  g_current->args+=*yytext;
+  					  yyextra->current->args+=*yytext;
   					}
 <EnumBaseType>\n			{
-                                          lineCount();
-  					  g_current->args+=' ';
+                                          lineCount(yyscanner);
+  					  yyextra->current->args+=' ';
   					}
 <FindMembers>[;,]			{ 
-  					  QCString oldType = g_current->type;
-					  if (g_current->bodyLine==-1)
+  					  QCString oldType = yyextra->current->type;
+					  if (yyextra->current->bodyLine==-1)
 					  {
-					    g_current->bodyLine = g_yyLineNr;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
 					  }
-                                          if ( g_insidePHP && g_current->type.left(3) == "var" )
+                                          if ( yyextra->insidePHP && yyextra->current->type.left(3) == "var" )
                                           {
-                                            g_current->type = g_current->type.mid(3);
+                                            yyextra->current->type = yyextra->current->type.mid(3);
                                           }
-					  if (g_isTypedef && g_current->type.left(8)!="typedef ")
+					  if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
 					  {
-					    g_current->type.prepend("typedef ");
+					    yyextra->current->type.prepend("typedef ");
 					  }
-					  bool stat = g_current->stat;
-					  if (!g_current->name.isEmpty() && g_current->section!=Entry::ENUM_SEC)
+					  bool stat = yyextra->current->stat;
+					  if (!yyextra->current->name.isEmpty() && yyextra->current->section!=Entry::ENUM_SEC)
 					  {
-					    g_current->type=g_current->type.simplifyWhiteSpace();
-					    g_current->args=removeRedundantWhiteSpace(g_current->args);
-					    g_current->name=g_current->name.stripWhiteSpace();
-					    if (g_current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;"
+					    yyextra->current->type=yyextra->current->type.simplifyWhiteSpace();
+					    yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
+					    yyextra->current->name=yyextra->current->name.stripWhiteSpace();
+					    if (yyextra->current->section==Entry::CLASS_SEC) // remove spec for "struct Bla bla;"
 					    {
-					    	g_current->spec = 0;
+					    	yyextra->current->spec = 0;
 					    }
-					    g_current->section = Entry::VARIABLE_SEC ;
-					    g_current->fileName = g_yyFileName;
-					    g_current->startLine = g_yyBegLineNr;
-					    g_current->startColumn = g_yyBegColNr;
-					    g_current_root->moveToSubEntryAndRefresh( g_current ) ;
-                                            initEntry();
+					    yyextra->current->section = Entry::VARIABLE_SEC ;
+					    yyextra->current->fileName = yyextra->yyFileName;
+					    yyextra->current->startLine = yyextra->yyBegLineNr;
+					    yyextra->current->startColumn = yyextra->yyBegColNr;
+					    yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+                                            initEntry(yyscanner);
 					  }
 					  if ( *yytext == ',')
 					  {
-					    g_current->stat = stat; // the static attribute holds for all variables
-					    g_current->name.resize(0);
-					    g_current->args.resize(0);
-					    g_current->brief.resize(0);
-					    g_current->doc.resize(0);
-					    g_current->initializer.resize(0);
-					    g_current->bitfields.resize(0);
+					    yyextra->current->stat = stat; // the static attribute holds for all variables
+					    yyextra->current->name.resize(0);
+					    yyextra->current->args.resize(0);
+					    yyextra->current->brief.resize(0);
+					    yyextra->current->doc.resize(0);
+					    yyextra->current->initializer.resize(0);
+					    yyextra->current->bitfields.resize(0);
 					    int i=oldType.length(); 
 					    while (i>0 && (oldType[i-1]=='*' || oldType[i-1]=='&' || oldType[i-1]==' ')) i--;
-					    g_current->type = oldType.left(i);
+					    yyextra->current->type = oldType.left(i);
 					  }
 					  else
 					  {
-                                            g_mtype = Method;
-                                            g_virt = Normal;
-					    g_current->groups.clear();
-					    initEntry();
+                                            yyextra->mtype = Method;
+                                            yyextra->virt = Normal;
+					    yyextra->current->groups.clear();
+					    initEntry(yyscanner);
 					  }
 					}
 
 <FindMembers>"["			{ 
-                                          if (g_insideSlice)
+                                          if (yyextra->insideSlice)
                                           {
-          				    g_squareCount=1;
-                                            g_lastSquareContext = YY_START;
-                                            g_current->metaData += "[";
+          				    yyextra->squareCount=1;
+                                            yyextra->lastSquareContext = YY_START;
+                                            yyextra->current->metaData += "[";
                                             BEGIN( SliceMetadata );
                                           }
-                                          else if (!g_insideCS &&  
-					      (g_current->name.isEmpty() || 
-					       g_current->name=="typedef"
+                                          else if (!yyextra->insideCS &&  
+					      (yyextra->current->name.isEmpty() || 
+					       yyextra->current->name=="typedef"
 					      )
 					     ) // IDL function property
  					  {
-          				    g_squareCount=1;
-					    g_lastSquareContext = YY_START;
-					    g_idlAttr.resize(0);
-					    g_idlProp.resize(0);
-					    g_current->mtype = g_mtype;
+          				    yyextra->squareCount=1;
+					    yyextra->lastSquareContext = YY_START;
+					    yyextra->idlAttr.resize(0);
+					    yyextra->idlProp.resize(0);
+					    yyextra->current->mtype = yyextra->mtype;
 
 					    if (Config_getBool(IDL_PROPERTY_SUPPORT) &&
-					         g_current->mtype == Property)
-					    { // we are g_inside the properties section of a dispinterface
-					      g_odlProp = true;
-					      g_current->spec |= Entry::Gettable;
-					      g_current->spec |= Entry::Settable;
+					         yyextra->current->mtype == Property)
+					    { // we are yyextra->inside the properties section of a dispinterface
+					      yyextra->odlProp = true;
+					      yyextra->current->spec |= Entry::Gettable;
+					      yyextra->current->spec |= Entry::Settable;
 					    }
 
 					    BEGIN( IDLAttribute );
 					  }
-                                          else if (g_insideCS &&
-                                                  g_current->name.isEmpty())
+                                          else if (yyextra->insideCS &&
+                                                  yyextra->current->name.isEmpty())
                                           {
-                                            g_squareCount=1;
-                                            g_lastSquareContext = YY_START;
+                                            yyextra->squareCount=1;
+                                            yyextra->lastSquareContext = YY_START;
                                             // Skip the C# attribute
                                             // for this member
-                                            g_current->args.resize(0);
+                                            yyextra->current->args.resize(0);
                                             BEGIN( SkipSquare );
                                           }
 					  else
 					  {
-  					    g_current->args += yytext ;
-					    g_squareCount=1;
-					    g_externC=FALSE; // see bug759247
+  					    yyextra->current->args += yytext ;
+					    yyextra->squareCount=1;
+					    yyextra->externC=FALSE; // see bug759247
 					    BEGIN( Array ) ;
 					  }
 					}
 <SliceMetadata>"["                      { // Global metadata.
-          				  g_squareCount++;
-                                          g_current->metaData += "[";
+          				  yyextra->squareCount++;
+                                          yyextra->current->metaData += "[";
                                         }
 <SliceMetadata>{BN}*                    {
-          				  lineCount();
+          				  lineCount(yyscanner);
                                         }
 <SliceMetadata>\"[^\"]*\"               {
-                                          g_current->metaData += yytext;
+                                          yyextra->current->metaData += yytext;
                                         }
 <SliceMetadata>","                      {
-                                          g_current->metaData += yytext;
+                                          yyextra->current->metaData += yytext;
                                         }
 <SliceMetadata>"]"                      {
-                                          g_current->metaData += yytext;
-                                          if (--g_squareCount<=0)
+                                          yyextra->current->metaData += yytext;
+                                          if (--yyextra->squareCount<=0)
                                           {
-                                            BEGIN (g_lastSquareContext);
+                                            BEGIN (yyextra->lastSquareContext);
                                           }
                                         }
 <SliceOptional>"("                      {
-                                          g_current->type += "(";
-                                          g_roundCount++;
+                                          yyextra->current->type += "(";
+                                          yyextra->roundCount++;
                                         }
 <SliceOptional>[0-9]+                   {
-                                          g_current->type += yytext;
+                                          yyextra->current->type += yytext;
                                         }
 <SliceOptional>")"                      {
-                                          g_current->type += ")";
-                                          if(--g_roundCount<=0)
+                                          yyextra->current->type += ")";
+                                          if(--yyextra->roundCount<=0)
                                           {
-                                            BEGIN (g_lastModifierContext);
+                                            BEGIN (yyextra->lastModifierContext);
                                           }
                                         }
 <IDLAttribute>"]"			{
   					  // end of IDL function attribute
-					  if (--g_squareCount<=0)
+					  if (--yyextra->squareCount<=0)
 					  {
-					    lineCount();
-					    if (g_current->mtype == Property)
+					    lineCount(yyscanner);
+					    if (yyextra->current->mtype == Property)
 					      BEGIN( IDLPropName );
 					    else
-					      BEGIN( g_lastSquareContext );
+					      BEGIN( yyextra->lastSquareContext );
 					  }
 					}
 <IDLAttribute>"propput"	                {
                                           if (Config_getBool(IDL_PROPERTY_SUPPORT))
 					  {
-					    g_current->mtype = Property;
+					    yyextra->current->mtype = Property;
 					  }
-					  g_current->spec |= Entry::Settable;
+					  yyextra->current->spec |= Entry::Settable;
 					}
 <IDLAttribute>"propget" 		{
                                           if (Config_getBool(IDL_PROPERTY_SUPPORT))
 					  {
-					    g_current->mtype = Property;
+					    yyextra->current->mtype = Property;
 					  }
-					  g_current->spec |= Entry::Gettable;
+					  yyextra->current->spec |= Entry::Gettable;
 					}
 <IDLAttribute>"property" { // UNO IDL property
-					  g_current->spec |= Entry::Property;
+					  yyextra->current->spec |= Entry::Property;
 					}
 <IDLAttribute>"attribute" { // UNO IDL attribute
-					  g_current->spec |= Entry::Attribute;
+					  yyextra->current->spec |= Entry::Attribute;
 					}
 <IDLAttribute>"optional" { // on UNO IDL interface/service/attribute/property
-                           g_current->spec |= Entry::Optional;
+                           yyextra->current->spec |= Entry::Optional;
                          }
 <IDLAttribute>"readonly" { // on UNO IDL attribute or property
-					  if (Config_getBool(IDL_PROPERTY_SUPPORT) && g_odlProp)
+					  if (Config_getBool(IDL_PROPERTY_SUPPORT) && yyextra->odlProp)
 					  {
-					    g_current->spec ^= Entry::Settable;
+					    yyextra->current->spec ^= Entry::Settable;
 					  }
 					  else
 					  {
-					    g_current->spec |= Entry::Readonly;
+					    yyextra->current->spec |= Entry::Readonly;
 					  }
 					}
 <IDLAttribute>"bound" { // on UNO IDL attribute or property
-					  g_current->spec |= Entry::Bound;
+					  yyextra->current->spec |= Entry::Bound;
 					}
 <IDLAttribute>"removable" { // on UNO IDL property
-					  g_current->spec |= Entry::Removable;
+					  yyextra->current->spec |= Entry::Removable;
 					}
 <IDLAttribute>"constrained" { // on UNO IDL property
-					  g_current->spec |= Entry::Constrained;
+					  yyextra->current->spec |= Entry::Constrained;
 					}
 <IDLAttribute>"transient" { // on UNO IDL property
-					  g_current->spec |= Entry::Transient;
+					  yyextra->current->spec |= Entry::Transient;
 					}
 <IDLAttribute>"maybevoid" { // on UNO IDL property
-					  g_current->spec |= Entry::MaybeVoid;
+					  yyextra->current->spec |= Entry::MaybeVoid;
 					}
 <IDLAttribute>"maybedefault" { // on UNO IDL property
-					  g_current->spec |= Entry::MaybeDefault;
+					  yyextra->current->spec |= Entry::MaybeDefault;
 					}
 <IDLAttribute>"maybeambiguous" { // on UNO IDL property
-					  g_current->spec |= Entry::MaybeAmbiguous;
+					  yyextra->current->spec |= Entry::MaybeAmbiguous;
 					}
 <IDLAttribute>.				{
 					}
 <IDLPropName>{BN}*{ID}{BN}*		{
 					  // return type (probably HRESULT) - skip it
 
-					  if (g_odlProp)
+					  if (yyextra->odlProp)
 					  { // property type
-					    g_idlProp = yytext;
+					    yyextra->idlProp = yytext;
 					  }
 					}
 <IDLPropName>{ID}{BN}*"("		{
-  					  g_current->name = yytext;
-					  g_current->name = g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
-  					  g_current->startLine = g_yyLineNr;
-					  g_current->startColumn = g_yyColNr;
+  					  yyextra->current->name = yytext;
+					  yyextra->current->name = yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+  					  yyextra->current->startLine = yyextra->yyLineNr;
+					  yyextra->current->startColumn = yyextra->yyColNr;
 					  BEGIN( IDLProp );
 					}
 <IDLPropName>{BN}*"("{BN}*{ID}{BN}*")"{BN}*	{
-					   if (g_odlProp)
+					   if (yyextra->odlProp)
 					   {
-					     g_idlProp += yytext;
+					     yyextra->idlProp += yytext;
 					   }
 					}
 <IDLPropName>{ID}{BN}*/";"		{
-					   if (g_odlProp)
+					   if (yyextra->odlProp)
 					   {
-					     g_current->name = yytext;
-					     g_idlProp = g_idlProp.stripWhiteSpace();
-					     g_odlProp = false;
+					     yyextra->current->name = yytext;
+					     yyextra->idlProp = yyextra->idlProp.stripWhiteSpace();
+					     yyextra->odlProp = false;
 
 					     BEGIN( IDLProp );
 					   }
 					}
 <IDLProp>{BN}*"["[^\]]*"]"{BN}*		{  // attribute of a parameter
-					   g_idlAttr = yytext;
-					   g_idlAttr=g_idlAttr.stripWhiteSpace();
+					   yyextra->idlAttr = yytext;
+					   yyextra->idlAttr=yyextra->idlAttr.stripWhiteSpace();
 					}
 <IDLProp>{ID}				{  // property type
-					   g_idlProp = yytext;
+					   yyextra->idlProp = yytext;
 					}
 <IDLProp>{BN}*{ID}{BN}*"," 		{  // Rare: Another parameter ([propput] HRESULT Item(int index, [in] Type theRealProperty);)
-					  if (!g_current->args)
-					    g_current->args = "(";
+					  if (!yyextra->current->args)
+					    yyextra->current->args = "(";
 					  else
-					    g_current->args += ", ";
-					  g_current->args += g_idlAttr;
-					  g_current->args += " ";
-					  g_current->args += g_idlProp;	// prop was actually type of extra parameter
-					  g_current->args += " ";
-					  g_current->args += yytext;
-					  g_current->args = g_current->args.left(g_current->args.length() - 1);	// strip comma
-					  g_idlProp.resize(0);
-					  g_idlAttr.resize(0);
+					    yyextra->current->args += ", ";
+					  yyextra->current->args += yyextra->idlAttr;
+					  yyextra->current->args += " ";
+					  yyextra->current->args += yyextra->idlProp;	// prop was actually type of extra parameter
+					  yyextra->current->args += " ";
+					  yyextra->current->args += yytext;
+					  yyextra->current->args = yyextra->current->args.left(yyextra->current->args.length() - 1);	// strip comma
+					  yyextra->idlProp.resize(0);
+					  yyextra->idlAttr.resize(0);
 					  BEGIN( IDLProp );
 					}
 <IDLProp>{BN}*{ID}{BN}*")"{BN}*		{
 					  // the parameter name for the property - just skip.
 					}
 <IDLProp>";"				{
-					  g_current->fileName   = g_yyFileName;
-					  g_current->type		= g_idlProp;
-  					  g_current->args       = g_current->args.simplifyWhiteSpace();
-  					  if (g_current->args)
-  					    g_current->args += ")";
-  					  g_current->name       = g_current->name.stripWhiteSpace();
-					  g_current->section    = Entry::VARIABLE_SEC;
-					  g_current_root->moveToSubEntryAndRefresh(g_current);
-					  initEntry();
+					  yyextra->current->fileName   = yyextra->yyFileName;
+					  yyextra->current->type		= yyextra->idlProp;
+  					  yyextra->current->args       = yyextra->current->args.simplifyWhiteSpace();
+  					  if (yyextra->current->args)
+  					    yyextra->current->args += ")";
+  					  yyextra->current->name       = yyextra->current->name.stripWhiteSpace();
+					  yyextra->current->section    = Entry::VARIABLE_SEC;
+					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					  initEntry(yyscanner);
 					  BEGIN( FindMembers );
 					}
 <IDLProp>.				{ // spaces, *, or other stuff
-  					  //g_idlProp+=yytext;
+  					  //yyextra->idlProp+=yytext;
  					}
-<Array>"]"		                { g_current->args += *yytext ;
-					  if (--g_squareCount<=0)
+<Array>"]"		                { yyextra->current->args += *yytext ;
+					  if (--yyextra->squareCount<=0)
 	                                     BEGIN( FindMembers ) ;
 					}
-<FuncFuncArray>"]"		        { g_current->args += *yytext ;
-					  if (--g_squareCount<=0)
+<FuncFuncArray>"]"		        { yyextra->current->args += *yytext ;
+					  if (--yyextra->squareCount<=0)
 	                                     BEGIN( Function ) ;
 					}
-<Array,FuncFuncArray>"["		{ g_current->args += *yytext ;
-					  g_squareCount++;	
+<Array,FuncFuncArray>"["		{ yyextra->current->args += *yytext ;
+					  yyextra->squareCount++;	
 					}
-<Array,FuncFuncArray>.			{ g_current->args += *yytext ; }
-<SkipSquare>"["				{ g_squareCount++; }
+<Array,FuncFuncArray>.			{ yyextra->current->args += *yytext ; }
+<SkipSquare>"["				{ yyextra->squareCount++; }
 <SkipSquare>"]"				{
-  					  if (--g_squareCount<=0)
-					    BEGIN( g_lastSquareContext );
+  					  if (--yyextra->squareCount<=0)
+					    BEGIN( yyextra->lastSquareContext );
   					}
 <SkipSquare>\"				{
-  					  g_lastStringContext=YY_START;
+  					  yyextra->lastStringContext=YY_START;
   				          BEGIN( SkipString ); 
 					}
 <SkipSquare>[^\n\[\]\"]+
-<FindMembers>"<"			{ addType();
-					  g_current->type += yytext ;
+<FindMembers>"<"			{ addType(yyscanner);
+					  yyextra->current->type += yytext ;
 					  BEGIN( Sharp ) ;
 					}
-<Sharp>">"				{ g_current->type += *yytext ;
-					  if (--g_sharpCount<=0)
+<Sharp>">"				{ yyextra->current->type += *yytext ;
+					  if (--yyextra->sharpCount<=0)
 	                                     BEGIN( FindMembers ) ;
 					}
-<Sharp>"<"				{ g_current->type += *yytext ;
-					  g_sharpCount++;	
+<Sharp>"<"				{ yyextra->current->type += *yytext ;
+					  yyextra->sharpCount++;	
 					}
 <Sharp>{BN}+				{
-                                          g_current->type += ' ';
-  					  lineCount();
+                                          yyextra->current->type += ' ';
+  					  lineCount(yyscanner);
 					}
-<Sharp>.				{ g_current->type += *yytext ; }
+<Sharp>.				{ yyextra->current->type += *yytext ; }
 <FindFields>{ID}			{
-                                          if (g_insideCpp || g_insideObjC) 
+                                          if (yyextra->insideCpp || yyextra->insideObjC) 
                                           {
-                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
+                                            yyextra->current->id = ClangParser::instance()->lookup(yyextra->yyLineNr,yytext);
                                           }
-  					  g_current->bodyLine = g_yyLineNr;
-  					  g_current->name     = yytext;
+  					  yyextra->current->bodyLine = yyextra->yyLineNr;
+  					  yyextra->current->name     = yytext;
 					}
 <FindFields>"("				{
   					  // Java enum initializer
   					  unput('(');
-  					  g_lastInitializerContext = YY_START;
-					  g_initBracketCount=0;
-                                          g_current->initializer = "=";
+  					  yyextra->lastInitializerContext = YY_START;
+					  yyextra->initBracketCount=0;
+                                          yyextra->current->initializer = "=";
   					  BEGIN(ReadInitializer);
   					}
 <FindFields>"="				{
-  					  g_lastInitializerContext = YY_START;
-					  g_initBracketCount=0;
-                                          g_current->initializer = yytext;
+  					  yyextra->lastInitializerContext = YY_START;
+					  yyextra->initBracketCount=0;
+                                          yyextra->current->initializer = yytext;
   					  BEGIN(ReadInitializer);
   					}
 <FindFields>";"                         {
-  					  if (g_insideJava)  // g_last enum field in Java class
+  					  if (yyextra->insideJava)  // yyextra->last enum field in Java class
 					  {
-					    if (!g_current->name.isEmpty())
+					    if (!yyextra->current->name.isEmpty())
 					    {
-					      g_current->fileName   = g_yyFileName;
-					      g_current->startLine  = g_yyLineNr;
-					      g_current->startColumn = g_yyColNr;
-					      if (!(g_current_root->spec&Entry::Enum))
+					      yyextra->current->fileName   = yyextra->yyFileName;
+					      yyextra->current->startLine  = yyextra->yyLineNr;
+					      yyextra->current->startColumn = yyextra->yyColNr;
+					      if (!(yyextra->current_root->spec&Entry::Enum))
 					      {
-					        g_current->type       = "@"; // enum marker
+					        yyextra->current->type       = "@"; // enum marker
 					      }
-					      g_current->args       = g_current->args.simplifyWhiteSpace();
-					      g_current->name       = g_current->name.stripWhiteSpace();
-					      g_current->section    = Entry::VARIABLE_SEC;
-					      g_current_root->moveToSubEntryAndRefresh(g_current);
-					      initEntry();
+					      yyextra->current->args       = yyextra->current->args.simplifyWhiteSpace();
+					      yyextra->current->name       = yyextra->current->name.stripWhiteSpace();
+					      yyextra->current->section    = Entry::VARIABLE_SEC;
+					      yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					      initEntry(yyscanner);
 					    }
 
 					    BEGIN( FindMembers );
@@ -3763,70 +3463,70 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <SkipRemainder>\n			{ 
-                                          lineCount();
+                                          lineCount(yyscanner);
                                         }
 <SkipRemainder>[^\n]*
 <FindFields>","				{
 					  //printf("adding '%s' '%s' '%s' to enum '%s' (mGrpId=%d)\n",
-					  //     g_current->type.data(), g_current->name.data(),
-					  //     g_current->args.data(), g_current_root->name.data(),g_current->mGrpId);
-  					  if (!g_current->name.isEmpty())
-					  {
-					    g_current->fileName   = g_yyFileName;
-					    g_current->startLine  = g_yyLineNr;
-					    g_current->startColumn = g_yyColNr;
-					    if (!(g_current_root->spec&Entry::Enum))
+					  //     yyextra->current->type.data(), yyextra->current->name.data(),
+					  //     yyextra->current->args.data(), yyextra->current_root->name.data(),yyextra->current->mGrpId);
+  					  if (!yyextra->current->name.isEmpty())
+					  {
+					    yyextra->current->fileName   = yyextra->yyFileName;
+					    yyextra->current->startLine  = yyextra->yyLineNr;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    if (!(yyextra->current_root->spec&Entry::Enum))
 					    {
-					      g_current->type       = "@"; // enum marker
+					      yyextra->current->type       = "@"; // enum marker
 					    }
-  					    g_current->args       = g_current->args.simplifyWhiteSpace();
-  					    g_current->name       = g_current->name.stripWhiteSpace();
-					    g_current->section    = Entry::VARIABLE_SEC;
+  					    yyextra->current->args       = yyextra->current->args.simplifyWhiteSpace();
+  					    yyextra->current->name       = yyextra->current->name.stripWhiteSpace();
+					    yyextra->current->section    = Entry::VARIABLE_SEC;
 					    // add to the scope of the enum
-					    if (!g_insideCS && !g_insideJava &&
-                                                !(g_current_root->spec&Entry::Strong)) 
+					    if (!yyextra->insideCS && !yyextra->insideJava &&
+                                                !(yyextra->current_root->spec&Entry::Strong)) 
                                                 // for C# and Java 1.5+ enum values always have to be explicitly qualified,
                                                 // same for C++11 style enums (enum class Name {})
 					    {
 					      // add to the scope surrounding the enum (copy!)
                                               // we cannot during it directly as that would invalidate the iterator in parseCompounds.
-                                              //printf("*** adding outer scope entry for %s\n",g_current->name.data());
-                                              g_outerScopeEntries.emplace_back(g_current_root->parent(), std::make_unique<Entry>(*g_current));
+                                              //printf("*** adding outer scope entry for %s\n",yyextra->current->name.data());
+                                              yyextra->outerScopeEntries.emplace_back(yyextra->current_root->parent(), std::make_unique<Entry>(*yyextra->current));
 					    }
-					    g_current_root->moveToSubEntryAndRefresh(g_current);
-					    initEntry();
+					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					    initEntry(yyscanner);
 					  }
 					  else // probably a redundant , 
 					  {
-				     	    g_current->reset();
-					    initEntry();
+				     	    yyextra->current->reset();
+					    initEntry(yyscanner);
 					  }
   					}
 <FindFields>"["				{ // attribute list in IDL
-					  g_squareCount=1;
-					  g_lastSquareContext = YY_START;
+					  yyextra->squareCount=1;
+					  yyextra->lastSquareContext = YY_START;
 					  BEGIN(SkipSquare);
   					}
   /*
 <FindFieldArg>","			{ unput(*yytext); BEGIN(FindFields); }
   */
-<ReadBody,ReadNSBody,ReadBodyIntf>[^\r\n\#{}"@'/<]*	{ g_current->program += yytext ; }
-<ReadBody,ReadNSBody,ReadBodyIntf>"//".*		{ g_current->program += yytext ; }
-<ReadBody,ReadNSBody,ReadBodyIntf>"#".*	{ if (!g_insidePHP) 
+<ReadBody,ReadNSBody,ReadBodyIntf>[^\r\n\#{}"@'/<]*	{ yyextra->current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>"//".*		{ yyextra->current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>"#".*	{ if (!yyextra->insidePHP) 
 					    REJECT;
 					  // append PHP comment.
-					  g_current->program += yytext ;
+					  yyextra->current->program += yytext ;
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>@\"	{ g_current->program += yytext ; 
-                                          g_pSkipVerbString = &g_current->program;
-                                          g_lastSkipVerbStringContext=YY_START;
+<ReadBody,ReadNSBody,ReadBodyIntf>@\"	{ yyextra->current->program += yytext ; 
+                                          yyextra->pSkipVerbString = &yyextra->current->program;
+                                          yyextra->lastSkipVerbStringContext=YY_START;
                                           BEGIN( SkipVerbString );
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>"<<<"	{ if (g_insidePHP)
+<ReadBody,ReadNSBody,ReadBodyIntf>"<<<"	{ if (yyextra->insidePHP)
                                           {
-                                            g_current->program += yytext ; 
-                                            g_pCopyHereDocGString = &g_current->program;
-                                            g_lastHereDocContext=YY_START;
+                                            yyextra->current->program += yytext ; 
+                                            yyextra->pCopyHereDocGString = &yyextra->current->program;
+                                            yyextra->lastHereDocContext=YY_START;
                                             BEGIN( CopyHereDoc );
                                           }
                                           else
@@ -3834,154 +3534,154 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                             REJECT;
                                           }
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>\"	{ g_current->program += yytext ; 
-                                          g_pCopyQuotedGString = &g_current->program;
-                                          g_lastStringContext=YY_START;
+<ReadBody,ReadNSBody,ReadBodyIntf>\"	{ yyextra->current->program += yytext ; 
+                                          yyextra->pCopyQuotedGString = &yyextra->current->program;
+                                          yyextra->lastStringContext=YY_START;
                                           BEGIN( CopyGString );
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{B}*		{ g_current->program += yytext ;
-					  g_lastContext = YY_START ;
+<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{B}*		{ yyextra->current->program += yytext ;
+					  yyextra->lastContext = YY_START ;
 					  BEGIN( Comment ) ;
 					}
-<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{BL}		{ g_current->program += yytext ;
-					  ++g_yyLineNr ;
-					  g_lastContext = YY_START ;
+<ReadBody,ReadNSBody,ReadBodyIntf>"/*"{BL}		{ yyextra->current->program += yytext ;
+					  ++yyextra->yyLineNr ;
+					  yyextra->lastContext = YY_START ;
 					  BEGIN( Comment ) ;
 					}
 <ReadBody,ReadNSBody,ReadBodyIntf>"'"	{
-  					  if (!g_insidePHP)
+  					  if (!yyextra->insidePHP)
 					  {
-					    g_current->program += yytext;
+					    yyextra->current->program += yytext;
 					  }
 					  else
 					  { // begin of single quoted string
-					    g_current->program += yytext;
-                                            g_pCopyQuotedGString = &g_current->program;
-                                            g_lastStringContext=YY_START;
+					    yyextra->current->program += yytext;
+                                            yyextra->pCopyQuotedGString = &yyextra->current->program;
+                                            yyextra->lastStringContext=YY_START;
 					    BEGIN(CopyPHPGString);
 					  }
   					}
 <ReadBody,ReadNSBody,ReadBodyIntf>{CHARLIT} { 
-                                              if (g_insidePHP) 
+                                              if (yyextra->insidePHP) 
 					      {
 						REJECT; // for PHP code single quotes 
 					                // are used for strings of arbitrary length
 					      }
 					      else
 					      {
-                                                g_current->program += yytext; 
+                                                yyextra->current->program += yytext; 
 					      }
                                             }
-<ReadBody,ReadNSBody,ReadBodyIntf>"{"   { g_current->program += yytext ;
-					  ++g_curlyCount ;
+<ReadBody,ReadNSBody,ReadBodyIntf>"{"   { yyextra->current->program += yytext ;
+					  ++yyextra->curlyCount ;
 					}
 <ReadBodyIntf>"}"			{
-					  g_current->program += yytext ;
-					  --g_curlyCount ;
+					  yyextra->current->program += yytext ;
+					  --yyextra->curlyCount ;
   					}
-<ReadBody,ReadNSBody>"}"		{ //err("ReadBody count=%d\n",g_curlyCount);
-  					  if ( g_curlyCount>0 )
+<ReadBody,ReadNSBody>"}"		{ //err("ReadBody count=%d\n",yyextra->curlyCount);
+  					  if ( yyextra->curlyCount>0 )
 					  {
-					    g_current->program += yytext ;
-					    --g_curlyCount ;
+					    yyextra->current->program += yytext ;
+					    --yyextra->curlyCount ;
 					  }
 					  else
 					  {
-					    g_current->endBodyLine = g_yyLineNr;
-                                            Entry * original_root = g_current_root; // save root this namespace is in
-                                            if (g_current->section == Entry::NAMESPACE_SEC && g_current->type == "namespace")
+					    yyextra->current->endBodyLine = yyextra->yyLineNr;
+                                            Entry * original_root = yyextra->current_root; // save root this namespace is in
+                                            if (yyextra->current->section == Entry::NAMESPACE_SEC && yyextra->current->type == "namespace")
                                             {
                                               int split_point;
                                               // save documentation values
-                                              QCString doc       = g_current->doc;
-                                              int      docLine   = g_current->docLine;
-                                              QCString docFile   = g_current->docFile;
-                                              QCString brief     = g_current->brief;
-                                              int      briefLine = g_current->briefLine;
-                                              QCString briefFile = g_current->briefFile;
+                                              QCString doc       = yyextra->current->doc;
+                                              int      docLine   = yyextra->current->docLine;
+                                              QCString docFile   = yyextra->current->docFile;
+                                              QCString brief     = yyextra->current->brief;
+                                              int      briefLine = yyextra->current->briefLine;
+                                              QCString briefFile = yyextra->current->briefFile;
                                               // reset documentation values
-                                              g_current->doc       = "";
-                                              g_current->docLine   = 0;
-                                              g_current->docFile   = "";
-                                              g_current->brief     = "";
-                                              g_current->briefLine = 0;
-                                              g_current->briefFile = "";
-                                              while ((split_point = g_current->name.find("::")) != -1)
+                                              yyextra->current->doc       = "";
+                                              yyextra->current->docLine   = 0;
+                                              yyextra->current->docFile   = "";
+                                              yyextra->current->brief     = "";
+                                              yyextra->current->briefLine = 0;
+                                              yyextra->current->briefFile = "";
+                                              while ((split_point = yyextra->current->name.find("::")) != -1)
                                               {
-                                                std::unique_ptr<Entry> new_g_current = std::make_unique<Entry>(*g_current);
-                                                g_current->program = "";
-                                                new_g_current->name  = g_current->name.mid(split_point + 2);
-                                                g_current->name  = g_current->name.left(split_point);
-                                                if (!g_current_root->name.isEmpty()) g_current->name.prepend(g_current_root->name+"::");
-
-                                                Entry *tmp = g_current.get();
-                                                g_current_root->moveToSubEntryAndKeep(g_current);
-                                                g_current_root = tmp;
-                                                g_current.swap(new_g_current);
+                                                std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*yyextra->current);
+                                                yyextra->current->program = "";
+                                                new_current->name  = yyextra->current->name.mid(split_point + 2);
+                                                yyextra->current->name  = yyextra->current->name.left(split_point);
+                                                if (!yyextra->current_root->name.isEmpty()) yyextra->current->name.prepend(yyextra->current_root->name+"::");
+
+                                                Entry *tmp = yyextra->current.get();
+                                                yyextra->current_root->moveToSubEntryAndKeep(yyextra->current);
+                                                yyextra->current_root = tmp;
+                                                yyextra->current.swap(new_current);
                                               }
                                               // restore documentation values
-                                              g_current->doc       = doc;
-                                              g_current->docLine   = docLine;
-                                              g_current->docFile   = docFile;
-                                              g_current->brief     = brief;
-                                              g_current->briefLine = briefLine;
-                                              g_current->briefFile = briefFile;
+                                              yyextra->current->doc       = doc;
+                                              yyextra->current->docLine   = docLine;
+                                              yyextra->current->docFile   = docFile;
+                                              yyextra->current->brief     = brief;
+                                              yyextra->current->briefLine = briefLine;
+                                              yyextra->current->briefFile = briefFile;
                                             }
-					    QCString &cn = g_current->name;
-					    QCString rn = g_current_root->name.copy();
-					    //printf("cn='%s' rn='%s' g_isTypedef=%d\n",cn.data(),rn.data(),g_isTypedef);
+					    QCString &cn = yyextra->current->name;
+					    QCString rn = yyextra->current_root->name.copy();
+					    //printf("cn='%s' rn='%s' yyextra->isTypedef=%d\n",cn.data(),rn.data(),yyextra->isTypedef);
 					    if (!cn.isEmpty() && !rn.isEmpty())
 					    {
-					      prependScope();
+					      prependScope(yyscanner);
 					    }
-					    if (g_isTypedef && cn.isEmpty())
+					    if (yyextra->isTypedef && cn.isEmpty())
 					    {
 					      //printf("Typedef Name\n");
 					      BEGIN( TypedefName );
 					    }
 					    else
 					    {
-					      if ((g_current->section == Entry::ENUM_SEC) || (g_current->spec&Entry::Enum))
+					      if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
 					      {
-					        g_current->program+=','; // add field terminator
+					        yyextra->current->program+=','; // add field terminator
 					      }
 					      // add compound definition to the tree
-					      g_current->args=removeRedundantWhiteSpace(g_current->args);
-					                // was: g_current->args.simplifyWhiteSpace();
-  					      g_current->type = g_current->type.simplifyWhiteSpace();
-  					      g_current->name = g_current->name.stripWhiteSpace();
-					      //printf("adding '%s' '%s' '%s' brief=%s g_insideObjC=%d %x\n",g_current->type.data(),g_current->name.data(),g_current->args.data(),g_current->brief.data(),g_insideObjC,g_current->section);
-					      if (g_insideObjC && 
-						  ((g_current->spec&Entry::Interface) || (g_current->spec==Entry::Category))
+					      yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
+					                // was: yyextra->current->args.simplifyWhiteSpace();
+  					      yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
+  					      yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+					      //printf("adding '%s' '%s' '%s' brief=%s yyextra->insideObjC=%d %x\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data(),yyextra->current->brief.data(),yyextra->insideObjC,yyextra->current->section);
+					      if (yyextra->insideObjC && 
+						  ((yyextra->current->spec&Entry::Interface) || (yyextra->current->spec==Entry::Category))
 						 ) // method definition follows
 					      {
 				                BEGIN( ReadBodyIntf ) ;
 					      }
 					      else
 					      {
-					        g_memspecEntry = g_current.get();
-					        g_current_root->copyToSubEntry( g_current ) ;
-						if (g_current->section==Entry::NAMESPACE_SEC ||
-						    (g_current->spec==Entry::Interface) ||
-						    g_insideJava || g_insidePHP || g_insideCS || g_insideD || g_insideJS ||
-                                                    g_insideSlice
+					        yyextra->memspecEntry = yyextra->current.get();
+					        yyextra->current_root->copyToSubEntry( yyextra->current ) ;
+						if (yyextra->current->section==Entry::NAMESPACE_SEC ||
+						    (yyextra->current->spec==Entry::Interface) ||
+						    yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideJS ||
+                                                    yyextra->insideSlice
 						   )
 						{ // namespaces and interfaces and java classes ends with a closing bracket without semicolon
-                                                  g_current->reset();
-                                                  g_current_root = original_root; // restore scope from before namespace descent
-						  initEntry();
-						  g_memspecEntry = 0;
+                                                  yyextra->current->reset();
+                                                  yyextra->current_root = original_root; // restore scope from before namespace descent
+						  initEntry(yyscanner);
+						  yyextra->memspecEntry = 0;
 						  BEGIN( FindMembers ) ;
 						}
 						else
 						{
                                                   static QRegExp re("@[0-9]+$");
-						  if (!g_isTypedef && g_memspecEntry &&
-                                                      g_memspecEntry->name.find(re)==-1) // not typedef or anonymous type (see bug691071)
+						  if (!yyextra->isTypedef && yyextra->memspecEntry &&
+                                                      yyextra->memspecEntry->name.find(re)==-1) // not typedef or anonymous type (see bug691071)
 						  {
 						    // enabled the next two lines for bug 623424
-						    g_current->doc.resize(0);
-						    g_current->brief.resize(0);
+						    yyextra->current->doc.resize(0);
+						    yyextra->current->brief.resize(0);
 						  }
 						  BEGIN( MemberSpec ) ;
 						}
@@ -3989,113 +3689,113 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    }
 					  }
 					}
-<ReadBody>"}"{BN}+"typedef"{BN}+	{ //err("ReadBody count=%d\n",g_curlyCount);
-					  lineCount();
-  					  if ( g_curlyCount>0 )
+<ReadBody>"}"{BN}+"typedef"{BN}+	{ //err("ReadBody count=%d\n",yyextra->curlyCount);
+					  lineCount(yyscanner);
+  					  if ( yyextra->curlyCount>0 )
 					  {
-					    g_current->program += yytext ;
-					    --g_curlyCount ;
+					    yyextra->current->program += yytext ;
+					    --yyextra->curlyCount ;
 					  }
 					  else
 					  {
-					    g_isTypedef = TRUE;
-					    g_current->endBodyLine = g_yyLineNr;
-					    QCString &cn = g_current->name;
-					    QCString rn = g_current_root->name.copy();
+					    yyextra->isTypedef = TRUE;
+					    yyextra->current->endBodyLine = yyextra->yyLineNr;
+					    QCString &cn = yyextra->current->name;
+					    QCString rn = yyextra->current_root->name.copy();
 					    if (!cn.isEmpty() && !rn.isEmpty())
 					    {
-					      prependScope();
+					      prependScope(yyscanner);
 					    }
 					    BEGIN( TypedefName );
 					  }
 					}
 <TypedefName>("const"|"volatile"){BN}	{ // late "const" or "volatile" keyword
-					  lineCount();
-  					  g_current->type.prepend(yytext);
+					  lineCount(yyscanner);
+  					  yyextra->current->type.prepend(yytext);
   					}
 <TypedefName>{ID}			{
-					  if ((g_current->section == Entry::ENUM_SEC) || (g_current->spec&Entry::Enum))
+					  if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
 					  {
-					    g_current->program+=","; // add field terminator
+					    yyextra->current->program+=","; // add field terminator
 					  }
-  				          g_current->name=yytext;
-					  prependScope();
-  					  g_current->args = g_current->args.simplifyWhiteSpace();
-  					  g_current->type = g_current->type.simplifyWhiteSpace();
-					  //printf("Adding compound %s %s %s\n",g_current->type.data(),g_current->name.data(),g_current->args.data());
-					  if (!g_firstTypedefEntry)
+  				          yyextra->current->name=yytext;
+					  prependScope(yyscanner);
+  					  yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+  					  yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
+					  //printf("Adding compound %s %s %s\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+					  if (!yyextra->firstTypedefEntry)
 					  {
-					    g_firstTypedefEntry = g_current.get();
+					    yyextra->firstTypedefEntry = yyextra->current.get();
 					  }
-					  g_current_root->moveToSubEntryAndRefresh( g_current ) ;
-					  initEntry();
-					  g_isTypedef=TRUE; // to undo reset by initEntry()
+					  yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+					  initEntry(yyscanner);
+					  yyextra->isTypedef=TRUE; // to undo reset by initEntry(yyscanner)
   					  BEGIN(MemberSpecSkip); 
   					}
 <TypedefName>";"			{ /* typedef of anonymous type */
-					  g_current->name.sprintf("@%d",g_anonCount++);
-					  if ((g_current->section == Entry::ENUM_SEC) || (g_current->spec&Entry::Enum))
+					  yyextra->current->name.sprintf("@%d",yyextra->anonCount++);
+					  if ((yyextra->current->section == Entry::ENUM_SEC) || (yyextra->current->spec&Entry::Enum))
 					  {
-					    g_current->program+=','; // add field terminator
+					    yyextra->current->program+=','; // add field terminator
 					  }
 					  // add compound definition to the tree
-  					  g_current->args = g_current->args.simplifyWhiteSpace();
-  					  g_current->type = g_current->type.simplifyWhiteSpace();
-					  g_memspecEntry = g_current.get();
-					  g_current_root->moveToSubEntryAndRefresh( g_current ) ;
-					  initEntry();
+  					  yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
+  					  yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
+					  yyextra->memspecEntry = yyextra->current.get();
+					  yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+					  initEntry(yyscanner);
 					  unput(';');
 					  BEGIN( MemberSpec ) ;
   					}
 <MemberSpec>([*&]*{BN}*)*{ID}{BN}*("["[^\]\n]*"]")* { // the [] part could be improved.
-  					  lineCount();
+  					  lineCount(yyscanner);
   					  int i=0,l=(int)yyleng,j;
 					  while (i<l && (!isId(yytext[i]))) i++;
-					  g_msName = QCString(yytext).right(l-i).stripWhiteSpace();
-					  j=g_msName.find("[");
+					  yyextra->msName = QCString(yytext).right(l-i).stripWhiteSpace();
+					  j=yyextra->msName.find("[");
 					  if (j!=-1) 
 					  {
-					    g_msArgs=g_msName.right(g_msName.length()-j);
-					    g_msName=g_msName.left(j);
+					    yyextra->msArgs=yyextra->msName.right(yyextra->msName.length()-j);
+					    yyextra->msName=yyextra->msName.left(j);
 					  }
-					  g_msType=QCString(yytext).left(i);
+					  yyextra->msType=QCString(yytext).left(i);
 
 					  // handle *pName in: typedef { ... } name, *pName;
-					  if (g_firstTypedefEntry) 
+					  if (yyextra->firstTypedefEntry) 
 					  {
-					    if (g_firstTypedefEntry->spec&Entry::Struct)
+					    if (yyextra->firstTypedefEntry->spec&Entry::Struct)
 					    {
-					      g_msType.prepend("struct "+g_firstTypedefEntry->name);
+					      yyextra->msType.prepend("struct "+yyextra->firstTypedefEntry->name);
 					    }
-					    else if (g_firstTypedefEntry->spec&Entry::Union)
+					    else if (yyextra->firstTypedefEntry->spec&Entry::Union)
 					    {
-					      g_msType.prepend("union "+g_firstTypedefEntry->name);
+					      yyextra->msType.prepend("union "+yyextra->firstTypedefEntry->name);
 					    }
-					    else if (g_firstTypedefEntry->section==Entry::ENUM_SEC)
+					    else if (yyextra->firstTypedefEntry->section==Entry::ENUM_SEC)
 					    {
-					      g_msType.prepend("enum "+g_firstTypedefEntry->name);
+					      yyextra->msType.prepend("enum "+yyextra->firstTypedefEntry->name);
 					    }
 					    else
 					    {
-					      g_msType.prepend(g_firstTypedefEntry->name);
+					      yyextra->msType.prepend(yyextra->firstTypedefEntry->name);
 					    }
 					  }
 					}
 <MemberSpec>"("				{ // function with struct return type
-  					  addType();
-  					  g_current->name = g_msName;
-					  g_current->spec = 0;
+  					  addType(yyscanner);
+  					  yyextra->current->name = yyextra->msName;
+					  yyextra->current->spec = 0;
   					  unput('(');
 					  BEGIN(FindMembers);
   					}
 <MemberSpec>[,;]			{
-  					  if (g_msName.isEmpty() && !g_current->name.isEmpty())
+  					  if (yyextra->msName.isEmpty() && !yyextra->current->name.isEmpty())
 					  { 
-					    // see if the compound does not have a name or is g_inside another
+					    // see if the compound does not have a name or is yyextra->inside another
 					    // anonymous compound. If so we insert a 
 					    // special 'anonymous' variable.
-					    //Entry *p=g_current_root;
-					    const Entry *p=g_current.get();
+					    //Entry *p=yyextra->current_root;
+					    const Entry *p=yyextra->current.get();
 					    while (p)
 					    {
 					      // only look for class scopes, not namespace scopes
@@ -4106,164 +3806,164 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 						int pi = (i==-1) ? 0 : i+2;
 						if (p->name.at(pi)=='@')
 						{
-						  // anonymous compound g_inside -> insert dummy variable name
+						  // anonymous compound yyextra->inside -> insert dummy variable name
 						  //printf("Adding anonymous variable for scope %s\n",p->name.data());
-						  g_msName.sprintf("@%d",g_anonCount++); 
+						  yyextra->msName.sprintf("@%d",yyextra->anonCount++); 
 						  break;
 						}
 					      }
 					      //p=p->parent;
-					      if (p==g_current.get()) p=g_current_root; else p=p->parent();
+					      if (p==yyextra->current.get()) p=yyextra->current_root; else p=p->parent();
 					    }
 					  }
-					  //printf("g_msName=%s g_current->name=%s\n",g_msName.data(),g_current->name.data());
-					  if (!g_msName.isEmpty() 
-					      /*&& g_msName!=g_current->name*/) // skip typedef T {} T;, removed due to bug608493
+					  //printf("yyextra->msName=%s yyextra->current->name=%s\n",yyextra->msName.data(),yyextra->current->name.data());
+					  if (!yyextra->msName.isEmpty() 
+					      /*&& yyextra->msName!=yyextra->current->name*/) // skip typedef T {} T;, removed due to bug608493
 					  {
 					    bool typedefHidesStruct = Config_getBool(TYPEDEF_HIDES_STRUCT);
 					    // case 1: typedef struct _S { ... } S_t; 
 					    // -> omit typedef and use S_t as the struct name
 					    if (typedefHidesStruct && 
-						g_isTypedef && 
-						((g_current->spec&(Entry::Struct|Entry::Union)) ||
-						 g_current->section==Entry::ENUM_SEC )&&
-						g_msType.stripWhiteSpace().isEmpty() && 
-						g_memspecEntry)
+						yyextra->isTypedef && 
+						((yyextra->current->spec&(Entry::Struct|Entry::Union)) ||
+						 yyextra->current->section==Entry::ENUM_SEC )&&
+						yyextra->msType.stripWhiteSpace().isEmpty() && 
+						yyextra->memspecEntry)
 					    {
-					      g_memspecEntry->name=g_msName;
+					      yyextra->memspecEntry->name=yyextra->msName;
 					    }
 					    else // case 2: create a typedef field
 					    {
                                               std::unique_ptr<Entry> varEntry=std::make_unique<Entry>();
-					      varEntry->lang = g_language;
-					      varEntry->protection = g_current->protection ;
-					      varEntry->mtype = g_current->mtype;
-					      varEntry->virt = g_current->virt;
-					      varEntry->stat = g_current->stat;
+					      varEntry->lang = yyextra->language;
+					      varEntry->protection = yyextra->current->protection ;
+					      varEntry->mtype = yyextra->current->mtype;
+					      varEntry->virt = yyextra->current->virt;
+					      varEntry->stat = yyextra->current->stat;
 					      varEntry->section = Entry::VARIABLE_SEC;
-					      varEntry->name = g_msName.stripWhiteSpace();
-					      varEntry->type = g_current->type.simplifyWhiteSpace()+" ";
-					      varEntry->args = g_msArgs; 
-					      if (g_isTypedef)
+					      varEntry->name = yyextra->msName.stripWhiteSpace();
+					      varEntry->type = yyextra->current->type.simplifyWhiteSpace()+" ";
+					      varEntry->args = yyextra->msArgs; 
+					      if (yyextra->isTypedef)
 					      {
 						varEntry->type.prepend("typedef ");
-						//  //printf("g_current->name = %s %s\n",g_current->name.data(),g_msName.data());
+						//  //printf("yyextra->current->name = %s %s\n",yyextra->current->name.data(),yyextra->msName.data());
 					      }
 					      if (typedefHidesStruct &&
-						  g_isTypedef &&
-						  (g_current->spec&(Entry::Struct|Entry::Union)) &&
-						  g_memspecEntry
+						  yyextra->isTypedef &&
+						  (yyextra->current->spec&(Entry::Struct|Entry::Union)) &&
+						  yyextra->memspecEntry
 						 ) // case 1: use S_t as type for pS_t in "typedef struct _S {} S_t, *pS_t;"
 					      {
-						varEntry->type+=g_memspecEntry->name+g_msType;
+						varEntry->type+=yyextra->memspecEntry->name+yyextra->msType;
 					      }
 					      else // case 2: use _S as type for for pS_t
 					      {
-						varEntry->type+=g_current->name+g_msType;
+						varEntry->type+=yyextra->current->name+yyextra->msType;
 					      }
-					      varEntry->fileName = g_yyFileName;
-					      varEntry->startLine = g_yyLineNr;
-					      varEntry->startColumn = g_yyColNr;
-					      varEntry->doc = g_current->doc.copy();
-					      varEntry->brief = g_current->brief.copy();
-					      varEntry->mGrpId = g_current->mGrpId;
-                                              varEntry->initializer = g_current->initializer;
-                                              varEntry->groups = g_current->groups;
-                                              varEntry->sli = g_current->sli;
+					      varEntry->fileName = yyextra->yyFileName;
+					      varEntry->startLine = yyextra->yyLineNr;
+					      varEntry->startColumn = yyextra->yyColNr;
+					      varEntry->doc = yyextra->current->doc.copy();
+					      varEntry->brief = yyextra->current->brief.copy();
+					      varEntry->mGrpId = yyextra->current->mGrpId;
+                                              varEntry->initializer = yyextra->current->initializer;
+                                              varEntry->groups = yyextra->current->groups;
+                                              varEntry->sli = yyextra->current->sli;
 
 					      //printf("Add: type='%s',name='%s',args='%s' brief=%s doc=%s\n",
 					      //      varEntry->type.data(),varEntry->name.data(),
 					      //      varEntry->args.data(),varEntry->brief.data(),varEntry->doc.data());
-					      g_current_root->moveToSubEntryAndKeep(varEntry);
+					      yyextra->current_root->moveToSubEntryAndKeep(varEntry);
 					    }
 					  }
 					  if (*yytext==';') // end of a struct/class ...
 					  {
-					    if (!g_isTypedef && g_msName.isEmpty() && g_memspecEntry && (g_current->section&Entry::COMPOUND_MASK))
+					    if (!yyextra->isTypedef && yyextra->msName.isEmpty() && yyextra->memspecEntry && (yyextra->current->section&Entry::COMPOUND_MASK))
 					    { // case where a class/struct has a doc block after it
-					      if (!g_current->doc.isEmpty())
+					      if (!yyextra->current->doc.isEmpty())
 					      {
-					        g_memspecEntry->doc += g_current->doc;
+					        yyextra->memspecEntry->doc += yyextra->current->doc;
 					      }
-					      if (!g_current->brief.isEmpty())
+					      if (!yyextra->current->brief.isEmpty())
 					      {
-					        g_memspecEntry->brief += g_current->brief;
+					        yyextra->memspecEntry->brief += yyextra->current->brief;
 					      }
 				  	    }
-					    g_msType.resize(0);
-					    g_msName.resize(0);
-					    g_msArgs.resize(0);
-					    g_isTypedef=FALSE;
-					    g_firstTypedefEntry=0;
-					    g_memspecEntry=0;
-					    g_current->reset();
-					    initEntry();
+					    yyextra->msType.resize(0);
+					    yyextra->msName.resize(0);
+					    yyextra->msArgs.resize(0);
+					    yyextra->isTypedef=FALSE;
+					    yyextra->firstTypedefEntry=0;
+					    yyextra->memspecEntry=0;
+					    yyextra->current->reset();
+					    initEntry(yyscanner);
 					    BEGIN( FindMembers );
 					  }
 					  else
 					  {
-					    g_current->doc.resize(0);
-					    g_current->brief.resize(0);
+					    yyextra->current->doc.resize(0);
+					    yyextra->current->brief.resize(0);
 					  }
 
   					}
 <MemberSpec>"="				{ 
-  					  g_lastInitializerContext=YY_START;
-					  g_initBracketCount=0;
-                                          g_current->initializer = yytext;
+  					  yyextra->lastInitializerContext=YY_START;
+					  yyextra->initBracketCount=0;
+                                          yyextra->current->initializer = yytext;
   					  BEGIN(ReadInitializer);
   					  /* BEGIN(MemberSpecSkip); */
 					}
   /*
 <MemberSpecSkip>"{"			{
-  					  g_curlyCount=0;
-					  g_lastCurlyContext = MemberSpecSkip;
-					  g_previous = g_current;
+  					  yyextra->curlyCount=0;
+					  yyextra->lastCurlyContext = MemberSpecSkip;
+					  yyextra->previous = yyextra->current;
   					  BEGIN(SkipCurly);
   					}
   */
 <MemberSpecSkip>","			{ BEGIN(MemberSpec); }
 <MemberSpecSkip>";"		        { unput(';'); BEGIN(MemberSpec); }
-<ReadBody,ReadNSBody,ReadBodyIntf>{BN}{1,80} { g_current->program += yytext ;
-					  lineCount() ;
+<ReadBody,ReadNSBody,ReadBodyIntf>{BN}{1,80} { yyextra->current->program += yytext ;
+					  lineCount(yyscanner) ;
 					}
 <ReadBodyIntf>"@end"/[^a-z_A-Z0-9]	{ // end of Objective C block
-					  g_current_root->moveToSubEntryAndRefresh( g_current ) ;
-					  initEntry();
-					  g_language = g_current->lang = SrcLangExt_Cpp; // see bug746361
-					  g_insideObjC=FALSE;
+					  yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+					  initEntry(yyscanner);
+					  yyextra->language = yyextra->current->lang = SrcLangExt_Cpp; // see bug746361
+					  yyextra->insideObjC=FALSE;
 					  BEGIN( FindMembers ); 
   					}
-<ReadBody,ReadNSBody,ReadBodyIntf>.	{ g_current->program += yytext ; }
+<ReadBody,ReadNSBody,ReadBodyIntf>.	{ yyextra->current->program += yytext ; }
 
 <FindMembers>"("/{BN}*"::"*{BN}*({TSCOPE}{BN}*"::")*{TSCOPE}{BN}*")"{BN}*"(" | /* typedef void (A<int>::func_t)(args...) */
 <FindMembers>("("({BN}*"::"*{BN}*{TSCOPE}{BN}*"::")*({BN}*[*&\^]{BN}*)+)+ {   /* typedef void (A::*ptr_t)(args...) or int (*func(int))[], the ^ is for Obj-C blocks */
-  					  if (g_insidePHP) // reference parameter
+  					  if (yyextra->insidePHP) // reference parameter
 					  {
 					    REJECT
 					  }
 					  else
 					  {
-					    g_current->bodyLine = g_yyLineNr;
-					    lineCount();
-					    addType();
-					    g_funcPtrType=yytext;
-					    g_roundCount=0;
-					    //g_current->type += yytext;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+					    lineCount(yyscanner);
+					    addType(yyscanner);
+					    yyextra->funcPtrType=yytext;
+					    yyextra->roundCount=0;
+					    //yyextra->current->type += yytext;
 					    BEGIN( FuncPtr );
 					  }
   					}
 <FuncPtr>{SCOPENAME}			{
-  					  g_current->name = yytext;
-					  if (nameIsOperator(g_current->name))
+  					  yyextra->current->name = yytext;
+					  if (nameIsOperator(yyextra->current->name))
 					  {
 					    BEGIN( FuncPtrOperator );
 					  }
 					  else
 					  {
-					    if (g_current->name=="const" || g_current->name=="volatile")
+					    if (yyextra->current->name=="const" || yyextra->current->name=="volatile")
 					    {
-					      g_funcPtrType += g_current->name;
+					      yyextra->funcPtrType += yyextra->current->name;
 					    }
 					    else
 					    {
@@ -4272,213 +3972,213 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <FuncPtr>.				{
-  					  //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,g_yyLineNr,g_yyFileName);
+  					  //printf("error: FuncPtr '%c' unexpected at line %d of %s\n",*yytext,yyextra->yyLineNr,yyextra->yyFileName);
   					}
 <FuncPtrOperator>"("{BN}*")"{BN}*/"("	{
-  					  g_current->name += yytext;
-					  g_current->name = g_current->name.simplifyWhiteSpace();
-					  lineCount();
+  					  yyextra->current->name += yytext;
+					  yyextra->current->name = yyextra->current->name.simplifyWhiteSpace();
+					  lineCount(yyscanner);
   					}
 <FuncPtrOperator>\n			{
-                                          lineCount();
-  					  g_current->name += *yytext;
+                                          lineCount(yyscanner);
+  					  yyextra->current->name += *yytext;
   					}
 <FuncPtrOperator>"("			{
   					  unput(*yytext);
 					  BEGIN( EndFuncPtr );
                                         }
 <FuncPtrOperator>.			{
-  					  g_current->name += *yytext;
+  					  yyextra->current->name += *yytext;
   					}
 <EndFuncPtr>")"{BN}*/";"		{ // a variable with extra braces
- 					  lineCount();
-					  g_current->type+=g_funcPtrType.data()+1;
+ 					  lineCount(yyscanner);
+					  yyextra->current->type+=yyextra->funcPtrType.data()+1;
   					  BEGIN(FindMembers);
   					}
 <EndFuncPtr>")"{BN}*/"("		{ // a function pointer
-  					  lineCount();
-					  g_current->type+=g_funcPtrType+")";
+  					  lineCount(yyscanner);
+					  yyextra->current->type+=yyextra->funcPtrType+")";
 					  BEGIN(FindMembers);
   					}
 <EndFuncPtr>")"{BN}*/"["		{ // an array of variables
-  					  lineCount();
-					  g_current->type+=g_funcPtrType.data();
-					  g_current->args += ")";
+  					  lineCount(yyscanner);
+					  yyextra->current->type+=yyextra->funcPtrType.data();
+					  yyextra->current->args += ")";
 					  BEGIN(FindMembers);
   					}
 <EndFuncPtr>"("				{ // a function returning a function or 
                                           // a function returning a pointer to an array
-  					  g_current->args += *yytext ;
-					  //g_roundCount=0;
+  					  yyextra->current->args += *yytext ;
+					  //yyextra->roundCount=0;
 					  //BEGIN( FuncFunc );
-					  g_current->bodyLine = g_yyLineNr;
-					  g_currentArgumentContext = FuncFuncEnd;
-					  g_fullArgString=g_current->args.copy();
-					  g_copyArgString=&g_current->args;
+					  yyextra->current->bodyLine = yyextra->yyLineNr;
+					  yyextra->currentArgumentContext = FuncFuncEnd;
+					  yyextra->fullArgString=yyextra->current->args.copy();
+					  yyextra->copyArgString=&yyextra->current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
 <EndFuncPtr>"["[^\n\]]*"]"		{
-  					  g_funcPtrType+=yytext;
+  					  yyextra->funcPtrType+=yytext;
   					}
 <EndFuncPtr>")"				{
   					  BEGIN(FindMembers);
   					}
 <FuncFunc>"("				{
-  					  g_current->args += *yytext ;
-  					  ++g_roundCount;
+  					  yyextra->current->args += *yytext ;
+  					  ++yyextra->roundCount;
 					}
 <FuncFunc>")"				{
-  					  g_current->args += *yytext ;
-  					  if ( g_roundCount )
-					    --g_roundCount;
+  					  yyextra->current->args += *yytext ;
+  					  if ( yyextra->roundCount )
+					    --yyextra->roundCount;
 					  else
 					  {
 					    BEGIN(FuncFuncEnd);
 					  }
   					}
 <FuncFuncEnd>")"{BN}*"("		{
-  					  lineCount();
-					  g_current->type+=g_funcPtrType+")(";
+  					  lineCount(yyscanner);
+					  yyextra->current->type+=yyextra->funcPtrType+")(";
 					  BEGIN(FuncFuncType);
   					}
 <FuncFuncEnd>")"{BN}*/[;{]		{
-  					  lineCount();
-					  g_current->type+=g_funcPtrType.data()+1;
+  					  lineCount(yyscanner);
+					  yyextra->current->type+=yyextra->funcPtrType.data()+1;
   					  BEGIN(Function);
   					}
 <FuncFuncEnd>")"{BN}*/"["		{ // function returning a pointer to an array
-                                          lineCount();
-					  g_current->type+=g_funcPtrType;
-					  g_current->args+=")";
+                                          lineCount(yyscanner);
+					  yyextra->current->type+=yyextra->funcPtrType;
+					  yyextra->current->args+=")";
 					  BEGIN(FuncFuncArray);
   					}
 <FuncFuncEnd>.				{
-  					  g_current->args += *yytext;
+  					  yyextra->current->args += *yytext;
   					}
 <FuncFuncType>"("			{
-  					  g_current->type += *yytext;
-					  g_roundCount++;
+  					  yyextra->current->type += *yytext;
+					  yyextra->roundCount++;
   					}
 <FuncFuncType>")"			{
-  					  g_current->type += *yytext;
-  					  if (g_roundCount)
-					    --g_roundCount;
+  					  yyextra->current->type += *yytext;
+  					  if (yyextra->roundCount)
+					    --yyextra->roundCount;
 					  else
 					    BEGIN(Function);
 					}
-<FuncFuncType>{BN}*","{BN}*		{ lineCount() ; g_current->type += ", " ; }
-<FuncFuncType>{BN}+			{ lineCount() ; g_current->type += ' ' ; }
+<FuncFuncType>{BN}*","{BN}*		{ lineCount(yyscanner) ; yyextra->current->type += ", " ; }
+<FuncFuncType>{BN}+			{ lineCount(yyscanner) ; yyextra->current->type += ' ' ; }
 <FuncFuncType>.				{
-  					  g_current->type += *yytext;
+  					  yyextra->current->type += *yytext;
   					}
 <FindMembers>"("/{BN}*{ID}{BN}*"*"{BN}*{ID}*")"{BN}*"(" { // for catching typedef void (__stdcall *f)() like definitions
-                                          if (g_current->type.left(7)=="typedef" && g_current->bodyLine==-1) 
+                                          if (yyextra->current->type.left(7)=="typedef" && yyextra->current->bodyLine==-1) 
 					    // the bodyLine check is to prevent this guard to be true more than once
 					  {
-  					    g_current->bodyLine = g_yyLineNr;
+  					    yyextra->current->bodyLine = yyextra->yyLineNr;
 					    BEGIN( GetCallType );
 					  }
-					  else if (!g_current->name.isEmpty()) // normal function
+					  else if (!yyextra->current->name.isEmpty()) // normal function
 					  {
-					    g_current->args = yytext;
-					    g_current->bodyLine = g_yyLineNr;
-					    g_currentArgumentContext = FuncQual;
-					    g_fullArgString=g_current->args.copy();
-					    g_copyArgString=&g_current->args;
+					    yyextra->current->args = yytext;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+					    yyextra->currentArgumentContext = FuncQual;
+					    yyextra->fullArgString=yyextra->current->args.copy();
+					    yyextra->copyArgString=&yyextra->current->args;
 					    BEGIN( ReadFuncArgType ) ;
 					    //printf(">>> Read function arguments!\n");
 					  }
 					}
 <GetCallType>{BN}*{ID}{BN}*"*"		{
-  					  lineCount();
-  					  addType();
-					  g_funcPtrType="(";
-					  g_funcPtrType+=yytext;
-					  g_roundCount=0;
+  					  lineCount(yyscanner);
+  					  addType(yyscanner);
+					  yyextra->funcPtrType="(";
+					  yyextra->funcPtrType+=yytext;
+					  yyextra->roundCount=0;
 					  BEGIN( FuncPtr );
   					}
 <FindMembers>"("			{ 
-                                          if (!g_current->name.isEmpty())
+                                          if (!yyextra->current->name.isEmpty())
 					  {
-					    g_current->args = yytext;
-					    g_current->bodyLine = g_yyLineNr;
-					    g_currentArgumentContext = FuncQual;
-					    g_fullArgString=g_current->args.copy();
-					    g_copyArgString=&g_current->args;
+					    yyextra->current->args = yytext;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+					    yyextra->currentArgumentContext = FuncQual;
+					    yyextra->fullArgString=yyextra->current->args.copy();
+					    yyextra->copyArgString=&yyextra->current->args;
 					    BEGIN( ReadFuncArgType ) ;
-					    //printf(">>> Read function arguments g_current->argList.size()=%d\n",g_current->argList.size());
+					    //printf(">>> Read function arguments yyextra->current->argList.size()=%d\n",yyextra->current->argList.size());
 					  }
 					}
   /*
 <FindMembers>"("{BN}*("void"{BN}*)?")"	{
-  					  lineCount();
-  					  g_current->args = "()"; 
+  					  lineCount(yyscanner);
+  					  yyextra->current->args = "()"; 
   					  BEGIN( FuncQual );
   					}
   */
 
   /*- Function argument reading rules ---------------------------------------*/
 
-<ReadFuncArgType>[^ \/\r\t\n\)\(\"\'#]+ { *g_copyArgString+=yytext; 
-  					  g_fullArgString+=yytext;
+<ReadFuncArgType>[^ \/\r\t\n\)\(\"\'#]+ { *yyextra->copyArgString+=yytext; 
+  					  yyextra->fullArgString+=yytext;
   					}
-<CopyArgString,CopyArgPHPString>[^\n\\\"\']+		{ *g_copyArgString+=yytext; 
-					  g_fullArgString+=yytext;
+<CopyArgString,CopyArgPHPString>[^\n\\\"\']+		{ *yyextra->copyArgString+=yytext; 
+					  yyextra->fullArgString+=yytext;
 					}
 <CopyArgRound>[^\/\n\)\(\"\']+		{ 
-  					  *g_copyArgString+=yytext; 
-  					  g_fullArgString+=yytext;
+  					  *yyextra->copyArgString+=yytext; 
+  					  yyextra->fullArgString+=yytext;
   					}
 <ReadFuncArgType,ReadTempArgs>{BN}*	{
-  					  *g_copyArgString+=" ";
-  					  g_fullArgString+=" ";
-  					  lineCount();
+  					  *yyextra->copyArgString+=" ";
+  					  yyextra->fullArgString+=" ";
+  					  lineCount(yyscanner);
   					}
 <ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>{RAWBEGIN}	{
-                                          g_delimiter = yytext+2;
-                                          g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-                                          g_lastRawStringContext = YY_START;
-                                          g_pCopyRawString = g_copyArgString;
-                                          *g_pCopyRawString+=yytext;
-  					  g_fullArgString+=yytext;
+                                          yyextra->delimiter = yytext+2;
+                                          yyextra->delimiter=yyextra->delimiter.left(yyextra->delimiter.length()-1);
+                                          yyextra->lastRawStringContext = YY_START;
+                                          yyextra->pCopyRawString = yyextra->copyArgString;
+                                          *yyextra->pCopyRawString+=yytext;
+  					  yyextra->fullArgString+=yytext;
                                           BEGIN(RawString);
                                         }
 <ReadFuncArgType,CopyArgRound,CopyArgSharp,ReadTempArgs>\"	{
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-					  g_lastCopyArgStringContext = YY_START;
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+					  yyextra->lastCopyArgStringContext = YY_START;
   					  BEGIN( CopyArgString );
   					}
 <ReadFuncArgType,ReadTempArgs>"("	{
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-  					  g_argRoundCount=0; 
-					  g_lastCopyArgContext = YY_START;
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+  					  yyextra->argRoundCount=0; 
+					  yyextra->lastCopyArgContext = YY_START;
 					  BEGIN( CopyArgRound ); 
   					}
 <ReadFuncArgType>")"			{ 
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-					  stringToArgumentList(g_fullArgString,g_current->argList);
-					  if (g_insideJS)
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+					  stringToArgumentList(yyextra->fullArgString,yyextra->current->argList);
+					  if (yyextra->insideJS)
 					  {
-					    fixArgumentListForJavaScript(g_current->argList);
+					    fixArgumentListForJavaScript(yyextra->current->argList);
 					  }
-                                          handleParametersCommentBlocks(g_current->argList);
+                                          handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
 
-					  /* remember the g_current documentation block, since
+					  /* remember the yyextra->current documentation block, since
 					     we could overwrite it with the documentation of
 					     a function argument, which we then have to correct later
 					     on
 					   */
-					  g_docBackup = g_current->doc;
-					  g_briefBackup = g_current->brief;
+					  yyextra->docBackup = yyextra->current->doc;
+					  yyextra->briefBackup = yyextra->current->brief;
 
-					  BEGIN( g_currentArgumentContext );
+					  BEGIN( yyextra->currentArgumentContext );
 					}
 	/* a special comment */
 <ReadFuncArgType,ReadTempArgs>("/*"[*!]|"//"[/!])("<"?)	{ 
-                                          if (g_currentArgumentContext==DefineEnd)
+                                          if (yyextra->currentArgumentContext==DefineEnd)
 					  {
 					    // for defines we interpret a comment
 					    // as documentation for the define 
@@ -4486,17 +4186,17 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      unput(yytext[i]);
 					    }
-					    stringToArgumentList(g_fullArgString,g_current->argList);
-                                            handleParametersCommentBlocks(g_current->argList);
-					    BEGIN( g_currentArgumentContext );
+					    stringToArgumentList(yyextra->fullArgString,yyextra->current->argList);
+                                            handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
+					    BEGIN( yyextra->currentArgumentContext );
 					  }
 					  else // not a define
 					  {
 					    // for functions we interpret a comment
 					    // as documentation for the argument
-					    g_fullArgString+=yytext;
-					    g_lastCopyArgChar=0;
-					    g_lastCommentInArgContext=YY_START;
+					    yyextra->fullArgString+=yytext;
+					    yyextra->lastCopyArgChar=0;
+					    yyextra->lastCommentInArgContext=YY_START;
 					    if (yytext[1]=='/')
 					      BEGIN( CopyArgCommentLine );
 					    else
@@ -4506,30 +4206,30 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 	/* a non-special comment */
 <ReadFuncArgType,ReadTempArgs>"/**/"	{ /* empty comment */ }
 <ReadFuncArgType,ReadTempArgs>"/*"	{
-  					  g_lastCContext = YY_START;
+  					  yyextra->lastCContext = YY_START;
 					  BEGIN( SkipComment );
   					}
 <ReadFuncArgType,ReadTempArgs>"//"	{
-  					  g_lastCContext = YY_START;
+  					  yyextra->lastCContext = YY_START;
 					  BEGIN( SkipCxxComment );
   					}
   /*
-<ReadFuncArgType,ReadTempArgs>"'#"	{ if (g_insidePHP)
+<ReadFuncArgType,ReadTempArgs>"'#"	{ if (yyextra->insidePHP)
                                             REJECT;
-  					  *g_copyArgString+=yytext; 
-  					  g_fullArgString+=yytext; 
+  					  *yyextra->copyArgString+=yytext; 
+  					  yyextra->fullArgString+=yytext; 
 					}
 <ReadFuncArgType,ReadTempArgs>"#"	{
-  					  if (!g_insidePHP)
+  					  if (!yyextra->insidePHP)
   					    REJECT;
-  					  g_lastCContext = YY_START;
+  					  yyextra->lastCContext = YY_START;
 					  BEGIN( SkipCxxComment );
   					}
   */
 	/* ')' followed by a special comment */
 <ReadFuncArgType>")"{BN}*("/*"[*!]|"//"[/!])"<"	{
-  					  lineCount();
-                                          if (g_currentArgumentContext==DefineEnd)
+  					  lineCount(yyscanner);
+                                          if (yyextra->currentArgumentContext==DefineEnd)
 					  {
 					    // for defines we interpret a comment
 					    // as documentation for the define 
@@ -4537,21 +4237,21 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      unput(yytext[i]);
 					    }
-					    *g_copyArgString+=*yytext;
-					    g_fullArgString+=*yytext;
-					    stringToArgumentList(g_fullArgString,g_current->argList);
-                                            handleParametersCommentBlocks(g_current->argList);
-					    BEGIN( g_currentArgumentContext );
+					    *yyextra->copyArgString+=*yytext;
+					    yyextra->fullArgString+=*yytext;
+					    stringToArgumentList(yyextra->fullArgString,yyextra->current->argList);
+                                            handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
+					    BEGIN( yyextra->currentArgumentContext );
 					  }
 					  else
 					  {
 					    // for functions we interpret a comment
-					    // as documentation for the g_last argument
-					    g_lastCopyArgChar=*yytext;
+					    // as documentation for the yyextra->last argument
+					    yyextra->lastCopyArgChar=*yytext;
 					    QCString text=&yytext[1];
 					    text=text.stripWhiteSpace();
-					    g_lastCommentInArgContext=YY_START;
-					    g_fullArgString+=text;
+					    yyextra->lastCommentInArgContext=YY_START;
+					    yyextra->fullArgString+=text;
 					    if (text.find("//")!=-1)
 					      BEGIN( CopyArgCommentLine );
 					    else
@@ -4559,152 +4259,152 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <CopyArgComment>^{B}*"*"+/{BN}+		
-<CopyArgComment>[^\n\\\@\*]+		{ g_fullArgString+=yytext; }
-<CopyArgComment>"*/"			{ g_fullArgString+=yytext; 
-  					  if (g_lastCopyArgChar!=0)
-					    unput(g_lastCopyArgChar); 
-                                          BEGIN( g_lastCommentInArgContext ); 
-					}
-<CopyArgCommentLine>\n			{ g_fullArgString+=yytext;
-                                          lineCount();
-  					  if (g_lastCopyArgChar!=0)
-					    unput(g_lastCopyArgChar);
-					  BEGIN( g_lastCommentInArgContext );
+<CopyArgComment>[^\n\\\@\*]+		{ yyextra->fullArgString+=yytext; }
+<CopyArgComment>"*/"			{ yyextra->fullArgString+=yytext; 
+  					  if (yyextra->lastCopyArgChar!=0)
+					    unput(yyextra->lastCopyArgChar); 
+                                          BEGIN( yyextra->lastCommentInArgContext ); 
+					}
+<CopyArgCommentLine>\n			{ yyextra->fullArgString+=yytext;
+                                          lineCount(yyscanner);
+  					  if (yyextra->lastCopyArgChar!=0)
+					    unput(yyextra->lastCopyArgChar);
+					  BEGIN( yyextra->lastCommentInArgContext );
   					}
 <CopyArgCommentLine>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"dot"|"code")/[^a-z_A-Z0-9\-]	{ // verbatim command (which could contain nested comments!)
-				          g_docBlockName=&yytext[1];
-  					  g_fullArgString+=yytext;
+				          yyextra->docBlockName=&yytext[1];
+  					  yyextra->fullArgString+=yytext;
 					  BEGIN(CopyArgVerbatim);
   					}
 <CopyArgCommentLine>{CMD}("f$"|"f["|"f{")	        {
-				          g_docBlockName=&yytext[1];
-					  if (g_docBlockName.at(1)=='[')
+				          yyextra->docBlockName=&yytext[1];
+					  if (yyextra->docBlockName.at(1)=='[')
 					  {
-				            g_docBlockName.at(1)='}';
+				            yyextra->docBlockName.at(1)='}';
 					  }
-					  if (g_docBlockName.at(1)=='{')
+					  if (yyextra->docBlockName.at(1)=='{')
 					  {
-				            g_docBlockName.at(1)='}';
+				            yyextra->docBlockName.at(1)='}';
 					  }
-  					  g_fullArgString+=yytext;
+  					  yyextra->fullArgString+=yytext;
   					  BEGIN(CopyArgVerbatim);
                                         }
 <CopyArgVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"enddot"|"endcode"|"f$"|"f]"|"f}")/[^a-z_A-Z0-9\-] { // end of verbatim block
-  					  g_fullArgString+=yytext;
+  					  yyextra->fullArgString+=yytext;
 				          if (yytext[1]=='f') // end of formula
 				          {
 				            BEGIN(CopyArgCommentLine);
 				          }
-					  if (&yytext[4]==g_docBlockName)
+					  if (&yytext[4]==yyextra->docBlockName)
 					  {
   					    BEGIN(CopyArgCommentLine);
 					  }
   					}
-<CopyArgCommentLine>[^\\\@\n]+		{ g_fullArgString+=yytext; }
-<CopyArgCommentLine>.			{ g_fullArgString+=*yytext; }
-<CopyArgComment,CopyArgVerbatim>\n	{ g_fullArgString+=*yytext; lineCount(); }
-<CopyArgComment,CopyArgVerbatim>.	{ g_fullArgString+=*yytext; }
+<CopyArgCommentLine>[^\\\@\n]+		{ yyextra->fullArgString+=yytext; }
+<CopyArgCommentLine>.			{ yyextra->fullArgString+=*yytext; }
+<CopyArgComment,CopyArgVerbatim>\n	{ yyextra->fullArgString+=*yytext; lineCount(yyscanner); }
+<CopyArgComment,CopyArgVerbatim>.	{ yyextra->fullArgString+=*yytext; }
 <CopyArgComment>{CMD}("brief"|"short"){B}+ {
-  					  warn(g_yyFileName,g_yyLineNr,
-					      "Ignoring %cbrief command g_inside argument documentation",*yytext
+  					  warn(yyextra->yyFileName,yyextra->yyLineNr,
+					      "Ignoring %cbrief command yyextra->inside argument documentation",*yytext
 					     );
-                                          g_fullArgString+=' ';
+                                          yyextra->fullArgString+=' ';
                                         }
 <ReadTempArgs>"<"			{
-					  *g_copyArgString+=*yytext;
-					  g_fullArgString+=*yytext;
-					  g_argSharpCount=1;
+					  *yyextra->copyArgString+=*yytext;
+					  yyextra->fullArgString+=*yytext;
+					  yyextra->argSharpCount=1;
 					  BEGIN( CopyArgSharp );
 					}
 <ReadTempArgs>">"			{
-					  *g_copyArgString+=*yytext;
-					  g_fullArgString+=*yytext;
-					  //printf("end template list '%s'\n",g_copyArgString->data());
-					  stringToArgumentList(g_fullArgString,*g_currentArgumentList);
-					  BEGIN( g_currentArgumentContext );
+					  *yyextra->copyArgString+=*yytext;
+					  yyextra->fullArgString+=*yytext;
+					  //printf("end template list '%s'\n",yyextra->copyArgString->data());
+					  stringToArgumentList(yyextra->fullArgString,*yyextra->currentArgumentList);
+					  BEGIN( yyextra->currentArgumentContext );
 					}
 <CopyArgRound>"("			{
-  					  g_argRoundCount++;
-					  *g_copyArgString+=*yytext;
-					  g_fullArgString+=*yytext;
+  					  yyextra->argRoundCount++;
+					  *yyextra->copyArgString+=*yytext;
+					  yyextra->fullArgString+=*yytext;
   					}
 <CopyArgRound>")"			{
-					  *g_copyArgString+=*yytext;
-					  g_fullArgString+=*yytext;
-					  if (g_argRoundCount>0) 
-					    g_argRoundCount--;
+					  *yyextra->copyArgString+=*yytext;
+					  yyextra->fullArgString+=*yytext;
+					  if (yyextra->argRoundCount>0) 
+					    yyextra->argRoundCount--;
 					  else 
-					    BEGIN( g_lastCopyArgContext );
+					    BEGIN( yyextra->lastCopyArgContext );
   					}
 <CopyArgSharp>"("                       {
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-  					  g_argRoundCount=0; 
-					  g_lastCopyArgContext = YY_START;
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+  					  yyextra->argRoundCount=0; 
+					  yyextra->lastCopyArgContext = YY_START;
 					  BEGIN( CopyArgRound ); 
                                         }
 <CopyArgSharp>"<"			{
-  					  g_argSharpCount++;
-					  //printf("g_argSharpCount++=%d  copy\n",g_argSharpCount);
-					  *g_copyArgString+=*yytext;
-					  g_fullArgString+=*yytext;
+  					  yyextra->argSharpCount++;
+					  //printf("yyextra->argSharpCount++=%d  copy\n",yyextra->argSharpCount);
+					  *yyextra->copyArgString+=*yytext;
+					  yyextra->fullArgString+=*yytext;
   					}
 <CopyArgSharp>">"			{
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-					  g_argSharpCount--;
-					  if (g_argSharpCount>0)
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+					  yyextra->argSharpCount--;
+					  if (yyextra->argSharpCount>0)
 					  {
-					    //printf("g_argSharpCount--=%d copy\n",g_argSharpCount);
+					    //printf("yyextra->argSharpCount--=%d copy\n",yyextra->argSharpCount);
 					  }
 					  else
 					  {
 					    BEGIN( ReadTempArgs );
-					    //printf("end of g_argSharpCount\n");
+					    //printf("end of yyextra->argSharpCount\n");
 					  }
   					}
 <CopyArgString,CopyArgPHPString>\\.	{
-  					  *g_copyArgString+=yytext;
-  					  g_fullArgString+=yytext;
+  					  *yyextra->copyArgString+=yytext;
+  					  yyextra->fullArgString+=yytext;
   					}
 <CopyArgString>\"			{
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-					  BEGIN( g_lastCopyArgStringContext );
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+					  BEGIN( yyextra->lastCopyArgStringContext );
   					}
 <CopyArgPHPString>\'			{
-  					  *g_copyArgString+=*yytext;
-  					  g_fullArgString+=*yytext;
-					  BEGIN( g_lastCopyArgStringContext );
+  					  *yyextra->copyArgString+=*yytext;
+  					  yyextra->fullArgString+=*yytext;
+					  BEGIN( yyextra->lastCopyArgStringContext );
   					}
 <ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>{CHARLIT}     { 
-                                          if (g_insidePHP)
+                                          if (yyextra->insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-  					    *g_copyArgString+=yytext; 
-  					    g_fullArgString+=yytext; 
+  					    *yyextra->copyArgString+=yytext; 
+  					    yyextra->fullArgString+=yytext; 
 					  }
 					}
 <ReadFuncArgType,ReadTempArgs,CopyArgRound,CopyArgSharp>\'     { 
-  					  *g_copyArgString+=yytext; 
-  					  g_fullArgString+=yytext; 
-					  if (g_insidePHP)
+  					  *yyextra->copyArgString+=yytext; 
+  					  yyextra->fullArgString+=yytext; 
+					  if (yyextra->insidePHP)
 					  {
-					    g_lastCopyArgStringContext=YY_START;
+					    yyextra->lastCopyArgStringContext=YY_START;
 					    BEGIN(CopyArgPHPString);
 					  }
   					}
 <ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>\n  { 
-                                          lineCount();
-					  *g_copyArgString+=*yytext; 
-					  g_fullArgString+=*yytext; 
+                                          lineCount(yyscanner);
+					  *yyextra->copyArgString+=*yytext; 
+					  yyextra->fullArgString+=*yytext; 
 					}
 <ReadFuncArgType,ReadTempArgs,CopyArgString,CopyArgPHPString,CopyArgRound,CopyArgSharp>.	  { 
-  					  *g_copyArgString+=*yytext; 
-  					  g_fullArgString+=*yytext; 
+  					  *yyextra->copyArgString+=*yytext; 
+  					  yyextra->fullArgString+=*yytext; 
 					}
 
 
@@ -4712,29 +4412,29 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   /*------------------------------------------------------------------------*/
 
 
-<FuncRound>"("				{ g_current->args += *yytext ;
-					  ++g_roundCount ;
+<FuncRound>"("				{ yyextra->current->args += *yytext ;
+					  ++yyextra->roundCount ;
 					}
-<FuncRound>")"                          { g_current->args += *yytext ; 
-					  if ( g_roundCount )
-					    --g_roundCount ;
+<FuncRound>")"                          { yyextra->current->args += *yytext ; 
+					  if ( yyextra->roundCount )
+					    --yyextra->roundCount ;
 				          else
 					    BEGIN( FuncQual ) ;
 					}
   /*
-<FuncQual>"#"				{ if (g_insidePHP)
+<FuncQual>"#"				{ if (yyextra->insidePHP)
   					    REJECT;
-  					  g_lastCPPContext = YY_START;
+  					  yyextra->lastCPPContext = YY_START;
   					  BEGIN(SkipCPP);
 					}
   */
 <FuncQual>[{:;,]                        {
                                           if ( qstrcmp(yytext,";")==0 && 
-					       g_insidePHP && 
-					       !containsWord(g_current->type,"function") )
+					       yyextra->insidePHP && 
+					       !containsWord(yyextra->current->type,"function") )
                                           {
-                                            g_current->reset();
-                                            initEntry();
+                                            yyextra->current->reset();
+                                            initEntry(yyscanner);
                                             BEGIN( FindMembers );
                                           }
                                           else
@@ -4743,89 +4443,89 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           }
                                         }
 <FuncQual>{BN}*"abstract"{BN}*          { // pure virtual member function
-                                          lineCount() ; 
-                                          g_current->virt = Pure;
-                                          g_current->args += " override "; 
+                                          lineCount(yyscanner) ; 
+                                          yyextra->current->virt = Pure;
+                                          yyextra->current->args += " override "; 
                                         }
 <FuncQual,TrailingReturn>{BN}*"override"{BN}*          { // C++11 overridden virtual member function
-                                          lineCount() ; 
-                                          g_current->spec |= Entry::Override;
-                                          g_current->args += " override "; 
+                                          lineCount(yyscanner) ; 
+                                          yyextra->current->spec |= Entry::Override;
+                                          yyextra->current->args += " override "; 
                                           BEGIN(FuncQual);
                                         }
 <FuncQual,TrailingReturn>{BN}*"final"{BN}*             { // C++11 final method
-                                          lineCount() ; 
-                                          g_current->spec |= Entry::Final;
-                                          g_current->args += " final "; 
+                                          lineCount(yyscanner) ; 
+                                          yyextra->current->spec |= Entry::Final;
+                                          yyextra->current->args += " final "; 
                                           BEGIN(FuncQual);
                                         }
 <FuncQual>{BN}*"sealed"{BN}*            { // sealed member function
-                                          lineCount() ; 
-                                          g_current->spec |= Entry::Sealed;
-                                          g_current->args += " sealed "; 
+                                          lineCount(yyscanner) ; 
+                                          yyextra->current->spec |= Entry::Sealed;
+                                          yyextra->current->args += " sealed "; 
                                         }
 <FuncQual>{BN}*"new"{BN}*               { // new member function
-                                          lineCount() ; 
-                                          g_current->spec |= Entry::New;
-                                          g_current->args += " new "; 
+                                          lineCount(yyscanner) ; 
+                                          yyextra->current->spec |= Entry::New;
+                                          yyextra->current->args += " new "; 
                                         }
 <FuncQual>{BN}*"const"{BN}*       	{ // const member function
-  					  lineCount() ; 
-  					  g_current->args += " const "; 
-					  g_current->argList.constSpecifier=TRUE;
+  					  lineCount(yyscanner) ; 
+  					  yyextra->current->args += " const "; 
+					  yyextra->current->argList.constSpecifier=TRUE;
 					}
 <FuncQual>{BN}*"volatile"{BN}*    	{ // volatile member function
-  					  lineCount() ; 
-  					  g_current->args += " volatile "; 
-					  g_current->argList.volatileSpecifier=TRUE;
+  					  lineCount(yyscanner) ; 
+  					  yyextra->current->args += " volatile "; 
+					  yyextra->current->argList.volatileSpecifier=TRUE;
 					}
 <FuncQual>{BN}*"noexcept"{BN}*    	{ // noexcept qualifier
-  					  lineCount() ; 
-  					  g_current->args += " noexcept "; 
-					  g_current->spec |= Entry::NoExcept;
+  					  lineCount(yyscanner) ; 
+  					  yyextra->current->args += " noexcept "; 
+					  yyextra->current->spec |= Entry::NoExcept;
 					}
 <FuncQual>{BN}*"noexcept"{BN}*"("    	{ // noexcept expression
-  					  lineCount() ; 
-  					  g_current->args += " noexcept("; 
-					  g_current->spec |= Entry::NoExcept;
-  					  g_lastRoundContext=FuncQual;
-  					  g_pCopyRoundString=&g_current->args;
-					  g_roundCount=0;
+  					  lineCount(yyscanner) ; 
+  					  yyextra->current->args += " noexcept("; 
+					  yyextra->current->spec |= Entry::NoExcept;
+  					  yyextra->lastRoundContext=FuncQual;
+  					  yyextra->pCopyRoundString=&yyextra->current->args;
+					  yyextra->roundCount=0;
                                           BEGIN(CopyRound);
                                         }
 <FuncQual>{BN}*"&"                      {
-                                          g_current->args += " &";
-                                          g_current->argList.refQualifier=RefQualifierLValue;
+                                          yyextra->current->args += " &";
+                                          yyextra->current->argList.refQualifier=RefQualifierLValue;
                                         }
 <FuncQual>{BN}*"&&"                     {
-                                          g_current->args += " &&";
-                                          g_current->argList.refQualifier=RefQualifierRValue;
+                                          yyextra->current->args += " &&";
+                                          yyextra->current->argList.refQualifier=RefQualifierRValue;
                                         }
 
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"0"{BN}*  	{ // pure virtual member function
-  					  lineCount() ; 
-					  g_current->args += " = 0"; 
-					  g_current->virt = Pure; 
-					  g_current->argList.pureSpecifier=TRUE;
+  					  lineCount(yyscanner) ; 
+					  yyextra->current->args += " = 0"; 
+					  yyextra->current->virt = Pure; 
+					  yyextra->current->argList.pureSpecifier=TRUE;
                                           BEGIN(FuncQual);
 					}
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"delete"{BN}*     { // C++11 explicitly delete member
-                                          lineCount();
-                                          g_current->args += " = delete";
-					  g_current->spec |= Entry::Delete;
-					  g_current->argList.isDeleted=TRUE;
+                                          lineCount(yyscanner);
+                                          yyextra->current->args += " = delete";
+					  yyextra->current->spec |= Entry::Delete;
+					  yyextra->current->argList.isDeleted=TRUE;
                                           BEGIN(FuncQual);
                                         }
 <FuncQual,TrailingReturn>{BN}*"="{BN}*"default"{BN}*     { // C++11 explicitly defaulted constructor/assignment operator
-                                          lineCount();
-                                          g_current->args += " = default";
-					  g_current->spec |= Entry::Default;
+                                          lineCount(yyscanner);
+                                          yyextra->current->args += " = default";
+					  yyextra->current->spec |= Entry::Default;
                                           BEGIN(FuncQual);
                                         }
 <FuncQual>{BN}*"->"{BN}*                {
-                                          lineCount();
-                                          g_current->argList.trailingReturnType = " -> ";
-                                          g_current->args += " -> ";
+                                          lineCount(yyscanner);
+                                          yyextra->current->argList.trailingReturnType = " -> ";
+                                          yyextra->current->args += " -> ";
                                           BEGIN(TrailingReturn);
                                         }
 <TrailingReturn>[{;]                    {
@@ -4833,30 +4533,30 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           BEGIN(FuncQual);
                                         }
 <TrailingReturn>.                       {
-                                          g_current->argList.trailingReturnType+=yytext;
-                                          g_current->args+=yytext;
+                                          yyextra->current->argList.trailingReturnType+=yytext;
+                                          yyextra->current->args+=yytext;
                                         }
 <TrailingReturn>\n                      {
-                                          lineCount();
-                                          g_current->argList.trailingReturnType+=yytext;
-                                          g_current->args+=' ';
+                                          lineCount(yyscanner);
+                                          yyextra->current->argList.trailingReturnType+=yytext;
+                                          yyextra->current->args+=' ';
                                         }
 <FuncRound,FuncFunc>{BN}*","{BN}*	{ 
-  					  lineCount() ; 
-					  g_current->args += ", " ; 
+  					  lineCount(yyscanner) ; 
+					  yyextra->current->args += ", " ; 
 					}
 <FuncQual,FuncRound,FuncFunc>{BN}+   	{ 
-  					  lineCount() ; 
-					  g_current->args += ' ' ; 
+  					  lineCount(yyscanner) ; 
+					  yyextra->current->args += ' ' ; 
 					}
-<Function,FuncQual,FuncRound,FuncFunc>"#" { if (g_insidePHP)
+<Function,FuncQual,FuncRound,FuncFunc>"#" { if (yyextra->insidePHP)
   					    REJECT;
-  					  g_lastCPPContext = YY_START;
+  					  yyextra->lastCPPContext = YY_START;
   					  BEGIN(SkipCPP);
 					}	
 <FuncQual>"="				{ 
-                                          if (g_insideCli && 
-					      (g_current_root->section&Entry::COMPOUND_MASK) 
+                                          if (yyextra->insideCli && 
+					      (yyextra->current_root->section&Entry::COMPOUND_MASK) 
 					     )
 					  {
 					    BEGIN(CliOverride);
@@ -4864,9 +4564,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
                                             // typically an initialized function pointer
-  					    g_lastInitializerContext=YY_START;
-					    g_initBracketCount=0;
-                                            g_current->initializer = yytext;
+  					    yyextra->lastInitializerContext=YY_START;
+					    yyextra->initBracketCount=0;
+                                            yyextra->current->initializer = yytext;
   					    BEGIN(ReadInitializer);
 					  }
   					}
@@ -4877,7 +4577,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(FuncQual);
   					}
 <CliOverride>\n				{
-                                          lineCount();
+                                          lineCount(yyscanner);
   					}
 <CliOverride>.				{
   					}
@@ -4886,96 +4586,96 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(FuncQual);
   					}
 <FuncPtrInit>\"				{
-                                          g_current->args += *yytext; 
-  					  g_pCopyQuotedString=&g_current->args;
-					  g_lastStringContext=FuncPtrInit;
+                                          yyextra->current->args += *yytext; 
+  					  yyextra->pCopyQuotedString=&yyextra->current->args;
+					  yyextra->lastStringContext=FuncPtrInit;
 					  BEGIN(CopyString);
 					}
 <FuncPtrInit>\'				{
-                                          g_current->args += *yytext; 
-					  if (g_insidePHP)
+                                          yyextra->current->args += *yytext; 
+					  if (yyextra->insidePHP)
 					  {
-					    g_pCopyQuotedString=&g_current->args;
-					    g_lastStringContext=FuncPtrInit;
+					    yyextra->pCopyQuotedString=&yyextra->current->args;
+					    yyextra->lastStringContext=FuncPtrInit;
 					    BEGIN(CopyPHPString);
 					  }
 					}
 <FuncPtrInit>{CHARLIT}			{
-                                          if (g_insidePHP)
+                                          if (yyextra->insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            g_current->args += yytext; 
+                                            yyextra->current->args += yytext; 
 					  }
   					}
 <FuncPtrInit>{ID}			{
-                                          g_current->args += yytext; 
+                                          yyextra->current->args += yytext; 
 					}
 <FuncPtrInit>.				{
-                                          g_current->args += *yytext; 
+                                          yyextra->current->args += *yytext; 
   					}
 <FuncPtrInit>\n				{
-                                          g_current->args += *yytext; 
-                                          lineCount();
+                                          yyextra->current->args += *yytext; 
+                                          lineCount(yyscanner);
   					}
 <FuncQual>{ID}				{ // typically a K&R style C function
-                                          if (g_insideCS && qstrcmp(yytext,"where")==0)
+                                          if (yyextra->insideCS && qstrcmp(yytext,"where")==0)
 					  { 
 					    // type constraint for a method
-					    g_current->typeConstr.clear();
-					    g_current->typeConstr.push_back(Argument());
-					    g_lastCSConstraint = YY_START;
+					    yyextra->current->typeConstr.clear();
+					    yyextra->current->typeConstr.push_back(Argument());
+					    yyextra->lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
-					  else if (checkForKnRstyleC())
+					  else if (checkForKnRstyleC(yyscanner))
 					  {
-                                            g_current->args = yytext; 
-					    g_oldStyleArgType.resize(0);
+                                            yyextra->current->args = yytext; 
+					    yyextra->oldStyleArgType.resize(0);
 					    BEGIN(OldStyleArgs);
 					  }
 					  else
 					  {
-                                            g_current->args += yytext; 
+                                            yyextra->current->args += yytext; 
 					  }
   					}
 <OldStyleArgs>[,;]			{
   					  QCString oldStyleArgPtr;
   					  QCString oldStyleArgName;
-					  splitKnRArg(oldStyleArgPtr,oldStyleArgName);
+					  splitKnRArg(yyscanner,oldStyleArgPtr,oldStyleArgName);
 					  QCString doc,brief;
-					  if (g_current->doc!=g_docBackup)
+					  if (yyextra->current->doc!=yyextra->docBackup)
 					  {
-                                            doc=g_current->doc.copy();
-					    g_current->doc=g_docBackup;
+                                            doc=yyextra->current->doc.copy();
+					    yyextra->current->doc=yyextra->docBackup;
 					  }
-					  if (g_current->brief!=g_briefBackup)
+					  if (yyextra->current->brief!=yyextra->briefBackup)
 					  {
-                                            brief=g_current->brief.copy();
-					    g_current->brief=g_briefBackup;
+                                            brief=yyextra->current->brief.copy();
+					    yyextra->current->brief=yyextra->briefBackup;
 					  }
-					  addKnRArgInfo(g_oldStyleArgType+oldStyleArgPtr,
+					  addKnRArgInfo(yyscanner,yyextra->oldStyleArgType+oldStyleArgPtr,
 					                oldStyleArgName,brief,doc);
-					  g_current->args.resize(0);
-					  if (*yytext==';') g_oldStyleArgType.resize(0);
+					  yyextra->current->args.resize(0);
+					  if (*yytext==';') yyextra->oldStyleArgType.resize(0);
   					}
-<OldStyleArgs>{ID} 			{ g_current->args += yytext; }
+<OldStyleArgs>{ID} 			{ yyextra->current->args += yytext; }
 <OldStyleArgs>"{"			{
-                                          if (g_current->argList.empty())
+                                          if (yyextra->current->argList.empty())
                                           {
-                                            g_current->argList.noParameters=TRUE;
+                                            yyextra->current->argList.noParameters=TRUE;
                                           }
-  					  g_current->args = argListToString(g_current->argList);
+  					  yyextra->current->args = argListToString(yyextra->current->argList);
   					  unput('{');
 					  BEGIN(FuncQual);
   					}
-<OldStyleArgs>.	 			{ g_current->args += *yytext; }
-<FuncQual,FuncRound,FuncFunc>.		{ g_current->args += *yytext; }
+<OldStyleArgs>.	 			{ yyextra->current->args += *yytext; }
+<FuncQual,FuncRound,FuncFunc>.		{ yyextra->current->args += *yytext; }
 <FuncQual>{BN}*"try:"			|
 <FuncQual>{BN}*"try"{BN}+		{ /* try-function-block */ 
-					  g_insideTryBlock=TRUE;
-					  lineCount();
+					  yyextra->insideTryBlock=TRUE;
+					  lineCount(yyscanner);
   					  if (yytext[yyleng-1]==':')
 					  {
 					    unput(':');
@@ -4983,33 +4683,33 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <FuncQual>{BN}*"throw"{BN}*"("		{ // C++ style throw clause
-  					  g_current->exception = " throw (" ;
-					  g_roundCount=0;
-					  lineCount() ;
+  					  yyextra->current->exception = " throw (" ;
+					  yyextra->roundCount=0;
+					  lineCount(yyscanner) ;
 					  BEGIN( ExcpRound ) ;
 					}
 <FuncQual>{BN}*"raises"{BN}*"("         {
-  					  g_current->exception = " raises (" ;
-					  lineCount() ;
-					  g_roundCount=0;
+  					  yyextra->current->exception = " raises (" ;
+					  lineCount(yyscanner) ;
+					  yyextra->roundCount=0;
 					  BEGIN( ExcpRound ) ;
   					}
 <FuncQual>{BN}*"throws"{BN}+		{ // Java style throw clause
-  					  g_current->exception = " throws " ;
-					  lineCount() ;
+  					  yyextra->current->exception = " throws " ;
+					  lineCount(yyscanner) ;
 					  BEGIN( ExcpList );
   					}
-<ExcpRound>"("				{ g_current->exception += *yytext ;
-					  ++g_roundCount ;
+<ExcpRound>"("				{ yyextra->current->exception += *yytext ;
+					  ++yyextra->roundCount ;
 					}
-<ExcpRound>")"                          { g_current->exception += *yytext ; 
-					  if ( g_roundCount )
-					    --g_roundCount ;
+<ExcpRound>")"                          { yyextra->current->exception += *yytext ; 
+					  if ( yyextra->roundCount )
+					    --yyextra->roundCount ;
 				          else
 					    BEGIN( FuncQual ) ;
 					}
 <ExcpRound>.				{
-  					  g_current->exception += *yytext;
+  					  yyextra->current->exception += *yytext;
   					}
 <ExcpList>"{"				{
   					  unput('{'); BEGIN( FuncQual );
@@ -5018,101 +4718,101 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  unput(';'); BEGIN( FuncQual );
   					}
 <ExcpList>"\n"				{
-  					  g_current->exception += ' ';
-                                          lineCount();
+  					  yyextra->current->exception += ' ';
+                                          lineCount(yyscanner);
   					}
 <ExcpList>.				{
-  					  g_current->exception += *yytext;
+  					  yyextra->current->exception += *yytext;
   					}
-<Function>"("				{ g_current->type += g_current->name ;
-					  g_current->name  = g_current->args ;
-					  g_current->args  = yytext ;
-					  g_roundCount=0;
+<Function>"("				{ yyextra->current->type += yyextra->current->name ;
+					  yyextra->current->name  = yyextra->current->args ;
+					  yyextra->current->args  = yytext ;
+					  yyextra->roundCount=0;
 					  BEGIN( FuncRound ) ;
 					}
 <Function>":"				{
-  					  if (!g_insidePHP) BEGIN(SkipInits);
+  					  if (!yyextra->insidePHP) BEGIN(SkipInits);
   					}
 <Function>[;{,]				{ 
-					  g_current->name=g_current->name.simplifyWhiteSpace();
-  					  g_current->type=g_current->type.simplifyWhiteSpace();
-					  g_current->args=removeRedundantWhiteSpace(g_current->args);
-					                // was: g_current->args.simplifyWhiteSpace();
-					  g_current->fileName = g_yyFileName;
-					  g_current->startLine = g_yyBegLineNr;
-					  g_current->startColumn = g_yyBegColNr;
+					  yyextra->current->name=yyextra->current->name.simplifyWhiteSpace();
+  					  yyextra->current->type=yyextra->current->type.simplifyWhiteSpace();
+					  yyextra->current->args=removeRedundantWhiteSpace(yyextra->current->args);
+					                // was: yyextra->current->args.simplifyWhiteSpace();
+					  yyextra->current->fileName = yyextra->yyFileName;
+					  yyextra->current->startLine = yyextra->yyBegLineNr;
+					  yyextra->current->startColumn = yyextra->yyBegColNr;
 					  static QRegExp re("([^)]*[*&][^)]*)"); // (...*...)
-					  if (*yytext!=';' || (g_current_root->section&Entry::COMPOUND_MASK) )
+					  if (*yytext!=';' || (yyextra->current_root->section&Entry::COMPOUND_MASK) )
 					  {
-					    int tempArg=g_current->name.find('<');
-                                            int ts=g_current->type.find('<');
-                                            int te=g_current->type.findRev('>');
-                                            int ti=g_current->type.find(re,0);
+					    int tempArg=yyextra->current->name.find('<');
+                                            int ts=yyextra->current->type.find('<');
+                                            int te=yyextra->current->type.findRev('>');
+                                            int ti=yyextra->current->type.find(re,0);
 
                                             // bug677315: A<int(void *, char *)> get(); is not a function pointer
                                             bool isFunction = ti==-1 || // not a (...*...) pattern
                                                               (ts!=-1 && ts<te && ts<ti && ti<te); // (...*...) is part of a template argument list
                                                               
                                             //printf("type=%s ts=%d te=%d ti=%d isFunction=%d\n",
-                                            //    g_current->type.data(),ts,te,ti,isFunction);
+                                            //    yyextra->current->type.data(),ts,te,ti,isFunction);
 					    QCString tempName;
-					    if (tempArg==-1) tempName=g_current->name; else tempName=g_current->name.left(tempArg);
-					    if (!g_current->type.isEmpty() &&
-						(!isFunction || g_current->type.left(8)=="typedef "))
+					    if (tempArg==-1) tempName=yyextra->current->name; else tempName=yyextra->current->name.left(tempArg);
+					    if (!yyextra->current->type.isEmpty() &&
+						(!isFunction || yyextra->current->type.left(8)=="typedef "))
 					    {
-					      //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", g_current->type.data(),g_current->name.data(),g_current->args.data());
-					      if (g_isTypedef && g_current->type.left(8)!="typedef ")
+					      //printf("Scanner.l: found in class variable: '%s' '%s' '%s'\n", yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+					      if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
 					      {
-						g_current->type.prepend("typedef ");
+						yyextra->current->type.prepend("typedef ");
 					      }
-					      g_current->section = Entry::VARIABLE_SEC ;
+					      yyextra->current->section = Entry::VARIABLE_SEC ;
 					    }
 					    else	      
 					    {
-					      //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", g_current->type.data(),g_current->name.data(),g_current->args.data());
-					      g_current->section = Entry::FUNCTION_SEC ;
-			                      g_current->proto = *yytext==';';
+					      //printf("Scanner.l: found in class function: '%s' '%s' '%s'\n", yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+					      yyextra->current->section = Entry::FUNCTION_SEC ;
+			                      yyextra->current->proto = *yytext==';';
 					    }
 					  }
 					  else // a global function prototype or function variable
 					  {
-					    //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",g_current->type.data(),g_current->name.data(),g_current->args.data());
-					    if (!g_current->type.isEmpty() && 
-						(g_current->type.find(re,0)!=-1 || g_current->type.left(8)=="typedef "))
+					    //printf("Scanner.l: prototype? type='%s' name='%s' args='%s'\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
+					    if (!yyextra->current->type.isEmpty() && 
+						(yyextra->current->type.find(re,0)!=-1 || yyextra->current->type.left(8)=="typedef "))
 					    {
-					      if (g_isTypedef && g_current->type.left(8)!="typedef ")
+					      if (yyextra->isTypedef && yyextra->current->type.left(8)!="typedef ")
 					      {
-						g_current->type.prepend("typedef ");
+						yyextra->current->type.prepend("typedef ");
 					      }
 					      //printf("Scanner.l: found function variable!\n");
-					      g_current->section = Entry::VARIABLE_SEC;
+					      yyextra->current->section = Entry::VARIABLE_SEC;
 					    }
 					    else
 					    {
 					      //printf("Scanner.l: found prototype\n");
-					      g_current->section = Entry::FUNCTION_SEC;
-					      g_current->proto = TRUE;
+					      yyextra->current->section = Entry::FUNCTION_SEC;
+					      yyextra->current->proto = TRUE;
 					    }
 					  }
-					  //printf("Adding entry '%s'\n",g_current->name.data());
-					  if ( g_insidePHP)
+					  //printf("Adding entry '%s'\n",yyextra->current->name.data());
+					  if ( yyextra->insidePHP)
 					  {
-					    if (findAndRemoveWord(g_current->type,"final"))
+					    if (findAndRemoveWord(yyextra->current->type,"final"))
 					    {
-					      g_current->spec |= Entry::Final;
+					      yyextra->current->spec |= Entry::Final;
 					    }
-					    if (findAndRemoveWord(g_current->type,"abstract"))
+					    if (findAndRemoveWord(yyextra->current->type,"abstract"))
 					    {
-					      g_current->spec |= Entry::Abstract;
+					      yyextra->current->spec |= Entry::Abstract;
 					    }
 					  }
-					  if ( g_insidePHP && !containsWord(g_current->type,"function"))
+					  if ( yyextra->insidePHP && !containsWord(yyextra->current->type,"function"))
 					  {
-					    initEntry();
+					    initEntry(yyscanner);
 					    if ( *yytext == '{' )
 					    {
-					      g_lastCurlyContext = FindMembers;
-					      g_curlyCount=0;
+					      yyextra->lastCurlyContext = FindMembers;
+					      yyextra->curlyCount=0;
 					      BEGIN( SkipCurly );
 					    }
 					    else
@@ -5122,66 +4822,66 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    if ( g_insidePHP)
+					    if ( yyextra->insidePHP)
 					    {
-					      findAndRemoveWord(g_current->type,"function");
+					      findAndRemoveWord(yyextra->current->type,"function");
 					    }
-					    g_previous = g_current.get();
-					    g_current_root->moveToSubEntryAndRefresh(g_current);
-					    initEntry();
+					    yyextra->previous = yyextra->current.get();
+					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+					    initEntry(yyscanner);
 					    // Objective C 2.0: Required/Optional section
-					    if (g_previous->spec & (Entry::Optional | Entry::Required))
+					    if (yyextra->previous->spec & (Entry::Optional | Entry::Required))
 					    {
-					      g_current->spec |= g_previous->spec & (Entry::Optional|Entry::Required);
+					      yyextra->current->spec |= yyextra->previous->spec & (Entry::Optional|Entry::Required);
 					    }
-					    g_lastCurlyContext = FindMembers;
+					    yyextra->lastCurlyContext = FindMembers;
 					    if ( *yytext == ',' )
 					    {
-					      g_current->type = g_previous->type;
+					      yyextra->current->type = yyextra->previous->type;
 					      // we need to strip any trailing * and & (see bugs 623023 and 649103 for test cases)
-					      int i=g_current->type.length(); 
-					      while (i>0 && (g_current->type[i-1]=='*' || g_current->type[i-1]=='&' || g_current->type[i-1]==' ')) i--;
-					      g_current->type = g_current->type.left(i);
+					      int i=yyextra->current->type.length(); 
+					      while (i>0 && (yyextra->current->type[i-1]=='*' || yyextra->current->type[i-1]=='&' || yyextra->current->type[i-1]==' ')) i--;
+					      yyextra->current->type = yyextra->current->type.left(i);
 					    }
 					    if ( *yytext == '{' )
 					    {
-					      if ( !g_insidePHP && (g_current_root->section & Entry::COMPOUND_MASK) )
+					      if ( !yyextra->insidePHP && (yyextra->current_root->section & Entry::COMPOUND_MASK) )
 					      {
-						g_previous->spec |= Entry::Inline;
+						yyextra->previous->spec |= Entry::Inline;
 					      }
 					      //addToBody(yytext);
-					      g_curlyCount=0;
+					      yyextra->curlyCount=0;
 					      BEGIN( SkipCurly ) ;
 					    }
 					    else
 					    {
-					      if (g_previous->section!=Entry::VARIABLE_SEC)
-						g_previous->bodyLine=-1; // a function/member declaration
+					      if (yyextra->previous->section!=Entry::VARIABLE_SEC)
+						yyextra->previous->bodyLine=-1; // a function/member declaration
 					      BEGIN( FindMembers ) ;
 					    }
 					  }
                                         }
 <SkipInits>">"{BN}*"{"                  { // C++11 style initializer (see bug 790788)
-                                          lineCount();
-                                          g_curlyCount=1;
+                                          lineCount(yyscanner);
+                                          yyextra->curlyCount=1;
                                           BEGIN(SkipC11Inits);
                                         }
 <SkipInits>{ID}{BN}*"{"                 { // C++11 style initializer (see bug 688647)
-                                          lineCount();
-                                          g_curlyCount=1;
+                                          lineCount(yyscanner);
+                                          yyextra->curlyCount=1;
                                           BEGIN(SkipC11Inits);
                                         }
 <SkipC11Inits>"{"                       {
-                                          ++g_curlyCount;
+                                          ++yyextra->curlyCount;
                                         }
 <SkipC11Inits>"}"                       {
-  					  if ( --g_curlyCount<=0 )
+  					  if ( --yyextra->curlyCount<=0 )
                                           {
                                             BEGIN(SkipInits);
                                           }
                                         }
 <SkipC11Attribute>"]]"                 {
-                                          BEGIN(g_lastC11AttributeContext);
+                                          BEGIN(yyextra->lastC11AttributeContext);
                                         }
 <SkipInits>"{"				{ // C++11 style initializer
   					  unput('{');
@@ -5189,197 +4889,197 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <SkipCurly>"{"				{ 
   				          //addToBody(yytext);
-  					  ++g_curlyCount ; 
+  					  ++yyextra->curlyCount ; 
 					}
 <SkipCurly>"}"/{BN}*("/*!"|"/**"|"//!"|"///")"<!--" | /* see bug710917 */
 <SkipCurly>"}"				{ 
   				          //addToBody(yytext);
-  					  if( g_curlyCount )
+  					  if( yyextra->curlyCount )
 					  {
-					    --g_curlyCount ;
+					    --yyextra->curlyCount ;
 					  }
 					  else
 					  {
-					    if (!g_current->sli.empty() && g_previous) // copy special list items
+					    if (!yyextra->current->sli.empty() && yyextra->previous) // copy special list items
 					    {
-                                              g_previous->sli = g_current->sli;
-					      g_current->sli.clear();
+                                              yyextra->previous->sli = yyextra->current->sli;
+					      yyextra->current->sli.clear();
 					    }
-					    if (g_previous) g_previous->endBodyLine=g_yyLineNr;
-					    BEGIN( g_lastCurlyContext ) ;
+					    if (yyextra->previous) yyextra->previous->endBodyLine=yyextra->yyLineNr;
+					    BEGIN( yyextra->lastCurlyContext ) ;
 					  }
 					}
 <SkipCurly>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" { 
-					  lineCount();
-  					  if ( g_curlyCount )
+					  lineCount(yyscanner);
+  					  if ( yyextra->curlyCount )
 					  {
 					    //addToBody(yytext);
-					    --g_curlyCount ;
+					    --yyextra->curlyCount ;
 					  }
 					  else
 					  {
-					    g_current->endBodyLine=g_yyLineNr;
-                                            // take g_previous out of g_current_root and move it into g_current
-					    g_current.swap(g_tempEntry); // remember g_current
-                                            g_current_root->moveFromSubEntry(g_previous,g_current);
-					    g_previous = 0;
+					    yyextra->current->endBodyLine=yyextra->yyLineNr;
+                                            // take yyextra->previous out of yyextra->current_root and move it into yyextra->current
+					    yyextra->current.swap(yyextra->tempEntry); // remember yyextra->current
+                                            yyextra->current_root->moveFromSubEntry(yyextra->previous,yyextra->current);
+					    yyextra->previous = 0;
 
-					    g_docBlockContext   = SkipCurlyEndDoc;
-					    g_docBlockInBody    = FALSE;
-					    g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					    yyextra->docBlockContext   = SkipCurlyEndDoc;
+					    yyextra->docBlockInBody    = FALSE;
+					    yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                        ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
-					    g_docBlock.resize(0);
-					    g_docBlockTerm = '}';
+					    yyextra->docBlock.resize(0);
+					    yyextra->docBlockTerm = '}';
 					    if (yytext[yyleng-3]=='/')
 					    {
-					      startCommentBlock(TRUE);
+					      startCommentBlock(yyscanner,TRUE);
 					      BEGIN( DocLine );
 					    }
 					    else
 					    {
-					      startCommentBlock(FALSE);
+					      startCommentBlock(yyscanner,FALSE);
 					      BEGIN( DocBlock );
 					    }
 					  }
 					}
 <SkipCurlyEndDoc>"}"{BN}*("/*!"|"/**"|"//!"|"///")"<" { // desc is followed by another one
-					  g_docBlockContext   = SkipCurlyEndDoc;
-					  g_docBlockInBody    = FALSE;
-					  g_docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
+					  yyextra->docBlockContext   = SkipCurlyEndDoc;
+					  yyextra->docBlockInBody    = FALSE;
+					  yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
 					                      ( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
-					  g_docBlock.resize(0);
-					  g_docBlockTerm = '}';
+					  yyextra->docBlock.resize(0);
+					  yyextra->docBlockTerm = '}';
 					  if (yytext[yyleng-3]=='/')
 					  {
-					    startCommentBlock(TRUE);
+					    startCommentBlock(yyscanner,TRUE);
 					    BEGIN( DocLine );
 					  }
 					  else
 					  {
-					    startCommentBlock(FALSE);
+					    startCommentBlock(yyscanner,FALSE);
 					    BEGIN( DocBlock );
 					  }
   					}
 <SkipCurlyEndDoc>"}"			{
   				          //addToBody("}");
-                                          if (g_tempEntry) // we can only switch back to g_current if no new item was created
+                                          if (yyextra->tempEntry) // we can only switch back to yyextra->current if no new item was created
 					  {
-					    g_tempEntry.swap(g_current);
-					    g_tempEntry.reset();
+					    yyextra->tempEntry.swap(yyextra->current);
+					    yyextra->tempEntry.reset();
 					  }
-  					  BEGIN( g_lastCurlyContext );
+  					  BEGIN( yyextra->lastCurlyContext );
   					}
 <SkipCurly>\"			        { 
   				          //addToBody(yytext);
-  					  g_lastStringContext=SkipCurly;
+  					  yyextra->lastStringContext=SkipCurly;
   				          BEGIN( SkipString ); 
 					}
 <SkipCurly>^{B}*"#"			{ 
-  				          if (g_insidePHP)
+  				          if (yyextra->insidePHP)
   				            REJECT;
   				          //addToBody(yytext);
   					  BEGIN( SkipCurlyCpp );
 					}
 <SkipCurly,SkipC11Inits,SkipInits,SkipC11Attribute>\n	{
-                                          lineCount();
+                                          lineCount(yyscanner);
   				          //addToBody(yytext);
   					}
 <SkipCurly,SkipCurlyCpp,ReadInitializer>"<<<"	        {
-  					  if (!g_insidePHP) 
+  					  if (!yyextra->insidePHP) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            g_lastHereDocContext = YY_START;
+                                            yyextra->lastHereDocContext = YY_START;
 					    BEGIN(HereDoc);
 					  }
   					}
 <SkipCurly,SkipCurlyCpp>{B}*{RAWBEGIN}  {
                                           QCString raw=QCString(yytext).stripWhiteSpace();
-                                          g_delimiter = raw.data()+2;
-                                          g_delimiter=g_delimiter.left(g_delimiter.length()-1);
-                                          g_lastRawStringContext = YY_START;
-                                          g_dummyRawString.resize(0);
-                                          g_pCopyRawString = &g_dummyRawString;
-                                          *g_pCopyRawString+=yytext;
+                                          yyextra->delimiter = raw.data()+2;
+                                          yyextra->delimiter=yyextra->delimiter.left(yyextra->delimiter.length()-1);
+                                          yyextra->lastRawStringContext = YY_START;
+                                          yyextra->dummyRawString.resize(0);
+                                          yyextra->pCopyRawString = &yyextra->dummyRawString;
+                                          *yyextra->pCopyRawString+=yytext;
                                           BEGIN(RawString);
                                         }
 <SkipCurly,SkipCurlyCpp>[^\n#"'@\\/{}<]+ {
-                                          lineCount();  // for g_column updates
+                                          lineCount(yyscanner);  // for yyextra->column updates
   				          //addToBody(yytext);
   					}
 <SkipCurlyCpp>\n			{ 
   				          //addToBody(yytext);
-                                          lineCount();
-  					  g_lastCurlyContext = FindMembers;
+                                          lineCount(yyscanner);
+  					  yyextra->lastCurlyContext = FindMembers;
   					  BEGIN( SkipCurly ); 
 					}
 <SkipCurlyCpp>\\[\r]*"\n"[\r]*		{ 
   				          //addToBody(yytext);
-                                          lineCount();
+                                          lineCount(yyscanner);
 					}
 <SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"/*"	{
   				          //addToBody(yytext);
-  					  g_lastCContext = YY_START;
+  					  yyextra->lastCContext = YY_START;
 					  BEGIN(SkipComment);
   					}
 <SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>"//"  {
   				          //addToBody(yytext);
-  					  g_lastCContext = YY_START;
+  					  yyextra->lastCContext = YY_START;
 					  BEGIN(SkipCxxComment);
   					}
 <SkipInits,SkipC11Inits,SkipC11Attribute>"("             {
-                                          g_roundCount=0;
-                                          g_lastSkipRoundContext=YY_START;
+                                          yyextra->roundCount=0;
+                                          yyextra->lastSkipRoundContext=YY_START;
                                           BEGIN(SkipRound);
                                         }
 <SkipInits,SkipC11Inits,SkipC11Attribute>\"	        {
-  					  g_lastStringContext=YY_START;
+  					  yyextra->lastStringContext=YY_START;
   				          BEGIN( SkipString ); 
 					}
 <SkipInits>;	                        {
-  					  warn(g_yyFileName,g_yyLineNr,
+  					  warn(yyextra->yyFileName,yyextra->yyLineNr,
 					      "Found ';' while parsing initializer list! "
 					      "(doxygen could be confused by a macro call without semicolon)"
 					     );
 					  BEGIN( FindMembers );
   					}
 <SkipInits,SkipCurly,SkipCurlyCpp>"#"   {
-  				          if (!g_insidePHP)
+  				          if (!yyextra->insidePHP)
   				            REJECT;
   				          //addToBody(yytext);
-  					  g_lastCContext = YY_START;
+  					  yyextra->lastCContext = YY_START;
 					  BEGIN(SkipCxxComment);
   					}
 <SkipInits,SkipCurly,SkipCurlyCpp>@\"   {
-  				          if (!g_insideCS) REJECT;
+  				          if (!yyextra->insideCS) REJECT;
 					  // C# verbatim string
-					  g_lastSkipVerbStringContext=YY_START;
-					  g_pSkipVerbString=&g_current->initializer;
+					  yyextra->lastSkipVerbStringContext=YY_START;
+					  yyextra->pSkipVerbString=&yyextra->current->initializer;
 					  BEGIN(SkipVerbString);
   					}
 <SkipInits,SkipCurly,SkipCurlyCpp>{CHARLIT}	{
-                                          if (g_insidePHP) REJECT;
+                                          if (yyextra->insidePHP) REJECT;
                                         }
 <SkipInits,SkipCurly,SkipCurlyCpp>\'	{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-					    g_lastStringContext=YY_START;
+					    yyextra->lastStringContext=YY_START;
 					    BEGIN(SkipPHPString);
 					  }
 					}
 <SkipInits,SkipC11Inits,SkipCurly,SkipCurlyCpp,SkipC11Attribute>.	{ }
 <SkipString,SkipPHPString>\\.		{ }
 <SkipString>\"				{ 
-  					  BEGIN( g_lastStringContext ); 
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <SkipPHPString>\'			{ 
-  					  BEGIN( g_lastStringContext ); 
+  					  BEGIN( yyextra->lastStringContext ); 
 					}
 <SkipString,SkipPHPString>"/*"|"*/"|"//" { }
 <SkipString,SkipPHPString>\n		{
-                                          lineCount();
+                                          lineCount(yyscanner);
   					}
 <SkipString,SkipPHPString>.		{ }
 <CompoundName>":"			{ // for "class : public base {} var;" construct, see bug 608359
@@ -5387,243 +5087,243 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN(ClassVar);
   					}
 <CompoundName>";"			{
-					  g_current->section = Entry::EMPTY_SEC ;
-					  g_current->type.resize(0) ;
-					  g_current->name.resize(0) ;
-					  g_current->args.resize(0) ;
-					  g_current->argList.clear();
+					  yyextra->current->section = Entry::EMPTY_SEC ;
+					  yyextra->current->type.resize(0) ;
+					  yyextra->current->name.resize(0) ;
+					  yyextra->current->args.resize(0) ;
+					  yyextra->current->argList.clear();
 					  BEGIN( FindMembers ) ;
 					}
 <Bases>";"			{
-					  if (g_insideIDL && (g_current->spec & (Entry::Singleton |
+					  if (yyextra->insideIDL && (yyextra->current->spec & (Entry::Singleton |
 					                                     Entry::Service)))
 					  {
 					    // in UNO IDL a service or singleton may be defined
 					    // completely like this: "service Foo : XFoo;"
-					    if (!g_current->name.isEmpty() && !g_current_root->name.isEmpty())
+					    if (!yyextra->current->name.isEmpty() && !yyextra->current_root->name.isEmpty())
 					    {
-					      prependScope();
+					      prependScope(yyscanner);
 					    }
-					    g_current->name = g_current->name.stripWhiteSpace();
+					    yyextra->current->name = yyextra->current->name.stripWhiteSpace();
 					    // there can be only one base class here
-					    if (!g_baseName.isEmpty())
+					    if (!yyextra->baseName.isEmpty())
 					    {
-					      g_current->extends.push_back(
-					        BaseInfo(g_baseName,Public,Normal));
-					      g_baseName.resize(0);
+					      yyextra->current->extends.push_back(
+					        BaseInfo(yyextra->baseName,Public,Normal));
+					      yyextra->baseName.resize(0);
 					    }
-					    g_current_root->moveToSubEntryAndRefresh( g_current ) ;
-                                            initEntry();
+					    yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
+                                            initEntry(yyscanner);
 					  }
 					  else
 					  {
-					    g_current->section = Entry::EMPTY_SEC ;
-					    g_current->type.resize(0) ;
-					    g_current->name.resize(0) ;
-					    g_current->args.resize(0) ;
-					    g_current->argList.clear();
+					    yyextra->current->section = Entry::EMPTY_SEC ;
+					    yyextra->current->type.resize(0) ;
+					    yyextra->current->name.resize(0) ;
+					    yyextra->current->args.resize(0) ;
+					    yyextra->current->argList.clear();
 					  }
 					  BEGIN( FindMembers ) ;
 					}
 <CompoundName>{SCOPENAME}/{BN}*"<"	{
-  					  g_sharpCount = 0;
-  					  g_current->name = yytext ;
-					  if (g_current->spec & Entry::Protocol)
+  					  yyextra->sharpCount = 0;
+  					  yyextra->current->name = yytext ;
+					  if (yyextra->current->spec & Entry::Protocol)
 					  {
-					    g_current->name+="-p";
+					    yyextra->current->name+="-p";
 					  }
-					  lineCount();
-					  g_lastClassTemplSpecContext = ClassVar;
-					  if (g_insideObjC) // protocol list
+					  lineCount(yyscanner);
+					  yyextra->lastClassTemplSpecContext = ClassVar;
+					  if (yyextra->insideObjC) // protocol list
 					  {
 					    BEGIN( ObjCProtocolList );
 					  }
-					  else if (g_insideCS) // C# generic class
+					  else if (yyextra->insideCS) // C# generic class
 					  {
-                                            //g_current->name+="-g";
+                                            //yyextra->current->name+="-g";
 					    BEGIN( CSGeneric );
 					  }
 					  else // C++ template specialization
 					  {
-					    g_roundCount=0;
+					    yyextra->roundCount=0;
 					    BEGIN( ClassTemplSpec );
 					  }
 					}
 <CSGeneric>"<"				{
 					  ArgumentList al;
 					  // check bug 612858 before enabling the next line
-					  //g_current->spec |= Entry::Template;
-					  g_current->tArgLists.push_back(al);
-					  g_currentArgumentList = &g_current->tArgLists.back();
-					  g_templateStr="<";
-					  g_current->name += "<";
-					  g_fullArgString = g_templateStr;
-					  g_copyArgString = &g_current->name;
-					  //g_copyArgString = &g_templateStr;
-					  g_currentArgumentContext = ClassVar;
+					  //yyextra->current->spec |= Entry::Template;
+					  yyextra->current->tArgLists.push_back(al);
+					  yyextra->currentArgumentList = &yyextra->current->tArgLists.back();
+					  yyextra->templateStr="<";
+					  yyextra->current->name += "<";
+					  yyextra->fullArgString = yyextra->templateStr;
+					  yyextra->copyArgString = &yyextra->current->name;
+					  //yyextra->copyArgString = &yyextra->templateStr;
+					  yyextra->currentArgumentContext = ClassVar;
 					  BEGIN( ReadTempArgs );
   					}
 <ObjCProtocolList>"<"			{
-  					  g_insideProtocolList=TRUE;
+  					  yyextra->insideProtocolList=TRUE;
   					  BEGIN( Bases );
   					}
 <ClassTemplSpec>">"({BN}*"::"{BN}*{SCOPENAME})?	{
-					  g_current->name += yytext;
-					  lineCount();
-  					  if (g_roundCount==0 && --g_sharpCount<=0)
+					  yyextra->current->name += yytext;
+					  lineCount(yyscanner);
+  					  if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
 					  {
-					    g_current->name = removeRedundantWhiteSpace(g_current->name);
-					    if (g_current->spec & Entry::Protocol)
+					    yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+					    if (yyextra->current->spec & Entry::Protocol)
 					    { // Objective-C protocol
 					      unput('{'); // fake start of body
 					      BEGIN( ClassVar );
 					    }
 					    else
 					    {
-					      BEGIN( g_lastClassTemplSpecContext );
+					      BEGIN( yyextra->lastClassTemplSpecContext );
 					    }
 					  }
 					}
 <ClassTemplSpec>"<"			{
-					  g_current->name += yytext;
-					  if (g_roundCount==0) g_sharpCount++;
+					  yyextra->current->name += yytext;
+					  if (yyextra->roundCount==0) yyextra->sharpCount++;
   					}
 <ClassTemplSpec>.			{
-  					  g_current->name += yytext;
+  					  yyextra->current->name += yytext;
 					}
 <CompoundName>{SCOPENAME}{BN}*";"	{ // forward declaration
-                                          if (!g_current->tArgLists.empty())
+                                          if (!yyextra->current->tArgLists.empty())
                                           {
                                             // found a forward template declaration, this has
                                             // a purpose of its own
-                                            g_current->name = yytext;
-                                            g_current->name=g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
-                                            //printf("template class declaration for %s!\n",g_current->name.data());
-					    QCString rn = g_current_root->name.copy();
-					    //printf("cn='%s' rn='%s' g_isTypedef=%d\n",cn.data(),rn.data(),g_isTypedef);
-					    if (!g_current->name.isEmpty() && !rn.isEmpty())
+                                            yyextra->current->name = yytext;
+                                            yyextra->current->name=yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+                                            //printf("template class declaration for %s!\n",yyextra->current->name.data());
+					    QCString rn = yyextra->current_root->name.copy();
+					    //printf("cn='%s' rn='%s' yyextra->isTypedef=%d\n",cn.data(),rn.data(),yyextra->isTypedef);
+					    if (!yyextra->current->name.isEmpty() && !rn.isEmpty())
 					    {
-					      prependScope();
+					      prependScope(yyscanner);
 					    }
-                                            g_current->spec|=Entry::ForwardDecl;
-                                            g_current_root->moveToSubEntryAndRefresh(g_current);
+                                            yyextra->current->spec|=Entry::ForwardDecl;
+                                            yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
                                           }
-					  else if (g_insideIDL &&
-					           (((g_current_root->spec & (Entry::Interface |
+					  else if (yyextra->insideIDL &&
+					           (((yyextra->current_root->spec & (Entry::Interface |
 					                                    Entry::Service)) &&
-					             (g_current->spec & Entry::Interface)) ||
-					            ((g_current_root->spec & (Entry::Service |
+					             (yyextra->current->spec & Entry::Interface)) ||
+					            ((yyextra->current_root->spec & (Entry::Service |
 					                                    Entry::Singleton)) &&
-					             (g_current->spec & Entry::Service))))
+					             (yyextra->current->spec & Entry::Service))))
 					  {
-					    // interface g_inside of UNO IDL service or interface
-					    // service g_inside of UNO IDL service or singleton
+					    // interface yyextra->inside of UNO IDL service or interface
+					    // service yyextra->inside of UNO IDL service or singleton
 					    // there may be documentation on the member,
 					    // so do not throw it away...
-					    g_current->name = yytext;
-					    g_current->name=g_current->name.left(g_current->name.length()-1).stripWhiteSpace();
-					    g_current->section = (g_current->spec & Entry::Interface)
+					    yyextra->current->name = yytext;
+					    yyextra->current->name=yyextra->current->name.left(yyextra->current->name.length()-1).stripWhiteSpace();
+					    yyextra->current->section = (yyextra->current->spec & Entry::Interface)
 					        ? Entry::EXPORTED_INTERFACE_SEC
 					        : Entry::INCLUDED_SERVICE_SEC;
-//					    g_current->section = Entry::MEMBERDOC_SEC;
-					    g_current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
-					    g_current_root->moveToSubEntryAndRefresh(g_current);
+//					    yyextra->current->section = Entry::MEMBERDOC_SEC;
+					    yyextra->current->spec &= ~(Entry::Interface|Entry::Service); // FIXME: horrible: Interface == Gettable, so need to clear it - actually we're mixing values from different enums in this case... granted only Optional and Interface are actually valid in this context but urgh...
+					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
 					  }
 
     					  unput(';');
-					  g_current->reset();
-					  initEntry();
-                                          if (g_insideObjC) // see bug746361
+					  yyextra->current->reset();
+					  initEntry(yyscanner);
+                                          if (yyextra->insideObjC) // see bug746361
                                           {
-					    g_language = g_current->lang = SrcLangExt_Cpp;
-                                            g_insideObjC = FALSE;
+					    yyextra->language = yyextra->current->lang = SrcLangExt_Cpp;
+                                            yyextra->insideObjC = FALSE;
                                           }
-					  if (g_isTypedef) // typedef of a class, put typedef keyword back
+					  if (yyextra->isTypedef) // typedef of a class, put typedef keyword back
 					  {
-					    g_current->type.prepend("typedef");
+					    yyextra->current->type.prepend("typedef");
 					  }
 					  BEGIN( FindMembers );
 					}
 <CompoundName>{SCOPENAME}/{BN}*"("	{ 
-					  g_current->name = yytext ;
-					  lineCount();
-                                          if (g_insideCpp && g_current->name=="alignas") // C++11
+					  yyextra->current->name = yytext ;
+					  lineCount(yyscanner);
+                                          if (yyextra->insideCpp && yyextra->current->name=="alignas") // C++11
                                           {
-                                            g_lastAlignAsContext = YY_START;
+                                            yyextra->lastAlignAsContext = YY_START;
                                             BEGIN( AlignAs );
                                           }
                                           else
                                           {
-                                            if (g_current->spec & Entry::Protocol)
+                                            if (yyextra->current->spec & Entry::Protocol)
                                             {
-                                              g_current->name += "-p";
+                                              yyextra->current->name += "-p";
                                             }
                                             BEGIN( ClassVar );
                                           }
 					}
-<AlignAs>"("                            { g_roundCount=0; 
+<AlignAs>"("                            { yyextra->roundCount=0; 
                                           BEGIN( AlignAsEnd ); 
                                         }
-<AlignAs>\n                             { lineCount(); }
+<AlignAs>\n                             { lineCount(yyscanner); }
 <AlignAs>.
-<AlignAsEnd>"("                         { g_roundCount++; }
-<AlignAsEnd>")"                         { if (--g_roundCount<0) 
+<AlignAsEnd>"("                         { yyextra->roundCount++; }
+<AlignAsEnd>")"                         { if (--yyextra->roundCount<0) 
                                           {
-                                            BEGIN( g_lastAlignAsContext ); 
+                                            BEGIN( yyextra->lastAlignAsContext ); 
                                           }
                                         }
-<AlignAsEnd>\n                          { lineCount(); }
+<AlignAsEnd>\n                          { lineCount(yyscanner); }
 <AlignAsEnd>.
 <CompoundName>{SCOPENAME}/{BN}*","	{  // multiple forward declarations on one line
                                            // e.g. @protocol A,B;
-					  g_current->reset();
-					  initEntry();
+					  yyextra->current->reset();
+					  initEntry(yyscanner);
   					}
 <CompoundName>{SCOPENAME}		{ 
-					  g_current->name = yytext ;
-                                          if (g_insideCpp || g_insideObjC) 
+					  yyextra->current->name = yytext ;
+                                          if (yyextra->insideCpp || yyextra->insideObjC) 
                                           {
-                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
+                                            yyextra->current->id = ClangParser::instance()->lookup(yyextra->yyLineNr,yytext);
                                           }
-					  lineCount();
-					  if (g_current->spec & Entry::Protocol)
+					  lineCount(yyscanner);
+					  if (yyextra->current->spec & Entry::Protocol)
 					  {
-					    g_current->name += "-p";
+					    yyextra->current->name += "-p";
 					  }
-					  if ((g_current->spec & Entry::Protocol) ||
-					      g_current->section == Entry::OBJCIMPL_SEC)
+					  if ((yyextra->current->spec & Entry::Protocol) ||
+					      yyextra->current->section == Entry::OBJCIMPL_SEC)
 					  {
 					    unput('{'); // fake start of body
 					  }
 					  BEGIN( ClassVar );
 					}
 <CompoundName>{CSSCOPENAME}	        { // C# style scope
-					  g_current->name = substitute(yytext,".","::");
-					  lineCount();
+					  yyextra->current->name = substitute(yytext,".","::");
+					  lineCount(yyscanner);
 					  BEGIN( ClassVar );
                                         }
 <ClassVar>{SCOPENAME}{BN}*/"("		{
-  					  if (g_insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
+  					  if (yyextra->insideIDL && qstrncmp(yytext,"switch",6)==0 && !isId(yytext[6]))
 					  {
 					    // Corba IDL style union
-					    g_roundCount=0;
+					    yyextra->roundCount=0;
 					    BEGIN(SkipUnionSwitch);
 					  }
 					  else
 					  {
-  					    addType();
-					    g_current->name = yytext;
-					    g_current->name = g_current->name.stripWhiteSpace();
-					    lineCount();
+  					    addType(yyscanner);
+					    yyextra->current->name = yytext;
+					    yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+					    lineCount(yyscanner);
   					    BEGIN( FindMembers );
 					  }
   					}
 <ClassVar>","				{
- 					  if (g_isTypedef)
+ 					  if (yyextra->isTypedef)
 					  {
 					    // multiple types in one typedef
 					    unput(',');
-					    g_current->type.prepend("typedef ");
+					    yyextra->current->type.prepend("typedef ");
 					    BEGIN(FindMembers);
 					  }
 					  else
@@ -5632,12 +5332,12 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <ClassVar>("sealed"|"abstract")/{BN}*(":"|"{") {
-  					  if (g_insideCli)
+  					  if (yyextra->insideCli)
 					  {
 					    if (yytext[0]=='s') // sealed
-					      g_current->spec |= Entry::SealedClass;
+					      yyextra->current->spec |= Entry::SealedClass;
 					    else // abstract
-					      g_current->spec |= Entry::AbstractClass;
+					      yyextra->current->spec |= Entry::AbstractClass;
 					    BEGIN( ClassVar ); 
 					  }
 					  else
@@ -5646,66 +5346,66 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <ClassVar>{ID}				{
-                                          if (g_insideCpp || g_insideObjC) 
+                                          if (yyextra->insideCpp || yyextra->insideObjC) 
                                           {
-                                            g_current->id = ClangParser::instance()->lookup(g_yyLineNr,yytext);
+                                            yyextra->current->id = ClangParser::instance()->lookup(yyextra->yyLineNr,yytext);
                                           }
-  					  if (g_insideIDL && qstrcmp(yytext,"switch")==0)
+  					  if (yyextra->insideIDL && qstrcmp(yytext,"switch")==0)
 					  {
 					    // Corba IDL style union
-					    g_roundCount=0;
+					    yyextra->roundCount=0;
 					    BEGIN(SkipUnionSwitch);
 					  }
-					  else if ((g_insideJava || g_insidePHP || g_insideJS || g_insideSlice) && (qstrcmp(yytext,"implements")==0 || qstrcmp(yytext,"extends")==0))
+					  else if ((yyextra->insideJava || yyextra->insidePHP || yyextra->insideJS || yyextra->insideSlice) && (qstrcmp(yytext,"implements")==0 || qstrcmp(yytext,"extends")==0))
 					  {
-  					    g_current->type.resize(0);
-					    g_baseProt=Public;
-                                            g_baseVirt=Normal;
-					    g_baseName.resize(0);
+  					    yyextra->current->type.resize(0);
+					    yyextra->baseProt=Public;
+                                            yyextra->baseVirt=Normal;
+					    yyextra->baseName.resize(0);
 					    BEGIN( BasesProt ) ;
 					  }
-					  else if (g_insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
+					  else if (yyextra->insideCS && qstrcmp(yytext,"where")==0) // C# type constraint
 					  {
-                                            g_current->typeConstr.clear();
-					    g_current->typeConstr.push_back(Argument());
-					    g_lastCSConstraint = YY_START;
+                                            yyextra->current->typeConstr.clear();
+					    yyextra->current->typeConstr.push_back(Argument());
+					    yyextra->lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
-					  else if (g_insideCli &&  qstrcmp(yytext,"abstract")==0)
+					  else if (yyextra->insideCli &&  qstrcmp(yytext,"abstract")==0)
 					  {
-					    g_current->spec|=Entry::Abstract;
+					    yyextra->current->spec|=Entry::Abstract;
 					  }
-					  else if (g_insideCli &&  qstrcmp(yytext,"sealed")==0)
+					  else if (yyextra->insideCli &&  qstrcmp(yytext,"sealed")==0)
 					  {
-					    g_current->spec|=Entry::Sealed;
+					    yyextra->current->spec|=Entry::Sealed;
 					  }
                                           else if (qstrcmp(yytext,"final")==0)
                                           {
-                                            g_current->spec|=Entry::Final;
+                                            yyextra->current->spec|=Entry::Final;
                                           }
 					  else
 					  {
-					    if (g_current->section == Entry::ENUM_SEC)
+					    if (yyextra->current->section == Entry::ENUM_SEC)
 					    { // found "enum a b" -> variable
-					      g_current->section = Entry::VARIABLE_SEC ;
+					      yyextra->current->section = Entry::VARIABLE_SEC ;
 					    }
-					    g_current->type += ' ' ;
-					    g_current->type += g_current->name ;
-					    g_current->name = yytext ;
+					    yyextra->current->type += ' ' ;
+					    yyextra->current->type += yyextra->current->name ;
+					    yyextra->current->name = yytext ;
 					    
-					    if (nameIsOperator(g_current->name))
+					    if (nameIsOperator(yyextra->current->name))
 					    {
 				              BEGIN( Operator );
 					    }
 					  }
   					}
 <ClassVar>[(\[]				{
-    					  if (g_insideObjC && *yytext=='(') // class category
+    					  if (yyextra->insideObjC && *yytext=='(') // class category
 					  {
-					    g_current->name+='(';
-                                            //if (g_current->section!=Entry::OBJCIMPL_SEC)
+					    yyextra->current->name+='(';
+                                            //if (yyextra->current->section!=Entry::OBJCIMPL_SEC)
                                             //{
-					      g_current->spec|=Entry::Category;
+					      yyextra->current->spec|=Entry::Category;
                                             //}
 					    BEGIN( ClassCategory );
 					  }
@@ -5718,73 +5418,73 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					}
 <CSConstraintType,CSConstraintName>"/**/" { /* empty comment */ }
 <CSConstraintType,CSConstraintName>("/*"[*!]|"//"[/!])("<"?)	{ // special comment
-                                          g_fullArgString.resize(0);
-					  g_lastCopyArgChar='#'; // end marker
-					  g_lastCommentInArgContext=YY_START;
+                                          yyextra->fullArgString.resize(0);
+					  yyextra->lastCopyArgChar='#'; // end marker
+					  yyextra->lastCommentInArgContext=YY_START;
 					  if (yytext[1]=='/')
 					    BEGIN( CopyArgCommentLine );
 					  else
 					    BEGIN( CopyArgComment );
 					}
 <CSConstraintType,CSConstraintName>"#"	{ // artificially inserted token to signal end of comment block
-                                          g_current->typeConstr.back().docs = g_fullArgString;
+                                          yyextra->current->typeConstr.back().docs = yyextra->fullArgString;
   					}
 <CSConstraintType>"{"			{ // end of type constraint reached
                                           // parse documentation of the constraints
-                                          handleParametersCommentBlocks(g_current->typeConstr);
+                                          handleParametersCommentBlocks(yyscanner,yyextra->current->typeConstr);
 					  unput('{');
-					  BEGIN( g_lastCSConstraint );
+					  BEGIN( yyextra->lastCSConstraint );
 					}
 <CSConstraintType,CSConstraintName>";"  {
-                                          handleParametersCommentBlocks(g_current->typeConstr);
+                                          handleParametersCommentBlocks(yyscanner,yyextra->current->typeConstr);
 					  unput(';');
-					  BEGIN( g_lastCSConstraint );
+					  BEGIN( yyextra->lastCSConstraint );
   					}
 <CSConstraintName>":"                   {
                                           BEGIN( CSConstraintType );
                                         }
 <CSConstraintName>{ID}                  {
                                           // parameter name
-                                          g_current->typeConstr.back().name=yytext;
+                                          yyextra->current->typeConstr.back().name=yytext;
                                         }
 <CSConstraintType>"where"		{ // another constraint for a different param
-					  g_current->typeConstr.push_back(Argument());
+					  yyextra->current->typeConstr.push_back(Argument());
                                           BEGIN( CSConstraintName );
   					}
 <CSConstraintType>({ID}".")*{ID}("<"{ID}">")?("()")?  {
-                                          if (g_current->typeConstr.back().type.isEmpty())
+                                          if (yyextra->current->typeConstr.back().type.isEmpty())
                                               // first type constraint for this parameter
                                           {
-                                            g_current->typeConstr.back().type=yytext;
+                                            yyextra->current->typeConstr.back().type=yytext;
                                           }
                                           else // new type constraint for same parameter
                                           {
-                                            QCString name = g_current->typeConstr.back().name;
-                                            g_current->typeConstr.push_back(Argument());
-                                            g_current->typeConstr.back().name=name;
-                                            g_current->typeConstr.back().type=yytext;
+                                            QCString name = yyextra->current->typeConstr.back().name;
+                                            yyextra->current->typeConstr.push_back(Argument());
+                                            yyextra->current->typeConstr.back().name=name;
+                                            yyextra->current->typeConstr.back().type=yytext;
                                           }
                                         }
 <CSConstraintName,CSConstraintType>\n	{
-                                          lineCount();
+                                          lineCount(yyscanner);
 					}
 <CSConstraintName,CSConstraintType>.	{
 					}
 <ClassCategory>{ID}			{
-					  g_current->name+=yytext;
+					  yyextra->current->name+=yytext;
 					}
 <ClassCategory>")"/{BN}*"{"		{
-					  g_current->name+=')';
+					  yyextra->current->name+=')';
 					  BEGIN( ClassVar );
                                         }
 <ClassCategory>")"/{BN}*"<"		{
-					  g_current->name+=')';
+					  yyextra->current->name+=')';
 					  BEGIN( ObjCProtocolList );
                                         }
 <ClassCategory>")"			{
-					  g_current->name+=')';
-					  if ((g_current->section & Entry::Protocol) ||
-					      g_current->section == Entry::OBJCIMPL_SEC)
+					  yyextra->current->name+=')';
+					  if ((yyextra->current->section & Entry::Protocol) ||
+					      yyextra->current->section == Entry::OBJCIMPL_SEC)
 					  {
 					    unput('{'); // fake start of body
 					  }
@@ -5796,61 +5496,61 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  BEGIN( ClassVar );
 					}
 <ClassVar>":"				{ 
-                                          if (g_current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
+                                          if (yyextra->current->section==Entry::VARIABLE_SEC) // enum A B:2, see bug 748208
                                           {
-                                            g_current->bitfields+=":";
-                                            g_current->args.resize(0);
+                                            yyextra->current->bitfields+=":";
+                                            yyextra->current->args.resize(0);
                                             BEGIN(BitFields);
                                           }
-                                          else if (g_current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, 
+                                          else if (yyextra->current->section==Entry::ENUM_SEC) // enum E:2, see bug 313527, 
                                                                                  // or C++11 style enum: 'E : unsigned int {...}'
 					  {
-					    g_current->args.resize(0);
+					    yyextra->current->args.resize(0);
   					    BEGIN(EnumBaseType);
 					  }
 					  else
 					  {
-					    g_current->type.resize(0);
-					    if ((g_current->spec & Entry::Interface) || 
-						(g_current->spec & Entry::Struct)    || 
-						(g_current->spec & Entry::Ref)       || 
-						(g_current->spec & Entry::Value)     || 
-						g_insidePHP || g_insideCS || g_insideD || g_insideObjC || g_insideIDL
+					    yyextra->current->type.resize(0);
+					    if ((yyextra->current->spec & Entry::Interface) || 
+						(yyextra->current->spec & Entry::Struct)    || 
+						(yyextra->current->spec & Entry::Ref)       || 
+						(yyextra->current->spec & Entry::Value)     || 
+						yyextra->insidePHP || yyextra->insideCS || yyextra->insideD || yyextra->insideObjC || yyextra->insideIDL
 					       )
-					      g_baseProt=Public;
+					      yyextra->baseProt=Public;
 					    else
-					      g_baseProt=Private;
-					    g_baseVirt=Normal;
-					    g_baseName.resize(0);
+					      yyextra->baseProt=Private;
+					    yyextra->baseVirt=Normal;
+					    yyextra->baseName.resize(0);
 					    BEGIN( BasesProt ) ;
 					  }
 					}
 <ClassVar>[;=*&]			{
     					  unput(*yytext);
-					  if (g_isTypedef) // typedef of a class, put typedef keyword back
+					  if (yyextra->isTypedef) // typedef of a class, put typedef keyword back
 					  {
-					    g_current->type.prepend("typedef");
+					    yyextra->current->type.prepend("typedef");
 					  }
 					  if ((yytext[0]=='*' || yytext[0]=='&') && 
-					      g_current->section == Entry::ENUM_SEC)
+					      yyextra->current->section == Entry::ENUM_SEC)
 					  { // found "enum a *b" -> variable
-					    g_current->section = Entry::VARIABLE_SEC ;
+					    yyextra->current->section = Entry::VARIABLE_SEC ;
 					  }
 					  BEGIN( FindMembers );
     					}
 <Bases,ClassVar>"///"/[^/]              {
-  					  if (!g_insideObjC)
+  					  if (!yyextra->insideObjC)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-					    lineCount();
-					    g_current->program+=yytext;
-                                            g_current->fileName = g_yyFileName ;
-					    g_current->startLine = g_yyLineNr ;
-					    g_current->startColumn = g_yyColNr;
-					    g_curlyCount=0;
+					    lineCount(yyscanner);
+					    yyextra->current->program+=yytext;
+                                            yyextra->current->fileName = yyextra->yyFileName ;
+					    yyextra->current->startLine = yyextra->yyLineNr ;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->curlyCount=0;
 					    BEGIN( ReadBodyIntf );
 					  }
   					}
@@ -5858,56 +5558,56 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <Bases,ClassVar>("//"{B}*)?"/*!"        |
 <Bases,ClassVar>"//!"                   |
 <Bases,ClassVar>[\-+]{BN}*		{
-  					  if (!g_insideObjC)
+  					  if (!yyextra->insideObjC)
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-					    lineCount();
-					    g_current->program+=yytext;
-                                            g_current->fileName = g_yyFileName ;
-					    g_current->startLine = g_yyLineNr ;
-					    g_current->startColumn = g_yyColNr;
-					    g_curlyCount=0;
+					    lineCount(yyscanner);
+					    yyextra->current->program+=yytext;
+                                            yyextra->current->fileName = yyextra->yyFileName ;
+					    yyextra->current->startLine = yyextra->yyLineNr ;
+					    yyextra->current->startColumn = yyextra->yyColNr;
+					    yyextra->curlyCount=0;
 					    BEGIN( ReadBodyIntf );
 					  }
   					}
 <CompoundName,ClassVar>{B}*"{"{B}*	{ 
-                                          g_current->fileName = g_yyFileName ;
-					  g_current->startLine = g_yyLineNr ;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->name = removeRedundantWhiteSpace(g_current->name);
-					  if (g_current->name.isEmpty() && !g_isTypedef) // anonymous compound
+                                          yyextra->current->fileName = yyextra->yyFileName ;
+					  yyextra->current->startLine = yyextra->yyLineNr ;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+					  if (yyextra->current->name.isEmpty() && !yyextra->isTypedef) // anonymous compound
 					  {
-					    if (g_current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces
+					    if (yyextra->current->section==Entry::NAMESPACE_SEC) // allow reopening of anonymous namespaces
 					    {
 					      if (Config_getBool(EXTRACT_ANON_NSPACES)) // use visible name
 					      {
-					        g_current->name="anonymous_namespace{"+stripPath(g_current->fileName)+"}";
+					        yyextra->current->name="anonymous_namespace{"+stripPath(yyextra->current->fileName)+"}";
 					      }
 					      else // use invisible name
 					      {
-					        g_current->name.sprintf("@%d",g_anonNSCount);
+					        yyextra->current->name.sprintf("@%d",yyextra->anonNSCount);
 					      }
 					    }
 					    else
 					    {
-					      g_current->name.sprintf("@%d",g_anonCount++);
+					      yyextra->current->name.sprintf("@%d",yyextra->anonCount++);
 					    }
 					  }
-					  g_curlyCount=0;
-					  if (g_current_root && // not a nested struct g_inside an @interface section
-					      !(g_current_root->spec & Entry::Interface) &&
-					      ((g_current->spec & (Entry::Interface | Entry::Protocol | Entry::Category) ||
-					        g_current->section==Entry::OBJCIMPL_SEC)
+					  yyextra->curlyCount=0;
+					  if (yyextra->current_root && // not a nested struct yyextra->inside an @interface section
+					      !(yyextra->current_root->spec & Entry::Interface) &&
+					      ((yyextra->current->spec & (Entry::Interface | Entry::Protocol | Entry::Category) ||
+					        yyextra->current->section==Entry::OBJCIMPL_SEC)
 					      ) &&
-					      g_insideObjC
+					      yyextra->insideObjC
 					     )
 					  { // ObjC body that ends with @end
 					    BEGIN( ReadBodyIntf );
 					  }
-					  else if (g_current->section==Entry::NAMESPACE_SEC)
+					  else if (yyextra->current->section==Entry::NAMESPACE_SEC)
 					  { // namespace body
 					    BEGIN( ReadNSBody );
 					  }
@@ -5916,60 +5616,60 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    BEGIN( ReadBody ) ;
 					  }
 					}
-<BasesProt>"virtual"{BN}+               { lineCount(); g_baseVirt = Virtual; }
-<BasesProt>"public"{BN}+                { lineCount(); g_baseProt = Public; }
-<BasesProt>"protected"{BN}+             { lineCount(); g_baseProt = Protected; }
-<BasesProt>"internal"{BN}+              { if (!g_insideCli) REJECT ; lineCount(); g_baseProt = Package; }
-<BasesProt>"private"{BN}+               { lineCount(); g_baseProt = Private; }
-<BasesProt>{BN}				{ lineCount(); }
+<BasesProt>"virtual"{BN}+               { lineCount(yyscanner); yyextra->baseVirt = Virtual; }
+<BasesProt>"public"{BN}+                { lineCount(yyscanner); yyextra->baseProt = Public; }
+<BasesProt>"protected"{BN}+             { lineCount(yyscanner); yyextra->baseProt = Protected; }
+<BasesProt>"internal"{BN}+              { if (!yyextra->insideCli) REJECT ; lineCount(yyscanner); yyextra->baseProt = Package; }
+<BasesProt>"private"{BN}+               { lineCount(yyscanner); yyextra->baseProt = Private; }
+<BasesProt>{BN}				{ lineCount(yyscanner); }
 <BasesProt>.				{ unput(*yytext); BEGIN(Bases); }
 <Bases>("\\")?({ID}"\\")*{ID}		{ // PHP namespace token, not sure if interspacing is allowed but it gives problems (see bug 640847)
-                                          if (!g_insidePHP)
+                                          if (!yyextra->insidePHP)
 					  {
 					    REJECT;
 					  }
 					  else // PHP base class of the form \Ns\Cl or Ns\Cl
 					  {
-  					    lineCount();
+  					    lineCount(yyscanner);
 					    QCString bn=yytext;
 					    bn = substitute(bn,"\\","::");
-					    g_baseName += bn;
-					    g_current->args += ' ';
-					    g_current->args += yytext;
+					    yyextra->baseName += bn;
+					    yyextra->current->args += ' ';
+					    yyextra->current->args += yytext;
 					  }
                                         }
 <Bases>("::")?{BN}*({ID}{BN}*"::"{BN}*)*{ID}	{ 
-  					  lineCount();
+  					  lineCount(yyscanner);
                                           QCString baseScope = yytext;
-                                          if (g_insideCS && baseScope.stripWhiteSpace()=="where")
+                                          if (yyextra->insideCS && baseScope.stripWhiteSpace()=="where")
 					  { 
 					    // type constraint for a class
-                                            g_current->typeConstr.clear();
-					    g_current->typeConstr.push_back(Argument());
-					    g_lastCSConstraint = YY_START;
+                                            yyextra->current->typeConstr.clear();
+					    yyextra->current->typeConstr.push_back(Argument());
+					    yyextra->lastCSConstraint = YY_START;
 					    BEGIN( CSConstraintName );
 					  }
 					  else
 					  {
-  					    g_baseName+=yytext;
-					    g_current->args += ' ';
-					    g_current->args += yytext;
+  					    yyextra->baseName+=yytext;
+					    yyextra->current->args += ' ';
+					    yyextra->current->args += yytext;
 					  }
 					}
 <Bases>{BN}*{ID}("."{ID})*		{ // Java style class
     					  QCString name = substitute(yytext,".","::");
-					  g_baseName += name;
-					  g_current->args += ' ';
-					  g_current->args += name;
+					  yyextra->baseName += name;
+					  yyextra->current->args += ' ';
+					  yyextra->current->args += name;
     					}
 <ClassVar,Bases>\n/{BN}*[^{, \t\n]	{
-                                          if (!g_insideObjC) 
+                                          if (!yyextra->insideObjC) 
 					  {
 					    REJECT;
 					  }
 					  else
 					  {
-                                            lineCount();
+                                            lineCount(yyscanner);
 					    unput('{');
 					  }
 					}
@@ -5981,53 +5681,53 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					  unput('}'); 
   					  unput('{');
 					}
-<ClassVar>"<"   	                { g_current->name += *yytext;
-  					  g_sharpCount=1; 
-					  g_roundCount=0;
-					  g_lastSkipSharpContext = YY_START;
-					  g_specName = &g_current->name;
+<ClassVar>"<"   	                { yyextra->current->name += *yytext;
+  					  yyextra->sharpCount=1; 
+					  yyextra->roundCount=0;
+					  yyextra->lastSkipSharpContext = YY_START;
+					  yyextra->specName = &yyextra->current->name;
 					  BEGIN ( Specialization );
 					}
 <Bases>{BN}*"<"                         {
-                                          lineCount();
-  					  g_sharpCount=1; 
-					  g_roundCount=0;
-					  g_lastSkipSharpContext = YY_START;
-					  if (g_insideObjC) // start of protocol list
+                                          lineCount(yyscanner);
+  					  yyextra->sharpCount=1; 
+					  yyextra->roundCount=0;
+					  yyextra->lastSkipSharpContext = YY_START;
+					  if (yyextra->insideObjC) // start of protocol list
 					  {
 					    unput(',');
 					  }
 					  else // template specialization
 					  {
-					    //if (g_insideCS) // generic
+					    //if (yyextra->insideCS) // generic
 					    //{
-					    //  g_baseName+="-g";
+					    //  yyextra->baseName+="-g";
 					    //}
-                                            g_templateStr = yytext;
-					    g_specName = &g_templateStr;
+                                            yyextra->templateStr = yytext;
+					    yyextra->specName = &yyextra->templateStr;
 					    BEGIN ( Specialization );
 					  }
 					}
-<Specialization>"<"			{ *g_specName += *yytext;
-  					  if (g_roundCount==0) g_sharpCount++;
+<Specialization>"<"			{ *yyextra->specName += *yytext;
+  					  if (yyextra->roundCount==0) yyextra->sharpCount++;
   					}
 <Specialization>">"			{
-  					  *g_specName += *yytext;
-  					  if (g_roundCount==0 && --g_sharpCount<=0)
+  					  *yyextra->specName += *yytext;
+  					  if (yyextra->roundCount==0 && --yyextra->sharpCount<=0)
 					  {
-					    g_baseName+=removeRedundantWhiteSpace(*g_specName);
-					    BEGIN(g_lastSkipSharpContext);
+					    yyextra->baseName+=removeRedundantWhiteSpace(*yyextra->specName);
+					    BEGIN(yyextra->lastSkipSharpContext);
 					  }
   					}
-<Specialization>{BN}+			{ lineCount(); *g_specName +=' '; }
-<Specialization>"<<"			{ *g_specName += yytext; }
+<Specialization>{BN}+			{ lineCount(yyscanner); *yyextra->specName +=' '; }
+<Specialization>"<<"			{ *yyextra->specName += yytext; }
 <Specialization>">>"/{B}*"::"		{ // M$ C++ extension to allow >> to close a template...
   					  unput('>');
   					  unput(' ');
   					  unput('>');
                                         }
 <Specialization>">>"			{
-                                          if (g_insideCS) // for C# >> ends a nested template
+                                          if (yyextra->insideCS) // for C# >> ends a nested template
 					  {
 					    REJECT;
 					  }
@@ -6037,9 +5737,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					       // We require the bitshift to be enclosed in braces.
 					       // See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2005/n1757.html
 					  {
-					    if (g_roundCount>0)
+					    if (yyextra->roundCount>0)
 					    {
-                                              *g_specName += yytext; 
+                                              *yyextra->specName += yytext; 
 					    }
 					    else
 					    {
@@ -6049,64 +5749,64 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    }
 					  }
                                         }
-<Specialization>"typename"{BN}+		{ lineCount(); }
-<Specialization>"("			{ *g_specName += *yytext; g_roundCount++; }
-<Specialization>")"			{ *g_specName += *yytext; g_roundCount--; }
-
-<Specialization>"\\\\"			{ *g_specName += *yytext;}
-<Specialization>"\\'"			{ *g_specName += *yytext;}
-<Specialization>"\\\""			{ *g_specName += *yytext;}
-<Specialization>"'"			{ *g_specName += *yytext;BEGIN(SpecializationSingleQuote);}
-<Specialization>"\""			{ *g_specName += *yytext;BEGIN(SpecializationDoubleQuote);}
-<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\"       { *g_specName += *yytext;}
-<SpecializationSingleQuote>"\\'"        { *g_specName += *yytext;}
-<SpecializationSingleQuote>"'"          { *g_specName += *yytext; BEGIN(Specialization);}
-<SpecializationDoubleQuote>"\\\""       { *g_specName += *yytext;}
-<SpecializationDoubleQuote>"\""         { *g_specName += *yytext; BEGIN(Specialization);}
-<SpecializationSingleQuote,SpecializationDoubleQuote>.          { *g_specName += *yytext;}
+<Specialization>"typename"{BN}+		{ lineCount(yyscanner); }
+<Specialization>"("			{ *yyextra->specName += *yytext; yyextra->roundCount++; }
+<Specialization>")"			{ *yyextra->specName += *yytext; yyextra->roundCount--; }
+
+<Specialization>"\\\\"			{ *yyextra->specName += *yytext;}
+<Specialization>"\\'"			{ *yyextra->specName += *yytext;}
+<Specialization>"\\\""			{ *yyextra->specName += *yytext;}
+<Specialization>"'"			{ *yyextra->specName += *yytext;BEGIN(SpecializationSingleQuote);}
+<Specialization>"\""			{ *yyextra->specName += *yytext;BEGIN(SpecializationDoubleQuote);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>"\\\\"       { *yyextra->specName += *yytext;}
+<SpecializationSingleQuote>"\\'"        { *yyextra->specName += *yytext;}
+<SpecializationSingleQuote>"'"          { *yyextra->specName += *yytext; BEGIN(Specialization);}
+<SpecializationDoubleQuote>"\\\""       { *yyextra->specName += *yytext;}
+<SpecializationDoubleQuote>"\""         { *yyextra->specName += *yytext; BEGIN(Specialization);}
+<SpecializationSingleQuote,SpecializationDoubleQuote>.          { *yyextra->specName += *yytext;}
 
 <Specialization>.			{
-  					  *g_specName += *yytext;
+  					  *yyextra->specName += *yytext;
   					}
-<SkipRound>"("				{ ++g_roundCount; }
-<SkipRound>")"				{ if (--g_roundCount<0)
-					    BEGIN ( g_lastSkipRoundContext );
+<SkipRound>"("				{ ++yyextra->roundCount; }
+<SkipRound>")"				{ if (--yyextra->roundCount<0)
+					    BEGIN ( yyextra->lastSkipRoundContext );
 					}
 <SkipRound>\"				{
-  					  g_lastStringContext=SkipRound;
+  					  yyextra->lastStringContext=SkipRound;
 					  BEGIN(SkipString);
   					}
-<Bases>","|(">"({BN}*"{")?)|({BN}+"implements"{BN}*)	{ lineCount();
-                                          if (g_insideProtocolList)
+<Bases>","|(">"({BN}*"{")?)|({BN}+"implements"{BN}*)	{ lineCount(yyscanner);
+                                          if (yyextra->insideProtocolList)
 					  {
-					    g_baseName+="-p";
+					    yyextra->baseName+="-p";
 					  }
 					  else
 					  {
-                                            g_current->args += ',' ; 
+                                            yyextra->current->args += ',' ; 
 					  }
-					  g_current->name = removeRedundantWhiteSpace(g_current->name);
-  					  if (!g_baseName.isEmpty())
+					  yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+  					  if (!yyextra->baseName.isEmpty())
 					  {
-  					    g_current->extends.push_back(
-					      BaseInfo(g_baseName,g_baseProt,g_baseVirt)
+  					    yyextra->current->extends.push_back(
+					      BaseInfo(yyextra->baseName,yyextra->baseProt,yyextra->baseVirt)
 					    );
 					  }
-					  if ((g_current->spec & (Entry::Interface|Entry::Struct)) || 
-					      g_insideJava || g_insidePHP || g_insideCS || 
-					      g_insideD || g_insideObjC || g_insideIDL || g_insideSlice)
+					  if ((yyextra->current->spec & (Entry::Interface|Entry::Struct)) || 
+					      yyextra->insideJava || yyextra->insidePHP || yyextra->insideCS || 
+					      yyextra->insideD || yyextra->insideObjC || yyextra->insideIDL || yyextra->insideSlice)
 					  {
-					    g_baseProt=Public;
+					    yyextra->baseProt=Public;
 					  }
 					  else
 					  {
-					    g_baseProt=Private;
+					    yyextra->baseProt=Private;
 					  }
-					  g_baseVirt=Normal;
-					  g_baseName.resize(0);
+					  yyextra->baseVirt=Normal;
+					  yyextra->baseName.resize(0);
                                           if (*yytext=='>')
 					  { // end of a ObjC protocol list
-  					    g_insideProtocolList=FALSE;
+  					    yyextra->insideProtocolList=FALSE;
 					    if (yyleng==1)
 					    {
 					      unput('{'); // dummy start body
@@ -6118,23 +5818,23 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					  else
 					  {
-					    if (*yytext==',' && g_insideObjC) // Begin of protocol list
+					    if (*yytext==',' && yyextra->insideObjC) // Begin of protocol list
 					    {
-  					      g_insideProtocolList=TRUE;
+  					      yyextra->insideProtocolList=TRUE;
 					    }
 					    BEGIN(BasesProt);
 					  }
 					}
-<Bases>{B}*"{"{B}*			{ g_current->fileName = g_yyFileName ;
-					  g_current->startLine = g_yyLineNr ;
-					  g_current->startColumn = g_yyColNr;
-					  g_current->name = removeRedundantWhiteSpace(g_current->name);
-  					  if (!g_baseName.isEmpty())
-  					    g_current->extends.push_back(
-					       BaseInfo(g_baseName,g_baseProt,g_baseVirt)
+<Bases>{B}*"{"{B}*			{ yyextra->current->fileName = yyextra->yyFileName ;
+					  yyextra->current->startLine = yyextra->yyLineNr ;
+					  yyextra->current->startColumn = yyextra->yyColNr;
+					  yyextra->current->name = removeRedundantWhiteSpace(yyextra->current->name);
+  					  if (!yyextra->baseName.isEmpty())
+  					    yyextra->current->extends.push_back(
+					       BaseInfo(yyextra->baseName,yyextra->baseProt,yyextra->baseVirt)
 					    );
-					  g_curlyCount=0;
-					  if (g_insideObjC)
+					  yyextra->curlyCount=0;
+					  if (yyextra->insideObjC)
 					  {
 					    BEGIN( ReadBodyIntf );
 					  }
@@ -6144,214 +5844,214 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
 					}
 <SkipUnionSwitch>{B}*"("		{
-  					  g_roundCount++;
+  					  yyextra->roundCount++;
   					}
 <SkipUnionSwitch>")"			{
-  					  if (--g_roundCount==0)
+  					  if (--yyextra->roundCount==0)
 					  {
 					    BEGIN(ClassVar);
 					  }
   					}
-<SkipUnionSwitch>\n			{ lineCount(); }
+<SkipUnionSwitch>\n			{ lineCount(yyscanner); }
 <SkipUnionSwitch>.			
-<Comment>{BN}+				{ g_current->program += yytext ;
-					  lineCount() ;
+<Comment>{BN}+				{ yyextra->current->program += yytext ;
+					  lineCount(yyscanner) ;
 					}
-<Comment>"/*"				{ g_current->program += yytext ; } 
-<Comment>"//"				{ g_current->program += yytext ; }
+<Comment>"/*"				{ yyextra->current->program += yytext ; } 
+<Comment>"//"				{ yyextra->current->program += yytext ; }
 <Comment>{CMD}("code"|"verbatim")	{
-                                          g_insideCode=TRUE;
-  					  g_current->program += yytext ;
+                                          yyextra->insideCode=TRUE;
+  					  yyextra->current->program += yytext ;
   					}
 <Comment>{CMD}("endcode"|"endverbatim")	{
-                                          g_insideCode=FALSE;
-  					  g_current->program += yytext ;
+                                          yyextra->insideCode=FALSE;
+  					  yyextra->current->program += yytext ;
   					}
-<Comment>[^ \.\t\r\n\/\*]+		{ g_current->program += yytext ; }
-<Comment>"*/"				{ g_current->program += yytext ;
-					  if (!g_insideCode) BEGIN( g_lastContext ) ;
+<Comment>[^ \.\t\r\n\/\*]+		{ yyextra->current->program += yytext ; }
+<Comment>"*/"				{ yyextra->current->program += yytext ;
+					  if (!yyextra->insideCode) BEGIN( yyextra->lastContext ) ;
 					}
-<Comment>.				{ g_current->program += *yytext ; }
+<Comment>.				{ yyextra->current->program += *yytext ; }
 
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,SkipC11Inits,SkipC11Attribute,Bases,OldStyleArgs>("//"{B}*)?"/*!" { 
-  					  //printf("Start doc block at %d\n",g_yyLineNr);
-					  if (!g_current->doc.isEmpty())
+  					  //printf("Start doc block at %d\n",yyextra->yyLineNr);
+					  if (!yyextra->current->doc.isEmpty())
 					  {
-					    g_current->doc+="\n\n";
+					    yyextra->current->doc+="\n\n";
 					  }
 					  else
 					  {
-					    g_current->docLine = g_yyLineNr;
-					    g_current->docFile = g_yyFileName;
+					    yyextra->current->docLine = yyextra->yyLineNr;
+					    yyextra->current->docFile = yyextra->yyFileName;
 					  }
 
-					  g_lastDocContext = YY_START;
-					  if (g_current_root->section & Entry::SCOPE_MASK)
+					  yyextra->lastDocContext = YY_START;
+					  if (yyextra->current_root->section & Entry::SCOPE_MASK)
                                           {
-					    g_current->inside = g_current_root->name+"::";
+					    yyextra->current->inside = yyextra->current_root->name+"::";
                                           }
-					  g_docBlockContext   = YY_START;
-					  g_docBlockInBody    = YY_START==SkipCurly;
-					  g_docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF);
+					  yyextra->docBlockContext   = YY_START;
+					  yyextra->docBlockInBody    = YY_START==SkipCurly;
+					  yyextra->docBlockAutoBrief = Config_getBool(QT_AUTOBRIEF);
 
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
 
-					  if (g_docBlockAutoBrief)
+					  if (yyextra->docBlockAutoBrief)
 					  {
-					    g_current->briefLine = g_yyLineNr;
-					    g_current->briefFile = g_yyFileName;
+					    yyextra->current->briefLine = yyextra->yyLineNr;
+					    yyextra->current->briefFile = yyextra->yyFileName;
 					  }
-					  startCommentBlock(FALSE);
+					  startCommentBlock(yyscanner,FALSE);
 					  BEGIN( DocBlock );
 					}
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>"/**"[*]+{BL} {
 					  bool javadocBanner = Config_getBool(JAVADOC_BANNER);
-                                          lineCount();
+                                          lineCount(yyscanner);
 
 					  if( javadocBanner )
                                           {
-                                            g_lastDocContext = YY_START;
+                                            yyextra->lastDocContext = YY_START;
 
-                                            //printf("Found comment banner at %s:%d\n",g_yyFileName,g_yyLineNr);
-                                            if (g_current_root->section & Entry::SCOPE_MASK)
+                                            //printf("Found comment banner at %s:%d\n",yyextra->yyFileName,yyextra->yyLineNr);
+                                            if (yyextra->current_root->section & Entry::SCOPE_MASK)
                                             {
-                                              g_current->inside = g_current_root->name+"::";
+                                              yyextra->current->inside = yyextra->current_root->name+"::";
                                             }
-                                            g_current->docLine = g_yyLineNr;
-                                            g_current->docFile = g_yyFileName;
-                                            g_docBlockContext = YY_START;
-                                            g_docBlockInBody  = YY_START==SkipCurly;
+                                            yyextra->current->docLine = yyextra->yyLineNr;
+                                            yyextra->current->docFile = yyextra->yyFileName;
+                                            yyextra->docBlockContext = YY_START;
+                                            yyextra->docBlockInBody  = YY_START==SkipCurly;
                                             bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
-                                            g_docBlockAutoBrief = javadocAutoBrief;
+                                            yyextra->docBlockAutoBrief = javadocAutoBrief;
 
                                             QCString indent;
-                                            indent.fill(' ',computeIndent(yytext,g_column));
-                                            g_docBlock=indent;
+                                            indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                            yyextra->docBlock=indent;
 
-                                            if (g_docBlockAutoBrief)
+                                            if (yyextra->docBlockAutoBrief)
                                             {
-                                              g_current->briefLine = g_yyLineNr;
-                                              g_current->briefFile = g_yyFileName;
+                                              yyextra->current->briefLine = yyextra->yyLineNr;
+                                              yyextra->current->briefFile = yyextra->yyFileName;
                                             }
-                                            startCommentBlock(FALSE);
+                                            startCommentBlock(yyscanner,FALSE);
                                             BEGIN( DocBlock );
                                           }
                                           else
                                           {
-					    g_current->program += yytext ;
-					    g_lastContext = YY_START ;
+					    yyextra->current->program += yytext ;
+					    yyextra->lastContext = YY_START ;
 					    BEGIN( Comment ) ;
 					  }
 					}
 <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/**"/[^/*] {
-					  g_lastDocContext = YY_START;
+					  yyextra->lastDocContext = YY_START;
 
-					  //printf("Found comment block at %s:%d\n",g_yyFileName,g_yyLineNr);
-					  if (g_current_root->section & Entry::SCOPE_MASK)
+					  //printf("Found comment block at %s:%d\n",yyextra->yyFileName,yyextra->yyLineNr);
+					  if (yyextra->current_root->section & Entry::SCOPE_MASK)
                                           {
-					    g_current->inside = g_current_root->name+"::";
+					    yyextra->current->inside = yyextra->current_root->name+"::";
                                           }
-					  g_current->docLine = g_yyLineNr;
-					  g_current->docFile = g_yyFileName;
-					  g_docBlockContext = YY_START;
-					  g_docBlockInBody  = YY_START==SkipCurly;
+					  yyextra->current->docLine = yyextra->yyLineNr;
+					  yyextra->current->docFile = yyextra->yyFileName;
+					  yyextra->docBlockContext = YY_START;
+					  yyextra->docBlockInBody  = YY_START==SkipCurly;
                                           bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF);
-					  g_docBlockAutoBrief = javadocAutoBrief;
+					  yyextra->docBlockAutoBrief = javadocAutoBrief;
 
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
 
-					  if (g_docBlockAutoBrief)
+					  if (yyextra->docBlockAutoBrief)
 					  {
-					    g_current->briefLine = g_yyLineNr;
-					    g_current->briefFile = g_yyFileName;
+					    yyextra->current->briefLine = yyextra->yyLineNr;
+					    yyextra->current->briefFile = yyextra->yyFileName;
 					  }
-					  startCommentBlock(FALSE);
+					  startCommentBlock(yyscanner,FALSE);
 					  BEGIN( DocBlock );
   					}
 <FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"//!" { 
-					  g_lastDocContext = YY_START;
-					  if (g_current_root->section & Entry::SCOPE_MASK)
+					  yyextra->lastDocContext = YY_START;
+					  if (yyextra->current_root->section & Entry::SCOPE_MASK)
                                           {
-					    g_current->inside = g_current_root->name+"::";
+					    yyextra->current->inside = yyextra->current_root->name+"::";
                                           }
-					  g_docBlockContext   = YY_START;
-					  g_docBlockInBody    = YY_START==SkipCurly;
-					  g_docBlockAutoBrief = FALSE;
+					  yyextra->docBlockContext   = YY_START;
+					  yyextra->docBlockInBody    = YY_START==SkipCurly;
+					  yyextra->docBlockAutoBrief = FALSE;
 
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
 
-					  startCommentBlock(g_current->brief.isEmpty());
+					  startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
 					  BEGIN( DocLine );
 					}
 <FindMembers,FindFields,MemberSpec,SkipCurly,FuncQual,Operator,ClassVar,Bases,OldStyleArgs>"///"/[^/] { 
-					  g_lastDocContext = YY_START;
-					  if (g_current_root->section & Entry::SCOPE_MASK)
+					  yyextra->lastDocContext = YY_START;
+					  if (yyextra->current_root->section & Entry::SCOPE_MASK)
                                           {
-					    g_current->inside = g_current_root->name+"::";
+					    yyextra->current->inside = yyextra->current_root->name+"::";
                                           }
-					  g_docBlockContext   = YY_START;
-					  g_docBlockInBody    = YY_START==SkipCurly;
-					  g_docBlockAutoBrief = FALSE;
+					  yyextra->docBlockContext   = YY_START;
+					  yyextra->docBlockInBody    = YY_START==SkipCurly;
+					  yyextra->docBlockAutoBrief = FALSE;
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock=indent;
-					  startCommentBlock(g_current->brief.isEmpty());
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock=indent;
+					  startCommentBlock(yyscanner,yyextra->current->brief.isEmpty());
 					  BEGIN( DocLine );
 					}
 <FindMembers>"extern"{BN}*"\"C"("++")?"\""{BN}*("{")?  {
-					  lineCount();
-					  g_externC=TRUE;
+					  lineCount(yyscanner);
+					  yyextra->externC=TRUE;
 					}
 <FindMembers>"{"			{
-                                          if (g_externC) 
+                                          if (yyextra->externC) 
 					  {
-					    g_externC=FALSE;
+					    yyextra->externC=FALSE;
 					  }
-                                          else if (g_insideCS &&    
-					      !g_current->name.isEmpty() && 
-					      !g_current->type.isEmpty())
+                                          else if (yyextra->insideCS &&    
+					      !yyextra->current->name.isEmpty() && 
+					      !yyextra->current->type.isEmpty())
 					  {
-					    if (containsWord(g_current->type,"event")) // event
+					    if (containsWord(yyextra->current->type,"event")) // event
 					    {
-  					      g_current->mtype = g_mtype = Event;
+  					      yyextra->current->mtype = yyextra->mtype = Event;
 					    }
 					    else // property
 					    {				
-  					      g_current->mtype = g_mtype = Property;
+  					      yyextra->current->mtype = yyextra->mtype = Property;
 					    }
-					    g_current->bodyLine = g_yyLineNr;
-					    g_curlyCount=0;
+					    yyextra->current->bodyLine = yyextra->yyLineNr;
+					    yyextra->curlyCount=0;
 					    BEGIN( CSAccessorDecl );
 					  }
-					  else if (g_insideIDL && (g_current->spec & Entry::Attribute))
+					  else if (yyextra->insideIDL && (yyextra->current->spec & Entry::Attribute))
 					  {
 					    // UNO IDL: attributes may have setter and getter
 					    // exception specifications
-					    g_current->exception = " {";
+					    yyextra->current->exception = " {";
 					    BEGIN(UNOIDLAttributeBlock);
 					  }
 					  else
 					  {
-					    if ((g_insideJava || g_insideCS || g_insideD) &&
-						g_current->name.isEmpty()
+					    if ((yyextra->insideJava || yyextra->insideCS || yyextra->insideD) &&
+						yyextra->current->name.isEmpty()
 					       )
 					    {
 					      // static Java initializer
-					      g_needsSemi = FALSE;
-					      if (g_current->stat)
+					      yyextra->needsSemi = FALSE;
+					      if (yyextra->current->stat)
 					      {
-						g_current->name="[static initializer]";
-						g_current->type.resize(0);
+						yyextra->current->name="[static initializer]";
+						yyextra->current->type.resize(0);
 					      }
 					      else
 					      {
-						g_current->name="[instance initializer]";
+						yyextra->current->name="[instance initializer]";
 					      }
                                               unput(*yytext); 
 					      BEGIN( Function );
@@ -6359,122 +6059,122 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    else
 					    {
 					      // pre C++11 code -> ignore the initializer
-                                              //g_needsSemi = TRUE;
-					      //g_current->type.resize(0);
-					      //g_current->name.resize(0);
-					      //g_current->args.resize(0);
-					      //g_current->argList.clear();
-					      //g_curlyCount=0;
+                                              //yyextra->needsSemi = TRUE;
+					      //yyextra->current->type.resize(0);
+					      //yyextra->current->name.resize(0);
+					      //yyextra->current->args.resize(0);
+					      //yyextra->current->argList.clear();
+					      //yyextra->curlyCount=0;
 					      //BEGIN( SkipCurlyBlock );
 
                                               // C++11 style initializer list
-  					      g_current->bodyLine = g_yyLineNr;
-                                              g_current->initializer = yytext;
-					      g_lastInitializerContext = YY_START;
-					      g_initBracketCount=1;
+  					      yyextra->current->bodyLine = yyextra->yyLineNr;
+                                              yyextra->current->initializer = yytext;
+					      yyextra->lastInitializerContext = YY_START;
+					      yyextra->initBracketCount=1;
 					      BEGIN(ReadInitializer);
 					    }
 					  }
   					}
-<CSAccessorDecl>"{"			{ g_curlyCount++; }
+<CSAccessorDecl>"{"			{ yyextra->curlyCount++; }
 <CSAccessorDecl>"}"{B}*"="		{
 					  // fall back to next rule if it's not the right bracket
-					  if (g_curlyCount != 0) REJECT;
-					  g_current->initializer = "=";
-					  g_current->endBodyLine=g_yyLineNr;
-					  g_lastInitializerContext = FindMembers;
+					  if (yyextra->curlyCount != 0) REJECT;
+					  yyextra->current->initializer = "=";
+					  yyextra->current->endBodyLine=yyextra->yyLineNr;
+					  yyextra->lastInitializerContext = FindMembers;
 					  BEGIN(ReadInitializer);
 					}
 <CSAccessorDecl>"}"			{ 
-                                          if (g_curlyCount) 
+                                          if (yyextra->curlyCount) 
                                           {
-                                            g_curlyCount--; 
+                                            yyextra->curlyCount--; 
 					  }
 					  else
 					  {
-  					    g_mtype = Method;
-                                            g_virt = Normal;
+  					    yyextra->mtype = Method;
+                                            yyextra->virt = Normal;
 					    // not really important, but while we are at it
-					    g_current->endBodyLine=g_yyLineNr;
+					    yyextra->current->endBodyLine=yyextra->yyLineNr;
                                             unput(';');
 					    BEGIN(FindMembers);
 					  }
                                         }
-<CSAccessorDecl>"private "{BN}*"set"	{ if (g_curlyCount==0) g_current->spec |= Entry::PrivateSettable;   }
-<CSAccessorDecl>"protected "{BN}*"set"	{ if (g_curlyCount==0) g_current->spec |= Entry::ProtectedSettable; }
-<CSAccessorDecl>"private "{BN}*"get"	{ if (g_curlyCount==0) g_current->spec |= Entry::PrivateGettable;  	}
-<CSAccessorDecl>"protected "{BN}*"get"	{ if (g_curlyCount==0) g_current->spec |= Entry::ProtectedGettable; }
-<CSAccessorDecl>"set"			{ if (g_curlyCount==0) g_current->spec |= Entry::Settable;  }
-<CSAccessorDecl>"get"			{ if (g_curlyCount==0) g_current->spec |= Entry::Gettable;  }
-<CSAccessorDecl>"add"			{ if (g_curlyCount==0) g_current->spec |= Entry::Addable;   }
-<CSAccessorDecl>"remove"		{ if (g_curlyCount==0) g_current->spec |= Entry::Removable; }
-<CSAccessorDecl>"raise"			{ if (g_curlyCount==0) g_current->spec |= Entry::Raisable;  }
+<CSAccessorDecl>"private "{BN}*"set"	{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::PrivateSettable;   }
+<CSAccessorDecl>"protected "{BN}*"set"	{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::ProtectedSettable; }
+<CSAccessorDecl>"private "{BN}*"get"	{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::PrivateGettable;  	}
+<CSAccessorDecl>"protected "{BN}*"get"	{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::ProtectedGettable; }
+<CSAccessorDecl>"set"			{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Settable;  }
+<CSAccessorDecl>"get"			{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Gettable;  }
+<CSAccessorDecl>"add"			{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Addable;   }
+<CSAccessorDecl>"remove"		{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Removable; }
+<CSAccessorDecl>"raise"			{ if (yyextra->curlyCount==0) yyextra->current->spec |= Entry::Raisable;  }
 <CSAccessorDecl>"\""			{ BEGIN(CSString);}
 <CSAccessorDecl>"."			{}
-<CSAccessorDecl>\n			{ lineCount(); }
+<CSAccessorDecl>\n			{ lineCount(yyscanner); }
 <CSString>"\""				{ BEGIN(CSAccessorDecl);}
 <CSString>"//"				{} // Otherwise the rule <*>"//" will kick in
 <CSString>"/*"				{} // Otherwise the rule <*>"/*" will kick in
-<CSString>\n				{ lineCount(); }
+<CSString>\n				{ lineCount(yyscanner); }
 <CSString>"."				{}
 
  /* ---- Slice-specific rules ------ */
 
 <SliceSequence>{SCOPENAME}              {
-                                          if (g_current->spec&Entry::Local)
+                                          if (yyextra->current->spec&Entry::Local)
                                           {
-                                            g_current->type = "local ";
+                                            yyextra->current->type = "local ";
                                           }
-                                          g_current->type += "sequence<";
-                                          g_current->type += yytext;
-                                          g_current->type += ">";
+                                          yyextra->current->type += "sequence<";
+                                          yyextra->current->type += yytext;
+                                          yyextra->current->type += ">";
                                         }
 
 <SliceSequence>{BN}*">"{BN}*            {
-                                          lineCount();
+                                          lineCount(yyscanner);
                                           BEGIN(SliceSequenceName);
                                         }
 
 <SliceSequenceName>{ID}{BN}*            {
-                                          lineCount();
-                                          g_current->name = yytext ;
-                                          g_current->name = g_current->name.stripWhiteSpace();
+                                          lineCount(yyscanner);
+                                          yyextra->current->name = yytext ;
+                                          yyextra->current->name = yyextra->current->name.stripWhiteSpace();
                                         }
 
 <SliceSequenceName>";"                  {
-                                          g_current->section = Entry::VARIABLE_SEC;
-                                          g_current_root->moveToSubEntryAndRefresh(g_current);
-                                          initEntry();
+                                          yyextra->current->section = Entry::VARIABLE_SEC;
+                                          yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+                                          initEntry(yyscanner);
                                           BEGIN(FindMembers);
                                         }
 
 <SliceDictionary>{SCOPENAME}{BN}*","{BN}*{SCOPENAME} {
-                                          lineCount();
-                                          if (g_current->spec&Entry::Local)
+                                          lineCount(yyscanner);
+                                          if (yyextra->current->spec&Entry::Local)
                                           {
-                                            g_current->type = "local ";
+                                            yyextra->current->type = "local ";
                                           }
-                                          g_current->type += "dictionary<";
-                                          g_current->type += yytext;
-                                          g_current->type += ">";
-                                          g_current->type = g_current->type.simplifyWhiteSpace();
+                                          yyextra->current->type += "dictionary<";
+                                          yyextra->current->type += yytext;
+                                          yyextra->current->type += ">";
+                                          yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
                                         }
 
 <SliceDictionary>{BN}*">"{BN}*          {
-                                          lineCount();
+                                          lineCount(yyscanner);
                                           BEGIN(SliceDictionaryName);
                                         }
 
 <SliceDictionaryName>{ID}{BN}*          {
-                                          lineCount();
-                                          g_current->name = yytext ;
-                                          g_current->name = g_current->name.stripWhiteSpace();
+                                          lineCount(yyscanner);
+                                          yyextra->current->name = yytext ;
+                                          yyextra->current->name = yyextra->current->name.stripWhiteSpace();
                                         }
 
 <SliceDictionaryName>";"                {
-                                          g_current->section = Entry::VARIABLE_SEC;
-                                          g_current_root->moveToSubEntryAndRefresh(g_current);
-                                          initEntry();
+                                          yyextra->current->section = Entry::VARIABLE_SEC;
+                                          yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
+                                          initEntry(yyscanner);
                                           BEGIN(FindMembers);
                                         }
 
@@ -6484,100 +6184,100 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
  /* ---- Single line comments ------ */
 <DocLine>[^\n]*"\n"[ \t]*"//"[/!][<]?   { // continuation of multiline C++-style comment
-				           g_docBlock+=yytext;
+				           yyextra->docBlock+=yytext;
                                            int markerLen = yytext[yyleng-1]=='<' ? 4 : 3;
-          		                   g_docBlock.resize(g_docBlock.length() - markerLen);
-                                           lineCount();
+          		                   yyextra->docBlock.resize(yyextra->docBlock.length() - markerLen);
+                                           lineCount(yyscanner);
                                         }
 <DocLine>{B}*"///"[/]+{B}*/"\n"		{ // ignore marker line (see bug700345)
-					  handleCommentBlock(g_docBlock.data(),g_current->brief.isEmpty());
-					  BEGIN( g_docBlockContext );
+					  handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
+					  BEGIN( yyextra->docBlockContext );
   					}
 <DocLine>[^\n]*/"\n"{B}*"//"[!/]{B}*{CMD}"}"	{ // next line is an end group marker, see bug 752712
-  					  g_docBlock+=yytext;
-					  handleCommentBlock(g_docBlock.data(),g_current->brief.isEmpty());
-					  BEGIN( g_docBlockContext );
+  					  yyextra->docBlock+=yytext;
+					  handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
+					  BEGIN( yyextra->docBlockContext );
   					}
 <DocLine>[^\n]*/"\n"			{ // whole line
-  					  g_docBlock+=yytext;
-					  handleCommentBlock(g_docBlock.data(),g_current->brief.isEmpty());
-					  BEGIN( g_docBlockContext );
+  					  yyextra->docBlock+=yytext;
+					  handleCommentBlock(yyscanner,yyextra->docBlock.data(),yyextra->current->brief.isEmpty());
+					  BEGIN( yyextra->docBlockContext );
   					}
 
  /* ---- Comments blocks ------ */
 
 <DocBlock>"*"*"*/"			{ // end of comment block
-  				          handleCommentBlock(g_docBlock.data(),FALSE);
-					  BEGIN(g_docBlockContext);
+  				          handleCommentBlock(yyscanner,yyextra->docBlock.data(),FALSE);
+					  BEGIN(yyextra->docBlockContext);
   					}
 <DocBlock>^{B}*"*"+/[^/]		{ 
 
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock+=indent;
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock+=indent;
   					}
 <DocBlock>^{B}*("//")?{B}*"*"+/[^//a-z_A-Z0-9*]	{ // start of a comment line
                                           QCString indent;
-                                          indent.fill(' ',computeIndent(yytext,g_column));
-                                          g_docBlock+=indent;
+                                          indent.fill(' ',computeIndent(yytext,yyextra->column));
+                                          yyextra->docBlock+=indent;
   					}
 <DocBlock>^{B}*("//"){B}*		{ // strip embedded C++ comments if at the start of a line
   					}
 <DocBlock>"//"				{ // slashes in the middle of a comment block
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
   					}
 <DocBlock>"/*"				{ // start of a new comment in the 
                                           // middle of a comment block
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
   					}
 <DocBlock>({CMD}{CMD}){ID}/[^a-z_A-Z0-9] { // escaped command
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
   					}
 <DocBlock>{CMD}("f$"|"f["|"f{")	        {
-                                          g_docBlock+=yytext;
-				          g_docBlockName=&yytext[1];
-					  if (g_docBlockName.at(1)=='{')
+                                          yyextra->docBlock+=yytext;
+				          yyextra->docBlockName=&yytext[1];
+					  if (yyextra->docBlockName.at(1)=='{')
 					  {
-				            g_docBlockName.at(1)='}';
+				            yyextra->docBlockName.at(1)='}';
 					  }
-                                          g_fencedSize=0;
-                                          g_nestedComment=FALSE;
+                                          yyextra->fencedSize=0;
+                                          yyextra->nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
                                         }
 <DocBlock>{B}*"<"{PRE}">"		{
-                                          g_docBlock+=yytext;
-				          g_docBlockName="<pre>";
-                                          g_fencedSize=0;
-                                          g_nestedComment=FALSE;
+                                          yyextra->docBlock+=yytext;
+				          yyextra->docBlockName="<pre>";
+                                          yyextra->fencedSize=0;
+                                          yyextra->nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
   					}
 <DocBlock>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"dot"|"code")/[^a-z_A-Z0-9\-]	{ // verbatim command (which could contain nested comments!)
-                                          g_docBlock+=yytext;
-				          g_docBlockName=&yytext[1];
-                                          g_fencedSize=0;
-                                          g_nestedComment=FALSE;
+                                          yyextra->docBlock+=yytext;
+				          yyextra->docBlockName=&yytext[1];
+                                          yyextra->fencedSize=0;
+                                          yyextra->nestedComment=FALSE;
   					  BEGIN(DocCopyBlock);
   					}
 <DocBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]*                {
-                                          g_docBlock+=substitute(yytext,"*"," ");
-                                          g_docBlockName="~~~";
-                                          g_fencedSize=yyleng;
-                                          g_nestedComment=FALSE;
+                                          yyextra->docBlock+=substitute(yytext,"*"," ");
+                                          yyextra->docBlockName="~~~";
+                                          yyextra->fencedSize=yyleng;
+                                          yyextra->nestedComment=FALSE;
                                           BEGIN(DocCopyBlock);
                                         }
 <DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                {
-                                          g_docBlock+=substitute(yytext,"*"," ");
-                                          g_docBlockName="```";
-                                          g_fencedSize=yyleng;
-                                          g_nestedComment=FALSE;
+                                          yyextra->docBlock+=substitute(yytext,"*"," ");
+                                          yyextra->docBlockName="```";
+                                          yyextra->fencedSize=yyleng;
+                                          yyextra->nestedComment=FALSE;
                                           BEGIN(DocCopyBlock);
                                         }
 <DocBlock>{B}*"<code>"                  {
-  					  if (g_insideCS)
+  					  if (yyextra->insideCS)
 					  {
-					    g_docBlock+=yytext;
-					    g_docBlockName="<code>";
-                                            g_nestedComment=FALSE;
+					    yyextra->docBlock+=yytext;
+					    yyextra->docBlockName="<code>";
+                                            yyextra->nestedComment=FALSE;
 					    BEGIN(DocCopyBlock);
 					  }
 					  else
@@ -6586,49 +6286,49 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DocBlock>[^@*~\/\\\n]+			{ // any character that isn't special
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
   					}
 <DocBlock>\n				{ // newline
-                                          lineCount();
-					  g_docBlock+=*yytext;
+                                          lineCount(yyscanner);
+					  yyextra->docBlock+=*yytext;
   					}
 <DocBlock>.				{ // command block
-					  g_docBlock+=*yytext;
+					  yyextra->docBlock+=*yytext;
   					}
 
  /* ---- Copy verbatim sections ------ */
 
 <DocCopyBlock>"</"{PRE}">"		{ // end of a <pre> block
-  					  g_docBlock+=yytext;
-					  if (g_docBlockName=="<pre>")
+  					  yyextra->docBlock+=yytext;
+					  if (yyextra->docBlockName=="<pre>")
 					  {
   					    BEGIN(DocBlock);
 					  }
   					}
 <DocCopyBlock>"</"{CODE}">"		{ // end of a <code> block
-  					  g_docBlock+=yytext;
-					  if (g_docBlockName=="<code>")
+  					  yyextra->docBlock+=yytext;
+					  if (yyextra->docBlockName=="<code>")
 					  {
   					    BEGIN(DocBlock);
 					  }
   					}
 <DocCopyBlock>[\\@]("f$"|"f]"|"f}")     {
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
 					  BEGIN(DocBlock);
   					}
 <DocCopyBlock>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"enddot"|"endcode")/[^a-z_A-Z0-9] { // end of verbatim block
-  					  g_docBlock+=yytext;
-					  if (&yytext[4]==g_docBlockName)
+  					  yyextra->docBlock+=yytext;
+					  if (&yytext[4]==yyextra->docBlockName)
 					  {
   					    BEGIN(DocBlock);
 					  }
   					}
 <DocCopyBlock>^{B}*"*"+/{BN}+		{ // start of a comment line
-  					  if (g_docBlockName=="verbatim")
+  					  if (yyextra->docBlockName=="verbatim")
 					  {
 					    REJECT;
 					  }
-  					  else if (g_docBlockName=="code")
+  					  else if (yyextra->docBlockName=="code")
 					  {
 					    REJECT;
 					  }
@@ -6636,15 +6336,15 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           {
                                             QCString indent;
                                             indent.fill(' ',computeIndent(yytext,0));
-                                            g_docBlock+=indent;
+                                            yyextra->docBlock+=indent;
                                           }
   					}
 <DocCopyBlock>^{B}*"*"+/{B}+"*"{BN}*	{ // start of a comment line with two *'s
-  					  if (g_docBlockName=="code")
+  					  if (yyextra->docBlockName=="code")
                                           {
                                             QCString indent;
                                             indent.fill(' ',computeIndent(yytext,0));
-                                            g_docBlock+=indent;
+                                            yyextra->docBlock+=indent;
                                           }
                                           else
 					  {
@@ -6652,11 +6352,11 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DocCopyBlock>^{B}*"*"+/({ID}|"(")	{ // Assume *var or *(... is part of source code (see bug723516)
-					  if (g_docBlockName=="code")
+					  if (yyextra->docBlockName=="code")
                                           {
                                             QCString indent;
                                             indent.fill(' ',computeIndent(yytext,-1));
-                                            g_docBlock+=indent+"*";
+                                            yyextra->docBlock+=indent+"*";
                                           }
                                           else
                                           {
@@ -6664,18 +6364,18 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           }
                                         }
 <DocCopyBlock>^{B}*"*"+/{BN}*		{ // start of a comment line with one *
-  					  if (g_docBlockName=="code")
+  					  if (yyextra->docBlockName=="code")
                                           {
                                             QCString indent;
-                                            if (g_nestedComment) // keep * it is part of the code
+                                            if (yyextra->nestedComment) // keep * it is part of the code
                                             {
                                               indent.fill(' ',computeIndent(yytext,-1));
-                                              g_docBlock+=indent+"*";
+                                              yyextra->docBlock+=indent+"*";
                                             }
                                             else // remove * it is part of the comment block
                                             {
                                               indent.fill(' ',computeIndent(yytext,0));
-                                              g_docBlock+=indent;
+                                              yyextra->docBlock+=indent;
                                             }
                                           }
                                           else
@@ -6684,45 +6384,45 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <DocCopyBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* {
-                                          g_docBlock+=substitute(yytext,"*"," ");
-                                          if (g_fencedSize==yyleng)
+                                          yyextra->docBlock+=substitute(yytext,"*"," ");
+                                          if (yyextra->fencedSize==yyleng)
                                           {
                                             BEGIN(DocBlock);
                                           }
                                         }
 <DocCopyBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*                 {
-                                          g_docBlock+=substitute(yytext,"*"," ");
-                                          if (g_fencedSize==yyleng)
+                                          yyextra->docBlock+=substitute(yytext,"*"," ");
+                                          if (yyextra->fencedSize==yyleng)
                                           {
                                             BEGIN(DocBlock);
                                           }
                                         }
 <DocCopyBlock>[^\<@/*\]~\$\\\n]+	{ // any character that is not special
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
   					}
 <DocCopyBlock>"/*"|"*/"|"//"		{
                                           if (yytext[1]=='*')
                                           {
-                                            g_nestedComment=TRUE;
+                                            yyextra->nestedComment=TRUE;
                                           }
                                           else if (yytext[0]=='*')
                                           {
-                                            g_nestedComment=FALSE;
+                                            yyextra->nestedComment=FALSE;
                                           }
-  					  g_docBlock+=yytext;
+  					  yyextra->docBlock+=yytext;
 					}
 <DocCopyBlock>\n			{ // newline
-  					  g_docBlock+=*yytext;
-                                          lineCount();
+  					  yyextra->docBlock+=*yytext;
+                                          lineCount(yyscanner);
   					}
 <DocCopyBlock>.				{ // any other character
-  					  g_docBlock+=*yytext;
+  					  yyextra->docBlock+=*yytext;
   					}
 <DocCopyBlock><<EOF>>			{
-  					  warn(g_yyFileName,g_yyLineNr,
-					      "reached end of file while g_inside a '%s' block!\n"
+  					  warn(yyextra->yyFileName,yyextra->yyLineNr,
+					      "reached end of file while yyextra->inside a '%s' block!\n"
 					      "The command that should end the block seems to be missing!\n",
-					      g_docBlockName.data());
+					      yyextra->docBlockName.data());
   					  yyterminate();
   					}
 
@@ -6730,69 +6430,69 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
     /* ------------- Prototype parser -------------- */
 
 <Prototype>"operator"{B}*"("{B}*")"	{
-  					  g_current->name+=yytext;
+  					  yyextra->current->name+=yytext;
   					}
 <Prototype>"("			       {
-  					  g_current->args+=*yytext;
-					  g_currentArgumentContext = PrototypeQual;
-					  g_fullArgString = g_current->args.copy();
-					  g_copyArgString = &g_current->args;
+  					  yyextra->current->args+=*yytext;
+					  yyextra->currentArgumentContext = PrototypeQual;
+					  yyextra->fullArgString = yyextra->current->args.copy();
+					  yyextra->copyArgString = &yyextra->current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
 <Prototype>"("({ID}"::")*({B}*[&*])+	{
-  					  g_current->type+=g_current->name+yytext;
-					  g_current->name.resize(0);
+  					  yyextra->current->type+=yyextra->current->name+yytext;
+					  yyextra->current->name.resize(0);
   					  BEGIN( PrototypePtr );
   					}
 <PrototypePtr>{SCOPENAME}		{
-  					  g_current->name+=yytext;
+  					  yyextra->current->name+=yytext;
   					}
 <PrototypePtr>"("			{
-  					  g_current->args+=*yytext;
-					  g_currentArgumentContext = PrototypeQual;
-					  g_fullArgString = g_current->args.copy();
-					  g_copyArgString = &g_current->args;
+  					  yyextra->current->args+=*yytext;
+					  yyextra->currentArgumentContext = PrototypeQual;
+					  yyextra->fullArgString = yyextra->current->args.copy();
+					  yyextra->copyArgString = &yyextra->current->args;
 					  BEGIN( ReadFuncArgType ) ;
   					}
 <PrototypePtr>")"			{
-  					  g_current->type+=')';
+  					  yyextra->current->type+=')';
   					  BEGIN( Prototype );
   					}
 <PrototypePtr>.				{
-  					  g_current->name+=yytext;
+  					  yyextra->current->name+=yytext;
   					}
 <PrototypeQual>"{"			{
   					  BEGIN( PrototypeSkipLine);
   					}
 <PrototypeQual>{B}*"const"{B}*    	{ 
-  					  g_current->args += " const "; 
-					  g_current->argList.constSpecifier=TRUE;
+  					  yyextra->current->args += " const "; 
+					  yyextra->current->argList.constSpecifier=TRUE;
 					}
 <PrototypeQual>{B}*"volatile"{B}* 	{ 
-  					  g_current->args += " volatile "; 
-					  g_current->argList.volatileSpecifier=TRUE;
+  					  yyextra->current->args += " volatile "; 
+					  yyextra->current->argList.volatileSpecifier=TRUE;
 					}
 <PrototypeQual>{B}*"="{B}*"0"{B}*	{ 
-					  g_current->args += " = 0"; 
-					  g_current->virt = Pure; 
-					  g_current->argList.pureSpecifier=TRUE;
+					  yyextra->current->args += " = 0"; 
+					  yyextra->current->virt = Pure; 
+					  yyextra->current->argList.pureSpecifier=TRUE;
 					}
 <PrototypeQual>"throw"{B}*"("	        {
-  					  g_current->exception = "throw(";
+  					  yyextra->current->exception = "throw(";
 					  BEGIN(PrototypeExc);
   					}
 <PrototypeExc>")"			{
-  					  g_current->exception += ')';
+  					  yyextra->current->exception += ')';
 					  BEGIN(PrototypeQual);
   					}
 <PrototypeExc>.			        {
-  					  g_current->exception += *yytext;
+  					  yyextra->current->exception += *yytext;
   					}
 <PrototypeQual>.			{
-  					  g_current->args += *yytext;
+  					  yyextra->current->args += *yytext;
   					}
 <Prototype>.	                        {
-  					  g_current->name += *yytext;
+  					  yyextra->current->name += *yytext;
   					}
 <PrototypeSkipLine>.			{
   					}
@@ -6801,149 +6501,475 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 
 
 <SkipCxxComment>.*"\\\n"		{  // line continuation
-  					  if (g_insideCS) 
+  					  if (yyextra->insideCS) 
 					  {
 					    REJECT;
 					  }
 					  else 
 					  {
-                                            lineCount();
+                                            lineCount(yyscanner);
 					  }
   					}
 <SkipCxxComment>.*/\n			{ 
-					  BEGIN( g_lastCContext ) ;
+					  BEGIN( yyextra->lastCContext ) ;
 					}
 <SkipComment>[^\*\n]+
 
   /* ------------ Generic rules -------------- */
 
 <*>"[["                                 { // C++11 attribute
-                                          if (!g_insideCpp) REJECT;
+                                          if (!yyextra->insideCpp) REJECT;
                                           if (YY_START == CopyGString || YY_START == CopyGString) REJECT;
-                                          g_lastC11AttributeContext = YY_START;
+                                          yyextra->lastC11AttributeContext = YY_START;
                                           BEGIN( SkipC11Attribute );
                                         }
 
-<*>\n					{ lineCount(); }
+<*>\n					{ lineCount(yyscanner); }
 <*>\"					{
-					  if (g_insideIDL && g_insideCppQuote)
+					  if (yyextra->insideIDL && yyextra->insideCppQuote)
 					  {
 					    BEGIN(EndCppQuote);
 					  }
 					}
 <*>"#"				        {	
-  					  if (!g_insidePHP)
+  					  if (!yyextra->insidePHP)
   					    REJECT;
-  					  g_lastCContext = YY_START ;
+  					  yyextra->lastCContext = YY_START ;
 					  BEGIN( SkipCxxComment ) ;
 					}
 <*>\'					{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-  					    g_lastStringContext=YY_START;
+  					    yyextra->lastStringContext=YY_START;
 					    BEGIN(SkipPHPString);
 					  }
   					}
 <*>\"					{
-  					  if (g_insidePHP)
+  					  if (yyextra->insidePHP)
 					  {
-  					    g_lastStringContext=YY_START;
+  					    yyextra->lastStringContext=YY_START;
 					    BEGIN(SkipString);
 					  }
   					}
 <*>\?                                   {
-  					  if (g_insideCS && (YY_START != SkipRound)) 
+  					  if (yyextra->insideCS && (YY_START != SkipRound)) 
 					  {
-					    if (g_current->type.isEmpty())
+					    if (yyextra->current->type.isEmpty())
 					    {
-					      if (g_current->name.isEmpty())
-					        g_current->name="?";
+					      if (yyextra->current->name.isEmpty())
+					        yyextra->current->name="?";
 					      else
-					        g_current->name+="?";
+					        yyextra->current->name+="?";
 					    }
 					    else
 					    {
-					      g_current->type+="?";
+					      yyextra->current->type+="?";
 					    }
 					  }
   					}
 <*>.
 <SkipComment>"//"|"/*"
-<*>"/*"					{ g_lastCContext = YY_START ;
+<*>"/*"					{ yyextra->lastCContext = YY_START ;
 					  BEGIN( SkipComment ) ;
 					}
-<SkipComment>{B}*"*/"			{ BEGIN( g_lastCContext ) ; }
+<SkipComment>{B}*"*/"			{ BEGIN( yyextra->lastCContext ) ; }
 <*>"//"				        {	
-  					  g_lastCContext = YY_START ;
+  					  yyextra->lastCContext = YY_START ;
 					  BEGIN( SkipCxxComment ) ;
 					}
 %%
 
 //----------------------------------------------------------------------------
+static int yyread(yyscan_t yyscanner,char *buf,int max_size)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int c=0;
+  while( c < max_size && yyextra->inputString[yyextra->inputPosition] )
+  {
+    *buf = yyextra->inputString[yyextra->inputPosition++] ;
+    //printf("%d (%c)\n",*buf,*buf);
+    c++; buf++;
+  }
+  return c;
+}
 
-static void startCommentBlock(bool brief)
+
+static void initParser(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  yyextra->outerScopeEntries.clear();
+  yyextra->baseName.resize(0);
+  yyextra->protection = Public;
+  yyextra->baseProt = Public;
+  yyextra->sharpCount = 0;
+  yyextra->roundCount = 0;
+  yyextra->curlyCount = 0;
+  yyextra->mtype = Method;
+  yyextra->stat = FALSE;
+  yyextra->virt = Normal;
+  yyextra->baseVirt = Normal;
+  yyextra->isTypedef = FALSE;
+  yyextra->autoGroupStack.clear();
+  yyextra->insideTryBlock = FALSE;
+  yyextra->autoGroupStack.setAutoDelete(TRUE);
+  yyextra->insideFormula = FALSE;
+  yyextra->insideCode=FALSE;
+  yyextra->insideCli=Config_getBool(CPP_CLI_SUPPORT);
+  yyextra->previous = 0;
+  yyextra->firstTypedefEntry = 0;
+  yyextra->memspecEntry =0;
+}
+
+static void initEntry(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->insideJava) 
+  {
+    yyextra->protection = (yyextra->current_root->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
+  }
+  yyextra->current->protection = yyextra->protection ;
+  yyextra->current->mtype      = yyextra->mtype;
+  yyextra->current->virt       = yyextra->virt;
+  yyextra->current->stat       = yyextra->stat;
+  yyextra->current->lang       = yyextra->language;
+  //printf("*** initEntry(yyscanner) yyextra->language=%d\n",yyextra->language);
+  Doxygen::docGroup.initGroupInfo(yyextra->current.get());
+  yyextra->isTypedef=FALSE;
+}
+
+
+//-----------------------------------------------------------------------------
+
+static void lineCount(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int tabSize = Config_getInt(TAB_SIZE);
+  const char *p;
+  for (p = yytext ; *p ; ++p )
+  {
+    if (*p=='\n') 
+    {
+      yyextra->yyLineNr++,yyextra->column=0,yyextra->yyColNr=1;
+    }
+    else if (*p=='\t') 
+    {
+      yyextra->column+=tabSize - (yyextra->column%tabSize);
+    }
+    else 
+    {
+      yyextra->column++,yyextra->yyColNr++;
+    }
+  }
+  //printf("lineCount()=%d\n",yyextra->column);
+}
+
+static inline int computeIndent(const char *s,int startIndent)
+{
+  int col=startIndent;
+  int tabSize=Config_getInt(TAB_SIZE);
+  const char *p=s;
+  char c;
+  while ((c=*p++))
+  {
+    if (c=='\t') col+=tabSize-(col%tabSize);
+    else if (c=='\n') col=0;
+    else col++;
+  }
+  return col;
+}
+
+static void addType(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  uint tl=yyextra->current->type.length();
+  if( tl>0 && !yyextra->current->name.isEmpty() && yyextra->current->type.at(tl-1)!='.') 
+  {
+    yyextra->current->type += ' ' ;
+  }
+  yyextra->current->type += yyextra->current->name ;
+  yyextra->current->name.resize(0) ;
+  tl=yyextra->current->type.length();
+  if( tl>0 && !yyextra->current->args.isEmpty() && yyextra->current->type.at(tl-1)!='.') 
+  {
+    yyextra->current->type += ' ' ;
+  }
+  yyextra->current->type += yyextra->current->args ;
+  yyextra->current->args.resize(0) ;
+  yyextra->current->argList.clear();
+}
+
+
+static QCString stripQuotes(const char *s)
 {
+  QCString name;
+  if (s==0 || *s==0) return name;
+  name=s;
+  if (name.at(0)=='"' && name.at(name.length()-1)=='"')
+  {
+    name=name.mid(1,name.length()-2);
+  }
+  return name;
+}
+
+//-----------------------------------------------------------------
+
+static bool nameIsOperator(QCString &name)
+{
+  int i=name.find("operator");
+  if (i==-1) return FALSE;
+  if (i==0 && !isId(name.at(8))) return TRUE; // case operator ::X
+  if (i>0 && !isId(name.at(i-1)) && !isId(name.at(i+8))) return TRUE; // case X::operator
+  return FALSE; // case TEXToperatorTEXT
+}
+
+//-----------------------------------------------------------------------------
+
+static void setContext(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  yyextra->language    = getLanguageFromFileName(yyextra->yyFileName);
+  yyextra->insideIDL   = yyextra->language==SrcLangExt_IDL;
+  yyextra->insideJava  = yyextra->language==SrcLangExt_Java;
+  yyextra->insideCS    = yyextra->language==SrcLangExt_CSharp; 
+  yyextra->insideD     = yyextra->language==SrcLangExt_D;
+  yyextra->insidePHP   = yyextra->language==SrcLangExt_PHP;
+  yyextra->insideObjC  = yyextra->language==SrcLangExt_ObjC;
+  yyextra->insideJS    = yyextra->language==SrcLangExt_JS;
+  yyextra->insideSlice = yyextra->language==SrcLangExt_Slice;
+  yyextra->insideCpp   = yyextra->language==SrcLangExt_Cpp;
+  //printf("setContext(%s) yyextra->insideIDL=%d yyextra->insideJava=%d yyextra->insideCS=%d "
+  //       "yyextra->insideD=%d yyextra->insidePHP=%d yyextra->insideObjC=%d\n",
+  //       yyextra->yyFileName.data(),yyextra->insideIDL,yyextra->insideJava,yyextra->insideCS,yyextra->insideD,yyextra->insidePHP,yyextra->insideObjC
+  //	);
+}
+
+//-----------------------------------------------------------------------------
+
+static void prependScope(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->current_root->section & Entry::SCOPE_MASK)
+  {
+    //printf("--- prependScope %s to %s\n",yyextra->current_root->name.data(),yyextra->current->name.data());
+    yyextra->current->name.prepend(yyextra->current_root->name+"::");
+    //printf("prependScope #=%d #yyextra->current=%d\n",yyextra->current_root->tArgLists->count(),yyextra->current->tArgLists->count());
+    for (const ArgumentList &srcAl : yyextra->current_root->tArgLists)
+    {
+      yyextra->current->tArgLists.insert(yyextra->current->tArgLists.begin(),srcAl);
+    }
+  }
+}
+
+//-----------------------------------------------------------------------------
+
+/*! Returns TRUE iff the yyextra->current entry could be a K&R style C function */
+static bool checkForKnRstyleC(yyscan_t yyscanner)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (((QCString)yyextra->yyFileName).right(2).lower()!=".c") return FALSE; // must be a C file
+  if (yyextra->current->argList.empty()) return FALSE; // must have arguments
+  for (const Argument &a : yyextra->current->argList)
+  {
+    // in K&R style argument do not have a type, but doxygen expects a type
+    // so it will think the argument has no name
+    if (a.type.isEmpty() || !a.name.isEmpty()) return FALSE;
+  }
+  return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+
+static void splitKnRArg(yyscan_t yyscanner,QCString &oldStyleArgPtr,QCString &oldStyleArgName)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  int si = yyextra->current->args.length();
+  if (yyextra->oldStyleArgType.isEmpty()) // new argument
+  {
+    static QRegExp re("([^)]*)");
+    int bi1 = yyextra->current->args.findRev(re);
+    int bi2 = bi1!=-1 ? yyextra->current->args.findRev(re,bi1-1) : -1; 
+    char c;
+    if (bi1!=-1 && bi2!=-1) // found something like "int (*func)(int arg)"
+    {
+      int s=bi2+1;
+      yyextra->oldStyleArgType = yyextra->current->args.left(s);
+      int i=s;
+      while (i<si && ((c=yyextra->current->args.at(i))=='*' || isspace((uchar)c))) i++;
+      yyextra->oldStyleArgType += yyextra->current->args.mid(s,i-s);
+      s=i;
+      while (i<si && isId(yyextra->current->args.at(i))) i++;
+      oldStyleArgName = yyextra->current->args.mid(s,i-s);
+      yyextra->oldStyleArgType+=yyextra->current->args.mid(i);
+    }
+    else if (bi1!=-1) // redundant braces like in "int (*var)"
+    {
+      int s=bi1;
+      yyextra->oldStyleArgType = yyextra->current->args.left(s);
+      s++;
+      int i=s+1;
+      while (i<si && ((c=yyextra->current->args.at(i))=='*' || isspace((uchar)c))) i++;
+      yyextra->oldStyleArgType += yyextra->current->args.mid(s,i-s);
+      s=i;
+      while (i<si && isId(yyextra->current->args.at(i))) i++;
+      oldStyleArgName = yyextra->current->args.mid(s,i-s);
+    }
+    else // normal "int *var"
+    {
+      int l=si,i=l-1,j;
+      char c;
+      // look for start of name in "type *name"
+      while (i>=0 && isId(yyextra->current->args.at(i))) i--;
+      j=i+1;
+      // look for start of *'s
+      while (i>=0 && ((c=yyextra->current->args.at(i))=='*' || isspace((uchar)c))) i--;
+      i++;
+      if (i!=l)
+      {
+	yyextra->oldStyleArgType=yyextra->current->args.left(i);
+	oldStyleArgPtr=yyextra->current->args.mid(i,j-i);
+	oldStyleArgName=yyextra->current->args.mid(j).stripWhiteSpace();
+      }
+      else
+      {
+	oldStyleArgName=yyextra->current->args.copy().stripWhiteSpace();
+      }
+    }
+  }
+  else // continuation like *arg2 in "int *args,*arg2"
+  {
+    int l=si,j=0;
+    char c;
+    while (j<l && ((c=yyextra->current->args.at(j))=='*' || isspace((uchar)c))) j++;
+    if (j>0)
+    {
+      oldStyleArgPtr=yyextra->current->args.left(j);
+      oldStyleArgName=yyextra->current->args.mid(j).stripWhiteSpace();
+    }
+    else
+    {
+      oldStyleArgName=yyextra->current->args.copy().stripWhiteSpace();
+    }
+  }
+}
+
+//-----------------------------------------------------------------------------
+
+/*! Update the argument \a name with additional \a type info. For K&R style
+ *  function the type is found \e after the argument list, so this routine
+ *  in needed to fix up.
+ */
+static void addKnRArgInfo(yyscan_t yyscanner,const QCString &type,const QCString &name,
+                          const QCString &brief,const QCString &docs)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  for (Argument &a : yyextra->current->argList)
+  {
+    if (a.type==name)
+    {
+      a.type=type.stripWhiteSpace();
+      if (a.type.left(9)=="register ") // strip keyword
+      {
+	a.type=a.type.mid(9);
+      }
+      a.name=name.stripWhiteSpace();
+      if (!brief.isEmpty() && !docs.isEmpty())
+      {
+        a.docs=brief+"\n\n"+docs;
+      }
+      else if (!brief.isEmpty())
+      {
+        a.docs=brief;
+      }
+      else
+      {
+	a.docs=docs;
+      }
+    }
+  }
+}
+
+//-----------------------------------------------------------------------------
+
+
+void fixArgumentListForJavaScript(ArgumentList &al)
+{
+  for (Argument &a : al)
+  {
+    if (!a.type.isEmpty() && a.name.isEmpty())
+    { // a->type is actually the (typeless) parameter name, so move it
+      a.name=a.type;
+      a.type.resize(0);
+    }
+  }
+}
+
+
+static void startCommentBlock(yyscan_t yyscanner,bool brief)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (brief)
   {
-    g_current->briefFile = g_yyFileName;
-    g_current->briefLine = g_yyLineNr;
+    yyextra->current->briefFile = yyextra->yyFileName;
+    yyextra->current->briefLine = yyextra->yyLineNr;
   }
   else
   {
-    g_current->docFile = g_yyFileName;
-    g_current->docLine = g_yyLineNr;
+    yyextra->current->docFile = yyextra->yyFileName;
+    yyextra->current->docLine = yyextra->yyLineNr;
   }
 }
   
 //----------------------------------------------------------------------------
 
-static void newEntry()
+static void newEntry(yyscan_t yyscanner)
 {
-  if (g_tempEntry==0) // if temp entry is not 0, it holds g_current, 
-                    // and g_current is actually replaced by g_previous which was 
-                    // already added to g_current_root, so we should not add it again 
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  if (yyextra->tempEntry==0) // if temp entry is not 0, it holds yyextra->current, 
+                    // and yyextra->current is actually replaced by yyextra->previous which was 
+                    // already added to yyextra->current_root, so we should not add it again 
                     // (see bug723314)
   {
-    g_previous = g_current.get();
-    g_current_root->moveToSubEntryAndRefresh(g_current);
+    yyextra->previous = yyextra->current.get();
+    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
   }
   else
   {
-    g_previous = g_current.get();
-    g_tempEntry.swap(g_current);
-    g_tempEntry.reset();
+    yyextra->previous = yyextra->current.get();
+    yyextra->tempEntry.swap(yyextra->current);
+    yyextra->tempEntry.reset();
   }
-  initEntry();
+  initEntry(yyscanner);
 }
 
-static void handleCommentBlock(const QCString &doc,bool brief)
+static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   bool hideInBodyDocs = Config_getBool(HIDE_IN_BODY_DOCS);
-  if (g_docBlockInBody && hideInBodyDocs) return;
+  if (yyextra->docBlockInBody && hideInBodyDocs) return;
   //printf("parseCommentBlock [%s] brief=%d\n",doc.data(),brief);
-  int lineNr = brief ? g_current->briefLine : g_current->docLine;   // line of block start
+  int lineNr = brief ? yyextra->current->briefLine : yyextra->current->docLine;   // line of block start
 
   // fill in inbodyFile && inbodyLine the first time, see bug 633891
-  Entry *docEntry = g_docBlockInBody && g_previous ? g_previous : g_current.get();
-  if (g_docBlockInBody && docEntry && docEntry->inbodyLine==-1)
+  Entry *docEntry = yyextra->docBlockInBody && yyextra->previous ? yyextra->previous : yyextra->current.get();
+  if (yyextra->docBlockInBody && docEntry && docEntry->inbodyLine==-1)
   {
-    docEntry->inbodyFile = g_yyFileName;
+    docEntry->inbodyFile = yyextra->yyFileName;
     docEntry->inbodyLine = lineNr;
   }
 
   int position=0;
   bool needsEntry=FALSE;
-  QCString processedDoc = preprocessCommentBlock(stripIndentation(doc),g_yyFileName,lineNr);
+  QCString processedDoc = preprocessCommentBlock(stripIndentation(doc),yyextra->yyFileName,lineNr);
   while (parseCommentBlock(
-	g_thisParser,
-	g_docBlockInBody && g_previous ? g_previous : g_current.get(),
+	yyextra->thisParser,
+	yyextra->docBlockInBody && yyextra->previous ? yyextra->previous : yyextra->current.get(),
 	processedDoc, // text
-	g_yyFileName,   // file
+	yyextra->yyFileName,   // file
 	lineNr,       // line of block start
-	g_docBlockInBody ? FALSE : brief,               // isBrief
-	g_docBlockInBody ? FALSE : g_docBlockAutoBrief,   // isJavaDocStyle
-	g_docBlockInBody,                               // isInBody
-	g_protection,
+	yyextra->docBlockInBody ? FALSE : brief,               // isBrief
+	yyextra->docBlockInBody ? FALSE : yyextra->docBlockAutoBrief,   // isJavaDocStyle
+	yyextra->docBlockInBody,                               // isInBody
+	yyextra->protection,
         position,
         needsEntry
         )
@@ -6952,26 +6978,27 @@ static void handleCommentBlock(const QCString &doc,bool brief)
     //printf("parseCommentBlock position=%d [%s]\n",position,doc.data()+position);
     if (needsEntry) 
     {
-      QCString docFile = g_current->docFile;
-      newEntry();
-      g_current->docFile = docFile;
-      g_current->docLine = lineNr;
+      QCString docFile = yyextra->current->docFile;
+      newEntry(yyscanner);
+      yyextra->current->docFile = docFile;
+      yyextra->current->docLine = lineNr;
     }
   }
   if (needsEntry)
   {
-    newEntry();
+    newEntry(yyscanner);
   }
 
-  if (g_docBlockTerm)
+  if (yyextra->docBlockTerm)
   {
-    unput(g_docBlockTerm);
-    g_docBlockTerm=0;
+    unput(yyextra->docBlockTerm);
+    yyextra->docBlockTerm=0;
   }
 }
 
-static void handleParametersCommentBlocks(ArgumentList &al)
+static void handleParametersCommentBlocks(yyscan_t yyscanner,ArgumentList &al)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf(">>>>>>> handleParametersCommentBlocks()\n");
   for (Argument &a : al)
   {
@@ -6983,44 +7010,44 @@ static void handleParametersCommentBlocks(ArgumentList &al)
       bool needsEntry;
 
       // save context
-      QCString orgDoc   = g_current->doc;
-      QCString orgBrief = g_current->brief;
-      int orgDocLine    = g_current->docLine;
-      int orgBriefLine  = g_current->briefLine;
+      QCString orgDoc   = yyextra->current->doc;
+      QCString orgBrief = yyextra->current->brief;
+      int orgDocLine    = yyextra->current->docLine;
+      int orgBriefLine  = yyextra->current->briefLine;
 
-      g_current->doc.resize(0);
-      g_current->brief.resize(0);
+      yyextra->current->doc.resize(0);
+      yyextra->current->brief.resize(0);
 
       //printf("handleParametersCommentBlock [%s]\n",doc.data());
       while (parseCommentBlock(
-	     g_thisParser,
-	     g_current.get(),
+	     yyextra->thisParser,
+	     yyextra->current.get(),
 	     a.docs,             // text
-	     g_yyFileName,         // file
-	     g_current->docLine,   // line of block start
+	     yyextra->yyFileName,         // file
+	     yyextra->current->docLine,   // line of block start
 	     FALSE, 
 	     FALSE,
 	     FALSE,
-	     g_protection,
+	     yyextra->protection,
 	     position,
 	     needsEntry
 	    )
 	  ) 
       {
 	//printf("handleParametersCommentBlock position=%d [%s]\n",position,doc.data()+position);
-	if (needsEntry) newEntry();
+	if (needsEntry) newEntry(yyscanner);
       }
       if (needsEntry)
       {
-	newEntry();
+	newEntry(yyscanner);
       }
-      a.docs = g_current->doc;
+      a.docs = yyextra->current->doc;
 
       // restore context
-      g_current->doc       = orgDoc;
-      g_current->brief     = orgBrief;
-      g_current->docLine   = orgDocLine;
-      g_current->briefLine = orgBriefLine;
+      yyextra->current->doc       = orgDoc;
+      yyextra->current->brief     = orgBrief;
+      yyextra->current->docLine   = orgDocLine;
+      yyextra->current->briefLine = orgBriefLine;
     }
   }
 }
@@ -7028,8 +7055,9 @@ static void handleParametersCommentBlocks(ArgumentList &al)
 
 //----------------------------------------------------------------------------
 
-static void parseCompounds(const std::unique_ptr<Entry> &rt)
+static void parseCompounds(yyscan_t yyscanner,const std::unique_ptr<Entry> &rt)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf("parseCompounds(%s)\n",rt->name.data());
   for (const auto &ce : rt->children())
   {
@@ -7038,26 +7066,25 @@ static void parseCompounds(const std::unique_ptr<Entry> &rt)
       //printf("-- %s ---------\n%s\n---------------\n",
       //  ce->name.data(),ce->program.data());
       // init scanner state
-      g_padCount=0;
+      yyextra->padCount=0;
       //depthIf = 0;
-      g_column=0;
-      g_inputString = ce->program;
-      g_inputPosition = 0;
-      scannerYYrestart( scannerYYin ) ;
+      yyextra->column=0;
+      yyextra->inputString = ce->program;
+      yyextra->inputPosition = 0;
       if (ce->section==Entry::ENUM_SEC || (ce->spec&Entry::Enum))
 	BEGIN( FindFields ) ;
       else
 	BEGIN( FindMembers ) ;
-      g_current_root = ce.get() ;
-      g_yyFileName = ce->fileName;
+      yyextra->current_root = ce.get() ;
+      yyextra->yyFileName = ce->fileName;
       //setContext();
-      g_yyLineNr = ce->startLine ;
-      g_yyColNr = ce->startColumn ;
-      g_insideObjC = ce->lang==SrcLangExt_ObjC;
-      //printf("---> Inner block starts at line %d objC=%d\n",g_yyLineNr,g_insideObjC);
-      g_current = std::make_unique<Entry>();
-      g_stat = FALSE;
-      initEntry();
+      yyextra->yyLineNr = ce->startLine ;
+      yyextra->yyColNr = ce->startColumn ;
+      yyextra->insideObjC = ce->lang==SrcLangExt_ObjC;
+      //printf("---> Inner block starts at line %d objC=%d\n",yyextra->yyLineNr,yyextra->insideObjC);
+      yyextra->current = std::make_unique<Entry>();
+      yyextra->stat = FALSE;
+      initEntry(yyscanner);
 
       // deep copy group list from parent (see bug 727732)
       bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS);
@@ -7070,99 +7097,102 @@ static void parseCompounds(const std::unique_ptr<Entry> &rt)
       // set default protection based on the compound type
       if( ce->section==Entry::CLASS_SEC ) // class
       {
-        if (g_insidePHP || g_insideD || g_insideJS || g_insideIDL || g_insideSlice)
+        if (yyextra->insidePHP || yyextra->insideD || yyextra->insideJS || yyextra->insideIDL || yyextra->insideSlice)
 	{
-          g_current->protection = g_protection = Public ; 
+          yyextra->current->protection = yyextra->protection = Public ; 
 	}
-	else if (g_insideJava)
+	else if (yyextra->insideJava)
 	{
-          g_current->protection = g_protection = (ce->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
+          yyextra->current->protection = yyextra->protection = (ce->spec & (Entry::Interface|Entry::Enum)) ?  Public : Package;
 	}
 	else if (ce->spec&(Entry::Interface | Entry::Ref | Entry::Value | Entry::Struct | Entry::Union))
 	{
 	  if (ce->lang==SrcLangExt_ObjC)
 	  {
-	    g_current->protection = g_protection = Protected ;
+	    yyextra->current->protection = yyextra->protection = Protected ;
 	  }
 	  else
 	  {
-	    g_current->protection = g_protection = Public ;
+	    yyextra->current->protection = yyextra->protection = Public ;
 	  }
 	}
 	else 
 	{
-          g_current->protection = g_protection = Private ;
+          yyextra->current->protection = yyextra->protection = Private ;
 	}
       }
       else if (ce->section == Entry::ENUM_SEC ) // enum
       {
-	g_current->protection = g_protection = ce->protection;
+	yyextra->current->protection = yyextra->protection = ce->protection;
       }
       else if (!ce->name.isEmpty() && ce->name.at(ni)=='@') // unnamed union or namespace
       {
 	if (ce->section == Entry::NAMESPACE_SEC ) // unnamed namespace
 	{
-          g_current->stat = g_stat = TRUE;
+          yyextra->current->stat = yyextra->stat = TRUE;
 	}
-	g_current->protection = g_protection = ce->protection;
+	yyextra->current->protection = yyextra->protection = ce->protection;
       }
       else // named struct, union, protocol, category
       {
-	g_current->protection = g_protection = Public ;
+	yyextra->current->protection = yyextra->protection = Public ;
       }
-      g_mtype = Method;
-      g_virt = Normal;
-      //printf("name=%s g_current->stat=%d g_stat=%d\n",ce->name.data(),g_current->stat,g_stat);
+      yyextra->mtype = Method;
+      yyextra->virt = Normal;
+      //printf("name=%s yyextra->current->stat=%d yyextra->stat=%d\n",ce->name.data(),yyextra->current->stat,yyextra->stat);
 
       //memberGroupId = DOX_NOGROUP;
       //memberGroupRelates.resize(0);
       //memberGroupInside.resize(0);
       QCString name = ce->name;
-      Doxygen::docGroup.enterCompound(g_yyFileName,g_yyLineNr,name);
+      Doxygen::docGroup.enterCompound(yyextra->yyFileName,yyextra->yyLineNr,name);
       
-      scannerYYlex() ;
-      g_lexInit=TRUE;
+      scannerYYlex(yyscanner);
+      yyextra->lexInit=TRUE;
       //forceEndGroup();
 
-      Doxygen::docGroup.leaveCompound(g_yyFileName,g_yyLineNr,name);
+      Doxygen::docGroup.leaveCompound(yyextra->yyFileName,yyextra->yyLineNr,name);
       
       ce->program.resize(0);
 
 
       //if (depthIf>0)
       //{
-      //	warn(g_yyFileName,g_yyLineNr,"Documentation block ended in the middle of a conditional section!");
+      //	warn(yyextra->yyFileName,yyextra->yyLineNr,"Documentation block ended in the middle of a conditional section!");
       //}
     }
-    parseCompounds(ce);
+    parseCompounds(yyscanner,ce);
   }
 }
 
 //----------------------------------------------------------------------------
 
-static void parseMain(const char *fileName,
+static void parseMain(yyscan_t yyscanner,
+                      const char *fileName,
                       const char *fileBuf,
                       const std::unique_ptr<Entry> &rt,
                       bool sameTranslationUnit,
                       QStrList & filesInSameTranslationUnit)
 {
-  initParser();
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  initParser(yyscanner);
 
-  g_inputString = fileBuf;
-  g_inputPosition = 0;
-  g_column = 0;
+  yyextra->inputString = fileBuf;
+  yyextra->inputPosition = 0;
+  yyextra->column = 0;
+  scannerYYrestart(0,yyscanner);
 
-  //g_anonCount     = 0;  // don't reset per file
+  //yyextra->anonCount     = 0;  // don't reset per file
   //depthIf       = 0;
-  g_protection    = Public;
-  g_mtype         = Method;
-  g_stat         = FALSE;
-  g_virt          = Normal;
-  g_current_root  = rt.get();
-  g_yyLineNr= 1 ; 
-  g_yyFileName = fileName;
-  setContext();
-  bool processWithClang = g_insideCpp || g_insideObjC;
+  yyextra->protection    = Public;
+  yyextra->mtype         = Method;
+  yyextra->stat         = FALSE;
+  yyextra->virt          = Normal;
+  yyextra->current_root  = rt.get();
+  yyextra->yyLineNr= 1 ; 
+  yyextra->yyFileName = fileName;
+  setContext(yyscanner);
+  bool processWithClang = yyextra->insideCpp || yyextra->insideObjC;
   if (processWithClang)
   {
     if (!sameTranslationUnit) // new file
@@ -7174,25 +7204,24 @@ static void parseMain(const char *fileName,
       ClangParser::instance()->switchToFile(fileName);
     }
   }
-  rt->lang = g_language;
-  msg("Parsing file %s...\n",g_yyFileName.data());
-
-  g_current_root  = rt.get() ;
-  initParser();
-  Doxygen::docGroup.enterFile(g_yyFileName,g_yyLineNr);
-  g_current = std::make_unique<Entry>();
-  //printf("g_current=%p g_current_root=%p\n",g_current,g_current_root);
-  int sec=guessSection(g_yyFileName);
+  rt->lang = yyextra->language;
+  msg("Parsing file %s...\n",yyextra->yyFileName.data());
+
+  yyextra->current_root  = rt.get() ;
+  initParser(yyscanner);
+  Doxygen::docGroup.enterFile(yyextra->yyFileName,yyextra->yyLineNr);
+  yyextra->current = std::make_unique<Entry>();
+  //printf("yyextra->current=%p yyextra->current_root=%p\n",yyextra->current,yyextra->current_root);
+  int sec=guessSection(yyextra->yyFileName);
   if (sec)
   {
-    g_current->name    = g_yyFileName;
-    g_current->section = sec;
-    g_current_root->moveToSubEntryAndRefresh(g_current);
+    yyextra->current->name    = yyextra->yyFileName;
+    yyextra->current->section = sec;
+    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
   }
-  g_current->reset();
-  initEntry();
-  scannerYYrestart( scannerYYin );
-  if ( g_insidePHP )
+  yyextra->current->reset();
+  initEntry(yyscanner);
+  if ( yyextra->insidePHP )
   {
     BEGIN( FindMembersPHP );
   }
@@ -7201,44 +7230,45 @@ static void parseMain(const char *fileName,
     BEGIN( FindMembers );
   }
 
-  scannerYYlex();
-  g_lexInit=TRUE;
+  scannerYYlex(yyscanner);
+  yyextra->lexInit=TRUE;
 
   if (YY_START==Comment)
   {
-    warn(g_yyFileName,g_yyLineNr,"File ended in the middle of a comment block! Perhaps a missing \\endcode?");
+    warn(yyextra->yyFileName,yyextra->yyLineNr,"File ended in the middle of a comment block! Perhaps a missing \\endcode?");
   }
 
   //forceEndGroup();
-  Doxygen::docGroup.leaveFile(g_yyFileName,g_yyLineNr);
+  Doxygen::docGroup.leaveFile(yyextra->yyFileName,yyextra->yyLineNr);
 
   rt->program.resize(0);
 
-  parseCompounds(rt);
+  parseCompounds(yyscanner,rt);
 
-  g_anonNSCount++;
+  yyextra->anonNSCount++;
 
   // add additional entries that were created during processing
-  for (auto &kv: g_outerScopeEntries)
+  for (auto &kv: yyextra->outerScopeEntries)
   {
     //printf(">>> adding '%s' to scope '%s'\n",kv.second->name.data(),kv.first->name.data());
     kv.first->moveToSubEntryAndKeep(kv.second);
   }
-  g_outerScopeEntries.clear();
+  yyextra->outerScopeEntries.clear();
 
 }
 
 //----------------------------------------------------------------------------
 
-static void parsePrototype(const QCString &text)
+static void parsePrototype(yyscan_t yyscanner,const QCString &text)
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf("**** parsePrototype(%s) begin\n",text.data());
   if (text.isEmpty()) 
   {
-    warn(g_yyFileName,g_yyLineNr,"Empty prototype found!");
+    warn(yyextra->yyFileName,yyextra->yyLineNr,"Empty prototype found!");
     return;
   }
-  if (!g_current) // nothing to store (see bug683516)
+  if (!yyextra->current) // nothing to store (see bug683516)
   {
     return;
   }
@@ -7249,44 +7279,34 @@ static void parsePrototype(const QCString &text)
   
   // save scanner state
   orgState = YY_CURRENT_BUFFER;
-  yy_switch_to_buffer(yy_create_buffer(scannerYYin, YY_BUF_SIZE));
-  orgInputString = g_inputString; 
-  orgInputPosition = g_inputPosition;
+  yy_switch_to_buffer(yy_create_buffer(0, YY_BUF_SIZE, yyscanner), yyscanner);
+  orgInputString = yyextra->inputString; 
+  orgInputPosition = yyextra->inputPosition;
 
   // set new string
-  g_inputString = text;
-  g_inputPosition = 0;
-  g_column = 0;
-  scannerYYrestart( scannerYYin );
+  yyextra->inputString = text;
+  yyextra->inputPosition = 0;
+  yyextra->column = 0;
+  scannerYYrestart(0, yyscanner);
   BEGIN(Prototype);
-  scannerYYlex();
-  g_lexInit=TRUE;
+  scannerYYlex(yyscanner);
+  yyextra->lexInit=TRUE;
 
-  g_current->name = g_current->name.stripWhiteSpace();
-  if (g_current->section == Entry::MEMBERDOC_SEC && g_current->args.isEmpty())
-    g_current->section = Entry::VARIABLEDOC_SEC;
+  yyextra->current->name = yyextra->current->name.stripWhiteSpace();
+  if (yyextra->current->section == Entry::MEMBERDOC_SEC && yyextra->current->args.isEmpty())
+    yyextra->current->section = Entry::VARIABLEDOC_SEC;
 
   // restore original scanner state
   YY_BUFFER_STATE tmpState = YY_CURRENT_BUFFER;
-  yy_switch_to_buffer(orgState);
-  yy_delete_buffer(tmpState);
-  g_inputString = orgInputString; 
-  g_inputPosition = orgInputPosition;
+  yy_switch_to_buffer(orgState, yyscanner);
+  yy_delete_buffer(tmpState, yyscanner);
+  yyextra->inputString = orgInputString; 
+  yyextra->inputPosition = orgInputPosition;
 
 
   //printf("**** parsePrototype end\n");
 }
 
-void scanFreeScanner()
-{
-#if defined(YY_FLEX_SUBMINOR_VERSION)
-  if (g_lexInit)
-  {
-    scannerYYlex_destroy();
-  }
-#endif
-}
-
 //static void handleGroupStartCommand(const char *header)
 //{
 //  memberGroupHeader=header;
@@ -7301,13 +7321,32 @@ void scanFreeScanner()
 
 //----------------------------------------------------------------------------
 
+struct CLanguageScanner::Private
+{
+  yyscan_t yyscanner;
+  scannerYY_state state;
+};
+
+CLanguageScanner::CLanguageScanner()
+{
+  p = new Private;
+  scannerYYlex_init_extra(&p->state,&p->yyscanner);
+}
+
+CLanguageScanner::~CLanguageScanner()
+{
+  scannerYYlex_destroy(p->yyscanner);
+  delete p;
+}
+
 void CLanguageScanner::startTranslationUnit(const char *)
 {
 }
 
 void CLanguageScanner::finishTranslationUnit()
 {
-  bool processWithClang = g_insideCpp || g_insideObjC;
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  bool processWithClang = yyextra->insideCpp || yyextra->insideObjC;
   if (processWithClang)
   {
     ClangParser::instance()->finish();
@@ -7320,11 +7359,12 @@ void CLanguageScanner::parseInput(const char *fileName,
                                   bool sameTranslationUnit,
                                   QStrList & filesInSameTranslationUnit)
 {
-  g_thisParser = this;
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  yyextra->thisParser = this;
 
   printlex(yy_flex_debug, TRUE, __FILE__, fileName);
 
-  ::parseMain(fileName,fileBuf,root,
+  ::parseMain(p->yyscanner, fileName,fileBuf,root,
               sameTranslationUnit,filesInSameTranslationUnit);
 
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
@@ -7347,7 +7387,8 @@ void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
                    bool collectXRefs
                   )
 {
-  g_codeScanner.parseCCode(codeOutIntf,scopeName,input,lang,isExampleBlock,exampleName,
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  yyextra->codeScanner.parseCCode(codeOutIntf,scopeName,input,lang,isExampleBlock,exampleName,
                fileDef,startLine,endLine,inlineFragment,memberDef,
 	       showLineNumbers,searchCtx,collectXRefs);
 }
@@ -7364,12 +7405,13 @@ bool CLanguageScanner::needsPreprocessing(const QCString &extension) const
 
 void CLanguageScanner::resetCodeParserState()
 {
-  g_codeScanner.reset();
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  yyextra->codeScanner.reset();
 }
 
 void CLanguageScanner::parsePrototype(const char *text)
 {
-  ::parsePrototype(text);
+  ::parsePrototype(p->yyscanner,text);
 }
 
 //----------------------------------------------------------------------------
-- 
cgit v0.12


From ef06c8d14c7889e723331601ac847cc481966f5c Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Mon, 2 Dec 2019 14:23:25 +0100
Subject: Coverity uninitialized

Fixing a number of uninitialized variables based on the coverity output of November 30, 2019
---
 addon/doxmlparser/src/basehandler.h         |  10 +--
 addon/doxmlparser/src/compoundhandler.cpp   |   2 +-
 addon/doxmlparser/src/compoundhandler.h     |  40 ++++-----
 addon/doxmlparser/src/linkedtexthandler.cpp |   2 +-
 addon/doxywizard/wizard.h                   | 114 +++++++++++++-------------
 src/classdef.cpp                            |  68 ++++++++--------
 src/condparser.cpp                          |   2 +-
 src/docgroup.h                              |   4 +-
 src/docparser.h                             | 122 ++++++++++++++--------------
 src/doctokenizer.h                          |  14 ++--
 src/dotdirdeps.h                            |   4 +-
 src/dotgraph.h                              |  18 ++--
 src/memberdef.cpp                           | 120 +++++++++++++--------------
 src/membergroup.h                           |  16 ++--
 src/namespacedef.cpp                        |  28 +++----
 src/scanner.l                               |   2 +-
 src/searchindex.cpp                         |   2 +-
 src/tclscanner.l                            |   2 +-
 src/template.cpp                            | 120 +++++++++++++--------------
 src/vhdldocgen.h                            |   8 +-
 src/vhdljjparser.h                          |   6 +-
 21 files changed, 352 insertions(+), 352 deletions(-)

diff --git a/addon/doxmlparser/src/basehandler.h b/addon/doxmlparser/src/basehandler.h
index a82114d..1772d8a 100644
--- a/addon/doxmlparser/src/basehandler.h
+++ b/addon/doxmlparser/src/basehandler.h
@@ -57,7 +57,7 @@ template<class T> class ElementMapper
          void operator()(const QXmlAttributes &attrib) 
            { if (m_parent) (m_parent->*m_handler)(attrib); }
        private:
-         T *m_parent;
+         T *m_parent = 0;
          Handler m_handler;
     };
 
@@ -71,7 +71,7 @@ template<class T> class ElementMapper
         void operator()() 
           { if (m_parent) (m_parent->*m_handler)(); }
       private:
-        T *m_parent;
+        T *m_parent = 0;
         Handler m_handler;
     };
 
@@ -277,9 +277,9 @@ template<class T> class BaseHandler : public QXmlDefaultHandler,
   protected:
     QString                     m_curString;
     QString                     m_skipUntil;
-    int                         m_skipCount;
-    QXmlDefaultHandler         *m_delegateHandler;
-    IFallBackHandler           *m_fallBackHandler;
+    int                         m_skipCount = 0;
+    QXmlDefaultHandler         *m_delegateHandler = 0;
+    IFallBackHandler           *m_fallBackHandler = 0;
 };
 
 //-----------------------------------------------------------------------------
diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp
index 077c8fb..69fb70c 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -86,7 +86,7 @@ class CompoundIdIterator : public ICompoundIterator,
     { delete this; }
 
   private:
-    const MainHandler *m_mainHandler;
+    const MainHandler *m_mainHandler = 0;
 };
 
 //----------------------------------------------------------------------------
diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h
index b05ba3d..6f191dc 100644
--- a/addon/doxmlparser/src/compoundhandler.h
+++ b/addon/doxmlparser/src/compoundhandler.h
@@ -54,10 +54,10 @@ class IncludeHandler : public IInclude, public BaseHandler<IncludeHandler>
     { return m_isLocal; }
 
   private:
-    IBaseHandler *m_parent;
+    IBaseHandler *m_parent = 0;
     StringImpl m_name;             // element's content
     StringImpl m_refId;            // refid
-    bool m_isLocal;                // local
+    bool m_isLocal = false;        // local
 };
 
 class IncludeIterator : public BaseIterator<IIncludeIterator,IInclude,IncludeHandler>
@@ -86,10 +86,10 @@ class RelatedCompound : public IRelatedCompound
     virtual const IString *name() const { return &m_name; }
     
   private:  
-    CompoundHandler *m_parent;
+    CompoundHandler *m_parent = 0;
     QString m_id;                  // refid
-    Protection m_protection;       // prot
-    Kind m_kind;                   // virt
+    Protection m_protection = Public; // prot
+    Kind m_kind = Normal;          // virt
     StringImpl m_name;             // element's content
 };
 
@@ -193,42 +193,42 @@ class CompoundHandler : public IClass,
                                                                 // XML elements:
                                                                 // -------------
     StringImpl                     m_name;                      // compoundname
-    TitleHandler*                  m_titleHandler;              // title
+    TitleHandler*                  m_titleHandler = 0;              // title
     QList<RelatedCompound>         m_subClasses;                // basecompoundref
     QList<RelatedCompound>         m_superClasses;              // derivedcompoundref
     QList<IncludeHandler>          m_includes;                  // includes
     QList<IncludeHandler>          m_includedBy;                // includedBy
-    GraphHandler*                  m_includeDependencyGraph;    // incdepgraph
-    GraphHandler*                  m_includedByDependencyGraph; // invincdepgraph
+    GraphHandler*                  m_includeDependencyGraph = 0;// incdepgraph
+    GraphHandler*                  m_includedByDependencyGraph = 0; // invincdepgraph
     QList<QString>                 m_innerCompounds;            // innerdir/innerfile/innerclass/innernamespace/innergroup
     TemplateParamListHandler*      m_templateParamList;         // templateparamlist
     QList<SectionHandler>          m_sections;                  // sectiondef
-    DocHandler*                    m_brief;                     // briefdescription
-    DocHandler*                    m_detailed;                  // detaileddescription
-    GraphHandler*                  m_inheritanceGraph;          // inheritancegraph
-    GraphHandler*                  m_collaborationGraph;        // collaborationgraph
-    ProgramListingHandler*         m_programListing;            // programlisting
+    DocHandler*                    m_brief = 0;                 // briefdescription
+    DocHandler*                    m_detailed = 0;              // detaileddescription
+    GraphHandler*                  m_inheritanceGraph = 0;      // inheritancegraph
+    GraphHandler*                  m_collaborationGraph = 0;    // collaborationgraph
+    ProgramListingHandler*         m_programListing = 0;        // programlisting
                                                                 // location
     StringImpl                     m_defFile;                   // - file
-    int                            m_defLine;                   // - line
+    int                            m_defLine = 0;               // - line
     StringImpl                     m_defBodyFile;               // - bodyfile
-    int                            m_defBodyStart;              // - bodystart 
-    int                            m_defBodyEnd;                // - bodyend
-    ListOfAllMembersHandler*       m_members;                   // listofallmember
+    int                            m_defBodyStart = 0;          // - bodystart 
+    int                            m_defBodyEnd = 0;            // - bodyend
+    ListOfAllMembersHandler*       m_members = 0;               // listofallmember
 
                                                                 // XML attributes:
                                                                 // ---------------
     StringImpl                     m_id;                        // id
-    CompoundKind                   m_kind;                      // kind
+    CompoundKind                   m_kind = Invalid;            // kind
     StringImpl                     m_kindString;                // kind as a string
     StringImpl                     m_protection;                // prot
 
     // local variables
     QString                        m_xmlDir;                    // directory where the info is found
-    int                            m_refCount;                  // object reference counter
+    int                            m_refCount = 0;              // object reference counter
     QDict<MemberHandler>           m_memberDict;                // id->member lookup
     QDict<QList<MemberHandler> >   m_memberNameDict;            // name->memberlist lookup
-    MainHandler*                   m_mainHandler;               // parent object
+    MainHandler*                   m_mainHandler = 0;           // parent object
 };
 
 void compoundhandler_init();
diff --git a/addon/doxmlparser/src/linkedtexthandler.cpp b/addon/doxmlparser/src/linkedtexthandler.cpp
index b774f0f..140a48b 100644
--- a/addon/doxmlparser/src/linkedtexthandler.cpp
+++ b/addon/doxmlparser/src/linkedtexthandler.cpp
@@ -51,7 +51,7 @@ class LT_Ref : public LinkedTextImpl, public ILT_Ref
     StringImpl    m_refId;
     StringImpl    m_extId;
     StringImpl    m_text;
-    TargetKind m_targetKind;
+    TargetKind m_targetKind = TargetKind::Member;
 };
 
 LinkedTextHandler::LinkedTextHandler(IBaseHandler *parent,
diff --git a/addon/doxywizard/wizard.h b/addon/doxywizard/wizard.h
index 02f3f6d..810ab95 100644
--- a/addon/doxywizard/wizard.h
+++ b/addon/doxywizard/wizard.h
@@ -50,11 +50,11 @@ class TuneColorDialog : public QDialog
     void updateImage(int hue,int sat,int val);
 
   private:
-    QImage *m_image;
-    QLabel *m_imageLab;
-    int m_hue;
-    int m_sat;
-    int m_gam;
+    QImage *m_image = 0;
+    QLabel *m_imageLab = 0;
+    int m_hue = 0;
+    int m_sat = 0;
+    int m_gam = 0;
 };
 
 class ColorPicker : public QWidget
@@ -89,11 +89,11 @@ private:
     void setSat(int v);
     void setGam(int v);
 
-    QPixmap *m_pix;
-    Mode m_mode;
-    int m_gam;
-    int m_hue;
-    int m_sat;
+    QPixmap *m_pix = 0;
+    Mode m_mode = Hue;
+    int m_gam = 0;
+    int m_hue = 0;
+    int m_sat = 0;
 
 };
 
@@ -118,16 +118,16 @@ class Step1 : public QWidget
     void setRecursiveScan(int);
 
   private:
-    QLineEdit *m_projName;
-    QLineEdit *m_projBrief;
-    QLineEdit *m_projNumber;
-    QLineEdit *m_sourceDir;
-    QLineEdit *m_destDir;
-    QLabel    *m_projIconLab;
-    QCheckBox *m_recursive;
-    QPushButton *m_srcSelectDir;
-    QPushButton *m_dstSelectDir;
-    Wizard    *m_wizard;
+    QLineEdit *m_projName = 0;
+    QLineEdit *m_projBrief = 0;
+    QLineEdit *m_projNumber = 0;
+    QLineEdit *m_sourceDir = 0;
+    QLineEdit *m_destDir = 0;
+    QLabel    *m_projIconLab = 0;
+    QCheckBox *m_recursive = 0;
+    QPushButton *m_srcSelectDir = 0;
+    QPushButton *m_dstSelectDir = 0;
+    Wizard    *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -144,12 +144,12 @@ class Step2 : public QWidget
     void changeCrossRefState(int choice);
 
   private:
-    QGroupBox    *m_extractMode;
-    QGroupBox    *m_optimizeLang;
-    QButtonGroup *m_extractModeGroup;
-    QButtonGroup *m_optimizeLangGroup;
-    QCheckBox    *m_crossRef;
-    Wizard       *m_wizard;
+    QGroupBox    *m_extractMode = 0;
+    QGroupBox    *m_optimizeLang = 0;
+    QButtonGroup *m_extractModeGroup = 0;
+    QButtonGroup *m_optimizeLangGroup = 0;
+    QCheckBox    *m_crossRef = 0;
+    Wizard       *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -173,18 +173,18 @@ class Step3 : public QWidget
     void tuneColorDialog();
 
   private:
-    QGroupBox *m_texOptions;
-    QButtonGroup *m_texOptionsGroup;
-    QGroupBox *m_htmlOptions;
-    QButtonGroup *m_htmlOptionsGroup;
-    QCheckBox *m_htmlEnabled;
-    QCheckBox *m_latexEnabled;
-    QCheckBox *m_manEnabled;
-    QCheckBox *m_rtfEnabled;
-    QCheckBox *m_xmlEnabled;
-    QCheckBox *m_searchEnabled;
-    QPushButton *m_tuneColor;
-    Wizard    *m_wizard;
+    QGroupBox *m_texOptions = 0;
+    QButtonGroup *m_texOptionsGroup = 0;
+    QGroupBox *m_htmlOptions = 0;
+    QButtonGroup *m_htmlOptionsGroup = 0;
+    QCheckBox *m_htmlEnabled = 0;
+    QCheckBox *m_latexEnabled = 0;
+    QCheckBox *m_manEnabled = 0;
+    QCheckBox *m_rtfEnabled = 0;
+    QCheckBox *m_xmlEnabled = 0;
+    QCheckBox *m_searchEnabled = 0;
+    QPushButton *m_tuneColor = 0;
+    Wizard    *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -207,17 +207,17 @@ class Step4 : public QWidget
     void setCallerGraphEnabled(int state);
 
   private:
-    QGroupBox *m_diagramMode;
-    QButtonGroup *m_diagramModeGroup;
-    QGroupBox *m_dotGroup;
-    QCheckBox *m_dotClass;
-    QCheckBox *m_dotCollaboration;
-    QCheckBox *m_dotInclude;
-    QCheckBox *m_dotIncludedBy;
-    QCheckBox *m_dotInheritance;
-    QCheckBox *m_dotCall;
-    QCheckBox *m_dotCaller;
-    Wizard    *m_wizard;
+    QGroupBox *m_diagramMode = 0;
+    QButtonGroup *m_diagramModeGroup = 0;
+    QGroupBox *m_dotGroup = 0;
+    QCheckBox *m_dotClass = 0;
+    QCheckBox *m_dotCollaboration = 0;
+    QCheckBox *m_dotInclude = 0;
+    QCheckBox *m_dotIncludedBy = 0;
+    QCheckBox *m_dotInheritance = 0;
+    QCheckBox *m_dotCall = 0;
+    QCheckBox *m_dotCaller = 0;
+    Wizard    *m_wizard = 0;
     const QHash<QString,Input *> &m_modelData;
 };
 
@@ -241,14 +241,14 @@ class Wizard : public QSplitter
 
   private:
     const QHash<QString,Input *> &m_modelData;
-    QTreeWidget    *m_treeWidget;
-    QStackedWidget *m_topicStack;
-    Step1          *m_step1;
-    Step2          *m_step2;
-    Step3          *m_step3;
-    Step4          *m_step4;
-    QPushButton    *m_next;
-    QPushButton    *m_prev;
+    QTreeWidget    *m_treeWidget = 0;
+    QStackedWidget *m_topicStack = 0;
+    Step1          *m_step1 = 0;
+    Step2          *m_step2 = 0;
+    Step3          *m_step3 = 0;
+    Step4          *m_step4 = 0;
+    QPushButton    *m_next = 0;
+    QPushButton    *m_prev = 0;
 };
 
 #endif
diff --git a/src/classdef.cpp b/src/classdef.cpp
index fd24f0b..bba962e 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -264,7 +264,7 @@ class ClassDefImpl : public DefinitionImpl, public ClassDef
 
     // PIMPL idiom
     class IMPL;
-    IMPL *m_impl;
+    IMPL *m_impl = 0;
 };
 
 ClassDef *createClassDef(
@@ -522,7 +522,7 @@ class ClassDefAliasImpl : public DefinitionAliasImpl, public ClassDef
                  QPtrDict<void> *visitedClasses=0) const {}
 
   private:
-    mutable bool m_visited;
+    mutable bool m_visited = false;
 };
 
 
@@ -560,27 +560,27 @@ class ClassDefImpl::IMPL
     /*! Include information about the header file should be included
      *  in the documentation. 0 by default, set by setIncludeFile().
      */
-    IncludeInfo *incInfo;
+    IncludeInfo *incInfo = 0;
 
     /*! List of base class (or super-classes) from which this class derives
      *  directly.
      */
-    BaseClassList *inherits;
+    BaseClassList *inherits = 0;
 
     /*! List of sub-classes that directly derive from this class
      */
-    BaseClassList *inheritedBy;
+    BaseClassList *inheritedBy = 0;
 
     /*! Namespace this class is part of
      *  (this is the inner most namespace in case of nested namespaces)
      */
-    NamespaceDef  *nspace;
+    NamespaceDef  *nspace = 0;
 
     /*! File this class is defined in */
-    FileDef *fileDef;
+    FileDef *fileDef = 0;
 
     /*! List of all members (including inherited members) */
-    MemberNameInfoSDict *allMemberNameInfoSDict;
+    MemberNameInfoSDict *allMemberNameInfoSDict = 0;
 
     /*! Template arguments of this class */
     ArgumentList tempArgs;
@@ -592,7 +592,7 @@ class ClassDefImpl::IMPL
     FileList files;
 
     /*! Examples that use this class */
-    ExampleSDict *exampleSDict;
+    ExampleSDict *exampleSDict = 0;
 
     /*! Holds the kind of "class" this is. */
     ClassDef::CompoundType compType;
@@ -606,30 +606,30 @@ class ClassDefImpl::IMPL
     /*! The inner classes contained in this class. Will be 0 if there are
      *  no inner classes.
      */
-    ClassSDict *innerClasses;
+    ClassSDict *innerClasses = 0;
 
     /* classes for the collaboration diagram */
-    UsesClassDict *usesImplClassDict;
-    UsesClassDict *usedByImplClassDict;
-    UsesClassDict *usesIntfClassDict;
+    UsesClassDict *usesImplClassDict = 0;
+    UsesClassDict *usedByImplClassDict = 0;
+    UsesClassDict *usesIntfClassDict = 0;
 
-    ConstraintClassDict *constraintClassDict;
+    ConstraintClassDict *constraintClassDict = 0;
 
     /*! Template instances that exists of this class, the key in the
      *  dictionary is the template argument list.
      */
-    mutable QDict<ClassDef> *templateInstances;
+    mutable QDict<ClassDef> *templateInstances = 0;
 
     /*! Template instances that exists of this class, as defined by variables.
      *  We do NOT want to document these individually. The key in the
      *  dictionary is the template argument list.
      */
-    mutable QDict<ClassDef> *variableInstances;
+    mutable QDict<ClassDef> *variableInstances = 0;
 
-    QDict<int> *templBaseClassNames;
+    QDict<int> *templBaseClassNames = 0;
 
     /*! The class this class is an instance of. */
-    const ClassDef *templateMaster;
+    const ClassDef *templateMaster = 0;
 
     /*! local class name which could be a typedef'ed alias name. */
     QCString className;
@@ -637,54 +637,54 @@ class ClassDefImpl::IMPL
     /*! If this class is a Objective-C category, then this points to the
      *  class which is extended.
      */
-    ClassDef *categoryOf;
+    ClassDef *categoryOf = 0;
 
     QList<MemberList> memberLists;
 
     /* user defined member groups */
-    MemberGroupSDict *memberGroupSDict;
+    MemberGroupSDict *memberGroupSDict = 0;
 
     /*! Is this an abstract class? */
-    bool isAbstract;
+    bool isAbstract = false;
 
     /*! Is the class part of an unnamed namespace? */
-    bool isStatic;
+    bool isStatic = false;
 
     /*! TRUE if classes members are merged with those of the base classes. */
-    bool membersMerged;
+    bool membersMerged = false;
 
     /*! TRUE if the class is defined in a source file rather than a header file. */
-    bool isLocal;
+    bool isLocal = false;
 
-    bool isTemplArg;
+    bool isTemplArg = false;
 
     /*! Does this class group its user-grouped members
      *  as a sub-section of the normal (public/protected/..)
      *  groups?
      */
-    bool subGrouping;
+    bool subGrouping = false;
 
     /** Reason of existence is a "use" relation */
-    bool usedOnly;
+    bool usedOnly = false;
 
     /** List of titles to use for the summary */
     SDict<QCString> vhdlSummaryTitles;
 
     /** Is this a simple (non-nested) C structure? */
-    bool isSimple;
+    bool isSimple = false;
 
     /** Does this class overloaded the -> operator? */
-    MemberDef *arrowOperator;
+    MemberDef *arrowOperator = 0;
 
-    ClassList *taggedInnerClasses;
-    ClassDef *tagLessRef;
+    ClassList *taggedInnerClasses = 0;
+    ClassDef *tagLessRef = 0;
 
     /** Does this class represent a Java style enum? */
-    bool isJavaEnum;
+    bool isJavaEnum = false;
 
-    bool isGeneric;
+    bool isGeneric = false;
 
-    uint64 spec;
+    uint64 spec = 0;
 
     QCString metaData;
 };
diff --git a/src/condparser.cpp b/src/condparser.cpp
index 74e26bc..9d7ac45 100644
--- a/src/condparser.cpp
+++ b/src/condparser.cpp
@@ -257,7 +257,7 @@ bool CondParser::parseLevel3()
 
 bool CondParser::parseVar()
 {
-  bool ans = 0;
+  bool ans = false;
   switch (m_tokenType)
   {
     case VARIABLE:
diff --git a/src/docgroup.h b/src/docgroup.h
index 47a0a3e..3ccef0d 100644
--- a/src/docgroup.h
+++ b/src/docgroup.h
@@ -42,9 +42,9 @@ class DocGroup
 
   private:
     int findExistingGroup(int &groupId,const MemberGroupInfo *info);
-    int              m_openCount;
+    int              m_openCount = 0;
     QCString         m_memberGroupHeader;
-    int              m_memberGroupId;
+    int              m_memberGroupId = 0;
     QCString         m_memberGroupRelates;
     QCString         m_memberGroupDocs;
     std::vector<Grouping> m_autoGroupStack;
diff --git a/src/docparser.h b/src/docparser.h
index 02fe135..5999eae 100644
--- a/src/docparser.h
+++ b/src/docparser.h
@@ -173,10 +173,10 @@ class DocNode
   protected:
     /*! Sets whether or not this item is inside a preformatted section */
     void setInsidePreformatted(bool p) { m_insidePre = p; }
-    DocNode *m_parent;
+    DocNode *m_parent = 0;
   private:
 
-    bool m_insidePre;
+    bool m_insidePre = false;
 };
 
 /** Default accept implementation for compound nodes in the abstract
@@ -294,7 +294,7 @@ class DocURL : public DocNode
 
   private:
     QCString  m_url;
-    bool m_isEmail;
+    bool m_isEmail = false;
 };
 
 /** Node representing a line break */
@@ -401,9 +401,9 @@ class DocStyleChange : public DocNode
     const HtmlAttribList &attribs() const { return m_attribs; }
 
   private:
-    uint     m_position;
-    Style    m_style;
-    bool     m_enable;
+    uint     m_position = 0;
+    Style    m_style = Bold;
+    bool     m_enable = false;
     HtmlAttribList m_attribs;
 };
 
@@ -488,7 +488,7 @@ class DocSymbol : public DocNode
     static SymType decodeSymbol(const QCString &symName);
 
   private:
-    SymType  m_symbol;
+    SymType  m_symbol = Sym_Unknown;
 };
 
 /** Node representing a n emoji */
@@ -503,7 +503,7 @@ class DocEmoji : public DocNode
 
   private:
     QCString m_symName;
-    int m_index;
+    int m_index = 0;
 };
 
 /** Node representing some amount of white space */
@@ -562,12 +562,12 @@ class DocVerbatim : public DocNode
   private:
     QCString  m_context;
     QCString  m_text;
-    Type      m_type;
-    bool      m_isExample;
+    Type      m_type = Code;
+    bool      m_isExample = false;
     QCString  m_exampleFile;
     QCString  m_relPath;
     QCString  m_lang;
-    bool      m_isBlock;
+    bool      m_isBlock = false;
     QCString  m_width;
     QCString  m_height;
     QList<DocNode> m_children;
@@ -610,9 +610,9 @@ class DocInclude : public DocNode
     QCString  m_file;
     QCString  m_context;
     QCString  m_text;
-    Type      m_type;
-    bool      m_isExample;
-    bool      m_isBlock;
+    Type      m_type = Include;
+    bool      m_isExample = false;
+    bool      m_isBlock = false;
     QCString  m_exampleFile;
     QCString  m_blockId;
 };
@@ -656,15 +656,15 @@ class DocIncOperator : public DocNode
     void parse();
 
   private:
-    Type     m_type;
-    int      m_line;
-    bool     m_showLineNo;
+    Type     m_type = Line;
+    int      m_line = 0;
+    bool     m_showLineNo = false;
     QCString  m_text;
     QCString  m_pattern;
     QCString  m_context;
-    bool     m_isFirst;
-    bool     m_isLast;
-    bool     m_isExample;
+    bool     m_isFirst = false;
+    bool     m_isLast = false;
+    bool     m_isExample = false;
     QCString  m_exampleFile;
     QCString m_includeFileName;
 };
@@ -686,7 +686,7 @@ class DocFormula : public DocNode
     QCString  m_name;
     QCString  m_text;
     QCString  m_relPath;
-    int      m_id;
+    int      m_id = 0;
 };
 
 /** Node representing an entry in the index. */
@@ -704,8 +704,8 @@ class DocIndexEntry : public DocNode
 
   private:
     QCString     m_entry;
-    const Definition *m_scope;
-    const MemberDef  *m_member;
+    const Definition *m_scope = 0;
+    const MemberDef  *m_member = 0;
 };
 
 //-----------------------------------------------------------------------
@@ -722,9 +722,9 @@ class DocAutoList : public CompAccept<DocAutoList>
     int parse();
 
   private:
-    int      m_indent;
-    bool     m_isEnumList;
-    int      m_depth;
+    int      m_indent = 0;
+    bool     m_isEnumList = false;
+    int      m_depth = 0;
 };
 
 /** Node representing an item of a auto list */
@@ -737,8 +737,8 @@ class DocAutoListItem : public CompAccept<DocAutoListItem>
     int parse();
 
   private:
-    int m_indent;
-    int m_itemNum;
+    int m_indent = 0;
+    int m_itemNum = 0;
 };
 
 
@@ -770,7 +770,7 @@ class DocXRefItem : public CompAccept<DocXRefItem>
     bool parse();
 
   private:
-    int      m_id;
+    int      m_id = 0;
     QCString  m_key;
     QCString  m_file;
     QCString  m_anchor;
@@ -801,12 +801,12 @@ class DocImage : public CompAccept<DocImage>
   private:
     HtmlAttribList m_attribs;
     QCString  m_name;
-    Type      m_type;
+    Type      m_type = Html;
     QCString  m_width;
     QCString  m_height;
     QCString  m_relPath;
     QCString  m_url;
-    bool      m_inlineImage;
+    bool      m_inlineImage = false;
 };
 
 /** Node representing a dot file */
@@ -929,8 +929,8 @@ class DocRef : public CompAccept<DocRef>
 
   private:
     enum RefType { Unknown, Anchor, Section, Table };
-    RefType    m_refType;
-    bool       m_isSubPage;
+    RefType    m_refType = Unknown;
+    bool       m_isSubPage = false;
     QCString   m_file;
     QCString   m_relPath;
     QCString   m_ref;
@@ -986,7 +986,7 @@ class DocHtmlHeader : public CompAccept<DocHtmlHeader>
     int parse();
 
   private:
-    int           m_level;
+    int           m_level = 0;
     HtmlAttribList m_attribs;
 };
 
@@ -1033,7 +1033,7 @@ class DocSection : public CompAccept<DocSection>
     int parse();
 
   private:
-    int      m_level;
+    int       m_level = 0;
     QCString  m_id;
     QCString  m_title;
     QCString  m_anchor;
@@ -1117,7 +1117,7 @@ class DocHtmlList : public CompAccept<DocHtmlList>
     int parseXml();
 
   private:
-    Type          m_type;
+    Type           m_type = Unordered;
     HtmlAttribList m_attribs;
 };
 
@@ -1143,8 +1143,8 @@ class DocSimpleSect : public CompAccept<DocSimpleSect>
     bool hasTitle() const      { return m_title->hasTitle(); }
 
   private:
-    Type            m_type;
-    DocTitle *      m_title;
+    Type            m_type = Unknown;
+    DocTitle *      m_title = 0;
 };
 
 /** Node representing a separator between two simple sections of the
@@ -1183,9 +1183,9 @@ class DocParamSect : public CompAccept<DocParamSect>
     bool hasTypeSpecifier() const  { return m_hasTypeSpecifier; }
 
   private:
-    Type            m_type;
-    bool            m_hasInOutSpecifier;
-    bool            m_hasTypeSpecifier;
+    Type            m_type = Unknown;
+    bool            m_hasInOutSpecifier = false;
+    bool            m_hasTypeSpecifier = false;
 };
 
 /** Node representing a paragraph in the documentation tree */
@@ -1230,8 +1230,8 @@ class DocPara : public CompAccept<DocPara>
 
   private:
     QCString  m_sectionId;
-    bool     m_isFirst;
-    bool     m_isLast;
+    bool      m_isFirst = false;
+    bool      m_isLast = false;
     HtmlAttribList m_attribs;
 };
 
@@ -1271,10 +1271,10 @@ class DocParamList : public DocNode
     QList<DocPara>          m_paragraphs;
     QList<DocNode>          m_params;
     QList<DocNode>          m_paramTypes;
-    DocParamSect::Type      m_type;
-    DocParamSect::Direction m_dir;
-    bool                    m_isFirst;
-    bool                    m_isLast;
+    DocParamSect::Type      m_type = DocParamSect::Unknown;
+    DocParamSect::Direction m_dir = DocParamSect::Unspecified;
+    bool                    m_isFirst = false;
+    bool                    m_isLast = false;
 };
 
 /** Node representing a simple list item */
@@ -1294,7 +1294,7 @@ class DocSimpleListItem : public DocNode
     }
 
   private:
-    DocPara *m_paragraph;
+    DocPara *m_paragraph = 0;
 };
 
 /** Node representing a HTML list item */
@@ -1311,7 +1311,7 @@ class DocHtmlListItem : public CompAccept<DocHtmlListItem>
 
   private:
     HtmlAttribList m_attribs;
-    int            m_itemNum;
+    int            m_itemNum = 0;
 };
 
 /** Node representing a HTML description data */
@@ -1355,12 +1355,12 @@ class DocHtmlCell : public CompAccept<DocHtmlCell>
   private:
     void setRowIndex(int idx)    { m_rowIdx = idx; }
     void setColumnIndex(int idx) { m_colIdx = idx; }
-    bool           m_isHeading;
-    bool           m_isFirst;
-    bool           m_isLast;
+    bool           m_isHeading = false;
+    bool           m_isFirst = false;
+    bool           m_isLast = false;
     HtmlAttribList m_attribs;
-    int            m_rowIdx;
-    int            m_colIdx;
+    int            m_rowIdx = -1;
+    int            m_colIdx = -1;
 };
 
 /** Node representing a HTML table caption */
@@ -1377,7 +1377,7 @@ class DocHtmlCaption : public CompAccept<DocHtmlCaption>
 
   private:
     HtmlAttribList m_attribs;
-    bool           m_hasCaptionId;
+    bool           m_hasCaptionId = false;
     QCString       m_file;
     QCString       m_anchor;
 };
@@ -1414,8 +1414,8 @@ class DocHtmlRow : public CompAccept<DocHtmlRow>
   private:
     void setRowIndex(int idx)    { m_rowIdx = idx; }
     HtmlAttribList m_attribs;
-    int m_visibleCells;
-    int m_rowIdx;
+    int m_visibleCells = -1;
+    int m_rowIdx = -1;
 };
 
 /** Node representing a HTML table */
@@ -1442,9 +1442,9 @@ class DocHtmlTable : public CompAccept<DocHtmlTable>
 
   private:
     void computeTableGrid();
-    DocHtmlCaption    *m_caption;
+    DocHtmlCaption    *m_caption = 0;
     HtmlAttribList     m_attribs;
-    int m_numCols;
+    int m_numCols = 0;
 };
 
 /** Node representing an HTML blockquote */
@@ -1483,8 +1483,8 @@ class DocRoot : public CompAccept<DocRoot>
     bool isEmpty() const { return m_children.isEmpty(); }
 
   private:
-    bool m_indent;
-    bool m_singleLine;
+    bool m_indent = false;
+    bool m_singleLine = false;
 };
 
 
diff --git a/src/doctokenizer.h b/src/doctokenizer.h
index f89069c..badf23e 100644
--- a/src/doctokenizer.h
+++ b/src/doctokenizer.h
@@ -80,8 +80,8 @@ struct TokenInfo
   // comment blocks
   
   // list token info
-  bool isEnumList;
-  int indent;
+  bool isEnumList = false;
+  int indent = 0;
 
   // sections
   QCString sectionId;
@@ -94,22 +94,22 @@ struct TokenInfo
   QCString verb;
 
   // xrefitem
-  int id;
+  int id = -1;
 
   // html tag
   HtmlAttribList attribs;
-  bool endTag;
-  bool emptyTag;
+  bool endTag = false;
+  bool emptyTag = false;
 
   // whitespace
   QCString chars;
 
   // url
-  bool isEMailAddr;
+  bool isEMailAddr = false;
 
   // param attributes
   enum ParamDir { In=1, Out=2, InOut=3, Unspecified=0 };
-  ParamDir paramDir;
+  ParamDir paramDir = Unspecified;
 };
 
 // globals
diff --git a/src/dotdirdeps.h b/src/dotdirdeps.h
index f5eef65..a71e8f1 100644
--- a/src/dotdirdeps.h
+++ b/src/dotdirdeps.h
@@ -43,9 +43,9 @@ class DotDirDeps : public DotGraph
     virtual QCString getImgAltText() const;
 
   private:
-    const DirDef *m_dir;
+    const DirDef *m_dir = 0;
 
-    bool m_linkRelations;
+    bool m_linkRelations = false;
 };
 
 #endif
diff --git a/src/dotgraph.h b/src/dotgraph.h
index 0eda3a8..edba009 100644
--- a/src/dotgraph.h
+++ b/src/dotgraph.h
@@ -74,22 +74,22 @@ class DotGraph
     QCString relImgName()  const { return m_relPath + imgName(); }
 
     // the following variables are used while writing the graph to a .dot file
-    GraphOutputFormat      m_graphFormat;
-    EmbeddedOutputFormat   m_textFormat;
+    GraphOutputFormat      m_graphFormat = GOF_BITMAP;
+    EmbeddedOutputFormat   m_textFormat = EOF_Html;
     QDir                   m_dir;
     QCString               m_fileName;
     QCString               m_relPath;
-    bool                   m_generateImageMap;
-    int                    m_graphId;
+    bool                   m_generateImageMap = false;
+    int                    m_graphId = 0;
 
     QCString               m_absPath;
     QCString               m_baseName;
     QGString               m_theGraph;
-    bool                   m_regenerate;
-    bool                   m_doNotAddImageToIndex;
-    bool                   m_noDivTag;
-    bool                   m_zoomable;
-    bool                   m_urlOnly;
+    bool                   m_regenerate = false;
+    bool                   m_doNotAddImageToIndex = false;
+    bool                   m_noDivTag = false;
+    bool                   m_zoomable = true;
+    bool                   m_urlOnly = false;
 
   private:
     DotGraph(const DotGraph &);
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 840dd78..f3fd4b4 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -1300,32 +1300,32 @@ class MemberDefImpl::IMPL
               const ArgumentList &al,const char *meta
              );
 
-    ClassDef     *classDef;   // member of or related to
-    FileDef      *fileDef;    // member of file definition
-    NamespaceDef *nspace;     // the namespace this member is in.
+    ClassDef     *classDef = 0;   // member of or related to
+    FileDef      *fileDef = 0;    // member of file definition
+    NamespaceDef *nspace = 0;     // the namespace this member is in.
 
-    MemberDef  *enumScope;    // the enclosing scope, if this is an enum field
-    bool        livesInsideEnum;
-    const MemberDef  *annEnumType;  // the anonymous enum that is the type of this member
-    MemberList *enumFields;   // enumeration fields
+    MemberDef  *enumScope = 0;    // the enclosing scope, if this is an enum field
+    bool        livesInsideEnum = false;
+    const MemberDef  *annEnumType = 0;  // the anonymous enum that is the type of this member
+    MemberList *enumFields = 0;   // enumeration fields
 
-    MemberDef  *redefines;    // the members that this member redefines
-    MemberList *redefinedBy;  // the list of members that redefine this one
+    MemberDef  *redefines = 0;    // the members that this member redefines
+    MemberList *redefinedBy = 0;  // the list of members that redefine this one
 
-    MemberDef  *memDef;       // member definition for this declaration
-    MemberDef  *memDec;       // member declaration for this definition
-    ClassDef   *relatedAlso;  // points to class marked by relatedAlso
+    MemberDef  *memDef = 0;       // member definition for this declaration
+    MemberDef  *memDec = 0;       // member declaration for this definition
+    ClassDef   *relatedAlso = 0;  // points to class marked by relatedAlso
 
-    ExampleSDict *exampleSDict; // a dictionary of all examples for quick access
+    ExampleSDict *exampleSDict = 0; // a dictionary of all examples for quick access
 
     QCString type;            // return actual type
     QCString accessorType;    // return type that tell how to get to this member
-    ClassDef *accessorClass;  // class that this member accesses (for anonymous types)
+    ClassDef *accessorClass = 0;  // class that this member accesses (for anonymous types)
     QCString args;            // function arguments/variable array specifiers
     QCString def;             // member definition in code (fully qualified name)
     QCString anc;             // HTML anchor name
-    Specifier virt;           // normal/virtual/pure virtual
-    Protection prot;          // protection type [Public/Protected/Private]
+    Specifier virt = Normal;  // normal/virtual/pure virtual
+    Protection prot = Public; // protection type [Public/Protected/Private]
     QCString decl;            // member declaration in class
 
     QCString bitfields;       // struct member bitfields
@@ -1335,13 +1335,13 @@ class MemberDefImpl::IMPL
     QCString initializer;     // initializer
     QCString extraTypeChars;  // extra type info found after the argument list
     QCString enumBaseType;    // base type of the enum (C++11)
-    int initLines;            // number of lines in the initializer
+    int initLines = 0;            // number of lines in the initializer
 
-    uint64  memSpec;          // The specifiers present for this member
-    MemberType mtype;         // returns the kind of member
-    int maxInitLines;         // when the initializer will be displayed
-    int userInitLines;        // result of explicit \hideinitializer or \showinitializer
-    MemberDef  *annMemb;
+    uint64  memSpec = 0;          // The specifiers present for this member
+    MemberType mtype = MemberType_Define; // returns the kind of member
+    int maxInitLines = 0;         // when the initializer will be displayed
+    int userInitLines = 0;        // result of explicit \hideinitializer or \showinitializer
+    MemberDef  *annMemb = 0;
 
     ArgumentList defArgList;    // argument list of this member definition
     ArgumentList declArgList;   // argument list of this member declaration
@@ -1358,19 +1358,19 @@ class MemberDefImpl::IMPL
                                    // as its type then this is computed by
                                    // getClassDefOfAnonymousType() and
                                    // cached here.
-    SDict<MemberList> *classSectionSDict; // not accessible
+    SDict<MemberList> *classSectionSDict = 0; // not accessible
 
-    const MemberDef *groupAlias;    // Member containing the definition
-    int grpId;                // group id
-    MemberGroup *memberGroup; // group's member definition
-    GroupDef *group;          // group in which this member is in
+    const MemberDef *groupAlias = 0;    // Member containing the definition
+    int grpId = 0;                // group id
+    MemberGroup *memberGroup = 0; // group's member definition
+    GroupDef *group = 0;          // group in which this member is in
     Grouping::GroupPri_t grouppri; // priority of this definition
     QCString groupFileName;   // file where this grouping was defined
-    int groupStartLine;       // line  "      "      "     "     "
-    MemberDef *groupMember;
+    int groupStartLine = 0;       // line  "      "      "     "     "
+    MemberDef *groupMember = 0;
 
-    bool isTypedefValCached;
-    const ClassDef *cachedTypedefValue;
+    bool isTypedefValCached = false;
+    const ClassDef *cachedTypedefValue = 0;
     QCString cachedTypedefTemplSpec;
     QCString cachedResolvedType;
 
@@ -1380,41 +1380,41 @@ class MemberDefImpl::IMPL
     //QCString inbodyDocs;
 
     // documentation inheritance
-    MemberDef *docProvider;
+    MemberDef *docProvider = 0;
 
     // to store the output file base from tag files
     QCString explicitOutputFileBase;
 
     // objective-c
-    bool implOnly; // function found in implementation but not
-                     // in the interface
-    mutable bool hasDocumentedParams;
-    mutable bool hasDocumentedReturnType;
-    bool isDMember;
-    Relationship related;     // relationship of this to the class
-    bool stat;                // is it a static function?
-    bool proto;               // is it a prototype;
-    bool docEnumValues;       // is an enum with documented enum values.
-
-    mutable bool annScope;    // member is part of an anonymous scope
-    mutable bool annUsed;     // ugly: needs to be mutable to allow setAnonymousUsed to act as a
-                              // const member.
-    bool hasCallGraph;
-    bool hasCallerGraph;
-    bool hasReferencedByRelation;
-    bool hasReferencesRelation;
-    bool explExt;             // member was explicitly declared external
-    bool tspec;               // member is a template specialization
-    bool groupHasDocs;        // true if the entry that caused the grouping was documented
-    bool docsForDefinition;   // TRUE => documentation block is put before
-                              //         definition.
-                              // FALSE => block is put before declaration.
-    ClassDef *category;
-    MemberDef *categoryRelation;
+    bool implOnly = false; // function found in implementation but not
+                           // in the interface
+    mutable bool hasDocumentedParams = false;
+    mutable bool hasDocumentedReturnType = false;
+    bool isDMember = false;
+    Relationship related = Member;    // relationship of this to the class
+    bool stat = false;                // is it a static function?
+    bool proto = false;               // is it a prototype?
+    bool docEnumValues = false;       // is an enum with documented enum values.
+
+    mutable bool annScope = false;    // member is part of an anonymous scope
+    mutable bool annUsed = false;     // ugly: needs to be mutable to allow setAnonymousUsed to act as a
+                                      // const member.
+    bool hasCallGraph = false;
+    bool hasCallerGraph = false;
+    bool hasReferencedByRelation = false;
+    bool hasReferencesRelation = false;
+    bool explExt = false;             // member was explicitly declared external
+    bool tspec = false;               // member is a template specialization
+    bool groupHasDocs = false;        // true if the entry that caused the grouping was documented
+    bool docsForDefinition = false;   // TRUE => documentation block is put before
+                                      //         definition.
+                                      // FALSE => block is put before declaration.
+    ClassDef *category = 0;
+    MemberDef *categoryRelation = 0;
     QCString declFileName;
-    int declLine;
-    int declColumn;
-    int numberOfFlowKW;
+    int declLine = 0;
+    int declColumn = 0;
+    int numberOfFlowKW = 0;
 };
 
 MemberDefImpl::IMPL::IMPL() :
diff --git a/src/membergroup.h b/src/membergroup.h
index 0fda3d7..aa30063 100644
--- a/src/membergroup.h
+++ b/src/membergroup.h
@@ -89,18 +89,18 @@ class MemberGroup
     int docLine() const { return m_docLine; }
 
   private: 
-    MemberList *memberList;      // list of all members in the group
-    MemberList *inDeclSection;
-    int grpId;
+    MemberList *memberList = 0;      // list of all members in the group
+    MemberList *inDeclSection = 0;
+    int grpId = 0;
     QCString grpHeader;
     QCString fileName;           // base name of the generated file
     QCString doc;
-    bool inSameSection;
-    int  m_numDecMembers;
-    int  m_numDocMembers;
-    const Definition *m_parent;
+    bool inSameSection = 0;
+    int  m_numDecMembers = 0;
+    int  m_numDocMembers = 0;
+    const Definition *m_parent = 0;
     QCString m_docFile;
-    int m_docLine;
+    int m_docLine = 0;
     std::vector<ListItemInfo> m_xrefListItems;
 };
 
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index fa258a0..220f300 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -124,23 +124,23 @@ class NamespaceDefImpl : public DefinitionImpl, public NamespaceDef
     QCString              fileName;
     FileList              files;
 
-    NamespaceSDict       *usingDirList;
-    SDict<Definition> *usingDeclList;
-    SDict<Definition>    *m_innerCompounds;
+    NamespaceSDict       *usingDirList = 0;
+    SDict<Definition>    *usingDeclList = 0;
+    SDict<Definition>    *m_innerCompounds = 0;
 
-    MemberSDict          *m_allMembersDict;
+    MemberSDict          *m_allMembersDict = 0;
     QList<MemberList>     m_memberLists;
-    MemberGroupSDict     *memberGroupSDict;
-    ClassSDict           *classSDict;
-    ClassSDict           *interfaceSDict;
-    ClassSDict           *structSDict;
-    ClassSDict           *exceptionSDict;
-    NamespaceSDict       *namespaceSDict;
-    bool                  m_subGrouping;
+    MemberGroupSDict     *memberGroupSDict = 0;
+    ClassSDict           *classSDict = 0;
+    ClassSDict           *interfaceSDict = 0;
+    ClassSDict           *structSDict = 0;
+    ClassSDict           *exceptionSDict = 0;
+    NamespaceSDict       *namespaceSDict = 0;
+    bool                  m_subGrouping = false;
     enum { NAMESPACE, MODULE, CONSTANT_GROUP, LIBRARY } m_type;
-    bool m_isPublished;
+    bool m_isPublished = false;
     QCString              metaData;
-    bool                  m_inline;
+    bool                  m_inline = false;
 };
 
 NamespaceDef *createNamespaceDef(const char *defFileName,int defLine,int defColumn,
@@ -246,7 +246,7 @@ class NamespaceDefAliasImpl : public DefinitionAliasImpl, public NamespaceDef
     bool isVisited() const { return m_visited; }
 
   private:
-    bool m_visited;
+    bool m_visited = false;
 };
 
 NamespaceDef *createNamespaceDefAlias(const Definition *newScope,const NamespaceDef *nd)
diff --git a/src/scanner.l b/src/scanner.l
index 3a71535..6c02153 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -187,7 +187,7 @@ struct scannerYY_state
   int              column = 0;
 
   int              fencedSize = 0;
-  bool             nestedComment = 0;
+  bool             nestedComment = false;
   std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > outerScopeEntries;
   CodeScanner      codeScanner;
 };
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index 06c5c75..22d33b6 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -426,7 +426,7 @@ struct SearchIndexExternal::Private
 {
   Private() : docEntries(12251) {}
   SDict<SearchDocEntry> docEntries;
-  SearchDocEntry *current;
+  SearchDocEntry *current = 0;
 };
 
 SearchIndexExternal::SearchIndexExternal() : SearchIndexIntf(External)
diff --git a/src/tclscanner.l b/src/tclscanner.l
index d22c5d6..fccc7fc 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -1503,7 +1503,7 @@ tcl_inf("-> %s\n",(const char *)tcl.string_comment);
     {
 tcl_inf("-> %s\n",(const char *)tcl.string_comment);
       int myPos=0;
-      bool myNew=0;
+      bool myNew=false;
       int myLine=tcl.line_comment;
       BufStr myI(1024);
       BufStr myO(1024);
diff --git a/src/template.cpp b/src/template.cpp
index 173df74..ca28c73 100644
--- a/src/template.cpp
+++ b/src/template.cpp
@@ -245,7 +245,7 @@ class TemplateStruct::Private
     Private() : fields(17), refCount(0)
     { fields.setAutoDelete(TRUE); }
     QDict<TemplateVariant> fields;
-    int refCount;
+    int refCount = 0;
 };
 
 TemplateStruct::TemplateStruct()
@@ -306,8 +306,8 @@ class TemplateList::Private
   public:
     Private() : index(-1), refCount(0) {}
     QValueList<TemplateVariant> elems;
-    int index;
-    int refCount;
+    int index = -1;
+    int refCount = 0;
 };
 
 
@@ -398,7 +398,7 @@ class TemplateListConstIterator : public TemplateListIntf::ConstIterator
   private:
     const TemplateList &m_list;
     QValueList<TemplateVariant>::ConstIterator m_it;
-    int m_index;
+    int m_index = 0;
 };
 
 TemplateListIntf::ConstIterator *TemplateList::createIterator() const
@@ -565,21 +565,21 @@ class TemplateContextImpl : public TemplateContext
     void addIndexEntry(const QCString &indexName,const QValueList<TemplateKeyValue> &arguments);
 
   private:
-    const TemplateEngine *m_engine;
+    const TemplateEngine *m_engine = 0;
     QCString m_templateName;
-    int m_line;
+    int m_line = 0;
     QCString m_outputDir;
     QList< QDict<TemplateVariant> > m_contextStack;
     TemplateBlockContext m_blockContext;
     QDict<TemplateEscapeIntf*> m_escapeIntfDict;
-    TemplateEscapeIntf *m_activeEscapeIntf;
-    TemplateSpacelessIntf *m_spacelessIntf;
-    bool m_spacelessEnabled;
-    bool m_tabbingEnabled;
+    TemplateEscapeIntf *m_activeEscapeIntf = 0;
+    TemplateSpacelessIntf *m_spacelessIntf = 0;
+    bool m_spacelessEnabled = false;
+    bool m_tabbingEnabled = false;
     TemplateAutoRef<TemplateStruct> m_indices;
     QDict< QStack<TemplateVariant> > m_indexStacks;
     QCString m_encoding;
-    void *m_fromUtf8;
+    void *m_fromUtf8 = 0;
 };
 
 //-----------------------------------------------------------------------------
@@ -1445,7 +1445,7 @@ class ExprAstNumber : public ExprAst
     int number() const { return m_number; }
     virtual TemplateVariant resolve(TemplateContext *) { return TemplateVariant(m_number); }
   private:
-    int m_number;
+    int m_number = 0;
 };
 
 /** @brief Class representing a variable in the AST */
@@ -1497,7 +1497,7 @@ class ExprAstFunctionVariable : public ExprAst
       return v;
     }
   private:
-    ExprAst *m_var;
+    ExprAst *m_var = 0;
     QList<ExprAst> m_args;
 };
 
@@ -1526,7 +1526,7 @@ class ExprAstFilter : public ExprAst
     }
   private:
     QCString m_name;
-    ExprAst *m_arg;
+    ExprAst *m_arg = 0;
 };
 
 /** @brief Class representing a filter applied to an expression in the AST */
@@ -1542,7 +1542,7 @@ class ExprAstFilterAppl : public ExprAst
       return m_filter->apply(m_expr->resolve(c),c);
     }
   private:
-    ExprAst *m_expr;
+    ExprAst *m_expr = 0;
     ExprAstFilter *m_filter;
 };
 
@@ -1568,7 +1568,7 @@ class ExprAstNegate : public ExprAst
     virtual TemplateVariant resolve(TemplateContext *c)
     { return TemplateVariant(!m_expr->resolve(c).toBool()); }
   private:
-    ExprAst *m_expr;
+    ExprAst *m_expr = 0;
 };
 
 class ExprAstUnary : public ExprAst
@@ -1589,8 +1589,8 @@ class ExprAstUnary : public ExprAst
       }
     }
   private:
-    Operator::Type m_operator;
-    ExprAst *m_exp;
+    Operator::Type m_operator = Operator::Or;
+    ExprAst *m_exp = 0;
 };
 
 /** @brief Class representing a binary operator in the AST */
@@ -1696,9 +1696,9 @@ class ExprAstBinary : public ExprAst
       }
     }
   private:
-    Operator::Type m_operator;
-    ExprAst *m_lhs;
-    ExprAst *m_rhs;
+    Operator::Type m_operator = Operator::Or;
+    ExprAst *m_lhs = 0;
+    ExprAst *m_rhs = 0;
 };
 
 //----------------------------------------------------------
@@ -1715,7 +1715,7 @@ class TemplateNode
     TemplateNode *parent() { return m_parent; }
 
   private:
-    TemplateNode *m_parent;
+    TemplateNode *m_parent = 0;
 };
 
 //----------------------------------------------------------
@@ -1736,7 +1736,7 @@ class TemplateParser
     QCString templateName() const { return m_templateName; }
     void warn(const char *fileName,int line,const char *fmt,...) const;
   private:
-    const TemplateEngine *m_engine;
+    const TemplateEngine *m_engine = 0;
     QCString m_templateName;
     QList<TemplateToken> &m_tokens;
 };
@@ -2282,9 +2282,9 @@ class ExpressionParser
       return TRUE;
     }
 
-    const TemplateParser *m_parser;
+    const TemplateParser *m_parser = 0;
     ExprToken m_curToken;
-    int m_line;
+    int m_line = 0;
     const char *m_tokenStream;
 };
 
@@ -2296,9 +2296,9 @@ class TemplateToken
   public:
     enum Type { Text, Variable, Block };
     TemplateToken(Type t,const char *d,int l) : type(t), data(d), line(l) {}
-    Type type;
+    Type type = Text;
     QCString data;
-    int line;
+    int line = 0;
 };
 
 //----------------------------------------------------------
@@ -2339,7 +2339,7 @@ class TemplateImpl : public TemplateNode, public Template
     TemplateBlockContext *blockContext() { return &m_blockContext; }
 
   private:
-    TemplateEngine *m_engine;
+    TemplateEngine *m_engine = 0;
     QCString m_name;
     TemplateNodeList m_nodes;
     TemplateBlockContext m_blockContext;
@@ -2358,8 +2358,8 @@ class TemplateStructWeakRef : public TemplateStructIntf
     virtual int addRef() { return ++m_refCount; }
     virtual int release() { int count=--m_refCount; if (count<=0) { delete this; } return count; }
   private:
-    TemplateStructIntf *m_ref;
-    int m_refCount;
+    TemplateStructIntf *m_ref = 0;
+    int m_refCount = 0;
 };
 
 //----------------------------------------------------------
@@ -2789,8 +2789,8 @@ class TemplateNodeVariable : public TemplateNode
 
   private:
     QCString m_templateName;
-    int m_line;
-    ExprAst *m_var;
+    int m_line = 0;
+    ExprAst *m_var = 0;
     QList<ExprAst> m_args;
 };
 
@@ -2853,7 +2853,7 @@ template<class T> class TemplateNodeCreator : public TemplateNode
       }
     }
     QCString m_templateName;
-    int m_line;
+    int m_line = 0;
 };
 
 //----------------------------------------------------------
@@ -2950,8 +2950,8 @@ class TemplateNodeIf : public TemplateNodeCreator<TemplateNodeIf>
     {
       GuardedNodes() : guardAst(0) {}
      ~GuardedNodes() { delete guardAst; }
-      int line;
-      ExprAst *guardAst;
+      int line = 0;
+      ExprAst *guardAst = 0;
       TemplateNodeList trueNodes;
     };
     QList<GuardedNodes> m_ifGuardedNodes;
@@ -3009,7 +3009,7 @@ class TemplateNodeRepeat : public TemplateNodeCreator<TemplateNodeRepeat>
     }
   private:
     TemplateNodeList m_repeatNodes;
-    ExprAst *m_expr;
+    ExprAst *m_expr = 0;
 };
 
 //----------------------------------------------------------
@@ -3175,9 +3175,9 @@ class TemplateNodeRange : public TemplateNodeCreator<TemplateNodeRange>
     }
 
   private:
-    bool m_down;
-    ExprAst *m_startExpr;
-    ExprAst *m_endExpr;
+    bool m_down = false;
+    ExprAst *m_startExpr = 0;
+    ExprAst *m_endExpr = 0;
     QCString m_var;
     TemplateNodeList m_loopNodes;
 };
@@ -3332,8 +3332,8 @@ class TemplateNodeFor : public TemplateNodeCreator<TemplateNodeFor>
     }
 
   private:
-    bool m_reversed;
-    ExprAst *m_expr;
+    bool m_reversed = false;
+    ExprAst *m_expr = 0;
     QValueList<QCString> m_vars;
     TemplateNodeList m_loopNodes;
     TemplateNodeList m_emptyNodes;
@@ -3534,7 +3534,7 @@ class TemplateNodeExtend : public TemplateNodeCreator<TemplateNodeExtend>
     }
 
   private:
-    ExprAst *m_extendExpr;
+    ExprAst *m_extendExpr = 0;
     TemplateNodeList m_nodes;
 };
 
@@ -3591,7 +3591,7 @@ class TemplateNodeInclude : public TemplateNodeCreator<TemplateNodeInclude>
     }
 
   private:
-    ExprAst *m_includeExpr;
+    ExprAst *m_includeExpr = 0;
 };
 
 //----------------------------------------------------------
@@ -3724,8 +3724,8 @@ class TemplateNodeCreate : public TemplateNodeCreator<TemplateNodeCreate>
     }
 
   private:
-    ExprAst *m_templateExpr;
-    ExprAst *m_fileExpr;
+    ExprAst *m_templateExpr = 0;
+    ExprAst *m_fileExpr = 0;
 };
 
 //----------------------------------------------------------
@@ -3839,7 +3839,7 @@ class TemplateNodeTree : public TemplateNodeCreator<TemplateNodeTree>
     }
 
   private:
-    ExprAst         *m_treeExpr;
+    ExprAst         *m_treeExpr = 0;
     TemplateNodeList m_treeNodes;
 };
 
@@ -3853,7 +3853,7 @@ class TemplateNodeIndexEntry : public TemplateNodeCreator<TemplateNodeIndexEntry
       Mapping(const QCString &n,ExprAst *e) : name(n), value(e) {}
      ~Mapping() { delete value; }
       QCString name;
-      ExprAst *value;
+      ExprAst *value = 0;
     };
   public:
     TemplateNodeIndexEntry(TemplateParser *parser,TemplateNode *parent,int line,const QCString &data)
@@ -4128,7 +4128,7 @@ class TemplateNodeCycle : public TemplateNodeCreator<TemplateNodeCycle>
       }
     }
   private:
-    uint m_index;
+    uint m_index = 0;
     QList<ExprAst> m_args;
 };
 
@@ -4142,7 +4142,7 @@ class TemplateNodeSet : public TemplateNodeCreator<TemplateNodeSet>
       Mapping(const QCString &n,ExprAst *e) : name(n), value(e) {}
      ~Mapping() { delete value; }
       QCString name;
-      ExprAst *value;
+      ExprAst *value = 0;
     };
   public:
     TemplateNodeSet(TemplateParser *parser,TemplateNode *parent,int line,const QCString &data)
@@ -4175,7 +4175,7 @@ class TemplateNodeSet : public TemplateNodeCreator<TemplateNodeSet>
       }
     }
   private:
-    Mapping *m_mapping;
+    Mapping *m_mapping = 0;
 };
 
 //----------------------------------------------------------
@@ -4323,8 +4323,8 @@ class TemplateNodeMarkers : public TemplateNodeCreator<TemplateNodeMarkers>
   private:
     TemplateNodeList m_nodes;
     QCString m_var;
-    ExprAst *m_listExpr;
-    ExprAst *m_patternExpr;
+    ExprAst *m_listExpr = 0;
+    ExprAst *m_patternExpr = 0;
 };
 
 //----------------------------------------------------------
@@ -4427,8 +4427,8 @@ class TemplateNodeResource : public TemplateNodeCreator<TemplateNodeResource>
       }
     }
   private:
-    ExprAst *m_resExpr;
-    ExprAst *m_asExpr;
+    ExprAst *m_resExpr = 0;
+    ExprAst *m_asExpr = 0;
 };
 
 //----------------------------------------------------------
@@ -4645,11 +4645,11 @@ class TemplateLexer
                   const char *data,int line,int startPos,int endPos,
                   TemplateToken::Type type);
     void reset();
-    const TemplateEngine *m_engine;
+    const TemplateEngine *m_engine = 0;
     QCString m_fileName;
     QCString m_data;
-    char m_openChar;
-    char m_closeChar;
+    char m_openChar = 0;
+    char m_closeChar = 0;
 };
 
 TemplateLexer::TemplateLexer(const TemplateEngine *engine,const QCString &fileName,const QCString &data) :
@@ -5070,10 +5070,10 @@ class TemplateEngine::Private
         int line() const { return m_line; }
 
       private:
-        Type m_type;
+        Type m_type = Template;
         QCString m_fileName;
         QCString m_blockName;
-        int m_line;
+        int m_line = 0;
     };
   public:
     Private(TemplateEngine *engine) : m_templateCache(17) /*, m_indent(0)*/, m_engine(engine)
@@ -5185,7 +5185,7 @@ class TemplateEngine::Private
   private:
     QDict<Template> m_templateCache;
     //mutable int m_indent;
-    TemplateEngine *m_engine;
+    TemplateEngine *m_engine = 0;
     QList<IncludeEntry> m_includeStack;
     QCString m_extension;
     QCString m_templateDirName;
diff --git a/src/vhdldocgen.h b/src/vhdldocgen.h
index 1d9397b..6203196 100644
--- a/src/vhdldocgen.h
+++ b/src/vhdldocgen.h
@@ -307,11 +307,11 @@ class FlowChart
     ~FlowChart();
 
 private:
-    int id;
-    int stamp;
-    int type;
+    int id = 0;
+    int stamp = 0;
+    int type = 0;
 
-    int line;
+    int line = 0;
 
     QCString label;
     QCString text;
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index f2bf60d..26bfb0e 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -89,9 +89,9 @@ struct VhdlConfNode
   QCString arch;
   QCString binding;
   QCString compSpec;
-  int level;
-  bool isLeaf;
-  bool isInlineConf;
+  int level = 0;
+  bool isLeaf = false;
+  bool isInlineConf = false;
 
 };
 
-- 
cgit v0.12


From 3bda58a7b7b4f9094c2fcb2bad71c7174367605e Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 3 Dec 2019 20:54:36 +0100
Subject: Split language parser into "outline parser" and "code parser"

---
 addon/doxyapp/doxyapp.cpp     |   6 +--
 addon/doxyparse/doxyparse.cpp |   6 +--
 src/code.h                    |  33 +++++++-----
 src/code.l                    |  14 +++--
 src/commentscan.h             |   4 +-
 src/commentscan.l             |   4 +-
 src/context.cpp               |  16 +++---
 src/definition.cpp            |  30 +++++------
 src/docbookvisitor.cpp        |  24 ++++-----
 src/doxygen.cpp               |  83 +++++++++++++++++++-----------
 src/filedef.cpp               |  14 ++---
 src/fileparser.cpp            |   2 +-
 src/fileparser.h              |  12 ++---
 src/fortrancode.h             |  46 ++++++++++++++---
 src/fortrancode.l             |  30 +++++++++++
 src/fortranscanner.h          |  30 +++--------
 src/fortranscanner.l          |  36 +++----------
 src/htmldocvisitor.cpp        |  24 ++++-----
 src/latexdocvisitor.cpp       |  24 ++++-----
 src/mandocvisitor.cpp         |  24 ++++-----
 src/markdown.cpp              |  45 +++--------------
 src/markdown.h                |  22 +-------
 src/memberdef.cpp             |   6 +--
 src/parserintf.h              | 115 ++++++++++++++++++++++++++++--------------
 src/pycode.h                  |  29 ++++++++---
 src/pycode.l                  |  29 +++++++++++
 src/pyscanner.h               |  19 +------
 src/pyscanner.l               |  34 ++-----------
 src/rtfdocvisitor.cpp         |  24 ++++-----
 src/scanner.h                 |  25 ++-------
 src/scanner.l                 |  49 ++++--------------
 src/sqlcode.h                 |  31 +++++++++---
 src/sqlcode.l                 |  30 +++++++++++
 src/sqlscanner.h              |  65 ------------------------
 src/tclscanner.h              |  10 ++--
 src/tclscanner.l              |  68 +++++++++++++------------
 src/vhdlcode.h                |  31 +++++++++---
 src/vhdlcode.l                |  22 +++++---
 src/vhdldocgen.cpp            |  51 +++----------------
 src/vhdljjparser.cpp          |   6 +--
 src/vhdljjparser.h            |  26 ++--------
 src/xmlcode.h                 |  31 +++++++++---
 src/xmlcode.l                 |  28 ++++++++++
 src/xmldocvisitor.cpp         |  24 ++++-----
 src/xmlgen.cpp                |   6 +--
 src/xmlscanner.h              |  65 ------------------------
 46 files changed, 642 insertions(+), 711 deletions(-)
 delete mode 100644 src/sqlscanner.h
 delete mode 100644 src/xmlscanner.h

diff --git a/addon/doxyapp/doxyapp.cpp b/addon/doxyapp/doxyapp.cpp
index c18f907..edd39e3 100644
--- a/addon/doxyapp/doxyapp.cpp
+++ b/addon/doxyapp/doxyapp.cpp
@@ -109,19 +109,19 @@ class XRefDummyCodeGenerator : public CodeOutputInterface
 static void findXRefSymbols(FileDef *fd)
 {
   // get the interface to a parser that matches the file extension
-  ParserInterface *pIntf=Doxygen::parserManager->getParser(fd->getDefFileExtension());
+  CodeParserInterface &intf=Doxygen::parserManager->getCodeParser(fd->getDefFileExtension());
 
   // get the programming language from the file name
   SrcLangExt lang = getLanguageFromFileName(fd->name());
 
   // reset the parsers state
-  pIntf->resetCodeParserState();
+  intf.resetCodeParserState();
 
   // create a new backend object 
   XRefDummyCodeGenerator *xrefGen = new XRefDummyCodeGenerator(fd);
 
   // parse the source code
-  pIntf->parseCode(*xrefGen,
+  intf.parseCode(*xrefGen,
                 0,
                 fileToString(fd->absFilePath()),
                 lang,
diff --git a/addon/doxyparse/doxyparse.cpp b/addon/doxyparse/doxyparse.cpp
index 415354d..59b560f 100644
--- a/addon/doxyparse/doxyparse.cpp
+++ b/addon/doxyparse/doxyparse.cpp
@@ -89,19 +89,19 @@ static bool is_c_code = true;
 static void findXRefSymbols(FileDef *fd)
 {
   // get the interface to a parser that matches the file extension
-  ParserInterface *pIntf=Doxygen::parserManager->getParser(fd->getDefFileExtension());
+  CodeParserInterface &intf=Doxygen::parserManager->getCodeParser(fd->getDefFileExtension());
 
   // get the programming language from the file name
   SrcLangExt lang = getLanguageFromFileName(fd->name());
 
   // reset the parsers state
-  pIntf->resetCodeParserState();
+  intf.resetCodeParserState();
 
   // create a new backend object
   Doxyparse *parse = new Doxyparse(fd);
 
   // parse the source code
-  pIntf->parseCode(*parse, 0, fileToString(fd->absFilePath()), lang, FALSE, 0, fd);
+  intf.parseCode(*parse, 0, fileToString(fd->absFilePath()), lang, FALSE, 0, fd);
 
   // dismiss the object.
   delete parse;
diff --git a/src/code.h b/src/code.h
index a86ecc0..42265ad 100644
--- a/src/code.h
+++ b/src/code.h
@@ -18,28 +18,37 @@
 #ifndef CODE_H
 #define CODE_H
 
-#include "types.h"
+#include "parserintf.h"
 
-class CodeOutputInterface;
 class FileDef;
 class MemberDef;
 class QCString;
 class Definition;
 
-class CodeScanner
+class CCodeParser : public CodeParserInterface
 {
   public:
-    CodeScanner();
-    virtual ~CodeScanner();
-    void parseCCode(CodeOutputInterface &,const char *,const QCString &,
-            SrcLangExt lang, bool isExample, const char *exName,FileDef *fd,
-            int startLine,int endLine,bool inlineFragment,
-            const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
-            bool collectXRefs);
-    void reset();
+    CCodeParser();
+    virtual ~CCodeParser();
+    void parseCode(CodeOutputInterface &codeOutIntf,
+                   const char *scopeName,
+                   const QCString &input,
+                   SrcLangExt lang,
+                   bool isExampleBlock,
+                   const char *exampleName=0,
+                   FileDef *fileDef=0,
+                   int startLine=-1,
+                   int endLine=-1,
+                   bool inlineFragment=FALSE,
+                   const MemberDef *memberDef=0,
+                   bool showLineNumbers=TRUE,
+                   const Definition *searchCtx=0,
+                   bool collectXRefs=TRUE
+                  );
+    void resetCodeParserState();
   private:
     struct Private;
-    Private *p;
+    std::unique_ptr<Private> p;
 };
 
 #endif
diff --git a/src/code.l b/src/code.l
index bab6b0c..2ebc09d 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3861,25 +3861,23 @@ static void restoreObjCContext(yyscan_t yyscanner)
   }
 }
 
-struct CodeScanner::Private
+struct CCodeParser::Private
 {
   yyscan_t yyscanner;
   codeYY_state state;
 };
 
-CodeScanner::CodeScanner()
+CCodeParser::CCodeParser() : p(std::make_unique<CCodeParser::Private>())
 {
-  p = new Private;
   codeYYlex_init_extra(&p->state,&p->yyscanner);
 }
 
-CodeScanner::~CodeScanner()
+CCodeParser::~CCodeParser()
 {
   codeYYlex_destroy(p->yyscanner);
-  delete p;
 }
 
-void CodeScanner::reset()
+void CCodeParser::resetCodeParserState()
 {
   struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
   //printf("***CodeParser::reset()\n");
@@ -3895,7 +3893,7 @@ void CodeScanner::reset()
   yyextra->anchorCount = 0;
 }
 
-void CodeScanner::parseCCode(CodeOutputInterface &od,const char *className,const QCString &s, 
+void CCodeParser::parseCode(CodeOutputInterface &od,const char *className,const QCString &s, 
                 SrcLangExt lang,bool exBlock, const char *exName,FileDef *fd,
 		int startLine,int endLine,bool inlineFragment,
 		const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
@@ -3912,7 +3910,7 @@ void CodeScanner::parseCCode(CodeOutputInterface &od,const char *className,const
 
   if (yyextra->codeClassSDict==0)
   {
-    reset();
+    resetCodeParserState();
   }
   yyextra->code = &od;
   yyextra->inputString   = s;
diff --git a/src/commentscan.h b/src/commentscan.h
index 7d2189f..f471890 100644
--- a/src/commentscan.h
+++ b/src/commentscan.h
@@ -19,7 +19,7 @@
 #include "types.h"
 
 class Entry;
-class ParserInterface;
+class OutlineParserInterface;
 
 /** @file
  *  @brief Interface for the comment block parser */
@@ -72,7 +72,7 @@ QCString preprocessCommentBlock(const QCString &comment,
  *         where to proceed parsing. FALSE indicates no further processing is
  *         needed.
  */
-bool parseCommentBlock(ParserInterface *parser,
+bool parseCommentBlock(OutlineParserInterface *parser,
                        Entry *curEntry,
                        const QCString &comment,
 	               const QCString &fileName,
diff --git a/src/commentscan.l b/src/commentscan.l
index 2b10f87..fa454e5 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -395,7 +395,7 @@ class GuardedSection
  *	statics
  */
 
-static ParserInterface *langParser;          // the language parser that is calling us
+static OutlineParserInterface *langParser;   // the language parser that is calling us
 static QCString         inputString;         // input string
 static int		inputPosition;       // read pointer
 static QCString		yyFileName;          // file name that is read from
@@ -3127,7 +3127,7 @@ QCString preprocessCommentBlock(const QCString &comment,
   }
 }
 
-bool parseCommentBlock(/* in */     ParserInterface *parser,
+bool parseCommentBlock(/* in */     OutlineParserInterface *parser,
                        /* in */     Entry *curEntry,
                        /* in */     const QCString &comment,
 		       /* in */     const QCString &fileName,
diff --git a/src/context.cpp b/src/context.cpp
index ebe6857..476c15e 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1302,8 +1302,8 @@ static TemplateVariant parseDoc(const Definition *def,const QCString &file,int l
 static TemplateVariant parseCode(MemberDef *md,const QCString &scopeName,const QCString &relPath,
                                  const QCString &code,int startLine=-1,int endLine=-1,bool showLineNumbers=FALSE)
 {
-  ParserInterface *pIntf = Doxygen::parserManager->getParser(md->getDefFileExtension());
-  pIntf->resetCodeParserState();
+  CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(md->getDefFileExtension());
+  intf.resetCodeParserState();
   QGString s;
   FTextStream t(&s);
   switch (g_globals.outputFormat)
@@ -1311,14 +1311,14 @@ static TemplateVariant parseCode(MemberDef *md,const QCString &scopeName,const Q
     case ContextOutputFormat_Html:
       {
         HtmlCodeGenerator codeGen(t,relPath);
-        pIntf->parseCode(codeGen,scopeName,code,md->getLanguage(),FALSE,0,md->getBodyDef(),
+        intf.parseCode(codeGen,scopeName,code,md->getLanguage(),FALSE,0,md->getBodyDef(),
             startLine,endLine,TRUE,md,showLineNumbers,md);
       }
       break;
     case ContextOutputFormat_Latex:
       {
         LatexCodeGenerator codeGen(t,relPath,md->docFile());
-        pIntf->parseCode(codeGen,scopeName,code,md->getLanguage(),FALSE,0,md->getBodyDef(),
+        intf.parseCode(codeGen,scopeName,code,md->getLanguage(),FALSE,0,md->getBodyDef(),
             startLine,endLine,TRUE,md,showLineNumbers,md);
       }
       break;
@@ -1333,8 +1333,8 @@ static TemplateVariant parseCode(MemberDef *md,const QCString &scopeName,const Q
 static TemplateVariant parseCode(const FileDef *fd,const QCString &relPath)
 {
   static bool filterSourceFiles = Config_getBool(FILTER_SOURCE_FILES);
-  ParserInterface *pIntf = Doxygen::parserManager->getParser(fd->getDefFileExtension());
-  pIntf->resetCodeParserState();
+  CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(fd->getDefFileExtension());
+  intf.resetCodeParserState();
   QGString s;
   FTextStream t(&s);
   switch (g_globals.outputFormat)
@@ -1342,7 +1342,7 @@ static TemplateVariant parseCode(const FileDef *fd,const QCString &relPath)
     case ContextOutputFormat_Html:
       {
         HtmlCodeGenerator codeGen(t,relPath);
-        pIntf->parseCode(codeGen,0,
+        intf.parseCode(codeGen,0,
               fileToString(fd->absFilePath(),filterSourceFiles,TRUE), // the sources
               fd->getLanguage(),  // lang
               FALSE,              // isExampleBlock
@@ -1361,7 +1361,7 @@ static TemplateVariant parseCode(const FileDef *fd,const QCString &relPath)
     case ContextOutputFormat_Latex:
       {
         LatexCodeGenerator codeGen(t,relPath,fd->docFile());
-        pIntf->parseCode(codeGen,0,
+        intf.parseCode(codeGen,0,
               fileToString(fd->absFilePath(),filterSourceFiles,TRUE), // the sources
               fd->getLanguage(),  // lang
               FALSE,              // isExampleBlock
diff --git a/src/definition.cpp b/src/definition.cpp
index 80060ba..9a1519e 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -1262,26 +1262,26 @@ void DefinitionImpl::writeInlineCode(OutputList &ol,const char *scopeName) const
     {
       //printf("Adding code fragment '%s' ext='%s'\n",
       //    codeFragment.data(),m_impl->defFileExt.data());
-      ParserInterface *pIntf = Doxygen::parserManager->getParser(m_impl->defFileExt);
-      pIntf->resetCodeParserState();
+      CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(m_impl->defFileExt);
+      intf.resetCodeParserState();
       //printf("Read:\n'%s'\n\n",codeFragment.data());
       const MemberDef *thisMd = 0;
       if (definitionType()==TypeMember) thisMd = dynamic_cast <const MemberDef*>(this);
 
       ol.startCodeFragment();
-      pIntf->parseCode(ol,               // codeOutIntf
-                       scopeName,        // scope
-                       codeFragment,     // input
-                       m_impl->lang,     // lang
-                       FALSE,            // isExample
-                       0,                // exampleName
-                       m_impl->body->fileDef,  // fileDef
-                       actualStart,      // startLine
-                       actualEnd,        // endLine
-                       TRUE,             // inlineFragment
-                       thisMd,           // memberDef
-                       TRUE              // show line numbers
-                      );
+      intf.parseCode(ol,               // codeOutIntf
+                     scopeName,        // scope
+                     codeFragment,     // input
+                     m_impl->lang,     // lang
+                     FALSE,            // isExample
+                     0,                // exampleName
+                     m_impl->body->fileDef,  // fileDef
+                     actualStart,      // startLine
+                     actualEnd,        // endLine
+                     TRUE,             // inlineFragment
+                     thisMd,           // memberDef
+                     TRUE              // show line numbers
+                    );
       ol.endCodeFragment();
     }
   }
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp
index ce3a845..08ec4dd 100644
--- a/src/docbookvisitor.cpp
+++ b/src/docbookvisitor.cpp
@@ -280,8 +280,8 @@ DB_VIS_C
   {
     case DocVerbatim::Code: // fall though
       m_t << "<literallayout><computeroutput>";
-      Doxygen::parserManager->getParser(m_langExt)
-        ->parseCode(m_ci,s->context(),s->text(),langExt,
+      Doxygen::parserManager->getCodeParser(m_langExt)
+         .parseCode(m_ci,s->context(),s->text(),langExt,
             s->isExample(),s->exampleFile());
       m_t << "</computeroutput></literallayout>";
       break;
@@ -389,8 +389,8 @@ DB_VIS_C
         m_t << "<literallayout><computeroutput>";
         QFileInfo cfi( inc->file() );
         FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-        Doxygen::parserManager->getParser(inc->extension())
-          ->parseCode(m_ci,inc->context(),
+        Doxygen::parserManager->getCodeParser(inc->extension())
+           .parseCode(m_ci,inc->context(),
               inc->text(),
               langExt,
               inc->isExample(),
@@ -401,8 +401,8 @@ DB_VIS_C
       break;
     case DocInclude::Include:
       m_t << "<literallayout><computeroutput>";
-      Doxygen::parserManager->getParser(inc->extension())
-        ->parseCode(m_ci,inc->context(),
+      Doxygen::parserManager->getCodeParser(inc->extension())
+         .parseCode(m_ci,inc->context(),
             inc->text(),
             langExt,
             inc->isExample(),
@@ -421,8 +421,8 @@ DB_VIS_C
       break;
     case DocInclude::Snippet:
       m_t << "<literallayout><computeroutput>";
-      Doxygen::parserManager->getParser(inc->extension())
-        ->parseCode(m_ci,
+      Doxygen::parserManager->getCodeParser(inc->extension())
+         .parseCode(m_ci,
             inc->context(),
             extractBlock(inc->text(),inc->blockId()),
             langExt,
@@ -436,8 +436,8 @@ DB_VIS_C
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
          m_t << "<literallayout><computeroutput>";
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -489,8 +489,8 @@ DB_VIS_C
         fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
       }
 
-      Doxygen::parserManager->getParser(locLangExt)
-        ->parseCode(m_ci,op->context(),
+      Doxygen::parserManager->getCodeParser(locLangExt)
+         .parseCode(m_ci,op->context(),
             op->text(),langExt,op->isExample(),
             op->exampleFile(),
             fd,     // fileDef
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 3277bbe..f29b2f8 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -75,10 +75,12 @@
 #include "searchindex.h"
 #include "parserintf.h"
 #include "htags.h"
+#include "pycode.h"
 #include "pyscanner.h"
+#include "fortrancode.h"
 #include "fortranscanner.h"
-#include "xmlscanner.h"
-#include "sqlscanner.h"
+#include "xmlcode.h"
+#include "sqlcode.h"
 #include "tclscanner.h"
 #include "code.h"
 #include "objcache.h"
@@ -8992,8 +8994,8 @@ static void generateExampleDocs()
   for (pdi.toFirst();(pd=pdi.current());++pdi)
   {
     msg("Generating docs for example %s...\n",pd->name().data());
-    ParserInterface *pIntf = Doxygen::parserManager->getParser(".c"); // TODO: do this on code type
-    pIntf->resetCodeParserState();
+    CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(".c"); // TODO: do this on code type
+    intf.resetCodeParserState();
     QCString n=pd->getOutputFileBase();
     startFile(*g_outputList,n,n,pd->name());
     startTitle(*g_outputList,n);
@@ -9349,7 +9351,7 @@ static void copyExtraFiles(QStrList files,const QCString &filesOption,const QCSt
 
 //----------------------------------------------------------------------------
 
-static ParserInterface *getParserForFile(const char *fn)
+static OutlineParserInterface &getParserForFile(const char *fn)
 {
   QCString fileName=fn;
   QCString extension;
@@ -9364,10 +9366,10 @@ static ParserInterface *getParserForFile(const char *fn)
     extension = ".no_extension";
   }
 
-  return Doxygen::parserManager->getParser(extension);
+  return Doxygen::parserManager->getOutlineParser(extension);
 }
 
-static void parseFile(ParserInterface *parser,
+static void parseFile(OutlineParserInterface &parser,
                       const std::unique_ptr<Entry> &root,FileDef *fd,const char *fn,
                       bool sameTu,QStrList &filesInSameTu)
 {
@@ -9392,7 +9394,7 @@ static void parseFile(ParserInterface *parser,
   BufStr preBuf(fi.size()+4096);
 
   if (Config_getBool(ENABLE_PREPROCESSING) &&
-      parser->needsPreprocessing(extension))
+      parser.needsPreprocessing(extension))
   {
     BufStr inBuf(fi.size()+4096);
     msg("Preprocessing %s...\n",fn);
@@ -9423,7 +9425,7 @@ static void parseFile(ParserInterface *parser,
 
   std::unique_ptr<Entry> fileRoot = std::make_unique<Entry>();
   // use language parse to parse the file
-  parser->parseInput(fileName,convBuf.data(),fileRoot,sameTu,filesInSameTu);
+  parser.parseInput(fileName,convBuf.data(),fileRoot,sameTu,filesInSameTu);
   fileRoot->setFileDef(fd);
   root->moveToSubEntryAndKeep(fileRoot);
 }
@@ -9455,8 +9457,8 @@ static void parseFiles(const std::unique_ptr<Entry> &root)
       if (fd->isSource() && !fd->isReference()) // this is a source file
       {
         QStrList filesInSameTu;
-        ParserInterface * parser = getParserForFile(s->data());
-        parser->startTranslationUnit(s->data());
+        OutlineParserInterface &parser = getParserForFile(s->data());
+        parser.startTranslationUnit(s->data());
         parseFile(parser,root,fd,s->data(),FALSE,filesInSameTu);
         //printf("  got %d extra files in tu\n",filesInSameTu.count());
 
@@ -9478,7 +9480,7 @@ static void parseFiles(const std::unique_ptr<Entry> &root)
           }
           incFile = filesInSameTu.next();
         }
-        parser->finishTranslationUnit();
+        parser.finishTranslationUnit();
         g_processedFiles.insert(*s,(void*)0x8);
       }
     }
@@ -9491,10 +9493,10 @@ static void parseFiles(const std::unique_ptr<Entry> &root)
         QStrList filesInSameTu;
         FileDef *fd=findFileDef(Doxygen::inputNameDict,s->data(),ambig);
         ASSERT(fd!=0);
-        ParserInterface * parser = getParserForFile(s->data());
-        parser->startTranslationUnit(s->data());
+        OutlineParserInterface &parser = getParserForFile(s->data());
+        parser.startTranslationUnit(s->data());
         parseFile(parser,root,fd,s->data(),FALSE,filesInSameTu);
-        parser->finishTranslationUnit();
+        parser.finishTranslationUnit();
         g_processedFiles.insert(*s,(void*)0x8);
       }
     }
@@ -9510,8 +9512,8 @@ static void parseFiles(const std::unique_ptr<Entry> &root)
       QStrList filesInSameTu;
       FileDef *fd=findFileDef(Doxygen::inputNameDict,s->data(),ambig);
       ASSERT(fd!=0);
-      ParserInterface * parser = getParserForFile(s->data());
-      parser->startTranslationUnit(s->data());
+      OutlineParserInterface &parser = getParserForFile(s->data());
+      parser.startTranslationUnit(s->data());
       parseFile(parser,root,fd,s->data(),FALSE,filesInSameTu);
     }
   }
@@ -10068,6 +10070,19 @@ static const char *getArg(int argc,char **argv,int &optind)
 
 //----------------------------------------------------------------------------
 
+/** @brief /dev/null outline parser */
+class NullOutlineParser : public OutlineParserInterface
+{
+  public:
+    void startTranslationUnit(const char *) {}
+    void finishTranslationUnit() {}
+    void parseInput(const char *, const char *,const std::unique_ptr<Entry> &, bool, QStrList &) {}
+    bool needsPreprocessing(const QCString &) const { return FALSE; }
+    void parsePrototype(const char *) {}
+};
+
+
+
 void initDoxygen()
 {
   initResources();
@@ -10082,18 +10097,28 @@ void initDoxygen()
   Doxygen::runningTime.start();
   Doxygen::preprocessor = new Preprocessor();
 
-  Doxygen::parserManager = new ParserManager;
-  Doxygen::parserManager->registerDefaultParser(         new FileParser);
-  Doxygen::parserManager->registerParser("c",            new CLanguageScanner);
-  Doxygen::parserManager->registerParser("python",       new PythonLanguageScanner);
-  Doxygen::parserManager->registerParser("fortran",      new FortranLanguageScanner);
-  Doxygen::parserManager->registerParser("fortranfree",  new FortranLanguageScannerFree);
-  Doxygen::parserManager->registerParser("fortranfixed", new FortranLanguageScannerFixed);
-  Doxygen::parserManager->registerParser("vhdl",         new VHDLLanguageScanner);
-  Doxygen::parserManager->registerParser("xml",          new XMLScanner);
-  Doxygen::parserManager->registerParser("sql",          new SQLScanner);
-  Doxygen::parserManager->registerParser("tcl",          new TclLanguageScanner);
-  Doxygen::parserManager->registerParser("md",           new MarkdownFileParser);
+  Doxygen::parserManager = new ParserManager(            std::make_unique<NullOutlineParser>(),
+                                                         std::make_unique<FileCodeParser>());
+  Doxygen::parserManager->registerParser("c",            std::make_unique<COutlineParser>(),
+                                                         std::make_unique<CCodeParser>());
+  Doxygen::parserManager->registerParser("python",       std::make_unique<PythonOutlineParser>(),
+                                                         std::make_unique<PythonCodeParser>());
+  Doxygen::parserManager->registerParser("fortran",      std::make_unique<FortranOutlineParser>(),
+                                                         std::make_unique<FortranCodeParser>());
+  Doxygen::parserManager->registerParser("fortranfree",  std::make_unique<FortranOutlineParserFree>(),
+                                                         std::make_unique<FortranCodeParserFree>());
+  Doxygen::parserManager->registerParser("fortranfixed", std::make_unique<FortranOutlineParserFixed>(),
+                                                         std::make_unique<FortranCodeParserFixed>());
+  Doxygen::parserManager->registerParser("vhdl",         std::make_unique<VHDLOutlineParser>(),
+                                                         std::make_unique<VHDLCodeParser>());
+  Doxygen::parserManager->registerParser("xml",          std::make_unique<NullOutlineParser>(),
+                                                         std::make_unique<XMLCodeParser>());
+  Doxygen::parserManager->registerParser("sql",          std::make_unique<NullOutlineParser>(),
+                                                         std::make_unique<SQLCodeParser>());
+  Doxygen::parserManager->registerParser("tcl",          std::make_unique<TclOutlineParser>(),
+                                                         std::make_unique<TclCodeParser>());
+  Doxygen::parserManager->registerParser("md",           std::make_unique<MarkdownOutlineParser>(),
+                                                         std::make_unique<FileCodeParser>());
 
   // register any additional parsers here...
 
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 346fb62..0be5d75 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -1233,8 +1233,8 @@ void FileDefImpl::writeSource(OutputList &ol,bool sameTu,QStrList &filesInSameTu
   else
 #endif
   {
-    ParserInterface *pIntf = Doxygen::parserManager->getParser(getDefFileExtension());
-    pIntf->resetCodeParserState();
+    CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(getDefFileExtension());
+    intf.resetCodeParserState();
     ol.startCodeFragment();
     bool needs2PassParsing = 
         Doxygen::parseSourcesNeeded &&                // we need to parse (filtered) sources for cross-references
@@ -1244,13 +1244,13 @@ void FileDefImpl::writeSource(OutputList &ol,bool sameTu,QStrList &filesInSameTu
     if (needs2PassParsing)
     {
       // parse code for cross-references only (see bug707641)
-      pIntf->parseCode(devNullIntf,0,
+      intf.parseCode(devNullIntf,0,
                        fileToString(absFilePath(),TRUE,TRUE),
                        getLanguage(),
                        FALSE,0,this
                       );
     }
-    pIntf->parseCode(ol,0,
+    intf.parseCode(ol,0,
         fileToString(absFilePath(),filterSourceFiles,TRUE),
         getLanguage(),      // lang
         FALSE,              // isExampleBlock
@@ -1295,9 +1295,9 @@ void FileDefImpl::parseSource(bool sameTu,QStrList &filesInSameTu)
   else
 #endif
   {
-    ParserInterface *pIntf = Doxygen::parserManager->getParser(getDefFileExtension());
-    pIntf->resetCodeParserState();
-    pIntf->parseCode(
+    CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(getDefFileExtension());
+    intf.resetCodeParserState();
+    intf.parseCode(
             devNullIntf,0,
             fileToString(absFilePath(),filterSourceFiles,TRUE),
             getLanguage(),
diff --git a/src/fileparser.cpp b/src/fileparser.cpp
index 45bdc81..34085dc 100644
--- a/src/fileparser.cpp
+++ b/src/fileparser.cpp
@@ -16,7 +16,7 @@
 #include "fileparser.h"
 #include "outputgen.h"
 
-void FileParser::parseCode(CodeOutputInterface &codeOutIntf,
+void FileCodeParser::parseCode(CodeOutputInterface &codeOutIntf,
                const char *,     // scopeName
                const QCString &     input,
                SrcLangExt,       // lang
diff --git a/src/fileparser.h b/src/fileparser.h
index 3132f92..3245878 100644
--- a/src/fileparser.h
+++ b/src/fileparser.h
@@ -18,15 +18,11 @@
 
 #include "parserintf.h"
 
-/** @brief General file parser */
-class FileParser : public ParserInterface
+/** @brief Generic code parser */
+class FileCodeParser : public CodeParserInterface
 {
   public:
-    virtual ~FileParser() {}
-    void startTranslationUnit(const char *) {}
-    void finishTranslationUnit() {}
-    void parseInput(const char *, const char *,const std::unique_ptr<Entry> &, bool, QStrList &) {}
-    bool needsPreprocessing(const QCString &) const { return FALSE; }
+    virtual ~FileCodeParser() {}
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
@@ -43,8 +39,6 @@ class FileParser : public ParserInterface
                    bool collectXRefs=TRUE
                   );
     void resetCodeParserState() {}
-    void parsePrototype(const char *) {}
 };
 
-
 #endif
diff --git a/src/fortrancode.h b/src/fortrancode.h
index 4df20a9..8391a0b 100644
--- a/src/fortrancode.h
+++ b/src/fortrancode.h
@@ -18,7 +18,7 @@
 #ifndef FORTRANCODE_H
 #define FORTRANCODE_H
 
-#include "types.h"
+#include "parserintf.h"
 
 class CodeOutputInterface;
 class FileDef;
@@ -26,13 +26,45 @@ class MemberDef;
 class QCString;
 class Definition;
 
-void parseFortranCode(CodeOutputInterface &,const char *,const QCString &, 
-            bool ,const char *,FileDef *fd,
-            int startLine,int endLine,bool inlineFragment,
-            const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
-            bool collectRefs, FortranFormat format);
-void resetFortranCodeParserState();
 void codeFreeScanner();
 
 const int fixedCommentAfter = 72;
+
+class FortranCodeParser : public CodeParserInterface
+{
+  public:
+    FortranCodeParser(FortranFormat format=FortranFormat_Unknown) : m_format(format) { }
+    void parseCode(CodeOutputInterface &codeOutIntf,
+                   const char *scopeName,
+                   const QCString &input,
+                   SrcLangExt lang,
+                   bool isExampleBlock,
+                   const char *exampleName=0,
+                   FileDef *fileDef=0,
+                   int startLine=-1,
+                   int endLine=-1,
+                   bool inlineFragment=FALSE,
+                   const MemberDef *memberDef=0,
+                   bool showLineNumbers=TRUE,
+                   const Definition *searchCtx=0,
+                   bool collectXRefs=TRUE
+                  );
+    void resetCodeParserState();
+
+  private:
+    FortranFormat m_format;
+};
+
+class FortranCodeParserFree : public FortranCodeParser
+{
+  public:
+    FortranCodeParserFree() : FortranCodeParser(FortranFormat_Free) { }
+};
+
+class FortranCodeParserFixed : public FortranCodeParser
+{
+  public:
+    FortranCodeParserFixed() : FortranCodeParser(FortranFormat_Fixed) { }
+};
+
 #endif
diff --git a/src/fortrancode.l b/src/fortrancode.l
index 3bbecd8..21d1fa5 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -1395,4 +1395,34 @@ void parseFortranCode(CodeOutputInterface &od,const char *,const QCString &s,
   return;
 }
 
+//---------------------------------------------------------
+
+void FortranCodeParser::parseCode(CodeOutputInterface & codeOutIntf,
+                   const char * scopeName,
+                   const QCString & input,
+                   SrcLangExt /*lang*/,
+                   bool isExampleBlock,
+                   const char * exampleName,
+                   FileDef * fileDef,
+                   int startLine,
+                   int endLine,
+                   bool inlineFragment,
+		   const MemberDef *memberDef,
+                   bool showLineNumbers,
+                   const Definition *searchCtx,
+                   bool collectXRefs
+                  )
+{
+  ::parseFortranCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
+                     fileDef,startLine,endLine,inlineFragment,memberDef,
+                     showLineNumbers,searchCtx,collectXRefs,m_format);
+}
+
+void FortranCodeParser::resetCodeParserState()
+{
+  ::resetFortranCodeParserState();
+}
+
+//---------------------------------------------------------
+
 #include "fortrancode.l.h"
diff --git a/src/fortranscanner.h b/src/fortranscanner.h
index 6476c98..7038882 100644
--- a/src/fortranscanner.h
+++ b/src/fortranscanner.h
@@ -24,11 +24,10 @@
  *
  *  This is the Fortran language parser for doxygen.
  */
-class FortranLanguageScanner : public ParserInterface
+class FortranOutlineParser : public OutlineParserInterface
 {
   public:
-    FortranLanguageScanner(FortranFormat format=FortranFormat_Unknown) : m_format(format) { }
-    virtual ~FortranLanguageScanner() {}
+    FortranOutlineParser(FortranFormat format=FortranFormat_Unknown) : m_format(format) { }
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char *fileName,
@@ -37,38 +36,23 @@ class FortranLanguageScanner : public ParserInterface
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
-    void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt lang,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXRefs=TRUE
-                  );
-    void resetCodeParserState();
     void parsePrototype(const char *text);
 
   private:
     FortranFormat m_format;
 };
 
-class FortranLanguageScannerFree : public FortranLanguageScanner
+class FortranOutlineParserFree : public FortranOutlineParser
 {
   public:
-    FortranLanguageScannerFree() : FortranLanguageScanner(FortranFormat_Free) { }
+    FortranOutlineParserFree() : FortranOutlineParser(FortranFormat_Free) { }
 };
 
-class FortranLanguageScannerFixed : public FortranLanguageScanner
+class FortranOutlineParserFixed : public FortranOutlineParser
 {
   public:
-    FortranLanguageScannerFixed() : FortranLanguageScanner(FortranFormat_Fixed) { }
+    FortranOutlineParserFixed() : FortranOutlineParser(FortranFormat_Fixed) { }
 };
 
+
 #endif
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index e0d6d63..9178f80 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -136,7 +136,7 @@ static const char *directionParam[] =
  *
  *	statics
  */
-static ParserInterface *g_thisParser; 
+static OutlineParserInterface *g_thisParser; 
 static const char *     inputString;
 static int		inputPosition;
 static bool             isFixedForm;
@@ -2757,7 +2757,7 @@ static void parseMain(const char *fileName,const char *fileBuf,
 
 //----------------------------------------------------------------------------
 
-void FortranLanguageScanner::parseInput(const char *fileName,
+void FortranOutlineParser::parseInput(const char *fileName,
                                         const char *fileBuf,
                                         const std::unique_ptr<Entry> &root,
                                         bool /*sameTranslationUnit*/,
@@ -2772,37 +2772,11 @@ void FortranLanguageScanner::parseInput(const char *fileName,
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
 }
 
-void FortranLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
-                   const char * scopeName,
-                   const QCString & input,
-                   SrcLangExt /*lang*/,
-                   bool isExampleBlock,
-                   const char * exampleName,
-                   FileDef * fileDef,
-                   int startLine,
-                   int endLine,
-                   bool inlineFragment,
-		   const MemberDef *memberDef,
-                   bool showLineNumbers,
-                   const Definition *searchCtx,
-                   bool collectXRefs
-                  )
-{
-  ::parseFortranCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
-                     fileDef,startLine,endLine,inlineFragment,memberDef,
-                     showLineNumbers,searchCtx,collectXRefs,m_format);
-}
-
-bool FortranLanguageScanner::needsPreprocessing(const QCString &extension) const
+bool FortranOutlineParser::needsPreprocessing(const QCString &extension) const
 {
   return extension!=extension.lower(); // use preprocessor only for upper case extensions
 }
-void FortranLanguageScanner::resetCodeParserState()
-{
-  ::resetFortranCodeParserState();
-}
-
-void FortranLanguageScanner::parsePrototype(const char *text)
+void FortranOutlineParser::parsePrototype(const char *text)
 {
   QCString buffer = QCString(text);
   pushBuffer(buffer);
@@ -2813,6 +2787,8 @@ void FortranLanguageScanner::parsePrototype(const char *text)
   popBuffer();
 }
 
+//----------------------------------------------------------------------------
+
 static void scanner_abort() 
 {
   fprintf(stderr,"********************************************************************\n");
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 513c3a4..3dec509 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -518,8 +518,8 @@ void HtmlDocVisitor::visit(DocVerbatim *s)
     case DocVerbatim::Code: 
       forceEndParagraph(s);
       m_t << PREFRAG_START;
-      Doxygen::parserManager->getParser(lang)
-                            ->parseCode(m_ci,
+      Doxygen::parserManager->getCodeParser(lang)
+                             .parseCode(m_ci,
                                         s->context(),
                                         s->text(),
                                         langExt,
@@ -666,8 +666,8 @@ void HtmlDocVisitor::visit(DocInclude *inc)
     case DocInclude::Include: 
       forceEndParagraph(inc);
       m_t << PREFRAG_START;
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,                 
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,                 
                                         inc->context(),
                                         inc->text(),
                                         langExt,
@@ -690,8 +690,8 @@ void HtmlDocVisitor::visit(DocInclude *inc)
          m_t << PREFRAG_START;
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            inc->text(),
                                            langExt,
@@ -732,8 +732,8 @@ void HtmlDocVisitor::visit(DocInclude *inc)
       {
          forceEndParagraph(inc);
          m_t << PREFRAG_START;
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -757,8 +757,8 @@ void HtmlDocVisitor::visit(DocInclude *inc)
          m_t << PREFRAG_START;
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -810,8 +810,8 @@ void HtmlDocVisitor::visit(DocIncOperator *op)
         QFileInfo cfi( op->includeFileName() );
         fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
       }
-      Doxygen::parserManager->getParser(locLangExt)
-                            ->parseCode(
+      Doxygen::parserManager->getCodeParser(locLangExt)
+                             .parseCode(
                                 m_ci,
                                 op->context(),
                                 op->text(),
diff --git a/src/latexdocvisitor.cpp b/src/latexdocvisitor.cpp
index a0bbf73..5fd2e78 100644
--- a/src/latexdocvisitor.cpp
+++ b/src/latexdocvisitor.cpp
@@ -349,8 +349,8 @@ void LatexDocVisitor::visit(DocVerbatim *s)
       {
         m_t << "\n\\begin{DoxyCode}{" << usedTableLevels() << "}\n";
 	LatexCodeGenerator::setDoxyCodeOpen(TRUE);
-        Doxygen::parserManager->getParser(lang)
-                              ->parseCode(m_ci,s->context(),s->text(),langExt,
+        Doxygen::parserManager->getCodeParser(lang)
+                               .parseCode(m_ci,s->context(),s->text(),langExt,
                                           s->isExample(),s->exampleFile());
 	LatexCodeGenerator::setDoxyCodeOpen(FALSE);
         m_t << "\\end{DoxyCode}\n";
@@ -461,8 +461,8 @@ void LatexDocVisitor::visit(DocInclude *inc)
 	 LatexCodeGenerator::setDoxyCodeOpen(TRUE);
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,inc->context(),
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,inc->context(),
                                            inc->text(),
                                            langExt,
                                            inc->isExample(),
@@ -482,8 +482,8 @@ void LatexDocVisitor::visit(DocInclude *inc)
     case DocInclude::Include: 
       m_t << "\n\\begin{DoxyCodeInclude}{" << usedTableLevels() << "}\n";
       LatexCodeGenerator::setDoxyCodeOpen(TRUE);
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,inc->context(),
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,inc->context(),
                                         inc->text(),langExt,inc->isExample(),
                                         inc->exampleFile(),
                                         0,     // fileDef
@@ -512,8 +512,8 @@ void LatexDocVisitor::visit(DocInclude *inc)
       {
          m_t << "\n\\begin{DoxyCodeInclude}{" << usedTableLevels() << "}\n";
          LatexCodeGenerator::setDoxyCodeOpen(TRUE);
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -530,8 +530,8 @@ void LatexDocVisitor::visit(DocInclude *inc)
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
          m_t << "\n\\begin{DoxyCodeInclude}{" << usedTableLevels() << "}\n";
          LatexCodeGenerator::setDoxyCodeOpen(TRUE);
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -583,8 +583,8 @@ void LatexDocVisitor::visit(DocIncOperator *op)
         fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
       }
 
-      Doxygen::parserManager->getParser(locLangExt)
-                            ->parseCode(m_ci,op->context(),op->text(),langExt,
+      Doxygen::parserManager->getCodeParser(locLangExt)
+                             .parseCode(m_ci,op->context(),op->text(),langExt,
                                         op->isExample(),op->exampleFile(),
                                         fd,     // fileDef
                                         op->line(),    // startLine
diff --git a/src/mandocvisitor.cpp b/src/mandocvisitor.cpp
index 21e7cb9..3db556d 100644
--- a/src/mandocvisitor.cpp
+++ b/src/mandocvisitor.cpp
@@ -204,8 +204,8 @@ void ManDocVisitor::visit(DocVerbatim *s)
       if (!m_firstCol) m_t << endl;
       m_t << ".PP" << endl;
       m_t << ".nf" << endl;
-      Doxygen::parserManager->getParser(lang)
-                            ->parseCode(m_ci,s->context(),s->text(),
+      Doxygen::parserManager->getCodeParser(lang)
+                             .parseCode(m_ci,s->context(),s->text(),
                                         langExt,
                                         s->isExample(),s->exampleFile());
       if (!m_firstCol) m_t << endl;
@@ -257,8 +257,8 @@ void ManDocVisitor::visit(DocInclude *inc)
          m_t << ".nf" << endl;
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,inc->context(),
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,inc->context(),
                                            inc->text(),
                                            langExt,
                                            inc->isExample(),
@@ -281,8 +281,8 @@ void ManDocVisitor::visit(DocInclude *inc)
       if (!m_firstCol) m_t << endl;
       m_t << ".PP" << endl;
       m_t << ".nf" << endl;
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,inc->context(),
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,inc->context(),
                                         inc->text(),
                                         langExt,
                                         inc->isExample(),
@@ -318,8 +318,8 @@ void ManDocVisitor::visit(DocInclude *inc)
       if (!m_firstCol) m_t << endl;
       m_t << ".PP" << endl;
       m_t << ".nf" << endl;
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,
                                         inc->context(),
                                         extractBlock(inc->text(),inc->blockId()),
                                         langExt,
@@ -338,8 +338,8 @@ void ManDocVisitor::visit(DocInclude *inc)
          m_t << ".nf" << endl;
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -397,8 +397,8 @@ void ManDocVisitor::visit(DocIncOperator *op)
         fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
       }
 
-      Doxygen::parserManager->getParser(locLangExt)
-                            ->parseCode(m_ci,op->context(),op->text(),langExt,
+      Doxygen::parserManager->getCodeParser(locLangExt)
+                             .parseCode(m_ci,op->context(),op->text(),langExt,
                                         op->isExample(),op->exampleFile(),
                                         fd,     // fileDef
                                         op->line(),    // startLine
diff --git a/src/markdown.cpp b/src/markdown.cpp
index e054941..8511da3 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2576,7 +2576,7 @@ QCString markdownFileNameToId(const QCString &fileName)
 }
 
 
-void MarkdownFileParser::parseInput(const char *fileName, 
+void MarkdownOutlineParser::parseInput(const char *fileName, 
                 const char *fileBuf, 
                 const std::unique_ptr<Entry> &root,
                 bool /*sameTranslationUnit*/,
@@ -2660,47 +2660,14 @@ void MarkdownFileParser::parseInput(const char *fileName,
   g_indentLevel=0;
 }
 
-void MarkdownFileParser::parseCode(CodeOutputInterface &codeOutIntf,
-               const char *scopeName,
-               const QCString &input,
-               SrcLangExt lang,
-               bool isExampleBlock,
-               const char *exampleName,
-               FileDef *fileDef,
-               int startLine,
-               int endLine,
-               bool inlineFragment,
-               const MemberDef *memberDef,
-               bool showLineNumbers,
-               const Definition *searchCtx,
-               bool collectXRefs
-              )
+void MarkdownOutlineParser::parsePrototype(const char *text)
 {
-  ParserInterface *pIntf = Doxygen::parserManager->getParser("*.cpp");
-  if (pIntf!=this)
+  OutlineParserInterface &intf = Doxygen::parserManager->getOutlineParser("*.cpp");
+  if (&intf!=this)
   {
-    pIntf->parseCode(
-       codeOutIntf,scopeName,input,lang,isExampleBlock,exampleName,
-       fileDef,startLine,endLine,inlineFragment,memberDef,showLineNumbers,
-       searchCtx,collectXRefs);
+    intf.parsePrototype(text);
   }
 }
 
-void MarkdownFileParser::resetCodeParserState()
-{
-  ParserInterface *pIntf = Doxygen::parserManager->getParser("*.cpp");
-  if (pIntf!=this)
-  {
-    pIntf->resetCodeParserState();
-  }
-}
-
-void MarkdownFileParser::parsePrototype(const char *text)
-{
-  ParserInterface *pIntf = Doxygen::parserManager->getParser("*.cpp");
-  if (pIntf!=this)
-  {
-    pIntf->parsePrototype(text);
-  }
-}
+//------------------------------------------------------------------------
 
diff --git a/src/markdown.h b/src/markdown.h
index 2c9a496..4ce2f62 100644
--- a/src/markdown.h
+++ b/src/markdown.h
@@ -25,10 +25,10 @@ class Entry;
 QCString processMarkdown(const QCString &fileName,const int lineNr,Entry *e,const QCString &s);
 QCString markdownFileNameToId(const QCString &fileName);
 
-class MarkdownFileParser : public ParserInterface
+class MarkdownOutlineParser : public OutlineParserInterface
 {
   public:
-    virtual ~MarkdownFileParser() {}
+    virtual ~MarkdownOutlineParser() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char *fileName, 
@@ -37,26 +37,8 @@ class MarkdownFileParser : public ParserInterface
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &) const { return FALSE; }
-    void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt lang,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXRefs=TRUE
-                  );
-    void resetCodeParserState();
     void parsePrototype(const char *text);
 };
 
 
-
-
 #endif
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 840dd78..40d596c 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -3707,10 +3707,10 @@ void MemberDefImpl::writeDocumentation(const MemberList *ml,
     else
       ol.parseText(theTranslator->trInitialValue());
     ol.endBold();
-    ParserInterface *pIntf = Doxygen::parserManager->getParser(getDefFileExtension());
-    pIntf->resetCodeParserState();
+    CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(getDefFileExtension());
+    intf.resetCodeParserState();
     ol.startCodeFragment();
-    pIntf->parseCode(ol,scopeName,m_impl->initializer,lang,FALSE,0,const_cast<FileDef*>(getFileDef()),
+    intf.parseCode(ol,scopeName,m_impl->initializer,lang,FALSE,0,const_cast<FileDef*>(getFileDef()),
                      -1,-1,TRUE,this,FALSE,this);
     ol.endCodeFragment();
   }
diff --git a/src/parserintf.h b/src/parserintf.h
index c0939c9..4be8aee 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -18,10 +18,11 @@
 #ifndef PARSERINTF_H
 #define PARSERINTF_H
 
-#include <qdict.h>
 #include <qstrlist.h>
 
 #include <memory>
+#include <map>
+#include <string>
 
 #include "types.h"
 
@@ -31,16 +32,16 @@ class CodeOutputInterface;
 class MemberDef;
 class Definition;
 
-/** \brief Abstract interface for programming language parsers.
+/** \brief Abstract interface for outline parsers.
  *
  *  By implementing the methods of this interface one can add
- *  a new language parser to doxygen. The parser can make use of the 
+ *  a new language parser to doxygen. The parser implementation can make use of the 
  *  comment block parser to parse the contents of special comment blocks.
  */
-class ParserInterface
+class OutlineParserInterface
 {
   public:
-    virtual ~ParserInterface() {}
+    virtual ~OutlineParserInterface() {}
 
     /** Starts processing a translation unit (source files + headers).
      *  After this call parseInput() is called with sameTranslationUnit
@@ -80,6 +81,27 @@ class ParserInterface
      */
     virtual bool needsPreprocessing(const QCString &extension) const = 0;
     
+    /** Callback function called by the comment block scanner.
+     *  It provides a string \a text containing the prototype of a function
+     *  or variable. The parser should parse this and store the information
+     *  in the Entry node that corresponds with the node for which the
+     *  comment block parser was invoked.
+     */
+    virtual void parsePrototype(const char *text) = 0;
+
+};
+
+/** \brief Abstract interface for code parsers.
+ *
+ *  By implementing the methods of this interface one can add
+ *  a new language parser to doxygen. This interface is used for
+ *  syntax highlighting, but also to extract cross references and call graphs.
+ */
+class CodeParserInterface
+{
+  public:
+    virtual ~CodeParserInterface() {}
+
     /** Parses a source file or fragment with the goal to produce
      *  highlighted and cross-referenced output.
      *  @param[in] codeOutIntf Abstract interface for writing the result.
@@ -125,14 +147,6 @@ class ParserInterface
      */
     virtual void resetCodeParserState() = 0;
 
-    /** Callback function called by the comment block scanner.
-     *  It provides a string \a text containing the prototype of a function
-     *  or variable. The parser should parse this and store the information
-     *  in the Entry node that corresponds with the node for which the
-     *  comment block parser was invoked.
-     */
-    virtual void parsePrototype(const char *text) = 0;
-
 };
 
 //-----------------------------------------------------------------------------
@@ -145,18 +159,22 @@ class ParserInterface
 class ParserManager
 {
   public:
-    /** Creates the parser manager object. 
-     */
-    ParserManager()
-      : m_defaultParser(0) { m_parsers.setAutoDelete(TRUE); }
-   ~ParserManager()
+    struct ParserPair
     {
-      delete m_defaultParser;
-    }
+      ParserPair(std::unique_ptr<OutlineParserInterface> oli,
+                 std::unique_ptr<CodeParserInterface> cpi) noexcept
+        : outlineParser(std::move(oli)), codeParser(std::move(cpi)) 
+      {
+      }
 
-    void registerDefaultParser(ParserInterface *parser)
+      std::unique_ptr<OutlineParserInterface> outlineParser;
+      std::unique_ptr<CodeParserInterface>    codeParser;
+    };
+
+    ParserManager(std::unique_ptr<OutlineParserInterface> outlineParser,
+                  std::unique_ptr<CodeParserInterface> codeParser)
+      : m_defaultParsers(std::move(outlineParser),std::move(codeParser))
     {
-      m_defaultParser = parser;
     }
 
     /** Registers an additional parser.
@@ -165,9 +183,11 @@ class ParserManager
      *  @param[in] parser    The parser that is to be used for the
      *                       given name.
      */
-    void registerParser(const char *name,ParserInterface *parser)
+    void registerParser(const char *name,std::unique_ptr<OutlineParserInterface> outlineParser,
+                                         std::unique_ptr<CodeParserInterface> codeParser)
     {
-      m_parsers.insert(name,parser);
+      m_parsers.emplace(std::string(name),
+                        ParserPair(std::move(outlineParser),std::move(codeParser)));
     }
 
     /** Registers a file \a extension with a parser with name \a parserName. 
@@ -176,13 +196,16 @@ class ParserManager
     bool registerExtension(const char *extension, const char *parserName)
     {
       if (parserName==0 || extension==0) return FALSE;
-      ParserInterface *intf = m_parsers.find(parserName);
-      if (intf==0) return FALSE;
-      if (m_extensions.find(extension)!=0) // extension already exists
+
+      const auto &parserIt = m_parsers.find(parserName);
+      if (parserIt == m_parsers.end()) return FALSE;
+
+      auto extensionIt = m_extensions.find(extension);
+      if (extensionIt != m_extensions.end()) // extension already exists
       {
-        m_extensions.remove(extension); // remove it
+        m_extensions.erase(extensionIt); // remove it (e.g. user specified extension overrules built in one)
       }
-      m_extensions.insert(extension,intf); // add new mapping
+      m_extensions.emplace(std::string(extension),parserIt->second); // add new mapping
       return TRUE;
     }
 
@@ -190,22 +213,36 @@ class ParserManager
      *  If there is no parser explicitly registered for the supplied extension, 
      *  the interface to the default parser will be returned.
      */
-    ParserInterface *getParser(const char *extension)
+    OutlineParserInterface &getOutlineParser(const char *extension)
     {
-      QCString ext = QCString(extension).lower();
+      return *getParsers(extension).outlineParser;
+    }
+
+    /** Gets the interface to the parser associated with given \a extension.
+     *  If there is no parser explicitly registered for the supplied extension, 
+     *  the interface to the default parser will be returned.
+     */
+    CodeParserInterface &getCodeParser(const char *extension)
+    {
+      return *getParsers(extension).codeParser;
+    }
+
+  private:
+    ParserPair &getParsers(const char *extension)
+    {
+      QCString ext = QCString(extension).lower().data();
       if (ext.isEmpty()) ext=".no_extension";
-      ParserInterface *intf = m_extensions.find(ext);
-      if (intf==0 && ext.length()>4)
+      auto it = m_extensions.find(ext.data());
+      if (it==m_extensions.end() && ext.length()>4)
       {
-        intf = m_extensions.find(ext.left(4));
+        it = m_extensions.find(ext.left(4).data());
       }
-      return intf ? intf : m_defaultParser;
+      return it!=m_extensions.end() ? it->second : m_defaultParsers;
     }
 
-  private:
-    QDict<ParserInterface> m_parsers;
-    QDict<ParserInterface> m_extensions;
-    ParserInterface *m_defaultParser;
+    std::map<std::string,ParserPair> m_parsers;
+    std::map<std::string,ParserPair &> m_extensions;
+    ParserPair m_defaultParsers;
 };
 
 #endif
diff --git a/src/pycode.h b/src/pycode.h
index de0a8a9..e3a01b4 100644
--- a/src/pycode.h
+++ b/src/pycode.h
@@ -25,7 +25,7 @@
 #ifndef PYCODE_H
 #define PYCODE_H
 
-#include "types.h"
+#include "parserintf.h"
 
 class CodeOutputInterface;
 class FileDef;
@@ -33,11 +33,26 @@ class MemberDef;
 class QCString;
 class Definition;
 
-extern void parsePythonCode(CodeOutputInterface &,const char *,const QCString &,
-             bool ,const char *,FileDef *fd,
-	     int startLine,int endLine,bool inlineFragment,
-             const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
-             bool collectXRefs);
-extern void resetPythonCodeParserState();
+class PythonCodeParser : public CodeParserInterface
+{
+  public:
+    void parseCode(CodeOutputInterface &codeOutIntf,
+                   const char *scopeName,
+                   const QCString &input,
+                   SrcLangExt lang,
+                   bool isExampleBlock,
+                   const char *exampleName=0,
+                   FileDef *fileDef=0,
+                   int startLine=-1,
+                   int endLine=-1,
+                   bool inlineFragment=FALSE,
+                   const MemberDef *memberDef=0,
+                   bool showLineNumbers=TRUE,
+                   const Definition *searchCtx=0,
+                   bool collectXrefs=TRUE
+                  );
+    void resetCodeParserState();
+};
+
 
 #endif
diff --git a/src/pycode.l b/src/pycode.l
index 4e53a27..f7e255f 100644
--- a/src/pycode.l
+++ b/src/pycode.l
@@ -1638,4 +1638,33 @@ void parsePythonCode(CodeOutputInterface &od,const char * /*className*/,
   return;
 }
 
+//----------------------------------------------------------------------------
+
+void PythonCodeParser::parseCode(CodeOutputInterface &codeOutIntf,
+    const char *scopeName,
+    const QCString &input,
+    SrcLangExt /*lang*/,
+    bool isExampleBlock,
+    const char *exampleName,
+    FileDef *fileDef,
+    int startLine,
+    int endLine,
+    bool inlineFragment,
+    const MemberDef *memberDef,
+    bool showLineNumbers,
+    const Definition *searchCtx,
+    bool collectXRefs
+    )
+{
+  ::parsePythonCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
+                    fileDef,startLine,endLine,inlineFragment,memberDef,
+                    showLineNumbers,searchCtx,collectXRefs);
+}
+
+void PythonCodeParser::resetCodeParserState()
+{
+  ::resetPythonCodeParserState();
+}
+
+
 #include "pycode.l.h"
diff --git a/src/pyscanner.h b/src/pyscanner.h
index 2faffdc..73e1679 100644
--- a/src/pyscanner.h
+++ b/src/pyscanner.h
@@ -31,10 +31,9 @@
  *
  * This is the Python language parser for doxygen.
  */
-class PythonLanguageScanner : public ParserInterface
+class PythonOutlineParser : public OutlineParserInterface
 {
   public:
-    virtual ~PythonLanguageScanner() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char * fileName, 
@@ -43,22 +42,6 @@ class PythonLanguageScanner : public ParserInterface
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
-    void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt lang,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXrefs=TRUE
-                  );
-    void resetCodeParserState();
     void parsePrototype(const char *text);
 };
 
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 5d6b303..963b4e8 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -65,7 +65,7 @@
  */
 
   
-static ParserInterface *g_thisParser;
+static OutlineParserInterface *g_thisParser;
 static const char *     inputString;
 static int		inputPosition;
 static QFile            inputFile;
@@ -1886,7 +1886,7 @@ void pyscanFreeScanner()
 
 //----------------------------------------------------------------------------
 
-void PythonLanguageScanner::parseInput(const char *fileName,
+void PythonOutlineParser::parseInput(const char *fileName,
                                        const char *fileBuf,
                                        const std::unique_ptr<Entry> &root,
                                        bool /*sameTranslationUnit*/,
@@ -1901,43 +1901,17 @@ void PythonLanguageScanner::parseInput(const char *fileName,
   // printAST(global_root);
 }
 
-bool PythonLanguageScanner::needsPreprocessing(const QCString &) const
+bool PythonOutlineParser::needsPreprocessing(const QCString &) const
 {
   return FALSE;
 }
 
-void PythonLanguageScanner::parseCode(CodeOutputInterface &codeOutIntf,
-    const char *scopeName,
-    const QCString &input,
-    SrcLangExt /*lang*/,
-    bool isExampleBlock,
-    const char *exampleName,
-    FileDef *fileDef,
-    int startLine,
-    int endLine,
-    bool inlineFragment,
-    const MemberDef *memberDef,
-    bool showLineNumbers,
-    const Definition *searchCtx,
-    bool collectXRefs
-    )
-{
-  ::parsePythonCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
-                    fileDef,startLine,endLine,inlineFragment,memberDef,
-                    showLineNumbers,searchCtx,collectXRefs);
-}
-
-void PythonLanguageScanner::parsePrototype(const char *text)
+void PythonOutlineParser::parsePrototype(const char *text)
 {
   ::parsePrototype(text);
 
 }
 
-void PythonLanguageScanner::resetCodeParserState()
-{
-  ::resetPythonCodeParserState();
-}
-
 //----------------------------------------------------------------------------
 
 #include "pyscanner.l.h"
diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp
index 43ac362..5a8e49d 100644
--- a/src/rtfdocvisitor.cpp
+++ b/src/rtfdocvisitor.cpp
@@ -305,8 +305,8 @@ void RTFDocVisitor::visit(DocVerbatim *s)
       m_t << "{" << endl;
       m_t << "\\par" << endl;
       m_t << rtf_Style_Reset << getStyle("CodeExample");
-      Doxygen::parserManager->getParser(lang)
-                            ->parseCode(m_ci,s->context(),s->text(),langExt,
+      Doxygen::parserManager->getCodeParser(lang)
+                             .parseCode(m_ci,s->context(),s->text(),langExt,
                                         s->isExample(),s->exampleFile());
       //m_t << "\\par" << endl; 
       m_t << "}" << endl;
@@ -432,8 +432,8 @@ void RTFDocVisitor::visit(DocInclude *inc)
          m_t << rtf_Style_Reset << getStyle("CodeExample");
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,inc->context(),
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,inc->context(),
                                            inc->text(),
                                            langExt,
                                            inc->isExample(),
@@ -454,8 +454,8 @@ void RTFDocVisitor::visit(DocInclude *inc)
       m_t << "{" << endl;
       m_t << "\\par" << endl;
       m_t << rtf_Style_Reset << getStyle("CodeExample");
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,inc->context(),
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,inc->context(),
                                         inc->text(),langExt,inc->isExample(),
                                         inc->exampleFile(),
                                         0,     // fileDef
@@ -485,8 +485,8 @@ void RTFDocVisitor::visit(DocInclude *inc)
       m_t << "{" << endl;
       if (!m_lastIsPara) m_t << "\\par" << endl;
       m_t << rtf_Style_Reset << getStyle("CodeExample");
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,
                                         inc->context(),
                                         extractBlock(inc->text(),inc->blockId()),
                                         langExt,
@@ -502,8 +502,8 @@ void RTFDocVisitor::visit(DocInclude *inc)
          m_t << "{" << endl;
          if (!m_lastIsPara) m_t << "\\par" << endl;
          m_t << rtf_Style_Reset << getStyle("CodeExample");
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -560,8 +560,8 @@ void RTFDocVisitor::visit(DocIncOperator *op)
         fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
       }
 
-      Doxygen::parserManager->getParser(locLangExt)
-                            ->parseCode(m_ci,op->context(),op->text(),langExt,
+      Doxygen::parserManager->getCodeParser(locLangExt)
+                             .parseCode(m_ci,op->context(),op->text(),langExt,
                                         op->isExample(),op->exampleFile(),
                                         fd,     // fileDef
                                         op->line(),    // startLine
diff --git a/src/scanner.h b/src/scanner.h
index fd40485..1c7a50c 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -26,11 +26,11 @@
  *  supports C++ and various languages that are closely related to C++, 
  *  such as C, C#, Objective-C, Java, PHP, and IDL.
  */
-class CLanguageScanner : public ParserInterface
+class COutlineParser : public OutlineParserInterface
 {
   public:
-    CLanguageScanner();
-    virtual ~CLanguageScanner();
+    COutlineParser();
+    virtual ~COutlineParser();
     void startTranslationUnit(const char *fileName);
     void finishTranslationUnit();
     void parseInput(const char *fileName,
@@ -39,26 +39,11 @@ class CLanguageScanner : public ParserInterface
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
-    void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt lang,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXRefs=TRUE
-                  );
-    void resetCodeParserState();
     void parsePrototype(const char *text);
   private:
     struct Private;
-    Private *p;
+    std::unique_ptr<Private> p;
 };
 
+
 #endif
diff --git a/src/scanner.l b/src/scanner.l
index 3a71535..a03b777 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -58,7 +58,7 @@
 
 struct scannerYY_state
 {
-  ParserInterface *thisParser;
+  OutlineParserInterface *thisParser;
   const char *     inputString = 0;
   int              inputPosition = 0;
   int              lastContext = 0;
@@ -189,7 +189,6 @@ struct scannerYY_state
   int              fencedSize = 0;
   bool             nestedComment = 0;
   std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > outerScopeEntries;
-  CodeScanner      codeScanner;
 };
 
 static const char *stateToString(int state);
@@ -7321,29 +7320,27 @@ static void parsePrototype(yyscan_t yyscanner,const QCString &text)
 
 //----------------------------------------------------------------------------
 
-struct CLanguageScanner::Private
+struct COutlineParser::Private
 {
   yyscan_t yyscanner;
   scannerYY_state state;
 };
 
-CLanguageScanner::CLanguageScanner()
+COutlineParser::COutlineParser() : p(std::make_unique<COutlineParser::Private>())
 {
-  p = new Private;
   scannerYYlex_init_extra(&p->state,&p->yyscanner);
 }
 
-CLanguageScanner::~CLanguageScanner()
+COutlineParser::~COutlineParser()
 {
   scannerYYlex_destroy(p->yyscanner);
-  delete p;
 }
 
-void CLanguageScanner::startTranslationUnit(const char *)
+void COutlineParser::startTranslationUnit(const char *)
 {
 }
 
-void CLanguageScanner::finishTranslationUnit()
+void COutlineParser::finishTranslationUnit()
 {
   struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
   bool processWithClang = yyextra->insideCpp || yyextra->insideObjC;
@@ -7353,7 +7350,7 @@ void CLanguageScanner::finishTranslationUnit()
   }
 }
 
-void CLanguageScanner::parseInput(const char *fileName,
+void COutlineParser::parseInput(const char *fileName,
                                   const char *fileBuf,
                                   const std::unique_ptr<Entry> &root,
                                   bool sameTranslationUnit,
@@ -7371,29 +7368,7 @@ void CLanguageScanner::parseInput(const char *fileName,
 }
 
 
-void CLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
-                   const char * scopeName,
-                   const QCString & input,
-                   SrcLangExt lang,
-                   bool isExampleBlock,
-                   const char * exampleName,
-                   FileDef * fileDef,
-                   int startLine,
-                   int endLine,
-                   bool inlineFragment,
-		   const MemberDef *memberDef,
-		   bool showLineNumbers,
-                   const Definition *searchCtx,
-                   bool collectXRefs
-                  )
-{
-  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
-  yyextra->codeScanner.parseCCode(codeOutIntf,scopeName,input,lang,isExampleBlock,exampleName,
-               fileDef,startLine,endLine,inlineFragment,memberDef,
-	       showLineNumbers,searchCtx,collectXRefs);
-}
-
-bool CLanguageScanner::needsPreprocessing(const QCString &extension) const
+bool COutlineParser::needsPreprocessing(const QCString &extension) const
 {
   QCString fe=extension.lower();
   SrcLangExt lang = getLanguageFromFileName(extension);
@@ -7403,13 +7378,7 @@ bool CLanguageScanner::needsPreprocessing(const QCString &extension) const
     );
 }
 
-void CLanguageScanner::resetCodeParserState()
-{
-  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
-  yyextra->codeScanner.reset();
-}
-
-void CLanguageScanner::parsePrototype(const char *text)
+void COutlineParser::parsePrototype(const char *text)
 {
   ::parsePrototype(p->yyscanner,text);
 }
diff --git a/src/sqlcode.h b/src/sqlcode.h
index d8a09b7..20e20f7 100644
--- a/src/sqlcode.h
+++ b/src/sqlcode.h
@@ -19,7 +19,7 @@
 #ifndef SQLCODE_H
 #define SQLCODE_H
 
-#include "types.h"
+#include "parserintf.h"
 
 class CodeOutputInterface;
 class FileDef;
@@ -27,11 +27,28 @@ class MemberDef;
 class QCString;
 class Definition;
 
-extern void parseSqlCode(CodeOutputInterface &,const char *,const QCString &,
-             bool ,const char *,FileDef *fd,
-	     int startLine,int endLine,bool inlineFragment,
-             const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
-             bool collectXRefs);
-extern void resetSqlCodeParserState();
+/** SQL scanner. Only support syntax highlighting of code at the moment.
+ */
+class SQLCodeParser : public CodeParserInterface
+{
+  public:
+    void parseCode(CodeOutputInterface &codeOutIntf,
+                   const char *scopeName,
+                   const QCString &input,
+                   SrcLangExt,
+                   bool isExampleBlock,
+                   const char *exampleName=0,
+                   FileDef *fileDef=0,
+                   int startLine=-1,
+                   int endLine=-1,
+                   bool inlineFragment=FALSE,
+                   const MemberDef *memberDef=0,
+                   bool showLineNumbers=TRUE,
+                   const Definition *searchCtx=0,
+                   bool collectXRefs=TRUE
+                  );
+    void resetCodeParserState();
+};
+
 
 #endif
diff --git a/src/sqlcode.l b/src/sqlcode.l
index a9e88a7..499a512 100644
--- a/src/sqlcode.l
+++ b/src/sqlcode.l
@@ -454,4 +454,34 @@ void resetSqlCodeParserState()
   yyextra->currentMemberDef = 0;
 }
 
+//---------------------------------------------------------------------------------
+
+void SQLCodeParser::parseCode(CodeOutputInterface &codeOutIntf,
+               const char *scopeName,
+               const QCString &input,
+               SrcLangExt,
+               bool isExampleBlock,
+               const char *exampleName,
+               FileDef *fileDef,
+               int startLine,
+               int endLine,
+               bool inlineFragment,
+               const MemberDef *memberDef,
+               bool showLineNumbers,
+               const Definition *searchCtx,
+               bool collectXRefs
+              )
+{
+  parseSqlCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
+                fileDef,startLine,endLine,inlineFragment,memberDef,
+                showLineNumbers,searchCtx,collectXRefs);
+}
+
+void SQLCodeParser::resetCodeParserState()
+{
+  resetSqlCodeParserState();
+}
+
+//---------------------------------------------------------------------------------
+
 #include "sqlcode.l.h"
diff --git a/src/sqlscanner.h b/src/sqlscanner.h
deleted file mode 100644
index 694bf80..0000000
--- a/src/sqlscanner.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- * Documents produced by Doxygen are derivative works derived from the
- * input used in their production; they are not affected by this license.
- *
- */
-
-#ifndef SQLSCANNER_H
-#define SQLSCANNER_H
-
-#include "parserintf.h"
-#include "sqlcode.h"
-
-/** SQL scanner. Only support syntax highlighting of code at the moment.
- */
-class SQLScanner : public ParserInterface
-{
-public:
-    SQLScanner() {}
-    virtual ~SQLScanner() {}
-    void startTranslationUnit(const char *) {}
-    void finishTranslationUnit() {}
-    void parseInput(const char *, const char *, const std::unique_ptr<Entry> &, bool , QStrList &) {}
-    bool needsPreprocessing(const QCString &) const { return FALSE; }
-
-    void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXRefs=TRUE
-                  )
-    {
-      parseSqlCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
-                    fileDef,startLine,endLine,inlineFragment,memberDef,
-                    showLineNumbers,searchCtx,collectXRefs);
-    }
-
-    void resetCodeParserState()
-    {
-      resetSqlCodeParserState();
-    }
-
-    void parsePrototype(const char *) {}
-
-private:
-};
-
-#endif
diff --git a/src/tclscanner.h b/src/tclscanner.h
index 94da68b..52ff903 100644
--- a/src/tclscanner.h
+++ b/src/tclscanner.h
@@ -25,10 +25,9 @@
  *
  *  This is the Tcl language parser for doxygen.
  */
-class TclLanguageScanner : public ParserInterface
+class TclOutlineParser : public OutlineParserInterface
 {
   public:
-    virtual ~TclLanguageScanner() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char *fileName,
@@ -37,6 +36,12 @@ class TclLanguageScanner : public ParserInterface
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
+    void parsePrototype(const char *text);
+};
+
+class TclCodeParser : public CodeParserInterface
+{
+  public:
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
@@ -53,7 +58,6 @@ class TclLanguageScanner : public ParserInterface
                    bool collectXRefs=TRUE
                   );
     void resetCodeParserState();
-    void parsePrototype(const char *text);
 };
 
 #endif
diff --git a/src/tclscanner.l b/src/tclscanner.l
index d22c5d6..e3fd6f2 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -429,7 +429,7 @@ static struct
   QCString input_string; // file contents
   int input_position; // position in file
   QCString file_name; // name of used file
-  ParserInterface *this_parser; // myself
+  OutlineParserInterface *this_parser; // myself
   int command; // true if command was found
   int comment; // set true if comment was scanned
   int brace_level; // bookkeeping of braces
@@ -2964,7 +2964,7 @@ static void tcl_parse(const QCString ns, const QCString cls)
 }
 
 //! Parse text file and build up entry tree.
-void TclLanguageScanner::parseInput(const char *fileName,
+void TclOutlineParser::parseInput(const char *fileName,
                                     const char *input,
                                     const std::unique_ptr<Entry> &root,
                                     bool /*sameTranslationUnit*/,
@@ -2995,8 +2995,40 @@ tcl_inf("%s\n",fileName);
   printlex(yy_flex_debug, FALSE, __FILE__, fileName);
 }
 
+
+bool TclOutlineParser::needsPreprocessing(const QCString &extension) const
+{
+  (void)extension;
+  return FALSE;
+}
+
+void TclOutlineParser::parsePrototype(const char *text)
+{
+  (void)text;
+}
+
+static int yyread(char *buf,int max_size)
+{
+  int c=0;
+
+  *buf = '\0';
+  while ( c < max_size && tcl.input_string.at(tcl.input_position) )
+  {
+    *buf = tcl.input_string.at(tcl.input_position++) ;
+    c++; buf++;
+  }
+  //printf("Read from=%d size=%d max=%d c=%d\n",tcl.input_position,strlen(&tcl.input_string[tcl.input_position]),max_size,c);
+  return c;
+}
+
+//----------------------------------------------------------------------------
+
+void TclCodeParser::resetCodeParserState()
+{
+}
+
 //! Parse file and codify.
-void TclLanguageScanner::parseCode(CodeOutputInterface & codeOutIntf,
+void TclCodeParser::parseCode(CodeOutputInterface & codeOutIntf,
                    const char * scopeName,
                    const QCString & input,
                    SrcLangExt lang,
@@ -3100,36 +3132,6 @@ tcl_inf("%s (%d,%d) %d %d\n",myStr.data(),startLine,endLine,isExampleBlock,inlin
   tcl.entry.clear();
   printlex(yy_flex_debug, FALSE, __FILE__, fileDef ? fileDef->fileName().data(): NULL);
 }
-
-bool TclLanguageScanner::needsPreprocessing(const QCString &extension) const
-{
-  (void)extension;
-  return FALSE;
-}
-
-void TclLanguageScanner::resetCodeParserState()
-{
-}
-
-void TclLanguageScanner::parsePrototype(const char *text)
-{
-  (void)text;
-}
-
-static int yyread(char *buf,int max_size)
-{
-  int c=0;
-
-  *buf = '\0';
-  while ( c < max_size && tcl.input_string.at(tcl.input_position) )
-  {
-    *buf = tcl.input_string.at(tcl.input_position++) ;
-    c++; buf++;
-  }
-  //printf("Read from=%d size=%d max=%d c=%d\n",tcl.input_position,strlen(&tcl.input_string[tcl.input_position]),max_size,c);
-  return c;
-}
-
 //----------------------------------------------------------------------------
 
 // to avoid a warning
diff --git a/src/vhdlcode.h b/src/vhdlcode.h
index a7b4687..b79e2ab 100644
--- a/src/vhdlcode.h
+++ b/src/vhdlcode.h
@@ -1,16 +1,35 @@
 #ifndef VHDLCODE_H
 #define VHDLCODE_H
 
+#include "parserintf.h"
+
 class CodeOutputInterface;
 class FileDef;
 class MemberDef;
 
-void parseVhdlCode(CodeOutputInterface &,const char *,const QCString &, 
-            bool ,const char *,FileDef *fd,
-            int startLine,int endLine,bool inlineFragment,
-            const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
-            bool collectXRefs);
-void resetVhdlCodeParserState();
 void codeFreeVhdlScanner();
 
+class VHDLCodeParser : public CodeParserInterface
+{
+  public:
+    virtual ~VHDLCodeParser() {}
+    void parseCode(CodeOutputInterface &codeOutIntf,
+                   const char *scopeName,
+                   const QCString &input,
+                   SrcLangExt lang,
+                   bool isExampleBlock,
+                   const char *exampleName=0,
+                   FileDef *fileDef=0,
+                   int startLine=-1,
+                   int endLine=-1,
+                   bool inlineFragment=FALSE,
+                   const MemberDef *memberDef=0,
+                   bool showLineNumbers=TRUE,
+                   const Definition *searchCtx=0,
+                   bool collectXRefs=TRUE
+                  );
+    void resetCodeParserState() {}
+};
+
+
 #endif 
diff --git a/src/vhdlcode.l b/src/vhdlcode.l
index 53e1ed8..fe5a8d9 100644
--- a/src/vhdlcode.l
+++ b/src/vhdlcode.l
@@ -33,6 +33,7 @@
 #include <qdir.h>
 #include <qcstringlist.h>
 
+#include "vhdlcode.h"
 #include "entry.h"
 #include "doxygen.h"
 #include "message.h"
@@ -1530,17 +1531,26 @@ XILINX      "INST"|"NET"|"PIN"|"BLKNM"|"BUFG"|"COLLAPSE"|"CPLD"|"COMPGRP"|"CONFI
 /*@ ----------------------------------------------------------------------------
  */
 
-void resetVhdlCodeParserState()
+static void resetVhdlCodeParserState()
 {
   g_vhdlKeyDict.setAutoDelete(TRUE);
   g_vhdlKeyDict.clear();
 }
 
-void parseVhdlCode(CodeOutputInterface &od,const char *className,const QCString &s, 
-                  bool exBlock, const char *exName,FileDef *fd,
-                  int startLine,int endLine,bool inlineFragment,
-                  const MemberDef *memberDef,bool,const Definition *searchCtx,
-                  bool /* collectXRefs */)
+void VHDLCodeParser::parseCode(CodeOutputInterface &od,
+                               const char *className,
+                               const QCString &s, 
+                               SrcLangExt,
+                               bool exBlock,
+                               const char *exName,
+                               FileDef *fd,
+                               int startLine,
+                               int endLine,
+                               bool inlineFragment,
+                               const MemberDef *memberDef,
+                               bool,
+                               const Definition *searchCtx,
+                               bool /* collectXRefs */)
 {
   //printf("***parseCode() exBlock=%d exName=%s fd=%p\n",exBlock,exName,fd);
   if (s.isEmpty()) return;
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 90d4829..ba4d4de 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -2379,7 +2379,7 @@ void VhdlDocGen::writeStringLink(const MemberDef *mdef,QCString mem, OutputList&
 
 void VhdlDocGen::writeSource(const MemberDef *mdef,OutputList& ol,const QCString & cname)
 {
-  ParserInterface *pIntf = Doxygen::parserManager->getParser(".vhd");
+  CodeParserInterface &intf = Doxygen::parserManager->getCodeParser(".vhd");
  // pIntf->resetCodeParserState();
 
   QCString codeFragment=mdef->documentation();
@@ -2405,7 +2405,7 @@ void VhdlDocGen::writeSource(const MemberDef *mdef,OutputList& ol,const QCString
   codeFragment.prepend("\n");
   ol.pushGeneratorState();
   ol.startCodeFragment();
-  pIntf->parseCode(ol,                   // codeOutIntf
+  intf.parseCode(      ol,               // codeOutIntf
                        0,                // scope
                        codeFragment,     // input
                        SrcLangExt_VHDL,  // lang
@@ -3134,13 +3134,13 @@ void VhdlDocGen::createFlowChart(const MemberDef *mdef)
   bool b=readCodeFragment( fd->absFilePath().data(), actualStart,actualEnd,codeFragment);
   if (!b) return;
 
-  VHDLLanguageScanner *pIntf =(VHDLLanguageScanner*) Doxygen::parserManager->getParser(".vhd");
+  VHDLOutlineParser &intf =dynamic_cast<VHDLOutlineParser&>(Doxygen::parserManager->getOutlineParser(".vhd"));
   VhdlDocGen::setFlowMember(mdef);
   std::unique_ptr<Entry> root = std::make_unique<Entry>();
   QStrList filesInSameTu;
-  pIntf->startTranslationUnit("");
-  pIntf->parseInput("",codeFragment.data(),root,FALSE,filesInSameTu);
-  pIntf->finishTranslationUnit();
+  intf.startTranslationUnit("");
+  intf.parseInput("",codeFragment.data(),root,FALSE,filesInSameTu);
+  intf.finishTranslationUnit();
 }
 
 void VhdlDocGen::resetCodeVhdlParserState()
@@ -4312,42 +4312,3 @@ void FlowChart::writeFlowLinks(FTextStream &t)
 } //writeFlowLinks
 
 
-void VHDLLanguageScanner::parseCode(CodeOutputInterface &codeOutIntf,
-    const char *scopeName,
-    const QCString &input,
-    SrcLangExt, // lang
-    bool isExampleBlock,
-    const char *exampleName,
-    FileDef *fileDef,
-    int startLine,
-    int endLine,
-    bool inlineFragment,
-    const MemberDef *memberDef,
-    bool showLineNumbers,
-    const Definition *searchCtx,
-    bool collectXRefs
-    )
-{
-
-parseVhdlCode(codeOutIntf,
-                 scopeName,
-                  input,
-                  isExampleBlock,
-                  exampleName,
-                  fileDef,
-                  startLine,
-                  endLine,
-                  inlineFragment,
-                  memberDef,
-                  showLineNumbers,
-                  searchCtx,
-                  collectXRefs
-
-);
-
-
-
-
-
-
-}// class
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index d6e3ac3..874980b 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -33,7 +33,7 @@
 using namespace vhdl::parser;
 using namespace std;
 
-static ParserInterface *g_thisParser;
+static OutlineParserInterface *g_thisParser;
 
 static QCString         yyFileName;
 static int              yyLineNr      = 1;
@@ -105,7 +105,7 @@ bool isConstraintFile(const QCString &fileName,const QCString &ext)
 }
 
 
-void VHDLLanguageScanner::parseInput(const char *fileName,const char *fileBuf,
+void VHDLOutlineParser::parseInput(const char *fileName,const char *fileBuf,
                           const std::unique_ptr<Entry> &root, bool ,QStrList&)
 {
   g_thisParser=this;
@@ -321,7 +321,7 @@ void VhdlParser::handleCommentBlock(const char* doc1,bool brief)
   strComment.resize(0);
 }
 
-void VHDLLanguageScanner::parsePrototype(const char *text)
+void VHDLOutlineParser::parsePrototype(const char *text)
 {
   varName=text;
   varr=TRUE;
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index f2bf60d..faa0c08 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -39,10 +39,10 @@ struct VhdlConfNode;
  *
  * This is the VHDL language parser for doxygen.
  */
-class VHDLLanguageScanner : public ParserInterface
+class VHDLOutlineParser : public OutlineParserInterface
 {
   public:
-    virtual ~VHDLLanguageScanner() {}
+    virtual ~VHDLOutlineParser() {}
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
     void parseInput(const char * fileName,
@@ -50,25 +50,9 @@ class VHDLLanguageScanner : public ParserInterface
                     const std::unique_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
-  
- void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt lang,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXRefs=TRUE
-				   );
-		bool needsPreprocessing(const QCString &) const { return TRUE; }
-		void resetCodeParserState(){};
-	    void parsePrototype(const char *text);
+
+    bool needsPreprocessing(const QCString &) const { return TRUE; }
+    void parsePrototype(const char *text);
 };
 
 struct VhdlConfNode
diff --git a/src/xmlcode.h b/src/xmlcode.h
index e463866..4cada9b 100644
--- a/src/xmlcode.h
+++ b/src/xmlcode.h
@@ -19,7 +19,7 @@
 #ifndef XMLCODE_H
 #define XMLCODE_H
 
-#include "types.h"
+#include "parserintf.h"
 
 class CodeOutputInterface;
 class FileDef;
@@ -27,11 +27,28 @@ class MemberDef;
 class QCString;
 class Definition;
 
-extern void parseXmlCode(CodeOutputInterface &,const char *,const QCString &,
-             bool ,const char *,FileDef *fd,
-	     int startLine,int endLine,bool inlineFragment,
-             const MemberDef *memberDef,bool showLineNumbers,const Definition *searchCtx,
-             bool collectXRefs);
-extern void resetXmlCodeParserState();
+/** XML scanner. Only support syntax highlighting of code at the moment.
+ */
+class XMLCodeParser : public CodeParserInterface
+{
+  public:
+    void parseCode(CodeOutputInterface &codeOutIntf,
+                   const char *scopeName,
+                   const QCString &input,
+                   SrcLangExt,
+                   bool isExampleBlock,
+                   const char *exampleName=0,
+                   FileDef *fileDef=0,
+                   int startLine=-1,
+                   int endLine=-1,
+                   bool inlineFragment=FALSE,
+                   const MemberDef *memberDef=0,
+                   bool showLineNumbers=TRUE,
+                   const Definition *searchCtx=0,
+                   bool collectXRefs=TRUE
+                  );
+    void resetCodeParserState();
+};
+
 
 #endif
diff --git a/src/xmlcode.l b/src/xmlcode.l
index 2fedf2d..94548f8 100644
--- a/src/xmlcode.l
+++ b/src/xmlcode.l
@@ -407,4 +407,32 @@ void resetXmlCodeParserState()
   g_currentMemberDef = 0;
 }
 
+//----------------------------------------------------------------------------
+
+void XMLCodeParser::parseCode(CodeOutputInterface &codeOutIntf,
+               const char *scopeName,
+               const QCString &input,
+               SrcLangExt,
+               bool isExampleBlock,
+               const char *exampleName,
+               FileDef *fileDef,
+               int startLine,
+               int endLine,
+               bool inlineFragment,
+               const MemberDef *memberDef,
+               bool showLineNumbers,
+               const Definition *searchCtx,
+               bool collectXRefs
+              )
+{
+  parseXmlCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
+                fileDef,startLine,endLine,inlineFragment,memberDef,
+                showLineNumbers,searchCtx,collectXRefs);
+}
+
+void XMLCodeParser::resetCodeParserState()
+{
+  resetXmlCodeParserState();
+}
+
 #include "xmlcode.l.h"
diff --git a/src/xmldocvisitor.cpp b/src/xmldocvisitor.cpp
index a0afa9d..828c265 100644
--- a/src/xmldocvisitor.cpp
+++ b/src/xmldocvisitor.cpp
@@ -251,8 +251,8 @@ void XmlDocVisitor::visit(DocVerbatim *s)
           m_t << " filename=\"" << lang << "\">";
       else
           m_t << ">";
-      Doxygen::parserManager->getParser(lang)
-                            ->parseCode(m_ci,s->context(),s->text(),langExt,
+      Doxygen::parserManager->getCodeParser(lang)
+                             .parseCode(m_ci,s->context(),s->text(),langExt,
                                         s->isExample(),s->exampleFile());
       m_t << "</programlisting>"; 
       break;
@@ -306,8 +306,8 @@ void XmlDocVisitor::visit(DocInclude *inc)
          m_t << "<programlisting filename=\"" << inc->file() << "\">";
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,inc->context(),
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,inc->context(),
                                            inc->text(),
                                            langExt,
                                            inc->isExample(),
@@ -325,8 +325,8 @@ void XmlDocVisitor::visit(DocInclude *inc)
       break;    
     case DocInclude::Include: 
       m_t << "<programlisting filename=\"" << inc->file() << "\">";
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,inc->context(),
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,inc->context(),
                                         inc->text(),
                                         langExt,
                                         inc->isExample(),
@@ -367,8 +367,8 @@ void XmlDocVisitor::visit(DocInclude *inc)
       break;
     case DocInclude::Snippet:
       m_t << "<programlisting filename=\"" << inc->file() << "\">";
-      Doxygen::parserManager->getParser(inc->extension())
-                            ->parseCode(m_ci,
+      Doxygen::parserManager->getCodeParser(inc->extension())
+                             .parseCode(m_ci,
                                         inc->context(),
                                         extractBlock(inc->text(),inc->blockId()),
                                         langExt,
@@ -382,8 +382,8 @@ void XmlDocVisitor::visit(DocInclude *inc)
          m_t << "<programlisting filename=\"" << inc->file() << "\">";
          QFileInfo cfi( inc->file() );
          FileDef *fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
-         Doxygen::parserManager->getParser(inc->extension())
-                               ->parseCode(m_ci,
+         Doxygen::parserManager->getCodeParser(inc->extension())
+                                .parseCode(m_ci,
                                            inc->context(),
                                            extractBlock(inc->text(),inc->blockId()),
                                            langExt,
@@ -436,8 +436,8 @@ void XmlDocVisitor::visit(DocIncOperator *op)
         fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() );
       }
 
-      Doxygen::parserManager->getParser(locLangExt)
-                            ->parseCode(m_ci,op->context(),
+      Doxygen::parserManager->getCodeParser(locLangExt)
+                             .parseCode(m_ci,op->context(),
                                         op->text(),langExt,op->isExample(),
                                         op->exampleFile(),
                                         fd,     // fileDef
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 83e97b2..bf5af84 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -417,11 +417,11 @@ static void writeXMLDocBlock(FTextStream &t,
 
 void writeXMLCodeBlock(FTextStream &t,FileDef *fd)
 {
-  ParserInterface *pIntf=Doxygen::parserManager->getParser(fd->getDefFileExtension());
+  CodeParserInterface &intf=Doxygen::parserManager->getCodeParser(fd->getDefFileExtension());
   SrcLangExt langExt = getLanguageFromFileName(fd->getDefFileExtension());
-  pIntf->resetCodeParserState();
+  intf.resetCodeParserState();
   XMLCodeGenerator *xmlGen = new XMLCodeGenerator(t);
-  pIntf->parseCode(*xmlGen,  // codeOutIntf
+  intf.parseCode(*xmlGen,    // codeOutIntf
                 0,           // scopeName
                 fileToString(fd->absFilePath(),Config_getBool(FILTER_SOURCE_FILES)),
                 langExt,     // lang
diff --git a/src/xmlscanner.h b/src/xmlscanner.h
deleted file mode 100644
index 0fe01a7..0000000
--- a/src/xmlscanner.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- *
- * Copyright (C) 1997-2015 by Dimitri van Heesch.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
- * for any purpose. It is provided "as is" without express or implied warranty.
- * See the GNU General Public License for more details.
- *
- * Documents produced by Doxygen are derivative works derived from the
- * input used in their production; they are not affected by this license.
- *
- */
-
-#ifndef XMLSCANNER_H
-#define XMLSCANNER_H
-
-#include "parserintf.h"
-#include "xmlcode.h"
-
-/** XML scanner. Only support syntax highlighting of code at the moment.
- */
-class XMLScanner : public ParserInterface
-{
-public:
-    XMLScanner() {}
-    virtual ~XMLScanner() {}
-    void startTranslationUnit(const char *) {}
-    void finishTranslationUnit() {}
-    void parseInput(const char *, const char *, const std::unique_ptr<Entry> &, bool , QStrList &) {}
-    bool needsPreprocessing(const QCString &) const { return FALSE; }
-
-    void parseCode(CodeOutputInterface &codeOutIntf,
-                   const char *scopeName,
-                   const QCString &input,
-                   SrcLangExt,
-                   bool isExampleBlock,
-                   const char *exampleName=0,
-                   FileDef *fileDef=0,
-                   int startLine=-1,
-                   int endLine=-1,
-                   bool inlineFragment=FALSE,
-                   const MemberDef *memberDef=0,
-                   bool showLineNumbers=TRUE,
-                   const Definition *searchCtx=0,
-                   bool collectXRefs=TRUE
-                  )
-    {
-      parseXmlCode(codeOutIntf,scopeName,input,isExampleBlock,exampleName,
-                    fileDef,startLine,endLine,inlineFragment,memberDef,
-                    showLineNumbers,searchCtx,collectXRefs);
-    }
-
-    void resetCodeParserState()
-    {
-      resetXmlCodeParserState();
-    }
-
-    void parsePrototype(const char *) {}
-
-private:
-};
-
-#endif
-- 
cgit v0.12


From a2f09d6aae1260822fecf2f0de9c1d3fbcc312e7 Mon Sep 17 00:00:00 2001
From: Roel Standaert <roel@abittechnical.com>
Date: Wed, 4 Dec 2019 00:32:28 +0100
Subject: Fix incorrect reference resolving of enum class values

When they share enum value names inside the same namespace.

This is a proposed fix for issue #7427: "Incorrect resolving of
references to enum class values with shared names inside the same
namespace"
---
 src/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util.cpp b/src/util.cpp
index 5868b62..570a09c 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4283,7 +4283,7 @@ bool getDefs(const QCString &scName,
           int ni=namespaceName.findRev("::");
           //printf("namespaceName=%s ni=%d\n",namespaceName.data(),ni);
           bool notInNS = tmd && ni==-1 && tmd->getNamespaceDef()==0 && (mScope.isEmpty() || mScope==tmd->name());
-          bool sameNS  = tmd && tmd->getNamespaceDef() && namespaceName.left(ni)==tmd->getNamespaceDef()->name();
+          bool sameNS  = tmd && tmd->getNamespaceDef() && namespaceName.left(ni)==tmd->getNamespaceDef()->name() && namespaceName.mid(ni+2)==tmd->name();
           //printf("notInNS=%d sameNS=%d\n",notInNS,sameNS);
           if (tmd && tmd->isStrong() && // C++11 enum class
               (notInNS || sameNS) &&
-- 
cgit v0.12


From 2401964449ca956ac90cecaf05f2befd5650eb97 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 5 Dec 2019 21:46:23 +0100
Subject: remove noexcept from parser interface for better portability

---
 src/parserintf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parserintf.h b/src/parserintf.h
index 4be8aee..ddf2624 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -162,7 +162,7 @@ class ParserManager
     struct ParserPair
     {
       ParserPair(std::unique_ptr<OutlineParserInterface> oli,
-                 std::unique_ptr<CodeParserInterface> cpi) noexcept
+                 std::unique_ptr<CodeParserInterface> cpi)
         : outlineParser(std::move(oli)), codeParser(std::move(cpi)) 
       {
       }
-- 
cgit v0.12


From 4a4fcdf7931efba208a57b658185de689f2ef7fb Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 5 Dec 2019 21:55:22 +0100
Subject: Added missing debug flags for scanner that were made reentrant

---
 src/code.l       | 3 +++
 src/commentcnv.l | 3 +++
 src/declinfo.l   | 2 +-
 src/scanner.l    | 3 +++
 src/sqlcode.l    | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/code.l b/src/code.l
index 2ebc09d..c0db62b 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3870,6 +3870,9 @@ struct CCodeParser::Private
 CCodeParser::CCodeParser() : p(std::make_unique<CCodeParser::Private>())
 {
   codeYYlex_init_extra(&p->state,&p->yyscanner);
+#ifdef FLEX_DEBUG
+  codeYYset_debug(1,p->yyscanner);
+#endif
 }
 
 CCodeParser::~CCodeParser()
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 940f1a5..13a21c3 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -1093,6 +1093,9 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
   yyscan_t yyscanner;
   commentcnvYY_state extra;
   commentcnvYYlex_init_extra(&extra,&yyscanner);
+#ifdef FLEX_DEBUG
+  commentcnvYYset_debug(1,yyscanner);
+#endif
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf("convertCppComments(%s)\n",fileName);
   yyextra->inBuf    = inBuf;
diff --git a/src/declinfo.l b/src/declinfo.l
index 37d0449..af94569 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -262,7 +262,7 @@ void parseFuncDecl(const QCString &decl,const SrcLangExt lang,QCString &cl,QCStr
   struct yyguts_t *yyg = (struct yyguts_t*)g_yyscanner;
 
 #ifdef FLEX_DEBUG
-  yyset_debug(1,g_yyscanner);
+  declinfoYYset_debug(1,g_yyscanner);
 #endif
 
   printlex(yy_flex_debug, TRUE, __FILE__, NULL);
diff --git a/src/scanner.l b/src/scanner.l
index a03b777..ed2c88c 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -7329,6 +7329,9 @@ struct COutlineParser::Private
 COutlineParser::COutlineParser() : p(std::make_unique<COutlineParser::Private>())
 {
   scannerYYlex_init_extra(&p->state,&p->yyscanner);
+#ifdef FLEX_DEBUG
+  scannerYYset_debug(1,p->yyscanner);
+#endif
 }
 
 COutlineParser::~COutlineParser()
diff --git a/src/sqlcode.l b/src/sqlcode.l
index 499a512..02c2c14 100644
--- a/src/sqlcode.l
+++ b/src/sqlcode.l
@@ -383,7 +383,7 @@ void parseSqlCode(
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
 
 #ifdef FLEX_DEBUG
-  yyset_debug(1,yyscanner);
+  sqlcodeYYset_debug(1,yyscanner);
 #endif
 
   printlex(yy_flex_debug, TRUE, __FILE__, fd ? fd->fileName().data(): NULL);
-- 
cgit v0.12


From 72eed17195c6650d503c191fb8e3ed54d3426df4 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Fri, 6 Dec 2019 12:46:49 +0100
Subject: Email address seen as code starter

Some email addresses give problems in the comment converter as they contain e.g. `@code`, so we try to detect Email addresses (analogous to doctokenizer.l) to prevent these false positives.
The given warning would ne like:
```
aa.h:13: warning: Reached end of file while still inside a (nested) comment. Nesting level 1 (probable line reference: 1)
```
---
 src/commentcnv.l | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/commentcnv.l b/src/commentcnv.l
index 13a21c3..66aada1 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -119,6 +119,8 @@ static void replaceComment(yyscan_t yyscanner,int offset);
 
 %}
 
+MAILADR   ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+
+
 %option noyywrap
 
 %x Scan
@@ -335,6 +337,10 @@ static void replaceComment(yyscan_t yyscanner,int offset);
                                        yyextra->commentStack.push(new CommentCtx(yyextra->lineNr));
 				     }
   				   }
+<CComment,ReadLine>{MAILADR}      |
+<CComment,ReadLine>"<"{MAILADR}">" { // Mail address, to prevent seeing e.g x@code-factory.org as start of a code block
+                                     copyToOutput(yyscanner,yytext,(int)yyleng);
+                                   }
 <CComment>"{@code"/[ \t\n]	   {
                                      copyToOutput(yyscanner,"@code",5); 
 				     yyextra->lastCommentContext = YY_START;
@@ -519,7 +525,7 @@ static void replaceComment(yyscan_t yyscanner,int offset);
                                      copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 
-<CComment>[^\\!@*\n{\"\/]*           { /* anything that is not a '*' or command */ 
+<CComment>[^ <\\!@*\n{\"\/]*       { /* anything that is not a '*' or command */ 
                                      copyToOutput(yyscanner,yytext,(int)yyleng); 
                                    }
 <CComment>"*"+[^*/\\@\n{\"]*       { /* stars without slashes */
-- 
cgit v0.12


From 6d4835dbe01a27923db8a1e4559b61da5065cb7a Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 8 Dec 2019 11:18:56 +0100
Subject: Changed std::unique_ptr<Entry> to std::shared_ptr<Entry> at avoid use
 after free issues

---
 src/code.l               |  4 ++
 src/doxygen.cpp          | 32 ++++++++--------
 src/entry.cpp            | 26 ++++++-------
 src/entry.h              | 12 +++---
 src/fortranscanner.h     |  2 +-
 src/fortranscanner.l     | 95 +++++++++++++++++++++++-------------------------
 src/markdown.cpp         |  4 +-
 src/markdown.h           |  2 +-
 src/parserintf.h         |  2 +-
 src/pyscanner.h          |  2 +-
 src/pyscanner.l          | 34 ++++++++---------
 src/scanner.h            |  2 +-
 src/scanner.l            | 91 +++++++++++++++++++++++-----------------------
 src/tagreader.cpp        | 32 ++++++++--------
 src/tagreader.h          |  2 +-
 src/tclscanner.h         |  2 +-
 src/tclscanner.l         |  2 +-
 src/vhdldocgen.cpp       |  8 ++--
 src/vhdljjparser.cpp     | 20 +++++-----
 src/vhdljjparser.h       |  4 +-
 vhdlparser/VhdlParser.cc |  2 +-
 vhdlparser/VhdlParser.h  |  3 +-
 vhdlparser/vhdlparser.jj |  5 +--
 23 files changed, 193 insertions(+), 195 deletions(-)

diff --git a/src/code.l b/src/code.l
index c0db62b..fb609e5 100644
--- a/src/code.l
+++ b/src/code.l
@@ -3877,6 +3877,10 @@ CCodeParser::CCodeParser() : p(std::make_unique<CCodeParser::Private>())
 
 CCodeParser::~CCodeParser()
 {
+  struct yyguts_t *yyg = (struct yyguts_t*)p->yyscanner;
+  yyextra->classScopeLengthStack.clear();
+  delete yyextra->codeClassSDict;
+  yyextra->codeClassSDict=0;
   codeYYlex_destroy(p->yyscanner);
 }
 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index f29b2f8..fd4341c 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -422,9 +422,9 @@ static STLInfo g_stlinfo[] =
   { 0,                      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }
 };
 
-static void addSTLMember(const std::unique_ptr<Entry> &root,const char *type,const char *name)
+static void addSTLMember(const std::shared_ptr<Entry> &root,const char *type,const char *name)
 {
-  std::unique_ptr<Entry> memEntry = std::make_unique<Entry>();
+  std::shared_ptr<Entry> memEntry = std::make_shared<Entry>();
   memEntry->name       = name;
   memEntry->type       = type;
   memEntry->protection = Public;
@@ -435,9 +435,9 @@ static void addSTLMember(const std::unique_ptr<Entry> &root,const char *type,con
   root->moveToSubEntryAndKeep(memEntry);
 }
 
-static void addSTLIterator(const std::unique_ptr<Entry> &classEntry,const char *name)
+static void addSTLIterator(const std::shared_ptr<Entry> &classEntry,const char *name)
 {
-  std::unique_ptr<Entry> iteratorClassEntry = std::make_unique<Entry>();
+  std::shared_ptr<Entry> iteratorClassEntry = std::make_shared<Entry>();
   iteratorClassEntry->fileName  = "[STL]";
   iteratorClassEntry->startLine = 1;
   iteratorClassEntry->name      = name;
@@ -448,14 +448,14 @@ static void addSTLIterator(const std::unique_ptr<Entry> &classEntry,const char *
   classEntry->moveToSubEntryAndKeep(iteratorClassEntry);
 }
 
-static void addSTLClass(const std::unique_ptr<Entry> &root,const STLInfo *info)
+static void addSTLClass(const std::shared_ptr<Entry> &root,const STLInfo *info)
 {
   //printf("Adding STL class %s\n",info->className);
   QCString fullName = info->className;
   fullName.prepend("std::");
 
   // add fake Entry for the class
-  std::unique_ptr<Entry> classEntry = std::make_unique<Entry>();
+  std::shared_ptr<Entry> classEntry = std::make_shared<Entry>();
   classEntry->fileName  = "[STL]";
   classEntry->startLine = 1;
   classEntry->name      = fullName;
@@ -490,9 +490,9 @@ static void addSTLClass(const std::unique_ptr<Entry> &root,const STLInfo *info)
     addSTLMember(classEntry,info->templType2,info->templName2);
   }
   if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || fullName=="std::shared_ptr" ||
-      fullName=="std::unique_ptr" || fullName=="std::weak_ptr")
+      fullName=="std::shared_ptr" || fullName=="std::weak_ptr")
   {
-    std::unique_ptr<Entry> memEntry = std::make_unique<Entry>();
+    std::shared_ptr<Entry> memEntry = std::make_shared<Entry>();
     memEntry->name       = "operator->";
     memEntry->args       = "()";
     memEntry->type       = "T*";
@@ -523,9 +523,9 @@ static void addSTLClass(const std::unique_ptr<Entry> &root,const STLInfo *info)
 }
 
 
-static void addSTLClasses(const std::unique_ptr<Entry> &root)
+static void addSTLClasses(const std::shared_ptr<Entry> &root)
 {
-  std::unique_ptr<Entry> namespaceEntry = std::make_unique<Entry>();
+  std::shared_ptr<Entry> namespaceEntry = std::make_shared<Entry>();
   namespaceEntry->fileName  = "[STL]";
   namespaceEntry->startLine = 1;
   namespaceEntry->name      = "std";
@@ -9201,7 +9201,7 @@ static void compareDoxyfile()
 
 //----------------------------------------------------------------------------
 
-static void readTagFile(const std::unique_ptr<Entry> &root,const char *tl)
+static void readTagFile(const std::shared_ptr<Entry> &root,const char *tl)
 {
   QCString tagLine = tl;
   QCString fileName;
@@ -9370,7 +9370,7 @@ static OutlineParserInterface &getParserForFile(const char *fn)
 }
 
 static void parseFile(OutlineParserInterface &parser,
-                      const std::unique_ptr<Entry> &root,FileDef *fd,const char *fn,
+                      const std::shared_ptr<Entry> &root,FileDef *fd,const char *fn,
                       bool sameTu,QStrList &filesInSameTu)
 {
 #if USE_LIBCLANG
@@ -9423,7 +9423,7 @@ static void parseFile(OutlineParserInterface &parser,
     fd->getAllIncludeFilesRecursively(filesInSameTu);
   }
 
-  std::unique_ptr<Entry> fileRoot = std::make_unique<Entry>();
+  std::shared_ptr<Entry> fileRoot = std::make_shared<Entry>();
   // use language parse to parse the file
   parser.parseInput(fileName,convBuf.data(),fileRoot,sameTu,filesInSameTu);
   fileRoot->setFileDef(fd);
@@ -9431,7 +9431,7 @@ static void parseFile(OutlineParserInterface &parser,
 }
 
 //! parse the list of input files
-static void parseFiles(const std::unique_ptr<Entry> &root)
+static void parseFiles(const std::shared_ptr<Entry> &root)
 {
 #if USE_LIBCLANG
   static bool clangAssistedParsing = Config_getBool(CLANG_ASSISTED_PARSING);
@@ -10076,7 +10076,7 @@ class NullOutlineParser : public OutlineParserInterface
   public:
     void startTranslationUnit(const char *) {}
     void finishTranslationUnit() {}
-    void parseInput(const char *, const char *,const std::unique_ptr<Entry> &, bool, QStrList &) {}
+    void parseInput(const char *, const char *,const std::shared_ptr<Entry> &, bool, QStrList &) {}
     bool needsPreprocessing(const QCString &) const { return FALSE; }
     void parsePrototype(const char *) {}
 };
@@ -11266,7 +11266,7 @@ void parseInput()
    *             Handle Tag Files                                           *
    **************************************************************************/
 
-  std::unique_ptr<Entry> root = std::make_unique<Entry>();
+  std::shared_ptr<Entry> root = std::make_shared<Entry>();
   msg("Reading and parsing tag files\n");
 
   QStrList &tagFileList = Config_getList(TAGFILES);
diff --git a/src/entry.cpp b/src/entry.cpp
index 066c4a0..cc8cd1f 100644
--- a/src/entry.cpp
+++ b/src/entry.cpp
@@ -116,7 +116,7 @@ Entry::Entry(const Entry &e)
   m_sublist.reserve(e.m_sublist.size());
   for (const auto &cur : e.m_sublist)
   {
-    m_sublist.push_back(std::make_unique<Entry>(*cur));
+    m_sublist.push_back(std::make_shared<Entry>(*cur));
   }
 }
 
@@ -136,11 +136,11 @@ void Entry::moveToSubEntryAndRefresh(Entry *&current)
   current = new Entry;
 }
 
-void Entry::moveToSubEntryAndRefresh(std::unique_ptr<Entry> &current)
+void Entry::moveToSubEntryAndRefresh(std::shared_ptr<Entry> &current)
 {
   current->m_parent=this;
-  m_sublist.push_back(std::move(current));
-  current = std::make_unique<Entry>();
+  m_sublist.push_back(current);
+  current = std::make_shared<Entry>();
 }
 
 void Entry::moveToSubEntryAndKeep(Entry *current)
@@ -149,10 +149,10 @@ void Entry::moveToSubEntryAndKeep(Entry *current)
   m_sublist.emplace_back(current);
 }
 
-void Entry::moveToSubEntryAndKeep(std::unique_ptr<Entry> &current)
+void Entry::moveToSubEntryAndKeep(std::shared_ptr<Entry> &current)
 {
   current->m_parent=this;
-  m_sublist.push_back(std::move(current));
+  m_sublist.push_back(current);
 }
 
 void Entry::copyToSubEntry(Entry *current)
@@ -162,20 +162,20 @@ void Entry::copyToSubEntry(Entry *current)
   m_sublist.emplace_back(copy);
 }
 
-void Entry::copyToSubEntry(const std::unique_ptr<Entry> &current)
+void Entry::copyToSubEntry(const std::shared_ptr<Entry> &current)
 {
-  std::unique_ptr<Entry> copy = std::make_unique<Entry>(*current);
+  std::shared_ptr<Entry> copy = std::make_shared<Entry>(*current);
   copy->m_parent=this;
-  m_sublist.push_back(std::move(copy));
+  m_sublist.push_back(copy);
 }
 
-void Entry::moveFromSubEntry(const Entry *child,std::unique_ptr<Entry> &moveTo)
+void Entry::moveFromSubEntry(const Entry *child,std::shared_ptr<Entry> &moveTo)
 {
   auto it = std::find_if(m_sublist.begin(),m_sublist.end(),
-      [child](const std::unique_ptr<Entry>&elem) { return elem.get()==child; });
+      [child](const std::shared_ptr<Entry>&elem) { return elem.get()==child; });
   if (it!=m_sublist.end())
   {
-    moveTo = std::move(*it);
+    moveTo = *it;
     m_sublist.erase(it);
   }
   else
@@ -187,7 +187,7 @@ void Entry::moveFromSubEntry(const Entry *child,std::unique_ptr<Entry> &moveTo)
 void Entry::removeSubEntry(const Entry *e)
 {
   auto it = std::find_if(m_sublist.begin(),m_sublist.end(),
-      [e](const std::unique_ptr<Entry>&elem) { return elem.get()==e; });
+      [e](const std::shared_ptr<Entry>&elem) { return elem.get()==e; });
   if (it!=m_sublist.end())
   {
     m_sublist.erase(it);
diff --git a/src/entry.h b/src/entry.h
index 9d4ae9d..0391075 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -202,26 +202,26 @@ class Entry
     /*! Returns the list of children for this Entry
      *  @see addSubEntry() and removeSubEntry()
      */
-    const std::vector< std::unique_ptr<Entry> > &children() const { return m_sublist; }
+    const std::vector< std::shared_ptr<Entry> > &children() const { return m_sublist; }
 
     /*! @name add entry as a child and pass ownership.
      *  @note This makes the entry passed invalid! (TODO: tclscanner.l still has use after move!)
      *  @{
      */
     void moveToSubEntryAndKeep(Entry* e);
-    void moveToSubEntryAndKeep(std::unique_ptr<Entry> &e);
+    void moveToSubEntryAndKeep(std::shared_ptr<Entry> &e);
     /*! @} */
 
     /*! @name add entry as a child, pass ownership and reinitialize entry */
     void moveToSubEntryAndRefresh(Entry* &e);
-    void moveToSubEntryAndRefresh(std::unique_ptr<Entry> &e);
+    void moveToSubEntryAndRefresh(std::shared_ptr<Entry> &e);
 
     /*! take \a child of of to list of children and move it into \a moveTo */
-    void moveFromSubEntry(const Entry *child,std::unique_ptr<Entry> &moveTo);
+    void moveFromSubEntry(const Entry *child,std::shared_ptr<Entry> &moveTo);
 
     /*! make a copy of \a e and add it as a child to this entry */
     void copyToSubEntry (Entry* e);
-    void copyToSubEntry (const std::unique_ptr<Entry> &e);
+    void copyToSubEntry (const std::shared_ptr<Entry> &e);
 
     /*! Removes entry \a e from the list of children.
      *  The entry will be deleted if found.
@@ -332,7 +332,7 @@ class Entry
 
   private:
     Entry         *m_parent;    //!< parent node in the tree
-    std::vector< std::unique_ptr<Entry> > m_sublist;
+    std::vector< std::shared_ptr<Entry> > m_sublist;
     Entry &operator=(const Entry &);
     FileDef       *m_fileDef;
 };
diff --git a/src/fortranscanner.h b/src/fortranscanner.h
index 7038882..7a13f47 100644
--- a/src/fortranscanner.h
+++ b/src/fortranscanner.h
@@ -32,7 +32,7 @@ class FortranOutlineParser : public OutlineParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char *fileName,
                     const char *fileBuf,
-                    const std::unique_ptr<Entry> &root,
+                    const std::shared_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 9178f80..08c7a6a 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -145,7 +145,7 @@ static QCString         inputStringSemi; ///< Input string after command separat
 static unsigned int     inputPositionPrepass;
 static int              lineCountPrepass = 0;
 
-static QList<Entry>  subrCurrent;
+static std::vector< std::shared_ptr<Entry> >  subrCurrent;
 
 struct CommentInPrepass {
   int column;
@@ -162,14 +162,15 @@ static QFile            inputFile;
 static QCString		yyFileName;
 static int		yyLineNr     = 1 ;
 static int		yyColNr     = 0 ;
-static Entry*		current_root = 0 ;
-static Entry*		global_root  = 0 ;
-static Entry*		file_root    = 0 ;
-static Entry*		last_entry   = 0 ;
-static Entry*		last_enum    = 0 ;
-static std::unique_ptr<Entry> current;
+static Entry           *current_root = 0;
+static Entry           *global_scope = 0;
+static std::shared_ptr<Entry> global_root;
+static std::shared_ptr<Entry> file_root;
+static std::shared_ptr<Entry> last_entry;
+static std::shared_ptr<Entry> last_enum;
+static std::shared_ptr<Entry> current;
 static ScanVar          v_type       = V_IGNORE; // type of parsed variable
-static std::vector<Entry*>  moduleProcedures; // list of all interfaces which contain unresolved 
+static std::vector<std::shared_ptr<Entry> >  moduleProcedures; // list of all interfaces which contain unresolved 
                                           // module procedures
 static QCString         docBlock;
 static bool             docBlockInBody = FALSE;
@@ -202,7 +203,6 @@ static SymbolModifiers currentModifiers;
 //! Holds program scope->symbol name->symbol modifiers.
 static QMap<Entry*,QMap<QCString,SymbolModifiers> > modifiers;
 
-static Entry           *global_scope = 0;
 static int              anonCount    = 0 ;
 //-----------------------------------------------------------------------------
 
@@ -491,13 +491,13 @@ SCOPENAME ({ID}{BS}"::"{BS})*
                                           QCString name = QCString(yytext).stripWhiteSpace();
                                           name = name.right(name.length() - 9).stripWhiteSpace().lower();
                                           addInterface(name, ifType);
-                                          startScope(last_entry);
+                                          startScope(last_entry.get());
                                         }
 }
 
 <InterfaceBody>^{BS}end{BS}interface({BS_}{ID})? {
                                           // end scope only if GENERIC interface
-                                          if (ifType == IF_GENERIC)last_entry->parent()->endBodyLine = yyLineNr - 1;
+                                          if (ifType == IF_GENERIC) last_entry->parent()->endBodyLine = yyLineNr - 1;
                                           if (ifType == IF_GENERIC && !endScope(current_root))
                                             yyterminate();
 
@@ -510,12 +510,12 @@ SCOPENAME ({ID}{BS}"::"{BS})*
 <ModuleProcedure>{ID}                   { if (ifType == IF_ABSTRACT || ifType == IF_SPECIFIC)
                                           {
                                             addInterface(yytext, ifType);
-                                            startScope(last_entry);
+                                            startScope(last_entry.get());
                                           }
 
                                           current->section = Entry::FUNCTION_SEC ;
                                           current->name = yytext; 
-                                          moduleProcedures.push_back(current.get());
+                                          moduleProcedures.push_back(current);
                                           addCurrentEntry(true);
                                         }
 <ModuleProcedure>"\n"                   { yyColNr -= 1;
@@ -639,7 +639,7 @@ private                                 {
                                           current->startLine  = yyLineNr;
 
                                           /* if type is part of a module, mod name is necessary for output */
-                                          if ((current_root) && 
+                                          if (current_root && 
                                               (current_root->section == Entry::CLASS_SEC
                                                || current_root->section == Entry::NAMESPACE_SEC))
                                           {
@@ -647,7 +647,7 @@ private                                 {
                                           }
 
                                           addCurrentEntry(true);
-                                          startScope(last_entry); 
+                                          startScope(last_entry.get()); 
                                           BEGIN(TypedefBody);
                                         }
 }
@@ -727,7 +727,7 @@ private                                 {
 
 					   if (!endScope(current_root))
 					     yyterminate();
-                                           subrCurrent.remove(0u);
+                                           subrCurrent.pop_back();
 					   yy_pop_state() ;
 				        }
 <BlockData>{
@@ -736,7 +736,7 @@ private                                 {
 }
 <Start,ModuleBody,TypedefBody,SubprogBody,Enum>{
 ^{BS}{TYPE_SPEC}/{SEPARATE}             {
-                                          last_enum = 0;
+                                          last_enum.reset();
                                           if (YY_START == Enum)
                                           {
 					    argType = "@"; // enum marker
@@ -867,7 +867,7 @@ private                                 {
                                             {
                                               current_root->copyToSubEntry(current);
                                               // add to the scope surrounding the enum (copy!)
-                                              last_enum = current.get();
+                                              last_enum = current;
                                               current_root->parent()->moveToSubEntryAndRefresh(current);
                                               initEntry();
                                             }
@@ -1066,7 +1066,7 @@ private                                 {
                                           }
 
                                           addCurrentEntry(true);
-                                          startScope(last_entry); 
+                                          startScope(last_entry.get()); 
 					  BEGIN( Enum ) ;
                                         }
 <Enum>"end"{BS}"enum"                   {
@@ -1083,7 +1083,7 @@ private                                 {
                                          if (ifType == IF_ABSTRACT || ifType == IF_SPECIFIC)
                                          {
                                            addInterface("$interface$", ifType);
-                                           startScope(last_entry);
+                                           startScope(last_entry.get());
                                          }
 
                                          // TYPE_SPEC is for old function style function result
@@ -1109,7 +1109,7 @@ private                                 {
                                          if (ifType == IF_ABSTRACT || ifType == IF_SPECIFIC)
                                          {
                                            addInterface("$interface$", ifType);
-                                           startScope(last_entry);
+                                           startScope(last_entry.get());
                                          }
 
                                          result = QCString(yytext).stripWhiteSpace();
@@ -1136,7 +1136,7 @@ private                                 {
 				         current->args += ")";
 				         current->args = removeRedundantWhiteSpace(current->args);
                                          addCurrentEntry(true);
-					 startScope(last_entry);
+					 startScope(last_entry.get());
 					 BEGIN(SubprogBody);
 				       }
 <Parameterlist>{COMMA}|{BS}            { current->args += yytext;
@@ -1162,7 +1162,7 @@ private                                 {
 				           newLine();
 					   //printf("3=========> without parameterlist \n");
                                            addCurrentEntry(true);
-					   startScope(last_entry);
+					   startScope(last_entry.get());
 					   BEGIN(SubprogBody);				           
 }
 <SubprogBody>result{BS}\({BS}{ID}      {  
@@ -1214,20 +1214,19 @@ private                                 {
 					  unput(*yytext);                                        
 					  if (v_type == V_VARIABLE) 
 					  {
-                                            std::unique_ptr<Entry> tmp_entry;
-                                            current.swap(tmp_entry);
+                                            std::shared_ptr<Entry> tmp_entry = current;
                                             // temporarily switch to the previous entry
                                             if (last_enum)
                                             {
-                                              current.reset(last_enum);
+                                              current = last_enum;
                                             }
                                             else
                                             {
-					      current.reset(last_entry);
+					      current = last_entry;
                                             }
   					    handleCommentBlock(docBlock,TRUE);
                                             // switch back
- 					    tmp_entry.swap(current);
+ 					    current = tmp_entry;
                                           }
 					  else if (v_type == V_PARAMETER) 
 					  {
@@ -1779,7 +1778,7 @@ static void popBuffer() {
 }
 
 /** used to copy entry to an interface module procedure */
-static void copyEntry(Entry *dest, const std::unique_ptr<Entry> &src) 
+static void copyEntry(std::shared_ptr<Entry> dest, const std::shared_ptr<Entry> &src) 
 {
    dest->type        = src->type;
    dest->fileName    = src->fileName;
@@ -2306,7 +2305,7 @@ static int yyread(char *buf,int max_size)
 
 static void initParser()
 {
-  last_entry = 0;
+  last_entry.reset();
 }
 
 static void initEntry()
@@ -2333,7 +2332,7 @@ static void addCurrentEntry(bool case_insens)
 {
   if (case_insens) current->name = current->name.lower();
   //printf("===Adding entry %s to %s\n", current->name.data(), current_root->name.data());
-  last_entry = current.get();
+  last_entry = current;
   current_root->moveToSubEntryAndRefresh(current);
   initEntry();
 }
@@ -2367,14 +2366,14 @@ static void addModule(const char *name, bool isModule)
   current->startLine  = yyLineNr;
   current->protection = Public ;
   addCurrentEntry(true);
-  startScope(last_entry);
+  startScope(last_entry.get());
 }
 
 
 static void addSubprogram(const char *text)
 {
   DBG_CTX((stderr,"1=========> got subprog, type: %s\n",text)); 
-  subrCurrent.prepend(current.get());
+  subrCurrent.push_back(current);
   current->section = Entry::FUNCTION_SEC ;
   QCString subtype = text; subtype=subtype.lower().stripWhiteSpace();
   functionLine = (subtype.find("function") != -1);
@@ -2487,7 +2486,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   QCString processedDoc = preprocessCommentBlock(doc,yyFileName,lineNr);
   while (parseCommentBlock(
 	g_thisParser,
-	docBlockInBody ? subrCurrent.getFirst() : current.get(),
+	docBlockInBody ? subrCurrent.back().get() : current.get(),
 	processedDoc, // text
 	yyFileName, // file
 	lineNr,
@@ -2515,9 +2514,8 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
   QCString loc_doc;
   loc_doc = doc.stripWhiteSpace();
 
-  std::unique_ptr<Entry> tmp_entry;
-  current.swap(tmp_entry);
-  current.reset(subrCurrent.getFirst()); // temporarily switch to the entry of the subroutine / function
+  std::shared_ptr<Entry> tmp_entry = current;
+  current = subrCurrent.back(); // temporarily switch to the entry of the subroutine / function
 
   // Still in the specification section so no inbodyDocs yet, but parameter documentation
   current->inbodyDocs = "";
@@ -2566,7 +2564,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
       loc_doc.stripWhiteSpace();
       if (loc_doc.isEmpty() || (loc_doc.lower() == argName.lower()))
       {
-        tmp_entry.swap(current);
+        current = tmp_entry;
         return;
       }
       handleCommentBlock(QCString("\n\n@param ") + directionParam[SymbolModifiers::OUT] + " " + 
@@ -2610,7 +2608,7 @@ static void subrHandleCommentBlock(const QCString &doc,bool brief)
   }
 
   // reset current back to the part inside the routine
-  tmp_entry.swap(current);
+  current = tmp_entry;
 }
 //----------------------------------------------------------------------------
 /// Handle result description as defined after the declaration of the parameter
@@ -2619,9 +2617,8 @@ static void subrHandleCommentBlockResult(const QCString &doc,bool brief)
   QCString loc_doc;
   loc_doc = doc.stripWhiteSpace();
 
-  std::unique_ptr<Entry> tmp_entry;
-  current.swap(tmp_entry);
-  current.reset(subrCurrent.getFirst()); // temporarily switch to the entry of the subroutine / function
+  std::shared_ptr<Entry> tmp_entry = current;
+  current = subrCurrent.back(); // temporarily switch to the entry of the subroutine / function
 
   // Still in the specification section so no inbodyDocs yet, but parameter documentation
   current->inbodyDocs = "";
@@ -2640,7 +2637,7 @@ static void subrHandleCommentBlockResult(const QCString &doc,bool brief)
   }
 
   // reset current back to the part inside the routine
-  tmp_entry.swap(current);
+  current = tmp_entry;
 }
 
 //----------------------------------------------------------------------------
@@ -2661,7 +2658,7 @@ level--;
 
 
 static void parseMain(const char *fileName,const char *fileBuf,
-                      const std::unique_ptr<Entry> &rt, FortranFormat format)
+                      const std::shared_ptr<Entry> &rt, FortranFormat format)
 {
   char *tmpBuf = NULL;
   initParser();
@@ -2677,7 +2674,7 @@ static void parseMain(const char *fileName,const char *fileBuf,
   gstat         = FALSE;
   virt          = Normal;
   current_root  = rt.get();
-  global_root   = rt.get();
+  global_root   = rt;
   inputFile.setName(fileName);
   if (inputFile.open(IO_ReadOnly))
   {
@@ -2719,11 +2716,11 @@ static void parseMain(const char *fileName,const char *fileBuf,
     Doxygen::docGroup.enterFile(yyFileName,yyLineNr);
 
     // add entry for the file
-    current          = std::make_unique<Entry>();
+    current          = std::make_shared<Entry>();
     current->lang    = SrcLangExt_Fortran; 
     current->name    = yyFileName;
     current->section = Entry::SOURCE_SEC;
-    file_root        = current.get();
+    file_root        = current;
     current_root->moveToSubEntryAndRefresh(current);
     current->lang    = SrcLangExt_Fortran; 
 
@@ -2759,7 +2756,7 @@ static void parseMain(const char *fileName,const char *fileBuf,
 
 void FortranOutlineParser::parseInput(const char *fileName,
                                         const char *fileBuf,
-                                        const std::unique_ptr<Entry> &root,
+                                        const std::shared_ptr<Entry> &root,
                                         bool /*sameTranslationUnit*/,
                                         QStrList & /*filesInSameTranslationUnit*/)
 {
@@ -2799,7 +2796,7 @@ static void scanner_abort()
 
   for (const auto &ce : global_root->children())
   {
-     if (ce.get() == file_root) start=TRUE;
+     if (ce == file_root) start=TRUE;
      if (start) ce->reset(); 
   } 
 
diff --git a/src/markdown.cpp b/src/markdown.cpp
index 8511da3..42ea2ff 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
@@ -2578,11 +2578,11 @@ QCString markdownFileNameToId(const QCString &fileName)
 
 void MarkdownOutlineParser::parseInput(const char *fileName, 
                 const char *fileBuf, 
-                const std::unique_ptr<Entry> &root,
+                const std::shared_ptr<Entry> &root,
                 bool /*sameTranslationUnit*/,
                 QStrList & /*filesInSameTranslationUnit*/)
 {
-  std::unique_ptr<Entry> current = std::make_unique<Entry>();
+  std::shared_ptr<Entry> current = std::make_shared<Entry>();
   current->lang = SrcLangExt_Markdown;
   current->fileName = fileName;
   current->docFile  = fileName;
diff --git a/src/markdown.h b/src/markdown.h
index 4ce2f62..3ffd155 100644
--- a/src/markdown.h
+++ b/src/markdown.h
@@ -33,7 +33,7 @@ class MarkdownOutlineParser : public OutlineParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char *fileName, 
                     const char *fileBuf, 
-                    const std::unique_ptr<Entry> &root,
+                    const std::shared_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &) const { return FALSE; }
diff --git a/src/parserintf.h b/src/parserintf.h
index ddf2624..5095a1e 100644
--- a/src/parserintf.h
+++ b/src/parserintf.h
@@ -70,7 +70,7 @@ class OutlineParserInterface
      */
     virtual void parseInput(const char *fileName,
                             const char *fileBuf,
-                            const std::unique_ptr<Entry> &root,
+                            const std::shared_ptr<Entry> &root,
                             bool sameTranslationUnit,
                             QStrList &filesInSameTranslationUnit) = 0;
 
diff --git a/src/pyscanner.h b/src/pyscanner.h
index 73e1679..6cfadf6 100644
--- a/src/pyscanner.h
+++ b/src/pyscanner.h
@@ -38,7 +38,7 @@ class PythonOutlineParser : public OutlineParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char * fileName, 
                     const char *fileBuf, 
-                    const std::unique_ptr<Entry> &root,
+                    const std::shared_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
diff --git a/src/pyscanner.l b/src/pyscanner.l
index 963b4e8..efdc943 100644
--- a/src/pyscanner.l
+++ b/src/pyscanner.l
@@ -72,10 +72,10 @@ static QFile            inputFile;
 
 static Protection	protection;
 
-static Entry*		current_root = 0 ;
-static std::unique_ptr<Entry> current;
-static Entry*		previous     = 0 ;
-static Entry*		bodyEntry    = 0 ;
+static std::shared_ptr<Entry> current_root;
+static std::shared_ptr<Entry> current;
+static std::shared_ptr<Entry> previous;
+static std::shared_ptr<Entry> bodyEntry;
 static int		yyLineNr     = 1 ;
 static QCString		yyFileName;
 static MethodTypes 	mtype;
@@ -151,7 +151,7 @@ static void initEntry()
 
 static void newEntry()
 {
-  previous = current.get();
+  previous = current;
   current_root->moveToSubEntryAndRefresh(current);
   initEntry();
 }
@@ -292,7 +292,7 @@ static void handleCommentBlock(const QCString &doc,bool brief)
   QCString processedDoc = preprocessCommentBlock(doc,yyFileName,lineNr);
   while (parseCommentBlock(
 	g_thisParser,
-	(docBlockInBody && previous) ? previous : current.get(),
+	(docBlockInBody && previous) ? previous.get() : current.get(),
 	processedDoc, // text
 	yyFileName,   // file
 	lineNr,
@@ -913,7 +913,7 @@ STARTDOCSYMS      "##"
                             }
     {B}":"{B}		    { // function without arguments
 			      g_specialBlock = TRUE; // expecting a docstring
-			      bodyEntry = current.get();
+			      bodyEntry = current;
                               BEGIN(FunctionBody);
 			    }
 
@@ -1300,7 +1300,7 @@ STARTDOCSYMS      "##"
       				 current->program+=yytext;
 			         //current->startLine = yyLineNr;
 				 g_curIndent=computeIndent(yytext);
-				 bodyEntry = current.get();
+				 bodyEntry = current;
 				 DBG_CTX((stderr,"setting indent %d\n",g_curIndent));
 				 //printf("current->program=[%s]\n",current->program.data());
 				 //g_hideClassDocs = TRUE;
@@ -1706,12 +1706,12 @@ STARTDOCSYMS      "##"
 
 //----------------------------------------------------------------------------
 
-static void parseCompounds(Entry *rt)
+static void parseCompounds(std::shared_ptr<Entry> rt)
 {
   //printf("parseCompounds(%s)\n",rt->name.data());
   for (int i=0; i<rt->children().size(); ++i)
   {
-    Entry *ce = rt->children()[i].get();
+    std::shared_ptr<Entry> ce = rt->children()[i];
     if (!ce->program.isEmpty())
     {
       //printf("-- %s ---------\n%s\n---------------\n",
@@ -1727,14 +1727,14 @@ static void parseCompounds(Entry *rt)
       }
       else if (ce->parent())
       {
-        current_root = ce->parent();
+        current_root = rt;
 	//printf("Searching for member variables in %s parent=%s\n",
 	//    ce->name.data(),ce->parent->name.data());
 	BEGIN( SearchMemVars );
       }
       yyFileName = ce->fileName;
       yyLineNr   = ce->bodyLine ;
-      current = std::make_unique<Entry>();
+      current = std::make_shared<Entry>();
       initEntry();
 
       QCString name = ce->name;
@@ -1754,7 +1754,7 @@ static void parseCompounds(Entry *rt)
 //----------------------------------------------------------------------------
 
 
-static void parseMain(const char *fileName,const char *fileBuf,const std::unique_ptr<Entry> &rt)
+static void parseMain(const char *fileName,const char *fileBuf,const std::shared_ptr<Entry> &rt)
 {
   initParser();
 
@@ -1765,7 +1765,7 @@ static void parseMain(const char *fileName,const char *fileBuf,const std::unique
   mtype         = Method;
   gstat         = FALSE;
   virt          = Normal;
-  current_root  = rt.get();
+  current_root  = rt;
   g_specialBlock = FALSE;
 
 
@@ -1789,7 +1789,7 @@ static void parseMain(const char *fileName,const char *fileBuf,const std::unique
       g_moduleScope+=baseName;
     }
 
-    current            = std::make_unique<Entry>();
+    current            = std::make_shared<Entry>();
     initEntry();
     current->name      = g_moduleScope;
     current->section   = Entry::NAMESPACE_SEC;
@@ -1798,7 +1798,7 @@ static void parseMain(const char *fileName,const char *fileBuf,const std::unique
     current->startLine = yyLineNr;
     current->bodyLine  = yyLineNr;
 
-    current_root  = current.get();
+    current_root  = current;
 
     rt->moveToSubEntryAndRefresh(current);
 
@@ -1888,7 +1888,7 @@ void pyscanFreeScanner()
 
 void PythonOutlineParser::parseInput(const char *fileName,
                                        const char *fileBuf,
-                                       const std::unique_ptr<Entry> &root,
+                                       const std::shared_ptr<Entry> &root,
                                        bool /*sameTranslationUnit*/,
                                        QStrList & /*filesInSameTranslationUnit*/)
 {
diff --git a/src/scanner.h b/src/scanner.h
index 1c7a50c..70df660 100644
--- a/src/scanner.h
+++ b/src/scanner.h
@@ -35,7 +35,7 @@ class COutlineParser : public OutlineParserInterface
     void finishTranslationUnit();
     void parseInput(const char *fileName,
                     const char *fileBuf,
-                    const std::unique_ptr<Entry> &root,
+                    const std::shared_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
diff --git a/src/scanner.l b/src/scanner.l
index ed2c88c..912132c 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -90,12 +90,12 @@ struct scannerYY_state
   int              curlyCount   = 0 ;
   int              squareCount  = 0 ;
   int              padCount     = 0 ;
-  std::unique_ptr<Entry> current;
-  Entry*           current_root = 0 ;
-  Entry*           previous     = 0 ;
-  std::unique_ptr<Entry> tempEntry;
-  Entry*           firstTypedefEntry = 0 ;
-  Entry*           memspecEntry = 0 ;
+  std::shared_ptr<Entry> current;
+  std::shared_ptr<Entry> current_root;
+  std::shared_ptr<Entry> previous;
+  std::shared_ptr<Entry> tempEntry;
+  std::shared_ptr<Entry> firstTypedefEntry;
+  std::shared_ptr<Entry> memspecEntry;
   int              yyLineNr     = 1 ;
   int              yyBegLineNr  = 1 ;
   int              yyColNr      = 1 ;
@@ -188,7 +188,7 @@ struct scannerYY_state
 
   int              fencedSize = 0;
   bool             nestedComment = 0;
-  std::vector< std::pair<Entry*,std::unique_ptr<Entry> > > outerScopeEntries;
+  std::vector< std::pair<Entry*,std::shared_ptr<Entry> > > outerScopeEntries;
 };
 
 static const char *stateToString(int state);
@@ -1001,7 +1001,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  lineCount(yyscanner);
   					}
 <PackageName>";"			{
-                                          Entry *tmp = yyextra->current.get();
+                                          std::shared_ptr<Entry> tmp = yyextra->current;
 					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
                                           yyextra->current_root = tmp;
 					  initEntry(yyscanner);
@@ -1684,7 +1684,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    //printf("import name = %s -> %s\n",yytext,yyextra->current->name.data());
 					    yyextra->current->section=Entry::USINGDECL_SEC;
 					  }
-                                          yyextra->previous = yyextra->current.get();
+                                          yyextra->previous = yyextra->current;
 					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
 					  initEntry(yyscanner);
 					  BEGIN(Using);
@@ -1702,7 +1702,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           yyextra->current->fileName = yyextra->yyFileName; 
   					  yyextra->current->section=Entry::USINGDECL_SEC;
                                           yyextra->current->startLine = yyextra->yyLineNr;
-                                          yyextra->previous = yyextra->current.get();
+                                          yyextra->previous = yyextra->current;
 					  yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
 					  initEntry(yyscanner);
 					  if (yyextra->insideCS) /* Hack: in C# a using declaration and 
@@ -2482,7 +2482,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                           if (yyextra->previous && yyextra->previous->section==Entry::GROUPDOC_SEC)
 					  {
 					    // link open command to the group defined in the yyextra->previous entry
-					    Doxygen::docGroup.open(yyextra->previous,yyextra->yyFileName,yyextra->yyLineNr);
+					    Doxygen::docGroup.open(yyextra->previous.get(),yyextra->yyFileName,yyextra->yyLineNr);
 					  }
 					  else
 					  {
@@ -3490,7 +3490,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      // add to the scope surrounding the enum (copy!)
                                               // we cannot during it directly as that would invalidate the iterator in parseCompounds.
                                               //printf("*** adding outer scope entry for %s\n",yyextra->current->name.data());
-                                              yyextra->outerScopeEntries.emplace_back(yyextra->current_root->parent(), std::make_unique<Entry>(*yyextra->current));
+                                              yyextra->outerScopeEntries.emplace_back(yyextra->current_root->parent(), std::make_shared<Entry>(*yyextra->current));
 					    }
 					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
 					    initEntry(yyscanner);
@@ -3587,7 +3587,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  else
 					  {
 					    yyextra->current->endBodyLine = yyextra->yyLineNr;
-                                            Entry * original_root = yyextra->current_root; // save root this namespace is in
+                                            std::shared_ptr<Entry> original_root = yyextra->current_root; // save root this namespace is in
                                             if (yyextra->current->section == Entry::NAMESPACE_SEC && yyextra->current->type == "namespace")
                                             {
                                               int split_point;
@@ -3607,16 +3607,17 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                               yyextra->current->briefFile = "";
                                               while ((split_point = yyextra->current->name.find("::")) != -1)
                                               {
-                                                std::unique_ptr<Entry> new_current = std::make_unique<Entry>(*yyextra->current);
+                                                std::shared_ptr<Entry> new_current = std::make_shared<Entry>(*yyextra->current);
                                                 yyextra->current->program = "";
                                                 new_current->name  = yyextra->current->name.mid(split_point + 2);
                                                 yyextra->current->name  = yyextra->current->name.left(split_point);
                                                 if (!yyextra->current_root->name.isEmpty()) yyextra->current->name.prepend(yyextra->current_root->name+"::");
 
-                                                Entry *tmp = yyextra->current.get();
+                                                std::shared_ptr<Entry> tmp = yyextra->current;
                                                 yyextra->current_root->moveToSubEntryAndKeep(yyextra->current);
                                                 yyextra->current_root = tmp;
-                                                yyextra->current.swap(new_current);
+
+                                                yyextra->current = new_current;
                                               }
                                               // restore documentation values
                                               yyextra->current->doc       = doc;
@@ -3658,7 +3659,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					      }
 					      else
 					      {
-					        yyextra->memspecEntry = yyextra->current.get();
+					        yyextra->memspecEntry = yyextra->current;
 					        yyextra->current_root->copyToSubEntry( yyextra->current ) ;
 						if (yyextra->current->section==Entry::NAMESPACE_SEC ||
 						    (yyextra->current->spec==Entry::Interface) ||
@@ -3669,7 +3670,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                                   yyextra->current->reset();
                                                   yyextra->current_root = original_root; // restore scope from before namespace descent
 						  initEntry(yyscanner);
-						  yyextra->memspecEntry = 0;
+						  yyextra->memspecEntry.reset();
 						  BEGIN( FindMembers ) ;
 						}
 						else
@@ -3724,7 +3725,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  //printf("Adding compound %s %s %s\n",yyextra->current->type.data(),yyextra->current->name.data(),yyextra->current->args.data());
 					  if (!yyextra->firstTypedefEntry)
 					  {
-					    yyextra->firstTypedefEntry = yyextra->current.get();
+					    yyextra->firstTypedefEntry = yyextra->current;
 					  }
 					  yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
 					  initEntry(yyscanner);
@@ -3740,7 +3741,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  // add compound definition to the tree
   					  yyextra->current->args = yyextra->current->args.simplifyWhiteSpace();
   					  yyextra->current->type = yyextra->current->type.simplifyWhiteSpace();
-					  yyextra->memspecEntry = yyextra->current.get();
+					  yyextra->memspecEntry = yyextra->current;
 					  yyextra->current_root->moveToSubEntryAndRefresh( yyextra->current ) ;
 					  initEntry(yyscanner);
 					  unput(';');
@@ -3794,7 +3795,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    // anonymous compound. If so we insert a 
 					    // special 'anonymous' variable.
 					    //Entry *p=yyextra->current_root;
-					    const Entry *p=yyextra->current.get();
+                                            const Entry *p=yyextra->current.get();
 					    while (p)
 					    {
 					      // only look for class scopes, not namespace scopes
@@ -3812,7 +3813,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 						}
 					      }
 					      //p=p->parent;
-					      if (p==yyextra->current.get()) p=yyextra->current_root; else p=p->parent();
+					      if (p==yyextra->current.get()) p=yyextra->current_root.get(); else p=p->parent();
 					    }
 					  }
 					  //printf("yyextra->msName=%s yyextra->current->name=%s\n",yyextra->msName.data(),yyextra->current->name.data());
@@ -3833,7 +3834,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    }
 					    else // case 2: create a typedef field
 					    {
-                                              std::unique_ptr<Entry> varEntry=std::make_unique<Entry>();
+                                              std::shared_ptr<Entry> varEntry=std::make_shared<Entry>();
 					      varEntry->lang = yyextra->language;
 					      varEntry->protection = yyextra->current->protection ;
 					      varEntry->mtype = yyextra->current->mtype;
@@ -3893,8 +3894,8 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    yyextra->msName.resize(0);
 					    yyextra->msArgs.resize(0);
 					    yyextra->isTypedef=FALSE;
-					    yyextra->firstTypedefEntry=0;
-					    yyextra->memspecEntry=0;
+					    yyextra->firstTypedefEntry.reset();
+					    yyextra->memspecEntry.reset();
 					    yyextra->current->reset();
 					    initEntry(yyscanner);
 					    BEGIN( FindMembers );
@@ -4825,7 +4826,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      findAndRemoveWord(yyextra->current->type,"function");
 					    }
-					    yyextra->previous = yyextra->current.get();
+					    yyextra->previous = yyextra->current;
 					    yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
 					    initEntry(yyscanner);
 					    // Objective C 2.0: Required/Optional section
@@ -4919,9 +4920,9 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  {
 					    yyextra->current->endBodyLine=yyextra->yyLineNr;
                                             // take yyextra->previous out of yyextra->current_root and move it into yyextra->current
-					    yyextra->current.swap(yyextra->tempEntry); // remember yyextra->current
-                                            yyextra->current_root->moveFromSubEntry(yyextra->previous,yyextra->current);
-					    yyextra->previous = 0;
+					    yyextra->tempEntry = yyextra->current; // remember yyextra->current
+                                            yyextra->current_root->moveFromSubEntry(yyextra->previous.get(),yyextra->current);
+					    yyextra->previous.reset();
 
 					    yyextra->docBlockContext   = SkipCurlyEndDoc;
 					    yyextra->docBlockInBody    = FALSE;
@@ -4963,7 +4964,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   				          //addToBody("}");
                                           if (yyextra->tempEntry) // we can only switch back to yyextra->current if no new item was created
 					  {
-					    yyextra->tempEntry.swap(yyextra->current);
+					    yyextra->current = yyextra->tempEntry;
 					    yyextra->tempEntry.reset();
 					  }
   					  BEGIN( yyextra->lastCurlyContext );
@@ -6615,8 +6616,8 @@ static void initParser(yyscan_t yyscanner)
   yyextra->insideCode=FALSE;
   yyextra->insideCli=Config_getBool(CPP_CLI_SUPPORT);
   yyextra->previous = 0;
-  yyextra->firstTypedefEntry = 0;
-  yyextra->memspecEntry =0;
+  yyextra->firstTypedefEntry.reset();
+  yyextra->memspecEntry.reset();
 }
 
 static void initEntry(yyscan_t yyscanner)
@@ -6928,13 +6929,13 @@ static void newEntry(yyscan_t yyscanner)
                     // already added to yyextra->current_root, so we should not add it again 
                     // (see bug723314)
   {
-    yyextra->previous = yyextra->current.get();
+    yyextra->previous = yyextra->current;
     yyextra->current_root->moveToSubEntryAndRefresh(yyextra->current);
   }
   else
   {
-    yyextra->previous = yyextra->current.get();
-    yyextra->tempEntry.swap(yyextra->current);
+    yyextra->previous = yyextra->current;
+    yyextra->current  = yyextra->tempEntry;
     yyextra->tempEntry.reset();
   }
   initEntry(yyscanner);
@@ -6949,7 +6950,7 @@ static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief
   int lineNr = brief ? yyextra->current->briefLine : yyextra->current->docLine;   // line of block start
 
   // fill in inbodyFile && inbodyLine the first time, see bug 633891
-  Entry *docEntry = yyextra->docBlockInBody && yyextra->previous ? yyextra->previous : yyextra->current.get();
+  std::shared_ptr<Entry> docEntry = yyextra->docBlockInBody && yyextra->previous ? yyextra->previous : yyextra->current;
   if (yyextra->docBlockInBody && docEntry && docEntry->inbodyLine==-1)
   {
     docEntry->inbodyFile = yyextra->yyFileName;
@@ -6961,7 +6962,7 @@ static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief
   QCString processedDoc = preprocessCommentBlock(stripIndentation(doc),yyextra->yyFileName,lineNr);
   while (parseCommentBlock(
 	yyextra->thisParser,
-	yyextra->docBlockInBody && yyextra->previous ? yyextra->previous : yyextra->current.get(),
+	yyextra->docBlockInBody && yyextra->previous ? yyextra->previous.get() : yyextra->current.get(),
 	processedDoc, // text
 	yyextra->yyFileName,   // file
 	lineNr,       // line of block start
@@ -7054,7 +7055,7 @@ static void handleParametersCommentBlocks(yyscan_t yyscanner,ArgumentList &al)
 
 //----------------------------------------------------------------------------
 
-static void parseCompounds(yyscan_t yyscanner,const std::unique_ptr<Entry> &rt)
+static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr<Entry> &rt)
 {
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   //printf("parseCompounds(%s)\n",rt->name.data());
@@ -7074,14 +7075,14 @@ static void parseCompounds(yyscan_t yyscanner,const std::unique_ptr<Entry> &rt)
 	BEGIN( FindFields ) ;
       else
 	BEGIN( FindMembers ) ;
-      yyextra->current_root = ce.get() ;
+      yyextra->current_root = ce;
       yyextra->yyFileName = ce->fileName;
       //setContext();
       yyextra->yyLineNr = ce->startLine ;
       yyextra->yyColNr = ce->startColumn ;
       yyextra->insideObjC = ce->lang==SrcLangExt_ObjC;
       //printf("---> Inner block starts at line %d objC=%d\n",yyextra->yyLineNr,yyextra->insideObjC);
-      yyextra->current = std::make_unique<Entry>();
+      yyextra->current = std::make_shared<Entry>();
       yyextra->stat = FALSE;
       initEntry(yyscanner);
 
@@ -7169,7 +7170,7 @@ static void parseCompounds(yyscan_t yyscanner,const std::unique_ptr<Entry> &rt)
 static void parseMain(yyscan_t yyscanner,
                       const char *fileName,
                       const char *fileBuf,
-                      const std::unique_ptr<Entry> &rt,
+                      const std::shared_ptr<Entry> &rt,
                       bool sameTranslationUnit,
                       QStrList & filesInSameTranslationUnit)
 {
@@ -7187,7 +7188,7 @@ static void parseMain(yyscan_t yyscanner,
   yyextra->mtype         = Method;
   yyextra->stat         = FALSE;
   yyextra->virt          = Normal;
-  yyextra->current_root  = rt.get();
+  yyextra->current_root  = rt;
   yyextra->yyLineNr= 1 ; 
   yyextra->yyFileName = fileName;
   setContext(yyscanner);
@@ -7206,10 +7207,10 @@ static void parseMain(yyscan_t yyscanner,
   rt->lang = yyextra->language;
   msg("Parsing file %s...\n",yyextra->yyFileName.data());
 
-  yyextra->current_root  = rt.get() ;
+  yyextra->current_root  = rt;
   initParser(yyscanner);
   Doxygen::docGroup.enterFile(yyextra->yyFileName,yyextra->yyLineNr);
-  yyextra->current = std::make_unique<Entry>();
+  yyextra->current = std::make_shared<Entry>();
   //printf("yyextra->current=%p yyextra->current_root=%p\n",yyextra->current,yyextra->current_root);
   int sec=guessSection(yyextra->yyFileName);
   if (sec)
@@ -7355,7 +7356,7 @@ void COutlineParser::finishTranslationUnit()
 
 void COutlineParser::parseInput(const char *fileName,
                                   const char *fileBuf,
-                                  const std::unique_ptr<Entry> &root,
+                                  const std::shared_ptr<Entry> &root,
                                   bool sameTranslationUnit,
                                   QStrList & filesInSameTranslationUnit)
 {
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 65336e3..8f85e9d 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -909,12 +909,12 @@ class TagFileParser : public QXmlDefaultHandler
     }
 
     void dump();
-    void buildLists(const std::unique_ptr<Entry> &root);
+    void buildLists(const std::shared_ptr<Entry> &root);
     void addIncludes();
     
   private:
-    void buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMemberInfo> &members);
-    void addDocAnchors(const std::unique_ptr<Entry> &e,const TagAnchorInfoList &l);
+    void buildMemberList(const std::shared_ptr<Entry> &ce,QList<TagMemberInfo> &members);
+    void addDocAnchors(const std::shared_ptr<Entry> &e,const TagAnchorInfoList &l);
     QList<TagClassInfo>        m_tagFileClasses;
     QList<TagFileInfo>         m_tagFileFiles;
     QList<TagNamespaceInfo>    m_tagFileNamespaces;
@@ -1139,7 +1139,7 @@ void TagFileParser::dump()
   }
 }
 
-void TagFileParser::addDocAnchors(const std::unique_ptr<Entry> &e,const TagAnchorInfoList &l)
+void TagFileParser::addDocAnchors(const std::shared_ptr<Entry> &e,const TagAnchorInfoList &l)
 {
   QListIterator<TagAnchorInfo> tli(l);
   TagAnchorInfo *ta;
@@ -1161,13 +1161,13 @@ void TagFileParser::addDocAnchors(const std::unique_ptr<Entry> &e,const TagAncho
   }
 }
 
-void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMemberInfo> &members)
+void TagFileParser::buildMemberList(const std::shared_ptr<Entry> &ce,QList<TagMemberInfo> &members)
 {
   QListIterator<TagMemberInfo> mii(members);
   TagMemberInfo *tmi;
   for (;(tmi=mii.current());++mii)
   {
-    std::unique_ptr<Entry> me = std::make_unique<Entry>();
+    std::shared_ptr<Entry> me = std::make_shared<Entry>();
     me->type       = tmi->type;
     me->name       = tmi->name;
     me->args       = tmi->arglist;
@@ -1182,7 +1182,7 @@ void TagFileParser::buildMemberList(const std::unique_ptr<Entry> &ce,QList<TagMe
       TagEnumValueInfo *evi;
       for (evii.toFirst();(evi=evii.current());++evii)
       {
-        std::unique_ptr<Entry> ev = std::make_unique<Entry>();
+        std::shared_ptr<Entry> ev = std::make_shared<Entry>();
         ev->type       = "@";
         ev->name       = evi->name;
         ev->id         = evi->clangid;
@@ -1296,14 +1296,14 @@ static QCString stripPath(const QCString &s)
  *  This tree contains the information extracted from the input in a 
  *  "unrelated" form.
  */
-void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
+void TagFileParser::buildLists(const std::shared_ptr<Entry> &root)
 {
   // build class list
   QListIterator<TagClassInfo> cit(m_tagFileClasses);
   TagClassInfo *tci;
   for (cit.toFirst();(tci=cit.current());++cit)
   {
-    std::unique_ptr<Entry> ce = std::make_unique<Entry>();
+    std::shared_ptr<Entry> ce = std::make_shared<Entry>();
     ce->section = Entry::CLASS_SEC;
     switch (tci->kind)
     {
@@ -1360,7 +1360,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
   TagFileInfo *tfi;
   for (fit.toFirst();(tfi=fit.current());++fit)
   {
-    std::unique_ptr<Entry> fe = std::make_unique<Entry>();
+    std::shared_ptr<Entry> fe = std::make_shared<Entry>();
     fe->section = guessSection(tfi->name);
     fe->name     = tfi->name;
     addDocAnchors(fe,tfi->docAnchors);
@@ -1396,7 +1396,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
   TagNamespaceInfo *tni;
   for (nit.toFirst();(tni=nit.current());++nit)
   {
-    std::unique_ptr<Entry> ne = std::make_unique<Entry>();
+    std::shared_ptr<Entry> ne = std::make_shared<Entry>();
     ne->section  = Entry::NAMESPACE_SEC;
     ne->name     = tni->name;
     addDocAnchors(ne,tni->docAnchors);
@@ -1414,7 +1414,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
   TagPackageInfo *tpgi;
   for (pit.toFirst();(tpgi=pit.current());++pit)
   {
-    std::unique_ptr<Entry> pe = std::make_unique<Entry>();
+    std::shared_ptr<Entry> pe = std::make_shared<Entry>();
     pe->section  = Entry::PACKAGE_SEC;
     pe->name     = tpgi->name;
     addDocAnchors(pe,tpgi->docAnchors);
@@ -1431,7 +1431,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
   TagGroupInfo *tgi;
   for (git.toFirst();(tgi=git.current());++git)
   {
-    std::unique_ptr<Entry> ge = std::make_unique<Entry>();
+    std::shared_ptr<Entry> ge = std::make_shared<Entry>();
     ge->section  = Entry::GROUPDOC_SEC;
     ge->name     = tgi->name;
     ge->type     = tgi->title;
@@ -1455,7 +1455,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
       //for (eli.toFirst();(childNode=eli.current());++eli)
       const auto &children = root->children();
       auto i = std::find_if(children.begin(),children.end(),
-          [&](const std::unique_ptr<Entry> &e) { return e->name = *it; });
+          [&](const std::shared_ptr<Entry> &e) { return e->name = *it; });
       if (i!=children.end())
       {
         (*i)->groups.push_back(Grouping(tgi->name,Grouping::GROUPING_INGROUP));
@@ -1468,7 +1468,7 @@ void TagFileParser::buildLists(const std::unique_ptr<Entry> &root)
   TagPageInfo *tpi;
   for (pgit.toFirst();(tpi=pgit.current());++pgit)
   {
-    std::unique_ptr<Entry> pe = std::make_unique<Entry>();
+    std::shared_ptr<Entry> pe = std::make_shared<Entry>();
     pe->section  = tpi->filename=="index" ? Entry::MAINPAGEDOC_SEC : Entry::PAGEDOC_SEC;
     pe->name     = tpi->name;
     pe->args     = tpi->title;
@@ -1527,7 +1527,7 @@ void TagFileParser::addIncludes()
   }
 }
 
-void parseTagFile(const std::unique_ptr<Entry> &root,const char *fullName)
+void parseTagFile(const std::shared_ptr<Entry> &root,const char *fullName)
 {
   QFileInfo fi(fullName);
   if (!fi.exists()) return;
diff --git a/src/tagreader.h b/src/tagreader.h
index 4c09a04..454060b 100644
--- a/src/tagreader.h
+++ b/src/tagreader.h
@@ -23,6 +23,6 @@ class Entry;
 
 #include <memory>
 
-void parseTagFile(const std::unique_ptr<Entry> &root,const char *fullPathName);
+void parseTagFile(const std::shared_ptr<Entry> &root,const char *fullPathName);
 
 #endif
diff --git a/src/tclscanner.h b/src/tclscanner.h
index 52ff903..cdd56d8 100644
--- a/src/tclscanner.h
+++ b/src/tclscanner.h
@@ -32,7 +32,7 @@ class TclOutlineParser : public OutlineParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char *fileName,
                     const char *fileBuf,
-                    const std::unique_ptr<Entry> &root,
+                    const std::shared_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
     bool needsPreprocessing(const QCString &extension) const;
diff --git a/src/tclscanner.l b/src/tclscanner.l
index e3fd6f2..49c0807 100644
--- a/src/tclscanner.l
+++ b/src/tclscanner.l
@@ -2966,7 +2966,7 @@ static void tcl_parse(const QCString ns, const QCString cls)
 //! Parse text file and build up entry tree.
 void TclOutlineParser::parseInput(const char *fileName,
                                     const char *input,
-                                    const std::unique_ptr<Entry> &root,
+                                    const std::shared_ptr<Entry> &root,
                                     bool /*sameTranslationUnit*/,
                                     QStrList & /*filesInSameTranslationUnit*/)
 {
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index ba4d4de..dc39321 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -72,7 +72,7 @@ static void initUCF(Entry* root,const char* type,QCString &  qcs,int line,QCStri
 static void writeUCFLink(const MemberDef* mdef,OutputList &ol);
 static void assignBinding(VhdlConfNode* conf);
 static void addInstance(ClassDef* entity, ClassDef* arch, ClassDef *inst,
-                        const std::unique_ptr<Entry> &cur);
+                        const std::shared_ptr<Entry> &cur);
 
 //---------- create svg -------------------------------------------------------------
 static void createSVG();
@@ -2535,7 +2535,7 @@ static void initUCF(Entry* root,const char*  type,QCString &  qcs,int line,QCStr
 
   qcs.stripPrefix("=");
 
-  std::unique_ptr<Entry> current = std::make_unique<Entry>();
+  std::shared_ptr<Entry> current = std::make_shared<Entry>();
   current->spec=VhdlDocGen::UCF_CONST;
   current->section=Entry::VARIABLE_SEC;
   current->bodyLine=line;
@@ -2900,7 +2900,7 @@ void VhdlDocGen::computeVhdlComponentRelations()
 }
 
 static void addInstance(ClassDef* classEntity, ClassDef* ar,
-                        ClassDef *cd , const std::unique_ptr<Entry> &cur)
+                        ClassDef *cd , const std::shared_ptr<Entry> &cur)
 {
 
   QCString bName,n1;
@@ -3136,7 +3136,7 @@ void VhdlDocGen::createFlowChart(const MemberDef *mdef)
 
   VHDLOutlineParser &intf =dynamic_cast<VHDLOutlineParser&>(Doxygen::parserManager->getOutlineParser(".vhd"));
   VhdlDocGen::setFlowMember(mdef);
-  std::unique_ptr<Entry> root = std::make_unique<Entry>();
+  std::shared_ptr<Entry> root = std::make_shared<Entry>();
   QStrList filesInSameTu;
   intf.startTranslationUnit("");
   intf.parseInput("",codeFragment.data(),root,FALSE,filesInSameTu);
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index 874980b..8b7ebf6 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -48,16 +48,15 @@ static Entry* oldEntry;
 static bool varr=FALSE;
 static QCString varName;
 
-static std::vector< std::unique_ptr<Entry> > instFiles;
-static std::vector< std::unique_ptr<Entry> > libUse;
+static std::vector< std::shared_ptr<Entry> > instFiles;
+static std::vector< std::shared_ptr<Entry> > libUse;
 static std::vector<Entry*> lineEntry;
 
-Entry*   VhdlParser::currentCompound=0;
 Entry*   VhdlParser::tempEntry=0;
 Entry*   VhdlParser::lastEntity=0  ;
 Entry*   VhdlParser::lastCompound=0  ;
 Entry*   VhdlParser::current_root  = 0;
-std::unique_ptr<Entry> VhdlParser::current=0;
+std::shared_ptr<Entry> VhdlParser::current=0;
 QCString VhdlParser::compSpec;
 QCString VhdlParser::currName;
 QCString VhdlParser::confName;
@@ -90,7 +89,7 @@ static void insertEntryAtLine(const Entry* ce,int line);
 //-------------------------------------
 
 const QList<VhdlConfNode>& getVhdlConfiguration() { return  configL; }
-const std::vector<std::unique_ptr<Entry> > &getVhdlInstList() { return  instFiles; }
+const std::vector<std::shared_ptr<Entry> > &getVhdlInstList() { return  instFiles; }
 
 Entry* getVhdlCompound()
 {
@@ -106,7 +105,7 @@ bool isConstraintFile(const QCString &fileName,const QCString &ext)
 
 
 void VHDLOutlineParser::parseInput(const char *fileName,const char *fileBuf,
-                          const std::unique_ptr<Entry> &root, bool ,QStrList&)
+                          const std::shared_ptr<Entry> &root, bool ,QStrList&)
 {
   g_thisParser=this;
   bool inLine=false;
@@ -140,10 +139,9 @@ void VHDLOutlineParser::parseInput(const char *fileName,const char *fileBuf,
   VhdlParser::current_root=root.get();
   VhdlParser::lastCompound=0;
   VhdlParser::lastEntity=0;
-  VhdlParser::currentCompound=0;
   VhdlParser::lastEntity=0;
   oldEntry = 0;
-  VhdlParser::current=std::make_unique<Entry>();
+  VhdlParser::current=std::make_shared<Entry>();
   VhdlParser::initEntry(VhdlParser::current.get());
   Doxygen::docGroup.enterFile(fileName,yyLineNr);
   vhdlFileName = fileName;
@@ -355,10 +353,10 @@ void VhdlParser::addCompInst(const char *n, const char* instName, const char* co
     if (true) // !findInstant(current->type))
     {
       initEntry(current.get());
-      instFiles.emplace_back(std::make_unique<Entry>(*current));
+      instFiles.emplace_back(std::make_shared<Entry>(*current));
     }
 
-    current=std::make_unique<Entry>();
+    current=std::make_shared<Entry>();
   }
   else
   {
@@ -396,7 +394,7 @@ void VhdlParser::addVhdlType(const char *n,int startLine,int section,
 
     if (!lastCompound && (section==Entry::VARIABLE_SEC) &&  (spec == VhdlDocGen::USE || spec == VhdlDocGen::LIBRARY) )
     {
-      libUse.emplace_back(std::make_unique<Entry>(*current));
+      libUse.emplace_back(std::make_shared<Entry>(*current));
       current->reset();
     }
     newEntry();
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index faa0c08..f987e4a 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -47,7 +47,7 @@ class VHDLOutlineParser : public OutlineParserInterface
     void finishTranslationUnit() {}
     void parseInput(const char * fileName,
                     const char *fileBuf,
-                    const std::unique_ptr<Entry> &root,
+                    const std::shared_ptr<Entry> &root,
                     bool sameTranslationUnit,
                     QStrList &filesInSameTranslationUnit);
 
@@ -82,6 +82,6 @@ struct VhdlConfNode
 void vhdlscanFreeScanner();
 
 const QList<VhdlConfNode>& getVhdlConfiguration();
-const std::vector<std::unique_ptr<Entry> >&getVhdlInstList();
+const std::vector<std::shared_ptr<Entry> >&getVhdlInstList();
 
 #endif
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 2ed30e2..35f2ff6 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -5891,7 +5891,7 @@ void VhdlParser::package_declaration() {QCString s;
     }
     if (!hasError) {
 lastCompound=current.get();
-                          std::unique_ptr<Entry> clone=std::make_unique<Entry>(*current);
+                          std::shared_ptr<Entry> clone=std::make_shared<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
                           clone->spec=VhdlDocGen::PACKAGE;
                           clone->name=s;
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index a9f14d1..b88f156 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -8426,7 +8426,7 @@ static Entry* current_root;
 static Entry* tempEntry;
 static Entry*  lastEntity  ;
 static Entry*  lastCompound  ;
-static std::unique_ptr<Entry> current;
+static std::shared_ptr<Entry> current;
 static QCString compSpec;
 static QCString currName;
 static int levelCounter;
@@ -8437,7 +8437,6 @@ static QCString forL;
 static int param_sec ;
 static int parse_sec;
 static int currP;
-static Entry* currentCompound;
 
 //----------------------------------------
 
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index a3d6731..c602396 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -31,7 +31,7 @@ static Entry* current_root;
 static Entry* tempEntry;
 static Entry*  lastEntity  ;
 static Entry*  lastCompound  ;
-static std::unique_ptr<Entry> current;
+static std::shared_ptr<Entry> current;
 static QCString compSpec;
 static QCString currName;
 static int levelCounter;
@@ -42,7 +42,6 @@ static QCString forL;
 static int param_sec ;
 static int parse_sec;
 static int currP;
-static Entry* currentCompound;
 
 //----------------------------------------
 
@@ -1730,7 +1729,7 @@ void package_declaration():  {QCString s;}
  <PACKAGE_T> s=identifier() <IS_T>
                           {
                           lastCompound=current.get();
-                          std::unique_ptr<Entry> clone=std::make_unique<Entry>(*current);
+                          std::shared_ptr<Entry> clone=std::make_shared<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
                           clone->spec=VhdlDocGen::PACKAGE;
                           clone->name=s;
-- 
cgit v0.12


From 352ac919116aa49cdae48daa5d6861089ddd6055 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 8 Dec 2019 13:22:52 +0100
Subject: Renamed Portables to Portable

---
 src/cite.cpp       |  6 +++---
 src/config.xml     |  2 +-
 src/configimpl.l   | 16 ++++++++--------
 src/context.cpp    | 34 +++++++++++++++++-----------------
 src/definition.cpp | 16 ++++++++--------
 src/dia.cpp        | 18 +++++++++---------
 src/diagram.cpp    |  8 ++++----
 src/docparser.cpp  | 10 +++++-----
 src/doctokenizer.l |  2 +-
 src/dot.cpp        | 18 +++++++++---------
 src/dotrunner.cpp  | 14 +++++++-------
 src/doxygen.cpp    | 34 +++++++++++++++++-----------------
 src/filedef.cpp    |  4 ++--
 src/formula.cpp    | 32 ++++++++++++++++----------------
 src/htags.cpp      |  6 +++---
 src/message.cpp    |  2 +-
 src/msc.cpp        |  8 ++++----
 src/plantuml.cpp   | 16 ++++++++--------
 src/portable.cpp   | 52 ++++++++++++++++++++++++++--------------------------
 src/portable.h     |  2 +-
 src/pre.l          |  2 +-
 src/util.cpp       |  8 ++++----
 src/vhdldocgen.cpp |  4 ++--
 23 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/src/cite.cpp b/src/cite.cpp
index 40084b6..797881f 100644
--- a/src/cite.cpp
+++ b/src/cite.cpp
@@ -235,14 +235,14 @@ void CiteDict::generatePage() const
   // 5. run bib2xhtml perl script on the generated file which will insert the
   //    bibliography in citelist.doc
   int exitCode;
-  Portables::sysTimerStop();
-  if ((exitCode=Portables::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
+  Portable::sysTimerStop();
+  if ((exitCode=Portable::system("perl","\""+bib2xhtmlFile+"\" "+bibOutputFiles+" \""+
                          citeListFile+"\"")) != 0)
   {
     err("Problems running bibtex. Verify that the command 'perl --version' works from the command line. Exit code: %d\n",
         exitCode);
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
 
   QDir::setCurrent(oldDir);
 
diff --git a/src/config.xml b/src/config.xml
index fb0e01a..dfe22e2 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -953,7 +953,7 @@ Go to the <a href="commands.html">next</a> section or return to the
 ]]>
       </docs>
     </option>
-    <option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portables::fileSystemIsCaseSensitive()'>
+    <option type='bool' id='CASE_SENSE_NAMES' defval='0' altdefval='Portable::fileSystemIsCaseSensitive()'>
       <docs>
 <![CDATA[
  If the \c CASE_SENSE_NAMES tag is set to \c NO then doxygen
diff --git a/src/configimpl.l b/src/configimpl.l
index 0da6e68..6987e59 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -603,7 +603,7 @@ static FILE *tryPath(const char *path,const char *fileName)
   QFileInfo fi(absName);
   if (fi.exists() && fi.isFile())
   {
-    FILE *f=Portables::fopen(absName,"r");
+    FILE *f=Portable::fopen(absName,"r");
     if (!f) config_err("could not open file %s for reading\n",absName.data());
     return f;
   }
@@ -619,7 +619,7 @@ static FILE *findFile(const char *fileName)
   {
     return 0;
   }
-  if (Portables::isAbsolutePath(fileName))
+  if (Portable::isAbsolutePath(fileName))
   {
     return tryPath(NULL, fileName);
   }
@@ -1012,7 +1012,7 @@ static void substEnvVarsInString(QCString &s)
   while ((i=re.match(s,p,&l))!=-1 || (i=re2.match(s,p,&l))!=-1)
   {
     //printf("Found environment var s.mid(%d,%d)='%s'\n",i+2,l-3,s.mid(i+2,l-3).data());
-    QCString env=Portables::getenv(s.mid(i+2,l-3));
+    QCString env=Portable::getenv(s.mid(i+2,l-3));
     substEnvVarsInString(env); // recursively expand variables if needed.
     s = s.left(i)+env+s.right(s.length()-i-l);
     p=i+env.length(); // next time start at the end of the expanded string
@@ -1579,7 +1579,7 @@ void Config::checkAndCorrect()
     }
     else
     {
-      QFileInfo dp(dotPath+"/dot"+Portables::commandExtension());
+      QFileInfo dp(dotPath+"/dot"+Portable::commandExtension());
       if (!dp.exists() || !dp.isFile())
       {
 	warn_uncond("the dot tool could not be found at %s\n",dotPath.data());
@@ -1607,10 +1607,10 @@ void Config::checkAndCorrect()
     QFileInfo pu(plantumlJarPath);
     if (pu.exists() && pu.isDir()) // PLANTUML_JAR_PATH is directory
     {
-      QFileInfo jar(plantumlJarPath+Portables::pathSeparator()+"plantuml.jar");
+      QFileInfo jar(plantumlJarPath+Portable::pathSeparator()+"plantuml.jar");
       if (jar.exists() && jar.isFile())
       {
-        plantumlJarPath = jar.dirPath(TRUE).utf8()+Portables::pathSeparator();
+        plantumlJarPath = jar.dirPath(TRUE).utf8()+Portable::pathSeparator();
       }
       else
       {
@@ -1621,7 +1621,7 @@ void Config::checkAndCorrect()
     }
     else if (pu.exists() && pu.isFile() && plantumlJarPath.right(4)==".jar") // PLANTUML_JAR_PATH is file
     {
-      plantumlJarPath = pu.dirPath(TRUE).utf8()+Portables::pathSeparator();
+      plantumlJarPath = pu.dirPath(TRUE).utf8()+Portable::pathSeparator();
     }
     else
     {
@@ -1635,7 +1635,7 @@ void Config::checkAndCorrect()
   QCString &diaPath = Config_getString(DIA_PATH);
   if (!diaPath.isEmpty())
   {
-    QFileInfo dp(diaPath+"/dia"+Portables::commandExtension());
+    QFileInfo dp(diaPath+"/dia"+Portable::commandExtension());
     if (!dp.exists() || !dp.isFile())
     {
       warn_uncond("dia could not be found at %s\n",diaPath.data());
diff --git a/src/context.cpp b/src/context.cpp
index 4c70a19..5ee89cd 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -1978,7 +1978,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -1987,7 +1987,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2077,7 +2077,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -2086,7 +2086,7 @@ class ClassContext::Private : public DefinitionContext<ClassContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                              g_globals.outputDir,
-                             g_globals.outputDir+Portables::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
+                             g_globals.outputDir+Portable::pathSeparator()+m_classDef->getOutputFileBase()+".tex",
                              relPathAsString(),TRUE,TRUE,g_globals.dynSectionId
                             );
             }
@@ -3123,7 +3123,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3132,7 +3132,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3175,7 +3175,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3184,7 +3184,7 @@ class FileContext::Private : public DefinitionContext<FileContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_fileDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -3613,7 +3613,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -3625,7 +3625,7 @@ class DirContext::Private : public DefinitionContext<DirContext::Private>
               graph->writeGraph(t,GOF_EPS,
                                 EOF_LaTeX,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
+                                g_globals.outputDir+Portable::pathSeparator()+m_dirDef->getOutputFileBase()+".tex",
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId,
@@ -5026,7 +5026,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5035,7 +5035,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5098,7 +5098,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_BITMAP,EOF_Html,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5107,7 +5107,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private>
             {
               cg->writeGraph(t,GOF_EPS,EOF_LaTeX,
                   g_globals.outputDir,
-                  g_globals.outputDir+Portables::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
+                  g_globals.outputDir+Portable::pathSeparator()+m_memberDef->getOutputFileBase()+".tex",
                   relPathAsString(),TRUE,g_globals.dynSectionId
                   );
             }
@@ -5368,7 +5368,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_BITMAP,
                                 EOF_Html,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
+                                g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+Doxygen::htmlFileExtension,
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
@@ -5379,7 +5379,7 @@ class ModuleContext::Private : public DefinitionContext<ModuleContext::Private>
               graph->writeGraph(t,GOF_EPS,
                                 EOF_LaTeX,
                                 g_globals.outputDir,
-                                g_globals.outputDir+Portables::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
+                                g_globals.outputDir+Portable::pathSeparator()+m_groupDef->getOutputFileBase()+".tex",
                                 relPathAsString(),
                                 TRUE,
                                 g_globals.dynSectionId);
@@ -8461,7 +8461,7 @@ class InheritanceGraphContext::Private
                           /*GOF_BITMAP,
                           EOF_Html,*/
                           g_globals.outputDir,
-                          g_globals.outputDir+Portables::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
+                          g_globals.outputDir+Portable::pathSeparator()+"inherits"+Doxygen::htmlFileExtension,
                           m_id);
       }
       return TemplateVariant(result.data(),TRUE);
diff --git a/src/definition.cpp b/src/definition.cpp
index ee08e93..86f8789 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -744,12 +744,12 @@ class FilterCache
         // file already processed, get the results after filtering from the tmp file
         Debug::print(Debug::FilterOutput,0,"Reusing filter result for %s from %s at offset=%d size=%d\n",
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
-        f = Portables::fopen(Doxygen::filterDBFileName,"rb");
+        f = Portable::fopen(Doxygen::filterDBFileName,"rb");
         if (f)
         {
           bool success=TRUE;
           str.resize(item->fileSize+1);
-          if (Portables::fseek(f,item->filePos,SEEK_SET)==-1)
+          if (Portable::fseek(f,item->filePos,SEEK_SET)==-1)
           {
             err("Failed to seek to position %d in filter database file %s\n",(int)item->filePos,qPrint(Doxygen::filterDBFileName));
             success=FALSE;
@@ -780,8 +780,8 @@ class FilterCache
         // filter file
         QCString cmd=filter+" \""+fileName+"\"";
         Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-        f = Portables::popen(cmd,"r");
-        FILE *bf = Portables::fopen(Doxygen::filterDBFileName,"a+b");
+        f = Portable::popen(cmd,"r");
+        FILE *bf = Portable::fopen(Doxygen::filterDBFileName,"a+b");
         FilterCacheItem *item = new FilterCacheItem;
         item->filePos = m_endPos;
         if (bf==0)
@@ -790,7 +790,7 @@ class FilterCache
           err("Error opening filter database file %s\n",qPrint(Doxygen::filterDBFileName));
           str.addChar('\0');
           delete item;
-          Portables::pclose(f);
+          Portable::pclose(f);
           return FALSE;
         }
         // append the filtered output to the database file
@@ -806,7 +806,7 @@ class FilterCache
                 qPrint(Doxygen::filterDBFileName),bytesWritten,bytesRead);
             str.addChar('\0');
             delete item;
-            Portables::pclose(f);
+            Portable::pclose(f);
             fclose(bf);
             return FALSE;
           }
@@ -821,14 +821,14 @@ class FilterCache
                qPrint(fileName),qPrint(Doxygen::filterDBFileName),(int)item->filePos,(int)item->fileSize);
         // update end of file position
         m_endPos += size;
-        Portables::pclose(f);
+        Portable::pclose(f);
         fclose(bf);
       }
       else // no filtering
       {
         // normal file
         //printf("getFileContents(%s): no filter\n",qPrint(fileName));
-        f = Portables::fopen(fileName,"r");
+        f = Portable::fopen(fileName,"r");
         while (!feof(f))
         {
           int bytesRead = fread(buf,1,blockSize,f);
diff --git a/src/dia.cpp b/src/dia.cpp
index 39ba2f8..4a00a17 100644
--- a/src/dia.cpp
+++ b/src/dia.cpp
@@ -29,7 +29,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,DiaOutputFormat format)
 {
   QCString absOutFile = outDir;
-  absOutFile+=Portables::pathSeparator();
+  absOutFile+=Portable::pathSeparator();
   absOutFile+=outFile;
 
   // chdir to the output dir, so dot can find the font file.
@@ -37,7 +37,7 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
   // go to the html output directory (i.e. path)
   QDir::setCurrent(outDir);
   //printf("Going to dir %s\n",QDir::currentDirPath().data());
-  QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portables::commandExtension();
+  QCString diaExe = Config_getString(DIA_PATH)+"dia"+Portable::commandExtension();
   QCString diaArgs;
   QCString extension;
   diaArgs+="-n ";
@@ -62,26 +62,26 @@ void writeDiaGraphFromFile(const char *inFile,const char *outDir,
 
   int exitCode;
   //printf("*** running: %s %s outDir:%s %s\n",diaExe.data(),diaArgs.data(),outDir,outFile);
-  Portables::sysTimerStart();
-  if ((exitCode=Portables::system(diaExe,diaArgs,FALSE))!=0)
+  Portable::sysTimerStart();
+  if ((exitCode=Portable::system(diaExe,diaArgs,FALSE))!=0)
   {
     err("Problems running %s. Check your installation or look typos in you dia file %s\n",
         diaExe.data(),inFile);
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     goto error;
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
   if ( (format==DIA_EPS) && (Config_getBool(USE_PDFLATEX)) )
   {
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          outFile,outFile);
-    Portables::sysTimerStart();
-    if (Portables::system("epstopdf",epstopdfArgs)!=0)
+    Portable::sysTimerStart();
+    if (Portable::system("epstopdf",epstopdfArgs)!=0)
     {
       err("Problems running epstopdf. Check your TeX installation!\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
   }
 
 error:
diff --git a/src/diagram.cpp b/src/diagram.cpp
index 09e74c7..e8dc83a 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1338,14 +1338,14 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                    epsBaseName.data(),epsBaseName.data());
     //printf("Converting eps using '%s'\n",epstopdfArgs.data());
-    Portables::sysTimerStart();
-    if (Portables::system("epstopdf",epstopdfArgs)!=0)
+    Portable::sysTimerStart();
+    if (Portable::system("epstopdf",epstopdfArgs)!=0)
     {
        err("Problems running epstopdf. Check your TeX installation!\n");
-       Portables::sysTimerStop();
+       Portable::sysTimerStop();
        return;
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
   }
 }
 
diff --git a/src/docparser.cpp b/src/docparser.cpp
index cd71937..1e43993 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -369,12 +369,12 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type, bool
       epstopdfArgs.sprintf("\"%s/%s.eps\" --outfile=\"%s/%s.pdf\"",
                            outputDir.data(), baseName.data(),
 			   outputDir.data(), baseName.data());
-      Portables::sysTimerStart();
-      if (Portables::system("epstopdf",epstopdfArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system("epstopdf",epstopdfArgs)!=0)
       {
 	err("Problems running epstopdf. Check your TeX installation!\n");
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       return baseName;
     }
   }
@@ -1818,7 +1818,7 @@ static int internalValidatingParseDoc(DocNode *parent,QList<DocNode> &children,
 
 static void readTextFileByName(const QCString &file,QCString &text)
 {
-  if (Portables::isAbsolutePath(file.data()))
+  if (Portable::isAbsolutePath(file.data()))
   {
     QFileInfo fi(file);
     if (fi.exists())
@@ -1831,7 +1831,7 @@ static void readTextFileByName(const QCString &file,QCString &text)
   char *s=examplePathList.first();
   while (s)
   {
-    QCString absFileName = QCString(s)+Portables::pathSeparator()+file;
+    QCString absFileName = QCString(s)+Portable::pathSeparator()+file;
     QFileInfo fi(absFileName);
     if (fi.exists())
     {
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index a320bc6..c45bc9e 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -674,7 +674,7 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
 <St_Para,St_HtmlOnly,St_ManOnly,St_LatexOnly,St_RtfOnly,St_XmlOnly,St_DbOnly>"$("{ID}"("{ID}"))"   { /* environment variable */
                          QCString name = &yytext[2];
 			 name = name.left(name.length()-1);
-			 QCString value = Portables::getenv(name);
+			 QCString value = Portable::getenv(name);
 			 for (int i=value.length()-1;i>=0;i--) unput(value.at(i));
                        }
 <St_Para>{HTMLTAG}     { /* html tag */ 
diff --git a/src/dot.cpp b/src/dot.cpp
index 124870c..4e4c4bc 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -38,12 +38,12 @@ static QCString g_dotFontPath;
 static void setDotFontPath(const char *path)
 {
   ASSERT(g_dotFontPath.isEmpty());
-  g_dotFontPath = Portables::getenv("DOTFONTPATH");
+  g_dotFontPath = Portable::getenv("DOTFONTPATH");
   QCString newFontPath = Config_getString(DOT_FONTPATH);
   QCString spath = path;
   if (!newFontPath.isEmpty() && !spath.isEmpty())
   {
-    newFontPath.prepend(spath+Portables::pathListSeparator());
+    newFontPath.prepend(spath+Portable::pathListSeparator());
   }
   else if (newFontPath.isEmpty() && !spath.isEmpty())
   {
@@ -51,21 +51,21 @@ static void setDotFontPath(const char *path)
   }
   else
   {
-    Portables::unsetenv("DOTFONTPATH");
+    Portable::unsetenv("DOTFONTPATH");
     return;
   }
-  Portables::setenv("DOTFONTPATH",newFontPath);
+  Portable::setenv("DOTFONTPATH",newFontPath);
 }
 
 static void unsetDotFontPath()
 {
   if (g_dotFontPath.isEmpty())
   {
-    Portables::unsetenv("DOTFONTPATH");
+    Portable::unsetenv("DOTFONTPATH");
   }
   else
   {
-    Portables::setenv("DOTFONTPATH",g_dotFontPath);
+    Portable::setenv("DOTFONTPATH",g_dotFontPath);
   }
   g_dotFontPath="";
 }
@@ -183,7 +183,7 @@ bool DotManager::run() const
     setDotFontPath(Config_getString(DOCBOOK_OUTPUT));
     setPath=TRUE;
   }
-  Portables::sysTimerStart();
+  Portable::sysTimerStart();
   // fill work queue with dot operations
   DotRunner *dr;
   int prev=1;
@@ -211,7 +211,7 @@ bool DotManager::run() const
         msg("Running dot for graph %d/%d\n",prev,numDotRuns);
         prev++;
       }
-      Portables::sleep(100);
+      Portable::sleep(100);
     }
     while ((int)numDotRuns>=prev)
     {
@@ -229,7 +229,7 @@ bool DotManager::run() const
       m_workers.at(i)->wait();
     }
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
   if (setPath)
   {
     unsetDotFontPath();
diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp
index 07a5d3f..fbfeaca 100644
--- a/src/dotrunner.cpp
+++ b/src/dotrunner.cpp
@@ -34,7 +34,7 @@
 // support the PNG format, we need to check the result.
 static void checkPngResult(const char *imgName)
 {
-  FILE *f = Portables::fopen(imgName,"rb");
+  FILE *f = Portable::fopen(imgName,"rb");
   if (f)
   {
     char data[4];
@@ -115,7 +115,7 @@ bool DotRunner::readBoundingBox(const char *fileName,int *width,int *height,bool
 {
   const char *bb = isEps ? "%%PageBoundingBox:" : "/MediaBox [";
   int bblen = strlen(bb);
-  FILE *f = Portables::fopen(fileName,"rb");
+  FILE *f = Portable::fopen(fileName,"rb");
   if (!f) 
   {
     //printf("readBoundingBox: could not open %s\n",fileName);
@@ -191,14 +191,14 @@ bool DotRunner::run()
       dotArgs+=' ';
       dotArgs+=s->args.data();
     }
-    if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+    if ((exitCode=Portable::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
   }
   else
   {
     for (li.toFirst();(s=li.current());++li)
     {
       dotArgs=QCString("\"")+m_file.data()+"\" "+s->args.data();
-      if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+      if ((exitCode=Portable::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
     }
   }
 
@@ -214,7 +214,7 @@ bool DotRunner::run()
       {
         if (!resetPDFSize(width,height,getBaseNameOfOutput(s->output.data()))) goto error;
         dotArgs=QCString("\"")+m_file.data()+"\" "+s->args.data();
-        if ((exitCode=Portables::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
+        if ((exitCode=Portable::system(m_dotExe.data(),dotArgs,FALSE))!=0) goto error;
       }
     }
 
@@ -228,14 +228,14 @@ bool DotRunner::run()
   if (m_cleanUp) 
   {
     //printf("removing dot file %s\n",m_file.data());
-    Portables::unlink(m_file.data());
+    Portable::unlink(m_file.data());
   }
 
   // create checksum file
   if (!m_md5Hash.isEmpty()) 
   {
     QCString md5Name = getBaseNameOfOutput(m_file.data()) + ".md5";
-    FILE *f = Portables::fopen(md5Name,"w");
+    FILE *f = Portable::fopen(md5Name,"w");
     if (f)
     {
       fwrite(m_md5Hash.data(),1,32,f); 
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 30885f5..4c489d2 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10086,13 +10086,13 @@ class NullOutlineParser : public OutlineParserInterface
 void initDoxygen()
 {
   initResources();
-  const char *lang = Portables::getenv("LC_ALL");
-  if (lang) Portables::setenv("LANG",lang);
+  const char *lang = Portable::getenv("LC_ALL");
+  if (lang) Portable::setenv("LANG",lang);
   setlocale(LC_ALL,"");
   setlocale(LC_CTYPE,"C"); // to get isspace(0xA0)==0, needed for UTF-8
   setlocale(LC_NUMERIC,"C");
 
-  Portables::correct_path();
+  Portable::correct_path();
 
   Doxygen::runningTime.start();
   Doxygen::preprocessor = new Preprocessor();
@@ -11128,7 +11128,7 @@ void parseInput()
   signal(SIGINT, stopDoxygen);
 #endif
 
-  uint pid = Portables::pid();
+  uint pid = Portable::pid();
   Doxygen::objDBFileName.sprintf("doxygen_objdb_%d.tmp",pid);
   Doxygen::objDBFileName.prepend(outputDirectory+"/");
   Doxygen::entryDBFileName.sprintf("doxygen_entrydb_%d.tmp",pid);
@@ -11188,18 +11188,18 @@ void parseInput()
     QCString curFontPath = Config_getString(DOT_FONTPATH);
     if (curFontPath.isEmpty())
     {
-      Portables::getenv("DOTFONTPATH");
+      Portable::getenv("DOTFONTPATH");
       QCString newFontPath = ".";
       if (!curFontPath.isEmpty())
       {
-        newFontPath+=Portables::pathListSeparator();
+        newFontPath+=Portable::pathListSeparator();
         newFontPath+=curFontPath;
       }
-      Portables::setenv("DOTFONTPATH",newFontPath);
+      Portable::setenv("DOTFONTPATH",newFontPath);
     }
     else
     {
-      Portables::setenv("DOTFONTPATH",curFontPath);
+      Portable::setenv("DOTFONTPATH",curFontPath);
     }
   }
 
@@ -11824,7 +11824,7 @@ void generateOutput()
       {
         searchDataFile="searchdata.xml";
       }
-      if (!Portables::isAbsolutePath(searchDataFile))
+      if (!Portable::isAbsolutePath(searchDataFile))
       {
         searchDataFile.prepend(Config_getString(OUTPUT_DIRECTORY)+"/");
       }
@@ -11886,13 +11886,13 @@ void generateOutput()
     g_s.begin("Running html help compiler...\n");
     QString oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
-    Portables::setShortDir();
-    Portables::sysTimerStart();
-    if (Portables::system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
+    Portable::setShortDir();
+    Portable::sysTimerStart();
+    if (Portable::system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1)
     {
       err("failed to run html help compiler on index.hhp\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     QDir::setCurrent(oldDir);
     g_s.end();
   }
@@ -11907,12 +11907,12 @@ void generateOutput()
     QCString const args = QCString().sprintf("%s -o \"%s\"", qhpFileName.data(), qchFileName.data());
     QString const oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString(HTML_OUTPUT));
-    Portables::sysTimerStart();
-    if (Portables::system(Config_getString(QHG_LOCATION), args.data(), FALSE))
+    Portable::sysTimerStart();
+    if (Portable::system(Config_getString(QHG_LOCATION), args.data(), FALSE))
     {
       err("failed to run qhelpgenerator on index.qhp\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     QDir::setCurrent(oldDir);
     g_s.end();
   }
@@ -11933,7 +11933,7 @@ void generateOutput()
   {
     msg("Total elapsed time: %.3f seconds\n(of which %.3f seconds waiting for external tools to finish)\n",
          ((double)Doxygen::runningTime.elapsed())/1000.0,
-         Portables::getSysElapsedTime()
+         Portable::getSysElapsedTime()
         );
     g_s.print();
   }
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 01cadb2..e028bab 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -2015,7 +2015,7 @@ void FileDefImpl::acquireFileVersion()
     msg("Version of %s : ",m_filePath.data());
     QCString cmd = vercmd+" \""+m_filePath+"\"";
     Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-    FILE *f=Portables::popen(cmd,"r");
+    FILE *f=Portable::popen(cmd,"r");
     if (!f)
     {
       err("could not execute %s\n",vercmd.data());
@@ -2024,7 +2024,7 @@ void FileDefImpl::acquireFileVersion()
     const int bufSize=1024;
     char buf[bufSize];
     int numRead = (int)fread(buf,1,bufSize-1,f);
-    Portables::pclose(f);
+    Portable::pclose(f);
     if (numRead>0 && numRead<bufSize)
     {
       buf[numRead]='\0';
diff --git a/src/formula.cpp b/src/formula.cpp
index 9224c56..c884eba 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -100,15 +100,15 @@ void FormulaList::generateBitmaps(const char *path)
     //printf("Running latex...\n");
     //system("latex _formulas.tex </dev/null >/dev/null");
     QCString latexCmd = "latex";
-    Portables::sysTimerStart();
-    if (Portables::system(latexCmd,"_formulas.tex")!=0)
+    Portable::sysTimerStart();
+    if (Portable::system(latexCmd,"_formulas.tex")!=0)
     {
       err("Problems running latex. Check your installation or look "
           "for typos in _formulas.tex and check _formulas.log!\n");
       formulaError=TRUE;
       //return;
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
     //printf("Running dvips...\n");
     QListIterator<int> pli(pagesToGenerate);
     int *pagePtr;
@@ -125,27 +125,27 @@ void FormulaList::generateBitmaps(const char *path)
       // postscript file.
       sprintf(dviArgs,"-q -D 600 -n 1 -p %d -o %s_tmp.ps _formulas.dvi",
           pageIndex,formBase.data());
-      Portables::sysTimerStart();
-      if (Portables::system("dvips",dviArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system("dvips",dviArgs)!=0)
       {
         err("Problems running dvips. Check your installation!\n");
-        Portables::sysTimerStop();
+        Portable::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       // run ps2epsi to convert to an encapsulated postscript file with
       // boundingbox (dvips with -E has some problems here).
       sprintf(psArgs,"%s_tmp.ps %s.eps",formBase.data(),formBase.data()); 
-      Portables::sysTimerStart();
-      if (Portables::system("ps2epsi",psArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system("ps2epsi",psArgs)!=0)
       {
         err("Problems running ps2epsi. Check your installation!\n");
-        Portables::sysTimerStop();
+        Portable::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       // now we read the generated postscript file to extract the bounding box
       QFileInfo fi(formBase+".eps");
       if (fi.exists())
@@ -198,15 +198,15 @@ void FormulaList::generateBitmaps(const char *path)
                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
                     formBase.data(),formBase.data()
              );
-      Portables::sysTimerStart();
-      if (Portables::system(Portables::ghostScriptCommand(),gsArgs)!=0)
+      Portable::sysTimerStart();
+      if (Portable::system(Portable::ghostScriptCommand(),gsArgs)!=0)
       {
-        err("Problem running ghostscript %s %s. Check your installation!\n",Portables::ghostScriptCommand(),gsArgs);
-        Portables::sysTimerStop();
+        err("Problem running ghostscript %s %s. Check your installation!\n",Portable::ghostScriptCommand(),gsArgs);
+        Portable::sysTimerStop();
         QDir::setCurrent(oldDir);
         return;
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
       f.setName(formBase+".pnm");
       uint imageX=0,imageY=0;
       // we read the generated image again, to obtain the pixel data.
diff --git a/src/htags.cpp b/src/htags.cpp
index 56840e0..1a240b1 100644
--- a/src/htags.cpp
+++ b/src/htags.cpp
@@ -89,13 +89,13 @@ bool Htags::execute(const QCString &htmldir)
   QCString oldDir = QDir::currentDirPath().utf8();
   QDir::setCurrent(g_inputDir.absPath());
   //printf("CommandLine=[%s]\n",commandLine.data());
-  Portables::sysTimerStart();
-  bool result=Portables::system("htags",commandLine,FALSE)==0;
+  Portable::sysTimerStart();
+  bool result=Portable::system("htags",commandLine,FALSE)==0;
   if (!result)
   {
     err("Problems running %s. Check your installation\n", "htags");
   }
-  Portables::sysTimerStop();
+  Portable::sysTimerStop();
   QDir::setCurrent(oldDir);
   return result;
 }
diff --git a/src/message.cpp b/src/message.cpp
index 283ddfd..591267d 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -90,7 +90,7 @@ void initWarningFormat()
 
   if (!Config_getString(WARN_LOGFILE).isEmpty())
   {
-    warnFile = Portables::fopen(Config_getString(WARN_LOGFILE),"w");
+    warnFile = Portable::fopen(Config_getString(WARN_LOGFILE),"w");
   }
   if (!warnFile) // point it to something valid, because warn() relies on it
   {
diff --git a/src/msc.cpp b/src/msc.cpp
index 9b80c53..29c9334 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -95,7 +95,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
                            const char *outFile,MscOutputFormat format)
 {
   QCString absOutFile = outDir;
-  absOutFile+=Portables::pathSeparator();
+  absOutFile+=Portable::pathSeparator();
   absOutFile+=outFile;
 
   mscgen_format_t msc_format;
@@ -130,12 +130,12 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          absOutFile.data(),absOutFile.data());
-    Portables::sysTimerStart();
-    if (Portables::system("epstopdf",epstopdfArgs)!=0)
+    Portable::sysTimerStart();
+    if (Portable::system("epstopdf",epstopdfArgs)!=0)
     {
       err("Problems running epstopdf. Check your TeX installation!\n");
     }
-    Portables::sysTimerStop();
+    Portable::sysTimerStop();
   }
 
   Doxygen::indexList->addImageFile(imgName);
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index bad89e3..fa50f2d 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -210,7 +210,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
   }
   while (s)
   {
-    pumlArgs += Portables::pathListSeparator();
+    pumlArgs += Portable::pathListSeparator();
     pumlArgs += s;
     s = pumlIncludePathList.next(); 
   }
@@ -227,7 +227,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
     pumlArgs += "-graphvizdot \"";
     pumlArgs += dotPath;
     pumlArgs += "dot";
-    pumlArgs += Portables::commandExtension();
+    pumlArgs += Portable::commandExtension();
     pumlArgs += "\" ";
   }
   switch (format)
@@ -283,8 +283,8 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
       file.close();
       Debug::print(Debug::Plantuml,0,"*** %s Running Plantuml arguments:%s\n","PlantumlManager::runPlantumlContent",qPrint(pumlArguments));
 
-      Portables::sysTimerStart();
-      if ((exitCode=Portables::system(pumlExe,pumlArguments,TRUE))!=0)
+      Portable::sysTimerStart();
+      if ((exitCode=Portable::system(pumlExe,pumlArguments,TRUE))!=0)
       {
         err("Problems running PlantUML. Verify that the command 'java -jar \"%splantuml.jar\" -h' works from the command line. Exit code: %d\n",
             plantumlJarPath.data(),exitCode);
@@ -294,7 +294,7 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
         Debug::print(Debug::Plantuml,0,"*** %s Remove %s file\n","PlantumlManager::runPlantumlContent",qPrint(puFileName));
         file.remove();
       }
-      Portables::sysTimerStop();
+      Portable::sysTimerStop();
 
       if ( (format==PlantumlManager::PUML_EPS) && (Config_getBool(USE_PDFLATEX)) )
       {
@@ -309,12 +309,12 @@ static void runPlantumlContent(const QDict< QList <QCString> > &plantumlFiles,
             const int maxCmdLine = 40960;
             QCString epstopdfArgs(maxCmdLine);
             epstopdfArgs.sprintf("\"%s%s.eps\" --outfile=\"%s%s.pdf\"",qPrint(pumlOutDir),qPrint(*nb),qPrint(pumlOutDir),qPrint(*nb));
-            Portables::sysTimerStart();
-            if ((exitCode=Portables::system("epstopdf",epstopdfArgs))!=0)
+            Portable::sysTimerStart();
+            if ((exitCode=Portable::system("epstopdf",epstopdfArgs))!=0)
             {
               err("Problems running epstopdf. Check your TeX installation! Exit code: %d\n",exitCode);
             }
-            Portables::sysTimerStop();
+            Portable::sysTimerStop();
           }
         }
       }
diff --git a/src/portable.cpp b/src/portable.cpp
index 99e54fd..1134351 100644
--- a/src/portable.cpp
+++ b/src/portable.cpp
@@ -37,7 +37,7 @@ static double  g_sysElapsedTime;
 static QTime   g_time;
 
 
-int Portables::system(const char *command,const char *args,bool commandHasConsole)
+int Portable::system(const char *command,const char *args,bool commandHasConsole)
 {
 
   if (command==0) return 1;
@@ -196,7 +196,7 @@ int Portables::system(const char *command,const char *args,bool commandHasConsol
 
 }
 
-unsigned int Portables::pid(void)
+unsigned int Portable::pid(void)
 {
   unsigned int pid;
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -240,7 +240,7 @@ void loadEnvironment()
 }
 #endif
 
-void Portables::setenv(const char *name,const char *value)
+void Portable::setenv(const char *name,const char *value)
 {
     if (value==0) value="";
 #if defined(_WIN32) && !defined(__CYGWIN__)
@@ -255,7 +255,7 @@ void Portables::setenv(const char *name,const char *value)
 #endif
 }
 
-void Portables::unsetenv(const char *variable)
+void Portable::unsetenv(const char *variable)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     SetEnvironmentVariable(variable,0);
@@ -276,7 +276,7 @@ void Portables::unsetenv(const char *variable)
 #endif
 }
 
-const char *Portables::getenv(const char *variable)
+const char *Portable::getenv(const char *variable)
 {  
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return ::getenv(variable);
@@ -297,7 +297,7 @@ const char *Portables::getenv(const char *variable)
 #endif
 }
 
-portable_off_t Portables::fseek(FILE *f,portable_off_t offset, int whence)
+portable_off_t Portable::fseek(FILE *f,portable_off_t offset, int whence)
 {
 #if defined(__MINGW32__)
   return fseeko64(f,offset,whence);
@@ -308,7 +308,7 @@ portable_off_t Portables::fseek(FILE *f,portable_off_t offset, int whence)
 #endif
 }
 
-portable_off_t Portables::ftell(FILE *f)
+portable_off_t Portable::ftell(FILE *f)
 {
 #if defined(__MINGW32__)
   return ftello64(f);  
@@ -319,7 +319,7 @@ portable_off_t Portables::ftell(FILE *f)
 #endif
 }
 
-FILE *Portables::fopen(const char *fileName,const char *mode)
+FILE *Portable::fopen(const char *fileName,const char *mode)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   QString fn(fileName);
@@ -330,7 +330,7 @@ FILE *Portables::fopen(const char *fileName,const char *mode)
 #endif
 }
 
-char  Portables::pathSeparator(void)
+char  Portable::pathSeparator(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return '\\';
@@ -339,7 +339,7 @@ char  Portables::pathSeparator(void)
 #endif
 }
 
-char  Portables::pathListSeparator(void)
+char  Portable::pathListSeparator(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   return ';';
@@ -348,7 +348,7 @@ char  Portables::pathListSeparator(void)
 #endif
 }
 
-const char *Portables::ghostScriptCommand(void)
+const char *Portable::ghostScriptCommand(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return "gswin32c.exe";
@@ -357,7 +357,7 @@ const char *Portables::ghostScriptCommand(void)
 #endif
 }
 
-const char *Portables::commandExtension(void)
+const char *Portable::commandExtension(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
     return ".exe";
@@ -366,7 +366,7 @@ const char *Portables::commandExtension(void)
 #endif
 }
 
-bool Portables::fileSystemIsCaseSensitive(void)
+bool Portable::fileSystemIsCaseSensitive(void)
 {
 #if defined(_WIN32) || defined(macintosh) || defined(__MACOSX__) || defined(__APPLE__) || defined(__CYGWIN__)
   return FALSE;
@@ -375,7 +375,7 @@ bool Portables::fileSystemIsCaseSensitive(void)
 #endif
 }
 
-FILE * Portables::popen(const char *name,const char *type)
+FILE * Portable::popen(const char *name,const char *type)
 {
   #if defined(_MSC_VER) || defined(__BORLANDC__)
   return ::_popen(name,type);
@@ -384,7 +384,7 @@ FILE * Portables::popen(const char *name,const char *type)
   #endif
 }
 
-int Portables::pclose(FILE *stream)
+int Portable::pclose(FILE *stream)
 {
   #if defined(_MSC_VER) || defined(__BORLANDC__)
   return ::_pclose(stream);
@@ -393,22 +393,22 @@ int Portables::pclose(FILE *stream)
   #endif
 }
 
-void Portables::sysTimerStart(void)
+void Portable::sysTimerStart(void)
 {
   g_time.start();
 }
 
-void Portables::sysTimerStop(void)
+void Portable::sysTimerStop(void)
 {
   g_sysElapsedTime+=((double)g_time.elapsed())/1000.0;
 }
 
-double Portables::getSysElapsedTime(void)
+double Portable::getSysElapsedTime(void)
 {
   return g_sysElapsedTime;
 }
 
-void Portables::sleep(int ms)
+void Portable::sleep(int ms)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   Sleep(ms);
@@ -417,7 +417,7 @@ void Portables::sleep(int ms)
 #endif
 }
 
-bool Portables::isAbsolutePath(const char *fileName)
+bool Portable::isAbsolutePath(const char *fileName)
 {
 # ifdef _WIN32
   if (isalpha (fileName [0]) && fileName[1] == ':')
@@ -439,17 +439,17 @@ bool Portables::isAbsolutePath(const char *fileName)
  *
  * This routine was inspired by the cause for bug 766059 was that in the Windows path there were forward slashes.
  */
-void Portables::correct_path(void)
+void Portable::correct_path(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-  const char *p = Portables::getenv("PATH");
+  const char *p = Portable::getenv("PATH");
   if (!p) return; // no path nothing to correct
   QCString result = substitute(p,'/','\\');
-  if (result!=p) Portables::setenv("PATH",result.data());
+  if (result!=p) Portable::setenv("PATH",result.data());
 #endif
 }
 
-void Portables::unlink(const char *fileName)
+void Portable::unlink(const char *fileName)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   _unlink(fileName);
@@ -458,7 +458,7 @@ void Portables::unlink(const char *fileName)
 #endif
 }
 
-void Portables::setShortDir(void)
+void Portable::setShortDir(void)
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
   long     length = 0;
@@ -474,4 +474,4 @@ void Portables::setShortDir(void)
   QDir::setCurrent(buffer);
   delete [] buffer;
 #endif
-}
\ No newline at end of file
+}
diff --git a/src/portable.h b/src/portable.h
index 7160d61..27b7052 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -17,7 +17,7 @@ typedef off_t portable_off_t;
  *  @brief Portable versions of functions that are platform dependent.
  */
 
-namespace Portables
+namespace Portable
 {
   int            system(const char *command,const char *args,bool commandHasConsole=true);
   unsigned int   pid(void);
diff --git a/src/pre.l b/src/pre.l
index e572f40..2a66146 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1826,7 +1826,7 @@ static FileState *findFile(yyscan_t yyscanner, const char *fileName,bool localIn
 {
   YY_EXTRA_TYPE state = preYYget_extra(yyscanner);
   //printf("** findFile(%s,%d) state->yyFileName=%s\n",fileName,localInclude,state->yyFileName.data());
-  if (Portables::isAbsolutePath(fileName))
+  if (Portable::isAbsolutePath(fileName))
   {
     FileState *fs = checkAndOpenFile(yyscanner,fileName,alreadyIncluded);
     if (fs)
diff --git a/src/util.cpp b/src/util.cpp
index 92d5548..fe3c65f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2428,7 +2428,7 @@ static QCString getFilterFromList(const char *name,const QStrList &filterList,bo
     if (i_equals!=-1)
     {
       QCString filterPattern = fs.left(i_equals);
-      QRegExp fpat(filterPattern,Portables::fileSystemIsCaseSensitive(),TRUE); 
+      QRegExp fpat(filterPattern,Portable::fileSystemIsCaseSensitive(),TRUE); 
       if (fpat.match(name)!=-1) 
       {
         // found a match!
@@ -2589,7 +2589,7 @@ QCString fileToString(const char *name,bool filter,bool isSourceCode)
 static QDateTime getCurrentDateTime()
 {
   QDateTime current = QDateTime::currentDateTime();
-  QCString sourceDateEpoch = Portables::getenv("SOURCE_DATE_EPOCH");
+  QCString sourceDateEpoch = Portable::getenv("SOURCE_DATE_EPOCH");
   if (!sourceDateEpoch.isEmpty())
   {
     bool ok;
@@ -8019,7 +8019,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
   {
     QCString cmd=filterName+" \""+fileName+"\"";
     Debug::print(Debug::ExtCmd,0,"Executing popen(`%s`)\n",qPrint(cmd));
-    FILE *f=Portables::popen(cmd,"r");
+    FILE *f=Portable::popen(cmd,"r");
     if (!f)
     {
       err("could not execute filter %s\n",filterName.data());
@@ -8033,7 +8033,7 @@ bool readInputFile(const char *fileName,BufStr &inBuf,bool filter,bool isSourceC
       //printf(">>>>>>>>Reading %d bytes\n",numRead);
       inBuf.addArray(buf,numRead),size+=numRead;
     }
-    Portables::pclose(f);
+    Portable::pclose(f);
     inBuf.at(inBuf.curPos()) ='\0';
     Debug::print(Debug::FilterOutput, 0, "Filter output\n");
     Debug::print(Debug::FilterOutput,0,"-------------\n%s\n-------------\n",qPrint(inBuf));
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index 4ee0151..66d8384 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -169,7 +169,7 @@ static void createSVG()
 
     QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
-    if (Portables::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
+    if (Portable::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
     {
       err("could not create dot file");
     }
@@ -3796,7 +3796,7 @@ void FlowChart::createSVG()
 
   QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
-  if (Portables::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
+  if (Portable::system(Config_getString(DOT_PATH) + "dot",vlargs)!=0)
   {
     err("could not create dot file");
   }
-- 
cgit v0.12


From 994b081aac309954a7984929329fbcd5c5cf8883 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 10 Dec 2019 21:20:54 +0100
Subject: issue #7412: HTML: Opening a reference link in a new tab does not
 scroll to the content

---
 src/htmlgen.cpp          | 9 ++-------
 src/scanner.l            | 7 +++++--
 templates/html/resize.js | 1 +
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index df39d32..19a1869 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -300,12 +300,7 @@ static QCString substituteHtmlKeywords(const QCString &s,
     treeViewCssJs = "<link href=\"$relpath^navtree.css\" rel=\"stylesheet\" type=\"text/css\"/>\n"
 			"<script type=\"text/javascript\" src=\"$relpath^resize.js\"></script>\n"
 			"<script type=\"text/javascript\" src=\"$relpath^navtreedata.js\"></script>\n"
-			"<script type=\"text/javascript\" src=\"$relpath^navtree.js\"></script>\n"
-			"<script type=\"text/javascript\">\n"
-			"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
-			"  $(document).ready(initResizable);\n"
-			"/* @license-end */"
-			"</script>";
+			"<script type=\"text/javascript\" src=\"$relpath^navtree.js\"></script>\n";
   }
 
   if (searchEngine)
@@ -2372,7 +2367,7 @@ QCString HtmlGenerator::writeSplitBarAsString(const char *name,const char *relpa
 											"$(document).ready(function(){initNavTree('") +
 			QCString(name) + Doxygen::htmlFileExtension +
 			QCString("','") + relpath +
-			QCString("');});\n"
+			QCString("'); initResizable(); });\n"
 							 "/* @license-end */\n"
 							 "</script>\n"
 							 "<div id=\"doc-content\">\n");
diff --git a/src/scanner.l b/src/scanner.l
index 0e3aeb0..7115129 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1941,6 +1941,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  }
   					}
 <CopyHereDocEnd>\n			{ 
+                                          lineCount(yyscanner);
                                           *yyextra->pCopyHereDocGString += yytext;
                                         }
 <CopyHereDocEnd>{ID}			{ 
@@ -7186,10 +7187,12 @@ static void parseMain(yyscan_t yyscanner,
   //depthIf       = 0;
   yyextra->protection    = Public;
   yyextra->mtype         = Method;
-  yyextra->stat         = FALSE;
+  yyextra->stat          = FALSE;
   yyextra->virt          = Normal;
   yyextra->current_root  = rt;
-  yyextra->yyLineNr= 1 ; 
+  yyextra->yyLineNr      = 1 ;
+  yyextra->yyBegLineNr   = 1;
+  yyextra->yyBegColNr    = 0;
   yyextra->yyFileName = fileName;
   setContext(yyscanner);
   bool processWithClang = yyextra->insideCpp || yyextra->insideObjC;
diff --git a/templates/html/resize.js b/templates/html/resize.js
index f5291d9..a0bb5f4 100644
--- a/templates/html/resize.js
+++ b/templates/html/resize.js
@@ -91,6 +91,7 @@ function initResizable()
       }
       collapsedWidth=width;
     }
+    (document.getElementById(location.hash.slice(1))||document.body).scrollIntoView();
   }
 
   function collapseExpand()
-- 
cgit v0.12


From 1a5bbadb43b2d30e338d26a0d495b60e2b12f704 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 11 Dec 2019 20:14:29 +0100
Subject: issue #7436 Incorrect handling of block comments in VHDL

The search for `/*` or /*!` ended at the last `*/` in a file and thus skipping other intermediate block end and new starts. Also the intermediate code was lost see as comment.
The filter pattern used was incorrect and should have been `<"/*" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/">` (thanks to https://javacc.org/contrib/C.jj).
Here also the space plus one or more `*` at the end beginning of the line are still incorporated as well as multiple `*` before the colosing `*/` this is also filtered.
---
 src/growbuf.h            |  1 +
 src/vhdljjparser.cpp     | 35 ++++++++++++++++++++++++++++++++++-
 src/vhdljjparser.h       |  2 +-
 vhdlparser/vhdlparser.jj | 12 ++++++------
 4 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/growbuf.h b/src/growbuf.h
index 4c49dce..bf6d74e 100644
--- a/src/growbuf.h
+++ b/src/growbuf.h
@@ -47,6 +47,7 @@ class GrowBuf
                       }
     const char *get()     { return str; }
     int getPos() const    { return pos; }
+    void setPos(const int newPos) { pos = newPos; }
     char at(int i) const  { return str[i]; }
   private:
     char *str;
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index 8b7ebf6..4848a3e 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -29,6 +29,7 @@
 #include "arguments.h"
 #include "types.h"
 #include "VhdlParserIF.h"
+#include "growbuf.h"
 
 using namespace vhdl::parser;
 using namespace std;
@@ -169,7 +170,7 @@ void VhdlParser::lineCount(const char* text)
 {
   for (const char* c=text ; *c ; ++c )
   {
-    yyLineNr += (*c == '\n') ;
+    if (*c == '\n') yyLineNr++;
   }
 }
 
@@ -744,3 +745,35 @@ const char *getVhdlFileName(void)
 {
   return vhdlFileName;
 }
+
+QCString filter2008VhdlComment(const char *s)
+{
+  GrowBuf growBuf;
+  const char *p=s+3; // skip /*!
+  char c,pc='\0';
+  while (*p == ' ' || *p == '\t') p++;
+  while ((c=*p++))
+  {
+    growBuf.addChar(c);
+    if (c == '\n')
+    {
+      // special handling of space followed by * at beginning of line
+      while (*p == ' ' || *p == '\t') p++;
+      while (*p == '*') p++;
+      // special attention in case character at end is /
+      if (*p == '/') p++;
+    }
+  }
+  // special attention in case */ at end of last line
+  int len = growBuf.getPos();
+  if (growBuf.at(len-1) == '/' && growBuf.at(len-2) == '*')
+  {
+    len -= 2;
+    while (growBuf.at(len-1) == '*') len--;
+    c = growBuf.at(len-1);
+    while ((c = growBuf.at(len-1)) == ' ' || c == '\t') len--;
+    growBuf.setPos(len);
+  }
+  growBuf.addChar(0);
+  return growBuf.get();
+}
diff --git a/src/vhdljjparser.h b/src/vhdljjparser.h
index 53eb0be..f6cd17d 100644
--- a/src/vhdljjparser.h
+++ b/src/vhdljjparser.h
@@ -83,5 +83,5 @@ void vhdlscanFreeScanner();
 
 const QList<VhdlConfNode>& getVhdlConfiguration();
 const std::vector<std::shared_ptr<Entry> >&getVhdlInstList();
-
+QCString filter2008VhdlComment(const char *s);
 #endif
diff --git a/vhdlparser/vhdlparser.jj b/vhdlparser/vhdlparser.jj
index 8a76bc6..3151528 100644
--- a/vhdlparser/vhdlparser.jj
+++ b/vhdlparser/vhdlparser.jj
@@ -107,17 +107,17 @@ SKIP:
 // VHDL 2008 doxygen comment /*! .... */
 SKIP :
 {
-  <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!"  (~[])* "*/" >
+  <MULT_DOXYGEN_VHDL_COMMENT_2008 : "/*!" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/">
   {
    {
-     QCString q(image.data());
-     q.stripPrefix("/*!");
-     q.resize(q.length()-2);
+     QCString q = filter2008VhdlComment(image.data());
      ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
    }
   }
-  | <MULT_VHDL_2008_COMMENT : "/*"  (~[])* "*/" >  {::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();}
-}
+  | <MULT_VHDL_2008_COMMENT : "/*" (~["*"])* "*" ("*" | ~["*","/"] (~["*"])* "*")* "/">
+    {
+      ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();}
+    }
 
 /* KEYWORDS */
 
-- 
cgit v0.12


From ac303e2ff9e3a66cbe128c30c2986ed92851ceb6 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 11 Dec 2019 20:32:22 +0100
Subject: issue #7436 Incorrect handling of block comments in VHDL

Added some documentation
---
 doc/docblocks.doc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/docblocks.doc b/doc/docblocks.doc
index 9d14f6e..a427b76 100644
--- a/doc/docblocks.doc
+++ b/doc/docblocks.doc
@@ -513,6 +513,9 @@ Here is an example VHDL file with doxygen comments:
  for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
  \endlatexonly
 
+As of VHDL 2008 it is also to use `/&zwj;*` type comments. Doxygen will handle `/&zwj;* ... *&zwj;/`
+as plain comments and `/&zwj;*! ... *&zwj;/` comments as special doxygen comments with documentaton.
+
 To get proper looking output you need to set
 \ref cfg_optimize_output_vhdl "OPTIMIZE_OUTPUT_VHDL" to \c YES in the
 configuration file. This will also affect a number of other settings. When they
-- 
cgit v0.12


From fe233524d5637944e66d08a3f1bed05e14107956 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 12 Dec 2019 13:27:46 +0100
Subject: Adding JAVACC_FLAGS for javacc compilation

During transition to cmake build the, essential for debugging, flag possibility was not added.
(Added analogous to LEX_FLAGS and YACC_Flags).

Available debug options (according to old Makefile):
  `-debug_parser`
  `-debug_token_manager`
  `-debug_lookahead`
---
 CMakeLists.txt            | 2 ++
 vhdlparser/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2644ceb..8ab5aa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,9 +82,11 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
 if (CMAKE_GENERATOR MATCHES "Ninja")
   set(LEX_FLAGS )
   set(YACC_FLAGS )
+  set(JAVACC_FLAGS )
 else ()
   set(LEX_FLAGS $(LEX_FLAGS))
   set(YACC_FLAGS $(YACC_FLAGS))
+  set(JAVACC_FLAGS $(JAVACC_FLAGS))
 endif ()
 
 find_program(DOT NAMES dot)
diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt
index ad5af28..43dc74d 100644
--- a/vhdlparser/CMakeLists.txt
+++ b/vhdlparser/CMakeLists.txt
@@ -1,7 +1,7 @@
 find_package(Javacc)
 if (JAVACC_FOUND)
     add_custom_command(
-        COMMAND ${JAVACC_EXECUTABLE} -OUTPUT_DIRECTORY=${CMAKE_SOURCE_DIR}/vhdlparser ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj
+        COMMAND ${JAVACC_EXECUTABLE} ${JAVACC_FLAGS} -OUTPUT_DIRECTORY=${CMAKE_SOURCE_DIR}/vhdlparser ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj
         DEPENDS ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj
         OUTPUT ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.cc ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.h ${CMAKE_SOURCE_DIR}/vhdlparser/ErrorHandler.h ${CMAKE_SOURCE_DIR}/vhdlparser/JavaCC.h ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.cc ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.h ${CMAKE_SOURCE_DIR}/vhdlparser/Token.cc ${CMAKE_SOURCE_DIR}/vhdlparser/Token.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenManager.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.cc ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserConstants.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.h
     )
-- 
cgit v0.12


From 0e4dc3b329e8010bbff4a43761027f60fb61ecd3 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 12 Dec 2019 20:17:22 +0100
Subject: Revert to use of javacc-6.1.3 due to regression

---
 vhdlparser/CharStream.cc             |   22 +-
 vhdlparser/CharStream.h              |  246 +-
 vhdlparser/ErrorHandler.h            |   23 +-
 vhdlparser/ParseException.cc         |   50 +-
 vhdlparser/ParseException.h          |   22 +-
 vhdlparser/Token.cc                  |   37 +-
 vhdlparser/Token.h                   |   21 +-
 vhdlparser/TokenManager.h            |   21 +-
 vhdlparser/TokenMgrError.cc          |   26 +-
 vhdlparser/TokenMgrError.h           |   33 +-
 vhdlparser/VhdlParser.cc             | 5661 ++++++++++++++++++++++------------
 vhdlparser/VhdlParser.h              | 4650 +++++++++++++++-------------
 vhdlparser/VhdlParserConstants.h     |  384 +--
 vhdlparser/VhdlParserTokenManager.cc |  516 ++--
 vhdlparser/VhdlParserTokenManager.h  |   91 +-
 15 files changed, 7069 insertions(+), 4734 deletions(-)

diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc
index 05003ef..bcc83ba 100644
--- a/vhdlparser/CharStream.cc
+++ b/vhdlparser/CharStream.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "CharStream.h"
 
@@ -12,8 +12,8 @@ void ArrayCopy(T* src, int src_offset, T* dest, int dest_offset, int len) {
 
 class StringReaderStream : public ReaderStream {
  public:
-  StringReaderStream(const JJString& str) : str_(str), cur_(0), max_(str.size()) {}
-  virtual size_t read(JJChar *bufptr, int offset, size_t len) {
+  StringReaderStream(const JAVACC_STRING_TYPE& str) : str_(str), cur_(0), max_(str.size()) {}
+  virtual size_t read(JAVACC_CHAR_TYPE *bufptr, int offset, size_t len) {
     size_t count = str_.copy(bufptr + offset, len > max_ ? max_ : len, cur_);
     cur_ += count;
     max_ -= count;
@@ -25,7 +25,7 @@ class StringReaderStream : public ReaderStream {
   }
 
  private:
-  const JJString str_;
+  const JAVACC_STRING_TYPE str_;
   size_t cur_;
   size_t max_;
 };
@@ -33,7 +33,7 @@ class StringReaderStream : public ReaderStream {
 
 namespace vhdl {
 namespace parser {
-void CharStream::ReInit(const JJString& str, int startline,
+void CharStream::ReInit(const JAVACC_STRING_TYPE& str, int startline,
                         int startcolumn, int buffersize) {
   StringReaderStream *stream = new StringReaderStream(str);
   ReInit(stream, startline, startcolumn, buffersize);
@@ -46,12 +46,12 @@ void CharStream::ReInit(ReaderStream *input_stream, int startline,
    delete inputStream;
   }
 
-  if (buffer) {
+  if (buffer != NULL) {
     DeleteBuffers();
   }
 
   available = bufsize = buffersize;
-  buffer = new JJChar[buffersize];
+  buffer = new JAVACC_CHAR_TYPE[buffersize];
   bufline = new int[buffersize];
   bufcolumn = new int[buffersize];
 
@@ -111,7 +111,7 @@ void CharStream::adjustBeginLineColumn(int newLine, int newCol) {
 }
 
 void CharStream::ExpandBuff(bool wrapAround) {
-  JJChar *newbuffer = new JJChar[bufsize + 2048];
+  JAVACC_CHAR_TYPE *newbuffer = new JAVACC_CHAR_TYPE[bufsize + 2048];
   int *newbufline = new int[bufsize + 2048];
   int *newbufcolumn = new int[bufsize + 2048];
 
@@ -160,7 +160,7 @@ void CharStream::FillBuff() {
     }
   }
 
-  size_t i = inputStream->read(buffer, maxNextCharInd, available - maxNextCharInd);
+  int i = inputStream->read(buffer, maxNextCharInd, available - maxNextCharInd);
   if (i > 0) {
     maxNextCharInd += i;
   } else {
@@ -172,7 +172,7 @@ void CharStream::FillBuff() {
   }
 }
 
-void CharStream::UpdateLineColumn(JJChar c) {
+void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
   column++;
   if (prevCharIsLF) {
     prevCharIsLF = false;
@@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JJChar c) {
 
 }
 }
-/* JavaCC - OriginalChecksum=0ba78d6c493d812eba61de6fa794fd15 (do not edit this line) */
+/* JavaCC - OriginalChecksum=eff57228f86b403d970758af731465ce (do not edit this line) */
diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index a955d8e..12b58b8 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -1,8 +1,7 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_CHARSTREAM_H_
-#define JAVACC_CHARSTREAM_H_
-
+#ifndef CHARSTREAM_H
+#define CHARSTREAM_H
 #include "JavaCC.h"
 
 #ifndef INITIAL_BUFFER_SIZE
@@ -29,35 +28,17 @@ namespace parser {
 
 
 class CharStream {
-public:
-   void setTabSize(int i) { tabSize = i; }
-   int  getTabSize(int i) { return tabSize; }
-
-private:
-  int getBufcolumn(int pos) {
-    if (trackLineColumn && pos>=0) {
-      return bufcolumn[pos];
-    } else {
-      return -1;
-    }
-  }
-  int getBufline(int pos) {
-    if (trackLineColumn && pos>=0) {
-      return bufline[pos];
-    } else {
-      return -1;
-    }
-  }
-
-public:
-  virtual int getColumn()        { return getBufcolumn(bufpos); }
-  virtual int getLine()          { return getBufline(bufpos); }
-  virtual int getEndColumn()     { return getBufcolumn(bufpos); }
-  virtual int getEndLine()       { return getBufline(bufpos); }
-  virtual int getBeginColumn()   { return getBufcolumn(tokenBegin); }
-  virtual int getBeginLine()     { return getBufline(tokenBegin); }
-
-  virtual bool getTrackLineColumn()         { return trackLineColumn; }
+ public:
+  void setTabSize(int i) { tabSize = i; }
+  int getTabSize(int i) { return tabSize; }
+  virtual int getColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
+  virtual int getLine() { return trackLineColumn ? bufline[bufpos] : -1; }
+  virtual int getEndColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
+  virtual int getEndLine() { return trackLineColumn ? bufline[bufpos] : -1; }
+  virtual int getBeginColumn() { return trackLineColumn ? bufcolumn[tokenBegin] : -1; }
+  virtual int getBeginLine() { return trackLineColumn ? bufline[tokenBegin] : -1; }
+
+  virtual bool getTrackLineColumn() { return trackLineColumn; }
   virtual void setTrackLineColumn(bool val) { trackLineColumn = val; }
 
 /**
@@ -66,25 +47,25 @@ public:
  * (longer) token. So, they will be used again as the prefix of the next
  * token and it is the implemetation's responsibility to do this right.
  */
-  virtual inline void backup(int amount) {
-    inBuf += amount;
-    bufpos -= amount;
-    if (bufpos < 0) {
-      bufpos += bufsize;
-    }
+virtual inline void backup(int amount) {
+  inBuf += amount;
+  bufpos -= amount;
+  if (bufpos < 0) {
+    bufpos += bufsize;
   }
+}
 
 /**
  * Returns the next character that marks the beginning of the next token.
  * All characters must remain in the buffer between two successive calls
  * to this method to implement backup correctly.
  */
-  virtual inline JJChar BeginToken() {
-    tokenBegin = -1;
-    JJChar c = readChar();
-    tokenBegin = bufpos;
-    return c;
-  }
+virtual inline JAVACC_CHAR_TYPE BeginToken() {
+  tokenBegin = -1;
+  JAVACC_CHAR_TYPE c = readChar();
+  tokenBegin = bufpos;
+  return c;
+}
 
 
 /**
@@ -92,30 +73,31 @@ public:
  * of selecting the input is the responsibility of the class
  * implementing this class.
  */
-  virtual inline JJChar readChar() {
-    if (inBuf > 0) {
-      --inBuf;
-      ++bufpos;
-      if (bufpos == bufsize) {
-        bufpos = 0;
-      }
-      return buffer[bufpos];
-    }
-
+virtual inline JAVACC_CHAR_TYPE readChar() {
+  if (inBuf > 0) {
+    --inBuf;
     ++bufpos;
-    if (bufpos >= maxNextCharInd) {
-      FillBuff();
+    if (bufpos == bufsize) {
+      bufpos = 0;
     }
 
-    JJChar c = buffer[bufpos];
+    return buffer[bufpos];
+  }
+
+  ++bufpos;
+  if (bufpos >= maxNextCharInd) {
+    FillBuff();
+  }
 
-    if (trackLineColumn) {
-      UpdateLineColumn(c);
-    }
+  JAVACC_CHAR_TYPE c = buffer[bufpos];
 
-    return c;
+  if (trackLineColumn) {
+    UpdateLineColumn(c);
   }
 
+  return c;
+}
+
 
   virtual void ExpandBuff(bool wrapAround);
   virtual void FillBuff();
@@ -126,11 +108,12 @@ public:
    * anything that they want to. For example, for efficiency, one might decide
    * to just return NULL, which is a valid implementation.
    */
-  virtual JJString GetImage() {
+  virtual JAVACC_STRING_TYPE GetImage() {
     if (bufpos >= tokenBegin)
-      return JJString(buffer + tokenBegin, bufpos - tokenBegin + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufpos - tokenBegin + 1);
     else
-      return JJString(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin)
+             .append(buffer, bufpos + 1);
   }
 
   /**
@@ -139,11 +122,12 @@ public:
    * for use in actions in the case of MORE. A simple and inefficient
    * implementation of this is as follows :
    */
-  virtual JJString GetSuffix(int len) {
+  virtual JAVACC_STRING_TYPE GetSuffix(int len) {
     if ((bufpos + 1) >= len) {
-      return JJString(buffer + bufpos - len + 1, len);
+      return JAVACC_STRING_TYPE(buffer + bufpos - len + 1, len);
     }
-    return JJString(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
+    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1)
+           .append(buffer, bufpos + 1);
   }
 
   /**
@@ -160,71 +144,74 @@ public:
   }
 
   bool endOfInput() {
-    return inBuf == 0 && bufpos + 1 >= maxNextCharInd && inputStream->endOfInput();
+    return inBuf == 0 && bufpos + 1 >= maxNextCharInd &&
+           inputStream->endOfInput();
   }
 
-  CharStream(const JJChar *buf, int sz, int startline,
+  CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline,
                       int startcolumn, int buffersize) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
-    ReInit(JJString(buf, sz), startline, startcolumn, buffersize);
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
+    ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize);
   }
 
-  CharStream(const JJChar *buf, int sz, int startline, int startcolumn) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
-    ReInit(JJString(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
+  CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) :
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
+    ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
-  CharStream(const JJString& str, int startline,
+  CharStream(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
     ReInit(str, startline, startcolumn, buffersize);
   }
 
-  CharStream(const JJString& str, int startline, int startcolumn) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+  CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) :
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0) ,tabSize(1), trackLineColumn(true){
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline,
              int startcolumn, int buffersize) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
-    ReInit(input_stream, startline, startcolumn, buffersize);
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
+    ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream) :
-    bufline(nullptr), bufcolumn(nullptr), buffer(nullptr), bufpos(0), bufsize(0), 
-    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
-    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
-    inputStream(nullptr), deleteStream(false) {
+    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
+    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
+    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
+    inBuf(0),tabSize(1), trackLineColumn(true) {
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn, int buffersize);
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn,
+                      int buffersize);
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn) {
+  virtual void ReInit(ReaderStream *input_stream, int startline,
+                      int startcolumn) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
@@ -232,40 +219,39 @@ public:
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(const JJString& str, int startline,
+  virtual void ReInit(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize);
 
-  virtual void ReInit(const JJString& str, int startline,
+  virtual void ReInit(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn) {
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   virtual void adjustBeginLineColumn(int newLine, int newCol);
 
-protected:
-  virtual void UpdateLineColumn(JJChar c);
-
-  int*               bufline;
-  int*               bufcolumn;
-  JJChar*  	         buffer;
-  int                bufpos;
-  int                bufsize;
-  int                tokenBegin;
-  int                column;
-  int                line;
-  bool               prevCharIsCR;
-  bool               prevCharIsLF;
-  int                available;
-  int                maxNextCharInd;
-  int                inBuf;
-  int                tabSize;
-  bool               trackLineColumn;
-  ReaderStream*      inputStream;
-  bool               deleteStream;
+ protected:
+  virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c);
+
+  int *bufline;
+  int *bufcolumn;
+  ReaderStream *inputStream;
+  bool deleteStream;
+  JAVACC_CHAR_TYPE * buffer;
+  int bufpos;
+  int bufsize;
+  int tokenBegin;
+  int column;
+  int line;
+  bool prevCharIsCR ;
+  bool prevCharIsLF ;
+  int available;
+  int maxNextCharInd;
+  int inBuf ;
+  int tabSize ;
+  bool trackLineColumn;
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=c5b4b2e72393f865547f405cc9def169 (do not edit this line) */
+/* JavaCC - OriginalChecksum=f8c313c692e78dec0bf9c85d18cb3b56 (do not edit this line) */
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index d5535e8..d3778c3 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -1,9 +1,7 @@
-/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */
-#ifndef JAVACC_ERRORHANDLER_H
-#define JAVACC_ERRORHANDLER_H
-
-#include <stdio.h>
+#ifndef ERRORHANDLER_H
+#define ERRORHANDLER_H
 #include <string>
 #include "JavaCC.h"
 #include "Token.h"
@@ -11,7 +9,7 @@
 namespace vhdl {
 namespace parser {
 
-JJSimpleString addUnicodeEscapes(const JJString& str);
+JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
 
   class VhdlParser;
   class ErrorHandler {
@@ -25,7 +23,7 @@ JJSimpleString addUnicodeEscapes(const JJString& str);
       // expectedKind - token kind that the parser was trying to consume.
       // expectedToken - the image of the token - tokenImages[expectedKind].
       // actual - the actual token that the parser got instead.
-      virtual void handleUnexpectedToken(int expectedKind, const JJString& expectedToken, Token *actual, VhdlParser *parser) {
+      virtual void handleUnexpectedToken(int expectedKind, JAVACC_STRING_TYPE expectedToken, Token *actual, VhdlParser *parser) {
         error_count++;
         fprintf(stderr, "Expecting %s at: %d:%d but got %s\n", addUnicodeEscapes(expectedToken).c_str(), actual->beginLine, actual->beginColumn, addUnicodeEscapes(actual->image).c_str());
       }
@@ -33,14 +31,14 @@ JJSimpleString addUnicodeEscapes(const JJString& str);
       // last - the last token successfully parsed.
       // unexpected - the token at which the error occurs.
       // production - the production in which this error occurrs.
-      virtual void handleParseError(Token *last, Token *unexpected, const JJSimpleString& production, VhdlParser *parser) {
+      virtual void handleParseError(Token *last, Token *unexpected, JAVACC_SIMPLE_STRING production, VhdlParser *parser) {
         error_count++;
         fprintf(stderr, "Encountered: %s at: %d:%d while parsing: %s\n", addUnicodeEscapes(unexpected->image).c_str(), unexpected->beginLine, unexpected->beginColumn, production.c_str());
       }
       virtual int getErrorCount() {
         return error_count;
       }
-      virtual void handleOtherError(const JJString& message, VhdlParser *parser) {
+      virtual void handleOtherError(JAVACC_STRING_TYPE message, VhdlParser *parser) {
         fprintf(stderr, "Error: %s\n", (char*)message.c_str());
       }
       virtual ~ErrorHandler() {}
@@ -63,11 +61,11 @@ JJSimpleString addUnicodeEscapes(const JJString& str);
        //    errorAfter  : prefix that was seen before this error occurred
        //    curchar     : the offending character
        //
-       virtual void lexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, VhdlParserTokenManager* token_manager) {
+       virtual void lexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, VhdlParserTokenManager* token_manager) {
         // by default, we just print an error message and return.
         fprintf(stderr, "Lexical error at: %d:%d. Encountered: %c after: %s.\n", errorLine, errorColumn, curChar, (EOFSeen? "EOF" : (const char*)errorAfter.c_str()));
       }
-       virtual void lexicalError(const JJString& errorMessage, VhdlParserTokenManager* token_manager) {
+       virtual void lexicalError(JAVACC_STRING_TYPE errorMessage, VhdlParserTokenManager* token_manager) {
         fprintf(stderr, "%s\n", (char*)errorMessage.c_str());
       }
       virtual ~TokenManagerErrorHandler() {}
@@ -77,5 +75,4 @@ JJSimpleString addUnicodeEscapes(const JJString& str);
 }
 
 #endif
-
-/* JavaCC - OriginalChecksum=5361b31ac6530c6c23511012deb15394 (do not edit this line) */
+/* JavaCC - OriginalChecksum=0dce21f9359cd0e5094357ad5cbc315d (do not edit this line) */
diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc
index 9f256d9..2ebb875 100644
--- a/vhdlparser/ParseException.cc
+++ b/vhdlparser/ParseException.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "ParseException.h"
 
@@ -23,7 +23,7 @@ namespace parser {
    */
   ParseException::ParseException(Token currentTokenVal,
                         int** expectedTokenSequencesVal,
-                        JJString* tokenImageVal
+                        JAVACC_STRING_TYPE* tokenImageVal
                        )
   {
     initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal);
@@ -46,7 +46,7 @@ namespace parser {
   }
 
   /** Constructor with message. */
-  ParseException::ParseException(const JJString& message) {
+  ParseException::ParseException(JAVACC_STRING_TYPE message) {
   }
 
 
@@ -69,7 +69,7 @@ namespace parser {
    * parser within which the parse error occurred.  This array is
    * defined in the generated ...Constants class.
    */
-  JJString* tokenImage;
+  JAVACC_STRING_TYPE* tokenImage;
 
   /**
    * It uses "currentToken" and "expectedTokenSequences" to generate a parse
@@ -78,12 +78,12 @@ namespace parser {
    * from the parser) the correct error message
    * gets displayed.
    */
-  JJString ParseException::initialise(Token currentToken,
+  JAVACC_STRING_TYPE ParseException::initialise(Token currentToken,
                            int** expectedTokenSequences,
-                           JJString* tokenImage) {
+                           JAVACC_STRING_TYPE* tokenImage) {
 #if 0
-    //JJString eol = System.getProperty("line.separator", "\n");
-     expected = new JJString();
+    //JAVACC_STRING_TYPE eol = System.getProperty("line.separator", "\n");
+     expected = new JAVACC_STRING_TYPE();
     int maxSize = 0;
     for (int i = 0; i < expectedTokenSequences.length; i++) {
       if (maxSize < expectedTokenSequences[i].length) {
@@ -93,39 +93,39 @@ namespace parser {
         expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
       }
       if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected.append((JJChar*)"...");
+        expected.append((JAVACC_CHAR_TYPE*)"...");
       }
       expected.append(eol).append("    ");
     }
-    JJString retval = (JJChar*)"Encountered \"";
+    JAVACC_STRING_TYPE retval = (JAVACC_CHAR_TYPE*)"Encountered \"";
     Token tok = currentToken.next;
     for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += (JJChar*)" ";
+      if (i != 0) retval += (JAVACC_CHAR_TYPE*)" ";
       if (tok.kind == 0) {
         retval += tokenImage[0];
         break;
       }
-      retval += (JJChar*)" " + tokenImage[tok.kind];
-      retval += (JJChar*)" \"";
+      retval += (JAVACC_CHAR_TYPE*)" " + tokenImage[tok.kind];
+      retval += (JAVACC_CHAR_TYPE*)" \"";
       retval += add_escapes(tok.image);
-      retval += (JJChar*)" \"";
+      retval += (JAVACC_CHAR_TYPE*)" \"";
       tok = tok.next;
     }
-    retval += (JJChar*)"\" at line " + currentToken.next.beginLine + (JJChar*)", column " + currentToken.next.beginColumn;
-    retval += (JJChar*)"." + eol;
+    retval += (JAVACC_CHAR_TYPE*)"\" at line " + currentToken.next.beginLine + (JAVACC_CHAR_TYPE*)", column " + currentToken.next.beginColumn;
+    retval += (JAVACC_CHAR_TYPE*)"." + eol;
     if (expectedTokenSequences.length == 1) {
-      retval += (JJChar*)"Was expecting:" + eol + (JJChar*)"    ";
+      retval += (JAVACC_CHAR_TYPE*)"Was expecting:" + eol + (JAVACC_CHAR_TYPE*)"    ";
     } else {
-      retval += (JJChar*)"Was expecting one of:" + eol + (JJChar*)"    ";
+      retval += (JAVACC_CHAR_TYPE*)"Was expecting one of:" + eol + (JAVACC_CHAR_TYPE*)"    ";
     }
     retval += expected.toString();
     return retval;
 #endif
-    return (JJChar*)"Parse exception";
+    return (JAVACC_CHAR_TYPE*)"Parse exception";
   }
 
   /**
-   * The end of line JJString for this machine.
+   * The end of line JAVACC_STRING_TYPE for this machine.
    */
 #define eol "\n"
 
@@ -134,10 +134,10 @@ namespace parser {
    * when these raw version cannot be used as part of an ASCII
    * string literal.
    */
-   JJString ParseException::add_escapes(const JJString& str) {
+   JAVACC_STRING_TYPE ParseException::add_escapes(JAVACC_STRING_TYPE str) {
 /*
-      JJString *retval = new JJString();
-      JJChar ch;
+      JAVACC_STRING_TYPE *retval = new JAVACC_STRING_TYPE();
+      JAVACC_CHAR_TYPE ch;
       for (int i = 0; i < str.length(); i++) {
         switch (str.charAt(i))
         {
@@ -167,7 +167,7 @@ namespace parser {
               continue;
            default:
               if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 JJString s = "0000" + Integer.toString(ch, 16);
+                 JAVACC_STRING_TYPE s = "0000" + Integer.toString(ch, 16);
                  retval.append("\\u" + s.substring(s.length() - 4, s.length()));
               } else {
                  retval.append(ch);
@@ -181,4 +181,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=7a72405661a136830ccf7f3cab0fffdc (do not edit this line) */
+/* JavaCC - OriginalChecksum=e25164d58610a09ceb227db80376beba (do not edit this line) */
diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h
index c4afc27..d69c391 100644
--- a/vhdlparser/ParseException.h
+++ b/vhdlparser/ParseException.h
@@ -1,8 +1,7 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_PARSE_EXCEPTION_H
-#define JAVACC_PARSE_EXCEPTION_H
-
+#ifndef _PARSE_EXCEPTION_H
+#define _PARSE_EXCEPTION_H
 #include "JavaCC.h"
 #include "Token.h"
 
@@ -29,7 +28,7 @@ class ParseException {
    */
   ParseException(Token currentTokenVal,
                         int** expectedTokenSequencesVal,
-                        JJString* tokenImageVal
+                        JAVACC_STRING_TYPE* tokenImageVal
                        );
 
   /**
@@ -45,7 +44,7 @@ class ParseException {
   ParseException();
 
   /** Constructor with message. */
-  ParseException(const JJString& message);
+  ParseException(JAVACC_STRING_TYPE message);
 
 
   /**
@@ -67,7 +66,7 @@ class ParseException {
    * parser within which the parse error occurred.  This array is
    * defined in the generated ...Constants class.
    */
-  JJString* tokenImage;
+  JAVACC_STRING_TYPE* tokenImage;
 
   /**
    * It uses "currentToken" and "expectedTokenSequences" to generate a parse
@@ -76,9 +75,9 @@ class ParseException {
    * from the parser) the correct error message
    * gets displayed.
    */
-  private:  JJString initialise(Token currentToken,
+  private:  JAVACC_STRING_TYPE initialise(Token currentToken,
                            int** expectedTokenSequences,
-                           JJString* tokenImage);
+                           JAVACC_STRING_TYPE* tokenImage);
 
   /**
    * The end of line string for this machine.
@@ -90,12 +89,11 @@ class ParseException {
    * when these raw version cannot be used as part of an ASCII
    * string literal.
    */
-   JJString add_escapes(const JJString& str);
+   JAVACC_STRING_TYPE add_escapes(JAVACC_STRING_TYPE str);
 
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=6705523c0ea4e83f3c38da57253c0aea (do not edit this line) */
+/* JavaCC - OriginalChecksum=339b52f10b77d027ae2838b74a4934e1 (do not edit this line) */
diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc
index d47dc68..d6fdebd 100644
--- a/vhdlparser/Token.cc
+++ b/vhdlparser/Token.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #include "Token.h"
 
@@ -18,46 +18,42 @@ namespace parser {
    * override this method as appropriate.
    */
   void * Token::getValue() {
-    return nullptr;
+    return NULL;
   }
 
   /**
    * No-argument constructor
    */
-  Token::Token() :
-  	beginLine(0), beginColumn(0), endLine(0), endColumn(0)
-  {
-    this->next = nullptr;
-    this->specialToken = nullptr;
+  Token::Token() {
+    this->next = NULL;
+    this->specialToken = NULL;
   }
 
   /**
    * Constructs a new token for the specified Image.
    */
-  Token::Token(int kind) :
-  	beginLine(0), beginColumn(0), endLine(0), endColumn(0) 
+  Token::Token(int kind)
   {
     this->kind = kind;
-    this->next = nullptr;
-    this->specialToken = nullptr;
+    this->next = NULL;
+    this->specialToken = NULL;
   }
 
   /**
    * Constructs a new token for the specified Image and Kind.
    */
-  Token::Token(int kind, const JJString& image)
-  	: beginLine(0), beginColumn(0), endLine(0), endColumn(0) 
+  Token::Token(int kind, JAVACC_STRING_TYPE image)
   {
     this->kind = kind;
     this->image = image;
-    this->next = nullptr;
-    this->specialToken = nullptr;
+    this->next = NULL;
+    this->specialToken = NULL;
   }
 
   /**
    * Returns the image.
    */
-  const JJString& Token::toString()
+  JAVACC_STRING_TYPE Token::toString()
   {
     return image;
   }
@@ -74,7 +70,7 @@ namespace parser {
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use sit in your lexical actions.
    */
-  Token *Token::newToken(int ofKind, const JJString& image)
+  Token *Token::newToken(int ofKind, JAVACC_STRING_TYPE image)
   {
     switch(ofKind)
     {
@@ -84,16 +80,13 @@ namespace parser {
 
   Token *Token::newToken(int ofKind)
   {
-    return newToken(ofKind, JJString());
+    return newToken(ofKind, JAVACC_STRING_TYPE((JAVACC_CHAR_TYPE*)""));
   }
 
   Token::~Token() {
     if (specialToken) delete specialToken;
-    this->kind = 0;
-    this->next = nullptr;
-    this->specialToken = nullptr;
   }
 
 }
 }
-/* JavaCC - OriginalChecksum=01131f3b3906a670aa8fee6224233701 (do not edit this line) */
+/* JavaCC - OriginalChecksum=ad49760663454c3609232308a7bb7379 (do not edit this line) */
diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h
index 3575005..a1ac519 100644
--- a/vhdlparser/Token.h
+++ b/vhdlparser/Token.h
@@ -1,8 +1,7 @@
-/* Generated By:JavaCC: Do not edit this line. Token.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
-#ifndef JAVACC_TOKEN_H
-#define JAVACC_TOKEN_H
-
+#ifndef TOKEN_H
+#define TOKEN_H
 #include "JavaCC.h"
 
 
@@ -36,7 +35,7 @@ class Token
   /**
    * The string image of the token.
    */
-  JJString image;
+  JAVACC_STRING_TYPE image;
 
   /**
    * A reference to the next regular (non-special) token from the input
@@ -85,15 +84,14 @@ class Token
   /**
    * Constructs a new token for the specified Image and Kind.
    */
-  Token(int kind, const JJString& image);
-
-  virtual ~Token();
+  Token(int kind, JAVACC_STRING_TYPE image);
 
   /**
    * Returns the image.
    */
-  const JJString& toString();
+  JAVACC_STRING_TYPE toString();
 
+  public: virtual ~Token();
 
   /**
    * Returns a new Token void *, by default. However, if you want, you
@@ -107,13 +105,12 @@ class Token
    * to the following switch statement. Then you can cast matchedToken
    * variable to the appropriate type and use sit in your lexical actions.
    */
-  static Token *newToken(int ofKind, const JJString& image);
+  static Token *newToken(int ofKind, JAVACC_STRING_TYPE image);
 
   static Token *newToken(int ofKind);
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=8c237423e3d9695c3bfcf539bcf92375 (do not edit this line) */
+/* JavaCC - OriginalChecksum=d80e40280c93973eed89266ba3cfbdca (do not edit this line) */
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index 6b158ae..9aed782 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -1,12 +1,11 @@
-/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_TOKENMANAGER_H
-#define JAVACC_TOKENMANAGER_H
-
-#include <iostream>
+#ifndef TOKENMANAGER_H
+#define TOKENMANAGER_H
 #include "JavaCC.h"
 #include "Token.h"
 
+
 namespace vhdl {
 namespace parser {
 /**
@@ -20,17 +19,15 @@ public:
   /** This gets the next token from the input stream.
    *  A token of kind 0 (<EOF>) should be returned on EOF.
    */
-  virtual       ~TokenManager() { }
-  virtual Token *getNextToken() = 0;
-  virtual void   setParser(void* parser) {};
-  virtual void   lexicalError() {
-  	std::cerr << "Lexical error encountered." << std::endl;
+  public: virtual Token *getNextToken() = 0;
+  public: virtual ~TokenManager() { }
+  public: virtual void lexicalError() {
+    fprintf(stderr, "Lexical error encountered.\n");
   }
 
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=c5e389e7ee25f48da34e517ae429ac2a (do not edit this line) */
+/* JavaCC - OriginalChecksum=c9208158050f6de2e723c580fee8011c (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index 3560805..d6c43ee 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "TokenMgrError.h"
 
@@ -14,17 +14,17 @@ namespace parser {
    *    errorLine   : line number when the error occurred
    *    errorColumn : column number when the error occurred
    *    errorAfter  : prefix that was seen before this error occurred
-   *    curJJChar     : the offending character
+   *    curJAVACC_CHAR_TYPE     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-    JJString TokenMgrError::LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar) {
+    JAVACC_STRING_TYPE TokenMgrError::LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar) {
 #if 0
-    JJString s;
-    stringstream<JJString> ss;
+    JAVACC_STRING_TYPE s;
+    stringstream<JAVACC_STRING_TYPE> ss;
     ss << "Lexical error at line " << errorLine << " column " << errorColumn
        << ".  Encountered: " << curChar << "(" << (int)curChar
        << ") after : \"" << errorAfter.c_str() << "\"";
-    return (JJString)ss.rdbuf()->str();
+    return (JAVACC_STRING_TYPE)ss.rdbuf()->str();
 #endif
     return EMPTY;
   }
@@ -38,7 +38,7 @@ namespace parser {
    *
    * from this method for such cases in the release version of your parser.
    */
-  JJString TokenMgrError::getMessage() {
+  JAVACC_STRING_TYPE TokenMgrError::getMessage() {
     return message;
   }
 
@@ -51,12 +51,12 @@ namespace parser {
   }
 
   /** Constructor with message and reason. */
-  TokenMgrError::TokenMgrError(const JJString& message, int reason) {
+  TokenMgrError::TokenMgrError(JAVACC_STRING_TYPE message, int reason) {
     errorCode = reason;
   }
 
   /** Full Constructor. */
-  TokenMgrError::TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, int reason) {
+  TokenMgrError::TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) {
     message = LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar);
    errorCode = reason;
   }
@@ -73,10 +73,10 @@ char hexChar(int i) {
  * Replaces unprintable characters by their escaped (or unicode escaped)
  * equivalents in the given string
  */
-JJSimpleString addUnicodeEscapes(const JJString& str) {
-  JJSimpleString retval;
+JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
+  JAVACC_SIMPLE_STRING retval;
   for (size_t i = 0; i < str.size(); i++) {
-    JJChar ch = str[i];
+    JAVACC_CHAR_TYPE ch = str[i];
     switch (ch)
     {
       case '\b':
@@ -115,4 +115,4 @@ JJSimpleString addUnicodeEscapes(const JJString& str) {
 
 }
 }
-/* JavaCC - OriginalChecksum=ed66d80b94c73435ce2644e44f7b4d49 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c94a22f5e55a710d715f7e0d07db2460 (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h
index 90c7530..32905ec 100644
--- a/vhdlparser/TokenMgrError.h
+++ b/vhdlparser/TokenMgrError.h
@@ -1,15 +1,14 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 7.0 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.1 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-#ifndef JAVACC_TOKENMGRERROR_H
-#define JAVACC_TOKENMGRERROR_H
-
+#ifndef _TOKENMGRERROR_H
+#define _TOKENMGRERROR_H
 #include "JavaCC.h"
 
 
 namespace vhdl {
 namespace parser {
 
-enum LexerErrors {
+ enum LexerErrors {
   /**
    * Lexical error occurred.
    */
@@ -29,10 +28,11 @@ enum LexerErrors {
    * Detected (and bailed out of) an infinite loop in the token manager.
    */
   LOOP_DETECTED = 3,
-};
+  };
 
-class TokenMgrError {
-public:
+class TokenMgrError
+{
+  public:
   /*
    * Ordinals for various reasons why an Error of this type can be thrown.
    */
@@ -55,10 +55,9 @@ public:
    *    curchar     : the offending character
    * Note: You can customize the lexical error message by modifying this method.
    */
-    JJString LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar);
+    JAVACC_STRING_TYPE LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar);
 
-private:
-   JJString message;
+  private: JAVACC_STRING_TYPE message;
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -69,25 +68,23 @@ private:
    *
    * from this method for such cases in the release version of your parser.
    */
-public:
-  JJString getMessage() ;
+  JAVACC_STRING_TYPE getMessage() ;
 
   /*
    * Constructors of various flavors follow.
    */
 
   /** No arg constructor. */
-  TokenMgrError() ;
+  public: TokenMgrError() ;
 
   /** Constructor with message and reason. */
-  TokenMgrError(const JJString& message, int reason) ;
+  public: TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
 
   /** Full Constructor. */
-  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, const JJString& errorAfter, JJChar curChar, int reason) ;
+  public: TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
 };
 
 }
 }
-
 #endif
-/* JavaCC - OriginalChecksum=4ab4cdcdef6a3feec22fd9c00ba86e07 (do not edit this line) */
+/* JavaCC - OriginalChecksum=a97a71ddb969ae96c94e5d370217e1a8 (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 35f2ff6..1c36d01 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -1,6 +1,5 @@
 /* VhdlParser.cc */
-#include "VhdlParser.h"
-#include "TokenMgrError.h"
+#include "/Users/dimitri/doxygen/vhdlparser/VhdlParser.h"
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
@@ -23,31 +22,37 @@ namespace parser {
 
 QCString VhdlParser::abstract_literal() {Token *tok;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DECIMAL_LITERAL:{
-      if (!hasError) {
+    case DECIMAL_LITERAL:{if (!hasError) {
+      
       tok = jj_consume_token(DECIMAL_LITERAL);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case INTEGER:{
-      if (!hasError) {
+    case INTEGER:{if (!hasError) {
+      
       tok = jj_consume_token(INTEGER);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case BASED_LITERAL:{
-      if (!hasError) {
+    case BASED_LITERAL:{if (!hasError) {
+      
       tok = jj_consume_token(BASED_LITERAL);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -56,104 +61,122 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;
-    if (!hasError) {
+QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if (!hasError) {
+    
     tok = jj_consume_token(ACCESS_T);
     }
     if (!hasError) {
+    
     str1 = subtype_indication();
     }
+    
 str=tok->image.c_str(); return str+str1;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::actual_designator() {QCString str;Token *t=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_T:{
-      if (!hasError) {
+    case OPEN_T:{if (!hasError) {
+      
       t = jj_consume_token(OPEN_T);
       }
       if (!hasError) {
+      
 return t->image.c_str();
       }
+      
       break;
       }
     default:
       jj_la1[1] = jj_gen;
-      if (jj_2_1(2147483647)) {
-        if (!hasError) {
+      if (jj_2_1(2147483647)) {if (!hasError) {
+        
         str = expression();
         }
         if (!hasError) {
+        
 return str;
         }
-      } else if (jj_2_2(2147483647)) {
-        if (!hasError) {
+        
+      } else if (jj_2_2(2147483647)) {if (!hasError) {
+        
         str = name();
         }
         if (!hasError) {
+        
 return str;
         }
+        
       } else {
         jj_consume_token(-1);
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::actual_parameter_part() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) {
+    
     s = association_list();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::actual_part() {QCString s,s1;
-    if (jj_2_3(2147483647)) {
-      if (!hasError) {
+    if (jj_2_3(2147483647)) {if (!hasError) {
+      
       s = actual_designator();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case BOX_T:{
-        if (!hasError) {
+      case BOX_T:{if (!hasError) {
+        
         jj_consume_token(BOX_T);
         }
         if (!hasError) {
+        
 return "<>";
         }
+        
         break;
         }
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         s = name();
         }
         if (!hasError) {
+        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
+        
         s1 = actual_designator();
         }
         if (!hasError) {
+        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
+        
 s+="(";s+=s1+")";return s;
         }
+        
         break;
         }
       default:
@@ -163,36 +186,42 @@ s+="(";s+=s1+")";return s;
       }
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::adding_operator() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PLUS_T:{
-      if (!hasError) {
+    case PLUS_T:{if (!hasError) {
+      
       jj_consume_token(PLUS_T);
       }
       if (!hasError) {
+      
 return "+";
       }
+      
       break;
       }
-    case MINUS_T:{
-      if (!hasError) {
+    case MINUS_T:{if (!hasError) {
+      
       jj_consume_token(MINUS_T);
       }
       if (!hasError) {
+      
 return "-";
       }
+      
       break;
       }
-    case AMPERSAND_T:{
-      if (!hasError) {
+    case AMPERSAND_T:{if (!hasError) {
+      
       jj_consume_token(AMPERSAND_T);
       }
       if (!hasError) {
+      
 return "&";
       }
+      
       break;
       }
     default:
@@ -201,17 +230,19 @@ return "&";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::aggregate() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s = element_association();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -221,49 +252,60 @@ QCString VhdlParser::aggregate() {QCString s,s1,s2;
       default:
         jj_la1[4] = jj_gen;
         goto end_label_1;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = element_association();
       }
       if (!hasError) {
+      
 s+=","+s1;
       }
+      
     }
     end_label_1: ;
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return "("+s+")";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::alias_declaration() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::alias_declaration() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(ALIAS_T);
     }
     if (!hasError) {
+    
     s2 = alias_designator();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case COLON_T:{
-      if (!hasError) {
+    case COLON_T:{if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
+      
 s+=":";
       }
       if (!hasError) {
+      
       s1 = subtype_indication();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
       break;
       }
     default:
@@ -272,26 +314,33 @@ s+=s1;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 s+=" is ";
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
 s+=s1;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LBRACKET_T:{
-      if (!hasError) {
+    case LBRACKET_T:{if (!hasError) {
+      
       s1 = signature();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
       break;
       }
     default:
@@ -300,43 +349,51 @@ s+=s1;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 addVhdlType(s2.data(),getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlDocGen::ALIAS,0,s.data(),Public);
 
  return s2+" "+s+";";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::alias_designator() {Token *tok=0;QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CHARACTER_LITERAL:{
-      if (!hasError) {
+    case CHARACTER_LITERAL:{if (!hasError) {
+      
       tok = jj_consume_token(CHARACTER_LITERAL);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case STRINGLITERAL:{
-      if (!hasError) {
+    case STRINGLITERAL:{if (!hasError) {
+      
       s = operator_symbol();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -345,26 +402,30 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 void VhdlParser::allocator() {
-    if (jj_2_4(3)) {
-      if (!hasError) {
+    if (jj_2_4(3)) {if (!hasError) {
+      
       jj_consume_token(NEW_T);
       }
       if (!hasError) {
+      
       qualified_expression();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NEW_T:{
-        if (!hasError) {
+      case NEW_T:{if (!hasError) {
+        
         jj_consume_token(NEW_T);
         }
         if (!hasError) {
+        
         subtype_indication();
         }
+        
         break;
         }
       default:
@@ -373,26 +434,31 @@ void VhdlParser::allocator() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
-void VhdlParser::architecture_body() {QCString s,s1;
-    if (!hasError) {
+void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(ARCHITECTURE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 QCString t=s1+"::"+s;
                   genLabels.resize(0);
                   pushLabel(genLabels,s1);
@@ -400,29 +466,36 @@ QCString t=s1+"::"+s;
                   addVhdlType(t,getLine(ARCHITECTURE_T),Entry::CLASS_SEC,VhdlDocGen::ARCHITECTURE,0,0,Private);
     }
     if (!hasError) {
-    try {
-      if (!hasError) {
+    
+    try {if (!hasError) {
+      
       architecture_declarative_part();
       }
+      
     } catch ( ...) {
 error_skipto(BEGIN_T);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
+    
     architecture_statement_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ARCHITECTURE_T:{
-      if (!hasError) {
+    case ARCHITECTURE_T:{if (!hasError) {
+      
       jj_consume_token(ARCHITECTURE_T);
       }
+      
       break;
       }
     default:
@@ -431,14 +504,16 @@ error_skipto(BEGIN_T);
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -447,14 +522,16 @@ error_skipto(BEGIN_T);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-}
+  }
 
 
-void VhdlParser::architecture_declarative_part() {
-    if (!hasError) {
+void VhdlParser::architecture_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -481,18 +558,20 @@ void VhdlParser::architecture_declarative_part() {
       default:
         jj_la1[11] = jj_gen;
         goto end_label_2;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       block_declarative_item();
       }
+      
     }
     end_label_2: ;
     }
-}
+    
+  }
 
 
-void VhdlParser::architecture_statement_part() {
-    if (!hasError) {
+void VhdlParser::architecture_statement_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -512,33 +591,39 @@ void VhdlParser::architecture_statement_part() {
       default:
         jj_la1[12] = jj_gen;
         goto end_label_3;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       concurrent_statement();
       }
+      
     }
     end_label_3: ;
     }
-}
+    
+  }
 
 
 QCString VhdlParser::array_type_definition() {QCString s;
-    if (jj_2_5(2147483647)) {
-      if (!hasError) {
+    if (jj_2_5(2147483647)) {if (!hasError) {
+      
       s = unconstraint_array_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ARRAY_T:{
-        if (!hasError) {
+      case ARRAY_T:{if (!hasError) {
+        
         s = constraint_array_definition();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
       default:
@@ -548,25 +633,29 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;
-    if (!hasError) {
+QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
+    
     jj_consume_token(ASSERT_T);
     }
     if (!hasError) {
+    
     s = condition();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case REPORT_T:{
-      if (!hasError) {
+    case REPORT_T:{if (!hasError) {
+      
       t = jj_consume_token(REPORT_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
+      
       break;
       }
     default:
@@ -575,14 +664,17 @@ QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SEVERITY_T:{
-      if (!hasError) {
+    case SEVERITY_T:{if (!hasError) {
+      
       t1 = jj_consume_token(SEVERITY_T);
       }
       if (!hasError) {
+      
       s2 = expression();
       }
+      
       break;
       }
     default:
@@ -590,25 +682,28 @@ QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;
       ;
     }
     }
+    
 s.prepend("assert ");
    if(t) s1.prepend(" report ");
    if(t1) s2.prepend(" report ");
     return s+s1+s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;
-    if (!hasError) {
+QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = label();
       }
       if (!hasError) {
+      
       t = jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -617,43 +712,51 @@ QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;
     }
     }
     if (!hasError) {
+    
     s1 = assertion();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(t) s+=":";
     return s+s1+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::association_element() {QCString s,s1;
-    if (!hasError) {
-    if (jj_2_6(2147483647)) {
-      if (!hasError) {
+QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
+    
+    if (jj_2_6(2147483647)) {if (!hasError) {
+      
       s = formal_part();
       }
       if (!hasError) {
+      
       jj_consume_token(ARROW_T);
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     s1 = actual_part();
     }
+    
 return s+" => "+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::association_list() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) {
+    
     s = association_element();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -663,65 +766,78 @@ QCString VhdlParser::association_list() {QCString s,s1;
       default:
         jj_la1[17] = jj_gen;
         goto end_label_4;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = association_element();
       }
       if (!hasError) {
+      
 s+=","+s1;
       }
+      
     }
     end_label_4: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::attribute_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(ATTRIBUTE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = type_mark();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public);
     return " attribute "+s+":"+s1+";";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::attribute_designator() {QCString s;Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case RANGE_T:{
-      if (!hasError) {
+    case RANGE_T:{if (!hasError) {
+      
       tok = jj_consume_token(RANGE_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -730,37 +846,45 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::attribute_name() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::attribute_name() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(APOSTROPHE_T);
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
 s+="'"+s1;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s+"("+s1+")";
       }
+      
       break;
       }
     default:
@@ -768,104 +892,120 @@ s+"("+s1+")";
       ;
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::attribute_specification() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::attribute_specification() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(ATTRIBUTE_T);
     }
     if (!hasError) {
+    
     s = attribute_designator();
     }
     if (!hasError) {
+    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
+    
     s1 = entity_specification();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     s2 = expression();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 QCString t= s1+" is "+s2;
    addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public);
    return " attribute "+s+" of "+s1+ " is "+s2+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::base() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::base() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(INTEGER);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::base_specifier() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::base_unit_declaration() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) {
+    
     s = identifier();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::based_integer() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::based_literal() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(BASED_LITERAL);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::basic_identifier() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-void VhdlParser::binding_indication() {
-    if (!hasError) {
+void VhdlParser::binding_indication() {if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case USE_T:{
-      if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
       jj_consume_token(USE_T);
       }
       if (!hasError) {
+      
       entity_aspect();
       }
+      
       break;
       }
     default:
@@ -874,11 +1014,13 @@ void VhdlParser::binding_indication() {
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
       generic_map_aspect();
       }
+      
       break;
       }
     default:
@@ -887,11 +1029,13 @@ void VhdlParser::binding_indication() {
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{
-      if (!hasError) {
+    case PORT_T:{if (!hasError) {
+      
       port_map_aspect();
       }
+      
       break;
       }
     default:
@@ -899,35 +1043,40 @@ void VhdlParser::binding_indication() {
       ;
     }
     }
-}
+    
+  }
 
 
-QCString VhdlParser::bit_string_literal() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(BIT_STRING_LITERAL);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::bit_value() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(BASIC_IDENTIFIER);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-void VhdlParser::block_configuration() {
-    if (!hasError) {
+void VhdlParser::block_configuration() {if (!hasError) {
+    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
+    
     block_specification();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case USE_T:{
@@ -937,14 +1086,16 @@ void VhdlParser::block_configuration() {
       default:
         jj_la1[23] = jj_gen;
         goto end_label_5;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       use_clause();
       }
+      
     }
     end_label_5: ;
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case FOR_T:{
@@ -954,23 +1105,28 @@ void VhdlParser::block_configuration() {
       default:
         jj_la1[24] = jj_gen;
         goto end_label_6;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       configuration_item();
       }
+      
     }
     end_label_6: ;
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
 void VhdlParser::block_declarative_item() {
@@ -978,105 +1134,121 @@ void VhdlParser::block_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       type_declaration();
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       subtype_declaration();
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       constant_declaration();
       }
+      
       break;
       }
-    case SIGNAL_T:{
-      if (!hasError) {
+    case SIGNAL_T:{if (!hasError) {
+      
       signal_declaration();
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       variable_declaration();
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       file_declaration();
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       alias_declaration();
       }
+      
       break;
       }
-    case COMPONENT_T:{
-      if (!hasError) {
+    case COMPONENT_T:{if (!hasError) {
+      
       component_declaration();
       }
+      
       break;
       }
     default:
       jj_la1[25] = jj_gen;
-      if (jj_2_7(2147483647)) {
-        if (!hasError) {
+      if (jj_2_7(2147483647)) {if (!hasError) {
+        
         attribute_declaration();
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{
-          if (!hasError) {
+        case ATTRIBUTE_T:{if (!hasError) {
+          
           attribute_specification();
           }
+          
           break;
           }
-        case FOR_T:{
-          if (!hasError) {
+        case FOR_T:{if (!hasError) {
+          
           configuration_specification();
           }
+          
           break;
           }
-        case DISCONNECT_T:{
-          if (!hasError) {
+        case DISCONNECT_T:{if (!hasError) {
+          
           disconnection_specification();
           }
+          
           break;
           }
-        case USE_T:{
-          if (!hasError) {
+        case USE_T:{if (!hasError) {
+          
           use_clause();
           }
+          
           break;
           }
         default:
           jj_la1[26] = jj_gen;
-          if (jj_2_8(3)) {
-            if (!hasError) {
+          if (jj_2_8(3)) {if (!hasError) {
+            
             group_template_declaration();
             }
+            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{
-              if (!hasError) {
+            case GROUP_T:{if (!hasError) {
+              
               group_declaration();
               }
+              
               break;
               }
             default:
@@ -1088,11 +1260,11 @@ void VhdlParser::block_declarative_item() {
         }
       }
     }
-}
+  }
 
 
-void VhdlParser::block_declarative_part() {
-    if (!hasError) {
+void VhdlParser::block_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -1119,31 +1291,36 @@ void VhdlParser::block_declarative_part() {
       default:
         jj_la1[28] = jj_gen;
         goto end_label_7;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       block_declarative_item();
       }
+      
     }
     end_label_7: ;
     }
-}
+    
+  }
 
 
-void VhdlParser::block_header() {
-    if (!hasError) {
-    if (jj_2_9(2147483647)) {
-      if (!hasError) {
+void VhdlParser::block_header() {if (!hasError) {
+    
+    if (jj_2_9(2147483647)) {if (!hasError) {
+      
       generic_clause();
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case GENERIC_T:{
-        if (!hasError) {
+      case GENERIC_T:{if (!hasError) {
+        
         generic_map_aspect();
         }
         if (!hasError) {
+        
         jj_consume_token(SEMI_T);
         }
+        
         break;
         }
       default:
@@ -1151,25 +1328,30 @@ void VhdlParser::block_header() {
         ;
       }
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{
-      if (!hasError) {
+    case PORT_T:{if (!hasError) {
+      
       port_clause();
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PORT_T:{
-        if (!hasError) {
+      case PORT_T:{if (!hasError) {
+        
         port_map_aspect();
         }
         if (!hasError) {
+        
         jj_consume_token(SEMI_T);
         }
+        
         break;
         }
       default:
@@ -1177,6 +1359,7 @@ void VhdlParser::block_header() {
         ;
       }
       }
+      
       break;
       }
     default:
@@ -1184,25 +1367,30 @@ void VhdlParser::block_header() {
       ;
     }
     }
-}
+    
+  }
 
 
-void VhdlParser::block_specification() {
-    if (!hasError) {
+void VhdlParser::block_specification() {if (!hasError) {
+    
     name();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       index_specification();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
+      
       break;
       }
     default:
@@ -1210,34 +1398,42 @@ void VhdlParser::block_specification() {
       ;
     }
     }
-}
+    
+  }
 
 
-void VhdlParser::block_statement() {QCString s;
-    if (!hasError) {
+void VhdlParser::block_statement() {QCString s;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     jj_consume_token(BLOCK_T);
     }
     if (!hasError) {
+    
 pushLabel(genLabels,s);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       expression();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
+      
       break;
       }
     default:
@@ -1246,11 +1442,13 @@ pushLabel(genLabels,s);
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       jj_consume_token(IS_T);
       }
+      
       break;
       }
     default:
@@ -1259,30 +1457,38 @@ pushLabel(genLabels,s);
     }
     }
     if (!hasError) {
+    
     block_header();
     }
     if (!hasError) {
+    
     block_declarative_part();
     }
     if (!hasError) {
+    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
+    
     block_statement_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(BLOCK_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -1291,14 +1497,16 @@ pushLabel(genLabels,s);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 genLabels=popLabel(genLabels);
-}
+  }
 
 
-void VhdlParser::block_statement_part() {
-    if (!hasError) {
+void VhdlParser::block_statement_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -1318,27 +1526,31 @@ void VhdlParser::block_statement_part() {
       default:
         jj_la1[36] = jj_gen;
         goto end_label_8;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       concurrent_statement();
       }
+      
     }
     end_label_8: ;
     }
-}
+    
+  }
 
 
-void VhdlParser::case_statement() {QCString s;
-    if (!hasError) {
+void VhdlParser::case_statement() {QCString s;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -1347,22 +1559,28 @@ void VhdlParser::case_statement() {QCString s;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(CASE_T);
     }
     if (!hasError) {
+    
     s = expression();
     }
     if (!hasError) {
+    
 QCString ca="case "+s;
      FlowChart::addFlowChart(FlowChart::CASE_NO,0,ca);
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     case_statement_alternative();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case WHEN_T:{
@@ -1372,26 +1590,31 @@ QCString ca="case "+s;
       default:
         jj_la1[38] = jj_gen;
         goto end_label_9;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       case_statement_alternative();
       }
+      
     }
     end_label_9: ;
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(CASE_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -1400,75 +1623,91 @@ QCString ca="case "+s;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 FlowChart::moveToPrevLevel();
          FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
-}
+  }
 
 
-void VhdlParser::case_statement_alternative() {QCString s;
-    if (!hasError) {
+void VhdlParser::case_statement_alternative() {QCString s;if (!hasError) {
+    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
+    
     s = choices();
     }
     if (!hasError) {
+    
     jj_consume_token(ARROW_T);
     }
     if (!hasError) {
+    
 QCString t="when ";
     t+=s+"=> ";
     FlowChart::addFlowChart(FlowChart::WHEN_NO,s.data(),t);
     }
     if (!hasError) {
+    
     sequence_of_statement();
     }
+    
 FlowChart::moveToPrevLevel();
-}
+  }
 
 
-QCString VhdlParser::character_literal() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(CHARACTER_LITERAL);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::choice() {QCString s;
-    if (jj_2_10(2147483647)) {
-      if (!hasError) {
+    if (jj_2_10(2147483647)) {if (!hasError) {
+      
       s = discrete_range();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_11(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_11(2147483647)) {if (!hasError) {
+      
       s = simple_expression();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_12(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_12(2147483647)) {if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OTHER_T:{
-        if (!hasError) {
+      case OTHER_T:{if (!hasError) {
+        
         jj_consume_token(OTHER_T);
         }
         if (!hasError) {
+        
 return " others ";
         }
+        
         break;
         }
       default:
@@ -1478,14 +1717,15 @@ return " others ";
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::choices() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::choices() {QCString s,s1;if (!hasError) {
+    
     s = choice();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BAR_T:{
@@ -1495,43 +1735,51 @@ QCString VhdlParser::choices() {QCString s,s1;
       default:
         jj_la1[41] = jj_gen;
         goto end_label_10;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(BAR_T);
       }
       if (!hasError) {
+      
       s1 = choice();
       }
       if (!hasError) {
+      
 s+="|";s+=s1;
       }
+      
     }
     end_label_10: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::component_configuration() {
-    if (!hasError) {
+void VhdlParser::component_configuration() {if (!hasError) {
+    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
+    
     component_specification();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case GENERIC_T:
     case PORT_T:
     case USE_T:
-    case SEMI_T:{
-      if (!hasError) {
+    case SEMI_T:{if (!hasError) {
+      
       binding_indication();
       }
       if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
+      
       break;
       }
     default:
@@ -1540,11 +1788,13 @@ void VhdlParser::component_configuration() {
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FOR_T:{
-      if (!hasError) {
+    case FOR_T:{if (!hasError) {
+      
       block_configuration();
       }
+      
       break;
       }
     default:
@@ -1553,30 +1803,37 @@ void VhdlParser::component_configuration() {
     }
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::component_declaration() {QCString s;
-    if (!hasError) {
+void VhdlParser::component_declaration() {QCString s;if (!hasError) {
+    
     jj_consume_token(COMPONENT_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       jj_consume_token(IS_T);
       }
+      
       break;
       }
     default:
@@ -1585,14 +1842,17 @@ void VhdlParser::component_declaration() {QCString s;
     }
     }
     if (!hasError) {
+    
 currP=VhdlDocGen::COMPONENT;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
       generic_clause();
       }
+      
       break;
       }
     default:
@@ -1601,11 +1861,13 @@ currP=VhdlDocGen::COMPONENT;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{
-      if (!hasError) {
+    case PORT_T:{if (!hasError) {
+      
       port_clause();
       }
+      
       break;
       }
     default:
@@ -1614,22 +1876,27 @@ currP=VhdlDocGen::COMPONENT;
     }
     }
     if (!hasError) {
+    
 addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPONENT,0,0,Public);
      currP=0;
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(COMPONENT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -1638,22 +1905,27 @@ addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPON
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::component_instantiation_statement() {QCString s,s1;
-    if (!hasError) {
+void VhdlParser::component_instantiation_statement() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = instantiation_unit();
     }
     if (!hasError) {
+    
 QCString s3;
        if (s1.contains("|")) {
          s3=VhdlDocGen::getIndexWord(s1.data(),0);
@@ -1663,20 +1935,24 @@ QCString s3;
        addCompInst(s.lower().data(),s1.lower().data(),s3.data(),getLine());
     }
     if (!hasError) {
-    if (jj_2_13(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_13(2147483647)) {if (!hasError) {
+      
       generic_map_aspect();
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{
-      if (!hasError) {
+    case PORT_T:{if (!hasError) {
+      
       port_map_aspect();
       }
+      
       break;
       }
     default:
@@ -1685,42 +1961,51 @@ QCString s3;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::component_specification() {
-    if (!hasError) {
+void VhdlParser::component_specification() {if (!hasError) {
+    
     instantiation_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     name();
     }
-}
+    
+  }
 
 
 QCString VhdlParser::composite_type_definition() {QCString s,s1;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ARRAY_T:{
-      if (!hasError) {
+    case ARRAY_T:{if (!hasError) {
+      
       s = array_type_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case RECORD_T:{
-      if (!hasError) {
+    case RECORD_T:{if (!hasError) {
+      
       record_type_definition();
       }
       if (!hasError) {
+      
 return s+"#";
       }
+      
       break;
       }
     default:
@@ -1729,28 +2014,32 @@ return s+"#";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-void VhdlParser::concurrent_assertion_statement() {
-    if (!hasError) {
-    if (jj_2_14(2)) {
-      if (!hasError) {
+void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
+    
+    if (jj_2_14(2)) {if (!hasError) {
+      
       identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{
-      if (!hasError) {
+    case POSTPONED_T:{if (!hasError) {
+      
       jj_consume_token(POSTPONED_T);
       }
+      
       break;
       }
     default:
@@ -1759,33 +2048,40 @@ void VhdlParser::concurrent_assertion_statement() {
     }
     }
     if (!hasError) {
+    
     assertion();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::concurrent_procedure_call_statement() {
-    if (!hasError) {
-    if (jj_2_15(2)) {
-      if (!hasError) {
+void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
+    
+    if (jj_2_15(2)) {if (!hasError) {
+      
       identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{
-      if (!hasError) {
+    case POSTPONED_T:{if (!hasError) {
+      
       jj_consume_token(POSTPONED_T);
       }
+      
       break;
       }
     default:
@@ -1794,33 +2090,40 @@ void VhdlParser::concurrent_procedure_call_statement() {
     }
     }
     if (!hasError) {
+    
     procedure_call();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::concurrent_signal_assignment_statement() {
-    if (!hasError) {
-    if (jj_2_16(2)) {
-      if (!hasError) {
+void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
+    
+    if (jj_2_16(2)) {if (!hasError) {
+      
       identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{
-      if (!hasError) {
+    case POSTPONED_T:{if (!hasError) {
+      
       jj_consume_token(POSTPONED_T);
       }
+      
       break;
       }
     default:
@@ -1829,16 +2132,19 @@ void VhdlParser::concurrent_signal_assignment_statement() {
     }
     }
     if (!hasError) {
-    if (jj_2_17(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_17(2147483647)) {if (!hasError) {
+      
       conditional_signal_assignment();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case WITH_T:{
-        if (!hasError) {
+      case WITH_T:{if (!hasError) {
+        
         selected_signal_assignment();
         }
+        
         break;
         }
       default:
@@ -1848,54 +2154,64 @@ void VhdlParser::concurrent_signal_assignment_statement() {
       }
     }
     }
-}
+    
+  }
 
 
 void VhdlParser::concurrent_statement() {
-    if (jj_2_18(2147483647)) {
-      if (!hasError) {
+    if (jj_2_18(2147483647)) {if (!hasError) {
+      
       block_statement();
       }
-    } else if (jj_2_19(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_19(2147483647)) {if (!hasError) {
+      
       process_statement();
       }
-    } else if (jj_2_20(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_20(2147483647)) {if (!hasError) {
+      
       generate_statement();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case CASE_T:{
-        if (!hasError) {
+      case CASE_T:{if (!hasError) {
+        
         case_scheme();
         }
+        
         break;
         }
       default:
         jj_la1[54] = jj_gen;
-        if (jj_2_21(2147483647)) {
-          if (!hasError) {
+        if (jj_2_21(2147483647)) {if (!hasError) {
+          
           concurrent_assertion_statement();
           }
-        } else if (jj_2_22(2147483647)) {
-          if (!hasError) {
+          
+        } else if (jj_2_22(2147483647)) {if (!hasError) {
+          
           concurrent_signal_assignment_statement();
           }
-        } else if (jj_2_23(2147483647)) {
-          if (!hasError) {
+          
+        } else if (jj_2_23(2147483647)) {if (!hasError) {
+          
           component_instantiation_statement();
           }
-        } else if (jj_2_24(2147483647)) {
-          if (!hasError) {
+          
+        } else if (jj_2_24(2147483647)) {if (!hasError) {
+          
           concurrent_procedure_call_statement();
           }
+          
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case VHDL2008TOOLDIR:{
-            if (!hasError) {
+          case VHDL2008TOOLDIR:{if (!hasError) {
+            
             jj_consume_token(VHDL2008TOOLDIR);
             }
+            
             break;
             }
           default:
@@ -1906,84 +2222,100 @@ void VhdlParser::concurrent_statement() {
         }
       }
     }
-}
+  }
 
 
-QCString VhdlParser::condition() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::condition() {QCString s;if (!hasError) {
+    
     s = expression();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::condition_clause() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::condition_clause() {QCString s;if (!hasError) {
+    
     jj_consume_token(UNTIL_T);
     }
     if (!hasError) {
+    
     s = condition();
     }
+    
 return " until "+s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::conditional_signal_assignment() {
-    if (!hasError) {
+void VhdlParser::conditional_signal_assignment() {if (!hasError) {
+    
     target();
     }
     if (!hasError) {
+    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
+    
     options();
     }
     if (!hasError) {
+    
     conditional_waveforms();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::conditional_waveforms() {
-    if (!hasError) {
+void VhdlParser::conditional_waveforms() {if (!hasError) {
+    
     waveform();
     }
     if (!hasError) {
+    
     while (!hasError) {
       if (jj_2_25(2147483647)) {
         ;
       } else {
         goto end_label_11;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       condition();
       }
       if (!hasError) {
+      
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
+      
       waveform();
       }
+      
     }
     end_label_11: ;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{
-      if (!hasError) {
+    case WHEN_T:{if (!hasError) {
+      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       condition();
       }
+      
       break;
       }
     default:
@@ -1991,44 +2323,55 @@ void VhdlParser::conditional_waveforms() {
       ;
     }
     }
-}
+    
+  }
 
 
-void VhdlParser::configuration_declaration() {QCString s,s1;
-    if (!hasError) {
+void VhdlParser::configuration_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(CONFIGURATION_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 confName=s+"::"+s1;
   addVhdlType(s.data(),getLine(CONFIGURATION_T),Entry::VARIABLE_SEC,VhdlDocGen::CONFIG,"configuration",s1.data(),Public);
     }
     if (!hasError) {
+    
     configuration_declarative_part();
     }
     if (!hasError) {
+    
     block_configuration();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONFIGURATION_T:{
-      if (!hasError) {
+    case CONFIGURATION_T:{if (!hasError) {
+      
       jj_consume_token(CONFIGURATION_T);
       }
+      
       break;
       }
     default:
@@ -2037,14 +2380,16 @@ confName=s+"::"+s1;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -2053,30 +2398,35 @@ confName=s+"::"+s1;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 genLabels.resize(0); confName="";
-}
+  }
 
 
 void VhdlParser::configuration_declarative_item() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case USE_T:{
-      if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
       use_clause();
       }
+      
       break;
       }
-    case ATTRIBUTE_T:{
-      if (!hasError) {
+    case ATTRIBUTE_T:{if (!hasError) {
+      
       attribute_specification();
       }
+      
       break;
       }
-    case GROUP_T:{
-      if (!hasError) {
+    case GROUP_T:{if (!hasError) {
+      
       group_declaration();
       }
+      
       break;
       }
     default:
@@ -2084,11 +2434,11 @@ void VhdlParser::configuration_declarative_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-void VhdlParser::configuration_declarative_part() {
-    if (!hasError) {
+void VhdlParser::configuration_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ATTRIBUTE_T:
@@ -2100,27 +2450,31 @@ void VhdlParser::configuration_declarative_part() {
       default:
         jj_la1[60] = jj_gen;
         goto end_label_12;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       configuration_declarative_item();
       }
+      
     }
     end_label_12: ;
     }
-}
+    
+  }
 
 
 void VhdlParser::configuration_item() {
-    if (jj_2_26(2147483647)) {
-      if (!hasError) {
+    if (jj_2_26(2147483647)) {if (!hasError) {
+      
       component_configuration();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case FOR_T:{
-        if (!hasError) {
+      case FOR_T:{if (!hasError) {
+        
         block_configuration();
         }
+        
         break;
         }
       default:
@@ -2129,47 +2483,57 @@ void VhdlParser::configuration_item() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
-void VhdlParser::configuration_specification() {
-    if (!hasError) {
+void VhdlParser::configuration_specification() {if (!hasError) {
+    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
+    
     component_specification();
     }
     if (!hasError) {
+    
     binding_indication();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;
-    if (!hasError) {
+QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!hasError) {
+    
     jj_consume_token(CONSTANT_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{
-      if (!hasError) {
+    case VARASSIGN_T:{if (!hasError) {
+      
       t = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
+      
       s2 = expression();
       }
+      
       break;
       }
     default:
@@ -2178,8 +2542,10 @@ QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(t)
       s2.prepend(":=");
      QCString it=s1+s2;
@@ -2187,29 +2553,33 @@ if(t)
      it.prepend("constant ");
      return it;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::constraint_array_definition() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(ARRAY_T);
     }
     if (!hasError) {
+    
     s = index_constraint();
     }
     if (!hasError) {
+    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
+    
 return s+" "+s1;
 assert(false);
-}
+  }
 
 
-void VhdlParser::context_clause() {
-    if (!hasError) {
+void VhdlParser::context_clause() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LIBRARY_T:
@@ -2220,51 +2590,59 @@ void VhdlParser::context_clause() {
       default:
         jj_la1[63] = jj_gen;
         goto end_label_13;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       context_item();
       }
+      
     }
     end_label_13: ;
     }
-}
+    
+  }
 
 
 QCString VhdlParser::constraint() {QCString s;
-    if (jj_2_27(2147483647)) {
-      if (!hasError) {
+    if (jj_2_27(2147483647)) {if (!hasError) {
+      
       s = range_constraint();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_28(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_28(2147483647)) {if (!hasError) {
+      
       s = index_constraint();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 void VhdlParser::context_item() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LIBRARY_T:{
-      if (!hasError) {
+    case LIBRARY_T:{if (!hasError) {
+      
       library_clause();
       }
+      
       break;
       }
-    case USE_T:{
-      if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
       use_clause();
       }
+      
       break;
       }
     default:
@@ -2272,43 +2650,49 @@ void VhdlParser::context_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-QCString VhdlParser::decimal_literal() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(DECIMAL_LITERAL);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::delay_mechanism() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case TRANSPORT_T:{
-      if (!hasError) {
+    case TRANSPORT_T:{if (!hasError) {
+      
       jj_consume_token(TRANSPORT_T);
       }
       if (!hasError) {
+      
 return " transport ";
       }
+      
       break;
       }
     case INERTIAL_T:
-    case REJECT_T:{
-      if (!hasError) {
+    case REJECT_T:{if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case REJECT_T:{
-        if (!hasError) {
+      case REJECT_T:{if (!hasError) {
+        
         jj_consume_token(REJECT_T);
         }
         if (!hasError) {
+        
         s = expression();
         }
         if (!hasError) {
+        
 s.prepend(" reject ");
         }
+        
         break;
         }
       default:
@@ -2317,11 +2701,14 @@ s.prepend(" reject ");
       }
       }
       if (!hasError) {
+      
       jj_consume_token(INERTIAL_T);
       }
       if (!hasError) {
+      
 return s+" inertial ";
       }
+      
       break;
       }
     default:
@@ -2330,7 +2717,7 @@ return s+" inertial ";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 void VhdlParser::design_file() {
@@ -2341,12 +2728,13 @@ void VhdlParser::design_file() {
     case ENTITY_T:
     case LIBRARY_T:
     case PACKAGE_T:
-    case USE_T:{
-      if (!hasError) {
-      while (!hasError) {
-        if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
+      while (!hasError) {if (!hasError) {
+        
         design_unit();
         }
+        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case ARCHITECTURE_T:
         case CONFIGURATION_T:
@@ -2366,14 +2754,17 @@ void VhdlParser::design_file() {
       end_label_14: ;
       }
       if (!hasError) {
+      
 
       }
+      
       break;
       }
-    case 0:{
-      if (!hasError) {
+    case 0:{if (!hasError) {
+      
       jj_consume_token(0);
       }
+      
       break;
       }
     default:
@@ -2381,38 +2772,44 @@ void VhdlParser::design_file() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-void VhdlParser::design_unit() {
-    if (!hasError) {
+void VhdlParser::design_unit() {if (!hasError) {
+    
     context_clause();
     }
     if (!hasError) {
+    
     library_unit();
     }
-}
+    
+  }
 
 
 QCString VhdlParser::designator() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case STRINGLITERAL:{
-      if (!hasError) {
+    case STRINGLITERAL:{if (!hasError) {
+      
       s = operator_symbol();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -2421,27 +2818,31 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::direction() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case TO_T:{
-      if (!hasError) {
+    case TO_T:{if (!hasError) {
+      
       tok = jj_consume_token(TO_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case DOWNTO_T:{
-      if (!hasError) {
+    case DOWNTO_T:{if (!hasError) {
+      
       tok = jj_consume_token(DOWNTO_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -2450,131 +2851,157 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-void VhdlParser::disconnection_specification() {
-    if (!hasError) {
+void VhdlParser::disconnection_specification() {if (!hasError) {
+    
     jj_consume_token(DISCONNECT_T);
     }
     if (!hasError) {
+    
     guarded_signal_specificatio();
     }
     if (!hasError) {
+    
     jj_consume_token(AFTER_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::guarded_signal_specificatio() {
-    if (!hasError) {
+void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
+    
     signal_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     name();
     }
-}
+    
+  }
 
 
 QCString VhdlParser::discrete_range() {QCString s;
-    if (jj_2_29(2147483647)) {
-      if (!hasError) {
+    if (jj_2_29(2147483647)) {if (!hasError) {
+      
       s = range();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_30(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_30(2147483647)) {if (!hasError) {
+      
       s = subtype_indication();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::element_association() {QCString s,s1;
-    if (!hasError) {
-    if (jj_2_31(2147483647)) {
-      if (!hasError) {
+QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) {
+    
+    if (jj_2_31(2147483647)) {if (!hasError) {
+      
       s = choices();
       }
       if (!hasError) {
+      
       jj_consume_token(ARROW_T);
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     s1 = expression();
     }
+    
 if(!s.isEmpty())
  return s+"=>"+s1;
 return s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::element_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(),Public);
   //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
   return s+":"+s1;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::entity_aspect() {Token *tok=0;QCString s,s1;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{
-      if (!hasError) {
+    case ENTITY_T:{if (!hasError) {
+      
       tok = jj_consume_token(ENTITY_T);
       }
       if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{
-        if (!hasError) {
+      case LPAREN_T:{if (!hasError) {
+        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
+        
         s1 = identifier();
         }
         if (!hasError) {
+        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
+        
 s+="("+s1+")";
         }
+        
         break;
         }
       default:
@@ -2583,29 +3010,36 @@ s+="("+s1+")";
       }
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CONFIGURATION_T:{
-      if (!hasError) {
+    case CONFIGURATION_T:{if (!hasError) {
+      
       tok = jj_consume_token(CONFIGURATION_T);
       }
       if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return tok->image.c_str()+s;
       }
+      
       break;
       }
-    case OPEN_T:{
-      if (!hasError) {
+    case OPEN_T:{if (!hasError) {
+      
       tok = jj_consume_token(OPEN_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -2614,162 +3048,196 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::entity_class() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{
-      if (!hasError) {
+    case ENTITY_T:{if (!hasError) {
+      
       jj_consume_token(ENTITY_T);
       }
       if (!hasError) {
+      
 return "entity";
       }
+      
       break;
       }
-    case ARCHITECTURE_T:{
-      if (!hasError) {
+    case ARCHITECTURE_T:{if (!hasError) {
+      
       jj_consume_token(ARCHITECTURE_T);
       }
       if (!hasError) {
+      
 return "architecture";
       }
+      
       break;
       }
-    case CONFIGURATION_T:{
-      if (!hasError) {
+    case CONFIGURATION_T:{if (!hasError) {
+      
       jj_consume_token(CONFIGURATION_T);
       }
       if (!hasError) {
+      
 return "configuration";
       }
+      
       break;
       }
-    case PROCEDURE_T:{
-      if (!hasError) {
+    case PROCEDURE_T:{if (!hasError) {
+      
       jj_consume_token(PROCEDURE_T);
       }
       if (!hasError) {
+      
 return "procedure";
       }
+      
       break;
       }
-    case FUNCTION_T:{
-      if (!hasError) {
+    case FUNCTION_T:{if (!hasError) {
+      
       jj_consume_token(FUNCTION_T);
       }
       if (!hasError) {
+      
 return "function";
       }
+      
       break;
       }
-    case PACKAGE_T:{
-      if (!hasError) {
+    case PACKAGE_T:{if (!hasError) {
+      
       jj_consume_token(PACKAGE_T);
       }
       if (!hasError) {
+      
 return "package";
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       jj_consume_token(TYPE_T);
       }
       if (!hasError) {
+      
 return "type";
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       jj_consume_token(SUBTYPE_T);
       }
       if (!hasError) {
+      
 return "subtype";
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
+      
 return "constant";
       }
+      
       break;
       }
-    case SIGNAL_T:{
-      if (!hasError) {
+    case SIGNAL_T:{if (!hasError) {
+      
       jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
+      
 return "signal";
       }
+      
       break;
       }
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
+      
 return "variable";
       }
+      
       break;
       }
-    case COMPONENT_T:{
-      if (!hasError) {
+    case COMPONENT_T:{if (!hasError) {
+      
       jj_consume_token(COMPONENT_T);
       }
       if (!hasError) {
+      
 return "component";
       }
+      
       break;
       }
-    case LABEL_T:{
-      if (!hasError) {
+    case LABEL_T:{if (!hasError) {
+      
       jj_consume_token(LABEL_T);
       }
       if (!hasError) {
+      
 return "label";
       }
+      
       break;
       }
-    case LITERAL_T:{
-      if (!hasError) {
+    case LITERAL_T:{if (!hasError) {
+      
       jj_consume_token(LITERAL_T);
       }
       if (!hasError) {
+      
 return "literal";
       }
+      
       break;
       }
-    case UNITS_T:{
-      if (!hasError) {
+    case UNITS_T:{if (!hasError) {
+      
       jj_consume_token(UNITS_T);
       }
       if (!hasError) {
+      
 return "units";
       }
+      
       break;
       }
-    case GROUP_T:{
-      if (!hasError) {
+    case GROUP_T:{if (!hasError) {
+      
       jj_consume_token(GROUP_T);
       }
       if (!hasError) {
+      
 return "group";
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       jj_consume_token(FILE_T);
       }
       if (!hasError) {
+      
 return "file";
       }
+      
       break;
       }
     default:
@@ -2778,22 +3246,25 @@ return "file";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::entity_class_entry() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::entity_class_entry() {QCString s;if (!hasError) {
+    
     s = entity_class();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case BOX_T:{
-      if (!hasError) {
+    case BOX_T:{if (!hasError) {
+      
       jj_consume_token(BOX_T);
       }
       if (!hasError) {
+      
 s+="<>";
       }
+      
       break;
       }
     default:
@@ -2801,21 +3272,25 @@ s+="<>";
       ;
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;if (!hasError) {
     if (!hasError) {
+    
     s1 = entity_class_entry();
     }
     if (!hasError) {
+    
 s+=s1;
     }
+    
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -2825,54 +3300,66 @@ s+=s1;
       default:
         jj_la1[75] = jj_gen;
         goto end_label_15;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s = entity_class_entry();
       }
       if (!hasError) {
+      
 s2+=",";s2+=s;
       }
+      
     }
     end_label_15: ;
     }
+    
 return s1+s2;
 assert(false);
-}
+  }
 
 
-void VhdlParser::entity_declaration() {QCString s;
-    if (!hasError) {
+void VhdlParser::entity_declaration() {QCString s;if (!hasError) {
+    
     jj_consume_token(ENTITY_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 lastEntity=current.get();
                 lastCompound=0;
                 addVhdlType(s.data(),getLine(ENTITY_T),Entry::CLASS_SEC,VhdlDocGen::ENTITY,0,0,Public);
     }
     if (!hasError) {
+    
     entity_header();
     }
     if (!hasError) {
+    
     entity_declarative_part();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case BEGIN_T:{
-      if (!hasError) {
+    case BEGIN_T:{if (!hasError) {
+      
       jj_consume_token(BEGIN_T);
       }
       if (!hasError) {
+      
       entity_statement_part();
       }
+      
       break;
       }
     default:
@@ -2881,14 +3368,17 @@ lastEntity=current.get();
     }
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{
-      if (!hasError) {
+    case ENTITY_T:{if (!hasError) {
+      
       jj_consume_token(ENTITY_T);
       }
+      
       break;
       }
     default:
@@ -2897,14 +3387,16 @@ lastEntity=current.get();
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -2913,10 +3405,12 @@ lastEntity=current.get();
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-}
+  }
 
 
 void VhdlParser::entity_declarative_item() {
@@ -2924,113 +3418,130 @@ void VhdlParser::entity_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       type_declaration();
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       subtype_declaration();
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       constant_declaration();
       }
+      
       break;
       }
-    case SIGNAL_T:{
-      if (!hasError) {
+    case SIGNAL_T:{if (!hasError) {
+      
       signal_declaration();
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       variable_declaration();
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       file_declaration();
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       alias_declaration();
       }
+      
       break;
       }
     default:
       jj_la1[79] = jj_gen;
-      if (jj_2_32(2147483647)) {
-        if (!hasError) {
+      if (jj_2_32(2147483647)) {if (!hasError) {
+        
         attribute_declaration();
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{
-          if (!hasError) {
+        case ATTRIBUTE_T:{if (!hasError) {
+          
           attribute_specification();
           }
+          
           break;
           }
-        case DISCONNECT_T:{
-          if (!hasError) {
+        case DISCONNECT_T:{if (!hasError) {
+          
           disconnection_specification();
           }
+          
           break;
           }
-        case USE_T:{
-          if (!hasError) {
+        case USE_T:{if (!hasError) {
+          
           use_clause();
           }
+          
           break;
           }
         default:
           jj_la1[80] = jj_gen;
-          if (jj_2_33(3)) {
-            if (!hasError) {
+          if (jj_2_33(3)) {if (!hasError) {
+            
             group_template_declaration();
             }
+            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{
-              if (!hasError) {
+            case GROUP_T:{if (!hasError) {
+              
               group_declaration();
               }
+              
               break;
               }
             default:
               jj_la1[81] = jj_gen;
-              if (jj_2_34(5)) {
-                if (!hasError) {
+              if (jj_2_34(5)) {if (!hasError) {
+                
                 package_instantiation_declaration();
                 }
+                
               } else {
                 switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-                case PACKAGE_T:{
-                  if (!hasError) {
+                case PACKAGE_T:{if (!hasError) {
+                  
                   package_declaration();
                   }
+                  
                   break;
                   }
-                case VHDL2008TOOLDIR:{
-                  if (!hasError) {
+                case VHDL2008TOOLDIR:{if (!hasError) {
+                  
                   jj_consume_token(VHDL2008TOOLDIR);
                   }
+                  
                   break;
                   }
                 default:
@@ -3044,11 +3555,11 @@ void VhdlParser::entity_declarative_item() {
         }
       }
     }
-}
+  }
 
 
-void VhdlParser::entity_declarative_part() {
-    if (!hasError) {
+void VhdlParser::entity_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -3075,26 +3586,30 @@ void VhdlParser::entity_declarative_part() {
       default:
         jj_la1[83] = jj_gen;
         goto end_label_16;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       entity_declarative_item();
       }
+      
     }
     end_label_16: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::entity_designator() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
+    
     s = entity_tag();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LBRACKET_T:{
-      if (!hasError) {
+    case LBRACKET_T:{if (!hasError) {
+      
       s1 = signature();
       }
+      
       break;
       }
     default:
@@ -3102,21 +3617,24 @@ QCString VhdlParser::entity_designator() {QCString s,s1;
       ;
     }
     }
+    
 return s+s1;
 assert(false);
-}
+  }
 
 
-void VhdlParser::entity_header() {
-    if (!hasError) {
+void VhdlParser::entity_header() {if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
 currP=VhdlDocGen::GENERIC;parse_sec=GEN_SEC;
       }
       if (!hasError) {
+      
       generic_clause();
       }
+      
       break;
       }
     default:
@@ -3125,14 +3643,17 @@ currP=VhdlDocGen::GENERIC;parse_sec=GEN_SEC;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PORT_T:{
-      if (!hasError) {
+    case PORT_T:{if (!hasError) {
+      
 currP=VhdlDocGen::PORT;
       }
       if (!hasError) {
+      
       port_clause();
       }
+      
       break;
       }
     default:
@@ -3140,7 +3661,8 @@ currP=VhdlDocGen::PORT;
       ;
     }
     }
-}
+    
+  }
 
 
 QCString VhdlParser::entity_name_list() {QCString s,s1;
@@ -3149,15 +3671,17 @@ QCString VhdlParser::entity_name_list() {QCString s,s1;
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
     case EXTENDED_CHARACTER:
-    case CHARACTER_LITERAL:{
-      if (!hasError) {
-      while (!hasError) {
-        if (!hasError) {
+    case CHARACTER_LITERAL:{if (!hasError) {
+      
+      while (!hasError) {if (!hasError) {
+        
         s1 = entity_designator();
         }
         if (!hasError) {
+        
 s+=s1;
         }
+        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case SLSL_T:
         case STRINGLITERAL:
@@ -3175,26 +3699,32 @@ s+=s1;
       end_label_17: ;
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case OTHER_T:{
-      if (!hasError) {
+    case OTHER_T:{if (!hasError) {
+      
       jj_consume_token(OTHER_T);
       }
       if (!hasError) {
+      
 return "other";
       }
+      
       break;
       }
-    case ALL_T:{
-      if (!hasError) {
+    case ALL_T:{if (!hasError) {
+      
       jj_consume_token(ALL_T);
       }
       if (!hasError) {
+      
 return "all";
       }
+      
       break;
       }
     default:
@@ -3203,43 +3733,49 @@ return "all";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::entity_specification() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) {
+    
     s = entity_name_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = entity_class();
     }
+    
 return s+":"+s1;
 assert(false);
-}
+  }
 
 
 void VhdlParser::entity_statement() {
-    if (jj_2_35(2147483647)) {
-      if (!hasError) {
+    if (jj_2_35(2147483647)) {if (!hasError) {
+      
       concurrent_assertion_statement();
       }
-    } else if (jj_2_36(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_36(2147483647)) {if (!hasError) {
+      
       process_statement();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case POSTPONED_T:
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         concurrent_procedure_call_statement();
         }
+        
         break;
         }
       default:
@@ -3248,11 +3784,11 @@ void VhdlParser::entity_statement() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
-void VhdlParser::entity_statement_part() {
-    if (!hasError) {
+void VhdlParser::entity_statement_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -3268,14 +3804,16 @@ void VhdlParser::entity_statement_part() {
       default:
         jj_la1[90] = jj_gen;
         goto end_label_18;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       entity_statement();
       }
+      
     }
     end_label_18: ;
     }
-}
+    
+  }
 
 
 QCString VhdlParser::entity_tag() {QCString s;
@@ -3283,22 +3821,26 @@ QCString VhdlParser::entity_tag() {QCString s;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CHARACTER_LITERAL:{
-      if (!hasError) {
+    case CHARACTER_LITERAL:{if (!hasError) {
+      
       s = character_literal();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -3307,28 +3849,32 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::enumeration_literal() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CHARACTER_LITERAL:{
-      if (!hasError) {
+    case CHARACTER_LITERAL:{if (!hasError) {
+      
       s = character_literal();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -3337,17 +3883,19 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::enumeration_type_definition() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s = enumeration_literal();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -3357,38 +3905,45 @@ QCString VhdlParser::enumeration_type_definition() {QCString s,s1;
       default:
         jj_la1[93] = jj_gen;
         goto end_label_19;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = enumeration_literal();
       }
       if (!hasError) {
+      
 s+=",";s+=s1;
       }
+      
     }
     end_label_19: ;
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return "("+s+")";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
-    if (!hasError) {
+QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       t = jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -3397,15 +3952,18 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(EXIT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s1 = identifier();
       }
+      
       break;
       }
     default:
@@ -3414,14 +3972,17 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{
-      if (!hasError) {
+    case WHEN_T:{if (!hasError) {
+      
       t1 = jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       s2 = condition();
       }
+      
       break;
       }
     default:
@@ -3430,8 +3991,10 @@ QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 lab.resize(0);
   if(t) s+=":";
   if(t1) s2.prepend(" when ");
@@ -3439,14 +4002,15 @@ lab.resize(0);
 
   return s+s1+s2+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::expression() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) {
+    
     s = relation();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case AND_T:
@@ -3461,78 +4025,94 @@ QCString VhdlParser::expression() {QCString s,s1,s2;
       default:
         jj_la1[97] = jj_gen;
         goto end_label_20;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = logop();
       }
       if (!hasError) {
+      
       s2 = relation();
       }
       if (!hasError) {
+      
 s+=s1;s+=s2;
       }
+      
     }
     end_label_20: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::logop() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case AND_T:{
-      if (!hasError) {
+    case AND_T:{if (!hasError) {
+      
       jj_consume_token(AND_T);
       }
       if (!hasError) {
+      
 return "and" ;
       }
+      
       break;
       }
-    case NAND_T:{
-      if (!hasError) {
+    case NAND_T:{if (!hasError) {
+      
       jj_consume_token(NAND_T);
       }
       if (!hasError) {
+      
 return "nand" ;
       }
+      
       break;
       }
-    case NOR_T:{
-      if (!hasError) {
+    case NOR_T:{if (!hasError) {
+      
       jj_consume_token(NOR_T);
       }
       if (!hasError) {
+      
 return "nor" ;
       }
+      
       break;
       }
-    case XNOR_T:{
-      if (!hasError) {
+    case XNOR_T:{if (!hasError) {
+      
       jj_consume_token(XNOR_T);
       }
       if (!hasError) {
+      
 return "xnor" ;
       }
+      
       break;
       }
-    case XOR_T:{
-      if (!hasError) {
+    case XOR_T:{if (!hasError) {
+      
       jj_consume_token(XOR_T);
       }
       if (!hasError) {
+      
 return "xor" ;
       }
+      
       break;
       }
-    case OR_T:{
-      if (!hasError) {
+    case OR_T:{if (!hasError) {
+      
       jj_consume_token(OR_T);
       }
       if (!hasError) {
+      
 return "or" ;
       }
+      
       break;
       }
     default:
@@ -3541,16 +4121,17 @@ return "or" ;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::extended_identifier() {Token *t;
-    if (!hasError) {
+QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) {
+    
     t = jj_consume_token(EXTENDED_CHARACTER);
     }
+    
 return t->image.c_str();
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::factor() {QCString s,s1;
@@ -3566,22 +4147,26 @@ QCString VhdlParser::factor() {QCString s,s1;
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{
-      if (!hasError) {
+    case BIT_STRING_LITERAL:{if (!hasError) {
+      
       s = primary();
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case DOUBLEMULT_T:{
-        if (!hasError) {
+      case DOUBLEMULT_T:{if (!hasError) {
+        
         jj_consume_token(DOUBLEMULT_T);
         }
         if (!hasError) {
+        
         s1 = primary();
         }
         if (!hasError) {
+        
 s+="**";s+=s1;
         }
+        
         break;
         }
       default:
@@ -3590,32 +4175,40 @@ s+="**";s+=s1;
       }
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case ABS_T:{
-      if (!hasError) {
+    case ABS_T:{if (!hasError) {
+      
       jj_consume_token(ABS_T);
       }
       if (!hasError) {
+      
       s = primary();
       }
       if (!hasError) {
+      
 s1 = "abs "; return s1+s;
       }
+      
       break;
       }
-    case NOT_T:{
-      if (!hasError) {
+    case NOT_T:{if (!hasError) {
+      
       jj_consume_token(NOT_T);
       }
       if (!hasError) {
+      
       s = primary();
       }
       if (!hasError) {
+      
 s1="not ";return s1+s;
       }
+      
       break;
       }
     default:
@@ -3624,29 +4217,34 @@ s1="not ";return s1+s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;
-    if (!hasError) {
+QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) {
+    
     jj_consume_token(FILE_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s2 = subtype_indication();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IS_T:
-    case OPEN_T:{
-      if (!hasError) {
+    case OPEN_T:{if (!hasError) {
+      
       s3 = file_open_information();
       }
+      
       break;
       }
     default:
@@ -3655,34 +4253,39 @@ QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 QCString t1=s2+" "+s3;
    addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public);
    return " file "+s+":"+s2+" "+s3+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::file_logical_name() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) {
+    
     s = expression();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::file_open_information() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_T:{
-      if (!hasError) {
+    case OPEN_T:{if (!hasError) {
+      
       jj_consume_token(OPEN_T);
       }
       if (!hasError) {
+      
       s = expression();
       }
+      
       break;
       }
     default:
@@ -3691,38 +4294,45 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     s1 = file_logical_name();
     }
+    
 s2="open "+s+" is "+s1;  return s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::file_type_definition() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(FILE_T);
     }
     if (!hasError) {
+    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
+    
     s = type_mark();
     }
+    
 s1=" file of "+s; return s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::floating_type_definition() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) {
+    
     s = range_constraint();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::formal_designator() {QCString s;Token *tok=0;
@@ -3730,22 +4340,26 @@ QCString VhdlParser::formal_designator() {QCString s;Token *tok=0;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case INTEGER:{
-      if (!hasError) {
+    case INTEGER:{if (!hasError) {
+      
       tok = jj_consume_token(INTEGER);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -3754,37 +4368,43 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::formal_parameter_list() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) {
+    
     s = interface_list();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::formal_part() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::formal_part() {QCString s,s1;if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       formal_designator();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s+"("+s1+")";
       }
+      
       break;
       }
     default:
@@ -3792,37 +4412,45 @@ s+"("+s1+")";
       ;
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(TYPE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 tmpEntry=current.get();
   addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,0,Public);
     }
     if (!hasError) {
-    try {
-      if (!hasError) {
+    
+    try {if (!hasError) {
+      
       s2 = type_definition();
       }
+      
     } catch ( ...) {
 error_skipto(SEMI_T);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if (s2.contains("#")) {
         VhdlDocGen::deleteAllChars(s2,'#');
         tmpEntry->spec=VhdlDocGen::RECORD;
@@ -3843,65 +4471,79 @@ if (s2.contains("#")) {
       tmpEntry=0;
       return "type "+s+" is "+s2+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::function_call() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s1 = actual_parameter_part();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return s+"("+s1+")";
 assert(false);
-}
+  }
 
 
-void VhdlParser::generate_statement() {QCString s;
-    if (!hasError) {
+void VhdlParser::generate_statement() {QCString s;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
-    try {
-      if (!hasError) {
+    
+    try {if (!hasError) {
+      
       generate_scheme();
       }
       if (!hasError) {
+      
       jj_consume_token(GENERATE_T);
       }
       if (!hasError) {
+      
 pushLabel(genLabels,s);
       }
       if (!hasError) {
+      
       generate_statement_body1();
       }
       if (!hasError) {
+      
       jj_consume_token(END_T);
       }
+      
     } catch ( ...) {
 error_skipto(GENERATE_T);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(GENERATE_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -3910,30 +4552,36 @@ error_skipto(GENERATE_T);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 genLabels=popLabel(genLabels);
-}
+  }
 
 
 void VhdlParser::generate_scheme() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FOR_T:{
-      if (!hasError) {
+    case FOR_T:{if (!hasError) {
+      
       jj_consume_token(FOR_T);
       }
       if (!hasError) {
+      
       parameter_specification();
       }
+      
       break;
       }
-    case IF_T:{
-      if (!hasError) {
+    case IF_T:{if (!hasError) {
+      
       jj_consume_token(IF_T);
       }
       if (!hasError) {
+      
       condition();
       }
+      
       break;
       }
     default:
@@ -3941,58 +4589,70 @@ void VhdlParser::generate_scheme() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-void VhdlParser::generic_clause() {QCString s;
-    if (!hasError) {
+void VhdlParser::generic_clause() {QCString s;if (!hasError) {
+    
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
 parse_sec=GEN_SEC;
     }
     if (!hasError) {
+    
     s = generic_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 parse_sec=0;
-}
+  }
 
 
-QCString VhdlParser::generic_list() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::generic_list() {QCString s;if (!hasError) {
+    
     s = interface_list();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::generic_map_aspect() {
-    if (!hasError) {
+void VhdlParser::generic_map_aspect() {if (!hasError) {
+    
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
+    
     jj_consume_token(MAP_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     association_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
-}
+    
+  }
 
 
 QCString VhdlParser::group_constituent() {QCString s;
@@ -4000,22 +4660,26 @@ QCString VhdlParser::group_constituent() {QCString s;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CHARACTER_LITERAL:{
-      if (!hasError) {
+    case CHARACTER_LITERAL:{if (!hasError) {
+      
       s = character_literal();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -4024,16 +4688,18 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) {
     if (!hasError) {
+    
     s1 = group_constituent();
     }
+    
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -4043,112 +4709,138 @@ QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;
       default:
         jj_la1[108] = jj_gen;
         goto end_label_21;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s = group_constituent();
       }
       if (!hasError) {
+      
 s2+=",";s2+=s1;
       }
+      
     }
     end_label_21: ;
     }
+    
 return s+s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::group_declaration() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(GROUP_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s2 = group_constituent_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return "group "+s+":"+s1+"("+s2+");";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::group_template_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(GROUP_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s1 = entity_class_entry_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return "group "+s+ "is ("+s1+");";
 assert(false);
-}
+  }
 
 
-void VhdlParser::guarded_signal_specification() {
-    if (!hasError) {
+void VhdlParser::guarded_signal_specification() {if (!hasError) {
+    
     signal_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     type_mark();
     }
-}
+    
+  }
 
 
 QCString VhdlParser::identifier() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       tok = jj_consume_token(EXTENDED_CHARACTER);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case BASIC_IDENTIFIER:{
-      if (!hasError) {
+    case BASIC_IDENTIFIER:{if (!hasError) {
+      
       tok = jj_consume_token(BASIC_IDENTIFIER);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -4157,14 +4849,15 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::identifier_list() {QCString str,str1;
-    if (!hasError) {
+QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) {
+    
     str = identifier();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -4174,35 +4867,41 @@ QCString VhdlParser::identifier_list() {QCString str,str1;
       default:
         jj_la1[110] = jj_gen;
         goto end_label_22;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       str1 = identifier();
       }
       if (!hasError) {
+      
 str+=",";str+=str1;
       }
+      
     }
     end_label_22: ;
     }
+    
 return str;
 assert(false);
-}
+  }
 
 
-void VhdlParser::if_statement() {QCString s,s1;
-    if (!hasError) {
+void VhdlParser::if_statement() {QCString s,s1;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -4211,22 +4910,28 @@ void VhdlParser::if_statement() {QCString s,s1;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(IF_T);
     }
     if (!hasError) {
+    
     s = condition();
     }
     if (!hasError) {
+    
     jj_consume_token(THEN_T);
     }
     if (!hasError) {
+    
 s.prepend("if ");
     FlowChart::addFlowChart(FlowChart::IF_NO,0,s);
     }
     if (!hasError) {
+    
     sequence_of_statement();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ELSIF_T:{
@@ -4236,38 +4941,47 @@ s.prepend("if ");
       default:
         jj_la1[112] = jj_gen;
         goto end_label_23;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(ELSIF_T);
       }
       if (!hasError) {
+      
       s1 = condition();
       }
       if (!hasError) {
+      
       jj_consume_token(THEN_T);
       }
       if (!hasError) {
+      
 s1.prepend("elsif ");
            FlowChart::addFlowChart(FlowChart::ELSIF_NO,0,s1.data());
       }
       if (!hasError) {
+      
       sequence_of_statement();
       }
+      
     }
     end_label_23: ;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ELSE_T:{
-      if (!hasError) {
+    case ELSE_T:{if (!hasError) {
+      
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
       }
       if (!hasError) {
+      
       sequence_of_statement();
       }
+      
       break;
       }
     default:
@@ -4276,18 +4990,22 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(IF_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -4296,39 +5014,47 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 FlowChart::moveToPrevLevel();
           FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0);
-}
+  }
 
 
-QCString VhdlParser::incomplete_type_declaration() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) {
+    
     jj_consume_token(TYPE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return "type "+s+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;
-    if (!hasError) {
+QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s2 = discrete_range();
     }
     if (!hasError) {
+    
 s+=s2;
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -4338,35 +5064,42 @@ s+=s2;
       default:
         jj_la1[115] = jj_gen;
         goto end_label_24;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = discrete_range();
       }
       if (!hasError) {
+      
 s+=",";s+=s1;
       }
+      
     }
     end_label_24: ;
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return s+")";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::index_specification() {QCString s;
-    if (jj_2_37(2147483647)) {
-      if (!hasError) {
+    if (jj_2_37(2147483647)) {if (!hasError) {
+      
       s = discrete_range();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ABS_T:
@@ -4384,13 +5117,15 @@ return s;
       case CHARACTER_LITERAL:
       case DECIMAL_LITERAL:
       case BASED_LITERAL:
-      case BIT_STRING_LITERAL:{
-        if (!hasError) {
+      case BIT_STRING_LITERAL:{if (!hasError) {
+        
         s = expression();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
       default:
@@ -4400,35 +5135,39 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::index_subtype_definition() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) {
+    
     s = type_mark();
     }
     if (!hasError) {
+    
     jj_consume_token(RANGE_T);
     }
     if (!hasError) {
+    
     jj_consume_token(BOX_T);
     }
+    
 return s+" range <> ";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case COMPONENT_T:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case COMPONENT_T:{
-        if (!hasError) {
+      case COMPONENT_T:{if (!hasError) {
+        
         jj_consume_token(COMPONENT_T);
         }
+        
         break;
         }
       default:
@@ -4437,50 +5176,63 @@ QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
       }
       }
       if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
 s1="component "; return s;
       }
+      
       break;
       }
-    case ENTITY_T:{
-      if (!hasError) {
+    case ENTITY_T:{if (!hasError) {
+      
       jj_consume_token(ENTITY_T);
       }
       if (!hasError) {
-      if (jj_2_38(2)) {
-        if (!hasError) {
+      
+      if (jj_2_38(2)) {if (!hasError) {
+        
         jj_consume_token(BASIC_IDENTIFIER);
         }
         if (!hasError) {
+        
         jj_consume_token(DOT_T);
         }
+        
       } else {
         ;
       }
       }
       if (!hasError) {
+      
       s2 = name();
       }
       if (!hasError) {
+      
 s="entity|"+s2;
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{
-        if (!hasError) {
+      case LPAREN_T:{if (!hasError) {
+        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
+        
         s1 = identifier();
         }
         if (!hasError) {
+        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
+        
 s+="(";s+=s1;s+=")" ;
         }
+        
         break;
         }
       default:
@@ -4489,20 +5241,25 @@ s+="(";s+=s1;s+=")" ;
       }
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CONFIGURATION_T:{
-      if (!hasError) {
+    case CONFIGURATION_T:{if (!hasError) {
+      
       jj_consume_token(CONFIGURATION_T);
       }
       if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 s1="configuration ";return s;
       }
+      
       break;
       }
     default:
@@ -4511,37 +5268,43 @@ s1="configuration ";return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::instantiation_list() {QCString s;Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier_list();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case OTHER_T:{
-      if (!hasError) {
+    case OTHER_T:{if (!hasError) {
+      
       tok = jj_consume_token(OTHER_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case ALL_T:{
-      if (!hasError) {
+    case ALL_T:{if (!hasError) {
+      
       tok = jj_consume_token(ALL_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -4550,69 +5313,81 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::integer() {Token *t;
-    if (!hasError) {
+QCString VhdlParser::integer() {Token *t;if (!hasError) {
+    
     t = jj_consume_token(INTEGER);
     }
+    
 return t->image.c_str();
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::integer_type_definition() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) {
+    
     s = range_constraint();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::interface_declaration() {QCString s,s1;
-    if (jj_2_39(5)) {
-      if (!hasError) {
+    if (jj_2_39(5)) {if (!hasError) {
+      
       s = interface_subprogram_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PACKAGE_T:{
-        if (!hasError) {
+      case PACKAGE_T:{if (!hasError) {
+        
         interface_package_declaration();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
       default:
         jj_la1[121] = jj_gen;
-        if (jj_2_40(5)) {
-          if (!hasError) {
+        if (jj_2_40(5)) {if (!hasError) {
+          
           s = interface_variable_declaration();
           }
           if (!hasError) {
+          
 return s;
           }
-        } else if (jj_2_41(5)) {
-          if (!hasError) {
+          
+        } else if (jj_2_41(5)) {if (!hasError) {
+          
           interface_file_declaration();
           }
           if (!hasError) {
+          
 return s;
           }
-        } else if (jj_2_42(2147483647)) {
-          if (!hasError) {
+          
+        } else if (jj_2_42(2147483647)) {if (!hasError) {
+          
           subprogram_declaration();
           }
           if (!hasError) {
+          
 return s;
           }
+          
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case CONSTANT_T:
@@ -4620,19 +5395,22 @@ return s;
           case SIGNAL_T:
           case SHARED_T:
           case TYPE_T:
-          case VARIABLE_T:{
-            if (!hasError) {
+          case VARIABLE_T:{if (!hasError) {
+            
             s = object_class();
             }
             if (!hasError) {
+            
             s1 = identifier();
             }
             if (!hasError) {
+            
 if (parse_sec==GEN_SEC)
 
     addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,currP,s1.data(),0,Public);
     return s;
             }
+            
             break;
             }
           default:
@@ -4644,42 +5422,48 @@ if (parse_sec==GEN_SEC)
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::interface_element() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::interface_element() {QCString s;if (!hasError) {
+    
     s = interface_declaration();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::interface_file_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(FILE_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
+    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
    return " file "+s+":"+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::interface_list() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) {
+    
     s = interface_element();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SEMI_T:{
@@ -4689,55 +5473,63 @@ QCString VhdlParser::interface_list() {QCString s,s1,s2;
       default:
         jj_la1[123] = jj_gen;
         goto end_label_25;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
       if (!hasError) {
+      
       s1 = interface_element();
       }
       if (!hasError) {
+      
 s2+=";";s2+=s1;
       }
+      
     }
     end_label_25: ;
     }
+    
 return s+s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;
-    if (!hasError) {
+QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case CONSTANT_T:
     case SIGNAL_T:
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case VARIABLE_T:{
-        if (!hasError) {
+      case VARIABLE_T:{if (!hasError) {
+        
         tok = jj_consume_token(VARIABLE_T);
         }
+        
         break;
         }
-      case SIGNAL_T:{
-        if (!hasError) {
+      case SIGNAL_T:{if (!hasError) {
+        
         tok = jj_consume_token(SIGNAL_T);
         }
+        
         break;
         }
-      case CONSTANT_T:{
-        if (!hasError) {
+      case CONSTANT_T:{if (!hasError) {
+        
         tok = jj_consume_token(CONSTANT_T);
         }
+        
         break;
         }
-      case SHARED_T:{
-        if (!hasError) {
+      case SHARED_T:{if (!hasError) {
+        
         tok = jj_consume_token(SHARED_T);
         }
+        
         break;
         }
       default:
@@ -4746,6 +5538,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
+      
       break;
       }
     default:
@@ -4754,21 +5547,25 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BUFFER_T:
     case IN_T:
     case INOUT_T:
     case LINKAGE_T:
-    case OUT_T:{
-      if (!hasError) {
+    case OUT_T:{if (!hasError) {
+      
       s1 = mode();
       }
+      
       break;
       }
     default:
@@ -4777,14 +5574,17 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
     if (!hasError) {
+    
     s2 = subtype_indication();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case BUS_T:{
-      if (!hasError) {
+    case BUS_T:{if (!hasError) {
+      
       tok1 = jj_consume_token(BUS_T);
       }
+      
       break;
       }
     default:
@@ -4793,14 +5593,17 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{
-      if (!hasError) {
+    case VARASSIGN_T:{if (!hasError) {
+      
       tok2 = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
+      
       s4 = expression();
       }
+      
       break;
       }
     default:
@@ -4808,6 +5611,7 @@ QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=
       ;
     }
     }
+    
 if(tok)
                     s5=tok->image.c_str();
 
@@ -4836,39 +5640,45 @@ if(tok)
                     } // if component
               return it;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::iteration_scheme() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHILE_T:{
-      if (!hasError) {
+    case WHILE_T:{if (!hasError) {
+      
       jj_consume_token(WHILE_T);
       }
       if (!hasError) {
+      
       s = condition();
       }
       if (!hasError) {
+      
 s.prepend("while ");
    FlowChart::addFlowChart(FlowChart::WHILE_NO,0,s.data(),lab.data());
    lab="";
   return s;
       }
+      
       break;
       }
-    case FOR_T:{
-      if (!hasError) {
+    case FOR_T:{if (!hasError) {
+      
       jj_consume_token(FOR_T);
       }
       if (!hasError) {
+      
       s = parameter_specification();
       }
       if (!hasError) {
+      
 QCString q=lab+" for "+s;
     FlowChart::addFlowChart(FlowChart::FOR_NO,0,q.data(),lab.data());
     lab="";
     return q;
       }
+      
       break;
       }
     default:
@@ -4877,30 +5687,35 @@ QCString q=lab+" for "+s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::label() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::label() {QCString s;if (!hasError) {
+    
     s = identifier();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::library_clause() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::library_clause() {QCString s;if (!hasError) {
     if (!hasError) {
+    
     jj_consume_token(LIBRARY_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
     }
+    
 if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
                    {
                            addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,s.data(),"_library_",Public);
@@ -4908,33 +5723,38 @@ if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
                    QCString s1="library "+s;
                    return s1;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::library_unit() {QCString s;
-    if (jj_2_43(2)) {
-      if (!hasError) {
+    if (jj_2_43(2)) {if (!hasError) {
+      
       primary_unit();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ARCHITECTURE_T:
-      case PACKAGE_T:{
-        if (!hasError) {
+      case PACKAGE_T:{if (!hasError) {
+        
         secondary_unit();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
-      case CONTEXT_T:{
-        if (!hasError) {
+      case CONTEXT_T:{if (!hasError) {
+        
         context_declaration();
         }
+        
         break;
         }
       default:
@@ -4944,49 +5764,59 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::literal() {QCString s;
-    if (jj_2_44(2147483647)) {
-      if (!hasError) {
+    if (jj_2_44(2147483647)) {if (!hasError) {
+      
       s = bit_string_literal();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_45(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_45(2147483647)) {if (!hasError) {
+      
       s = numeric_literal();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_46(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_46(2147483647)) {if (!hasError) {
+      
       s = enumeration_literal();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case STRINGLITERAL:{
-        if (!hasError) {
+      case STRINGLITERAL:{if (!hasError) {
+        
         s = string_literal();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
-      case NULL_T:{
-        if (!hasError) {
+      case NULL_T:{if (!hasError) {
+        
         jj_consume_token(NULL_T);
         }
         if (!hasError) {
+        
 return "null";
         }
+        
         break;
         }
       default:
@@ -4996,32 +5826,36 @@ return "null";
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::logical_operator() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::logical_operator() {QCString s;if (!hasError) {
+    
     s = logop();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;
-    if (!hasError) {
+QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
+      
 s+=":";
       }
+      
       break;
       }
     default:
@@ -5030,12 +5864,14 @@ s+=":";
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case FOR_T:
-    case WHILE_T:{
-      if (!hasError) {
+    case WHILE_T:{if (!hasError) {
+      
       s1 = iteration_scheme();
       }
+      
       break;
       }
     default:
@@ -5044,28 +5880,35 @@ s+=":";
     }
     }
     if (!hasError) {
+    
 if(s1.isEmpty())
         FlowChart::addFlowChart(FlowChart::LOOP_NO,0,"infinite");
     }
     if (!hasError) {
+    
     jj_consume_token(LOOP_T);
     }
     if (!hasError) {
+    
     s2 = sequence_of_statement();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LOOP_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s3 = identifier();
       }
+      
       break;
       }
     default:
@@ -5074,44 +5917,52 @@ if(s1.isEmpty())
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 QCString q = s+" loop "+s2+" end loop" +s3;
          QCString endLoop="end loop" + s3;
          FlowChart::moveToPrevLevel();
          FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
         return q;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::miscellaneous_operator() {Token *t=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DOUBLEMULT_T:{
-      if (!hasError) {
+    case DOUBLEMULT_T:{if (!hasError) {
+      
       jj_consume_token(DOUBLEMULT_T);
       }
       if (!hasError) {
+      
 return "**";
       }
+      
       break;
       }
-    case ABS_T:{
-      if (!hasError) {
+    case ABS_T:{if (!hasError) {
+      
       jj_consume_token(ABS_T);
       }
       if (!hasError) {
+      
 return "abs";
       }
+      
       break;
       }
-    case NOT_T:{
-      if (!hasError) {
+    case NOT_T:{if (!hasError) {
+      
       jj_consume_token(NOT_T);
       }
       if (!hasError) {
+      
 return "not";
       }
+      
       break;
       }
     default:
@@ -5120,54 +5971,64 @@ return "not";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::mode() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IN_T:{
-      if (!hasError) {
+    case IN_T:{if (!hasError) {
+      
       tok = jj_consume_token(IN_T);
       }
       if (!hasError) {
+      
 return "in";
       }
+      
       break;
       }
-    case OUT_T:{
-      if (!hasError) {
+    case OUT_T:{if (!hasError) {
+      
       tok = jj_consume_token(OUT_T);
       }
       if (!hasError) {
+      
 return "out";
       }
+      
       break;
       }
-    case INOUT_T:{
-      if (!hasError) {
+    case INOUT_T:{if (!hasError) {
+      
       tok = jj_consume_token(INOUT_T);
       }
       if (!hasError) {
+      
 return "inout";
       }
+      
       break;
       }
-    case BUFFER_T:{
-      if (!hasError) {
+    case BUFFER_T:{if (!hasError) {
+      
       tok = jj_consume_token(BUFFER_T);
       }
       if (!hasError) {
+      
 return "buffer";
       }
+      
       break;
       }
-    case LINKAGE_T:{
-      if (!hasError) {
+    case LINKAGE_T:{if (!hasError) {
+      
       tok = jj_consume_token(LINKAGE_T);
       }
       if (!hasError) {
+      
 return "linkage";
       }
+      
       break;
       }
     default:
@@ -5176,45 +6037,53 @@ return "linkage";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::multiplying_operation() {Token *tok=0;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case MULT_T:{
-      if (!hasError) {
+    case MULT_T:{if (!hasError) {
+      
       tok = jj_consume_token(MULT_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case SLASH_T:{
-      if (!hasError) {
+    case SLASH_T:{if (!hasError) {
+      
       tok = jj_consume_token(SLASH_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case MOD_T:{
-      if (!hasError) {
+    case MOD_T:{if (!hasError) {
+      
       tok = jj_consume_token(MOD_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
-    case REM_T:{
-      if (!hasError) {
+    case REM_T:{if (!hasError) {
+      
       tok = jj_consume_token(REM_T);
       }
       if (!hasError) {
+      
 return tok->image.c_str();
       }
+      
       break;
       }
     default:
@@ -5223,29 +6092,32 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::name() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::name() {QCString s,s1;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case STRINGLITERAL:{
-      if (!hasError) {
+    case STRINGLITERAL:{if (!hasError) {
+      
       s = operator_symbol();
       }
+      
       break;
       }
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
+      
       break;
       }
-    case SLSL_T:{
-      if (!hasError) {
+    case SLSL_T:{if (!hasError) {
+      
       s = external_name();
       }
+      
       break;
       }
     default:
@@ -5255,90 +6127,123 @@ QCString VhdlParser::name() {QCString s,s1;
     }
     }
     if (!hasError) {
-    if (jj_2_47(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_47(2147483647)) {if (!hasError) {
+      
       s1 = name_ext1();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
     } else {
       ;
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::name_ext1() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) {
+    
     s = name_ext();
     }
     if (!hasError) {
+    
     while (!hasError) {
       if (jj_2_48(2147483647)) {
         ;
       } else {
         goto end_label_26;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = name_ext();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
     }
     end_label_26: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::name_ext() {QCString s,s1,s2;
-    if (!hasError) {
-    if (jj_2_49(2147483647)) {
+QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) {
+    
+    if (jj_2_49(2147483647)) {if (!hasError) {
+      
+      jj_consume_token(APOSTROPHE_T);
+      }
       if (!hasError) {
+      
+      jj_consume_token(SUBTYPE_T);
+      }
+      if (!hasError) {
+      
+s+="'subtype";
+      }
+      
+    } else if (jj_2_50(2147483647)) {if (!hasError) {
+      
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
+      
       s1 = suffix();
       }
       if (!hasError) {
+      
 s+=".";s+=s1;
       }
-    } else if (jj_2_50(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_51(2147483647)) {if (!hasError) {
+      
       s1 = test_att_name();
       }
       if (!hasError) {
+      
 s+=s1;
       }
-    } else if (jj_2_51(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_52(2147483647)) {if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = discrete_range();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s+="(";s+=s1;s+=")";
       }
-    } else if (jj_2_52(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_53(2147483647)) {if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
 s+="(";s+=s1;
       }
       if (!hasError) {
+      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -5348,72 +6253,89 @@ s+="(";s+=s1;
         default:
           jj_la1[139] = jj_gen;
           goto end_label_27;
-        }
-        if (!hasError) {
+        }if (!hasError) {
+        
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
+        
         s1 = expression();
         }
         if (!hasError) {
+        
 s+=",";s+=s1;
         }
+        
       }
       end_label_27: ;
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s+=")";
       }
+      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::test_att_name() {QCString s,s1;
-    if (!hasError) {
-    if (jj_2_53(2147483647)) {
-      if (!hasError) {
+QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) {
+    
+    if (jj_2_54(2147483647)) {if (!hasError) {
+      
       s1 = signature();
       }
       if (!hasError) {
+      
 s=s1;
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(APOSTROPHE_T);
     }
     if (!hasError) {
+    
     s1 = attribute_designator();
     }
     if (!hasError) {
+    
 s+="'";s+=s1;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s+="(";s+=s1;s+=")";
       }
+      
       break;
       }
     default:
@@ -5421,25 +6343,30 @@ s+="(";s+=s1;s+=")";
       ;
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::indexed_name() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::indexed_name() {QCString s,s1,s2;if (!hasError) {
+    
     s2 = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s1 = expression();
     }
     if (!hasError) {
+    
 s=s2+"("+s1;
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -5449,38 +6376,45 @@ s=s2+"("+s1;
       default:
         jj_la1[141] = jj_gen;
         goto end_label_28;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
 s+=",";s+=s1;
       }
+      
     }
     end_label_28: ;
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return s+")";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
-    if (!hasError) {
+QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       t = jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -5489,15 +6423,18 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(NEXT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s1 = identifier();
       }
+      
       break;
       }
     default:
@@ -5506,14 +6443,17 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{
-      if (!hasError) {
+    case WHEN_T:{if (!hasError) {
+      
       t1 = jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       s2 = condition();
       }
+      
       break;
       }
     default:
@@ -5522,31 +6462,36 @@ QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(t) s+=":";
    FlowChart::addFlowChart(FlowChart::NEXT_NO,"next ",s2.data(),s1.data());
     lab.resize(0);
   if(t1) s2.prepend("when ");
   return s+s1+s2+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::null_statement() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::null_statement() {QCString s;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
+      
 s+=":";
       }
+      
       break;
       }
     default:
@@ -5555,35 +6500,42 @@ s+=":";
     }
     }
     if (!hasError) {
+    
     jj_consume_token(NULL_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return s+="null";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::numeric_literal() {QCString s;
-    if (jj_2_54(2147483647)) {
-      if (!hasError) {
+    if (jj_2_55(2147483647)) {if (!hasError) {
+      
       s = physical_literal();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case INTEGER:
       case DECIMAL_LITERAL:
-      case BASED_LITERAL:{
-        if (!hasError) {
+      case BASED_LITERAL:{if (!hasError) {
+        
         s = abstract_literal();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
       default:
@@ -5593,66 +6545,79 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::object_class() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
+      
 return "constant";
       }
+      
       break;
       }
-    case SIGNAL_T:{
-      if (!hasError) {
+    case SIGNAL_T:{if (!hasError) {
+      
       jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
+      
 return "signal";
       }
+      
       break;
       }
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
+      
 return "variable";
       }
+      
       break;
       }
-    case SHARED_T:{
-      if (!hasError) {
+    case SHARED_T:{if (!hasError) {
+      
       jj_consume_token(SHARED_T);
       }
       if (!hasError) {
+      
       jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
+      
 return "shared variable";
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       jj_consume_token(FILE_T);
       }
       if (!hasError) {
+      
 return "file";
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       jj_consume_token(TYPE_T);
       }
       if (!hasError) {
+      
 return "type";
       }
+      
       break;
       }
     default:
@@ -5661,25 +6626,27 @@ return "type";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::operator_symbol() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(STRINGLITERAL);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-void VhdlParser::options() {
-    if (!hasError) {
+void VhdlParser::options() {if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GUARDED_T:{
-      if (!hasError) {
+    case GUARDED_T:{if (!hasError) {
+      
       jj_consume_token(GUARDED_T);
       }
+      
       break;
       }
     default:
@@ -5688,13 +6655,15 @@ void VhdlParser::options() {
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INERTIAL_T:
     case REJECT_T:
-    case TRANSPORT_T:{
-      if (!hasError) {
+    case TRANSPORT_T:{if (!hasError) {
+      
       delay_mechanism();
       }
+      
       break;
       }
     default:
@@ -5702,42 +6671,52 @@ void VhdlParser::options() {
       ;
     }
     }
-}
+    
+  }
 
 
-void VhdlParser::package_body() {QCString s;
-    if (!hasError) {
+void VhdlParser::package_body() {QCString s;if (!hasError) {
+    
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
+    
     jj_consume_token(BODY_T);
     }
     if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 lastCompound=current.get();
                         s.prepend("_");
                         addVhdlType(s,getLine(),Entry::CLASS_SEC,VhdlDocGen::PACKAGE_BODY,0,0,Protected);
     }
     if (!hasError) {
+    
     package_body_declarative_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PACKAGE_T:{
-      if (!hasError) {
+    case PACKAGE_T:{if (!hasError) {
+      
       jj_consume_token(PACKAGE_T);
       }
       if (!hasError) {
+      
       jj_consume_token(BODY_T);
       }
+      
       break;
       }
     default:
@@ -5746,14 +6725,16 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -5762,10 +6743,12 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 lastCompound=0; genLabels.resize(0);
-}
+  }
 
 
 void VhdlParser::package_body_declarative_item() {
@@ -5773,67 +6756,77 @@ void VhdlParser::package_body_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       type_declaration();
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       subtype_declaration();
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       constant_declaration();
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       variable_declaration();
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       file_declaration();
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       alias_declaration();
       }
+      
       break;
       }
-    case USE_T:{
-      if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
       use_clause();
       }
+      
       break;
       }
     default:
       jj_la1[152] = jj_gen;
-      if (jj_2_55(3)) {
-        if (!hasError) {
+      if (jj_2_56(3)) {if (!hasError) {
+        
         group_template_declaration();
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case GROUP_T:{
-          if (!hasError) {
+        case GROUP_T:{if (!hasError) {
+          
           group_declaration();
           }
+          
           break;
           }
         default:
@@ -5843,11 +6836,11 @@ void VhdlParser::package_body_declarative_item() {
         }
       }
     }
-}
+  }
 
 
-void VhdlParser::package_body_declarative_part() {
-    if (!hasError) {
+void VhdlParser::package_body_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -5869,27 +6862,32 @@ void VhdlParser::package_body_declarative_part() {
       default:
         jj_la1[154] = jj_gen;
         goto end_label_29;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       package_body_declarative_item();
       }
+      
     }
     end_label_29: ;
     }
-}
+    
+  }
 
 
-void VhdlParser::package_declaration() {QCString s;
-    if (!hasError) {
+void VhdlParser::package_declaration() {QCString s;if (!hasError) {
+    
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 lastCompound=current.get();
                           std::shared_ptr<Entry> clone=std::make_shared<Entry>(*current);
                           clone->section=Entry::NAMESPACE_SEC;
@@ -5902,17 +6900,21 @@ lastCompound=current.get();
                           addVhdlType(s,getLine(PACKAGE_T),Entry::CLASS_SEC,VhdlDocGen::PACKAGE,0,0,Package);
     }
     if (!hasError) {
+    
     package_declarative_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PACKAGE_T:{
-      if (!hasError) {
+    case PACKAGE_T:{if (!hasError) {
+      
       jj_consume_token(PACKAGE_T);
       }
+      
       break;
       }
     default:
@@ -5921,14 +6923,16 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -5937,31 +6941,37 @@ lastCompound=current.get();
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-}
+  }
 
 
-void VhdlParser::geninter() {
-    if (!hasError) {
+void VhdlParser::geninter() {if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
       gen_interface_list();
       }
       if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case GENERIC_T:{
-        if (!hasError) {
+      case GENERIC_T:{if (!hasError) {
+        
         gen_assoc_list();
         }
         if (!hasError) {
+        
         jj_consume_token(SEMI_T);
         }
+        
         break;
         }
       default:
@@ -5969,6 +6979,7 @@ void VhdlParser::geninter() {
         ;
       }
       }
+      
       break;
       }
     default:
@@ -5976,7 +6987,8 @@ void VhdlParser::geninter() {
       ;
     }
     }
-}
+    
+  }
 
 
 void VhdlParser::package_declarative_item() {
@@ -5984,113 +6996,130 @@ void VhdlParser::package_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       type_declaration();
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       subtype_declaration();
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       constant_declaration();
       }
+      
       break;
       }
-    case SIGNAL_T:{
-      if (!hasError) {
+    case SIGNAL_T:{if (!hasError) {
+      
       signal_declaration();
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       variable_declaration();
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       file_declaration();
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       alias_declaration();
       }
+      
       break;
       }
-    case COMPONENT_T:{
-      if (!hasError) {
+    case COMPONENT_T:{if (!hasError) {
+      
       component_declaration();
       }
+      
       break;
       }
     default:
       jj_la1[159] = jj_gen;
-      if (jj_2_56(2147483647)) {
-        if (!hasError) {
+      if (jj_2_57(2147483647)) {if (!hasError) {
+        
         attribute_declaration();
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{
-          if (!hasError) {
+        case ATTRIBUTE_T:{if (!hasError) {
+          
           attribute_specification();
           }
+          
           break;
           }
-        case DISCONNECT_T:{
-          if (!hasError) {
+        case DISCONNECT_T:{if (!hasError) {
+          
           disconnection_specification();
           }
+          
           break;
           }
-        case USE_T:{
-          if (!hasError) {
+        case USE_T:{if (!hasError) {
+          
           use_clause();
           }
+          
           break;
           }
         default:
           jj_la1[160] = jj_gen;
-          if (jj_2_57(3)) {
-            if (!hasError) {
+          if (jj_2_58(3)) {if (!hasError) {
+            
             group_template_declaration();
             }
+            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{
-              if (!hasError) {
+            case GROUP_T:{if (!hasError) {
+              
               group_declaration();
               }
+              
               break;
               }
             default:
               jj_la1[161] = jj_gen;
-              if (jj_2_58(5)) {
-                if (!hasError) {
+              if (jj_2_59(5)) {if (!hasError) {
+                
                 package_instantiation_declaration();
                 }
+                
               } else {
                 switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-                case PACKAGE_T:{
-                  if (!hasError) {
+                case PACKAGE_T:{if (!hasError) {
+                  
                   package_declaration();
                   }
+                  
                   break;
                   }
                 default:
@@ -6104,11 +7133,11 @@ void VhdlParser::package_declarative_item() {
         }
       }
     }
-}
+  }
 
 
-void VhdlParser::package_declarative_part() {
-    if (!hasError) {
+void VhdlParser::package_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -6135,63 +7164,75 @@ void VhdlParser::package_declarative_part() {
       default:
         jj_la1[163] = jj_gen;
         goto end_label_30;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       package_declarative_item();
       }
+      
     }
     end_label_30: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::parameter_specification() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IN_T);
     }
     if (!hasError) {
+    
     s1 = discrete_range();
     }
+    
 return s+" in "+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::physical_literal() {QCString s,s1;
-    if (!hasError) {
-    if (jj_2_59(2147483647)) {
-      if (!hasError) {
+QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
+    
+    if (jj_2_60(2147483647)) {if (!hasError) {
+      
       s = abstract_literal();
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     s1 = name();
     }
+    
 s+=" ";s+=s1;s.prepend(" "); return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(UNITS_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
     if (!hasError) {
+    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public);
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
@@ -6202,28 +7243,33 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public)
       default:
         jj_la1[164] = jj_gen;
         goto end_label_31;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = secondary_unit_declaration();
       }
+      
     }
     end_label_31: ;
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(UNITS_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -6231,126 +7277,156 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public)
       ;
     }
     }
+    
 return s+"%";
 assert(false);
-}
+  }
 
 
-void VhdlParser::port_clause() {
-    if (!hasError) {
+void VhdlParser::port_clause() {if (!hasError) {
+    
     jj_consume_token(PORT_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     port_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 currP=0;
-}
+  }
 
 
-QCString VhdlParser::port_list() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::port_list() {QCString s;if (!hasError) {
+    
     s = interface_list();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::port_map_aspect() {
-    if (!hasError) {
+void VhdlParser::port_map_aspect() {if (!hasError) {
+    
     jj_consume_token(PORT_T);
     }
     if (!hasError) {
+    
     jj_consume_token(MAP_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     association_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
-}
+    
+  }
 
 
 QCString VhdlParser::primary() {QCString s,s1;
-    if (jj_2_60(2147483647)) {
-      if (!hasError) {
+    if (jj_2_61(2147483647)) {if (!hasError) {
+      
       s = function_call();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_61(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_62(2147483647)) {if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s="("+s1+")"; return s;
       }
-    } else if (jj_2_62(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_63(2147483647)) {if (!hasError) {
+      
       s = qualified_expression();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_63(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_64(2147483647)) {if (!hasError) {
+      
       s = type_conversion();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_64(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_65(2147483647)) {if (!hasError) {
+      
       s = literal();
       }
       if (!hasError) {
+      
 s.prepend(" ");return s;
       }
-    } else if (jj_2_65(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_66(2147483647)) {if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NEW_T:{
-        if (!hasError) {
+      case NEW_T:{if (!hasError) {
+        
         allocator();
         }
         if (!hasError) {
+        
 return "";
         }
+        
         break;
         }
-      case LPAREN_T:{
-        if (!hasError) {
+      case LPAREN_T:{if (!hasError) {
+        
         s = aggregate();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
       default:
@@ -6360,39 +7436,44 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
 void VhdlParser::primary_unit() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ENTITY_T:{
-      if (!hasError) {
+    case ENTITY_T:{if (!hasError) {
+      
       entity_declaration();
       }
+      
       break;
       }
-    case CONFIGURATION_T:{
-      if (!hasError) {
+    case CONFIGURATION_T:{if (!hasError) {
+      
       configuration_declaration();
       }
+      
       break;
       }
     default:
       jj_la1[167] = jj_gen;
-      if (jj_2_66(2147483647)) {
-        if (!hasError) {
+      if (jj_2_67(2147483647)) {if (!hasError) {
+        
         package_instantiation_declaration();
         }
-      } else if (jj_2_67(4)) {
-        if (!hasError) {
+        
+      } else if (jj_2_68(4)) {if (!hasError) {
+        
         interface_package_declaration();
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PACKAGE_T:{
-          if (!hasError) {
+        case PACKAGE_T:{if (!hasError) {
+          
           package_declaration();
           }
+          
           break;
           }
         default:
@@ -6402,28 +7483,33 @@ void VhdlParser::primary_unit() {
         }
       }
     }
-}
+  }
 
 
-QCString VhdlParser::procedure_call() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::procedure_call() {QCString s,s1;if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = actual_parameter_part();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
       if (!hasError) {
+      
 s1.prepend("("); s1.append(")");
       }
+      
       break;
       }
     default:
@@ -6431,36 +7517,43 @@ s1.prepend("("); s1.append(")");
       ;
     }
     }
+    
 return s+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::procedure_call_statement() {QCString s,s1;
-    if (!hasError) {
-    if (jj_2_68(2)) {
-      if (!hasError) {
+QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) {
+    
+    if (jj_2_69(2)) {if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
+      
 s+=":";
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     s1 = procedure_call();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return s+s1+";";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::process_declarative_item() {QCString s;
@@ -6468,117 +7561,141 @@ QCString VhdlParser::process_declarative_item() {QCString s;
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
       if (!hasError) {
+      
 return "";
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       s = type_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       s = subtype_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       s = constant_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       s = variable_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       s = file_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       s = alias_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
       jj_la1[170] = jj_gen;
-      if (jj_2_69(3)) {
-        if (!hasError) {
+      if (jj_2_70(3)) {if (!hasError) {
+        
         s = attribute_declaration();
         }
         if (!hasError) {
+        
 return s;
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{
-          if (!hasError) {
+        case ATTRIBUTE_T:{if (!hasError) {
+          
           s = attribute_specification();
           }
           if (!hasError) {
+          
 return s;
           }
+          
           break;
           }
-        case USE_T:{
-          if (!hasError) {
+        case USE_T:{if (!hasError) {
+          
           s = use_clause();
           }
           if (!hasError) {
+          
 return s;
           }
+          
           break;
           }
         default:
           jj_la1[171] = jj_gen;
-          if (jj_2_70(3)) {
-            if (!hasError) {
+          if (jj_2_71(3)) {if (!hasError) {
+            
             s = group_template_declaration();
             }
             if (!hasError) {
+            
 return s;
             }
+            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{
-              if (!hasError) {
+            case GROUP_T:{if (!hasError) {
+              
               s = group_declaration();
               }
               if (!hasError) {
+              
 return s;
               }
+              
               break;
               }
             default:
@@ -6591,11 +7708,11 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::process_declarative_part() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -6618,32 +7735,37 @@ QCString VhdlParser::process_declarative_part() {QCString s,s1;
       default:
         jj_la1[173] = jj_gen;
         goto end_label_32;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = process_declarative_item();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
     }
     end_label_32: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;
-    if (!hasError) {
+void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -6652,11 +7774,13 @@ void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{
-      if (!hasError) {
+    case POSTPONED_T:{if (!hasError) {
+      
       jj_consume_token(POSTPONED_T);
       }
+      
       break;
       }
     default:
@@ -6665,34 +7789,40 @@ void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;
     }
     }
     if (!hasError) {
+    
 currP=VhdlDocGen::PROCESS;
                current->startLine=getLine();
                current->bodyLine=getLine();
     }
     if (!hasError) {
+    
     jj_consume_token(PROCESS_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ALL_T:{
-        if (!hasError) {
+      case ALL_T:{if (!hasError) {
+        
         tok = jj_consume_token(ALL_T);
         }
+        
         break;
         }
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         s1 = sensitivity_list();
         }
+        
         break;
         }
       default:
@@ -6702,8 +7832,10 @@ currP=VhdlDocGen::PROCESS;
       }
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
+      
       break;
       }
     default:
@@ -6712,11 +7844,13 @@ currP=VhdlDocGen::PROCESS;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       jj_consume_token(IS_T);
       }
+      
       break;
       }
     default:
@@ -6725,28 +7859,35 @@ currP=VhdlDocGen::PROCESS;
     }
     }
     if (!hasError) {
+    
     s2 = process_declarative_part();
     }
     if (!hasError) {
+    
 if (s2.data())
                   FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s2.data(),0);
                 FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
     }
     if (!hasError) {
+    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
+    
     process_statement_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case POSTPONED_T:{
-      if (!hasError) {
+    case POSTPONED_T:{if (!hasError) {
+      
       jj_consume_token(POSTPONED_T);
       }
+      
       break;
       }
     default:
@@ -6755,15 +7896,18 @@ if (s2.data())
     }
     }
     if (!hasError) {
+    
     jj_consume_token(PROCESS_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -6772,8 +7916,10 @@ if (s2.data())
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(s.isEmpty())
    currName=VhdlDocGen::getProcessNumber();
    else
@@ -6789,11 +7935,11 @@ if(s.isEmpty())
   createFlow();
    currName="";
    newEntry();
-}
+  }
 
 
-void VhdlParser::process_statement_part() {
-    if (!hasError) {
+void VhdlParser::process_statement_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -6820,49 +7966,60 @@ void VhdlParser::process_statement_part() {
       default:
         jj_la1[181] = jj_gen;
         goto end_label_33;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       sequential_statement();
       }
+      
     }
     end_label_33: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::qualified_expression() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::qualified_expression() {QCString s,s1;if (!hasError) {
+    
     s1 = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(APOSTROPHE_T);
     }
     if (!hasError) {
+    
 s=s1+"'";
     }
     if (!hasError) {
-    if (jj_2_71(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_72(2147483647)) {if (!hasError) {
+      
       s1 = aggregate();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{
-        if (!hasError) {
+      case LPAREN_T:{if (!hasError) {
+        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
+        
         s1 = expression();
         }
         if (!hasError) {
+        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
+        
 s+="(";s+=s1;s+=")";
         }
+        
         break;
         }
       default:
@@ -6872,61 +8029,72 @@ s+="(";s+=s1;s+=")";
       }
     }
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::range() {QCString s,s1,s2;
-    if (jj_2_72(2147483647)) {
-      if (!hasError) {
+    if (jj_2_73(2147483647)) {if (!hasError) {
+      
       s = simple_expression();
       }
       if (!hasError) {
+      
       s1 = direction();
       }
       if (!hasError) {
+      
       s2 = simple_expression();
       }
       if (!hasError) {
+      
 return s+" "+s1+" "+s2;
       }
-    } else if (jj_2_73(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_74(2147483647)) {if (!hasError) {
+      
       s = attribute_name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::range_constraint() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(RANGE_T);
     }
     if (!hasError) {
+    
     s = range();
     }
+    
 return " range "+s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::record_type_definition() {
-    if (!hasError) {
+void VhdlParser::record_type_definition() {if (!hasError) {
+    
     jj_consume_token(RECORD_T);
     }
     if (!hasError) {
-    while (!hasError) {
-      if (!hasError) {
+    
+    while (!hasError) {if (!hasError) {
+      
       element_declaration();
       }
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
       case EXTENDED_CHARACTER:{
@@ -6941,20 +8109,24 @@ void VhdlParser::record_type_definition() {
     end_label_34: ;
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(RECORD_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       name();
       }
+      
       break;
       }
     default:
@@ -6962,27 +8134,31 @@ void VhdlParser::record_type_definition() {
       ;
     }
     }
-}
+    
+  }
 
 
-QCString VhdlParser::relation() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
+    
     s = shift_expression();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LESSTHAN_T:
     case GREATERTHAN_T:
     case LT_T:
     case GT_T:
     case EQU_T:
-    case NOTEQU_T:{
-      if (!hasError) {
+    case NOTEQU_T:{if (!hasError) {
+      
       s1 = relation_operator();
       }
       if (!hasError) {
+      
       s2 = shift_expression();
       }
+      
       break;
       }
     default:
@@ -6990,65 +8166,78 @@ QCString VhdlParser::relation() {QCString s,s1,s2;
       ;
     }
     }
+    
 return s+s1+s2;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::relation_operator() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LT_T:{
-      if (!hasError) {
+    case LT_T:{if (!hasError) {
+      
       jj_consume_token(LT_T);
       }
       if (!hasError) {
+      
 return "<";
       }
+      
       break;
       }
-    case GT_T:{
-      if (!hasError) {
+    case GT_T:{if (!hasError) {
+      
       jj_consume_token(GT_T);
       }
       if (!hasError) {
+      
 return ">";
       }
+      
       break;
       }
-    case EQU_T:{
-      if (!hasError) {
+    case EQU_T:{if (!hasError) {
+      
       jj_consume_token(EQU_T);
       }
       if (!hasError) {
+      
 return "=";
       }
+      
       break;
       }
-    case GREATERTHAN_T:{
-      if (!hasError) {
+    case GREATERTHAN_T:{if (!hasError) {
+      
       jj_consume_token(GREATERTHAN_T);
       }
       if (!hasError) {
+      
 return ">=";
       }
+      
       break;
       }
-    case LESSTHAN_T:{
-      if (!hasError) {
+    case LESSTHAN_T:{if (!hasError) {
+      
       jj_consume_token(LESSTHAN_T);
       }
       if (!hasError) {
+      
 return "<=";
       }
+      
       break;
       }
-    case NOTEQU_T:{
-      if (!hasError) {
+    case NOTEQU_T:{if (!hasError) {
+      
       jj_consume_token(NOTEQU_T);
       }
       if (!hasError) {
+      
 return "/=";
       }
+      
       break;
       }
     default:
@@ -7057,20 +8246,22 @@ return "/=";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       t = jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -7079,20 +8270,25 @@ QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2
     }
     }
     if (!hasError) {
+    
     jj_consume_token(REPORT_T);
     }
     if (!hasError) {
+    
     s1 = expression();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SEVERITY_T:{
-      if (!hasError) {
+    case SEVERITY_T:{if (!hasError) {
+      
       t1 = jj_consume_token(SEVERITY_T);
       }
       if (!hasError) {
+      
       s2 = expression();
       }
+      
       break;
       }
     default:
@@ -7101,30 +8297,35 @@ QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(t) s.append(":");
         s1.prepend(" report ");
         if(t1) s2.prepend(" severity ");
         return s+s1+s2+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::return_statement() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::return_statement() {QCString s,s1;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       jj_consume_token(COLON_T);
       }
       if (!hasError) {
+      
 s+=":";
       }
+      
       break;
       }
     default:
@@ -7133,9 +8334,11 @@ s+=":";
     }
     }
     if (!hasError) {
+    
     jj_consume_token(RETURN_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ABS_T:
     case NEW_T:
@@ -7152,10 +8355,11 @@ s+=":";
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{
-      if (!hasError) {
+    case BIT_STRING_LITERAL:{if (!hasError) {
+      
       s1 = expression();
       }
+      
       break;
       }
     default:
@@ -7164,40 +8368,48 @@ s+=":";
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return s+" return "+s1+";";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::scalar_type_definition() {QCString s,s1;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       s = enumeration_type_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case RANGE_T:{
-      if (!hasError) {
+    case RANGE_T:{if (!hasError) {
+      
       s = range_constraint();
       }
       if (!hasError) {
-      if (jj_2_74(2147483647)) {
-        if (!hasError) {
+      
+      if (jj_2_75(2147483647)) {if (!hasError) {
+        
         s1 = physical_type_definition();
         }
+        
       } else {
         ;
       }
       }
       if (!hasError) {
+      
 return s+" "+s1+"%";
       }
+      
       break;
       }
     default:
@@ -7206,21 +8418,23 @@ return s+" "+s1+"%";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 void VhdlParser::secondary_unit() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ARCHITECTURE_T:{
-      if (!hasError) {
+    case ARCHITECTURE_T:{if (!hasError) {
+      
       architecture_body();
       }
+      
       break;
       }
-    case PACKAGE_T:{
-      if (!hasError) {
+    case PACKAGE_T:{if (!hasError) {
+      
       package_body();
       }
+      
       break;
       }
     default:
@@ -7228,84 +8442,102 @@ void VhdlParser::secondary_unit() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(EQU_T);
     }
     if (!hasError) {
+    
     s1 = physical_literal();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 //printf("\n %s %s [%d]",s.data(),s1.data(),getLine());
   addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,s1.data(),Public);
 
   return s+"="+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::selected_name() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(DOT_T);
     }
     if (!hasError) {
+    
     s1 = suffix();
     }
+    
 return s+"."+s1;
 assert(false);
-}
+  }
 
 
-void VhdlParser::selected_signal_assignment() {
-    if (!hasError) {
+void VhdlParser::selected_signal_assignment() {if (!hasError) {
+    
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
+    
     target();
     }
     if (!hasError) {
+    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
+    
     options();
     }
     if (!hasError) {
+    
     selected_waveforms();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::selected_waveforms() {
-    if (!hasError) {
+void VhdlParser::selected_waveforms() {if (!hasError) {
+    
     waveform();
     }
     if (!hasError) {
+    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
+    
     choices();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -7315,43 +8547,51 @@ void VhdlParser::selected_waveforms() {
       default:
         jj_la1[193] = jj_gen;
         goto end_label_35;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       waveform();
       }
       if (!hasError) {
+      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       choices();
       }
+      
     }
     end_label_35: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::sensitivity_clause() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) {
+    
     jj_consume_token(ON_T);
     }
     if (!hasError) {
+    
     s = sensitivity_list();
     }
+    
 s.prepend(" on ");
   return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::sensitivity_list() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -7361,142 +8601,175 @@ QCString VhdlParser::sensitivity_list() {QCString s,s1;
       default:
         jj_la1[194] = jj_gen;
         goto end_label_36;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = name();
       }
       if (!hasError) {
+      
 s+=",";s+=s1;
       }
+      
     }
     end_label_36: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::sequence_of_statement() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) {
+    
     while (!hasError) {
-      if (jj_2_75(3)) {
+      if (jj_2_76(3)) {
         ;
       } else {
         goto end_label_37;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = sequential_statement();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
     }
     end_label_37: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::sequential_statement() {QCString s;
-    if (jj_2_76(2147483647)) {
-      if (!hasError) {
+    if (jj_2_77(2147483647)) {if (!hasError) {
+      
       s = signal_assignment_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_77(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_78(3)) {if (!hasError) {
+      
       s = assertion_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_78(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_79(3)) {if (!hasError) {
+      
       s = report_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_79(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_80(3)) {if (!hasError) {
+      
       s = wait_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_80(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_81(2147483647)) {if (!hasError) {
+      
       s = variable_assignment_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_81(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_82(3)) {if (!hasError) {
+      
       s = procedure_call_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
-    } else if (jj_2_82(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_83(3)) {if (!hasError) {
+      
       if_statement();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_83(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_84(3)) {if (!hasError) {
+      
       case_statement();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_84(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_85(3)) {if (!hasError) {
+      
       loop_statement();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_85(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_86(3)) {if (!hasError) {
+      
       s = next_statement();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_86(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_87(3)) {if (!hasError) {
+      
       s = exit_statement();
       }
       if (!hasError) {
+      
 return s;
       }
-    } else if (jj_2_87(3)) {
-      if (!hasError) {
+      
+    } else if (jj_2_88(3)) {if (!hasError) {
+      
       s = return_statement();
       }
       if (!hasError) {
+      
 FlowChart::addFlowChart(FlowChart::RETURN_NO,s.data(),0);return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case NULL_T:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         s = null_statement();
         }
         if (!hasError) {
+        
 FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
         }
+        
         break;
         }
       default:
@@ -7506,27 +8779,30 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::shift_expression() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
+    
     s = simple_expression();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ROL_T:
     case ROR_T:
     case SLA_T:
     case SLL_T:
     case SRA_T:
-    case SRL_T:{
-      if (!hasError) {
+    case SRL_T:{if (!hasError) {
+      
       s1 = shift_operator();
       }
       if (!hasError) {
+      
       s2 = simple_expression();
       }
+      
       break;
       }
     default:
@@ -7534,65 +8810,78 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;
       ;
     }
     }
+    
 return s+s1+s2;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::shift_operator() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SLL_T:{
-      if (!hasError) {
+    case SLL_T:{if (!hasError) {
+      
       jj_consume_token(SLL_T);
       }
       if (!hasError) {
+      
 return "sll";
       }
+      
       break;
       }
-    case SRL_T:{
-      if (!hasError) {
+    case SRL_T:{if (!hasError) {
+      
       jj_consume_token(SRL_T);
       }
       if (!hasError) {
+      
 return "srl";
       }
+      
       break;
       }
-    case SLA_T:{
-      if (!hasError) {
+    case SLA_T:{if (!hasError) {
+      
       jj_consume_token(SLA_T);
       }
       if (!hasError) {
+      
 return "sla";
       }
+      
       break;
       }
-    case SRA_T:{
-      if (!hasError) {
+    case SRA_T:{if (!hasError) {
+      
       jj_consume_token(SRA_T);
       }
       if (!hasError) {
+      
 return "sra";
       }
+      
       break;
       }
-    case ROL_T:{
-      if (!hasError) {
+    case ROL_T:{if (!hasError) {
+      
       jj_consume_token(ROL_T);
       }
       if (!hasError) {
+      
 return "rol";
       }
+      
       break;
       }
-    case ROR_T:{
-      if (!hasError) {
+    case ROR_T:{if (!hasError) {
+      
       jj_consume_token(ROR_T);
       }
       if (!hasError) {
+      
 return "ror";
       }
+      
       break;
       }
     default:
@@ -7601,27 +8890,31 @@ return "ror";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::sign() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PLUS_T:{
-      if (!hasError) {
+    case PLUS_T:{if (!hasError) {
+      
       jj_consume_token(PLUS_T);
       }
       if (!hasError) {
+      
 return "+";
       }
+      
       break;
       }
-    case MINUS_T:{
-      if (!hasError) {
+    case MINUS_T:{if (!hasError) {
+      
       jj_consume_token(MINUS_T);
       }
       if (!hasError) {
+      
 return "-";
       }
+      
       break;
       }
     default:
@@ -7630,60 +8923,71 @@ return "-";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
-    if (jj_2_89(2147483647)) {
-      if (!hasError) {
+    if (jj_2_90(2147483647)) {if (!hasError) {
+      
       conditional_signal_assignment_wave();
       }
       if (!hasError) {
+      
 return "";
       }
-    } else if (jj_2_90(2147483647)) {
-      if (!hasError) {
+      
+    } else if (jj_2_91(2147483647)) {if (!hasError) {
+      
       selected_signal_assignment_wave();
       }
       if (!hasError) {
+      
 return "";
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LPAREN_T:
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
-        if (jj_2_88(2)) {
-          if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
+        if (jj_2_89(2)) {if (!hasError) {
+          
           s = identifier();
           }
           if (!hasError) {
+          
           jj_consume_token(COLON_T);
           }
           if (!hasError) {
+          
 s+=":";
           }
+          
         } else {
           ;
         }
         }
         if (!hasError) {
+        
         s1 = target();
         }
         if (!hasError) {
+        
         jj_consume_token(LESSTHAN_T);
         }
         if (!hasError) {
+        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case INERTIAL_T:
         case REJECT_T:
-        case TRANSPORT_T:{
-          if (!hasError) {
+        case TRANSPORT_T:{if (!hasError) {
+          
           s2 = delay_mechanism();
           }
+          
           break;
           }
         default:
@@ -7692,14 +8996,18 @@ s+=":";
         }
         }
         if (!hasError) {
+        
         s3 = waveform();
         }
         if (!hasError) {
+        
         jj_consume_token(SEMI_T);
         }
         if (!hasError) {
+        
 return s+s1+"<="+s2+s3+";";
         }
+        
         break;
         }
       default:
@@ -7709,36 +9017,42 @@ return s+s1+"<="+s2+s3+";";
       }
     }
 assert(false);
-}
+  }
 
 
-void VhdlParser::semi() {
-    if (!hasError) {
+void VhdlParser::semi() {if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;
-    if (!hasError) {
+void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) {
+    
     jj_consume_token(SIGNAL_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BUS_T:
-    case REGISTER_T:{
-      if (!hasError) {
+    case REGISTER_T:{if (!hasError) {
+      
       s2 = signal_kind();
       }
+      
       break;
       }
     default:
@@ -7747,14 +9061,17 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{
-      if (!hasError) {
+    case VARASSIGN_T:{if (!hasError) {
+      
       tok = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
+      
       s3 = expression();
       }
+      
       break;
       }
     default:
@@ -7763,33 +9080,39 @@ void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(tok)
       s3.prepend(":=");
      s4=s1+s2+s3;
      addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public);
-}
+  }
 
 
 QCString VhdlParser::signal_kind() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case REGISTER_T:{
-      if (!hasError) {
+    case REGISTER_T:{if (!hasError) {
+      
       jj_consume_token(REGISTER_T);
       }
       if (!hasError) {
+      
 return "register";
       }
+      
       break;
       }
-    case BUS_T:{
-      if (!hasError) {
+    case BUS_T:{if (!hasError) {
+      
       jj_consume_token(BUS_T);
       }
       if (!hasError) {
+      
 return "bus";
       }
+      
       break;
       }
     default:
@@ -7798,7 +9121,7 @@ return "bus";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::signal_list() {QCString s,s1;
@@ -7806,11 +9129,12 @@ QCString VhdlParser::signal_list() {QCString s,s1;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -7820,37 +9144,45 @@ QCString VhdlParser::signal_list() {QCString s,s1;
         default:
           jj_la1[204] = jj_gen;
           goto end_label_38;
-        }
-        if (!hasError) {
+        }if (!hasError) {
+        
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
+        
         s1 = name();
         }
         if (!hasError) {
+        
 s+=",";s+=s1;
         }
+        
       }
       end_label_38: ;
       }
+      
       break;
       }
-    case OTHER_T:{
-      if (!hasError) {
+    case OTHER_T:{if (!hasError) {
+      
       jj_consume_token(OTHER_T);
       }
       if (!hasError) {
+      
 return "other";
       }
+      
       break;
       }
-    case ALL_T:{
-      if (!hasError) {
+    case ALL_T:{if (!hasError) {
+      
       jj_consume_token(ALL_T);
       }
       if (!hasError) {
+      
 return "all";
       }
+      
       break;
       }
     default:
@@ -7859,23 +9191,25 @@ return "all";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::signature() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(LBRACKET_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -7885,19 +9219,23 @@ QCString VhdlParser::signature() {QCString s,s1,s2;
         default:
           jj_la1[206] = jj_gen;
           goto end_label_39;
-        }
-        if (!hasError) {
+        }if (!hasError) {
+        
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
+        
         s1 = name();
         }
         if (!hasError) {
+        
 s+=",";s+=s1;
         }
+        
       }
       end_label_39: ;
       }
+      
       break;
       }
     default:
@@ -7906,17 +9244,21 @@ s+=",";s+=s1;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case RETURN_T:{
-      if (!hasError) {
+    case RETURN_T:{if (!hasError) {
+      
       jj_consume_token(RETURN_T);
       }
       if (!hasError) {
+      
       s1 = name();
       }
       if (!hasError) {
+      
 s+="return ";s+=s1;
       }
+      
       break;
       }
     default:
@@ -7925,21 +9267,24 @@ s+="return ";s+=s1;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(RBRACKET_T);
     }
+    
 s1="["+s+"]";return s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::simple_expression() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case PLUS_T:
-    case MINUS_T:{
-      if (!hasError) {
+    case MINUS_T:{if (!hasError) {
+      
       s = sign();
       }
+      
       break;
       }
     default:
@@ -7948,78 +9293,93 @@ QCString VhdlParser::simple_expression() {QCString s,s1,s2;
     }
     }
     if (!hasError) {
+    
     s1 = term();
     }
     if (!hasError) {
+    
 s+=s1;
     }
     if (!hasError) {
+    
     while (!hasError) {
-      if (jj_2_91(2147483647)) {
+      if (jj_2_92(2147483647)) {
         ;
       } else {
         goto end_label_40;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = adding_operator();
       }
       if (!hasError) {
+      
       s2 = term();
       }
       if (!hasError) {
+      
 s+=s1;s+=s2;
       }
+      
     }
     end_label_40: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-void VhdlParser::simple_name() {
-    if (!hasError) {
+void VhdlParser::simple_name() {if (!hasError) {
+    
     name();
     }
-}
+    
+  }
 
 
-QCString VhdlParser::slice_name() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s1 = discrete_range();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return s+"("+s1+")";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::string_literal() {Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) {
+    
     tok = jj_consume_token(STRINGLITERAL);
     }
+    
 return tok->image.c_str();
 assert(false);
-}
+  }
 
 
-void VhdlParser::subprogram_body() {QCString s;
-    if (!hasError) {
+void VhdlParser::subprogram_body() {QCString s;if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     //try{
      s = subprogram_declarative_part();
     }
     if (!hasError) {
+    
 if (s.data())
       {
         FlowChart::addFlowChart(FlowChart::VARIABLE_NO,s,0);
@@ -8027,21 +9387,26 @@ if (s.data())
       FlowChart::addFlowChart(FlowChart::BEGIN_NO,"BEGIN",0);
     }
     if (!hasError) {
+    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
+    
     subprogram_statement_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case FUNCTION_T:
-    case PROCEDURE_T:{
-      if (!hasError) {
+    case PROCEDURE_T:{if (!hasError) {
+      
       subprogram_kind();
       }
+      
       break;
       }
     default:
@@ -8050,13 +9415,15 @@ if (s.data())
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       designator();
       }
+      
       break;
       }
     default:
@@ -8065,34 +9432,40 @@ if (s.data())
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 tempEntry->endBodyLine=getLine(END_T);
       createFlow();
       currP=0;
-}
+  }
 
 
 void VhdlParser::subprogram_declaration() {
-    if (jj_2_92(2147483647)) {
-      if (!hasError) {
+    if (jj_2_93(2147483647)) {if (!hasError) {
+      
       subprogram_instantiation_declaration();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case FUNCTION_T:
       case IMPURE_T:
       case PROCEDURE_T:
-      case PURE_T:{
-        if (!hasError) {
+      case PURE_T:{if (!hasError) {
+        
         subprogram_specification();
         }
         if (!hasError) {
+        
         subprogram_1();
         }
         if (!hasError) {
+        
 currP=0;
         }
+        
         break;
         }
       default:
@@ -8101,21 +9474,23 @@ currP=0;
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
 void VhdlParser::subprogram_1() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       subprogram_body();
       }
+      
       break;
       }
-    case SEMI_T:{
-      if (!hasError) {
+    case SEMI_T:{if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
+      
       break;
       }
     default:
@@ -8123,7 +9498,7 @@ void VhdlParser::subprogram_1() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
 QCString VhdlParser::subprogram_declarative_item() {QCString s;
@@ -8131,126 +9506,152 @@ QCString VhdlParser::subprogram_declarative_item() {QCString s;
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
       if (!hasError) {
+      
 return "";
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       s = type_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       subprogram_body();
       }
       if (!hasError) {
+      
 return "";
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       s = subtype_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       s = constant_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       s = variable_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       s = file_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       s = alias_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
       jj_la1[214] = jj_gen;
-      if (jj_2_93(2147483647)) {
-        if (!hasError) {
+      if (jj_2_94(2147483647)) {if (!hasError) {
+        
         s = attribute_declaration();
         }
         if (!hasError) {
+        
 return s;
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{
-          if (!hasError) {
+        case ATTRIBUTE_T:{if (!hasError) {
+          
           s = attribute_specification();
           }
           if (!hasError) {
+          
 return s;
           }
+          
           break;
           }
-        case USE_T:{
-          if (!hasError) {
+        case USE_T:{if (!hasError) {
+          
           s = use_clause();
           }
           if (!hasError) {
+          
 return s;
           }
+          
           break;
           }
         default:
           jj_la1[215] = jj_gen;
-          if (jj_2_94(3)) {
-            if (!hasError) {
+          if (jj_2_95(3)) {if (!hasError) {
+            
             s = group_template_declaration();
             }
             if (!hasError) {
+            
 return s;
             }
+            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{
-              if (!hasError) {
+            case GROUP_T:{if (!hasError) {
+              
               s = group_declaration();
               }
               if (!hasError) {
+              
 return s;
               }
+              
               break;
               }
             default:
@@ -8263,11 +9664,11 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -8291,33 +9692,38 @@ QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;
       default:
         jj_la1[217] = jj_gen;
         goto end_label_41;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = subprogram_declarative_item();
       }
       if (!hasError) {
+      
 s+=s1;
       }
+      
     }
     end_label_41: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
 void VhdlParser::subprogram_kind() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FUNCTION_T:{
-      if (!hasError) {
+    case FUNCTION_T:{if (!hasError) {
+      
       jj_consume_token(FUNCTION_T);
       }
+      
       break;
       }
-    case PROCEDURE_T:{
-      if (!hasError) {
+    case PROCEDURE_T:{if (!hasError) {
+      
       jj_consume_token(PROCEDURE_T);
       }
+      
       break;
       }
     default:
@@ -8325,19 +9731,21 @@ void VhdlParser::subprogram_kind() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
 void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PROCEDURE_T:{
-      if (!hasError) {
+    case PROCEDURE_T:{if (!hasError) {
+      
       jj_consume_token(PROCEDURE_T);
       }
       if (!hasError) {
+      
       s = designator();
       }
       if (!hasError) {
+      
 currP=VhdlDocGen::PROCEDURE;
               createFunction(s.data(),currP,0);
               tempEntry=current.get();
@@ -8345,23 +9753,29 @@ currP=VhdlDocGen::PROCEDURE;
                current->bodyLine=getLine(PROCEDURE_T);
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{
-        if (!hasError) {
+      case LPAREN_T:{if (!hasError) {
+        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
+        
 param_sec=PARAM_SEC;
         }
         if (!hasError) {
+        
         interface_list();
         }
         if (!hasError) {
+        
 param_sec=0;
         }
         if (!hasError) {
+        
         jj_consume_token(RPAREN_T);
         }
+        
         break;
         }
       default:
@@ -8370,50 +9784,59 @@ param_sec=0;
       }
       }
       if (!hasError) {
-      if (jj_2_95(2)) {
-        if (!hasError) {
+      
+      if (jj_2_96(2)) {if (!hasError) {
+        
         gen_interface_list();
         }
+        
       } else {
         ;
       }
       }
       if (!hasError) {
-      if (jj_2_96(2)) {
-        if (!hasError) {
+      
+      if (jj_2_97(2)) {if (!hasError) {
+        
         gen_assoc_list();
         }
+        
       } else {
         ;
       }
       }
       if (!hasError) {
+      
       param();
       }
       if (!hasError) {
+      
 newEntry();
       }
+      
       break;
       }
     case FUNCTION_T:
     case IMPURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IMPURE_T:
-      case PURE_T:{
-        if (!hasError) {
+      case PURE_T:{if (!hasError) {
+        
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PURE_T:{
-          if (!hasError) {
+        case PURE_T:{if (!hasError) {
+          
           tok = jj_consume_token(PURE_T);
           }
+          
           break;
           }
-        case IMPURE_T:{
-          if (!hasError) {
+        case IMPURE_T:{if (!hasError) {
+          
           tok = jj_consume_token(IMPURE_T);
           }
+          
           break;
           }
         default:
@@ -8422,6 +9845,7 @@ newEntry();
           errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
         }
         }
+        
         break;
         }
       default:
@@ -8430,12 +9854,15 @@ newEntry();
       }
       }
       if (!hasError) {
+      
       t = jj_consume_token(FUNCTION_T);
       }
       if (!hasError) {
+      
       s = designator();
       }
       if (!hasError) {
+      
 currP=VhdlDocGen::FUNCTION;
      if(tok)
      createFunction(tok->image.c_str(),currP,s.data());
@@ -8446,23 +9873,29 @@ currP=VhdlDocGen::FUNCTION;
       current->bodyLine=getLine(FUNCTION_T);
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LPAREN_T:{
-        if (!hasError) {
+      case LPAREN_T:{if (!hasError) {
+        
 param_sec=PARAM_SEC;
         }
         if (!hasError) {
+        
         jj_consume_token(LPAREN_T);
         }
         if (!hasError) {
+        
         formal_parameter_list();
         }
         if (!hasError) {
+        
         jj_consume_token(RPAREN_T);
         }
         if (!hasError) {
+        
 param_sec=0;
         }
+        
         break;
         }
       default:
@@ -8471,16 +9904,20 @@ param_sec=0;
       }
       }
       if (!hasError) {
+      
       jj_consume_token(RETURN_T);
       }
       if (!hasError) {
+      
       s = type_mark();
       }
       if (!hasError) {
+      
 tempEntry=current.get();
                 current->type=s;
                 newEntry();
       }
+      
       break;
       }
     default:
@@ -8488,11 +9925,11 @@ tempEntry=current.get();
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-void VhdlParser::subprogram_statement_part() {
-    if (!hasError) {
+void VhdlParser::subprogram_statement_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -8519,100 +9956,120 @@ void VhdlParser::subprogram_statement_part() {
       default:
         jj_la1[224] = jj_gen;
         goto end_label_42;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       sequential_statement();
       }
+      
     }
     end_label_42: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::subtype_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(SUBTYPE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public);
   return " subtype "+s+" is "+s1+";";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::subtype_indication() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
-    if (jj_2_97(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_98(2147483647)) {if (!hasError) {
+      
       s1 = name();
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
-    if (jj_2_98(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_99(2147483647)) {if (!hasError) {
+      
       s2 = constraint();
       }
+      
     } else {
       ;
     }
     }
+    
 return s+" "+s1+" "+s2;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::suffix() {QCString s;
-    if (jj_2_99(2147483647)) {
-      if (!hasError) {
+    if (jj_2_100(2147483647)) {if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case CHARACTER_LITERAL:{
-        if (!hasError) {
+      case CHARACTER_LITERAL:{if (!hasError) {
+        
         s = character_literal();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
-      case STRINGLITERAL:{
-        if (!hasError) {
+      case STRINGLITERAL:{if (!hasError) {
+        
         s = operator_symbol();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
-      case ALL_T:{
-        if (!hasError) {
+      case ALL_T:{if (!hasError) {
+        
         jj_consume_token(ALL_T);
         }
         if (!hasError) {
+        
 return " all ";
         }
+        
         break;
         }
       default:
@@ -8622,7 +10079,7 @@ return " all ";
       }
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::target() {QCString s;
@@ -8630,22 +10087,26 @@ QCString VhdlParser::target() {QCString s;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       s = aggregate();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -8654,84 +10115,99 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::term() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) {
+    
     s = factor();
     }
     if (!hasError) {
+    
     while (!hasError) {
-      if (jj_2_100(2)) {
+      if (jj_2_101(2)) {
         ;
       } else {
         goto end_label_43;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = multiplying_operation();
       }
       if (!hasError) {
+      
       s2 = factor();
       }
       if (!hasError) {
+      
 s+=s1;s+=s2;
       }
+      
     }
     end_label_43: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::timeout_clause() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) {
+    
     jj_consume_token(FOR_T);
     }
     if (!hasError) {
+    
     s = expression();
     }
+    
 return " for "+s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::type_conversion() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s1 = expression();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
+    
 return s+"("+s1+")";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::type_declaration() {QCString s;
-    if (jj_2_101(3)) {
-      if (!hasError) {
+    if (jj_2_102(3)) {if (!hasError) {
+      
       s = full_type_declaration();
       }
       if (!hasError) {
+      
 return s;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case TYPE_T:{
-        if (!hasError) {
+      case TYPE_T:{if (!hasError) {
+        
         s = incomplete_type_declaration();
         }
         if (!hasError) {
+        
 return s;
         }
+        
         break;
         }
       default:
@@ -8741,68 +10217,80 @@ return s;
       }
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::type_definition() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case RANGE_T:
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       //try{
       s = scalar_type_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     case ARRAY_T:
-    case RECORD_T:{
-      if (!hasError) {
+    case RECORD_T:{if (!hasError) {
+      
       s = composite_type_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case ACCESS_T:{
-      if (!hasError) {
+    case ACCESS_T:{if (!hasError) {
+      
       s = access_type_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       s = file_type_definition();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
       jj_la1[228] = jj_gen;
-      if (jj_2_102(2)) {
-        if (!hasError) {
+      if (jj_2_103(2)) {if (!hasError) {
+        
         protected_type_body();
         }
         if (!hasError) {
+        
 return "";
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PROTECTED_T:{
-          if (!hasError) {
+        case PROTECTED_T:{if (!hasError) {
+          
           protected_type_declaration();
           }
           if (!hasError) {
+          
 return "";
           }
+          
           break;
           }
         default:
@@ -8813,29 +10301,33 @@ return "";
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::type_mark() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::type_mark() {QCString s;if (!hasError) {
+    
     s = name();
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;
-    if (!hasError) {
+QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!hasError) {
+    
     jj_consume_token(ARRAY_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     s = index_subtype_definition();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -8845,41 +10337,50 @@ QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;
       default:
         jj_la1[230] = jj_gen;
         goto end_label_44;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = index_subtype_definition();
       }
       if (!hasError) {
+      
 s3+=",";s3+=s1;
       }
+      
     }
     end_label_44: ;
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(OF_T);
     }
     if (!hasError) {
+    
     s2 = subtype_indication();
     }
+    
 return "array("+s+s3+") of "+s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::use_clause() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(USE_T);
     }
     if (!hasError) {
+    
     s = selected_name();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -8889,22 +10390,27 @@ QCString VhdlParser::use_clause() {QCString s,s1;
       default:
         jj_la1[231] = jj_gen;
         goto end_label_45;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       s1 = selected_name();
       }
       if (!hasError) {
+      
 s+=",";s+=s1;
       }
+      
     }
     end_label_45: ;
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 QCStringList ql1=QCStringList::split(",",s);
                    for (uint j=0;j<ql1.count();j++)
                    {
@@ -8918,7 +10424,7 @@ QCStringList ql1=QCStringList::split(",",s);
                    s1="use "+s;
                    return s1;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
@@ -8927,46 +10433,57 @@ QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
     case SLSL_T:
     case STRINGLITERAL:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
-      if (jj_2_103(2)) {
-        if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
+      if (jj_2_104(2)) {if (!hasError) {
+        
         s = identifier();
         }
         if (!hasError) {
+        
         jj_consume_token(COLON_T);
         }
         if (!hasError) {
+        
 s+=":";
         }
+        
       } else {
         ;
       }
       }
       if (!hasError) {
+      
       s1 = target();
       }
       if (!hasError) {
+      
       jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
+      
       s2 = expression();
       }
       if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
       if (!hasError) {
+      
 return s+s1+":="+s2+";";
       }
+      
       break;
       }
-    case WITH_T:{
-      if (!hasError) {
+    case WITH_T:{if (!hasError) {
+      
       selected_variable_assignment();
       }
       if (!hasError) {
+      
 return "";
       }
+      
       break;
       }
     default:
@@ -8975,16 +10492,17 @@ return "";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SHARED_T:{
-      if (!hasError) {
+    case SHARED_T:{if (!hasError) {
+      
       tok = jj_consume_token(SHARED_T);
       }
+      
       break;
       }
     default:
@@ -8993,26 +10511,33 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s
     }
     }
     if (!hasError) {
+    
     jj_consume_token(VARIABLE_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s1 = subtype_indication();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VARASSIGN_T:{
-      if (!hasError) {
+    case VARASSIGN_T:{if (!hasError) {
+      
       t1 = jj_consume_token(VARASSIGN_T);
       }
       if (!hasError) {
+      
       s2 = expression();
       }
+      
       break;
       }
     default:
@@ -9021,8 +10546,10 @@ QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 int spec;
     if(t1)
      s2.prepend(":=");
@@ -9044,20 +10571,22 @@ int spec;
     addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public);
     return val;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
-    if (!hasError) {
+QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       s = identifier();
       }
       if (!hasError) {
+      
       t = jj_consume_token(COLON_T);
       }
+      
       break;
       }
     default:
@@ -9066,14 +10595,17 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(WAIT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ON_T:{
-      if (!hasError) {
+    case ON_T:{if (!hasError) {
+      
       s1 = sensitivity_clause();
       }
+      
       break;
       }
     default:
@@ -9082,11 +10614,13 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case UNTIL_T:{
-      if (!hasError) {
+    case UNTIL_T:{if (!hasError) {
+      
       s2 = condition_clause();
       }
+      
       break;
       }
     default:
@@ -9095,11 +10629,13 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case FOR_T:{
-      if (!hasError) {
+    case FOR_T:{if (!hasError) {
+      
       s3 = timeout_clause();
       }
+      
       break;
       }
     default:
@@ -9108,12 +10644,14 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 if(t) s.append(":");
   return s+" wait "+s1+s2+s3+";";
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::waveform() {QCString s,s1;
@@ -9133,11 +10671,12 @@ QCString VhdlParser::waveform() {QCString s,s1;
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{
-      if (!hasError) {
+    case BIT_STRING_LITERAL:{if (!hasError) {
+      
       s = waveform_element();
       }
       if (!hasError) {
+      
       while (!hasError) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA_T:{
@@ -9147,31 +10686,38 @@ QCString VhdlParser::waveform() {QCString s,s1;
         default:
           jj_la1[239] = jj_gen;
           goto end_label_46;
-        }
-        if (!hasError) {
+        }if (!hasError) {
+        
         jj_consume_token(COMMA_T);
         }
         if (!hasError) {
+        
         s1 = waveform_element();
         }
         if (!hasError) {
+        
 s+=","; s+=s1;
         }
+        
       }
       end_label_46: ;
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case UNAFFECTED_T:{
-      if (!hasError) {
+    case UNAFFECTED_T:{if (!hasError) {
+      
       jj_consume_token(UNAFFECTED_T);
       }
       if (!hasError) {
+      
 return " unaffected ";
       }
+      
       break;
       }
     default:
@@ -9180,25 +10726,29 @@ return " unaffected ";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::waveform_element() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::waveform_element() {QCString s,s1;if (!hasError) {
+    
     s = expression();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case AFTER_T:{
-      if (!hasError) {
+    case AFTER_T:{if (!hasError) {
+      
       jj_consume_token(AFTER_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
 s1.prepend(" after ");
       }
+      
       break;
       }
     default:
@@ -9206,37 +10756,45 @@ s1.prepend(" after ");
       ;
     }
     }
+    
 return s+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::protected_type_body() {
-    if (!hasError) {
+QCString VhdlParser::protected_type_body() {if (!hasError) {
+    
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
+    
     jj_consume_token(BODY_T);
     }
     if (!hasError) {
+    
     protected_type_body_declarative_part();
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
+    
     jj_consume_token(BODY_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -9244,9 +10802,10 @@ QCString VhdlParser::protected_type_body() {
       ;
     }
     }
+    
 return "";
 assert(false);
-}
+  }
 
 
 void VhdlParser::protected_type_body_declarative_item() {
@@ -9254,87 +10813,100 @@ void VhdlParser::protected_type_body_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
+      
       break;
       }
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       subprogram_body();
       }
+      
       break;
       }
-    case TYPE_T:{
-      if (!hasError) {
+    case TYPE_T:{if (!hasError) {
+      
       type_declaration();
       }
+      
       break;
       }
-    case SUBTYPE_T:{
-      if (!hasError) {
+    case SUBTYPE_T:{if (!hasError) {
+      
       subtype_declaration();
       }
+      
       break;
       }
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       constant_declaration();
       }
+      
       break;
       }
     case SHARED_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       variable_declaration();
       }
+      
       break;
       }
-    case FILE_T:{
-      if (!hasError) {
+    case FILE_T:{if (!hasError) {
+      
       file_declaration();
       }
+      
       break;
       }
-    case ALIAS_T:{
-      if (!hasError) {
+    case ALIAS_T:{if (!hasError) {
+      
       alias_declaration();
       }
+      
       break;
       }
     default:
       jj_la1[243] = jj_gen;
-      if (jj_2_104(2147483647)) {
-        if (!hasError) {
+      if (jj_2_105(2147483647)) {if (!hasError) {
+        
         attribute_declaration();
         }
+        
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ATTRIBUTE_T:{
-          if (!hasError) {
+        case ATTRIBUTE_T:{if (!hasError) {
+          
           attribute_specification();
           }
+          
           break;
           }
-        case USE_T:{
-          if (!hasError) {
+        case USE_T:{if (!hasError) {
+          
           use_clause();
           }
+          
           break;
           }
         default:
           jj_la1[244] = jj_gen;
-          if (jj_2_105(3)) {
-            if (!hasError) {
+          if (jj_2_106(3)) {if (!hasError) {
+            
             group_template_declaration();
             }
+            
           } else {
             switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case GROUP_T:{
-              if (!hasError) {
+            case GROUP_T:{if (!hasError) {
+              
               group_declaration();
               }
+              
               break;
               }
             default:
@@ -9346,11 +10918,11 @@ void VhdlParser::protected_type_body_declarative_item() {
         }
       }
     }
-}
+  }
 
 
-void VhdlParser::protected_type_body_declarative_part() {
-    if (!hasError) {
+void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ALIAS_T:
@@ -9374,42 +10946,50 @@ void VhdlParser::protected_type_body_declarative_part() {
       default:
         jj_la1[246] = jj_gen;
         goto end_label_47;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       protected_type_body_declarative_item();
       }
+      
     }
     end_label_47: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::protected_type_declaration() {
-    if (!hasError) {
+QCString VhdlParser::protected_type_declaration() {if (!hasError) {
+    
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
-    try {
-      if (!hasError) {
+    
+    try {if (!hasError) {
+      
       protected_type_declarative_part();
       }
+      
     } catch ( ...) {
 error_skipto(END_T);
     }
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(PROTECTED_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -9417,9 +10997,10 @@ error_skipto(END_T);
       ;
     }
     }
+    
 return "";
 assert(false);
-}
+  }
 
 
 void VhdlParser::protected_type_declarative_item() {
@@ -9427,22 +11008,25 @@ void VhdlParser::protected_type_declarative_item() {
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_specification();
       }
+      
       break;
       }
-    case ATTRIBUTE_T:{
-      if (!hasError) {
+    case ATTRIBUTE_T:{if (!hasError) {
+      
       attribute_specification();
       }
+      
       break;
       }
-    case USE_T:{
-      if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
       use_clause();
       }
+      
       break;
       }
     default:
@@ -9450,11 +11034,11 @@ void VhdlParser::protected_type_declarative_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-void VhdlParser::protected_type_declarative_part() {
-    if (!hasError) {
+void VhdlParser::protected_type_declarative_part() {if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ATTRIBUTE_T:
@@ -9469,48 +11053,58 @@ void VhdlParser::protected_type_declarative_part() {
       default:
         jj_la1[249] = jj_gen;
         goto end_label_48;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       protected_type_declarative_item();
       }
       if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
+      
     }
     end_label_48: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::context_ref() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::context_ref() {QCString s;if (!hasError) {
+    
     jj_consume_token(CONTEXT_T);
     }
     if (!hasError) {
+    
     s = identifier_list();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 return "context "+s ;
 assert(false);
-}
+  }
 
 
-void VhdlParser::context_declaration() {QCString s,s1;
-    if (!hasError) {
+void VhdlParser::context_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(CONTEXT_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
 parse_sec=CONTEXT_SEC;
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case CONTEXT_T:
@@ -9522,22 +11116,26 @@ parse_sec=CONTEXT_SEC;
       default:
         jj_la1[250] = jj_gen;
         goto end_label_49;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = libustcont_stats();
       }
+      
     }
     end_label_49: ;
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONTEXT_T:{
-      if (!hasError) {
+    case CONTEXT_T:{if (!hasError) {
+      
       jj_consume_token(CONTEXT_T);
       }
+      
       break;
       }
     default:
@@ -9546,12 +11144,14 @@ parse_sec=CONTEXT_SEC;
     }
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -9560,40 +11160,48 @@ parse_sec=CONTEXT_SEC;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 parse_sec=0;
                           addVhdlType(s.data(),getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,"context",s1.data(),Public);
-}
+  }
 
 
 QCString VhdlParser::libustcont_stats() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case USE_T:{
-      if (!hasError) {
+    case USE_T:{if (!hasError) {
+      
       s = use_clause();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case LIBRARY_T:{
-      if (!hasError) {
+    case LIBRARY_T:{if (!hasError) {
+      
       s = library_clause();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case CONTEXT_T:{
-      if (!hasError) {
+    case CONTEXT_T:{if (!hasError) {
+      
       s = context_ref();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -9602,34 +11210,41 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;
-    if (!hasError) {
+void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     jj_consume_token(NEW_T);
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
     s2 = signature();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
       gen_assoc_list();
       }
+      
       break;
       }
     default:
@@ -9638,35 +11253,43 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 QCString q=" is new "+s1+s2;
       addVhdlType(s.data(),getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"package",q.data(),Public);
-}
+  }
 
 
-QCString VhdlParser::interface_package_declaration() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(PACKAGE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     jj_consume_token(NEW_T);
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
       gen_assoc_list();
       }
+      
       break;
       }
     default:
@@ -9674,37 +11297,45 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;
       ;
     }
     }
+    
 current->name=s;
                             return "package "+s+" is new "+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(FUNCTION_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     jj_consume_token(IS_T);
     }
     if (!hasError) {
+    
     jj_consume_token(NEW_T);
     }
     if (!hasError) {
+    
     s1 = name();
     }
     if (!hasError) {
+    
     s2 = signature();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case GENERIC_T:{
-      if (!hasError) {
+    case GENERIC_T:{if (!hasError) {
+      
       gen_assoc_list();
       }
+      
       break;
       }
     default:
@@ -9713,122 +11344,152 @@ QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
+    
 QCString q= " is new "+s1+s2;
       addVhdlType(s.data(),getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public);
     return q;
 assert(false);
-}
+  }
 
 
-void VhdlParser::gen_assoc_list() {
-    if (!hasError) {
+void VhdlParser::gen_assoc_list() {if (!hasError) {
+    
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
+    
     jj_consume_token(MAP_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
     association_list();
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::gen_interface_list() {
-    if (!hasError) {
+void VhdlParser::gen_interface_list() {if (!hasError) {
+    
     jj_consume_token(GENERIC_T);
     }
     if (!hasError) {
+    
     jj_consume_token(LPAREN_T);
     }
     if (!hasError) {
+    
 //int u=s_str.iLine;
                           parse_sec=GEN_SEC;
     }
     if (!hasError) {
+    
     interface_list();
     }
     if (!hasError) {
+    
 //  QCString vo=$3;
                           parse_sec=0;
     }
     if (!hasError) {
+    
     jj_consume_token(RPAREN_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::case_scheme() {
-    if (!hasError) {
+void VhdlParser::case_scheme() {if (!hasError) {
+    
     jj_consume_token(CASE_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(GENERATE_T);
     }
     if (!hasError) {
+    
     when_stats();
     }
     if (!hasError) {
-    if (jj_2_106(3)) {
-      if (!hasError) {
+    
+    if (jj_2_107(3)) {if (!hasError) {
+      
       ttend();
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     jj_consume_token(GENERATE_T);
     }
     if (!hasError) {
+    
     generate_statement_body();
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::when_stats() {
-    if (!hasError) {
-    while (!hasError) {
-      if (!hasError) {
+void VhdlParser::when_stats() {if (!hasError) {
+    
+    while (!hasError) {if (!hasError) {
+      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
-      if (jj_2_107(2)) {
-        if (!hasError) {
+      
+      if (jj_2_108(2)) {if (!hasError) {
+        
         label();
         }
         if (!hasError) {
+        
         jj_consume_token(COLON_T);
         }
+        
       } else {
         ;
       }
       }
       if (!hasError) {
+      
       choices();
       }
       if (!hasError) {
+      
       jj_consume_token(ARROW_T);
       }
       if (!hasError) {
+      
       generate_statement_body();
       }
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case WHEN_T:{
         ;
@@ -9841,20 +11502,23 @@ void VhdlParser::when_stats() {
     }
     end_label_50: ;
     }
-}
+    
+  }
 
 
-void VhdlParser::ttend() {
-    if (!hasError) {
+void VhdlParser::ttend() {if (!hasError) {
+    
     jj_consume_token(END_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       identifier();
       }
+      
       break;
       }
     default:
@@ -9863,23 +11527,27 @@ void VhdlParser::ttend() {
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::generate_statement_body() {
-    if (!hasError) {
+void VhdlParser::generate_statement_body() {if (!hasError) {
+    
     jj_consume_token(BEGIN_T);
     }
     if (!hasError) {
+    
     generate_statement_body();
     }
-}
+    
+  }
 
 
-void VhdlParser::generate_statement_body1() {
-    if (!hasError) {
+void VhdlParser::generate_statement_body1() {if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ALIAS_T:
     case ATTRIBUTE_T:
@@ -9899,23 +11567,26 @@ void VhdlParser::generate_statement_body1() {
     case SUBTYPE_T:
     case TYPE_T:
     case USE_T:
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       while (!hasError) {
-        if (jj_2_108(2147483647)) {
+        if (jj_2_109(2147483647)) {
           ;
         } else {
           goto end_label_51;
-        }
-        if (!hasError) {
+        }if (!hasError) {
+        
         block_declarative_item();
         }
+        
       }
       end_label_51: ;
       }
       if (!hasError) {
+      
       jj_consume_token(BEGIN_T);
       }
+      
       break;
       }
     default:
@@ -9924,6 +11595,7 @@ void VhdlParser::generate_statement_body1() {
     }
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ASSERT_T:
@@ -9943,69 +11615,83 @@ void VhdlParser::generate_statement_body1() {
       default:
         jj_la1[260] = jj_gen;
         goto end_label_52;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       concurrent_statement();
       }
+      
     }
     end_label_52: ;
     }
-}
+    
+  }
 
 
-QCString VhdlParser::external_name() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::external_name() {QCString s,s1,s2;if (!hasError) {
+    
     jj_consume_token(SLSL_T);
     }
     if (!hasError) {
+    
     s = sig_stat();
     }
     if (!hasError) {
+    
     s1 = external_pathname();
     }
     if (!hasError) {
+    
     jj_consume_token(COLON_T);
     }
     if (!hasError) {
+    
     s2 = subtype_indication();
     }
     if (!hasError) {
+    
     jj_consume_token(RSRS_T);
     }
+    
 QCString t="<<"+s;
                          QCString t1=s1+":"+s2+">>";
                          return   s+s1;
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::sig_stat() {Token *t;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case CONSTANT_T:{
-      if (!hasError) {
+    case CONSTANT_T:{if (!hasError) {
+      
       t = jj_consume_token(CONSTANT_T);
       }
       if (!hasError) {
+      
 return t->image.data();
       }
+      
       break;
       }
-    case SIGNAL_T:{
-      if (!hasError) {
+    case SIGNAL_T:{if (!hasError) {
+      
       t = jj_consume_token(SIGNAL_T);
       }
       if (!hasError) {
+      
 return t->image.data();
       }
+      
       break;
       }
-    case VARIABLE_T:{
-      if (!hasError) {
+    case VARIABLE_T:{if (!hasError) {
+      
       t = jj_consume_token(VARIABLE_T);
       }
       if (!hasError) {
+      
 return t->image.data();
       }
+      
       break;
       }
     default:
@@ -10014,36 +11700,42 @@ return t->image.data();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::external_pathname() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case DOT_T:{
-      if (!hasError) {
+    case DOT_T:{if (!hasError) {
+      
       s = absolute_pathname();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case NEG_T:{
-      if (!hasError) {
+    case NEG_T:{if (!hasError) {
+      
       s = relative_pathname();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
-    case AT_T:{
-      if (!hasError) {
+    case AT_T:{if (!hasError) {
+      
       s = package_path_name();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -10052,35 +11744,42 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
 QCString VhdlParser::absolute_pathname() {QCString s,s1;
-    if (jj_2_109(2147483647)) {
-      if (!hasError) {
+    if (jj_2_110(2147483647)) {if (!hasError) {
+      
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
+      
       s = pathname_element_list();
       }
       if (!hasError) {
+      
       s1 = identifier();
       }
       if (!hasError) {
+      
 return "."+s+s1;
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case DOT_T:{
-        if (!hasError) {
+      case DOT_T:{if (!hasError) {
+        
         jj_consume_token(DOT_T);
         }
         if (!hasError) {
+        
         s = identifier();
         }
         if (!hasError) {
+        
 return "."+s;
         }
+        
         break;
         }
       default:
@@ -10090,42 +11789,49 @@ return "."+s;
       }
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::relative_pathname() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
+    
     s = neg_list();
     }
     if (!hasError) {
-    if (jj_2_110(2147483647)) {
-      if (!hasError) {
+    
+    if (jj_2_111(2147483647)) {if (!hasError) {
+      
       s1 = pathname_element_list();
       }
+      
     } else {
       ;
     }
     }
     if (!hasError) {
+    
     s2 = identifier();
     }
+    
 return s+s1+s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::neg_list() {QCString s;
-    if (!hasError) {
-    while (!hasError) {
-      if (!hasError) {
+QCString VhdlParser::neg_list() {QCString s;if (!hasError) {
+    
+    while (!hasError) {if (!hasError) {
+      
       jj_consume_token(NEG_T);
       }
       if (!hasError) {
+      
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
+      
 s+="^.";
       }
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case NEG_T:{
         ;
@@ -10138,27 +11844,32 @@ s+="^.";
     }
     end_label_53: ;
     }
+    
 return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::pathname_element() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = expression();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
+      
       break;
       }
     default:
@@ -10166,77 +11877,90 @@ QCString VhdlParser::pathname_element() {QCString s,s1;
       ;
     }
     }
+    
 if(!s1.isEmpty())
      return s+"("+s1+")";
 
     return s;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;
-    if (!hasError) {
+QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;if (!hasError) {
     if (!hasError) {
+    
     s = pathname_element();
     }
     if (!hasError) {
+    
     jj_consume_token(DOT_T);
     }
+    
     }
     if (!hasError) {
+    
 s+=".";
     }
     if (!hasError) {
+    
     while (!hasError) {
-      if (jj_2_111(2147483647)) {
+      if (jj_2_112(2147483647)) {
         ;
       } else {
         goto end_label_54;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       s1 = pathname_element();
       }
       if (!hasError) {
+      
       jj_consume_token(DOT_T);
       }
       if (!hasError) {
+      
 s2+=s1;s2+=".";
       }
+      
     }
     end_label_54: ;
     }
+    
 return s+s2;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::package_path_name() {QCString s;
-    if (!hasError) {
+QCString VhdlParser::package_path_name() {QCString s;if (!hasError) {
+    
     jj_consume_token(AT_T);
     }
     if (!hasError) {
+    
     s = name();
     }
+    
 return "@"+s;
 assert(false);
-}
+  }
 
 
 void VhdlParser::conditional_signal_assignment_wave() {
-    if (jj_2_112(2147483647)) {
-      if (!hasError) {
+    if (jj_2_113(2147483647)) {if (!hasError) {
+      
       conditional_force_assignment();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case LPAREN_T:
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         conditional_waveform_assignment();
         }
+        
         break;
         }
       default:
@@ -10245,24 +11969,27 @@ void VhdlParser::conditional_signal_assignment_wave() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
-void VhdlParser::conditional_waveform_assignment() {
-    if (!hasError) {
+void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
+    
     target();
     }
     if (!hasError) {
+    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INERTIAL_T:
     case REJECT_T:
-    case TRANSPORT_T:{
-      if (!hasError) {
+    case TRANSPORT_T:{if (!hasError) {
+      
       delay_mechanism();
       }
+      
       break;
       }
     default:
@@ -10271,20 +11998,25 @@ void VhdlParser::conditional_waveform_assignment() {
     }
     }
     if (!hasError) {
+    
     waveform_element();
     }
     if (!hasError) {
+    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ELSE_T:{
-      if (!hasError) {
+    case ELSE_T:{if (!hasError) {
+      
       else_wave_list();
       }
+      
       break;
       }
     default:
@@ -10293,27 +12025,33 @@ void VhdlParser::conditional_waveform_assignment() {
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
-void VhdlParser::else_wave_list() {
-    if (!hasError) {
+void VhdlParser::else_wave_list() {if (!hasError) {
+    
     jj_consume_token(ELSE_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case WHEN_T:{
-      if (!hasError) {
+    case WHEN_T:{if (!hasError) {
+      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       expression();
       }
+      
       break;
       }
     default:
@@ -10321,26 +12059,31 @@ void VhdlParser::else_wave_list() {
       ;
     }
     }
-}
+    
+  }
 
 
-void VhdlParser::conditional_force_assignment() {
-    if (!hasError) {
+void VhdlParser::conditional_force_assignment() {if (!hasError) {
+    
     target();
     }
     if (!hasError) {
+    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(FORCE_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IN_T:
-    case OUT_T:{
-      if (!hasError) {
+    case OUT_T:{if (!hasError) {
+      
       inout_stat();
       }
+      
       break;
       }
     default:
@@ -10349,12 +12092,15 @@ void VhdlParser::conditional_force_assignment() {
     }
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ABS_T:
     case NEW_T:
@@ -10371,13 +12117,15 @@ void VhdlParser::conditional_force_assignment() {
     case CHARACTER_LITERAL:
     case DECIMAL_LITERAL:
     case BASED_LITERAL:
-    case BIT_STRING_LITERAL:{
-      if (!hasError) {
+    case BIT_STRING_LITERAL:{if (!hasError) {
+      
       expression();
       }
       if (!hasError) {
+      
       else_stat();
       }
+      
       break;
       }
     default:
@@ -10386,22 +12134,26 @@ void VhdlParser::conditional_force_assignment() {
     }
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
 void VhdlParser::selected_signal_assignment_wave() {
-    if (jj_2_113(2147483647)) {
-      if (!hasError) {
+    if (jj_2_114(2147483647)) {if (!hasError) {
+      
       selected_force_assignment();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case WITH_T:{
-        if (!hasError) {
+      case WITH_T:{if (!hasError) {
+        
         selected_waveform_assignment();
         }
+        
         break;
         }
       default:
@@ -10410,25 +12162,29 @@ void VhdlParser::selected_signal_assignment_wave() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
-void VhdlParser::selected_variable_assignment() {
-    if (!hasError) {
+void VhdlParser::selected_variable_assignment() {if (!hasError) {
+    
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case Q_T:{
-      if (!hasError) {
+    case Q_T:{if (!hasError) {
+      
       jj_consume_token(Q_T);
       }
+      
       break;
       }
     default:
@@ -10437,31 +12193,37 @@ void VhdlParser::selected_variable_assignment() {
     }
     }
     if (!hasError) {
+    
     select_name();
     }
     if (!hasError) {
+    
     jj_consume_token(VARASSIGN_T);
     }
     if (!hasError) {
+    
     sel_var_list();
     }
-}
+    
+  }
 
 
 void VhdlParser::select_name() {
-    if (jj_2_114(2147483647)) {
-      if (!hasError) {
+    if (jj_2_115(2147483647)) {if (!hasError) {
+      
       aggregate();
       }
+      
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SLSL_T:
       case STRINGLITERAL:
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         name();
         }
+        
         break;
         }
       default:
@@ -10470,25 +12232,29 @@ void VhdlParser::select_name() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-}
+  }
 
 
-void VhdlParser::selected_waveform_assignment() {
-    if (!hasError) {
+void VhdlParser::selected_waveform_assignment() {if (!hasError) {
+    
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case Q_T:{
-      if (!hasError) {
+    case Q_T:{if (!hasError) {
+      
       jj_consume_token(Q_T);
       }
+      
       break;
       }
     default:
@@ -10497,19 +12263,23 @@ void VhdlParser::selected_waveform_assignment() {
     }
     }
     if (!hasError) {
+    
     target();
     }
     if (!hasError) {
+    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case INERTIAL_T:
     case REJECT_T:
-    case TRANSPORT_T:{
-      if (!hasError) {
+    case TRANSPORT_T:{if (!hasError) {
+      
       delay_mechanism();
       }
+      
       break;
       }
     default:
@@ -10518,27 +12288,33 @@ void VhdlParser::selected_waveform_assignment() {
     }
     }
     if (!hasError) {
+    
     sel_wave_list();
     }
-}
+    
+  }
 
 
-void VhdlParser::selected_force_assignment() {
-    if (!hasError) {
+void VhdlParser::selected_force_assignment() {if (!hasError) {
+    
     jj_consume_token(WITH_T);
     }
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(SELECT_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case Q_T:{
-      if (!hasError) {
+    case Q_T:{if (!hasError) {
+      
       jj_consume_token(Q_T);
       }
+      
       break;
       }
     default:
@@ -10547,21 +12323,26 @@ void VhdlParser::selected_force_assignment() {
     }
     }
     if (!hasError) {
+    
     target();
     }
     if (!hasError) {
+    
     jj_consume_token(LESSTHAN_T);
     }
     if (!hasError) {
+    
     jj_consume_token(FORCE_T);
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IN_T:
-    case OUT_T:{
-      if (!hasError) {
+    case OUT_T:{if (!hasError) {
+      
       inout_stat();
       }
+      
       break;
       }
     default:
@@ -10570,34 +12351,41 @@ void VhdlParser::selected_force_assignment() {
     }
     }
     if (!hasError) {
+    
     sel_var_list();
     }
-}
+    
+  }
 
 
-void VhdlParser::sel_var_list() {
-    if (!hasError) {
+void VhdlParser::sel_var_list() {if (!hasError) {
     if (!hasError) {
+    
     expression();
     }
     if (!hasError) {
+    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
+    
     choices();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case COMMA_T:{
-      if (!hasError) {
+    case COMMA_T:{if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
+      
       break;
       }
-    case SEMI_T:{
-      if (!hasError) {
+    case SEMI_T:{if (!hasError) {
+      
       jj_consume_token(SEMI_T);
       }
+      
       break;
       }
     default:
@@ -10606,35 +12394,42 @@ void VhdlParser::sel_var_list() {
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
     }
+    
     }
     if (!hasError) {
+    
     while (!hasError) {
-      if (jj_2_115(2147483647)) {
+      if (jj_2_116(2147483647)) {
         ;
       } else {
         goto end_label_55;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       expression();
       }
       if (!hasError) {
+      
       jj_consume_token(WHEN_T);
       }
       if (!hasError) {
+      
       choices();
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case COMMA_T:{
-        if (!hasError) {
+      case COMMA_T:{if (!hasError) {
+        
         jj_consume_token(COMMA_T);
         }
+        
         break;
         }
-      case SEMI_T:{
-        if (!hasError) {
+      case SEMI_T:{if (!hasError) {
+        
         jj_consume_token(SEMI_T);
         }
+        
         break;
         }
       default:
@@ -10643,23 +12438,28 @@ void VhdlParser::sel_var_list() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
+      
     }
     end_label_55: ;
     }
-}
+    
+  }
 
 
-void VhdlParser::sel_wave_list() {
-    if (!hasError) {
+void VhdlParser::sel_wave_list() {if (!hasError) {
+    
     waveform_element();
     }
     if (!hasError) {
+    
     jj_consume_token(WHEN_T);
     }
     if (!hasError) {
+    
     choices();
     }
     if (!hasError) {
+    
     while (!hasError) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA_T:{
@@ -10669,34 +12469,40 @@ void VhdlParser::sel_wave_list() {
       default:
         jj_la1[281] = jj_gen;
         goto end_label_56;
-      }
-      if (!hasError) {
+      }if (!hasError) {
+      
       jj_consume_token(COMMA_T);
       }
       if (!hasError) {
+      
       sel_wave_list();
       }
+      
     }
     end_label_56: ;
     }
     if (!hasError) {
+    
     jj_consume_token(SEMI_T);
     }
-}
+    
+  }
 
 
 void VhdlParser::inout_stat() {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IN_T:{
-      if (!hasError) {
+    case IN_T:{if (!hasError) {
+      
       jj_consume_token(IN_T);
       }
+      
       break;
       }
-    case OUT_T:{
-      if (!hasError) {
+    case OUT_T:{if (!hasError) {
+      
       jj_consume_token(OUT_T);
       }
+      
       break;
       }
     default:
@@ -10704,27 +12510,31 @@ void VhdlParser::inout_stat() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-void VhdlParser::else_stat() {
-    if (!hasError) {
-    while (!hasError) {
-      if (!hasError) {
+void VhdlParser::else_stat() {if (!hasError) {
+    
+    while (!hasError) {if (!hasError) {
+      
       jj_consume_token(ELSE_T);
       }
       if (!hasError) {
+      
       expression();
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case WHEN_T:{
-        if (!hasError) {
+      case WHEN_T:{if (!hasError) {
+        
         jj_consume_token(WHEN_T);
         }
         if (!hasError) {
+        
         expression();
         }
+        
         break;
         }
       default:
@@ -10732,6 +12542,7 @@ void VhdlParser::else_stat() {
         ;
       }
       }
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ELSE_T:{
         ;
@@ -10744,29 +12555,34 @@ void VhdlParser::else_stat() {
     }
     end_label_57: ;
     }
-}
+    
+  }
 
 
 QCString VhdlParser::interface_subprogram_declaration() {QCString s;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PROCEDURE_T:{
-      if (!hasError) {
+    case PROCEDURE_T:{if (!hasError) {
+      
       s = iproc();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     case FUNCTION_T:
     case IMPURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       s = ifunc();
       }
       if (!hasError) {
+      
 return s;
       }
+      
       break;
       }
     default:
@@ -10775,41 +12591,46 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::iproc() {QCString s,s1;
-    if (!hasError) {
+QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) {
+    
     jj_consume_token(PROCEDURE_T);
     }
     if (!hasError) {
+    
     s = identifier();
     }
     if (!hasError) {
+    
     s1 = param();
     }
+    
 current->name=s;
   return "procedure "+s+s1;
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;
-    if (!hasError) {
+QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IMPURE_T:
     case PURE_T:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PURE_T:{
-        if (!hasError) {
+      case PURE_T:{if (!hasError) {
+        
         t = jj_consume_token(PURE_T);
         }
+        
         break;
         }
-      case IMPURE_T:{
-        if (!hasError) {
+      case IMPURE_T:{if (!hasError) {
+        
         t = jj_consume_token(IMPURE_T);
         }
+        
         break;
         }
       default:
@@ -10825,39 +12646,48 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
     }
     }
     if (!hasError) {
+    
     jj_consume_token(FUNCTION_T);
     }
     if (!hasError) {
+    
     s = name();
     }
     if (!hasError) {
+    
     s1 = param();
     }
     if (!hasError) {
+    
     jj_consume_token(RETURN_T);
     }
     if (!hasError) {
+    
     s2 = name();
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IS_T:{
-      if (!hasError) {
+    case IS_T:{if (!hasError) {
+      
       t1 = jj_consume_token(IS_T);
       }
       if (!hasError) {
+      
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASIC_IDENTIFIER:
-      case EXTENDED_CHARACTER:{
-        if (!hasError) {
+      case EXTENDED_CHARACTER:{if (!hasError) {
+        
         s3 = identifier();
         }
+        
         break;
         }
-      case BOX_T:{
-        if (!hasError) {
+      case BOX_T:{if (!hasError) {
+        
         t2 = jj_consume_token(BOX_T);
         }
+        
         break;
         }
       default:
@@ -10866,6 +12696,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
       }
+      
       break;
       }
     default:
@@ -10873,6 +12704,7 @@ QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *
       ;
     }
     }
+    
 QCString q;
       if(t) q=t->image.data();
       if(t2) s3="<>";
@@ -10892,16 +12724,17 @@ QCString q;
                     }
          currP=0;return "";
 assert(false);
-}
+  }
 
 
-QCString VhdlParser::param() {QCString s,s1;Token *tok=0;
-    if (!hasError) {
+QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case PARAMETER_T:{
-      if (!hasError) {
+    case PARAMETER_T:{if (!hasError) {
+      
       tok = jj_consume_token(PARAMETER_T);
       }
+      
       break;
       }
     default:
@@ -10910,20 +12743,25 @@ QCString VhdlParser::param() {QCString s,s1;Token *tok=0;
     }
     }
     if (!hasError) {
+    
 param_sec=PARAM_SEC;
     }
     if (!hasError) {
+    
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LPAREN_T:{
-      if (!hasError) {
+    case LPAREN_T:{if (!hasError) {
+      
       jj_consume_token(LPAREN_T);
       }
       if (!hasError) {
+      
       s1 = interface_list();
       }
       if (!hasError) {
+      
       jj_consume_token(RPAREN_T);
       }
+      
       break;
       }
     default:
@@ -10931,6 +12769,7 @@ param_sec=PARAM_SEC;
       ;
     }
     }
+    
 if(tok)
                      {
                       s = tok->image.data();
@@ -10939,7 +12778,7 @@ if(tok)
                       param_sec=0;
                       return s+"("+s1+")";
 assert(false);
-}
+  }
 
 
 void VhdlParser::parseInline() {
@@ -10947,19 +12786,21 @@ void VhdlParser::parseInline() {
     case POSTPONED_T:
     case PROCESS_T:
     case BASIC_IDENTIFIER:
-    case EXTENDED_CHARACTER:{
-      if (!hasError) {
+    case EXTENDED_CHARACTER:{if (!hasError) {
+      
       process_statement();
       }
+      
       break;
       }
     case FUNCTION_T:
     case IMPURE_T:
     case PROCEDURE_T:
-    case PURE_T:{
-      if (!hasError) {
+    case PURE_T:{if (!hasError) {
+      
       subprogram_declaration();
       }
+      
       break;
       }
     default:
@@ -10967,71 +12808,65 @@ void VhdlParser::parseInline() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-}
+  }
 
 
-  VhdlParser::VhdlParser(TokenManager *tokenManager){
-    head = nullptr;
-    ReInit(tokenManager);
+ VhdlParser::VhdlParser(TokenManager *tm){
+    head = NULL;
+    ReInit(tm);
 }
-VhdlParser::~VhdlParser()
+   VhdlParser::~VhdlParser()
 {
-  clear();
+  if (token_source) delete token_source;
+  if (head) {
+    Token *next, *t = head;
+    while (t) {
+      next = t->next;
+      delete t;
+      t = next;
+    }
+  }
+  if (errorHandlerCreated) {
+    delete errorHandler;
+  }
 }
 
-void VhdlParser::ReInit(TokenManager* tokenManager){
-    clear();
+void VhdlParser::ReInit(TokenManager *tm){
+    if (head) delete head;
     errorHandler = new ErrorHandler();
+    errorHandlerCreated = true;
     hasError = false;
-    token_source = tokenManager;
+    token_source = tm;
     head = token = new Token();
     token->kind = 0;
-    token->next = nullptr;
+    token->next = NULL;
     jj_lookingAhead = false;
     jj_rescan = false;
     jj_done = false;
-    jj_scanpos = jj_lastpos = nullptr;
+    jj_scanpos = jj_lastpos = NULL;
     jj_gc = 0;
     jj_kind = -1;
-    indent = 0;
-    trace = false;
+    trace_indent = 0;
+    trace_enabled = false;
     jj_ntk = -1;
     jj_gen = 0;
     for (int i = 0; i < 293; i++) jj_la1[i] = -1;
   }
 
 
-void VhdlParser::clear(){
-  //Since token manager was generate from outside,
-  //parser should not take care of deleting
-  //if (token_source) delete token_source;
-  if (head) {
-    Token *next, *t = head;
-    while (t) {
-      next = t->next;
-      delete t;
-      t = next;
-    }
-  }
-  if (errorHandler) {
-    delete errorHandler, errorHandler = nullptr;
-  }
-}
-
-
 Token * VhdlParser::jj_consume_token(int kind)  {
     Token *oldToken;
-    if ((oldToken = token)->next != nullptr) token = token->next;
+    if ((oldToken = token)->next != NULL) token = token->next;
     else token = token->next = token_source->getNextToken();
     jj_ntk = -1;
     if (token->kind == kind) {
       jj_gen++;
       if (++jj_gc > 100) {
         jj_gc = 0;
-        for (int i = 0; i < 115; i++) {
+        for (int i = 0; i < 116; i++) {
           JJCalls *c = &jj_2_rtns[i];
-          while (c != nullptr) {
-            if (c->gen < jj_gen) c->first = nullptr;
+          while (c != NULL) {
+            if (c->gen < jj_gen) c->first = NULL;
             c = c->next;
           }
         }
@@ -11040,9 +12875,8 @@ Token * VhdlParser::jj_consume_token(int kind)  {
     }
     token = oldToken;
     jj_kind = kind;
-    JJString image = kind >= 0 ? tokenImage[kind] : tokenImage[0];
-    errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this);
-    hasError = true;
+    JAVACC_STRING_TYPE image = kind >= 0 ? tokenImage[kind] : tokenImage[0];
+    errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this), hasError = true;
     return token;
   }
 
@@ -11050,7 +12884,7 @@ Token * VhdlParser::jj_consume_token(int kind)  {
 bool  VhdlParser::jj_scan_token(int kind){
     if (jj_scanpos == jj_lastpos) {
       jj_la--;
-      if (jj_scanpos->next == nullptr) {
+      if (jj_scanpos->next == NULL) {
         jj_lastpos = jj_scanpos = jj_scanpos->next = token_source->getNextToken();
       } else {
         jj_lastpos = jj_scanpos = jj_scanpos->next;
@@ -11060,8 +12894,8 @@ bool  VhdlParser::jj_scan_token(int kind){
     }
     if (jj_rescan) {
       int i = 0; Token *tok = token;
-      while (tok != nullptr && tok != jj_scanpos) { i++; tok = tok->next; }
-      if (tok != nullptr) jj_add_error_token(kind, i);
+      while (tok != NULL && tok != jj_scanpos) { i++; tok = tok->next; }
+      if (tok != NULL) jj_add_error_token(kind, i);
     }
     if (jj_scanpos->kind != kind) return true;
     if (jj_la == 0 && jj_scanpos == jj_lastpos) { return jj_done = true; }
@@ -11072,7 +12906,7 @@ bool  VhdlParser::jj_scan_token(int kind){
 /** Get the next Token. */
 
 Token * VhdlParser::getNextToken(){
-    if (token->next != nullptr) token = token->next;
+    if (token->next != NULL) token = token->next;
     else token = token->next = token_source->getNextToken();
     jj_ntk = -1;
     jj_gen++;
@@ -11084,7 +12918,7 @@ Token * VhdlParser::getNextToken(){
 Token * VhdlParser::getToken(int index){
     Token *t = token;
     for (int i = 0; i < index; i++) {
-      if (t->next != nullptr) t = t->next;
+      if (t->next != NULL) t = t->next;
       else t = t->next = token_source->getNextToken();
     }
     return t;
@@ -11092,37 +12926,35 @@ Token * VhdlParser::getToken(int index){
 
 
 int VhdlParser::jj_ntk_f(){
-    if ((jj_nt=token->next) == nullptr)
+    if ((jj_nt=token->next) == NULL)
       return (jj_ntk = (token->next=token_source->getNextToken())->kind);
     else
       return (jj_ntk = jj_nt->kind);
   }
 
 
-  void VhdlParser::jj_add_error_token(int kind, int pos)  {
+void VhdlParser::jj_add_error_token(int kind, int pos)  {
   }
 
+  /** Generate ParseException. */
 
  void  VhdlParser::parseError()   {
       fprintf(stderr, "Parse error at: %d:%d, after token: %s encountered: %s\n", token->beginLine, token->beginColumn, addUnicodeEscapes(token->image).c_str(), addUnicodeEscapes(getToken(1)->image).c_str());
    }
 
 
-  bool VhdlParser::trace_enabled()  {
-    return trace;
+ void VhdlParser::enable_tracing()  {
   }
 
+  /** Disable tracing. */
 
-  void VhdlParser::enable_tracing()  {
-  }
-
-  void VhdlParser::disable_tracing()  {
+ void VhdlParser::disable_tracing()  {
   }
 
 
-  void VhdlParser::jj_rescan_token(){
+void VhdlParser::jj_rescan_token(){
     jj_rescan = true;
-    for (int i = 0; i < 115; i++) {
+    for (int i = 0; i < 116; i++) {
       JJCalls *p = &jj_2_rtns[i];
       do {
         if (p->gen > jj_gen) {
@@ -11243,19 +13075,20 @@ int VhdlParser::jj_ntk_f(){
             case 112: jj_3_113(); break;
             case 113: jj_3_114(); break;
             case 114: jj_3_115(); break;
+            case 115: jj_3_116(); break;
           }
         }
         p = p->next;
-      } while (p != nullptr);
+      } while (p != NULL);
     }
     jj_rescan = false;
   }
 
 
-  void VhdlParser::jj_save(int index, int xla){
+void VhdlParser::jj_save(int index, int xla){
     JJCalls *p = &jj_2_rtns[index];
     while (p->gen > jj_gen) {
-      if (p->next == nullptr) { p = p->next = new JJCalls(); break; }
+      if (p->next == NULL) { p = p->next = new JJCalls(); break; }
       p = p->next;
     }
     p->gen = jj_gen + xla - jj_la; p->first = token; p->arg = xla;
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index b88f156..fffac50 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -4,305 +4,585 @@
 #include "CharStream.h"
 #include "Token.h"
 #include "TokenManager.h"
+#include "VhdlParserTokenManager.h"
 #include "vhdljjparser.h"
+
 #include "VhdlParserConstants.h"
 #include "ErrorHandler.h"
 namespace vhdl {
 namespace parser {
   struct JJCalls {
-    int        gen;
-    int        arg;
-    JJCalls*   next;
-    Token*     first;
+    int gen;
+    Token *first;
+    int arg;
+    JJCalls *next;
     ~JJCalls() { if (next) delete next; }
-     JJCalls() { next = nullptr; arg = 0; gen = -1; first = nullptr; }
+    JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
   };
 
 class VhdlParser {
-public:
+   public:
+
 QCString abstract_literal();
+
 QCString access_type_definition();
+
 QCString actual_designator();
+
 QCString actual_parameter_part();
+
 QCString actual_part();
+
 QCString adding_operator();
+
 QCString aggregate();
+
 QCString alias_declaration();
+
 QCString alias_designator();
+
 void allocator();
+
 void architecture_body();
+
 void architecture_declarative_part();
+
 void architecture_statement_part();
+
 QCString array_type_definition();
+
 QCString assertion();
+
 QCString assertion_statement();
+
 QCString association_element();
+
 QCString association_list();
+
 QCString attribute_declaration();
+
 QCString attribute_designator();
+
 QCString attribute_name();
+
 QCString attribute_specification();
+
 QCString base();
+
 QCString base_specifier();
+
 QCString base_unit_declaration();
+
 QCString based_integer();
+
 QCString based_literal();
+
 QCString basic_identifier();
+
 void binding_indication();
+
 QCString bit_string_literal();
+
 QCString bit_value();
+
 void block_configuration();
+
 void block_declarative_item();
+
 void block_declarative_part();
+
 void block_header();
+
 void block_specification();
+
 void block_statement();
+
 void block_statement_part();
+
 void case_statement();
+
 void case_statement_alternative();
+
 QCString character_literal();
+
 QCString choice();
+
 QCString choices();
+
 void component_configuration();
+
 void component_declaration();
+
 void component_instantiation_statement();
+
 void component_specification();
+
 QCString composite_type_definition();
+
 void concurrent_assertion_statement();
+
 void concurrent_procedure_call_statement();
+
 void concurrent_signal_assignment_statement();
+
 void concurrent_statement();
+
 QCString condition();
+
 QCString condition_clause();
+
 void conditional_signal_assignment();
+
 void conditional_waveforms();
+
 void configuration_declaration();
+
 void configuration_declarative_item();
+
 void configuration_declarative_part();
+
 void configuration_item();
+
 void configuration_specification();
+
 QCString constant_declaration();
+
 QCString constraint_array_definition();
+
 void context_clause();
+
 QCString constraint();
+
 void context_item();
+
 QCString decimal_literal();
+
 QCString delay_mechanism();
+
 void design_file();
+
 void design_unit();
+
 QCString designator();
+
 QCString direction();
+
 void disconnection_specification();
+
 void guarded_signal_specificatio();
+
 QCString discrete_range();
+
 QCString element_association();
+
 QCString element_declaration();
+
 QCString entity_aspect();
+
 QCString entity_class();
+
 QCString entity_class_entry();
+
 QCString entity_class_entry_list();
+
 void entity_declaration();
+
 void entity_declarative_item();
+
 void entity_declarative_part();
+
 QCString entity_designator();
+
 void entity_header();
+
 QCString entity_name_list();
+
 QCString entity_specification();
+
 void entity_statement();
+
 void entity_statement_part();
+
 QCString entity_tag();
+
 QCString enumeration_literal();
+
 QCString enumeration_type_definition();
+
 QCString exit_statement();
+
 QCString expression();
+
 QCString logop();
+
 QCString extended_identifier();
+
 QCString factor();
+
 QCString file_declaration();
+
 QCString file_logical_name();
+
 QCString file_open_information();
+
 QCString file_type_definition();
+
 QCString floating_type_definition();
+
 QCString formal_designator();
+
 QCString formal_parameter_list();
+
 QCString formal_part();
+
 QCString full_type_declaration();
+
 QCString function_call();
+
 void generate_statement();
+
 void generate_scheme();
+
 void generic_clause();
+
 QCString generic_list();
+
 void generic_map_aspect();
+
 QCString group_constituent();
+
 QCString group_constituent_list();
+
 QCString group_declaration();
+
 QCString group_template_declaration();
+
 void guarded_signal_specification();
+
 QCString identifier();
+
 QCString identifier_list();
+
 void if_statement();
+
 QCString incomplete_type_declaration();
+
 QCString index_constraint();
+
 QCString index_specification();
+
 QCString index_subtype_definition();
+
 QCString instantiation_unit();
+
 QCString instantiation_list();
+
 QCString integer();
+
 QCString integer_type_definition();
+
 QCString interface_declaration();
+
 QCString interface_element();
+
 QCString interface_file_declaration();
+
 QCString interface_list();
+
 QCString interface_variable_declaration();
+
 QCString iteration_scheme();
+
 QCString label();
+
 QCString library_clause();
+
 QCString library_unit();
+
 QCString literal();
+
 QCString logical_operator();
+
 QCString loop_statement();
+
 QCString miscellaneous_operator();
+
 QCString mode();
+
 QCString multiplying_operation();
+
 QCString name();
+
 QCString name_ext1();
+
 QCString name_ext();
+
 QCString test_att_name();
+
 QCString indexed_name();
+
 QCString next_statement();
+
 QCString null_statement();
+
 QCString numeric_literal();
+
 QCString object_class();
+
 QCString operator_symbol();
+
 void options();
+
 void package_body();
+
 void package_body_declarative_item();
+
 void package_body_declarative_part();
+
 void package_declaration();
+
 void geninter();
+
 void package_declarative_item();
+
 void package_declarative_part();
+
 QCString parameter_specification();
+
 QCString physical_literal();
+
 QCString physical_type_definition();
+
 void port_clause();
+
 QCString port_list();
+
 void port_map_aspect();
+
 QCString primary();
+
 void primary_unit();
+
 QCString procedure_call();
+
 QCString procedure_call_statement();
+
 QCString process_declarative_item();
+
 QCString process_declarative_part();
+
 void process_statement();
+
 void process_statement_part();
+
 QCString qualified_expression();
+
 QCString range();
+
 QCString range_constraint();
+
 void record_type_definition();
+
 QCString relation();
+
 QCString relation_operator();
+
 QCString report_statement();
+
 QCString return_statement();
+
 QCString scalar_type_definition();
+
 void secondary_unit();
+
 QCString secondary_unit_declaration();
+
 QCString selected_name();
+
 void selected_signal_assignment();
+
 void selected_waveforms();
+
 QCString sensitivity_clause();
+
 QCString sensitivity_list();
+
 QCString sequence_of_statement();
+
 QCString sequential_statement();
+
 QCString shift_expression();
+
 QCString shift_operator();
+
 QCString sign();
+
 QCString signal_assignment_statement();
+
 void semi();
+
 void signal_declaration();
+
 QCString signal_kind();
+
 QCString signal_list();
+
 QCString signature();
+
 QCString simple_expression();
+
 void simple_name();
+
 QCString slice_name();
+
 QCString string_literal();
+
 void subprogram_body();
+
 void subprogram_declaration();
+
 void subprogram_1();
+
 QCString subprogram_declarative_item();
+
 QCString subprogram_declarative_part();
+
 void subprogram_kind();
+
 void subprogram_specification();
+
 void subprogram_statement_part();
+
 QCString subtype_declaration();
+
 QCString subtype_indication();
+
 QCString suffix();
+
 QCString target();
+
 QCString term();
+
 QCString timeout_clause();
+
 QCString type_conversion();
+
 QCString type_declaration();
+
 QCString type_definition();
+
 QCString type_mark();
+
 QCString unconstraint_array_definition();
+
 QCString use_clause();
+
 QCString variable_assignment_statement();
+
 QCString variable_declaration();
+
 QCString wait_statement();
+
 QCString waveform();
+
 QCString waveform_element();
+
 QCString protected_type_body();
+
 void protected_type_body_declarative_item();
+
 void protected_type_body_declarative_part();
+
 QCString protected_type_declaration();
+
 void protected_type_declarative_item();
+
 void protected_type_declarative_part();
+
 QCString context_ref();
+
 void context_declaration();
+
 QCString libustcont_stats();
+
 void package_instantiation_declaration();
+
 QCString interface_package_declaration();
+
 QCString subprogram_instantiation_declaration();
+
 void gen_assoc_list();
+
 void gen_interface_list();
+
 void case_scheme();
+
 void when_stats();
+
 void ttend();
+
 void generate_statement_body();
+
 void generate_statement_body1();
+
 QCString external_name();
+
 QCString sig_stat();
+
 QCString external_pathname();
+
 QCString absolute_pathname();
+
 QCString relative_pathname();
+
 QCString neg_list();
+
 QCString pathname_element();
+
 QCString pathname_element_list();
+
 QCString package_path_name();
+
 void conditional_signal_assignment_wave();
+
 void conditional_waveform_assignment();
+
 void else_wave_list();
+
 void conditional_force_assignment();
+
 void selected_signal_assignment_wave();
+
 void selected_variable_assignment();
+
 void select_name();
+
 void selected_waveform_assignment();
+
 void selected_force_assignment();
+
 void sel_var_list();
+
 void sel_wave_list();
+
 void inout_stat();
+
 void else_stat();
+
 QCString interface_subprogram_declaration();
+
 QCString iproc();
+
 QCString ifunc();
+
 QCString param();
+
 void parseInline();
  inline bool jj_2_1(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_1() || jj_done);
+    return !jj_3_1() || jj_done;
  { jj_save(0, xla); }
   }
 
@@ -310,7 +590,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_2() || jj_done);
+    return !jj_3_2() || jj_done;
  { jj_save(1, xla); }
   }
 
@@ -318,7 +598,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_3() || jj_done);
+    return !jj_3_3() || jj_done;
  { jj_save(2, xla); }
   }
 
@@ -326,7 +606,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_4() || jj_done);
+    return !jj_3_4() || jj_done;
  { jj_save(3, xla); }
   }
 
@@ -334,7 +614,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_5() || jj_done);
+    return !jj_3_5() || jj_done;
  { jj_save(4, xla); }
   }
 
@@ -342,7 +622,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_6() || jj_done);
+    return !jj_3_6() || jj_done;
  { jj_save(5, xla); }
   }
 
@@ -350,7 +630,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_7() || jj_done);
+    return !jj_3_7() || jj_done;
  { jj_save(6, xla); }
   }
 
@@ -358,7 +638,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_8() || jj_done);
+    return !jj_3_8() || jj_done;
  { jj_save(7, xla); }
   }
 
@@ -366,7 +646,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_9() || jj_done);
+    return !jj_3_9() || jj_done;
  { jj_save(8, xla); }
   }
 
@@ -374,7 +654,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_10() || jj_done);
+    return !jj_3_10() || jj_done;
  { jj_save(9, xla); }
   }
 
@@ -382,7 +662,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_11() || jj_done);
+    return !jj_3_11() || jj_done;
  { jj_save(10, xla); }
   }
 
@@ -390,7 +670,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_12() || jj_done);
+    return !jj_3_12() || jj_done;
  { jj_save(11, xla); }
   }
 
@@ -398,7 +678,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_13() || jj_done);
+    return !jj_3_13() || jj_done;
  { jj_save(12, xla); }
   }
 
@@ -406,7 +686,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_14() || jj_done);
+    return !jj_3_14() || jj_done;
  { jj_save(13, xla); }
   }
 
@@ -414,7 +694,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_15() || jj_done);
+    return !jj_3_15() || jj_done;
  { jj_save(14, xla); }
   }
 
@@ -422,7 +702,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_16() || jj_done);
+    return !jj_3_16() || jj_done;
  { jj_save(15, xla); }
   }
 
@@ -430,7 +710,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_17() || jj_done);
+    return !jj_3_17() || jj_done;
  { jj_save(16, xla); }
   }
 
@@ -438,7 +718,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_18() || jj_done);
+    return !jj_3_18() || jj_done;
  { jj_save(17, xla); }
   }
 
@@ -446,7 +726,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_19() || jj_done);
+    return !jj_3_19() || jj_done;
  { jj_save(18, xla); }
   }
 
@@ -454,7 +734,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_20() || jj_done);
+    return !jj_3_20() || jj_done;
  { jj_save(19, xla); }
   }
 
@@ -462,7 +742,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_21() || jj_done);
+    return !jj_3_21() || jj_done;
  { jj_save(20, xla); }
   }
 
@@ -470,7 +750,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_22() || jj_done);
+    return !jj_3_22() || jj_done;
  { jj_save(21, xla); }
   }
 
@@ -478,7 +758,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_23() || jj_done);
+    return !jj_3_23() || jj_done;
  { jj_save(22, xla); }
   }
 
@@ -486,7 +766,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_24() || jj_done);
+    return !jj_3_24() || jj_done;
  { jj_save(23, xla); }
   }
 
@@ -494,7 +774,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_25() || jj_done);
+    return !jj_3_25() || jj_done;
  { jj_save(24, xla); }
   }
 
@@ -502,7 +782,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_26() || jj_done);
+    return !jj_3_26() || jj_done;
  { jj_save(25, xla); }
   }
 
@@ -510,7 +790,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_27() || jj_done);
+    return !jj_3_27() || jj_done;
  { jj_save(26, xla); }
   }
 
@@ -518,7 +798,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_28() || jj_done);
+    return !jj_3_28() || jj_done;
  { jj_save(27, xla); }
   }
 
@@ -526,7 +806,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_29() || jj_done);
+    return !jj_3_29() || jj_done;
  { jj_save(28, xla); }
   }
 
@@ -534,7 +814,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_30() || jj_done);
+    return !jj_3_30() || jj_done;
  { jj_save(29, xla); }
   }
 
@@ -542,7 +822,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_31() || jj_done);
+    return !jj_3_31() || jj_done;
  { jj_save(30, xla); }
   }
 
@@ -550,7 +830,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_32() || jj_done);
+    return !jj_3_32() || jj_done;
  { jj_save(31, xla); }
   }
 
@@ -558,7 +838,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_33() || jj_done);
+    return !jj_3_33() || jj_done;
  { jj_save(32, xla); }
   }
 
@@ -566,7 +846,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_34() || jj_done);
+    return !jj_3_34() || jj_done;
  { jj_save(33, xla); }
   }
 
@@ -574,7 +854,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_35() || jj_done);
+    return !jj_3_35() || jj_done;
  { jj_save(34, xla); }
   }
 
@@ -582,7 +862,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_36() || jj_done);
+    return !jj_3_36() || jj_done;
  { jj_save(35, xla); }
   }
 
@@ -590,7 +870,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_37() || jj_done);
+    return !jj_3_37() || jj_done;
  { jj_save(36, xla); }
   }
 
@@ -598,7 +878,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_38() || jj_done);
+    return !jj_3_38() || jj_done;
  { jj_save(37, xla); }
   }
 
@@ -606,7 +886,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_39() || jj_done);
+    return !jj_3_39() || jj_done;
  { jj_save(38, xla); }
   }
 
@@ -614,7 +894,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_40() || jj_done);
+    return !jj_3_40() || jj_done;
  { jj_save(39, xla); }
   }
 
@@ -622,7 +902,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_41() || jj_done);
+    return !jj_3_41() || jj_done;
  { jj_save(40, xla); }
   }
 
@@ -630,7 +910,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_42() || jj_done);
+    return !jj_3_42() || jj_done;
  { jj_save(41, xla); }
   }
 
@@ -638,7 +918,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_43() || jj_done);
+    return !jj_3_43() || jj_done;
  { jj_save(42, xla); }
   }
 
@@ -646,7 +926,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_44() || jj_done);
+    return !jj_3_44() || jj_done;
  { jj_save(43, xla); }
   }
 
@@ -654,7 +934,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_45() || jj_done);
+    return !jj_3_45() || jj_done;
  { jj_save(44, xla); }
   }
 
@@ -662,7 +942,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_46() || jj_done);
+    return !jj_3_46() || jj_done;
  { jj_save(45, xla); }
   }
 
@@ -670,7 +950,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_47() || jj_done);
+    return !jj_3_47() || jj_done;
  { jj_save(46, xla); }
   }
 
@@ -678,7 +958,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_48() || jj_done);
+    return !jj_3_48() || jj_done;
  { jj_save(47, xla); }
   }
 
@@ -686,7 +966,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_49() || jj_done);
+    return !jj_3_49() || jj_done;
  { jj_save(48, xla); }
   }
 
@@ -694,7 +974,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_50() || jj_done);
+    return !jj_3_50() || jj_done;
  { jj_save(49, xla); }
   }
 
@@ -702,7 +982,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_51() || jj_done);
+    return !jj_3_51() || jj_done;
  { jj_save(50, xla); }
   }
 
@@ -710,7 +990,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_52() || jj_done);
+    return !jj_3_52() || jj_done;
  { jj_save(51, xla); }
   }
 
@@ -718,7 +998,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_53() || jj_done);
+    return !jj_3_53() || jj_done;
  { jj_save(52, xla); }
   }
 
@@ -726,7 +1006,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_54() || jj_done);
+    return !jj_3_54() || jj_done;
  { jj_save(53, xla); }
   }
 
@@ -734,7 +1014,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_55() || jj_done);
+    return !jj_3_55() || jj_done;
  { jj_save(54, xla); }
   }
 
@@ -742,7 +1022,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_56() || jj_done);
+    return !jj_3_56() || jj_done;
  { jj_save(55, xla); }
   }
 
@@ -750,7 +1030,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_57() || jj_done);
+    return !jj_3_57() || jj_done;
  { jj_save(56, xla); }
   }
 
@@ -758,7 +1038,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_58() || jj_done);
+    return !jj_3_58() || jj_done;
  { jj_save(57, xla); }
   }
 
@@ -766,7 +1046,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_59() || jj_done);
+    return !jj_3_59() || jj_done;
  { jj_save(58, xla); }
   }
 
@@ -774,7 +1054,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_60() || jj_done);
+    return !jj_3_60() || jj_done;
  { jj_save(59, xla); }
   }
 
@@ -782,7 +1062,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_61() || jj_done);
+    return !jj_3_61() || jj_done;
  { jj_save(60, xla); }
   }
 
@@ -790,7 +1070,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_62() || jj_done);
+    return !jj_3_62() || jj_done;
  { jj_save(61, xla); }
   }
 
@@ -798,7 +1078,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_63() || jj_done);
+    return !jj_3_63() || jj_done;
  { jj_save(62, xla); }
   }
 
@@ -806,7 +1086,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_64() || jj_done);
+    return !jj_3_64() || jj_done;
  { jj_save(63, xla); }
   }
 
@@ -814,7 +1094,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_65() || jj_done);
+    return !jj_3_65() || jj_done;
  { jj_save(64, xla); }
   }
 
@@ -822,7 +1102,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_66() || jj_done);
+    return !jj_3_66() || jj_done;
  { jj_save(65, xla); }
   }
 
@@ -830,7 +1110,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_67() || jj_done);
+    return !jj_3_67() || jj_done;
  { jj_save(66, xla); }
   }
 
@@ -838,7 +1118,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_68() || jj_done);
+    return !jj_3_68() || jj_done;
  { jj_save(67, xla); }
   }
 
@@ -846,7 +1126,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_69() || jj_done);
+    return !jj_3_69() || jj_done;
  { jj_save(68, xla); }
   }
 
@@ -854,7 +1134,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_70() || jj_done);
+    return !jj_3_70() || jj_done;
  { jj_save(69, xla); }
   }
 
@@ -862,7 +1142,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_71() || jj_done);
+    return !jj_3_71() || jj_done;
  { jj_save(70, xla); }
   }
 
@@ -870,7 +1150,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_72() || jj_done);
+    return !jj_3_72() || jj_done;
  { jj_save(71, xla); }
   }
 
@@ -878,7 +1158,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_73() || jj_done);
+    return !jj_3_73() || jj_done;
  { jj_save(72, xla); }
   }
 
@@ -886,7 +1166,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_74() || jj_done);
+    return !jj_3_74() || jj_done;
  { jj_save(73, xla); }
   }
 
@@ -894,7 +1174,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_75() || jj_done);
+    return !jj_3_75() || jj_done;
  { jj_save(74, xla); }
   }
 
@@ -902,7 +1182,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_76() || jj_done);
+    return !jj_3_76() || jj_done;
  { jj_save(75, xla); }
   }
 
@@ -910,7 +1190,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_77() || jj_done);
+    return !jj_3_77() || jj_done;
  { jj_save(76, xla); }
   }
 
@@ -918,7 +1198,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_78() || jj_done);
+    return !jj_3_78() || jj_done;
  { jj_save(77, xla); }
   }
 
@@ -926,7 +1206,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_79() || jj_done);
+    return !jj_3_79() || jj_done;
  { jj_save(78, xla); }
   }
 
@@ -934,7 +1214,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_80() || jj_done);
+    return !jj_3_80() || jj_done;
  { jj_save(79, xla); }
   }
 
@@ -942,7 +1222,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_81() || jj_done);
+    return !jj_3_81() || jj_done;
  { jj_save(80, xla); }
   }
 
@@ -950,7 +1230,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_82() || jj_done);
+    return !jj_3_82() || jj_done;
  { jj_save(81, xla); }
   }
 
@@ -958,7 +1238,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_83() || jj_done);
+    return !jj_3_83() || jj_done;
  { jj_save(82, xla); }
   }
 
@@ -966,7 +1246,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_84() || jj_done);
+    return !jj_3_84() || jj_done;
  { jj_save(83, xla); }
   }
 
@@ -974,7 +1254,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_85() || jj_done);
+    return !jj_3_85() || jj_done;
  { jj_save(84, xla); }
   }
 
@@ -982,7 +1262,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_86() || jj_done);
+    return !jj_3_86() || jj_done;
  { jj_save(85, xla); }
   }
 
@@ -990,7 +1270,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_87() || jj_done);
+    return !jj_3_87() || jj_done;
  { jj_save(86, xla); }
   }
 
@@ -998,7 +1278,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_88() || jj_done);
+    return !jj_3_88() || jj_done;
  { jj_save(87, xla); }
   }
 
@@ -1006,7 +1286,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_89() || jj_done);
+    return !jj_3_89() || jj_done;
  { jj_save(88, xla); }
   }
 
@@ -1014,7 +1294,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_90() || jj_done);
+    return !jj_3_90() || jj_done;
  { jj_save(89, xla); }
   }
 
@@ -1022,7 +1302,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_91() || jj_done);
+    return !jj_3_91() || jj_done;
  { jj_save(90, xla); }
   }
 
@@ -1030,7 +1310,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_92() || jj_done);
+    return !jj_3_92() || jj_done;
  { jj_save(91, xla); }
   }
 
@@ -1038,7 +1318,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_93() || jj_done);
+    return !jj_3_93() || jj_done;
  { jj_save(92, xla); }
   }
 
@@ -1046,7 +1326,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_94() || jj_done);
+    return !jj_3_94() || jj_done;
  { jj_save(93, xla); }
   }
 
@@ -1054,7 +1334,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_95() || jj_done);
+    return !jj_3_95() || jj_done;
  { jj_save(94, xla); }
   }
 
@@ -1062,7 +1342,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_96() || jj_done);
+    return !jj_3_96() || jj_done;
  { jj_save(95, xla); }
   }
 
@@ -1070,7 +1350,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_97() || jj_done);
+    return !jj_3_97() || jj_done;
  { jj_save(96, xla); }
   }
 
@@ -1078,7 +1358,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_98() || jj_done);
+    return !jj_3_98() || jj_done;
  { jj_save(97, xla); }
   }
 
@@ -1086,7 +1366,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_99() || jj_done);
+    return !jj_3_99() || jj_done;
  { jj_save(98, xla); }
   }
 
@@ -1094,7 +1374,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_100() || jj_done);
+    return !jj_3_100() || jj_done;
  { jj_save(99, xla); }
   }
 
@@ -1102,7 +1382,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_101() || jj_done);
+    return !jj_3_101() || jj_done;
  { jj_save(100, xla); }
   }
 
@@ -1110,7 +1390,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_102() || jj_done);
+    return !jj_3_102() || jj_done;
  { jj_save(101, xla); }
   }
 
@@ -1118,7 +1398,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_103() || jj_done);
+    return !jj_3_103() || jj_done;
  { jj_save(102, xla); }
   }
 
@@ -1126,7 +1406,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_104() || jj_done);
+    return !jj_3_104() || jj_done;
  { jj_save(103, xla); }
   }
 
@@ -1134,7 +1414,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_105() || jj_done);
+    return !jj_3_105() || jj_done;
  { jj_save(104, xla); }
   }
 
@@ -1142,7 +1422,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_106() || jj_done);
+    return !jj_3_106() || jj_done;
  { jj_save(105, xla); }
   }
 
@@ -1150,7 +1430,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_107() || jj_done);
+    return !jj_3_107() || jj_done;
  { jj_save(106, xla); }
   }
 
@@ -1158,7 +1438,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_108() || jj_done);
+    return !jj_3_108() || jj_done;
  { jj_save(107, xla); }
   }
 
@@ -1166,7 +1446,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_109() || jj_done);
+    return !jj_3_109() || jj_done;
  { jj_save(108, xla); }
   }
 
@@ -1174,7 +1454,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_110() || jj_done);
+    return !jj_3_110() || jj_done;
  { jj_save(109, xla); }
   }
 
@@ -1182,7 +1462,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_111() || jj_done);
+    return !jj_3_111() || jj_done;
  { jj_save(110, xla); }
   }
 
@@ -1190,7 +1470,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_112() || jj_done);
+    return !jj_3_112() || jj_done;
  { jj_save(111, xla); }
   }
 
@@ -1198,7 +1478,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_113() || jj_done);
+    return !jj_3_113() || jj_done;
  { jj_save(112, xla); }
   }
 
@@ -1206,7 +1486,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_114() || jj_done);
+    return !jj_3_114() || jj_done;
  { jj_save(113, xla); }
   }
 
@@ -1214,10 +1494,18 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return (!jj_3_115() || jj_done);
+    return !jj_3_115() || jj_done;
  { jj_save(114, xla); }
   }
 
+ inline bool jj_2_116(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    jj_done = false;
+    return !jj_3_116() || jj_done;
+ { jj_save(115, xla); }
+  }
+
  inline bool jj_3_43()
  {
     if (jj_done) return true;
@@ -1240,26 +1528,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_442()
+ inline bool jj_3R_443()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_407()) return true;
+    if (jj_3R_408()) return true;
     return false;
   }
 
- inline bool jj_3R_366()
+ inline bool jj_3R_367()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_441()) return false;
+    if (jj_3R_442()) {
     jj_scanpos = xsp;
-    if (jj_3R_442()) return true;
+    if (jj_3R_443()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_441()
+ inline bool jj_3R_442()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHILE_T)) return true;
@@ -1270,19 +1559,19 @@ void parseInline();
  inline bool jj_3R_197()
  {
     if (jj_done) return true;
-    if (jj_3R_345()) return true;
+    if (jj_3R_346()) return true;
     return false;
   }
 
- inline bool jj_3R_399()
+ inline bool jj_3R_400()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEMI_T)) return true;
-    if (jj_3R_398()) return true;
+    if (jj_3R_399()) return true;
     return false;
   }
 
- inline bool jj_3R_411()
+ inline bool jj_3R_412()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -1296,13 +1585,16 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(116)) return false;
+    if (jj_scan_token(116)) {
     jj_scanpos = xsp;
-    if (!jj_scan_token(100)) return false;
+    if (jj_scan_token(100)) {
     jj_scanpos = xsp;
-    if (!jj_scan_token(31)) return false;
+    if (jj_scan_token(31)) {
     jj_scanpos = xsp;
     if (jj_scan_token(101)) return true;
+    }
+    }
+    }
     return false;
   }
 
@@ -1324,14 +1616,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_312()
+ inline bool jj_3R_313()
  {
     if (jj_done) return true;
-    if (jj_3R_398()) return true;
+    if (jj_3R_399()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_399()) { jj_scanpos = xsp; break; }
+      if (jj_3R_400()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -1346,10 +1638,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_398()
+ inline bool jj_3R_399()
  {
     if (jj_done) return true;
-    if (jj_3R_489()) return true;
+    if (jj_3R_490()) return true;
     return false;
   }
 
@@ -1360,15 +1652,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_557()
+ inline bool jj_3R_558()
  {
     if (jj_done) return true;
-    if (jj_3R_612()) return true;
+    if (jj_3R_613()) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_556()
+ inline bool jj_3R_557()
  {
     if (jj_done) return true;
     if (jj_3R_92()) return true;
@@ -1389,7 +1681,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_555()
+ inline bool jj_3R_556()
  {
     if (jj_done) return true;
     if (jj_3R_107()) return true;
@@ -1403,22 +1695,27 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_489()
+ inline bool jj_3R_490()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3_39()) return false;
+    if (jj_3_39()) {
     jj_scanpos = xsp;
-    if (!jj_3R_555()) return false;
+    if (jj_3R_556()) {
     jj_scanpos = xsp;
-    if (!jj_3_40()) return false;
+    if (jj_3_40()) {
     jj_scanpos = xsp;
-    if (!jj_3_41()) return false;
+    if (jj_3_41()) {
     jj_scanpos = xsp;
-    if (!jj_3R_556()) return false;
+    if (jj_3R_557()) {
     jj_scanpos = xsp;
-    if (jj_3R_557()) return true;
+    if (jj_3R_558()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
@@ -1438,55 +1735,57 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_624()
+ inline bool jj_3R_625()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_414()
+ inline bool jj_3R_696()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_413()
+ inline bool jj_3R_415()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OTHER_T)) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_695()
+ inline bool jj_3R_414()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_330()
+ inline bool jj_3R_331()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_412()) return false;
+    if (jj_3R_413()) {
     jj_scanpos = xsp;
-    if (!jj_3R_413()) return false;
+    if (jj_3R_414()) {
     jj_scanpos = xsp;
-    if (jj_3R_414()) return true;
+    if (jj_3R_415()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_412()
+ inline bool jj_3R_413()
  {
     if (jj_done) return true;
     if (jj_3R_196()) return true;
     return false;
   }
 
- inline bool jj_3R_327()
+ inline bool jj_3R_328()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
@@ -1494,7 +1793,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_326()
+ inline bool jj_3R_327()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
@@ -1503,7 +1802,20 @@ void parseInline();
     if (jj_3_38()) jj_scanpos = xsp;
     if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_411()) jj_scanpos = xsp;
+    if (jj_3R_412()) jj_scanpos = xsp;
+    return false;
+  }
+
+ inline bool jj_3R_426()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(IS_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_696()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(145)) return true;
+    }
     return false;
   }
 
@@ -1512,11 +1824,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_325()) return false;
+    if (jj_3R_326()) {
     jj_scanpos = xsp;
-    if (!jj_3R_326()) return false;
+    if (jj_3R_327()) {
     jj_scanpos = xsp;
-    if (jj_3R_327()) return true;
+    if (jj_3R_328()) return true;
+    }
+    }
     return false;
   }
 
@@ -1527,7 +1841,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_325()
+ inline bool jj_3R_326()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -1537,18 +1851,6 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_425()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(IS_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_695()) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(145)) return true;
-    return false;
-  }
-
  inline bool jj_3R_154()
  {
     if (jj_done) return true;
@@ -1558,28 +1860,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_621()
+ inline bool jj_3R_622()
  {
     if (jj_done) return true;
     if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_620()
+ inline bool jj_3R_621()
  {
     if (jj_done) return true;
     if (jj_3R_67()) return true;
     return false;
   }
 
- inline bool jj_3R_564()
+ inline bool jj_3R_565()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_620()) return false;
+    if (jj_3R_621()) {
     jj_scanpos = xsp;
-    if (jj_3R_621()) return true;
+    if (jj_3R_622()) return true;
+    }
     return false;
   }
 
@@ -1597,7 +1900,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_531()
+ inline bool jj_3R_532()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
@@ -1606,42 +1909,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_623()
+ inline bool jj_3R_624()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_258()) return true;
+    if (jj_3R_259()) return true;
     return false;
   }
 
- inline bool jj_3R_622()
+ inline bool jj_3R_623()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSIF_T)) return true;
     if (jj_3R_79()) return true;
     if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_258()) return true;
+    if (jj_3R_259()) return true;
     return false;
   }
 
- inline bool jj_3R_344()
+ inline bool jj_3R_520()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_313()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_519()
+ inline bool jj_3R_345()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_312()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_254()
+ inline bool jj_3R_255()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -1654,21 +1957,21 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_254()) jj_scanpos = xsp;
+    if (jj_3R_255()) jj_scanpos = xsp;
     if (jj_scan_token(IF_T)) return true;
     if (jj_3R_79()) return true;
     if (jj_scan_token(THEN_T)) return true;
-    if (jj_3R_258()) return true;
+    if (jj_3R_259()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_622()) { jj_scanpos = xsp; break; }
+      if (jj_3R_623()) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_623()) jj_scanpos = xsp;
+    if (jj_3R_624()) jj_scanpos = xsp;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(IF_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_624()) jj_scanpos = xsp;
+    if (jj_3R_625()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -1680,34 +1983,34 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_344()) { jj_scanpos = xsp; break; }
+      if (jj_3R_345()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_423()
+ inline bool jj_3R_424()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(77)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_519()) jj_scanpos = xsp;
+    if (jj_3R_520()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_164()
+ inline bool jj_3_116()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BASIC_IDENTIFIER)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
     return false;
   }
 
- inline bool jj_3_115()
+ inline bool jj_3R_164()
  {
     if (jj_done) return true;
-    if (jj_3R_58()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_scan_token(BASIC_IDENTIFIER)) return true;
     return false;
   }
 
@@ -1723,21 +2026,22 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_163()) return false;
+    if (jj_3R_163()) {
     jj_scanpos = xsp;
     if (jj_3R_164()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_544()
+ inline bool jj_3R_545()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_543()) return true;
+    if (jj_3R_544()) return true;
     return false;
   }
 
- inline bool jj_3R_385()
+ inline bool jj_3R_386()
  {
     if (jj_done) return true;
     if (jj_3R_58()) return true;
@@ -1745,41 +2049,42 @@ void parseInline();
     if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(134)) return false;
+    if (jj_scan_token(134)) {
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_65()
+ inline bool jj_3R_446()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_473()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_529()) return true;
     return false;
   }
 
- inline bool jj_3R_445()
+ inline bool jj_3R_530()
  {
     if (jj_done) return true;
-    if (jj_3R_528()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_448()) return true;
     return false;
   }
 
- inline bool jj_3R_529()
+ inline bool jj_3R_65()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_447()) return true;
+    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_474()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_545()
+ inline bool jj_3R_546()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
@@ -1787,137 +2092,132 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_304()
- {
-    if (jj_done) return true;
-    if (jj_3R_383()) return true;
-    return false;
-  }
-
- inline bool jj_3R_382()
+ inline bool jj_3R_305()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_474()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_384()) return true;
     return false;
   }
 
- inline bool jj_3R_424()
+ inline bool jj_3R_425()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(84)) return false;
+    if (jj_scan_token(84)) {
     jj_scanpos = xsp;
     if (jj_scan_token(52)) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_343()
+ inline bool jj_3R_344()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_424()) jj_scanpos = xsp;
+    if (jj_3R_425()) jj_scanpos = xsp;
     if (jj_scan_token(FUNCTION_T)) return true;
     if (jj_3R_59()) return true;
-    if (jj_3R_423()) return true;
+    if (jj_3R_424()) return true;
     if (jj_scan_token(RETURN_T)) return true;
     if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_425()) jj_scanpos = xsp;
+    if (jj_3R_426()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_474()
+ inline bool jj_3R_383()
  {
     if (jj_done) return true;
-    if (jj_3R_543()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_544()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_475()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_607()
+ inline bool jj_3R_475()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_3R_544()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_545()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_303()
+ inline bool jj_3R_304()
  {
     if (jj_done) return true;
     if (jj_3R_58()) return true;
-    if (jj_3R_384()) return true;
+    if (jj_3R_385()) return true;
     return false;
   }
 
- inline bool jj_3R_342()
+ inline bool jj_3R_343()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
     if (jj_3R_69()) return true;
-    if (jj_3R_423()) return true;
+    if (jj_3R_424()) return true;
     return false;
   }
 
- inline bool jj_3R_606()
+ inline bool jj_3R_608()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_543()
+ inline bool jj_3R_607()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_606()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_607()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_70()
+ inline bool jj_3R_544()
  {
     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_165()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_607()) {
+    jj_scanpos = xsp;
+    if (jj_3R_608()) return true;
+    }
     return false;
   }
 
  inline bool jj_3R_194()
  {
     if (jj_done) return true;
-    if (jj_3R_343()) return true;
+    if (jj_3R_344()) return true;
     return false;
   }
 
- inline bool jj_3R_170()
+ inline bool jj_3R_70()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) 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_165()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
  inline bool jj_3R_193()
  {
     if (jj_done) return true;
-    if (jj_3R_342()) return true;
+    if (jj_3R_343()) return true;
     return false;
   }
 
@@ -1926,42 +2226,50 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_193()) return false;
+    if (jj_3R_193()) {
     jj_scanpos = xsp;
     if (jj_3R_194()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_158()
+ inline bool jj_3R_170()
  {
     if (jj_done) return true;
-    if (jj_3R_312()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_475()
+ inline bool jj_3R_476()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
     if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_545()) jj_scanpos = xsp;
+    if (jj_3R_546()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_384()
+ inline bool jj_3R_385()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_475()) return true;
+    if (jj_3R_476()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_475()) { jj_scanpos = xsp; break; }
+      if (jj_3R_476()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
+ inline bool jj_3R_158()
+ {
+    if (jj_done) return true;
+    if (jj_3R_313()) return true;
+    return false;
+  }
+
  inline bool jj_3R_66()
  {
     if (jj_done) return true;
@@ -1973,25 +2281,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_383()
+ inline bool jj_3R_384()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(53)) return false;
+    if (jj_scan_token(53)) {
     jj_scanpos = xsp;
     if (jj_scan_token(75)) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_446()
+ inline bool jj_3R_447()
  {
     if (jj_done) return true;
-    if (jj_3R_404()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3R_321()
+ inline bool jj_3R_322()
  {
     if (jj_done) return true;
     if (jj_scan_token(IF_T)) return true;
@@ -1999,83 +2308,68 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_168()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_320()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_321()) return true;
-    return false;
-  }
-
- inline bool jj_3R_320()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_407()) return true;
-    return false;
-  }
-
- inline bool jj_3R_447()
+ inline bool jj_3R_448()
  {
     if (jj_done) return true;
-    if (jj_3R_444()) return true;
+    if (jj_3R_445()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_85()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_529()) { jj_scanpos = xsp; break; }
+      if (jj_3R_530()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_305()
+ inline bool jj_3R_168()
  {
     if (jj_done) return true;
-    if (jj_3R_58()) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(134)) return false;
+    if (jj_3R_321()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(137)) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_385()) { jj_scanpos = xsp; break; }
+    if (jj_3R_322()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_74()
+ inline bool jj_3R_321()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_168()) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_169()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_scan_token(FOR_T)) return true;
+    if (jj_3R_408()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_306()
+ {
+    if (jj_done) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_85()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_170()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(134)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(137)) return true;
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_386()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_302()
+ inline bool jj_3R_303()
  {
     if (jj_done) return true;
-    if (jj_3R_383()) return true;
+    if (jj_3R_384()) return true;
     return false;
   }
 
- inline bool jj_3_111()
+ inline bool jj_3_112()
  {
     if (jj_done) return true;
     if (jj_3R_142()) return true;
@@ -2083,13 +2377,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_104()
+ inline bool jj_3R_74()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_225()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_168()) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_169()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_170()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
@@ -2106,19 +2407,29 @@ void parseInline();
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_scan_token(FORCE_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_304()) jj_scanpos = xsp;
-    if (jj_3R_305()) return true;
+    if (jj_3R_305()) jj_scanpos = xsp;
+    if (jj_3R_306()) return true;
     return false;
   }
 
- inline bool jj_3_114()
+ inline bool jj_3R_104()
+ {
+    if (jj_done) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_226()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3_115()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_368()
+ inline bool jj_3R_369()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -2130,12 +2441,12 @@ void parseInline();
     if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_446()) jj_scanpos = xsp;
-    if (jj_3R_447()) return true;
+    if (jj_3R_447()) jj_scanpos = xsp;
+    if (jj_3R_448()) return true;
     return false;
   }
 
- inline bool jj_3R_300()
+ inline bool jj_3R_301()
  {
     if (jj_done) return true;
     if (jj_3R_142()) return true;
@@ -2143,14 +2454,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_686()
+ inline bool jj_3R_687()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_574()
+ inline bool jj_3R_575()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
@@ -2158,39 +2469,33 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_685()
+ inline bool jj_3R_686()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_662()
+ inline bool jj_3R_663()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_685()) return false;
+    if (jj_3R_686()) {
     jj_scanpos = xsp;
-    if (jj_3R_686()) return true;
-    return false;
-  }
-
- inline bool jj_3R_462()
- {
-    if (jj_done) return true;
-    if (jj_3R_533()) return true;
+    if (jj_3R_687()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_113()
+ inline bool jj_3_114()
  {
     if (jj_done) return true;
     if (jj_3R_144()) return true;
     return false;
   }
 
- inline bool jj_3R_526()
+ inline bool jj_3R_527()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -2199,50 +2504,49 @@ void parseInline();
     Token * xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(155)) jj_scanpos = xsp;
-    if (jj_3R_662()) return true;
+    if (jj_3R_663()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
-    if (jj_3R_305()) return true;
+    if (jj_3R_306()) return true;
     return false;
   }
 
- inline bool jj_3R_443()
+ inline bool jj_3R_444()
  {
     if (jj_done) return true;
-    if (jj_3R_404()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3R_270()
+ inline bool jj_3R_463()
  {
     if (jj_done) return true;
-    if (jj_3R_368()) return true;
+    if (jj_3R_534()) return true;
     return false;
   }
 
- inline bool jj_3R_127()
+ inline bool jj_3R_271()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_269()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_270()) return true;
+    if (jj_3R_369()) return true;
     return false;
   }
 
- inline bool jj_3R_269()
+ inline bool jj_3R_127()
  {
     if (jj_done) return true;
-    if (jj_3R_144()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_270()) {
+    jj_scanpos = xsp;
+    if (jj_3R_271()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_156()
+ inline bool jj_3R_270()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_311()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_144()) return true;
     return false;
   }
 
@@ -2254,96 +2558,98 @@ void parseInline();
     if (jj_scan_token(FORCE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_302()) jj_scanpos = xsp;
+    if (jj_3R_303()) jj_scanpos = xsp;
     if (jj_3R_58()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_303()) jj_scanpos = xsp;
+    if (jj_3R_304()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_136()
+ inline bool jj_3R_156()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_576()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_312()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_528()
+ inline bool jj_3R_529()
  {
     if (jj_done) return true;
     if (jj_scan_token(ELSE_T)) return true;
     if (jj_3R_58()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_574()) jj_scanpos = xsp;
+    if (jj_3R_575()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_112()
+ inline bool jj_3_113()
  {
     if (jj_done) return true;
     if (jj_3R_143()) return true;
     return false;
   }
 
- inline bool jj_3R_323()
+ inline bool jj_3R_136()
  {
     if (jj_done) return true;
-    if (jj_3R_409()) return true;
+    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_577()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_63()
+ inline bool jj_3R_324()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_156()) jj_scanpos = xsp;
+    if (jj_3R_410()) return true;
     return false;
   }
 
- inline bool jj_3R_367()
+ inline bool jj_3R_368()
  {
     if (jj_done) return true;
     if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_443()) jj_scanpos = xsp;
-    if (jj_3R_444()) return true;
+    if (jj_3R_444()) jj_scanpos = xsp;
+    if (jj_3R_445()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_445()) jj_scanpos = xsp;
+    if (jj_3R_446()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_569()
+ inline bool jj_3R_63()
  {
     if (jj_done) return true;
-    if (jj_3R_312()) return true;
+    if (jj_3R_59()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_156()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_268()
+ inline bool jj_3R_269()
  {
     if (jj_done) return true;
-    if (jj_3R_367()) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
- inline bool jj_3R_397()
+ inline bool jj_3R_570()
  {
     if (jj_done) return true;
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
@@ -2352,31 +2658,40 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_267()) return false;
+    if (jj_3R_268()) {
     jj_scanpos = xsp;
-    if (jj_3R_268()) return true;
+    if (jj_3R_269()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_267()
+ inline bool jj_3R_268()
  {
     if (jj_done) return true;
     if (jj_3R_143()) return true;
     return false;
   }
 
- inline bool jj_3R_311()
+ inline bool jj_3R_398()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(INTEGER)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_312()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_396()) return false;
+    if (jj_3R_397()) {
     jj_scanpos = xsp;
-    if (jj_3R_397()) return true;
+    if (jj_3R_398()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_396()
+ inline bool jj_3R_397()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
@@ -2391,12 +2706,12 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_300()) { jj_scanpos = xsp; break; }
+      if (jj_3R_301()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_554()
+ inline bool jj_3R_555()
  {
     if (jj_done) return true;
     if (jj_scan_token(AT_T)) return true;
@@ -2404,7 +2719,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_301()
+ inline bool jj_3R_302()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -2413,14 +2728,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_110()
+ inline bool jj_3_111()
  {
     if (jj_done) return true;
     if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_656()
+ inline bool jj_3R_657()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
@@ -2429,29 +2744,29 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_579()
+ inline bool jj_3R_612()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
-    if (jj_3R_58()) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3R_611()
+ inline bool jj_3R_580()
  {
     if (jj_done) return true;
-    if (jj_3R_141()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_533()
+ inline bool jj_3R_534()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_579()) jj_scanpos = xsp;
+    if (jj_3R_580()) jj_scanpos = xsp;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_580()) return true;
+    if (jj_3R_581()) return true;
     return false;
   }
 
@@ -2461,65 +2776,73 @@ void parseInline();
     if (jj_3R_69()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_301()) jj_scanpos = xsp;
+    if (jj_3R_302()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_580()
+ inline bool jj_3R_640()
  {
     if (jj_done) return true;
-    if (jj_3R_58()) return true;
+    if (jj_scan_token(NEG_T)) return true;
+    if (jj_scan_token(DOT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_639()
+ inline bool jj_3R_581()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NEG_T)) return true;
-    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_610()
+ inline bool jj_3R_611()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_639()) return true;
+    if (jj_3R_640()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_639()) { jj_scanpos = xsp; break; }
+      if (jj_3R_640()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_448()
+ inline bool jj_3_110()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOUBLEMULT_T)) return true;
-    if (jj_3R_369()) return true;
+    if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_141()) return true;
     return false;
   }
 
- inline bool jj_3_109()
+ inline bool jj_3R_554()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_141()) return true;
+    if (jj_3R_611()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_612()) jj_scanpos = xsp;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_553()
+ inline bool jj_3R_449()
  {
     if (jj_done) return true;
-    if (jj_3R_610()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_611()) jj_scanpos = xsp;
+    if (jj_scan_token(DOUBLEMULT_T)) return true;
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_610()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(DOT_T)) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_375()
+ inline bool jj_3R_376()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
@@ -2528,12 +2851,12 @@ void parseInline();
     if (jj_3R_84()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_462()) jj_scanpos = xsp;
+    if (jj_3R_463()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_263()
+ inline bool jj_3R_264()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -2544,43 +2867,50 @@ void parseInline();
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
+    if (jj_3R_141()) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_283()
+ inline bool jj_3R_553()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_609()) {
+    jj_scanpos = xsp;
+    if (jj_3R_610()) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_284()
  {
     if (jj_done) return true;
     if (jj_scan_token(NOT_T)) return true;
-    if (jj_3R_369()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_282()
+ inline bool jj_3R_283()
  {
     if (jj_done) return true;
     if (jj_scan_token(ABS_T)) return true;
-    if (jj_3R_369()) return true;
+    if (jj_3R_370()) return true;
     return false;
   }
 
- inline bool jj_3R_608()
+ inline bool jj_3R_489()
  {
     if (jj_done) return true;
-    if (jj_scan_token(DOT_T)) return true;
-    if (jj_3R_141()) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_555()) return true;
     return false;
   }
 
- inline bool jj_3R_552()
+ inline bool jj_3R_488()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_608()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_609()) return true;
+    if (jj_3R_554()) return true;
     return false;
   }
 
@@ -2589,28 +2919,38 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_281()) return false;
+    if (jj_3R_282()) {
     jj_scanpos = xsp;
-    if (!jj_3R_282()) return false;
+    if (jj_3R_283()) {
     jj_scanpos = xsp;
-    if (jj_3R_283()) return true;
+    if (jj_3R_284()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_281()
+ inline bool jj_3R_282()
  {
     if (jj_done) return true;
-    if (jj_3R_369()) return true;
+    if (jj_3R_370()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_448()) jj_scanpos = xsp;
+    if (jj_3R_449()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_488()
+ inline bool jj_3R_396()
  {
     if (jj_done) return true;
-    if (jj_3R_554()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_487()) {
+    jj_scanpos = xsp;
+    if (jj_3R_488()) {
+    jj_scanpos = xsp;
+    if (jj_3R_489()) return true;
+    }
+    }
     return false;
   }
 
@@ -2621,155 +2961,154 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_395()
+ inline bool jj_3_107()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_486()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_487()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_488()) return true;
+    if (jj_3R_138()) return true;
     return false;
   }
 
- inline bool jj_3R_486()
+ inline bool jj_3R_697()
  {
     if (jj_done) return true;
-    if (jj_3R_552()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_96()) return true;
     return false;
   }
 
- inline bool jj_3R_696()
+ inline bool jj_3R_486()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_96()) return true;
+    if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
  inline bool jj_3R_146()
  {
     if (jj_done) return true;
-    if (jj_3R_308()) return true;
+    if (jj_3R_309()) return true;
     if (jj_3R_145()) return true;
     return false;
   }
 
- inline bool jj_3_106()
+ inline bool jj_3R_485()
  {
     if (jj_done) return true;
-    if (jj_3R_138()) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_393()
+ inline bool jj_3R_394()
  {
     if (jj_done) return true;
     if (jj_scan_token(OR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_392()
+ inline bool jj_3R_393()
  {
     if (jj_done) return true;
     if (jj_scan_token(XOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_485()
+ inline bool jj_3R_392()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARIABLE_T)) return true;
+    if (jj_scan_token(XNOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_391()
+ inline bool jj_3R_395()
  {
     if (jj_done) return true;
-    if (jj_scan_token(XNOR_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_484()) {
+    jj_scanpos = xsp;
+    if (jj_3R_485()) {
+    jj_scanpos = xsp;
+    if (jj_3R_486()) return true;
+    }
+    }
     return false;
   }
 
  inline bool jj_3R_484()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_390()
+ inline bool jj_3R_391()
  {
     if (jj_done) return true;
     if (jj_scan_token(NOR_T)) return true;
     return false;
   }
 
- inline bool jj_3R_389()
+ inline bool jj_3R_390()
  {
     if (jj_done) return true;
     if (jj_scan_token(NAND_T)) return true;
     return false;
   }
 
- inline bool jj_3R_394()
+ inline bool jj_3_109()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_483()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_484()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_485()) return true;
+    if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_483()
+ inline bool jj_3R_275()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_308()
+ inline bool jj_3R_309()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_388()) return false;
+    if (jj_3R_389()) {
     jj_scanpos = xsp;
-    if (!jj_3R_389()) return false;
+    if (jj_3R_390()) {
     jj_scanpos = xsp;
-    if (!jj_3R_390()) return false;
+    if (jj_3R_391()) {
     jj_scanpos = xsp;
-    if (!jj_3R_391()) return false;
+    if (jj_3R_392()) {
     jj_scanpos = xsp;
-    if (!jj_3R_392()) return false;
+    if (jj_3R_393()) {
     jj_scanpos = xsp;
-    if (jj_3R_393()) return true;
+    if (jj_3R_394()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_388()
+ inline bool jj_3R_389()
  {
     if (jj_done) return true;
     if (jj_scan_token(AND_T)) return true;
     return false;
   }
 
- inline bool jj_3_108()
- {
-    if (jj_done) return true;
-    if (jj_3R_140()) return true;
-    return false;
-  }
-
- inline bool jj_3R_274()
+ inline bool jj_3R_311()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_scan_token(SLSL_T)) return true;
+    if (jj_3R_395()) return true;
+    if (jj_3R_396()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_84()) return true;
+    if (jj_scan_token(RSRS_T)) return true;
     return false;
   }
 
@@ -2785,32 +3124,20 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_310()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(SLSL_T)) return true;
-    if (jj_3R_394()) return true;
-    if (jj_3R_395()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_84()) return true;
-    if (jj_scan_token(RSRS_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_408()
+ inline bool jj_3R_409()
  {
     if (jj_done) return true;
     if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_322()
+ inline bool jj_3R_323()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_408()) { jj_scanpos = xsp; break; }
+      if (jj_3R_409()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(BEGIN_T)) return true;
     return false;
@@ -2821,15 +3148,30 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_322()) jj_scanpos = xsp;
+    if (jj_3R_323()) jj_scanpos = xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_323()) { jj_scanpos = xsp; break; }
+      if (jj_3R_324()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_264()
+ inline bool jj_3R_285()
+ {
+    if (jj_done) return true;
+    if (jj_3R_69()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_662()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_662()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_265()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
@@ -2837,14 +3179,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_284()
+ inline bool jj_3R_235()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_262()
+ inline bool jj_3R_263()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -2852,11 +3194,11 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_661()
+ inline bool jj_3_108()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_661()) return true;
+    if (jj_3R_139()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
@@ -2865,32 +3207,28 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_262()) jj_scanpos = xsp;
-    if (jj_scan_token(EXIT_T)) return true;
-    xsp = jj_scanpos;
     if (jj_3R_263()) jj_scanpos = xsp;
+    if (jj_scan_token(EXIT_T)) return true;
     xsp = jj_scanpos;
     if (jj_3R_264()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_265()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_234()
- {
-    if (jj_done) return true;
-    if (jj_3R_132()) return true;
-    return false;
-  }
-
- inline bool jj_3_107()
+ inline bool jj_3R_138()
  {
     if (jj_done) return true;
-    if (jj_3R_139()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_scan_token(END_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_285()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_687()
+ inline bool jj_3R_688()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -2898,47 +3236,48 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_696()) { jj_scanpos = xsp; break; }
+      if (jj_3R_697()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_138()
+ inline bool jj_3R_641()
  {
     if (jj_done) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_284()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_132()) return true;
     return false;
   }
 
- inline bool jj_3R_640()
+ inline bool jj_3R_652()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_108()) jj_scanpos = xsp;
+    if (jj_3R_85()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_662()) return true;
     return false;
   }
 
  inline bool jj_3R_208()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_651()
+ inline bool jj_3R_619()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_107()) jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_661()) return true;
+    if (jj_3R_652()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_652()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -2954,56 +3293,46 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_207()) return false;
+    if (jj_3R_207()) {
     jj_scanpos = xsp;
     if (jj_3R_208()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_618()
+ inline bool jj_3R_695()
  {
     if (jj_done) return true;
-    Token * xsp;
-    if (jj_3R_651()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_651()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_694()
+ inline bool jj_3R_561()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_scan_token(CASE_T)) return true;
+    if (jj_3R_58()) return true;
+    if (jj_scan_token(GENERATE_T)) return true;
+    if (jj_3R_619()) return true;
     return false;
   }
 
- inline bool jj_3R_693()
+ inline bool jj_3R_694()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_683()
+ inline bool jj_3R_684()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_693()) return false;
+    if (jj_3R_694()) {
     jj_scanpos = xsp;
-    if (jj_3R_694()) return true;
-    return false;
-  }
-
- inline bool jj_3R_560()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(CASE_T)) return true;
-    if (jj_3R_58()) return true;
-    if (jj_scan_token(GENERATE_T)) return true;
-    if (jj_3R_618()) return true;
+    if (jj_3R_695()) return true;
+    }
     return false;
   }
 
@@ -3026,7 +3355,7 @@ void parseInline();
     if (jj_done) return true;
     if (jj_scan_token(GENERIC_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_312()) return true;
+    if (jj_3R_313()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -3042,65 +3371,67 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_469()
+ inline bool jj_3R_470()
  {
     if (jj_done) return true;
-    if (jj_3R_538()) return true;
-    if (jj_scan_token(COLON_T)) return true;
     if (jj_3R_539()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_540()) return true;
     return false;
   }
 
- inline bool jj_3R_684()
+ inline bool jj_3R_685()
  {
     if (jj_done) return true;
-    if (jj_3R_233()) return true;
+    if (jj_3R_234()) return true;
     return false;
   }
 
- inline bool jj_3R_584()
+ inline bool jj_3R_585()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_583()
+ inline bool jj_3R_584()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_637()
+ inline bool jj_3R_638()
  {
     if (jj_done) return true;
-    if (jj_3R_658()) return true;
+    if (jj_3R_659()) return true;
     return false;
   }
 
- inline bool jj_3R_582()
+ inline bool jj_3R_583()
  {
     if (jj_done) return true;
     Token * xsp;
-    if (jj_3R_637()) return true;
+    if (jj_3R_638()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_637()) { jj_scanpos = xsp; break; }
+      if (jj_3R_638()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_538()
+ inline bool jj_3R_539()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_582()) return false;
+    if (jj_3R_583()) {
     jj_scanpos = xsp;
-    if (!jj_3R_583()) return false;
+    if (jj_3R_584()) {
     jj_scanpos = xsp;
-    if (jj_3R_584()) return true;
+    if (jj_3R_585()) return true;
+    }
+    }
     return false;
   }
 
@@ -3112,35 +3443,35 @@ void parseInline();
     if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(NEW_T)) return true;
     if (jj_3R_59()) return true;
-    if (jj_3R_233()) return true;
+    if (jj_3R_234()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_274()) jj_scanpos = xsp;
+    if (jj_3R_275()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_658()
+ inline bool jj_3R_107()
  {
     if (jj_done) return true;
-    if (jj_3R_683()) return true;
+    if (jj_scan_token(PACKAGE_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_scan_token(NEW_T)) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_684()) jj_scanpos = xsp;
+    if (jj_3R_641()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_107()
+ inline bool jj_3R_659()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PACKAGE_T)) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_scan_token(NEW_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_684()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_640()) jj_scanpos = xsp;
+    if (jj_3R_685()) jj_scanpos = xsp;
     return false;
   }
 
@@ -3152,10 +3483,10 @@ void parseInline();
     if (jj_scan_token(IS_T)) return true;
     if (jj_scan_token(NEW_T)) return true;
     if (jj_3R_59()) return true;
-    if (jj_3R_233()) return true;
+    if (jj_3R_234()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_234()) jj_scanpos = xsp;
+    if (jj_3R_235()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -3181,295 +3512,290 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_542()
+ inline bool jj_3R_543()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_541()) return true;
+    if (jj_3R_542()) return true;
     return false;
   }
 
- inline bool jj_3R_682()
+ inline bool jj_3R_683()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_253()
+ inline bool jj_3R_254()
  {
     if (jj_done) return true;
-    if (jj_3R_365()) return true;
+    if (jj_3R_366()) return true;
     return false;
   }
 
- inline bool jj_3R_692()
+ inline bool jj_3R_693()
  {
     if (jj_done) return true;
-    if (jj_3R_702()) return true;
+    if (jj_3R_703()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_681()
+ inline bool jj_3R_682()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_692()) { jj_scanpos = xsp; break; }
+      if (jj_3R_693()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_605()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_719()
+ inline bool jj_3R_720()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_718()
+ inline bool jj_3R_606()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_348()
+ inline bool jj_3R_719()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_717()
+ inline bool jj_3R_718()
  {
     if (jj_done) return true;
-    if (jj_3R_346()) return true;
+    if (jj_3R_347()) return true;
     return false;
   }
 
- inline bool jj_3R_702()
+ inline bool jj_3R_703()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_717()) return false;
+    if (jj_3R_718()) {
     jj_scanpos = xsp;
-    if (!jj_3R_718()) return false;
+    if (jj_3R_719()) {
     jj_scanpos = xsp;
-    if (jj_3R_719()) return true;
+    if (jj_3R_720()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_473()
+ inline bool jj_3R_349()
  {
     if (jj_done) return true;
-    if (jj_3R_541()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_542()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_680()
+ inline bool jj_3R_681()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_252()
+ inline bool jj_3R_253()
  {
     if (jj_done) return true;
-    if (jj_3R_364()) return true;
+    if (jj_3R_365()) return true;
     return false;
   }
 
- inline bool jj_3R_657()
+ inline bool jj_3R_474()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
-    if (jj_3R_681()) return true;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_3R_542()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_682()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_543()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_541()
+ inline bool jj_3R_658()
  {
     if (jj_done) return true;
-    if (jj_3R_539()) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
+    if (jj_3R_682()) return true;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(PROTECTED_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_605()) jj_scanpos = xsp;
+    if (jj_3R_683()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_691()
+ inline bool jj_3R_692()
  {
     if (jj_done) return true;
-    if (jj_3R_701()) return true;
+    if (jj_3R_702()) return true;
     return false;
   }
 
- inline bool jj_3R_619()
+ inline bool jj_3R_542()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_540()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_606()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_104()
+ inline bool jj_3_105()
  {
     if (jj_done) return true;
     if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_679()
+ inline bool jj_3R_680()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_691()) { jj_scanpos = xsp; break; }
+      if (jj_3R_692()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_601()
+ inline bool jj_3R_620()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FILE_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_600()
+ inline bool jj_3R_602()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GROUP_T)) return true;
+    if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_599()
+ inline bool jj_3R_717()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNITS_T)) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_598()
+ inline bool jj_3R_601()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LITERAL_T)) return true;
+    if (jj_scan_token(GROUP_T)) return true;
     return false;
   }
 
- inline bool jj_3R_716()
+ inline bool jj_3R_600()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_scan_token(UNITS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_597()
+ inline bool jj_3R_599()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LABEL_T)) return true;
+    if (jj_scan_token(LITERAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_596()
+ inline bool jj_3_106()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_595()
+ inline bool jj_3R_716()
  {
     if (jj_done) return true;
-    if (jj_scan_token(VARIABLE_T)) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3_105()
+ inline bool jj_3R_598()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_scan_token(LABEL_T)) return true;
     return false;
   }
 
  inline bool jj_3R_715()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_594()
+ inline bool jj_3R_597()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SIGNAL_T)) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_714()
+ inline bool jj_3R_596()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) return true;
+    if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_593()
+ inline bool jj_3R_714()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_592()
+ inline bool jj_3R_595()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SUBTYPE_T)) return true;
+    if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_713()
+ inline bool jj_3R_594()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_591()
+ inline bool jj_3R_713()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TYPE_T)) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3R_590()
+ inline bool jj_3R_593()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PACKAGE_T)) return true;
+    if (jj_scan_token(SUBTYPE_T)) return true;
     return false;
   }
 
@@ -3480,10 +3806,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_589()
+ inline bool jj_3R_592()
  {
     if (jj_done) return true;
-    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
@@ -3494,24 +3820,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_588()
+ inline bool jj_3R_591()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PROCEDURE_T)) return true;
+    if (jj_scan_token(PACKAGE_T)) return true;
     return false;
   }
 
  inline bool jj_3R_710()
  {
     if (jj_done) return true;
-    if (jj_3R_374()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_587()
+ inline bool jj_3R_590()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_scan_token(FUNCTION_T)) return true;
     return false;
   }
 
@@ -3522,10 +3848,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_586()
+ inline bool jj_3R_589()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ARCHITECTURE_T)) return true;
+    if (jj_scan_token(PROCEDURE_T)) return true;
     return false;
   }
 
@@ -3536,123 +3862,158 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_588()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_707()
  {
     if (jj_done) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_525()) return true;
     return false;
   }
 
- inline bool jj_3R_706()
+ inline bool jj_3R_587()
  {
     if (jj_done) return true;
-    if (jj_3R_524()) return true;
+    if (jj_scan_token(ARCHITECTURE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_585()
+ inline bool jj_3R_706()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ENTITY_T)) return true;
+    if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_539()
+ inline bool jj_3R_702()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_585()) return false;
+    if (jj_3R_706()) {
     jj_scanpos = xsp;
-    if (!jj_3R_586()) return false;
+    if (jj_3R_707()) {
     jj_scanpos = xsp;
-    if (!jj_3R_587()) return false;
+    if (jj_3R_708()) {
     jj_scanpos = xsp;
-    if (!jj_3R_588()) return false;
+    if (jj_3R_709()) {
     jj_scanpos = xsp;
-    if (!jj_3R_589()) return false;
+    if (jj_3R_710()) {
     jj_scanpos = xsp;
-    if (!jj_3R_590()) return false;
+    if (jj_3R_711()) {
     jj_scanpos = xsp;
-    if (!jj_3R_591()) return false;
+    if (jj_3R_712()) {
     jj_scanpos = xsp;
-    if (!jj_3R_592()) return false;
+    if (jj_3R_713()) {
     jj_scanpos = xsp;
-    if (!jj_3R_593()) return false;
+    if (jj_3R_714()) {
     jj_scanpos = xsp;
-    if (!jj_3R_594()) return false;
+    if (jj_3R_715()) {
     jj_scanpos = xsp;
-    if (!jj_3R_595()) return false;
+    if (jj_3R_716()) {
     jj_scanpos = xsp;
-    if (!jj_3R_596()) return false;
+    if (jj_3_106()) {
     jj_scanpos = xsp;
-    if (!jj_3R_597()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_598()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_599()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_600()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_601()) return true;
+    if (jj_3R_717()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_705()
+ inline bool jj_3R_586()
  {
     if (jj_done) return true;
-    if (jj_3R_92()) return true;
+    if (jj_scan_token(ENTITY_T)) return true;
     return false;
   }
 
- inline bool jj_3R_701()
+ inline bool jj_3R_540()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_705()) return false;
+    if (jj_3R_586()) {
+    jj_scanpos = xsp;
+    if (jj_3R_587()) {
+    jj_scanpos = xsp;
+    if (jj_3R_588()) {
     jj_scanpos = xsp;
-    if (!jj_3R_706()) return false;
+    if (jj_3R_589()) {
     jj_scanpos = xsp;
-    if (!jj_3R_707()) return false;
+    if (jj_3R_590()) {
     jj_scanpos = xsp;
-    if (!jj_3R_708()) return false;
+    if (jj_3R_591()) {
     jj_scanpos = xsp;
-    if (!jj_3R_709()) return false;
+    if (jj_3R_592()) {
     jj_scanpos = xsp;
-    if (!jj_3R_710()) return false;
+    if (jj_3R_593()) {
     jj_scanpos = xsp;
-    if (!jj_3R_711()) return false;
+    if (jj_3R_594()) {
     jj_scanpos = xsp;
-    if (!jj_3R_712()) return false;
+    if (jj_3R_595()) {
     jj_scanpos = xsp;
-    if (!jj_3R_713()) return false;
+    if (jj_3R_596()) {
     jj_scanpos = xsp;
-    if (!jj_3R_714()) return false;
+    if (jj_3R_597()) {
     jj_scanpos = xsp;
-    if (!jj_3R_715()) return false;
+    if (jj_3R_598()) {
     jj_scanpos = xsp;
-    if (!jj_3_105()) return false;
+    if (jj_3R_599()) {
     jj_scanpos = xsp;
-    if (jj_3R_716()) return true;
+    if (jj_3R_600()) {
+    jj_scanpos = xsp;
+    if (jj_3R_601()) {
+    jj_scanpos = xsp;
+    if (jj_3R_602()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_563()
+ inline bool jj_3R_252()
  {
     if (jj_done) return true;
-    if (jj_scan_token(OPEN_T)) return true;
+    if (jj_3R_364()) return true;
     return false;
   }
 
- inline bool jj_3R_251()
+ inline bool jj_3R_564()
  {
     if (jj_done) return true;
-    if (jj_3R_363()) return true;
+    if (jj_scan_token(OPEN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_562()
+ inline bool jj_3R_563()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONFIGURATION_T)) return true;
@@ -3660,35 +4021,37 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_561()
+ inline bool jj_3R_562()
  {
     if (jj_done) return true;
     if (jj_scan_token(ENTITY_T)) return true;
     if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_619()) jj_scanpos = xsp;
+    if (jj_3R_620()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_505()
+ inline bool jj_3R_528()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_561()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_562()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_563()) return true;
+    if (jj_scan_token(AFTER_T)) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_527()
+ inline bool jj_3R_506()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AFTER_T)) return true;
-    if (jj_3R_58()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_562()) {
+    jj_scanpos = xsp;
+    if (jj_3R_563()) {
+    jj_scanpos = xsp;
+    if (jj_3R_564()) return true;
+    }
+    }
     return false;
   }
 
@@ -3697,21 +4060,21 @@ void parseInline();
     if (jj_done) return true;
     if (jj_scan_token(PROTECTED_T)) return true;
     if (jj_scan_token(BODY_T)) return true;
-    if (jj_3R_679()) 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_680()) jj_scanpos = xsp;
+    if (jj_3R_681()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_495()
+ inline bool jj_3R_496()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_444()) return true;
+    if (jj_3R_445()) return true;
     return false;
   }
 
@@ -3723,7 +4086,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_704()
+ inline bool jj_3R_705()
  {
     if (jj_done) return true;
     if (jj_3R_196()) return true;
@@ -3740,24 +4103,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_29()
+ inline bool jj_3R_445()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_58()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_528()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_444()
+ inline bool jj_3_29()
  {
     if (jj_done) return true;
-    if (jj_3R_58()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_527()) jj_scanpos = xsp;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_358()
+ inline bool jj_3R_359()
  {
     if (jj_done) return true;
     if (jj_3R_85()) return true;
@@ -3765,85 +4128,87 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_235()
+ inline bool jj_3R_236()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_3R_359()) jj_scanpos = xsp;
     if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_160()
+ inline bool jj_3R_407()
  {
     if (jj_done) return true;
-    if (jj_3R_84()) return true;
+    if (jj_scan_token(UNAFFECTED_T)) return true;
     return false;
   }
 
- inline bool jj_3R_406()
+ inline bool jj_3R_160()
  {
     if (jj_done) return true;
-    if (jj_scan_token(UNAFFECTED_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_159()
+ inline bool jj_3R_318()
  {
     if (jj_done) return true;
-    if (jj_3R_83()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_406()) {
+    jj_scanpos = xsp;
+    if (jj_3R_407()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_67()
+ inline bool jj_3R_406()
  {
     if (jj_done) return true;
+    if (jj_3R_445()) return true;
     Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_159()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_160()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_496()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_317()
+ inline bool jj_3R_159()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_405()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_406()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_405()
+ inline bool jj_3R_67()
  {
     if (jj_done) return true;
-    if (jj_3R_444()) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_495()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_3R_159()) {
+    jj_scanpos = xsp;
+    if (jj_3R_160()) return true;
     }
     return false;
   }
 
- inline bool jj_3R_470()
+ inline bool jj_3R_251()
  {
     if (jj_done) return true;
-    if (jj_3R_540()) return true;
+    if (jj_3R_69()) return true;
     if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_250()
+ inline bool jj_3R_471()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_541()) return true;
     if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
@@ -3852,30 +4217,30 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_250()) jj_scanpos = xsp;
-    if (jj_scan_token(WAIT_T)) return true;
-    xsp = jj_scanpos;
     if (jj_3R_251()) jj_scanpos = xsp;
+    if (jj_scan_token(WAIT_T)) return true;
     xsp = jj_scanpos;
     if (jj_3R_252()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_253()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_254()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_380()
+ inline bool jj_3R_381()
  {
     if (jj_done) return true;
     if (jj_scan_token(DISCONNECT_T)) return true;
-    if (jj_3R_470()) return true;
+    if (jj_3R_471()) return true;
     if (jj_scan_token(AFTER_T)) return true;
     if (jj_3R_58()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_458()
+ inline bool jj_3R_459()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
@@ -3883,7 +4248,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_238()
+ inline bool jj_3R_239()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOWNTO_T)) return true;
@@ -3895,53 +4260,55 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_237()) return false;
+    if (jj_3R_238()) {
     jj_scanpos = xsp;
-    if (jj_3R_238()) return true;
+    if (jj_3R_239()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_237()
+ inline bool jj_3R_238()
  {
     if (jj_done) return true;
     if (jj_scan_token(TO_T)) return true;
     return false;
   }
 
- inline bool jj_3R_568()
+ inline bool jj_3R_155()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_154()) return true;
     return false;
   }
 
- inline bool jj_3R_155()
+ inline bool jj_3R_569()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_154()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
- inline bool jj_3R_567()
+ inline bool jj_3R_568()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_520()
+ inline bool jj_3R_521()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_567()) return false;
+    if (jj_3R_568()) {
     jj_scanpos = xsp;
-    if (jj_3R_568()) return true;
+    if (jj_3R_569()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_461()
+ inline bool jj_3R_462()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
@@ -3949,25 +4316,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_558()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(REJECT_T)) return true;
-    if (jj_3R_58()) return true;
-    return false;
-  }
-
- inline bool jj_3R_494()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_558()) jj_scanpos = xsp;
-    if (jj_scan_token(INERTIAL_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_374()
+ inline bool jj_3R_375()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -3978,52 +4327,64 @@ void parseInline();
     if (jj_scan_token(COLON_T)) return true;
     if (jj_3R_84()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_461()) jj_scanpos = xsp;
+    if (jj_3R_462()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_472()
+ inline bool jj_3R_559()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(REJECT_T)) return true;
+    if (jj_3R_58()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_473()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_471()) return true;
+    if (jj_3R_472()) return true;
     return false;
   }
 
- inline bool jj_3R_404()
+ inline bool jj_3R_495()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_493()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_494()) return true;
+    if (jj_3R_559()) jj_scanpos = xsp;
+    if (jj_scan_token(INERTIAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_493()
+ inline bool jj_3R_440()
  {
     if (jj_done) return true;
-    if (jj_scan_token(TRANSPORT_T)) return true;
+    if (jj_3R_527()) return true;
     return false;
   }
 
- inline bool jj_3R_439()
+ inline bool jj_3R_405()
  {
     if (jj_done) return true;
-    if (jj_3R_526()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_494()) {
+    jj_scanpos = xsp;
+    if (jj_3R_495()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_28()
+ inline bool jj_3R_494()
  {
     if (jj_done) return true;
-    if (jj_3R_82()) return true;
+    if (jj_scan_token(TRANSPORT_T)) return true;
     return false;
   }
 
- inline bool jj_3_103()
+ inline bool jj_3_104()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -4031,23 +4392,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_361()
+ inline bool jj_3R_362()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_438()) return false;
+    if (jj_3R_439()) {
     jj_scanpos = xsp;
-    if (jj_3R_439()) return true;
+    if (jj_3R_440()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_438()
+ inline bool jj_3R_439()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_103()) jj_scanpos = xsp;
+    if (jj_3_104()) jj_scanpos = xsp;
     if (jj_3R_114()) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
     if (jj_3R_58()) return true;
@@ -4055,6 +4417,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_28()
+ {
+    if (jj_done) return true;
+    if (jj_3R_82()) return true;
+    return false;
+  }
+
  inline bool jj_3_27()
  {
     if (jj_done) return true;
@@ -4062,7 +4431,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_276()
+ inline bool jj_3R_277()
  {
     if (jj_done) return true;
     if (jj_3R_82()) return true;
@@ -4074,43 +4443,34 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_275()) return false;
+    if (jj_3R_276()) {
     jj_scanpos = xsp;
-    if (jj_3R_276()) return true;
+    if (jj_3R_277()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_275()
+ inline bool jj_3R_276()
  {
     if (jj_done) return true;
     if (jj_3R_81()) return true;
     return false;
   }
 
- inline bool jj_3R_381()
+ inline bool jj_3R_382()
  {
     if (jj_done) return true;
     if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_471()) return true;
+    if (jj_3R_472()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_472()) { jj_scanpos = xsp; break; }
+      if (jj_3R_473()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_703()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ARRAY_T)) return true;
-    if (jj_3R_82()) return true;
-    if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_84()) return true;
-    return false;
-  }
-
  inline bool jj_3R_62()
  {
     if (jj_done) return true;
@@ -4128,159 +4488,176 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_157()
+ inline bool jj_3R_704()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(ARRAY_T)) return true;
+    if (jj_3R_82()) return true;
+    if (jj_scan_token(OF_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
- inline bool jj_3R_636()
+ inline bool jj_3R_157()
  {
     if (jj_done) return true;
-    if (jj_3R_657()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_372()
+ inline bool jj_3R_637()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONSTANT_T)) return true;
-    if (jj_3R_196()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    if (jj_3R_84()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_458()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_658()) return true;
     return false;
   }
 
- inline bool jj_3_102()
+ inline bool jj_3_103()
  {
     if (jj_done) return true;
     if (jj_3R_137()) return true;
     return false;
   }
 
- inline bool jj_3R_635()
+ inline bool jj_3R_636()
  {
     if (jj_done) return true;
-    if (jj_3R_656()) return true;
+    if (jj_3R_657()) return true;
     return false;
   }
 
- inline bool jj_3R_634()
+ inline bool jj_3R_373()
  {
     if (jj_done) return true;
-    if (jj_3R_655()) return true;
+    if (jj_scan_token(CONSTANT_T)) return true;
+    if (jj_3R_196()) return true;
+    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_84()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_459()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_633()
+ inline bool jj_3R_635()
  {
     if (jj_done) return true;
-    if (jj_3R_654()) return true;
+    if (jj_3R_656()) return true;
     return false;
   }
 
- inline bool jj_3_26()
+ inline bool jj_3R_634()
  {
     if (jj_done) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_655()) return true;
     return false;
   }
 
- inline bool jj_3R_632()
+ inline bool jj_3R_633()
  {
     if (jj_done) return true;
-    if (jj_3R_653()) return true;
+    if (jj_3R_654()) return true;
     return false;
   }
 
- inline bool jj_3R_576()
+ inline bool jj_3R_577()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_632()) return false;
+    if (jj_3R_633()) {
     jj_scanpos = xsp;
-    if (!jj_3R_633()) return false;
+    if (jj_3R_634()) {
     jj_scanpos = xsp;
-    if (!jj_3R_634()) return false;
+    if (jj_3R_635()) {
     jj_scanpos = xsp;
-    if (!jj_3R_635()) return false;
+    if (jj_3R_636()) {
     jj_scanpos = xsp;
-    if (!jj_3_102()) return false;
+    if (jj_3_103()) {
     jj_scanpos = xsp;
-    if (jj_3R_636()) return true;
+    if (jj_3R_637()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_379()
+ inline bool jj_3_26()
+ {
+    if (jj_done) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_380()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
     if (jj_3R_177()) return true;
-    if (jj_3R_331()) return true;
+    if (jj_3R_332()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_566()
+ inline bool jj_3_99()
  {
     if (jj_done) return true;
-    if (jj_3R_332()) return true;
+    if (jj_3R_133()) return true;
     return false;
   }
 
- inline bool jj_3_98()
+ inline bool jj_3R_458()
  {
     if (jj_done) return true;
-    if (jj_3R_133()) return true;
+    if (jj_3R_532()) return true;
     return false;
   }
 
- inline bool jj_3R_457()
+ inline bool jj_3R_567()
  {
     if (jj_done) return true;
-    if (jj_3R_531()) return true;
+    if (jj_3R_333()) return true;
     return false;
   }
 
- inline bool jj_3R_565()
+ inline bool jj_3_102()
  {
     if (jj_done) return true;
-    if (jj_3R_80()) return true;
+    if (jj_3R_136()) return true;
     return false;
   }
 
- inline bool jj_3R_507()
+ inline bool jj_3R_371()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_565()) return false;
+    if (jj_3_102()) {
     jj_scanpos = xsp;
-    if (jj_3R_566()) return true;
+    if (jj_3R_458()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_101()
+ inline bool jj_3R_566()
  {
     if (jj_done) return true;
-    if (jj_3R_136()) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
- inline bool jj_3R_370()
+ inline bool jj_3R_508()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3_101()) return false;
+    if (jj_3R_566()) {
     jj_scanpos = xsp;
-    if (jj_3R_457()) return true;
+    if (jj_3R_567()) return true;
+    }
     return false;
   }
 
@@ -4294,7 +4671,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_100()
+ inline bool jj_3_101()
  {
     if (jj_done) return true;
     if (jj_3R_134()) return true;
@@ -4309,7 +4686,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_365()
+ inline bool jj_3R_366()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
@@ -4324,12 +4701,12 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_100()) { jj_scanpos = xsp; break; }
+      if (jj_3_101()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_246()
+ inline bool jj_3R_247()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
@@ -4341,80 +4718,73 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_245()) return false;
+    if (jj_3R_246()) {
     jj_scanpos = xsp;
-    if (jj_3R_246()) return true;
+    if (jj_3R_247()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_99()
+ inline bool jj_3_100()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_245()
+ inline bool jj_3R_246()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3_25()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_79()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_349()
+ inline bool jj_3_98()
  {
     if (jj_done) return true;
-    if (jj_scan_token(CONFIGURATION_T)) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3_97()
+ inline bool jj_3R_218()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_217()
+ inline bool jj_3_25()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ALL_T)) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_79()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_216()
+ inline bool jj_3R_350()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_scan_token(CONFIGURATION_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_215()
+ inline bool jj_3R_217()
  {
     if (jj_done) return true;
-    if (jj_3R_351()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
- inline bool jj_3R_319()
+ inline bool jj_3R_216()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_79()) return true;
+    if (jj_3R_352()) return true;
     return false;
   }
 
- inline bool jj_3R_214()
+ inline bool jj_3R_215()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
@@ -4426,23 +4796,24 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_214()) return false;
+    if (jj_3R_215()) {
     jj_scanpos = xsp;
-    if (!jj_3R_215()) return false;
+    if (jj_3R_216()) {
     jj_scanpos = xsp;
-    if (!jj_3R_216()) return false;
+    if (jj_3R_217()) {
     jj_scanpos = xsp;
-    if (jj_3R_217()) return true;
+    if (jj_3R_218()) return true;
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_318()
+ inline bool jj_3R_320()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_79()) return true;
-    if (jj_scan_token(ELSE_T)) return true;
-    if (jj_3R_317()) return true;
     return false;
   }
 
@@ -4453,6 +4824,16 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_319()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_79()) return true;
+    if (jj_scan_token(ELSE_T)) return true;
+    if (jj_3R_318()) return true;
+    return false;
+  }
+
  inline bool jj_3R_84()
  {
     if (jj_done) return true;
@@ -4468,14 +4849,14 @@ void parseInline();
  inline bool jj_3R_167()
  {
     if (jj_done) return true;
-    if (jj_3R_317()) return true;
+    if (jj_3R_318()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_318()) { jj_scanpos = xsp; break; }
+      if (jj_3R_319()) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_319()) jj_scanpos = xsp;
+    if (jj_3R_320()) jj_scanpos = xsp;
     return false;
   }
 
@@ -4490,7 +4871,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_371()
+ inline bool jj_3R_372()
  {
     if (jj_done) return true;
     if (jj_scan_token(SUBTYPE_T)) return true;
@@ -4501,25 +4882,25 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_630()
+ inline bool jj_3R_631()
  {
     if (jj_done) return true;
     if (jj_3R_112()) return true;
     return false;
   }
 
- inline bool jj_3R_571()
+ inline bool jj_3R_572()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_630()) { jj_scanpos = xsp; break; }
+      if (jj_3R_631()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_364()
+ inline bool jj_3R_365()
  {
     if (jj_done) return true;
     if (jj_scan_token(UNTIL_T)) return true;
@@ -4534,35 +4915,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_523()
+ inline bool jj_3R_524()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_569()) return true;
+    if (jj_3R_570()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_24()
+ inline bool jj_3R_522()
  {
     if (jj_done) return true;
-    if (jj_3R_78()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_313()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_521()
+ inline bool jj_3_97()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_312()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_132()) return true;
+    return false;
+  }
+
+ inline bool jj_3_24()
+ {
+    if (jj_done) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
  inline bool jj_3_96()
  {
     if (jj_done) return true;
-    if (jj_3R_132()) return true;
+    if (jj_3R_131()) return true;
     return false;
   }
 
@@ -4573,10 +4961,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_95()
+ inline bool jj_3R_523()
  {
     if (jj_done) return true;
-    if (jj_3R_131()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(84)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(52)) return true;
+    }
     return false;
   }
 
@@ -4595,14 +4988,18 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_522()
+ inline bool jj_3R_433()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(84)) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(52)) return true;
+    if (jj_3R_523()) jj_scanpos = xsp;
+    if (jj_scan_token(FUNCTION_T)) return true;
+    if (jj_3R_521()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_524()) jj_scanpos = xsp;
+    if (jj_scan_token(RETURN_T)) return true;
+    if (jj_3R_157()) return true;
     return false;
   }
 
@@ -4618,29 +5015,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_503()
+ inline bool jj_3R_504()
  {
     if (jj_done) return true;
     if (jj_3R_78()) return true;
     return false;
   }
 
- inline bool jj_3R_432()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_522()) jj_scanpos = xsp;
-    if (jj_scan_token(FUNCTION_T)) return true;
-    if (jj_3R_520()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_523()) jj_scanpos = xsp;
-    if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_157()) return true;
-    return false;
-  }
-
- inline bool jj_3R_502()
+ inline bool jj_3R_503()
  {
     if (jj_done) return true;
     if (jj_3R_77()) return true;
@@ -4662,7 +5044,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_501()
+ inline bool jj_3R_502()
  {
     if (jj_done) return true;
     if (jj_3R_76()) return true;
@@ -4689,7 +5071,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_500()
+ inline bool jj_3R_501()
  {
     if (jj_done) return true;
     if (jj_3R_87()) return true;
@@ -4706,94 +5088,111 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_499()
- {
-    if (jj_done) return true;
-    if (jj_3R_560()) return true;
-    return false;
-  }
-
- inline bool jj_3R_498()
+ inline bool jj_3R_500()
  {
     if (jj_done) return true;
-    if (jj_3R_74()) return true;
+    if (jj_3R_561()) return true;
     return false;
   }
 
- inline bool jj_3R_346()
+ inline bool jj_3R_347()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_431()) return false;
+    if (jj_3R_432()) {
     jj_scanpos = xsp;
-    if (jj_3R_432()) return true;
+    if (jj_3R_433()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_431()
+ inline bool jj_3R_432()
  {
     if (jj_done) return true;
     if (jj_scan_token(PROCEDURE_T)) return true;
-    if (jj_3R_520()) return true;
+    if (jj_3R_521()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_521()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3_95()) jj_scanpos = xsp;
+    if (jj_3R_522()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3_96()) jj_scanpos = xsp;
-    if (jj_3R_423()) return true;
+    xsp = jj_scanpos;
+    if (jj_3_97()) jj_scanpos = xsp;
+    if (jj_3R_424()) return true;
     return false;
   }
 
- inline bool jj_3R_497()
+ inline bool jj_3R_499()
+ {
+    if (jj_done) return true;
+    if (jj_3R_74()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_498()
  {
     if (jj_done) return true;
     if (jj_3R_88()) return true;
     return false;
   }
 
- inline bool jj_3R_409()
+ inline bool jj_3R_632()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(46)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_410()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_496()) return false;
+    if (jj_3R_497()) {
     jj_scanpos = xsp;
-    if (!jj_3R_497()) return false;
+    if (jj_3R_498()) {
     jj_scanpos = xsp;
-    if (!jj_3R_498()) return false;
+    if (jj_3R_499()) {
     jj_scanpos = xsp;
-    if (!jj_3R_499()) return false;
+    if (jj_3R_500()) {
     jj_scanpos = xsp;
-    if (!jj_3R_500()) return false;
+    if (jj_3R_501()) {
     jj_scanpos = xsp;
-    if (!jj_3R_501()) return false;
+    if (jj_3R_502()) {
     jj_scanpos = xsp;
-    if (!jj_3R_502()) return false;
+    if (jj_3R_503()) {
     jj_scanpos = xsp;
-    if (!jj_3R_503()) return false;
+    if (jj_3R_504()) {
     jj_scanpos = xsp;
     if (jj_scan_token(189)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_496()
+ inline bool jj_3R_497()
  {
     if (jj_done) return true;
-    if (jj_3R_559()) return true;
+    if (jj_3R_560()) return true;
     return false;
   }
 
- inline bool jj_3R_631()
+ inline bool jj_3R_630()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_scan_token(46)) return false;
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) return true;
+    if (jj_3R_653()) return true;
     return false;
   }
 
@@ -4804,35 +5203,35 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_629()
+ inline bool jj_3R_571()
  {
     if (jj_done) return true;
-    if (jj_3R_652()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_630()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_570()
+ inline bool jj_3_94()
  {
     if (jj_done) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_629()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_172()
+ inline bool jj_3R_675()
  {
     if (jj_done) return true;
-    if (jj_3R_324()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3_93()
+ inline bool jj_3R_172()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
+    if (jj_3R_325()) return true;
     return false;
   }
 
@@ -4858,39 +5257,33 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_76()
+ inline bool jj_3_95()
  {
     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_171()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_172()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
  inline bool jj_3R_673()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
-    return false;
-  }
-
- inline bool jj_3_94()
- {
-    if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_672()
+ inline bool jj_3R_76()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) 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_171()) {
+    jj_scanpos = xsp;
+    if (jj_3R_172()) return true;
+    }
     return false;
   }
 
@@ -4902,23 +5295,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_78()
+ inline bool jj_3R_672()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3_15()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(79)) jj_scanpos = xsp;
-    if (jj_3R_176()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
  inline bool jj_3R_671()
  {
     if (jj_done) return true;
-    if (jj_3R_64()) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
@@ -4936,53 +5323,66 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_14()
+ inline bool jj_3R_574()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_521()) return true;
     return false;
   }
 
- inline bool jj_3_13()
+ inline bool jj_3R_78()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3_15()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) jj_scanpos = xsp;
+    if (jj_3R_176()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
  inline bool jj_3R_668()
  {
     if (jj_done) return true;
-    if (jj_3R_374()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_573()
+ inline bool jj_3R_667()
  {
     if (jj_done) return true;
-    if (jj_3R_520()) return true;
+    if (jj_3R_372()) return true;
     return false;
   }
 
- inline bool jj_3R_667()
+ inline bool jj_3R_666()
  {
     if (jj_done) return true;
-    if (jj_3R_372()) return true;
+    if (jj_3R_525()) return true;
     return false;
   }
 
- inline bool jj_3R_666()
+ inline bool jj_3_14()
  {
     if (jj_done) return true;
-    if (jj_3R_371()) return true;
+    if (jj_3R_69()) 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_70()) return true;
     return false;
   }
 
  inline bool jj_3R_665()
  {
     if (jj_done) return true;
-    if (jj_3R_524()) return true;
+    if (jj_3R_371()) return true;
     return false;
   }
 
@@ -4999,93 +5399,85 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_678()
- {
-    if (jj_done) return true;
-    if (jj_3R_690()) return true;
-    return false;
-  }
-
  inline bool jj_3R_664()
  {
     if (jj_done) return true;
-    if (jj_3R_370()) return true;
-    return false;
-  }
-
- inline bool jj_3R_677()
- {
-    if (jj_done) return true;
-    if (jj_3R_689()) return true;
-    return false;
-  }
-
- inline bool jj_3R_663()
- {
-    if (jj_done) return true;
     if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_654()
- {
-    if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_677()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_678()) return true;
-    return false;
-  }
-
- inline bool jj_3R_652()
+ inline bool jj_3R_653()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_663()) return false;
+    if (jj_3R_664()) {
     jj_scanpos = xsp;
-    if (!jj_3R_664()) return false;
+    if (jj_3R_665()) {
     jj_scanpos = xsp;
-    if (!jj_3R_665()) return false;
+    if (jj_3R_666()) {
     jj_scanpos = xsp;
-    if (!jj_3R_666()) return false;
+    if (jj_3R_667()) {
     jj_scanpos = xsp;
-    if (!jj_3R_667()) return false;
+    if (jj_3R_668()) {
     jj_scanpos = xsp;
-    if (!jj_3R_668()) return false;
+    if (jj_3R_669()) {
     jj_scanpos = xsp;
-    if (!jj_3R_669()) return false;
+    if (jj_3R_670()) {
     jj_scanpos = xsp;
-    if (!jj_3R_670()) return false;
+    if (jj_3R_671()) {
     jj_scanpos = xsp;
-    if (!jj_3R_671()) return false;
+    if (jj_3R_672()) {
     jj_scanpos = xsp;
-    if (!jj_3R_672()) return false;
+    if (jj_3R_673()) {
     jj_scanpos = xsp;
-    if (!jj_3R_673()) return false;
+    if (jj_3R_674()) {
     jj_scanpos = xsp;
-    if (!jj_3_94()) return false;
+    if (jj_3_95()) {
     jj_scanpos = xsp;
-    if (jj_3R_674()) return true;
+    if (jj_3R_675()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_175()
+ inline bool jj_3R_679()
  {
     if (jj_done) return true;
-    if (jj_3R_328()) return true;
+    if (jj_3R_691()) return true;
     return false;
   }
 
- inline bool jj_3R_174()
+ inline bool jj_3R_678()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_3R_690()) return true;
     return false;
   }
 
- inline bool jj_3R_460()
+ inline bool jj_3R_655()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_678()) {
+    jj_scanpos = xsp;
+    if (jj_3R_679()) return true;
+    }
+    return false;
+  }
+
+ inline bool jj_3R_461()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARASSIGN_T)) return true;
@@ -5093,42 +5485,57 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_468()
+ inline bool jj_3R_175()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    if (jj_3R_329()) return true;
     return false;
   }
 
- inline bool jj_3_92()
+ inline bool jj_3R_174()
+ {
+    if (jj_done) return true;
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+ inline bool jj_3_93()
  {
     if (jj_done) return true;
     if (jj_3R_130()) return true;
     return false;
   }
 
- inline bool jj_3R_347()
+ inline bool jj_3R_348()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_433()) return false;
+    if (jj_3R_434()) {
     jj_scanpos = xsp;
     if (jj_scan_token(137)) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_433()
+ inline bool jj_3R_434()
+ {
+    if (jj_done) return true;
+    if (jj_3R_525()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_469()
  {
     if (jj_done) return true;
-    if (jj_3R_524()) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
  inline bool jj_3R_177()
  {
     if (jj_done) return true;
-    if (jj_3R_330()) return true;
+    if (jj_3R_331()) return true;
     if (jj_scan_token(COLON_T)) return true;
     if (jj_3R_59()) return true;
     return false;
@@ -5137,15 +5544,15 @@ void parseInline();
  inline bool jj_3R_200()
  {
     if (jj_done) return true;
-    if (jj_3R_346()) return true;
     if (jj_3R_347()) return true;
+    if (jj_3R_348()) return true;
     return false;
   }
 
- inline bool jj_3R_572()
+ inline bool jj_3R_573()
  {
     if (jj_done) return true;
-    if (jj_3R_631()) return true;
+    if (jj_3R_632()) return true;
     return false;
   }
 
@@ -5161,13 +5568,29 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_199()) return false;
+    if (jj_3R_199()) {
     jj_scanpos = xsp;
     if (jj_3R_200()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_91()
+ inline bool jj_3_92()
+ {
+    if (jj_done) return true;
+    if (jj_3R_128()) return true;
+    if (jj_3R_129()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_460()
+ {
+    if (jj_done) return true;
+    if (jj_3R_533()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_162()
  {
     if (jj_done) return true;
     if (jj_3R_128()) return true;
@@ -5190,46 +5613,48 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_459()
- {
-    if (jj_done) return true;
-    if (jj_3R_532()) return true;
-    return false;
-  }
-
- inline bool jj_3R_162()
+ inline bool jj_3R_468()
  {
     if (jj_done) return true;
-    if (jj_3R_128()) return true;
-    if (jj_3R_129()) return true;
+    if (jj_3R_538()) return true;
     return false;
   }
 
  inline bool jj_3R_467()
  {
     if (jj_done) return true;
-    if (jj_3R_537()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_466()
+ inline bool jj_3R_179()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_3R_333()) return true;
     return false;
   }
 
- inline bool jj_3R_179()
+ inline bool jj_3R_178()
  {
     if (jj_done) return true;
     if (jj_3R_332()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_178()
+ inline bool jj_3R_525()
  {
     if (jj_done) return true;
-    if (jj_3R_331()) return true;
+    if (jj_scan_token(IS_T)) return true;
+    if (jj_3R_571()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_572()) return true;
+    if (jj_scan_token(END_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_573()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_574()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5242,39 +5667,22 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_377()
+ inline bool jj_3R_378()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMPONENT_T)) return true;
     if (jj_3R_69()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(56)) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_466()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_467()) jj_scanpos = xsp;
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(COMPONENT_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_468()) jj_scanpos = xsp;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_524()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_570()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
-    if (jj_3R_571()) return true;
-    if (jj_scan_token(END_T)) return true;
-    Token * xsp;
+    if (jj_scan_token(56)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_572()) jj_scanpos = xsp;
+    if (jj_3R_467()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_573()) jj_scanpos = xsp;
+    if (jj_3R_468()) jj_scanpos = xsp;
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(COMPONENT_T)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_469()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -5295,7 +5703,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_355()
+ inline bool jj_3R_356()
  {
     if (jj_done) return true;
     if (jj_scan_token(STRINGLITERAL)) return true;
@@ -5328,6 +5736,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_435()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_59()) return true;
+    return false;
+  }
+
  inline bool jj_3_10()
  {
     if (jj_done) return true;
@@ -5335,57 +5751,65 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_336()
+ inline bool jj_3R_337()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_434()
+ inline bool jj_3R_161()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_314()) return true;
     return false;
   }
 
- inline bool jj_3R_335()
+ inline bool jj_3R_336()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_334()
+ inline bool jj_3R_68()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_161()) jj_scanpos = xsp;
+    if (jj_3R_129()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_162()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_335()
  {
     if (jj_done) return true;
     if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_161()
+ inline bool jj_3R_358()
  {
     if (jj_done) return true;
-    if (jj_3R_313()) return true;
+    if (jj_scan_token(RETURN_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_68()
+ inline bool jj_3R_639()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_161()) jj_scanpos = xsp;
-    if (jj_3R_129()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_162()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_627()
+ inline bool jj_3R_628()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -5397,17 +5821,20 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_333()) return false;
+    if (jj_3R_334()) {
     jj_scanpos = xsp;
-    if (!jj_3R_334()) return false;
+    if (jj_3R_335()) {
     jj_scanpos = xsp;
-    if (!jj_3R_335()) return false;
+    if (jj_3R_336()) {
     jj_scanpos = xsp;
-    if (jj_3R_336()) return true;
+    if (jj_3R_337()) return true;
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_333()
+ inline bool jj_3R_334()
  {
     if (jj_done) return true;
     if (jj_3R_67()) return true;
@@ -5417,39 +5844,36 @@ void parseInline();
  inline bool jj_3R_357()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RETURN_T)) return true;
-    if (jj_3R_59()) return true;
-    return false;
-  }
-
- inline bool jj_3R_638()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
     if (jj_3R_59()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_435()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3R_356()
+ inline bool jj_3R_234()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    if (jj_scan_token(LBRACKET_T)) return true;
     Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_434()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_357()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_358()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET_T)) return true;
     return false;
   }
 
- inline bool jj_3R_351()
+ inline bool jj_3R_352()
  {
     if (jj_done) return true;
     if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_613()
+ inline bool jj_3R_614()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -5458,108 +5882,98 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_233()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LBRACKET_T)) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_356()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_357()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_604()
+ inline bool jj_3R_605()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_603()
+ inline bool jj_3R_604()
  {
     if (jj_done) return true;
     if (jj_scan_token(OTHER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_602()
+ inline bool jj_3R_603()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_638()) { jj_scanpos = xsp; break; }
+      if (jj_3R_639()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_540()
+ inline bool jj_3R_541()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_602()) return false;
+    if (jj_3R_603()) {
     jj_scanpos = xsp;
-    if (!jj_3R_603()) return false;
+    if (jj_3R_604()) {
     jj_scanpos = xsp;
-    if (jj_3R_604()) return true;
+    if (jj_3R_605()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_578()
+ inline bool jj_3R_579()
  {
     if (jj_done) return true;
     if (jj_scan_token(BUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_625()
+ inline bool jj_3R_578()
  {
     if (jj_done) return true;
-    if (jj_scan_token(WHEN_T)) return true;
-    if (jj_3R_85()) return true;
-    if (jj_scan_token(ARROW_T)) return true;
-    if (jj_3R_258()) return true;
+    if (jj_scan_token(REGISTER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_617()
+ inline bool jj_3R_533()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_578()) {
+    jj_scanpos = xsp;
+    if (jj_3R_579()) return true;
+    }
     return false;
   }
 
  inline bool jj_3R_626()
  {
     if (jj_done) return true;
-    if (jj_3R_625()) return true;
+    if (jj_scan_token(WHEN_T)) return true;
+    if (jj_3R_85()) return true;
+    if (jj_scan_token(ARROW_T)) return true;
+    if (jj_3R_259()) return true;
     return false;
   }
 
- inline bool jj_3R_577()
+ inline bool jj_3R_618()
  {
     if (jj_done) return true;
-    if (jj_scan_token(REGISTER_T)) return true;
+    if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_532()
+ inline bool jj_3R_627()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_577()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_578()) return true;
+    if (jj_3R_626()) return true;
     return false;
   }
 
- inline bool jj_3R_659()
+ inline bool jj_3R_660()
  {
     if (jj_done) return true;
     if (jj_3R_70()) return true;
@@ -5567,7 +5981,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_373()
+ inline bool jj_3R_374()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
@@ -5576,14 +5990,14 @@ void parseInline();
     if (jj_3R_84()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_459()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_460()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_461()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_255()
+ inline bool jj_3R_256()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -5591,68 +6005,68 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3_91()
+ {
+    if (jj_done) return true;
+    if (jj_3R_127()) return true;
+    return false;
+  }
+
  inline bool jj_3R_121()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_255()) jj_scanpos = xsp;
+    if (jj_3R_256()) jj_scanpos = xsp;
     if (jj_scan_token(CASE_T)) return true;
     if (jj_3R_58()) return true;
     if (jj_scan_token(IS_T)) return true;
-    if (jj_3R_625()) return true;
+    if (jj_3R_626()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_626()) { jj_scanpos = xsp; break; }
+      if (jj_3R_627()) { 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_627()) jj_scanpos = xsp;
+    if (jj_3R_628()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_650()
+ inline bool jj_3R_651()
  {
     if (jj_done) return true;
-    if (jj_3R_409()) return true;
+    if (jj_3R_410()) return true;
     return false;
   }
 
  inline bool jj_3_90()
  {
     if (jj_done) return true;
-    if (jj_3R_127()) return true;
+    if (jj_3R_126()) return true;
     return false;
   }
 
- inline bool jj_3R_616()
+ inline bool jj_3R_617()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_650()) { jj_scanpos = xsp; break; }
+      if (jj_3R_651()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3_89()
- {
-    if (jj_done) return true;
-    if (jj_3R_126()) return true;
-    return false;
-  }
-
- inline bool jj_3R_525()
+ inline bool jj_3R_526()
  {
     if (jj_done) return true;
-    if (jj_3R_404()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3_88()
+ inline bool jj_3_89()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -5660,74 +6074,76 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_437()
+ inline bool jj_3R_438()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_88()) jj_scanpos = xsp;
+    if (jj_3_89()) jj_scanpos = xsp;
     if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_525()) jj_scanpos = xsp;
-    if (jj_3R_317()) return true;
-    if (jj_scan_token(SEMI_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_660()
- {
-    if (jj_done) return true;
-    if (jj_3R_328()) return true;
+    if (jj_3R_526()) jj_scanpos = xsp;
+    if (jj_3R_318()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_436()
+ inline bool jj_3R_437()
  {
     if (jj_done) return true;
     if (jj_3R_127()) return true;
     return false;
   }
 
- inline bool jj_3R_386()
+ inline bool jj_3R_387()
  {
     if (jj_done) return true;
-    if (jj_3R_476()) return true;
+    if (jj_3R_477()) return true;
     if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_506()
+ inline bool jj_3R_661()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_564()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_329()) return true;
+    if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_360()
+ inline bool jj_3R_361()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_435()) return false;
+    if (jj_3R_436()) {
     jj_scanpos = xsp;
-    if (!jj_3R_436()) return false;
+    if (jj_3R_437()) {
     jj_scanpos = xsp;
-    if (jj_3R_437()) return true;
+    if (jj_3R_438()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_435()
+ inline bool jj_3R_436()
  {
     if (jj_done) return true;
     if (jj_3R_126()) return true;
     return false;
   }
 
- inline bool jj_3R_559()
+ inline bool jj_3R_507()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_565()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_560()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -5735,194 +6151,207 @@ void parseInline();
     if (jj_scan_token(BLOCK_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_613()) jj_scanpos = xsp;
+    if (jj_3R_614()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(56)) jj_scanpos = xsp;
-    if (jj_3R_614()) return true;
     if (jj_3R_615()) return true;
-    if (jj_scan_token(BEGIN_T)) return true;
     if (jj_3R_616()) return true;
+    if (jj_scan_token(BEGIN_T)) return true;
+    if (jj_3R_617()) return true;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(BLOCK_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_617()) jj_scanpos = xsp;
+    if (jj_3R_618()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3_9()
+ inline bool jj_3R_402()
  {
     if (jj_done) return true;
-    if (jj_3R_66()) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_401()
+ inline bool jj_3_9()
  {
     if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
- inline bool jj_3R_418()
+ inline bool jj_3R_314()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_506()) jj_scanpos = xsp;
+    if (jj_3R_401()) {
+    jj_scanpos = xsp;
+    if (jj_3R_402()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_313()
+ inline bool jj_3R_401()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_400()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_401()) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_400()
+ inline bool jj_3R_552()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
+    if (jj_scan_token(ROR_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_419()
+ {
+    if (jj_done) return true;
+    if (jj_3R_59()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_507()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3R_551()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ROR_T)) return true;
+    if (jj_scan_token(ROL_T)) return true;
     return false;
   }
 
  inline bool jj_3R_550()
  {
     if (jj_done) return true;
-    if (jj_scan_token(ROL_T)) return true;
+    if (jj_scan_token(SRA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_648()
+ inline bool jj_3R_549()
  {
     if (jj_done) return true;
-    if (jj_3R_537()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_660()) jj_scanpos = xsp;
+    if (jj_scan_token(SLA_T)) return true;
     return false;
   }
 
- inline bool jj_3R_549()
+ inline bool jj_3R_548()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SRA_T)) return true;
+    if (jj_scan_token(SRL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_548()
+ inline bool jj_3R_649()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SLA_T)) return true;
+    if (jj_3R_538()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_661()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_647()
+ inline bool jj_3R_648()
  {
     if (jj_done) return true;
     if (jj_3R_66()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_659()) jj_scanpos = xsp;
+    if (jj_3R_660()) jj_scanpos = xsp;
     return false;
   }
 
  inline bool jj_3R_547()
  {
     if (jj_done) return true;
-    if (jj_scan_token(SRL_T)) return true;
+    if (jj_scan_token(SLL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_614()
+ inline bool jj_3R_477()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_647()) jj_scanpos = xsp;
+    if (jj_3R_547()) {
+    jj_scanpos = xsp;
+    if (jj_3R_548()) {
+    jj_scanpos = xsp;
+    if (jj_3R_549()) {
+    jj_scanpos = xsp;
+    if (jj_3R_550()) {
+    jj_scanpos = xsp;
+    if (jj_3R_551()) {
+    jj_scanpos = xsp;
+    if (jj_3R_552()) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_615()
+ {
+    if (jj_done) return true;
+    Token * xsp;
     xsp = jj_scanpos;
     if (jj_3R_648()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_649()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_649()
+ inline bool jj_3R_650()
  {
     if (jj_done) return true;
     if (jj_3R_140()) return true;
     return false;
   }
 
- inline bool jj_3R_615()
+ inline bool jj_3R_616()
  {
     if (jj_done) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_649()) { jj_scanpos = xsp; break; }
+      if (jj_3R_650()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_546()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(SLL_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_476()
+ inline bool jj_3R_307()
  {
     if (jj_done) return true;
+    if (jj_3R_68()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_546()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_547()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_548()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_549()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_550()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_551()) return true;
+    if (jj_3R_387()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_306()
+ inline bool jj_3R_245()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_386()) jj_scanpos = xsp;
+    if (jj_3R_363()) return true;
     return false;
   }
 
- inline bool jj_3R_299()
+ inline bool jj_3R_300()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_244()
+ inline bool jj_3_88()
  {
     if (jj_done) return true;
-    if (jj_3R_362()) return true;
+    if (jj_3R_125()) return true;
     return false;
   }
 
@@ -5936,7 +6365,7 @@ void parseInline();
  inline bool jj_3_87()
  {
     if (jj_done) return true;
-    if (jj_3R_125()) return true;
+    if (jj_3R_124()) return true;
     return false;
   }
 
@@ -5947,6 +6376,13 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_299()
+ {
+    if (jj_done) return true;
+    if (jj_3R_382()) return true;
+    return false;
+  }
+
  inline bool jj_3R_298()
  {
     if (jj_done) return true;
@@ -5961,78 +6397,78 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_296()
+ inline bool jj_3_86()
  {
     if (jj_done) return true;
-    if (jj_3R_379()) return true;
+    if (jj_3R_123()) return true;
     return false;
   }
 
- inline bool jj_3_86()
+ inline bool jj_3R_296()
  {
     if (jj_done) return true;
-    if (jj_3R_124()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_295()
+ inline bool jj_3R_118()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
- inline bool jj_3_85()
+ inline bool jj_3_81()
  {
     if (jj_done) return true;
-    if (jj_3R_123()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_118()) jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
+    if (jj_scan_token(VARASSIGN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_118()
+ inline bool jj_3_85()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(COLON_T)) return true;
+    if (jj_3R_122()) return true;
     return false;
   }
 
- inline bool jj_3R_293()
+ inline bool jj_3R_294()
  {
     if (jj_done) return true;
-    if (jj_3R_377()) return true;
+    if (jj_3R_378()) return true;
     return false;
   }
 
- inline bool jj_3R_294()
+ inline bool jj_3R_295()
  {
     if (jj_done) return true;
     if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3R_292()
+ inline bool jj_3_84()
  {
     if (jj_done) return true;
-    if (jj_3R_376()) return true;
+    if (jj_3R_121()) return true;
     return false;
   }
 
- inline bool jj_3_80()
+ inline bool jj_3R_293()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_118()) jj_scanpos = xsp;
-    if (jj_3R_114()) return true;
-    if (jj_scan_token(VARASSIGN_T)) return true;
+    if (jj_3R_377()) return true;
     return false;
   }
 
- inline bool jj_3_84()
+ inline bool jj_3R_292()
  {
     if (jj_done) return true;
-    if (jj_3R_122()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
@@ -6043,17 +6479,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_290()
+ inline bool jj_3_83()
  {
     if (jj_done) return true;
-    if (jj_3R_374()) return true;
+    if (jj_3R_120()) return true;
     return false;
   }
 
- inline bool jj_3_83()
+ inline bool jj_3R_290()
  {
     if (jj_done) return true;
-    if (jj_3R_121()) return true;
+    if (jj_3R_374()) return true;
     return false;
   }
 
@@ -6078,31 +6514,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_82()
+ inline bool jj_3R_421()
  {
     if (jj_done) return true;
-    if (jj_3R_120()) return true;
+    if (jj_3R_508()) return true;
     return false;
   }
 
- inline bool jj_3R_286()
+ inline bool jj_3_82()
  {
     if (jj_done) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_119()) return true;
     return false;
   }
 
  inline bool jj_3R_420()
  {
     if (jj_done) return true;
-    if (jj_3R_507()) return true;
-    return false;
-  }
-
- inline bool jj_3R_419()
- {
-    if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
@@ -6111,54 +6540,62 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_285()) return false;
+    if (jj_3R_286()) {
     jj_scanpos = xsp;
-    if (!jj_3R_286()) return false;
+    if (jj_3R_287()) {
     jj_scanpos = xsp;
-    if (!jj_3R_287()) return false;
+    if (jj_3R_288()) {
     jj_scanpos = xsp;
-    if (!jj_3R_288()) return false;
+    if (jj_3R_289()) {
     jj_scanpos = xsp;
-    if (!jj_3R_289()) return false;
+    if (jj_3R_290()) {
     jj_scanpos = xsp;
-    if (!jj_3R_290()) return false;
+    if (jj_3R_291()) {
     jj_scanpos = xsp;
-    if (!jj_3R_291()) return false;
+    if (jj_3R_292()) {
     jj_scanpos = xsp;
-    if (!jj_3R_292()) return false;
+    if (jj_3R_293()) {
     jj_scanpos = xsp;
-    if (!jj_3R_293()) return false;
+    if (jj_3R_294()) {
     jj_scanpos = xsp;
-    if (!jj_3R_294()) return false;
+    if (jj_3R_295()) {
     jj_scanpos = xsp;
-    if (!jj_3R_295()) return false;
+    if (jj_3R_296()) {
     jj_scanpos = xsp;
-    if (!jj_3R_296()) return false;
+    if (jj_3R_297()) {
     jj_scanpos = xsp;
-    if (!jj_3R_297()) return false;
+    if (jj_3R_298()) {
     jj_scanpos = xsp;
-    if (!jj_3R_298()) return false;
+    if (jj_3R_299()) {
     jj_scanpos = xsp;
-    if (!jj_3_8()) return false;
+    if (jj_3_8()) {
     jj_scanpos = xsp;
-    if (jj_3R_299()) return true;
+    if (jj_3R_300()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_285()
+ inline bool jj_3R_286()
  {
     if (jj_done) return true;
     if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3_81()
- {
-    if (jj_done) return true;
-    if (jj_3R_119()) return true;
-    return false;
-  }
-
  inline bool jj_3R_113()
  {
     if (jj_done) return true;
@@ -6167,14 +6604,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_243()
+ inline bool jj_3R_244()
  {
     if (jj_done) return true;
-    if (jj_3R_361()) return true;
+    if (jj_3R_362()) return true;
     return false;
   }
 
- inline bool jj_3_76()
+ inline bool jj_3_77()
  {
     if (jj_done) return true;
     Token * xsp;
@@ -6185,19 +6622,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_332()
+ inline bool jj_3_80()
+ {
+    if (jj_done) return true;
+    if (jj_3R_117()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_333()
  {
     if (jj_done) return true;
     if (jj_scan_token(FOR_T)) return true;
-    if (jj_3R_418()) return true;
+    if (jj_3R_419()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_419()) { jj_scanpos = xsp; break; }
+      if (jj_3R_420()) { jj_scanpos = xsp; break; }
     }
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_420()) { jj_scanpos = xsp; break; }
+      if (jj_3R_421()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(FOR_T)) return true;
@@ -6208,29 +6652,22 @@ void parseInline();
  inline bool jj_3_79()
  {
     if (jj_done) return true;
-    if (jj_3R_117()) return true;
-    return false;
-  }
-
- inline bool jj_3_78()
- {
-    if (jj_done) return true;
     if (jj_3R_116()) return true;
     return false;
   }
 
- inline bool jj_3_77()
+ inline bool jj_3_78()
  {
     if (jj_done) return true;
     if (jj_3R_115()) return true;
     return false;
   }
 
- inline bool jj_3R_504()
+ inline bool jj_3R_505()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_317()) return true;
+    if (jj_3R_318()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_85()) return true;
     return false;
@@ -6241,38 +6678,58 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_242()) return false;
+    if (jj_3R_243()) {
     jj_scanpos = xsp;
-    if (!jj_3_77()) return false;
+    if (jj_3_78()) {
     jj_scanpos = xsp;
-    if (!jj_3_78()) return false;
+    if (jj_3_79()) {
     jj_scanpos = xsp;
-    if (!jj_3_79()) return false;
+    if (jj_3_80()) {
     jj_scanpos = xsp;
-    if (!jj_3R_243()) return false;
+    if (jj_3R_244()) {
     jj_scanpos = xsp;
-    if (!jj_3_81()) return false;
+    if (jj_3_82()) {
     jj_scanpos = xsp;
-    if (!jj_3_82()) return false;
+    if (jj_3_83()) {
     jj_scanpos = xsp;
-    if (!jj_3_83()) return false;
+    if (jj_3_84()) {
     jj_scanpos = xsp;
-    if (!jj_3_84()) return false;
+    if (jj_3_85()) {
     jj_scanpos = xsp;
-    if (!jj_3_85()) return false;
+    if (jj_3_86()) {
     jj_scanpos = xsp;
-    if (!jj_3_86()) return false;
+    if (jj_3_87()) {
     jj_scanpos = xsp;
-    if (!jj_3_87()) return false;
+    if (jj_3_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_244()) return true;
+    if (jj_3R_245()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_242()
+ inline bool jj_3R_243()
  {
     if (jj_done) return true;
-    if (jj_3R_360()) return true;
+    if (jj_3R_361()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_509()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
@@ -6283,7 +6740,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_239()
+ inline bool jj_3R_240()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -6292,116 +6749,108 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_508()
+ inline bool jj_3_76()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_112()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_259()
+ {
+    if (jj_done) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_76()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
- inline bool jj_3_75()
+ inline bool jj_3R_418()
  {
     if (jj_done) return true;
-    if (jj_3R_112()) return true;
+    if (jj_3R_329()) return true;
     return false;
   }
 
  inline bool jj_3R_417()
  {
     if (jj_done) return true;
-    if (jj_3R_328()) return true;
+    if (jj_3R_70()) return true;
     return false;
   }
 
  inline bool jj_3R_416()
  {
     if (jj_done) return true;
-    if (jj_3R_70()) return true;
+    if (jj_scan_token(USE_T)) return true;
+    if (jj_3R_506()) return true;
     return false;
   }
 
- inline bool jj_3R_258()
+ inline bool jj_3R_422()
  {
     if (jj_done) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_75()) { jj_scanpos = xsp; break; }
+      if (jj_3R_509()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_415()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(USE_T)) return true;
-    if (jj_3R_505()) return true;
-    return false;
-  }
-
- inline bool jj_3R_331()
+ inline bool jj_3R_332()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_415()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_416()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_417()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_418()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_421()
- {
-    if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_508()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
- inline bool jj_3R_266()
+ inline bool jj_3R_267()
  {
     if (jj_done) return true;
     if (jj_3R_58()) return true;
     return false;
   }
 
- inline bool jj_3R_363()
+ inline bool jj_3R_364()
  {
     if (jj_done) return true;
     if (jj_scan_token(ON_T)) return true;
-    if (jj_3R_421()) return true;
+    if (jj_3R_422()) return true;
     return false;
   }
 
- inline bool jj_3_74()
+ inline bool jj_3_75()
  {
     if (jj_done) return true;
     if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3R_410()
+ inline bool jj_3R_411()
  {
     if (jj_done) return true;
-    if (jj_3R_317()) return true;
+    if (jj_3R_318()) return true;
     if (jj_scan_token(WHEN_T)) return true;
     if (jj_3R_85()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_504()) { jj_scanpos = xsp; break; }
+      if (jj_3R_505()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_324()
+ inline bool jj_3R_325()
  {
     if (jj_done) return true;
     if (jj_scan_token(WITH_T)) return true;
@@ -6410,19 +6859,19 @@ void parseInline();
     if (jj_3R_114()) return true;
     if (jj_scan_token(LESSTHAN_T)) return true;
     if (jj_3R_166()) return true;
-    if (jj_3R_410()) return true;
+    if (jj_3R_411()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_688()
+ inline bool jj_3R_689()
  {
     if (jj_done) return true;
     if (jj_3R_111()) return true;
     return false;
   }
 
- inline bool jj_3R_471()
+ inline bool jj_3R_472()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -6431,7 +6880,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_338()
+ inline bool jj_3R_339()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEVERITY_T)) return true;
@@ -6439,7 +6888,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_359()
+ inline bool jj_3R_360()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -6449,93 +6898,95 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_378()
+ inline bool jj_3R_379()
  {
     if (jj_done) return true;
     if (jj_scan_token(ATTRIBUTE_T)) return true;
-    if (jj_3R_219()) return true;
+    if (jj_3R_220()) return true;
     if (jj_scan_token(OF_T)) return true;
-    if (jj_3R_469()) return true;
+    if (jj_3R_470()) return true;
     if (jj_scan_token(IS_T)) return true;
     if (jj_3R_58()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_315()
+ inline bool jj_3R_316()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_314()) return true;
+    if (jj_3R_315()) return true;
     return false;
   }
 
- inline bool jj_3R_110()
+ inline bool jj_3R_677()
  {
     if (jj_done) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_59()) return true;
+    if (jj_3R_81()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_239()) jj_scanpos = xsp;
+    if (jj_3R_689()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_676()
+ inline bool jj_3R_110()
  {
     if (jj_done) return true;
-    if (jj_3R_81()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(APOSTROPHE_T)) return true;
+    if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_688()) jj_scanpos = xsp;
+    if (jj_3R_240()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_354()
+ inline bool jj_3R_676()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_3R_688()) return true;
     return false;
   }
 
- inline bool jj_3R_675()
+ inline bool jj_3R_654()
  {
     if (jj_done) return true;
-    if (jj_3R_687()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_676()) {
+    jj_scanpos = xsp;
+    if (jj_3R_677()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_653()
+ inline bool jj_3R_355()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_675()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_676()) return true;
+    if (jj_scan_token(RANGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_219()
+ inline bool jj_3R_220()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_353()) return false;
+    if (jj_3R_354()) {
     jj_scanpos = xsp;
-    if (jj_3R_354()) return true;
+    if (jj_3R_355()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_353()
+ inline bool jj_3R_354()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_265()
+ inline bool jj_3R_266()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -6548,15 +6999,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_265()) jj_scanpos = xsp;
+    if (jj_3R_266()) jj_scanpos = xsp;
     if (jj_scan_token(RETURN_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_266()) jj_scanpos = xsp;
+    if (jj_3R_267()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_249()
+ inline bool jj_3R_250()
  {
     if (jj_done) return true;
     if (jj_scan_token(SEVERITY_T)) return true;
@@ -6564,6 +7015,14 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_308()
+ {
+    if (jj_done) return true;
+    if (jj_3R_388()) return true;
+    if (jj_3R_307()) return true;
+    return false;
+  }
+
  inline bool jj_3_6()
  {
     if (jj_done) return true;
@@ -6583,7 +7042,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_337()
+ inline bool jj_3R_338()
  {
     if (jj_done) return true;
     if (jj_scan_token(REPORT_T)) return true;
@@ -6591,56 +7050,48 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_307()
+ inline bool jj_3R_249()
  {
     if (jj_done) return true;
-    if (jj_3R_387()) return true;
-    if (jj_3R_306()) return true;
+    if (jj_3R_69()) return true;
+    if (jj_scan_token(COLON_T)) return true;
     return false;
   }
 
  inline bool jj_3R_165()
  {
     if (jj_done) return true;
-    if (jj_3R_314()) return true;
+    if (jj_3R_315()) return true;
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_315()) { jj_scanpos = xsp; break; }
+      if (jj_3R_316()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3R_248()
- {
-    if (jj_done) return true;
-    if (jj_3R_69()) return true;
-    if (jj_scan_token(COLON_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_116()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_248()) jj_scanpos = xsp;
+    if (jj_3R_249()) jj_scanpos = xsp;
     if (jj_scan_token(REPORT_T)) return true;
     if (jj_3R_58()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_249()) jj_scanpos = xsp;
+    if (jj_3R_250()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_700()
+ inline bool jj_3R_701()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_402()
+ inline bool jj_3R_403()
  {
     if (jj_done) return true;
     if (jj_3R_63()) return true;
@@ -6648,38 +7099,52 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_314()
+ inline bool jj_3R_483()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(NOTEQU_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_315()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_402()) jj_scanpos = xsp;
-    if (jj_3R_403()) return true;
+    if (jj_3R_403()) jj_scanpos = xsp;
+    if (jj_3R_404()) return true;
     return false;
   }
 
  inline bool jj_3R_482()
  {
     if (jj_done) return true;
-    if (jj_scan_token(NOTEQU_T)) return true;
+    if (jj_scan_token(LESSTHAN_T)) return true;
     return false;
   }
 
  inline bool jj_3R_481()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LESSTHAN_T)) return true;
+    if (jj_scan_token(GREATERTHAN_T)) return true;
     return false;
   }
 
  inline bool jj_3R_480()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GREATERTHAN_T)) return true;
+    if (jj_scan_token(EQU_T)) return true;
     return false;
   }
 
- inline bool jj_3R_247()
+ inline bool jj_3R_479()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(GT_T)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_248()
  {
     if (jj_done) return true;
     if (jj_3R_139()) return true;
@@ -6687,17 +7152,34 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_479()
+ inline bool jj_3R_388()
  {
     if (jj_done) return true;
-    if (jj_scan_token(EQU_T)) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_478()) {
+    jj_scanpos = xsp;
+    if (jj_3R_479()) {
+    jj_scanpos = xsp;
+    if (jj_3R_480()) {
+    jj_scanpos = xsp;
+    if (jj_3R_481()) {
+    jj_scanpos = xsp;
+    if (jj_3R_482()) {
+    jj_scanpos = xsp;
+    if (jj_3R_483()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
  inline bool jj_3R_478()
  {
     if (jj_done) return true;
-    if (jj_scan_token(GT_T)) return true;
+    if (jj_scan_token(LT_T)) return true;
     return false;
   }
 
@@ -6706,52 +7188,43 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_247()) jj_scanpos = xsp;
+    if (jj_3R_248()) jj_scanpos = xsp;
     if (jj_3R_187()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_387()
+ inline bool jj_3R_145()
  {
     if (jj_done) return true;
+    if (jj_3R_307()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_477()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_478()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_479()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_480()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_481()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_482()) return true;
+    if (jj_3R_308()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_477()
+ inline bool jj_3R_700()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LT_T)) return true;
+    if (jj_3R_705()) return true;
     return false;
   }
 
- inline bool jj_3R_145()
+ inline bool jj_3R_691()
  {
     if (jj_done) return true;
-    if (jj_3R_306()) return true;
+    if (jj_scan_token(RECORD_T)) return true;
     Token * xsp;
+    if (jj_3R_700()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_700()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(END_T)) return true;
+    if (jj_scan_token(RECORD_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_307()) jj_scanpos = xsp;
-    return false;
-  }
-
- inline bool jj_3R_699()
- {
-    if (jj_done) return true;
-    if (jj_3R_704()) return true;
+    if (jj_3R_701()) jj_scanpos = xsp;
     return false;
   }
 
@@ -6762,9 +7235,9 @@ void parseInline();
     if (jj_3R_79()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_337()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_338()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_339()) jj_scanpos = xsp;
     return false;
   }
 
@@ -6775,73 +7248,57 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_690()
+ inline bool jj_3_73()
  {
     if (jj_done) return true;
-    if (jj_scan_token(RECORD_T)) return true;
-    Token * xsp;
-    if (jj_3R_699()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_699()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(END_T)) return true;
-    if (jj_scan_token(RECORD_T)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_700()) jj_scanpos = xsp;
+    if (jj_3R_68()) return true;
+    if (jj_3R_109()) return true;
+    if (jj_3R_68()) return true;
     return false;
   }
 
- inline bool jj_3R_698()
+ inline bool jj_3_74()
  {
     if (jj_done) return true;
-    if (jj_3R_703()) return true;
+    if (jj_3R_110()) return true;
     return false;
   }
 
- inline bool jj_3_72()
+ inline bool jj_3R_699()
  {
     if (jj_done) return true;
-    if (jj_3R_68()) return true;
-    if (jj_3R_109()) return true;
-    if (jj_3R_68()) return true;
+    if (jj_3R_704()) return true;
     return false;
   }
 
- inline bool jj_3_73()
+ inline bool jj_3R_81()
  {
     if (jj_done) return true;
-    if (jj_3R_110()) return true;
+    if (jj_scan_token(RANGE_T)) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
- inline bool jj_3R_697()
+ inline bool jj_3R_698()
  {
     if (jj_done) return true;
     if (jj_3R_62()) return true;
     return false;
   }
 
- inline bool jj_3R_689()
+ inline bool jj_3R_690()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_697()) return false;
+    if (jj_3R_698()) {
     jj_scanpos = xsp;
-    if (jj_3R_698()) return true;
-    return false;
-  }
-
- inline bool jj_3R_81()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(RANGE_T)) return true;
-    if (jj_3R_83()) return true;
+    if (jj_3R_699()) return true;
+    }
     return false;
   }
 
- inline bool jj_3_71()
+ inline bool jj_3_72()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
@@ -6869,13 +7326,14 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_181()) return false;
+    if (jj_3R_181()) {
     jj_scanpos = xsp;
     if (jj_3R_182()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_227()
+ inline bool jj_3R_228()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -6884,17 +7342,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_226()
+ inline bool jj_3R_227()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3R_465()
+ inline bool jj_3R_466()
  {
     if (jj_done) return true;
-    if (jj_3R_233()) return true;
+    if (jj_3R_234()) return true;
     return false;
   }
 
@@ -6905,13 +7363,14 @@ void parseInline();
     if (jj_scan_token(APOSTROPHE_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_226()) return false;
+    if (jj_3R_227()) {
     jj_scanpos = xsp;
-    if (jj_3R_227()) return true;
+    if (jj_3R_228()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_341()
+ inline bool jj_3R_342()
  {
     if (jj_done) return true;
     if (jj_3R_112()) return true;
@@ -6924,7 +7383,7 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_341()) { jj_scanpos = xsp; break; }
+      if (jj_3R_342()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -6936,22 +7395,22 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_236()
+ inline bool jj_3R_340()
  {
     if (jj_done) return true;
-    if (jj_scan_token(COMMA_T)) return true;
-    if (jj_3R_235()) return true;
+    if (jj_3R_422()) return true;
     return false;
   }
 
- inline bool jj_3R_339()
+ inline bool jj_3R_237()
  {
     if (jj_done) return true;
-    if (jj_3R_421()) return true;
+    if (jj_scan_token(COMMA_T)) return true;
+    if (jj_3R_236()) return true;
     return false;
   }
 
- inline bool jj_3R_575()
+ inline bool jj_3R_576()
  {
     if (jj_done) return true;
     if (jj_scan_token(NEW_T)) return true;
@@ -6959,14 +7418,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_530()
+ inline bool jj_3R_531()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3_4()) return false;
+    if (jj_3_4()) {
     jj_scanpos = xsp;
-    if (jj_3R_575()) return true;
+    if (jj_3R_576()) return true;
+    }
     return false;
   }
 
@@ -6978,37 +7438,39 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_536()
+ inline bool jj_3R_537()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
- inline bool jj_3R_535()
+ inline bool jj_3R_536()
  {
     if (jj_done) return true;
     if (jj_scan_token(CHARACTER_LITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_534()
+ inline bool jj_3R_535()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_463()
+ inline bool jj_3R_464()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_534()) return false;
+    if (jj_3R_535()) {
     jj_scanpos = xsp;
-    if (!jj_3R_535()) return false;
+    if (jj_3R_536()) {
     jj_scanpos = xsp;
-    if (jj_3R_536()) return true;
+    if (jj_3R_537()) return true;
+    }
+    }
     return false;
   }
 
@@ -7018,14 +7480,15 @@ void parseInline();
     if (jj_scan_token(LPAREN_T)) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_scan_token(15)) return false;
+    if (jj_scan_token(15)) {
     jj_scanpos = xsp;
-    if (jj_3R_339()) return true;
+    if (jj_3R_340()) return true;
+    }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_464()
+ inline bool jj_3R_465()
  {
     if (jj_done) return true;
     if (jj_scan_token(COLON_T)) return true;
@@ -7033,36 +7496,22 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_376()
+ inline bool jj_3R_377()
  {
     if (jj_done) return true;
     if (jj_scan_token(ALIAS_T)) return true;
-    if (jj_3R_463()) return true;
+    if (jj_3R_464()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_464()) jj_scanpos = xsp;
+    if (jj_3R_465()) jj_scanpos = xsp;
     if (jj_scan_token(IS_T)) return true;
     if (jj_3R_59()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_465()) jj_scanpos = xsp;
+    if (jj_3R_466()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_108()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_235()) return true;
-    Token * xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_236()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN_T)) return true;
-    return false;
-  }
-
  inline bool jj_3R_188()
  {
     if (jj_done) return true;
@@ -7071,17 +7520,17 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_272()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(MINUS_T)) return true;
-    return false;
-  }
-
- inline bool jj_3R_273()
+ inline bool jj_3R_108()
  {
     if (jj_done) return true;
-    if (jj_scan_token(AMPERSAND_T)) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_236()) return true;
+    Token * xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_237()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
@@ -7111,30 +7560,24 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_340()
+ inline bool jj_3R_341()
  {
     if (jj_done) return true;
-    if (jj_3R_422()) return true;
+    if (jj_3R_423()) return true;
     return false;
   }
 
- inline bool jj_3R_128()
+ inline bool jj_3R_273()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_271()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_272()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_273()) return true;
+    if (jj_scan_token(MINUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_271()
+ inline bool jj_3R_274()
  {
     if (jj_done) return true;
-    if (jj_scan_token(PLUS_T)) return true;
+    if (jj_scan_token(AMPERSAND_T)) return true;
     return false;
   }
 
@@ -7144,90 +7587,99 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_340()) { jj_scanpos = xsp; break; }
+      if (jj_3R_341()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
- inline bool jj_3_3()
+ inline bool jj_3R_128()
  {
     if (jj_done) return true;
-    if (jj_3R_60()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_272()) {
+    jj_scanpos = xsp;
+    if (jj_3R_273()) {
+    jj_scanpos = xsp;
+    if (jj_3R_274()) return true;
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_518()
+ inline bool jj_3R_272()
  {
     if (jj_done) return true;
-    if (jj_3R_382()) return true;
+    if (jj_scan_token(PLUS_T)) return true;
     return false;
   }
 
- inline bool jj_3R_491()
+ inline bool jj_3R_519()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BOX_T)) return true;
+    if (jj_3R_383()) return true;
     return false;
   }
 
- inline bool jj_3R_492()
+ inline bool jj_3_3()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
     if (jj_3R_60()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_70()
+ inline bool jj_3R_518()
  {
     if (jj_done) return true;
-    if (jj_3R_65()) return true;
+    if (jj_3R_382()) return true;
     return false;
   }
 
- inline bool jj_3R_517()
+ inline bool jj_3_71()
  {
     if (jj_done) return true;
-    if (jj_3R_381()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_516()
+ inline bool jj_3R_517()
  {
     if (jj_done) return true;
-    if (jj_3R_378()) return true;
+    if (jj_3R_379()) return true;
     return false;
   }
 
- inline bool jj_3R_403()
+ inline bool jj_3R_492()
  {
     if (jj_done) return true;
-    Token * xsp;
-    xsp = jj_scanpos;
-    if (!jj_3R_490()) return false;
-    jj_scanpos = xsp;
-    if (!jj_3R_491()) return false;
-    jj_scanpos = xsp;
-    if (jj_3R_492()) return true;
+    if (jj_scan_token(BOX_T)) return true;
     return false;
   }
 
- inline bool jj_3R_490()
+ inline bool jj_3R_493()
  {
     if (jj_done) return true;
+    if (jj_3R_59()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
     if (jj_3R_60()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_69()
+ inline bool jj_3_70()
  {
     if (jj_done) return true;
     if (jj_3R_64()) return true;
     return false;
   }
 
+ inline bool jj_3R_516()
+ {
+    if (jj_done) return true;
+    if (jj_3R_377()) return true;
+    return false;
+  }
+
  inline bool jj_3R_515()
  {
     if (jj_done) return true;
@@ -7235,10 +7687,25 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_2()
+ inline bool jj_3R_404()
  {
     if (jj_done) return true;
-    if (jj_3R_59()) return true;
+    Token * xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_491()) {
+    jj_scanpos = xsp;
+    if (jj_3R_492()) {
+    jj_scanpos = xsp;
+    if (jj_3R_493()) return true;
+    }
+    }
+    return false;
+  }
+
+ inline bool jj_3R_491()
+ {
+    if (jj_done) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
@@ -7252,14 +7719,14 @@ void parseInline();
  inline bool jj_3R_513()
  {
     if (jj_done) return true;
-    if (jj_3R_374()) return true;
+    if (jj_3R_373()) return true;
     return false;
   }
 
- inline bool jj_3R_225()
+ inline bool jj_3_2()
  {
     if (jj_done) return true;
-    if (jj_3R_165()) return true;
+    if (jj_3R_59()) return true;
     return false;
   }
 
@@ -7277,10 +7744,10 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_510()
+ inline bool jj_3R_226()
  {
     if (jj_done) return true;
-    if (jj_3R_370()) return true;
+    if (jj_3R_165()) return true;
     return false;
   }
 
@@ -7291,49 +7758,60 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_422()
+ inline bool jj_3R_423()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_509()) return false;
+    if (jj_3R_510()) {
     jj_scanpos = xsp;
-    if (!jj_3R_510()) return false;
+    if (jj_3R_511()) {
     jj_scanpos = xsp;
-    if (!jj_3R_511()) return false;
+    if (jj_3R_512()) {
     jj_scanpos = xsp;
-    if (!jj_3R_512()) return false;
+    if (jj_3R_513()) {
     jj_scanpos = xsp;
-    if (!jj_3R_513()) return false;
+    if (jj_3R_514()) {
     jj_scanpos = xsp;
-    if (!jj_3R_514()) return false;
+    if (jj_3R_515()) {
     jj_scanpos = xsp;
-    if (!jj_3R_515()) return false;
+    if (jj_3R_516()) {
     jj_scanpos = xsp;
-    if (!jj_3_69()) return false;
+    if (jj_3_70()) {
     jj_scanpos = xsp;
-    if (!jj_3R_516()) return false;
+    if (jj_3R_517()) {
     jj_scanpos = xsp;
-    if (!jj_3R_517()) return false;
+    if (jj_3R_518()) {
     jj_scanpos = xsp;
-    if (!jj_3_70()) return false;
+    if (jj_3_71()) {
     jj_scanpos = xsp;
-    if (jj_3R_518()) return true;
+    if (jj_3R_519()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_509()
+ inline bool jj_3R_510()
  {
     if (jj_done) return true;
     if (jj_3R_92()) return true;
     return false;
   }
 
- inline bool jj_3R_329()
+ inline bool jj_3R_330()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_225()) return true;
+    if (jj_3R_226()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
@@ -7345,14 +7823,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_152()
- {
-    if (jj_done) return true;
-    if (jj_3R_58()) return true;
-    return false;
-  }
-
- inline bool jj_3_68()
+ inline bool jj_3_69()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -7365,12 +7836,19 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3_68()) jj_scanpos = xsp;
+    if (jj_3_69()) jj_scanpos = xsp;
     if (jj_3R_176()) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
+ inline bool jj_3R_152()
+ {
+    if (jj_done) return true;
+    if (jj_3R_58()) return true;
+    return false;
+  }
+
  inline bool jj_3R_151()
  {
     if (jj_done) return true;
@@ -7383,19 +7861,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_151()) return false;
+    if (jj_3R_151()) {
     jj_scanpos = xsp;
-    if (!jj_3R_152()) return false;
+    if (jj_3R_152()) {
     jj_scanpos = xsp;
     if (jj_3R_153()) return true;
-    return false;
-  }
-
- inline bool jj_3R_655()
- {
-    if (jj_done) return true;
-    if (jj_scan_token(ACCESS_T)) return true;
-    if (jj_3R_84()) return true;
+    }
+    }
     return false;
   }
 
@@ -7405,39 +7877,54 @@ void parseInline();
     if (jj_3R_59()) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_329()) jj_scanpos = xsp;
+    if (jj_3R_330()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_66()
+ inline bool jj_3_67()
  {
     if (jj_done) return true;
     if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3R_224()
+ inline bool jj_3R_656()
  {
     if (jj_done) return true;
-    if (jj_scan_token(BASED_LITERAL)) return true;
+    if (jj_scan_token(ACCESS_T)) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
  inline bool jj_3R_204()
  {
     if (jj_done) return true;
-    if (jj_3R_350()) return true;
+    if (jj_3R_351()) return true;
     return false;
   }
 
- inline bool jj_3R_223()
+ inline bool jj_3R_225()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(BASED_LITERAL)) return true;
+    return false;
+  }
+
+ inline bool jj_3R_224()
  {
     if (jj_done) return true;
     if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
- inline bool jj_3R_222()
+ inline bool jj_3_68()
+ {
+    if (jj_done) return true;
+    if (jj_3R_107()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_223()
  {
     if (jj_done) return true;
     if (jj_scan_token(DECIMAL_LITERAL)) return true;
@@ -7449,18 +7936,13 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_222()) return false;
+    if (jj_3R_223()) {
     jj_scanpos = xsp;
-    if (!jj_3R_223()) return false;
+    if (jj_3R_224()) {
     jj_scanpos = xsp;
-    if (jj_3R_224()) return true;
-    return false;
-  }
-
- inline bool jj_3_67()
- {
-    if (jj_done) return true;
-    if (jj_3R_107()) return true;
+    if (jj_3R_225()) return true;
+    }
+    }
     return false;
   }
 
@@ -7474,14 +7956,14 @@ void parseInline();
  inline bool jj_3R_202()
  {
     if (jj_done) return true;
-    if (jj_3R_349()) return true;
+    if (jj_3R_350()) return true;
     return false;
   }
 
  inline bool jj_3R_201()
  {
     if (jj_done) return true;
-    if (jj_3R_348()) return true;
+    if (jj_3R_349()) return true;
     return false;
   }
 
@@ -7490,68 +7972,72 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_201()) return false;
+    if (jj_3R_201()) {
     jj_scanpos = xsp;
-    if (!jj_3R_202()) return false;
+    if (jj_3R_202()) {
     jj_scanpos = xsp;
-    if (!jj_3R_203()) return false;
+    if (jj_3R_203()) {
     jj_scanpos = xsp;
-    if (!jj_3_67()) return false;
+    if (jj_3_68()) {
     jj_scanpos = xsp;
     if (jj_3R_204()) return true;
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3_65()
+ inline bool jj_3_66()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3_64()
+ inline bool jj_3_65()
  {
     if (jj_done) return true;
     if (jj_3R_106()) return true;
     return false;
   }
 
- inline bool jj_3R_456()
+ inline bool jj_3R_457()
  {
     if (jj_done) return true;
     if (jj_3R_108()) return true;
     return false;
   }
 
- inline bool jj_3_63()
+ inline bool jj_3_64()
  {
     if (jj_done) return true;
     if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_455()
+ inline bool jj_3R_456()
  {
     if (jj_done) return true;
-    if (jj_3R_530()) return true;
+    if (jj_3R_531()) return true;
     return false;
   }
 
- inline bool jj_3_62()
+ inline bool jj_3_63()
  {
     if (jj_done) return true;
     if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_454()
+ inline bool jj_3R_455()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3_61()
+ inline bool jj_3_62()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -7560,42 +8046,42 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_453()
+ inline bool jj_3R_454()
  {
     if (jj_done) return true;
     if (jj_3R_106()) return true;
     return false;
   }
 
- inline bool jj_3_60()
+ inline bool jj_3_61()
  {
     if (jj_done) return true;
     if (jj_3R_104()) return true;
     return false;
   }
 
- inline bool jj_3R_241()
+ inline bool jj_3R_242()
  {
     if (jj_done) return true;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_452()
+ inline bool jj_3R_453()
  {
     if (jj_done) return true;
     if (jj_3R_105()) return true;
     return false;
   }
 
- inline bool jj_3R_451()
+ inline bool jj_3R_452()
  {
     if (jj_done) return true;
     if (jj_3R_61()) return true;
     return false;
   }
 
- inline bool jj_3R_450()
+ inline bool jj_3R_451()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -7604,37 +8090,44 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_369()
+ inline bool jj_3R_370()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_449()) return false;
+    if (jj_3R_450()) {
     jj_scanpos = xsp;
-    if (!jj_3R_450()) return false;
+    if (jj_3R_451()) {
     jj_scanpos = xsp;
-    if (!jj_3R_451()) return false;
+    if (jj_3R_452()) {
     jj_scanpos = xsp;
-    if (!jj_3R_452()) return false;
+    if (jj_3R_453()) {
     jj_scanpos = xsp;
-    if (!jj_3R_453()) return false;
+    if (jj_3R_454()) {
     jj_scanpos = xsp;
-    if (!jj_3R_454()) return false;
+    if (jj_3R_455()) {
     jj_scanpos = xsp;
-    if (!jj_3R_455()) return false;
+    if (jj_3R_456()) {
     jj_scanpos = xsp;
-    if (jj_3R_456()) return true;
+    if (jj_3R_457()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_449()
+ inline bool jj_3R_450()
  {
     if (jj_done) return true;
     if (jj_3R_104()) return true;
     return false;
   }
 
- inline bool jj_3R_328()
+ inline bool jj_3R_329()
  {
     if (jj_done) return true;
     if (jj_scan_token(PORT_T)) return true;
@@ -7645,26 +8138,26 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_581()
+ inline bool jj_3R_582()
  {
     if (jj_done) return true;
-    if (jj_3R_312()) return true;
+    if (jj_3R_313()) return true;
     return false;
   }
 
- inline bool jj_3R_240()
+ inline bool jj_3R_241()
  {
     if (jj_done) return true;
-    if (jj_3R_359()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
- inline bool jj_3R_537()
+ inline bool jj_3R_538()
  {
     if (jj_done) return true;
     if (jj_scan_token(PORT_T)) return true;
     if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_581()) return true;
+    if (jj_3R_582()) return true;
     if (jj_scan_token(RPAREN_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
@@ -7679,23 +8172,23 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_240()) { jj_scanpos = xsp; break; }
+      if (jj_3R_241()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(UNITS_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_241()) jj_scanpos = xsp;
+    if (jj_3R_242()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_59()
+ inline bool jj_3_60()
  {
     if (jj_done) return true;
     if (jj_3R_103()) return true;
     return false;
   }
 
- inline bool jj_3R_221()
+ inline bool jj_3R_222()
  {
     if (jj_done) return true;
     if (jj_3R_103()) return true;
@@ -7707,12 +8200,12 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_221()) jj_scanpos = xsp;
+    if (jj_3R_222()) jj_scanpos = xsp;
     if (jj_3R_59()) return true;
     return false;
   }
 
- inline bool jj_3R_407()
+ inline bool jj_3R_408()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -7721,28 +8214,28 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_58()
+ inline bool jj_3_59()
  {
     if (jj_done) return true;
     if (jj_3R_86()) return true;
     return false;
   }
 
- inline bool jj_3_56()
+ inline bool jj_3_57()
  {
     if (jj_done) return true;
     if (jj_3R_64()) return true;
     return false;
   }
 
- inline bool jj_3_57()
+ inline bool jj_3_58()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_350()
+ inline bool jj_3R_351()
  {
     if (jj_done) return true;
     if (jj_scan_token(PACKAGE_T)) return true;
@@ -7750,21 +8243,21 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_55()
+ inline bool jj_3_56()
  {
     if (jj_done) return true;
     if (jj_3R_65()) return true;
     return false;
   }
 
- inline bool jj_3R_316()
+ inline bool jj_3R_317()
  {
     if (jj_done) return true;
-    if (jj_3R_404()) return true;
+    if (jj_3R_405()) return true;
     return false;
   }
 
- inline bool jj_3R_260()
+ inline bool jj_3R_261()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -7778,32 +8271,32 @@ void parseInline();
     xsp = jj_scanpos;
     if (jj_scan_token(50)) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_316()) jj_scanpos = xsp;
+    if (jj_3R_317()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_309()
+ inline bool jj_3R_310()
  {
     if (jj_done) return true;
     if (jj_scan_token(STRINGLITERAL)) return true;
     return false;
   }
 
- inline bool jj_3R_646()
+ inline bool jj_3R_647()
  {
     if (jj_done) return true;
     if (jj_scan_token(TYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_645()
+ inline bool jj_3R_646()
  {
     if (jj_done) return true;
     if (jj_scan_token(FILE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_644()
+ inline bool jj_3R_645()
  {
     if (jj_done) return true;
     if (jj_scan_token(SHARED_T)) return true;
@@ -7811,54 +8304,59 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_54()
+ inline bool jj_3_55()
  {
     if (jj_done) return true;
     if (jj_3R_102()) return true;
     return false;
   }
 
- inline bool jj_3R_643()
+ inline bool jj_3R_644()
  {
     if (jj_done) return true;
     if (jj_scan_token(VARIABLE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_642()
+ inline bool jj_3R_643()
  {
     if (jj_done) return true;
     if (jj_scan_token(SIGNAL_T)) return true;
     return false;
   }
 
- inline bool jj_3R_641()
+ inline bool jj_3R_642()
  {
     if (jj_done) return true;
     if (jj_scan_token(CONSTANT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_612()
+ inline bool jj_3R_613()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_641()) return false;
+    if (jj_3R_642()) {
     jj_scanpos = xsp;
-    if (!jj_3R_642()) return false;
+    if (jj_3R_643()) {
     jj_scanpos = xsp;
-    if (!jj_3R_643()) return false;
+    if (jj_3R_644()) {
     jj_scanpos = xsp;
-    if (!jj_3R_644()) return false;
+    if (jj_3R_645()) {
     jj_scanpos = xsp;
-    if (!jj_3R_645()) return false;
+    if (jj_3R_646()) {
     jj_scanpos = xsp;
-    if (jj_3R_646()) return true;
+    if (jj_3R_647()) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_352()
+ inline bool jj_3R_353()
  {
     if (jj_done) return true;
     if (jj_scan_token(COMMA_T)) return true;
@@ -7885,13 +8383,14 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_205()) return false;
+    if (jj_3R_205()) {
     jj_scanpos = xsp;
     if (jj_3R_206()) return true;
+    }
     return false;
   }
 
- inline bool jj_3R_440()
+ inline bool jj_3R_441()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -7899,12 +8398,12 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_362()
+ inline bool jj_3R_363()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_440()) jj_scanpos = xsp;
+    if (jj_3R_441()) jj_scanpos = xsp;
     if (jj_scan_token(NULL_T)) return true;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
@@ -7918,7 +8417,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_261()
+ inline bool jj_3R_262()
  {
     if (jj_done) return true;
     if (jj_scan_token(WHEN_T)) return true;
@@ -7926,14 +8425,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3_53()
+ inline bool jj_3_54()
  {
     if (jj_done) return true;
     if (jj_scan_token(LBRACKET_T)) return true;
     return false;
   }
 
- inline bool jj_3R_259()
+ inline bool jj_3R_260()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -7946,17 +8445,17 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_259()) jj_scanpos = xsp;
-    if (jj_scan_token(NEXT_T)) return true;
-    xsp = jj_scanpos;
     if (jj_3R_260()) jj_scanpos = xsp;
+    if (jj_scan_token(NEXT_T)) return true;
     xsp = jj_scanpos;
     if (jj_3R_261()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_262()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
 
- inline bool jj_3R_220()
+ inline bool jj_3R_221()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -7965,14 +8464,14 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_218()
+ inline bool jj_3R_219()
  {
     if (jj_done) return true;
-    if (jj_3R_233()) return true;
+    if (jj_3R_234()) return true;
     return false;
   }
 
- inline bool jj_3_52()
+ inline bool jj_3_53()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -7991,38 +8490,38 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_218()) jj_scanpos = xsp;
+    if (jj_3R_219()) jj_scanpos = xsp;
     if (jj_scan_token(APOSTROPHE_T)) return true;
-    if (jj_3R_219()) return true;
+    if (jj_3R_220()) return true;
     xsp = jj_scanpos;
-    if (jj_3R_220()) jj_scanpos = xsp;
+    if (jj_3R_221()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3_48()
+ inline bool jj_3_52()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_scan_token(LPAREN_T)) return true;
+    if (jj_3R_67()) return true;
+    if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_51()
+ inline bool jj_3_48()
  {
     if (jj_done) return true;
-    if (jj_scan_token(LPAREN_T)) return true;
-    if (jj_3R_67()) return true;
-    if (jj_scan_token(RPAREN_T)) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
- inline bool jj_3_50()
+ inline bool jj_3_51()
  {
     if (jj_done) return true;
     if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_213()
+ inline bool jj_3R_214()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -8030,13 +8529,13 @@ void parseInline();
     Token * xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_352()) { jj_scanpos = xsp; break; }
+      if (jj_3R_353()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(RPAREN_T)) return true;
     return false;
   }
 
- inline bool jj_3_49()
+ inline bool jj_3_50()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
@@ -8044,14 +8543,15 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_209()
+ inline bool jj_3_49()
  {
     if (jj_done) return true;
-    if (jj_3R_98()) return true;
+    if (jj_scan_token(APOSTROPHE_T)) return true;
+    if (jj_scan_token(SUBTYPE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_212()
+ inline bool jj_3R_213()
  {
     if (jj_done) return true;
     if (jj_scan_token(LPAREN_T)) return true;
@@ -8060,21 +8560,28 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_149()
+ inline bool jj_3R_209()
  {
     if (jj_done) return true;
-    if (jj_3R_310()) return true;
+    if (jj_3R_98()) return true;
     return false;
   }
 
- inline bool jj_3R_211()
+ inline bool jj_3R_212()
  {
     if (jj_done) return true;
     if (jj_3R_100()) return true;
     return false;
   }
 
- inline bool jj_3R_210()
+ inline bool jj_3R_149()
+ {
+    if (jj_done) return true;
+    if (jj_3R_311()) return true;
+    return false;
+  }
+
+ inline bool jj_3R_211()
  {
     if (jj_done) return true;
     if (jj_scan_token(DOT_T)) return true;
@@ -8082,18 +8589,32 @@ void parseInline();
     return false;
   }
 
+ inline bool jj_3R_210()
+ {
+    if (jj_done) return true;
+    if (jj_scan_token(APOSTROPHE_T)) return true;
+    if (jj_scan_token(SUBTYPE_T)) return true;
+    return false;
+  }
+
  inline bool jj_3R_98()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_210()) return false;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
+    if (jj_3R_211()) {
     jj_scanpos = xsp;
-    if (!jj_3R_211()) return false;
+    if (jj_3R_212()) {
     jj_scanpos = xsp;
-    if (!jj_3R_212()) return false;
+    if (jj_3R_213()) {
     jj_scanpos = xsp;
-    if (jj_3R_213()) return true;
+    if (jj_3R_214()) return true;
+    }
+    }
+    }
+    }
     return false;
   }
 
@@ -8133,7 +8654,7 @@ void parseInline();
  inline bool jj_3R_147()
  {
     if (jj_done) return true;
-    if (jj_3R_309()) return true;
+    if (jj_3R_310()) return true;
     return false;
   }
 
@@ -8142,31 +8663,33 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_147()) return false;
+    if (jj_3R_147()) {
     jj_scanpos = xsp;
-    if (!jj_3R_148()) return false;
+    if (jj_3R_148()) {
     jj_scanpos = xsp;
     if (jj_3R_149()) return true;
+    }
+    }
     xsp = jj_scanpos;
     if (jj_3R_150()) jj_scanpos = xsp;
     return false;
   }
 
- inline bool jj_3R_280()
+ inline bool jj_3R_281()
  {
     if (jj_done) return true;
     if (jj_scan_token(REM_T)) return true;
     return false;
   }
 
- inline bool jj_3R_279()
+ inline bool jj_3R_280()
  {
     if (jj_done) return true;
     if (jj_scan_token(MOD_T)) return true;
     return false;
   }
 
- inline bool jj_3R_278()
+ inline bool jj_3R_279()
  {
     if (jj_done) return true;
     if (jj_scan_token(SLASH_T)) return true;
@@ -8178,90 +8701,97 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_277()) return false;
+    if (jj_3R_278()) {
     jj_scanpos = xsp;
-    if (!jj_3R_278()) return false;
+    if (jj_3R_279()) {
     jj_scanpos = xsp;
-    if (!jj_3R_279()) return false;
+    if (jj_3R_280()) {
     jj_scanpos = xsp;
-    if (jj_3R_280()) return true;
+    if (jj_3R_281()) return true;
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_277()
+ inline bool jj_3R_278()
  {
     if (jj_done) return true;
     if (jj_scan_token(MULT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_628()
+ inline bool jj_3R_629()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
     return false;
   }
 
- inline bool jj_3R_430()
+ inline bool jj_3R_431()
  {
     if (jj_done) return true;
     if (jj_scan_token(LINKAGE_T)) return true;
     return false;
   }
 
- inline bool jj_3R_429()
+ inline bool jj_3R_430()
  {
     if (jj_done) return true;
     if (jj_scan_token(BUFFER_T)) return true;
     return false;
   }
 
- inline bool jj_3R_428()
+ inline bool jj_3R_429()
  {
     if (jj_done) return true;
     if (jj_scan_token(INOUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_427()
+ inline bool jj_3R_428()
  {
     if (jj_done) return true;
     if (jj_scan_token(OUT_T)) return true;
     return false;
   }
 
- inline bool jj_3R_345()
+ inline bool jj_3R_346()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_426()) return false;
+    if (jj_3R_427()) {
     jj_scanpos = xsp;
-    if (!jj_3R_427()) return false;
+    if (jj_3R_428()) {
     jj_scanpos = xsp;
-    if (!jj_3R_428()) return false;
+    if (jj_3R_429()) {
     jj_scanpos = xsp;
-    if (!jj_3R_429()) return false;
+    if (jj_3R_430()) {
     jj_scanpos = xsp;
-    if (jj_3R_430()) return true;
+    if (jj_3R_431()) return true;
+    }
+    }
+    }
+    }
     return false;
   }
 
- inline bool jj_3R_426()
+ inline bool jj_3R_427()
  {
     if (jj_done) return true;
     if (jj_scan_token(IN_T)) return true;
     return false;
   }
 
- inline bool jj_3R_257()
+ inline bool jj_3R_258()
  {
     if (jj_done) return true;
-    if (jj_3R_366()) return true;
+    if (jj_3R_367()) return true;
     return false;
   }
 
- inline bool jj_3R_256()
+ inline bool jj_3R_257()
  {
     if (jj_done) return true;
     if (jj_3R_69()) return true;
@@ -8274,15 +8804,15 @@ void parseInline();
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (jj_3R_256()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_257()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_258()) jj_scanpos = xsp;
     if (jj_scan_token(LOOP_T)) return true;
-    if (jj_3R_258()) return true;
+    if (jj_3R_259()) return true;
     if (jj_scan_token(END_T)) return true;
     if (jj_scan_token(LOOP_T)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_628()) jj_scanpos = xsp;
+    if (jj_3R_629()) jj_scanpos = xsp;
     if (jj_scan_token(SEMI_T)) return true;
     return false;
   }
@@ -8301,7 +8831,7 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_232()
+ inline bool jj_3R_233()
  {
     if (jj_done) return true;
     if (jj_scan_token(NULL_T)) return true;
@@ -8315,111 +8845,115 @@ void parseInline();
     return false;
   }
 
- inline bool jj_3R_231()
+ inline bool jj_3R_232()
  {
     if (jj_done) return true;
-    if (jj_3R_355()) return true;
+    if (jj_3R_356()) return true;
     return false;
   }
 
- inline bool jj_3R_230()
+ inline bool jj_3R_231()
  {
     if (jj_done) return true;
     if (jj_3R_96()) return true;
     return false;
   }
 
- inline bool jj_3R_229()
+ inline bool jj_3R_230()
  {
     if (jj_done) return true;
     if (jj_3R_95()) return true;
     return false;
   }
 
- inline bool jj_3R_228()
- {
-    if (jj_done) return true;
-    if (jj_3R_94()) return true;
-    return false;
-  }
-
  inline bool jj_3R_106()
  {
     if (jj_done) return true;
     Token * xsp;
     xsp = jj_scanpos;
-    if (!jj_3R_228()) return false;
+    if (jj_3R_229()) {
     jj_scanpos = xsp;
-    if (!jj_3R_229()) return false;
+    if (jj_3R_230()) {
     jj_scanpos = xsp;
-    if (!jj_3R_230()) return false;
+    if (jj_3R_231()) {
     jj_scanpos = xsp;
-    if (!jj_3R_231()) return false;
+    if (jj_3R_232()) {
     jj_scanpos = xsp;
-    if (jj_3R_232()) return true;
+    if (jj_3R_233()) return true;
+    }
+    }
+    }
+    }
     return false;
   }
 
-
-public: 
-  void setErrorHandler(ErrorHandler *eh) {
-    if (errorHandler) delete errorHandler;
-    errorHandler = eh;
+ inline bool jj_3R_229()
+ {
+    if (jj_done) return true;
+    if (jj_3R_94()) return true;
+    return false;
   }
 
-  TokenManager *token_source = nullptr;
-  CharStream   *jj_input_stream = nullptr;
+  public: TokenManager *token_source;
+  public: CharStream *jj_input_stream;
   /** Current token. */
-  Token        *token = nullptr;
+  public: Token *token;
   /** Next token. */
-  Token        *jj_nt = nullptr;
-
-private: 
-  int           jj_ntk;
-  JJCalls       jj_2_rtns[116];
-  bool          jj_rescan;
-  int           jj_gc;
-  Token        *jj_scanpos, *jj_lastpos;
-  int           jj_la;
+  public: Token *jj_nt;
+  private: int jj_ntk;
+  private: JJCalls jj_2_rtns[117];
+  private: bool jj_rescan;
+  private: int jj_gc;
+  private: Token *jj_scanpos, *jj_lastpos;
+  private: int jj_la;
   /** Whether we are looking ahead. */
-  bool          jj_lookingAhead;
-  bool          jj_semLA;
-  int           jj_gen;
-  int           jj_la1[294];
-  ErrorHandler *errorHandler = nullptr;
-
-protected: 
-  bool          hasError;
-
-  Token *head; 
-public: 
-  VhdlParser(TokenManager *tokenManager);
-  virtual ~VhdlParser();
-void ReInit(TokenManager* tokenManager);
-void clear();
+  private: bool jj_lookingAhead;
+  private: bool jj_semLA;
+  private: int jj_gen;
+  private: int jj_la1[294];
+  private: ErrorHandler *errorHandler;
+  private: bool errorHandlerCreated;
+  protected: bool hasError;
+  public: void setErrorHandler(ErrorHandler *eh) {
+    if (errorHandlerCreated) delete errorHandler;
+    errorHandler = eh;
+    errorHandlerCreated = false;
+  }
+ Token *head; 
+ public: 
+
+ VhdlParser(TokenManager *tm);
+   public: virtual ~VhdlParser();
+
+void ReInit(TokenManager *tm);
+
 Token * jj_consume_token(int kind);
+
 bool  jj_scan_token(int kind);
+
 Token * getNextToken();
+
 Token * getToken(int index);
+
 int jj_ntk_f();
-private:
-  int jj_kind;
+ private: int jj_kind;
   int **jj_expentries;
   int *jj_expentry;
-  void jj_add_error_token(int kind, int pos);
-protected:
-  /** Generate ParseException. */
-  virtual void  parseError();
-private:
-  int  indent;	// trace indentation
-  bool trace = false; // trace enabled if true
-
-public:
-  bool trace_enabled();
-  void enable_tracing();
-  void disable_tracing();
-  void jj_rescan_token();
-  void jj_save(int index, int xla);
+
+void jj_add_error_token(int kind, int pos);
+
+protected: virtual void  parseError();
+  private: int trace_indent;
+  private: bool trace_enabled;
+  /** Enable tracing. */
+
+public: void enable_tracing();
+
+public: void disable_tracing();
+
+void jj_rescan_token();
+
+void jj_save(int index, int xla);
 typedef unsigned long long uint64;
 
 static Entry* current_root;
@@ -8462,10 +8996,8 @@ static  void mapLibPackage( Entry* root);
 static void createFlow();
 static void error_skipto(int kind);
 static void oneLineComment(QCString qcs);
-static void setMultCommentLine();
+static void setMultCommentLine();private: bool jj_done;
 
-private:
-  bool jj_done;
 };
 }
 }
diff --git a/vhdlparser/VhdlParserConstants.h b/vhdlparser/VhdlParserConstants.h
index fe51270..882402b 100644
--- a/vhdlparser/VhdlParserConstants.h
+++ b/vhdlparser/VhdlParserConstants.h
@@ -2,7 +2,7 @@
 
 /**
  * Token literal values and constants.
- * Generated by org.javacc.parser.OtherFilesGenCPP#start()
+ * Generated by org.javacc.parser.OtherFilesGen#start()
  */
 #ifndef VHDLPARSERCONSTANTS_H
 #define VHDLPARSERCONSTANTS_H
@@ -387,387 +387,387 @@ const  int VHDL2008TOOLDIR = 189;
 const  int DEFAULT = 0;
 
   /** Literal token values. */
-  static const JJChar tokenImage_arr_0[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_0[] = 
 {0x3c, 0x45, 0x4f, 0x46, 0x3e, 0};
-  static const JJChar tokenImage_arr_1[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_1[] = 
 {0x22, 0x20, 0x22, 0};
-  static const JJChar tokenImage_arr_2[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_2[] = 
 {0x22, 0x9, 0x22, 0};
-  static const JJChar tokenImage_arr_3[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_3[] = 
 {0x22, 0xa, 0x22, 0};
-  static const JJChar tokenImage_arr_4[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_4[] = 
 {0x22, 0xd, 0x22, 0};
-  static const JJChar tokenImage_arr_5[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_5[] = 
 {0x22, 0x3c, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_6[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_6[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_7[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_7[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x46, 0x4c, 0x4f, 0x57, 0x43, 0x48, 0x41, 0x52, 0x54, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_8[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_8[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_9[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_9[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x44, 0x4f, 0x58, 0x59, 0x47, 0x45, 0x4e, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_10[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_10[] = 
 {0x22, 0x3c, 0x4d, 0x55, 0x4c, 0x54, 0x5f, 0x56, 0x48, 0x44, 0x4c, 0x5f, 0x32, 0x30, 0x30, 0x38, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_11[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_11[] = 
 {0x22, 0x61, 0x62, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_12[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_12[] = 
 {0x22, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_13[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_13[] = 
 {0x22, 0x61, 0x66, 0x74, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_14[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_14[] = 
 {0x22, 0x61, 0x6c, 0x69, 0x61, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_15[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_15[] = 
 {0x22, 0x61, 0x6c, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_16[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_16[] = 
 {0x22, 0x61, 0x6e, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_17[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_17[] = 
 {0x22, 0x61, 0x72, 0x63, 0x68, 0x69, 0x74, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_18[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_18[] = 
 {0x22, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_19[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_19[] = 
 {0x22, 0x61, 0x73, 0x73, 0x65, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_20[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_20[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_21[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_21[] = 
 {0x22, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_22[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_22[] = 
 {0x22, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_23[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_23[] = 
 {0x22, 0x62, 0x65, 0x67, 0x69, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_24[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_24[] = 
 {0x22, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0};
-  static const JJChar tokenImage_arr_25[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_25[] = 
 {0x22, 0x62, 0x6f, 0x64, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_26[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_26[] = 
 {0x22, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_27[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_27[] = 
 {0x22, 0x62, 0x75, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_28[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_28[] = 
 {0x22, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_29[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_29[] = 
 {0x22, 0x63, 0x61, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_30[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_30[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_31[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_31[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_32[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_32[] = 
 {0x22, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_33[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_33[] = 
 {0x22, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_34[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_34[] = 
 {0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_35[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_35[] = 
 {0x22, 0x64, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_36[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_36[] = 
 {0x22, 0x64, 0x6f, 0x77, 0x6e, 0x74, 0x6f, 0x22, 0};
-  static const JJChar tokenImage_arr_37[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_37[] = 
 {0x22, 0x65, 0x6c, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_38[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_38[] = 
 {0x22, 0x65, 0x6c, 0x73, 0x69, 0x66, 0x22, 0};
-  static const JJChar tokenImage_arr_39[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_39[] = 
 {0x22, 0x65, 0x6e, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_40[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_40[] = 
 {0x22, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_41[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_41[] = 
 {0x22, 0x65, 0x78, 0x69, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_42[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_42[] = 
 {0x22, 0x66, 0x61, 0x69, 0x72, 0x6e, 0x65, 0x73, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_43[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_43[] = 
 {0x22, 0x66, 0x69, 0x6c, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_44[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_44[] = 
 {0x22, 0x66, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_45[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_45[] = 
 {0x22, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_46[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_46[] = 
 {0x22, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_47[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_47[] = 
 {0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_48[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_48[] = 
 {0x22, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x22, 0};
-  static const JJChar tokenImage_arr_49[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_49[] = 
 {0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_50[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_50[] = 
 {0x22, 0x67, 0x75, 0x61, 0x72, 0x64, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_51[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_51[] = 
 {0x22, 0x69, 0x66, 0x22, 0};
-  static const JJChar tokenImage_arr_52[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_52[] = 
 {0x22, 0x69, 0x6d, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_53[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_53[] = 
 {0x22, 0x69, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_54[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_54[] = 
 {0x22, 0x69, 0x6e, 0x65, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_55[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_55[] = 
 {0x22, 0x69, 0x6e, 0x6f, 0x75, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_56[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_56[] = 
 {0x22, 0x69, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_57[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_57[] = 
 {0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_58[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_58[] = 
 {0x22, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_59[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_59[] = 
 {0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_60[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_60[] = 
 {0x22, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_61[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_61[] = 
 {0x22, 0x6c, 0x6f, 0x6f, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_62[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_62[] = 
 {0x22, 0x6d, 0x61, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_63[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_63[] = 
 {0x22, 0x6d, 0x6f, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_64[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_64[] = 
 {0x22, 0x6e, 0x61, 0x6e, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_65[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_65[] = 
 {0x22, 0x6e, 0x65, 0x77, 0x22, 0};
-  static const JJChar tokenImage_arr_66[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_66[] = 
 {0x22, 0x6e, 0x65, 0x78, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_67[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_67[] = 
 {0x22, 0x6e, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_68[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_68[] = 
 {0x22, 0x6e, 0x6f, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_69[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_69[] = 
 {0x22, 0x6e, 0x75, 0x6c, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_70[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_70[] = 
 {0x22, 0x6f, 0x66, 0x22, 0};
-  static const JJChar tokenImage_arr_71[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_71[] = 
 {0x22, 0x6f, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_72[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_72[] = 
 {0x22, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_73[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_73[] = 
 {0x22, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_74[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_74[] = 
 {0x22, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_75[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_75[] = 
 {0x22, 0x6f, 0x75, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_76[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_76[] = 
 {0x22, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_77[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_77[] = 
 {0x22, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_78[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_78[] = 
 {0x22, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_79[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_79[] = 
 {0x22, 0x70, 0x6f, 0x73, 0x74, 0x70, 0x6f, 0x6e, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_80[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_80[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x64, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_81[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_81[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_82[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_82[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_83[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_83[] = 
 {0x22, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_84[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_84[] = 
 {0x22, 0x70, 0x75, 0x72, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_85[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_85[] = 
 {0x22, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_86[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_86[] = 
 {0x22, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_87[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_87[] = 
 {0x22, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_88[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_88[] = 
 {0x22, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_89[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_89[] = 
 {0x22, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_90[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_90[] = 
 {0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_91[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_91[] = 
 {0x22, 0x72, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x5f, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_92[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_92[] = 
 {0x22, 0x72, 0x65, 0x6d, 0x22, 0};
-  static const JJChar tokenImage_arr_93[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_93[] = 
 {0x22, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_94[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_94[] = 
 {0x22, 0x72, 0x6f, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_95[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_95[] = 
 {0x22, 0x72, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_96[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_96[] = 
 {0x22, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_97[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_97[] = 
 {0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_98[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_98[] = 
 {0x22, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_99[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_99[] = 
 {0x22, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x22, 0};
-  static const JJChar tokenImage_arr_100[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_100[] = 
 {0x22, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_101[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_101[] = 
 {0x22, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_102[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_102[] = 
 {0x22, 0x73, 0x6c, 0x61, 0x22, 0};
-  static const JJChar tokenImage_arr_103[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_103[] = 
 {0x22, 0x73, 0x6c, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_104[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_104[] = 
 {0x22, 0x73, 0x72, 0x61, 0x22, 0};
-  static const JJChar tokenImage_arr_105[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_105[] = 
 {0x22, 0x73, 0x72, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_106[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_106[] = 
 {0x22, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x67, 0x22, 0};
-  static const JJChar tokenImage_arr_107[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_107[] = 
 {0x22, 0x73, 0x75, 0x62, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_108[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_108[] = 
 {0x22, 0x74, 0x68, 0x65, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_109[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_109[] = 
 {0x22, 0x74, 0x6f, 0x22, 0};
-  static const JJChar tokenImage_arr_110[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_110[] = 
 {0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_111[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_111[] = 
 {0x22, 0x74, 0x79, 0x70, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_112[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_112[] = 
 {0x22, 0x75, 0x6e, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x22, 0};
-  static const JJChar tokenImage_arr_113[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_113[] = 
 {0x22, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x22, 0};
-  static const JJChar tokenImage_arr_114[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_114[] = 
 {0x22, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x22, 0};
-  static const JJChar tokenImage_arr_115[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_115[] = 
 {0x22, 0x75, 0x73, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_116[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_116[] = 
 {0x22, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_117[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_117[] = 
 {0x22, 0x76, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_118[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_118[] = 
 {0x22, 0x76, 0x70, 0x72, 0x6f, 0x70, 0x22, 0};
-  static const JJChar tokenImage_arr_119[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_119[] = 
 {0x22, 0x76, 0x75, 0x6e, 0x69, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_120[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_120[] = 
 {0x22, 0x77, 0x61, 0x69, 0x74, 0x22, 0};
-  static const JJChar tokenImage_arr_121[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_121[] = 
 {0x22, 0x77, 0x68, 0x65, 0x6e, 0x22, 0};
-  static const JJChar tokenImage_arr_122[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_122[] = 
 {0x22, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x22, 0};
-  static const JJChar tokenImage_arr_123[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_123[] = 
 {0x22, 0x77, 0x69, 0x74, 0x68, 0x22, 0};
-  static const JJChar tokenImage_arr_124[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_124[] = 
 {0x22, 0x78, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_125[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_125[] = 
 {0x22, 0x78, 0x6e, 0x6f, 0x72, 0x22, 0};
-  static const JJChar tokenImage_arr_126[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_126[] = 
 {0x22, 0x26, 0x22, 0};
-  static const JJChar tokenImage_arr_127[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_127[] = 
 {0x22, 0x27, 0x22, 0};
-  static const JJChar tokenImage_arr_128[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_128[] = 
 {0x22, 0x28, 0x22, 0};
-  static const JJChar tokenImage_arr_129[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_129[] = 
 {0x22, 0x29, 0x22, 0};
-  static const JJChar tokenImage_arr_130[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_130[] = 
 {0x22, 0x2a, 0x2a, 0x22, 0};
-  static const JJChar tokenImage_arr_131[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_131[] = 
 {0x22, 0x2a, 0x22, 0};
-  static const JJChar tokenImage_arr_132[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_132[] = 
 {0x22, 0x2b, 0x22, 0};
-  static const JJChar tokenImage_arr_133[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_133[] = 
 {0x22, 0x2d, 0x22, 0};
-  static const JJChar tokenImage_arr_134[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_134[] = 
 {0x22, 0x2c, 0x22, 0};
-  static const JJChar tokenImage_arr_135[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_135[] = 
 {0x22, 0x3a, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_136[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_136[] = 
 {0x22, 0x3a, 0x22, 0};
-  static const JJChar tokenImage_arr_137[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_137[] = 
 {0x22, 0x3b, 0x22, 0};
-  static const JJChar tokenImage_arr_138[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_138[] = 
 {0x22, 0x3c, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_139[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_139[] = 
 {0x22, 0x3e, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_140[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_140[] = 
 {0x22, 0x3c, 0x22, 0};
-  static const JJChar tokenImage_arr_141[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_141[] = 
 {0x22, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_142[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_142[] = 
 {0x22, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_143[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_143[] = 
 {0x22, 0x2f, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_144[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_144[] = 
 {0x22, 0x3d, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_145[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_145[] = 
 {0x22, 0x3c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_146[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_146[] = 
 {0x22, 0x3c, 0x3c, 0x22, 0};
-  static const JJChar tokenImage_arr_147[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_147[] = 
 {0x22, 0x3e, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_148[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_148[] = 
 {0x22, 0x3f, 0x3f, 0x22, 0};
-  static const JJChar tokenImage_arr_149[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_149[] = 
 {0x22, 0x3f, 0x3e, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_150[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_150[] = 
 {0x22, 0x3f, 0x3c, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_151[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_151[] = 
 {0x22, 0x3f, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_152[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_152[] = 
 {0x22, 0x3f, 0x3c, 0x22, 0};
-  static const JJChar tokenImage_arr_153[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_153[] = 
 {0x22, 0x3f, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_154[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_154[] = 
 {0x22, 0x3f, 0x2f, 0x3d, 0x22, 0};
-  static const JJChar tokenImage_arr_155[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_155[] = 
 {0x22, 0x3f, 0x22, 0};
-  static const JJChar tokenImage_arr_156[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_156[] = 
 {0x22, 0x7c, 0x22, 0};
-  static const JJChar tokenImage_arr_157[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_157[] = 
 {0x22, 0x2e, 0x22, 0};
-  static const JJChar tokenImage_arr_158[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_158[] = 
 {0x22, 0x2f, 0x22, 0};
-  static const JJChar tokenImage_arr_159[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_159[] = 
 {0x22, 0x40, 0x22, 0};
-  static const JJChar tokenImage_arr_160[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_160[] = 
 {0x22, 0x5e, 0x22, 0};
-  static const JJChar tokenImage_arr_161[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_161[] = 
 {0x22, 0x5b, 0x22, 0};
-  static const JJChar tokenImage_arr_162[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_162[] = 
 {0x22, 0x5d, 0x22, 0};
-  static const JJChar tokenImage_arr_163[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_163[] = 
 {0x22, 0x7b, 0x22, 0};
-  static const JJChar tokenImage_arr_164[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_164[] = 
 {0x22, 0x7d, 0x22, 0};
-  static const JJChar tokenImage_arr_165[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_165[] = 
 {0x22, 0x3c, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_166[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_166[] = 
 {0x22, 0x3c, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_167[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_167[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_168[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_168[] = 
 {0x22, 0x3c, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_169[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_169[] = 
 {0x22, 0x3c, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_170[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_170[] = 
 {0x22, 0x3c, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_171[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_171[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_172[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_172[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x44, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_173[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_173[] = 
 {0x22, 0x3c, 0x45, 0x58, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_174[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_174[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_175[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_175[] = 
 {0x22, 0x3c, 0x47, 0x52, 0x41, 0x50, 0x48, 0x49, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_176[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_176[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_177[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_177[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x5f, 0x4f, 0x52, 0x5f, 0x44, 0x49, 0x47, 0x49, 0x54, 0x5f, 0x4f, 0x52, 0x5f, 0x53, 0x54, 0x44, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_178[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_178[] = 
 {0x22, 0x3c, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_179[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_179[] = 
 {0x22, 0x3c, 0x55, 0x50, 0x50, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_180[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_180[] = 
 {0x22, 0x3c, 0x42, 0x49, 0x54, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_181[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_181[] = 
 {0x22, 0x3c, 0x42, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_182[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_182[] = 
 {0x22, 0x3c, 0x53, 0x54, 0x44, 0x5f, 0x4c, 0x4f, 0x47, 0x49, 0x43, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_183[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_183[] = 
 {0x22, 0x3c, 0x44, 0x49, 0x47, 0x49, 0x54, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_184[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_184[] = 
 {0x22, 0x3c, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_185[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_185[] = 
 {0x22, 0x3c, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x41, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_186[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_186[] = 
 {0x22, 0x3c, 0x53, 0x50, 0x41, 0x43, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_187[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_187[] = 
 {0x22, 0x3c, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x4c, 0x45, 0x54, 0x54, 0x45, 0x52, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_188[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_188[] = 
 {0x22, 0x3c, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x3e, 0x22, 0};
-  static const JJChar tokenImage_arr_189[] = 
+  static JAVACC_CHAR_TYPE tokenImage_arr_189[] = 
 {0x22, 0x3c, 0x56, 0x48, 0x44, 0x4c, 0x32, 0x30, 0x30, 0x38, 0x54, 0x4f, 0x4f, 0x4c, 0x44, 0x49, 0x52, 0x3e, 0x22, 0};
-  static const JJChar* const tokenImage[] = {
+  static JAVACC_STRING_TYPE tokenImage[] = {
 tokenImage_arr_0, 
 tokenImage_arr_1, 
 tokenImage_arr_2, 
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 7187449..728e4c4 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -1,6 +1,5 @@
 /* VhdlParserTokenManager.cc */
-#include "VhdlParserTokenManager.h"
-#include "TokenMgrError.h"
+#include "/Users/dimitri/doxygen/vhdlparser/VhdlParserTokenManager.h"
 namespace vhdl {
 namespace parser {
 static const unsigned long long jjbitVec0[] = {
@@ -18,227 +17,227 @@ static const int jjnextStates[] = {
    40, 42, 56, 57, 58, 61, 60, 59, 61, 65, 66, 67, 68, 69, 71, 9, 
    10, 28, 29, 45, 47, 50, 52, 27, 30, 
 };
-static JJChar jjstrLiteralChars_0[] = {0};
-static JJChar jjstrLiteralChars_1[] = {0};
-static JJChar jjstrLiteralChars_2[] = {0};
-static JJChar jjstrLiteralChars_3[] = {0};
-static JJChar jjstrLiteralChars_4[] = {0};
-static JJChar jjstrLiteralChars_5[] = {0};
-static JJChar jjstrLiteralChars_6[] = {0};
-
-static JJChar jjstrLiteralChars_7[] = {0};
-static JJChar jjstrLiteralChars_8[] = {0};
-static JJChar jjstrLiteralChars_9[] = {0};
-static JJChar jjstrLiteralChars_10[] = {0};
-static JJChar jjstrLiteralChars_11[] = {0};
-static JJChar jjstrLiteralChars_12[] = {0};
-static JJChar jjstrLiteralChars_13[] = {0};
-static JJChar jjstrLiteralChars_14[] = {0};
-static JJChar jjstrLiteralChars_15[] = {0};
-static JJChar jjstrLiteralChars_16[] = {0};
-static JJChar jjstrLiteralChars_17[] = {0};
-static JJChar jjstrLiteralChars_18[] = {0};
-static JJChar jjstrLiteralChars_19[] = {0};
-static JJChar jjstrLiteralChars_20[] = {0};
-
-static JJChar jjstrLiteralChars_21[] = {0};
-static JJChar jjstrLiteralChars_22[] = {0};
-static JJChar jjstrLiteralChars_23[] = {0};
-static JJChar jjstrLiteralChars_24[] = {0};
-static JJChar jjstrLiteralChars_25[] = {0};
-static JJChar jjstrLiteralChars_26[] = {0};
-static JJChar jjstrLiteralChars_27[] = {0};
-static JJChar jjstrLiteralChars_28[] = {0};
-static JJChar jjstrLiteralChars_29[] = {0};
-static JJChar jjstrLiteralChars_30[] = {0};
-static JJChar jjstrLiteralChars_31[] = {0};
-static JJChar jjstrLiteralChars_32[] = {0};
-static JJChar jjstrLiteralChars_33[] = {0};
-static JJChar jjstrLiteralChars_34[] = {0};
-
-static JJChar jjstrLiteralChars_35[] = {0};
-static JJChar jjstrLiteralChars_36[] = {0};
-static JJChar jjstrLiteralChars_37[] = {0};
-static JJChar jjstrLiteralChars_38[] = {0};
-static JJChar jjstrLiteralChars_39[] = {0};
-static JJChar jjstrLiteralChars_40[] = {0};
-static JJChar jjstrLiteralChars_41[] = {0};
-static JJChar jjstrLiteralChars_42[] = {0};
-static JJChar jjstrLiteralChars_43[] = {0};
-static JJChar jjstrLiteralChars_44[] = {0};
-static JJChar jjstrLiteralChars_45[] = {0};
-static JJChar jjstrLiteralChars_46[] = {0};
-static JJChar jjstrLiteralChars_47[] = {0};
-static JJChar jjstrLiteralChars_48[] = {0};
-
-static JJChar jjstrLiteralChars_49[] = {0};
-static JJChar jjstrLiteralChars_50[] = {0};
-static JJChar jjstrLiteralChars_51[] = {0};
-static JJChar jjstrLiteralChars_52[] = {0};
-static JJChar jjstrLiteralChars_53[] = {0};
-static JJChar jjstrLiteralChars_54[] = {0};
-static JJChar jjstrLiteralChars_55[] = {0};
-static JJChar jjstrLiteralChars_56[] = {0};
-static JJChar jjstrLiteralChars_57[] = {0};
-static JJChar jjstrLiteralChars_58[] = {0};
-static JJChar jjstrLiteralChars_59[] = {0};
-static JJChar jjstrLiteralChars_60[] = {0};
-static JJChar jjstrLiteralChars_61[] = {0};
-static JJChar jjstrLiteralChars_62[] = {0};
-
-static JJChar jjstrLiteralChars_63[] = {0};
-static JJChar jjstrLiteralChars_64[] = {0};
-static JJChar jjstrLiteralChars_65[] = {0};
-static JJChar jjstrLiteralChars_66[] = {0};
-static JJChar jjstrLiteralChars_67[] = {0};
-static JJChar jjstrLiteralChars_68[] = {0};
-static JJChar jjstrLiteralChars_69[] = {0};
-static JJChar jjstrLiteralChars_70[] = {0};
-static JJChar jjstrLiteralChars_71[] = {0};
-static JJChar jjstrLiteralChars_72[] = {0};
-static JJChar jjstrLiteralChars_73[] = {0};
-static JJChar jjstrLiteralChars_74[] = {0};
-static JJChar jjstrLiteralChars_75[] = {0};
-static JJChar jjstrLiteralChars_76[] = {0};
-
-static JJChar jjstrLiteralChars_77[] = {0};
-static JJChar jjstrLiteralChars_78[] = {0};
-static JJChar jjstrLiteralChars_79[] = {0};
-static JJChar jjstrLiteralChars_80[] = {0};
-static JJChar jjstrLiteralChars_81[] = {0};
-static JJChar jjstrLiteralChars_82[] = {0};
-static JJChar jjstrLiteralChars_83[] = {0};
-static JJChar jjstrLiteralChars_84[] = {0};
-static JJChar jjstrLiteralChars_85[] = {0};
-static JJChar jjstrLiteralChars_86[] = {0};
-static JJChar jjstrLiteralChars_87[] = {0};
-static JJChar jjstrLiteralChars_88[] = {0};
-static JJChar jjstrLiteralChars_89[] = {0};
-static JJChar jjstrLiteralChars_90[] = {0};
-
-static JJChar jjstrLiteralChars_91[] = {0};
-static JJChar jjstrLiteralChars_92[] = {0};
-static JJChar jjstrLiteralChars_93[] = {0};
-static JJChar jjstrLiteralChars_94[] = {0};
-static JJChar jjstrLiteralChars_95[] = {0};
-static JJChar jjstrLiteralChars_96[] = {0};
-static JJChar jjstrLiteralChars_97[] = {0};
-static JJChar jjstrLiteralChars_98[] = {0};
-static JJChar jjstrLiteralChars_99[] = {0};
-static JJChar jjstrLiteralChars_100[] = {0};
-static JJChar jjstrLiteralChars_101[] = {0};
-static JJChar jjstrLiteralChars_102[] = {0};
-static JJChar jjstrLiteralChars_103[] = {0};
-static JJChar jjstrLiteralChars_104[] = {0};
-
-static JJChar jjstrLiteralChars_105[] = {0};
-static JJChar jjstrLiteralChars_106[] = {0};
-static JJChar jjstrLiteralChars_107[] = {0};
-static JJChar jjstrLiteralChars_108[] = {0};
-static JJChar jjstrLiteralChars_109[] = {0};
-static JJChar jjstrLiteralChars_110[] = {0};
-static JJChar jjstrLiteralChars_111[] = {0};
-static JJChar jjstrLiteralChars_112[] = {0};
-static JJChar jjstrLiteralChars_113[] = {0};
-static JJChar jjstrLiteralChars_114[] = {0};
-static JJChar jjstrLiteralChars_115[] = {0};
-static JJChar jjstrLiteralChars_116[] = {0};
-static JJChar jjstrLiteralChars_117[] = {0};
-static JJChar jjstrLiteralChars_118[] = {0};
-
-static JJChar jjstrLiteralChars_119[] = {0};
-static JJChar jjstrLiteralChars_120[] = {0};
-static JJChar jjstrLiteralChars_121[] = {0};
-static JJChar jjstrLiteralChars_122[] = {0};
-static JJChar jjstrLiteralChars_123[] = {0};
-static JJChar jjstrLiteralChars_124[] = {0};
-static JJChar jjstrLiteralChars_125[] = {0};
-
-static JJChar jjstrLiteralChars_126[] = {0x26, 0};
-static JJChar jjstrLiteralChars_127[] = {0x27, 0};
-
-static JJChar jjstrLiteralChars_128[] = {0x28, 0};
-static JJChar jjstrLiteralChars_129[] = {0x29, 0};
-
-static JJChar jjstrLiteralChars_130[] = {0x2a, 0x2a, 0};
-static JJChar jjstrLiteralChars_131[] = {0x2a, 0};
-
-static JJChar jjstrLiteralChars_132[] = {0x2b, 0};
-static JJChar jjstrLiteralChars_133[] = {0x2d, 0};
-
-static JJChar jjstrLiteralChars_134[] = {0x2c, 0};
-static JJChar jjstrLiteralChars_135[] = {0x3a, 0x3d, 0};
-
-static JJChar jjstrLiteralChars_136[] = {0x3a, 0};
-static JJChar jjstrLiteralChars_137[] = {0x3b, 0};
-
-static JJChar jjstrLiteralChars_138[] = {0x3c, 0x3d, 0};
-static JJChar jjstrLiteralChars_139[] = {0x3e, 0x3d, 0};
-
-static JJChar jjstrLiteralChars_140[] = {0x3c, 0};
-static JJChar jjstrLiteralChars_141[] = {0x3e, 0};
-
-static JJChar jjstrLiteralChars_142[] = {0x3d, 0};
-static JJChar jjstrLiteralChars_143[] = {0x2f, 0x3d, 0};
-
-static JJChar jjstrLiteralChars_144[] = {0x3d, 0x3e, 0};
-static JJChar jjstrLiteralChars_145[] = {0x3c, 0x3e, 0};
-
-static JJChar jjstrLiteralChars_146[] = {0x3c, 0x3c, 0};
-static JJChar jjstrLiteralChars_147[] = {0x3e, 0x3e, 0};
-
-static JJChar jjstrLiteralChars_148[] = {0x3f, 0x3f, 0};
-static JJChar jjstrLiteralChars_149[] = {0x3f, 0x3e, 0x3d, 0};
-
-static JJChar jjstrLiteralChars_150[] = {0x3f, 0x3c, 0x3d, 0};
-static JJChar jjstrLiteralChars_151[] = {0x3f, 0x3e, 0};
-
-static JJChar jjstrLiteralChars_152[] = {0x3f, 0x3c, 0};
-static JJChar jjstrLiteralChars_153[] = {0x3f, 0x3d, 0};
-
-static JJChar jjstrLiteralChars_154[] = {0x3f, 0x2f, 0x3d, 0};
-static JJChar jjstrLiteralChars_155[] = {0x3f, 0};
-
-static JJChar jjstrLiteralChars_156[] = {0x7c, 0};
-static JJChar jjstrLiteralChars_157[] = {0x2e, 0};
-
-static JJChar jjstrLiteralChars_158[] = {0x2f, 0};
-static JJChar jjstrLiteralChars_159[] = {0x40, 0};
-
-static JJChar jjstrLiteralChars_160[] = {0x5e, 0};
-static JJChar jjstrLiteralChars_161[] = {0x5b, 0};
-
-static JJChar jjstrLiteralChars_162[] = {0x5d, 0};
-static JJChar jjstrLiteralChars_163[] = {0x7b, 0};
-
-static JJChar jjstrLiteralChars_164[] = {0x7d, 0};
-static JJChar jjstrLiteralChars_165[] = {0};
-static JJChar jjstrLiteralChars_166[] = {0};
-static JJChar jjstrLiteralChars_167[] = {0};
-static JJChar jjstrLiteralChars_168[] = {0};
-static JJChar jjstrLiteralChars_169[] = {0};
-static JJChar jjstrLiteralChars_170[] = {0};
-static JJChar jjstrLiteralChars_171[] = {0};
-static JJChar jjstrLiteralChars_172[] = {0};
-static JJChar jjstrLiteralChars_173[] = {0};
-static JJChar jjstrLiteralChars_174[] = {0};
-static JJChar jjstrLiteralChars_175[] = {0};
-static JJChar jjstrLiteralChars_176[] = {0};
-static JJChar jjstrLiteralChars_177[] = {0};
-
-static JJChar jjstrLiteralChars_178[] = {0};
-static JJChar jjstrLiteralChars_179[] = {0};
-static JJChar jjstrLiteralChars_180[] = {0};
-static JJChar jjstrLiteralChars_181[] = {0};
-static JJChar jjstrLiteralChars_182[] = {0};
-static JJChar jjstrLiteralChars_183[] = {0};
-static JJChar jjstrLiteralChars_184[] = {0};
-static JJChar jjstrLiteralChars_185[] = {0};
-static JJChar jjstrLiteralChars_186[] = {0};
-static JJChar jjstrLiteralChars_187[] = {0};
-static JJChar jjstrLiteralChars_188[] = {0};
-static JJChar jjstrLiteralChars_189[] = {0};
-static const JJString jjstrLiteralImages[] = {
+static JAVACC_CHAR_TYPE jjstrLiteralChars_0[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_1[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_2[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_3[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_4[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_5[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_6[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_7[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_8[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_9[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_10[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_11[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_12[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_13[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_14[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_15[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_16[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_17[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_18[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_19[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_20[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_21[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_22[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_23[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_24[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_25[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_26[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_27[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_28[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_29[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_30[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_31[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_32[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_33[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_34[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_35[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_36[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_37[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_38[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_39[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_40[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_41[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_42[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_43[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_44[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_45[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_46[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_47[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_48[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_49[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_50[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_51[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_52[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_53[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_54[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_55[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_56[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_57[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_58[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_59[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_60[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_61[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_62[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_63[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_64[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_65[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_66[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_67[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_68[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_69[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_70[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_71[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_72[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_73[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_74[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_75[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_76[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_77[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_78[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_79[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_80[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_81[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_82[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_83[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_84[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_85[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_86[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_87[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_88[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_89[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_90[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_91[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_92[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_93[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_94[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_95[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_96[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_97[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_98[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_99[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_100[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_101[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_102[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_103[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_104[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_105[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_106[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_107[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_108[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_109[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_110[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_111[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_112[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_113[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_114[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_115[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_116[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_117[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_118[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_119[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_120[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_121[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_122[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_123[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_124[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_125[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_126[] = {0x26, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_127[] = {0x27, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_128[] = {0x28, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_129[] = {0x29, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_130[] = {0x2a, 0x2a, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_131[] = {0x2a, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_132[] = {0x2b, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_133[] = {0x2d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_134[] = {0x2c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_135[] = {0x3a, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_136[] = {0x3a, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_137[] = {0x3b, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_138[] = {0x3c, 0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_139[] = {0x3e, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_140[] = {0x3c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_141[] = {0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_142[] = {0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_143[] = {0x2f, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_144[] = {0x3d, 0x3e, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_145[] = {0x3c, 0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_146[] = {0x3c, 0x3c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_147[] = {0x3e, 0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_148[] = {0x3f, 0x3f, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_149[] = {0x3f, 0x3e, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_150[] = {0x3f, 0x3c, 0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_151[] = {0x3f, 0x3e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_152[] = {0x3f, 0x3c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_153[] = {0x3f, 0x3d, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_154[] = {0x3f, 0x2f, 0x3d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_155[] = {0x3f, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_156[] = {0x7c, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_157[] = {0x2e, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_158[] = {0x2f, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_159[] = {0x40, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_160[] = {0x5e, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_161[] = {0x5b, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_162[] = {0x5d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_163[] = {0x7b, 0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_164[] = {0x7d, 0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_165[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_166[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_167[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_168[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_169[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_170[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_171[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_172[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_173[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_174[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_175[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_176[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_177[] = {0};
+
+static JAVACC_CHAR_TYPE jjstrLiteralChars_178[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_179[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_180[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_181[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_182[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_183[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_184[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_185[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_186[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_187[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_188[] = {0};
+static JAVACC_CHAR_TYPE jjstrLiteralChars_189[] = {0};
+static const JAVACC_STRING_TYPE jjstrLiteralImages[] = {
 jjstrLiteralChars_0, 
 jjstrLiteralChars_1, 
 jjstrLiteralChars_2, 
@@ -432,9 +431,9 @@ jjstrLiteralChars_189,
 };
 
 /** Lexer state names. */
-static const JJChar lexStateNames_arr_0[] = 
+static const JAVACC_CHAR_TYPE lexStateNames_arr_0[] = 
 {0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0};
-static const JJString lexStateNames[] = {
+static const JAVACC_STRING_TYPE lexStateNames[] = {
 lexStateNames_arr_0, 
 };
 static const unsigned long long jjtoToken[] = {
@@ -444,7 +443,7 @@ static const unsigned long long jjtoSkip[] = {
    0x7deULL, 0x0ULL, 0x0ULL, 
 };
 
-  void  VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; }
+void  VhdlParserTokenManager::setDebugStream(FILE *ds){ debugStream = ds; }
 
  int  VhdlParserTokenManager::jjStopAtPos(int pos, int kind){
    jjmatchedKind = kind;
@@ -3321,12 +3320,12 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo
 
 Token * VhdlParserTokenManager::jjFillToken(){
    Token *t;
-   JJString curTokenImage;
-   int beginLine   = -1;
-   int endLine     = -1;
-   int beginColumn = -1;
-   int endColumn   = -1;
-   JJString im = jjstrLiteralImages[jjmatchedKind];
+   JAVACC_STRING_TYPE curTokenImage;
+   int beginLine;
+   int endLine;
+   int beginColumn;
+   int endColumn;
+   JAVACC_STRING_TYPE im = jjstrLiteralImages[jjmatchedKind];
    curTokenImage = (im.length() == 0) ? input_stream->GetImage() : im;
    if (input_stream->getTrackLineColumn()) {
      beginLine = input_stream->getBeginLine();
@@ -3334,11 +3333,9 @@ Token * VhdlParserTokenManager::jjFillToken(){
      endLine = input_stream->getEndLine();
      endColumn = input_stream->getEndColumn();
    }
-   t = Token::newToken(jjmatchedKind);
-   t->kind = jjmatchedKind;
-   t->image = curTokenImage;
-   t->specialToken = nullptr;
-   t->next = nullptr;
+   t = Token::newToken(jjmatchedKind, curTokenImage);
+   t->specialToken = NULL;
+   t->next = NULL;
 
    if (input_stream->getTrackLineColumn()) {
    t->beginLine = beginLine;
@@ -3353,7 +3350,7 @@ const int defaultLexState = 0;
 /** Get the next Token. */
 
 Token * VhdlParserTokenManager::getNextToken(){
-  Token *matchedToken = nullptr;
+  Token *matchedToken;
   int curPos = 0;
 
   for (;;)
@@ -3386,13 +3383,13 @@ Token * VhdlParserTokenManager::getNextToken(){
       }
       else
       {
-         SkipLexicalActions(nullptr);
+         SkipLexicalActions(NULL);
          goto EOFLoop;
       }
    }
    int error_line = input_stream->getEndLine();
    int error_column = input_stream->getEndColumn();
-   JJString error_after;
+   JAVACC_STRING_TYPE error_after;
    bool EOFSeen = false;
    if (input_stream->endOfInput()) {
       EOFSeen = true;
@@ -3593,15 +3590,17 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
    }
 }
   /** Reinitialise parser. */
-  void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState) {
-    clear();
+  void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg) {
+    if (input_stream) delete input_stream;
     jjmatchedPos = jjnewStateCnt = 0;
     curLexState = lexState;
     input_stream = stream;
     ReInitRounds();
     debugStream = stdout; // init
     SwitchTo(lexState);
+    parser = parserArg;
     errorHandler = new TokenManagerErrorHandler();
+    errorHandlerCreated = true;
   }
 
   void VhdlParserTokenManager::ReInitRounds() {
@@ -3613,40 +3612,25 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
 
   /** Switch to specified lex state. */
   void VhdlParserTokenManager::SwitchTo(int lexState) {
-    if (lexState >= 1 || lexState < 0) {
-      JJString message;
-#ifdef WIDE_CHAR
-      message += L"Error: Ignoring invalid lexical state : ";
-      message += lexState; message += L". State unchanged.";
-#else
-      message += "Error: Ignoring invalid lexical state : ";
-      message += lexState; message += ". State unchanged.";
-#endif
-      throw new TokenMgrError(message, INVALID_LEXICAL_STATE);
-    } else
+    if (lexState >= 1 || lexState < 0)
+      assert(false);
+      //throw 1;//new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+    else
       curLexState = lexState;
   }
 
   /** Constructor. */
-  VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState)
+  VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg)
   {
-    input_stream = nullptr;
-    ReInit(stream, lexState);
+    input_stream = NULL;
+    ReInit(stream, lexState, parserArg);
   }
 
   // Destructor
   VhdlParserTokenManager::~VhdlParserTokenManager () {
-    clear();
-  }
-
-  // clear
-  void VhdlParserTokenManager::clear() {
-    //Since input_stream was generated outside of TokenManager
-    //TokenManager should not take care of deleting it
-    //if (input_stream) delete input_stream;
-    if (errorHandler) delete errorHandler, errorHandler = nullptr;    
+    if (input_stream) delete input_stream;
+    if (errorHandlerCreated) delete errorHandler;
   }
 
-
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index 5100369..12e20c4 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -1,6 +1,5 @@
 #ifndef VHDLPARSERTOKENMANAGER_H
 #define VHDLPARSERTOKENMANAGER_H
-#include "stdio.h"
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
@@ -9,50 +8,77 @@
 #include "VhdlParserConstants.h"
 #include "VhdlParser.h"
 
-
 namespace vhdl {
 namespace parser {
 class VhdlParser;
 
 /** Token Manager. */
 class VhdlParserTokenManager : public TokenManager {
-public:
+   public:
 
+  /** Debug output. */
   FILE *debugStream;
-  void  setDebugStream(FILE *ds);
+  /** Set debug output. */
+
+void  setDebugStream(FILE *ds);
+
  int  jjStopAtPos(int pos, int kind);
+
  int  jjMoveStringLiteralDfa0_0();
+
  int  jjMoveStringLiteralDfa1_0(unsigned long long active0, unsigned long long active1, unsigned long long active2);
+
  int  jjMoveStringLiteralDfa2_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1, unsigned long long old2, unsigned long long active2);
+
  int  jjMoveStringLiteralDfa3_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1, unsigned long long old2, unsigned long long active2);
+
  int  jjMoveStringLiteralDfa4_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa5_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa6_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa7_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa8_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa9_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa10_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa11_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa12_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa13_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa14_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa15_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa16_0(unsigned long long old0, unsigned long long active0, unsigned long long old1, unsigned long long active1);
+
  int  jjMoveStringLiteralDfa17_0(unsigned long long old1, unsigned long long active1);
+
 int jjMoveNfa_0(int startState, int curPos);
+
 bool jjCanMove_0(int hiByte, int i1, int i2, unsigned long long l1, unsigned long long l2);
+
 bool jjCanMove_1(int hiByte, int i1, int i2, unsigned long long l1, unsigned long long l2);
+
 Token * jjFillToken();
 
-public:
-    int curLexState;
-    int jjnewStateCnt;
-    int jjround;
-    int jjmatchedPos;
-    int jjmatchedKind;
+public: int curLexState;
+public: int jjnewStateCnt;
+public: int jjround;
+public: int jjmatchedPos;
+public: int jjmatchedKind;
+
 
 Token * getNextToken();
+
 void  SkipLexicalActions(Token *matchedToken);
+
 void  TokenLexicalActions(Token *matchedToken);
 #define jjCheckNAdd(state)\
 {\
@@ -84,33 +110,28 @@ void  TokenLexicalActions(Token *matchedToken);
 #ifndef JAVACC_CHARSTREAM
 #define JAVACC_CHARSTREAM CharStream
 #endif
-
-private:
-  void ReInitRounds();
-
-public:
-  VhdlParserTokenManager(JAVACC_CHARSTREAM *stream, int lexState = 0);
-  virtual ~VhdlParserTokenManager();
-  void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0);
+  private: VhdlParser*parser;
+  private: void ReInitRounds();
+  public: VhdlParserTokenManager(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
+  public: virtual ~VhdlParserTokenManager();
+  void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
   void SwitchTo(int lexState);
-  void clear();
-  const JJSimpleString jjKindsForBitVector(int i, unsigned long long vec);
-  const JJSimpleString jjKindsForStateVector(int lexState, int vec[], int start, int end);
-
-  JAVACC_CHARSTREAM*        input_stream;
-  int                       jjrounds[77];
-  int                       jjstateSet[2 * 77];
-  JJString                  jjimage;
-  JJString                  image;
-  int                       jjimageLen;
-  int                       lengthOfMatch;
-  JJChar                    curChar;
-  TokenManagerErrorHandler* errorHandler = nullptr;
-
-public: 
-  void setErrorHandler(TokenManagerErrorHandler *eh) {
-      if (errorHandler) delete errorHandler, errorHandler = nullptr;
+  const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
+  const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
+    JAVACC_CHARSTREAM  *input_stream;
+    int jjrounds[77];
+    int jjstateSet[2 * 77];
+    JAVACC_STRING_TYPE jjimage;
+    JAVACC_STRING_TYPE image;
+    int jjimageLen;
+    int lengthOfMatch;
+    JAVACC_CHAR_TYPE curChar;
+    TokenManagerErrorHandler *errorHandler;
+    bool errorHandlerCreated;
+    public: void setErrorHandler(TokenManagerErrorHandler *eh) {
+      if (errorHandlerCreated && errorHandler != NULL) delete errorHandler;
       errorHandler = eh;
+      errorHandlerCreated = false;
     }
     
 };
-- 
cgit v0.12


From 8e9306fe1f1673772b6695ee390ce781898e8565 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 12 Dec 2019 20:45:59 +0100
Subject: Revert to locally patched version 6.2 of JavaCC due to more
 regressions :-(

---
 vhdlparser/CharStream.cc             |   4 +-
 vhdlparser/CharStream.h              | 204 ++++++------
 vhdlparser/ErrorHandler.h            |   5 +-
 vhdlparser/ParseException.cc         |   4 +-
 vhdlparser/ParseException.h          |   4 +-
 vhdlparser/Token.cc                  |   4 +-
 vhdlparser/Token.h                   |   7 +-
 vhdlparser/TokenManager.h            |  14 +-
 vhdlparser/TokenMgrError.cc          |   6 +-
 vhdlparser/TokenMgrError.h           |  23 +-
 vhdlparser/VhdlParser.cc             | 611 ++++++++++++++++++-----------------
 vhdlparser/VhdlParser.h              | 320 +++++++++---------
 vhdlparser/VhdlParserTokenManager.cc |  45 ++-
 vhdlparser/VhdlParserTokenManager.h  |  26 +-
 14 files changed, 668 insertions(+), 609 deletions(-)

diff --git a/vhdlparser/CharStream.cc b/vhdlparser/CharStream.cc
index bcc83ba..65179f5 100644
--- a/vhdlparser/CharStream.cc
+++ b/vhdlparser/CharStream.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "CharStream.h"
 
@@ -209,4 +209,4 @@ void CharStream::UpdateLineColumn(JAVACC_CHAR_TYPE c) {
 
 }
 }
-/* JavaCC - OriginalChecksum=eff57228f86b403d970758af731465ce (do not edit this line) */
+/* JavaCC - OriginalChecksum=ade3c1b57a731a003629de593814ffa6 (do not edit this line) */
diff --git a/vhdlparser/CharStream.h b/vhdlparser/CharStream.h
index 12b58b8..2543ad1 100644
--- a/vhdlparser/CharStream.h
+++ b/vhdlparser/CharStream.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. CharStream.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef CHARSTREAM_H
 #define CHARSTREAM_H
@@ -28,17 +28,33 @@ namespace parser {
 
 
 class CharStream {
+public:
+          void setTabSize(int i) { tabSize = i; }
+          int  getTabSize(int i) { return tabSize; }
+ private:
+  int getBufcolumn(int pos) {
+    if (trackLineColumn && pos>=0) {
+      return bufcolumn[pos];
+    } else {
+      return -1;
+    }
+  }
+  int getBufline(int pos) {
+    if (trackLineColumn && pos>=0) {
+      return bufline[pos];
+    } else {
+      return -1;
+    }
+  }
  public:
-  void setTabSize(int i) { tabSize = i; }
-  int getTabSize(int i) { return tabSize; }
-  virtual int getColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
-  virtual int getLine() { return trackLineColumn ? bufline[bufpos] : -1; }
-  virtual int getEndColumn() { return trackLineColumn ? bufcolumn[bufpos] : -1; }
-  virtual int getEndLine() { return trackLineColumn ? bufline[bufpos] : -1; }
-  virtual int getBeginColumn() { return trackLineColumn ? bufcolumn[tokenBegin] : -1; }
-  virtual int getBeginLine() { return trackLineColumn ? bufline[tokenBegin] : -1; }
-
-  virtual bool getTrackLineColumn() { return trackLineColumn; }
+  virtual int getColumn() { return getBufcolumn(bufpos); }
+  virtual int getLine() { return getBufline(bufpos); }
+  virtual int getEndColumn() { return getBufcolumn(bufpos); }
+  virtual int getEndLine() { return getBufline(bufpos); }
+  virtual int getBeginColumn() { return getBufcolumn(tokenBegin); }
+  virtual int getBeginLine() { return getBufline(tokenBegin); }
+
+  virtual bool getTrackLineColumn()         { return trackLineColumn; }
   virtual void setTrackLineColumn(bool val) { trackLineColumn = val; }
 
 /**
@@ -47,25 +63,25 @@ class CharStream {
  * (longer) token. So, they will be used again as the prefix of the next
  * token and it is the implemetation's responsibility to do this right.
  */
-virtual inline void backup(int amount) {
-  inBuf += amount;
-  bufpos -= amount;
-  if (bufpos < 0) {
-    bufpos += bufsize;
+  virtual inline void backup(int amount) {
+    inBuf += amount;
+    bufpos -= amount;
+    if (bufpos < 0) {
+      bufpos += bufsize;
+    }
   }
-}
 
 /**
  * Returns the next character that marks the beginning of the next token.
  * All characters must remain in the buffer between two successive calls
  * to this method to implement backup correctly.
  */
-virtual inline JAVACC_CHAR_TYPE BeginToken() {
-  tokenBegin = -1;
-  JAVACC_CHAR_TYPE c = readChar();
-  tokenBegin = bufpos;
-  return c;
-}
+  virtual inline JAVACC_CHAR_TYPE BeginToken() {
+    tokenBegin = -1;
+    JAVACC_CHAR_TYPE c = readChar();
+    tokenBegin = bufpos;
+    return c;
+  }
 
 
 /**
@@ -73,31 +89,30 @@ virtual inline JAVACC_CHAR_TYPE BeginToken() {
  * of selecting the input is the responsibility of the class
  * implementing this class.
  */
-virtual inline JAVACC_CHAR_TYPE readChar() {
-  if (inBuf > 0) {
-    --inBuf;
-    ++bufpos;
-    if (bufpos == bufsize) {
-      bufpos = 0;
+  virtual inline JAVACC_CHAR_TYPE readChar() {
+    if (inBuf > 0) {
+      --inBuf;
+      ++bufpos;
+      if (bufpos == bufsize) {
+        bufpos = 0;
+      }
+      return buffer[bufpos];
     }
 
-    return buffer[bufpos];
-  }
+    ++bufpos;
+    if (bufpos >= maxNextCharInd) {
+      FillBuff();
+    }
 
-  ++bufpos;
-  if (bufpos >= maxNextCharInd) {
-    FillBuff();
-  }
+    JAVACC_CHAR_TYPE c = buffer[bufpos];
 
-  JAVACC_CHAR_TYPE c = buffer[bufpos];
+    if (trackLineColumn) {
+      UpdateLineColumn(c);
+    }
 
-  if (trackLineColumn) {
-    UpdateLineColumn(c);
+    return c;
   }
 
-  return c;
-}
-
 
   virtual void ExpandBuff(bool wrapAround);
   virtual void FillBuff();
@@ -112,8 +127,7 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
     if (bufpos >= tokenBegin)
       return JAVACC_STRING_TYPE(buffer + tokenBegin, bufpos - tokenBegin + 1);
     else
-      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin)
-             .append(buffer, bufpos + 1);
+      return JAVACC_STRING_TYPE(buffer + tokenBegin, bufsize - tokenBegin).append(buffer, bufpos + 1);
   }
 
   /**
@@ -126,8 +140,7 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
     if ((bufpos + 1) >= len) {
       return JAVACC_STRING_TYPE(buffer + bufpos - len + 1, len);
     }
-    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1)
-           .append(buffer, bufpos + 1);
+    return JAVACC_STRING_TYPE(buffer + bufsize - (len - bufpos - 1), len - bufpos - 1).append(buffer, bufpos + 1);
   }
 
   /**
@@ -144,74 +157,71 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
   }
 
   bool endOfInput() {
-    return inBuf == 0 && bufpos + 1 >= maxNextCharInd &&
-           inputStream->endOfInput();
+    return inBuf == 0 && bufpos + 1 >= maxNextCharInd && inputStream->endOfInput();
   }
 
   CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(1), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, buffersize);
   }
 
   CharStream(const JAVACC_CHAR_TYPE *buf, int sz, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(1), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(JAVACC_STRING_TYPE(buf, sz), startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(const JAVACC_STRING_TYPE& str, int startline,
                       int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(1), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(str, startline, startcolumn, buffersize);
   }
 
   CharStream(const JAVACC_STRING_TYPE& str, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0) ,tabSize(1), trackLineColumn(true){
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(str, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline,
              int startcolumn, int buffersize) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(1), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream, int startline, int startcolumn) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(1), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
   CharStream(ReaderStream *input_stream) :
-    bufline(NULL), bufcolumn(NULL), inputStream(NULL), deleteStream(false),
-    buffer(NULL), bufpos(0), bufsize(0), tokenBegin(0), column(0), line(0),
-    prevCharIsCR (false), prevCharIsLF (false), available(0), maxNextCharInd(0),
-    inBuf(0),tabSize(1), trackLineColumn(true) {
+    bufline(NULL), bufcolumn(NULL), buffer(NULL), bufpos(0), bufsize(0), 
+    tokenBegin(0), column(0), line(0), prevCharIsCR(false), prevCharIsLF(false),
+    available(0), maxNextCharInd(0), inBuf(0), tabSize(1), trackLineColumn(true),
+    inputStream(NULL), deleteStream(false) {
     ReInit(input_stream, 1, 1, INITIAL_BUFFER_SIZE);
   }
 
-  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn,
-                      int buffersize);
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn, int buffersize);
 
-  virtual void ReInit(ReaderStream *input_stream, int startline,
-                      int startcolumn) {
+  virtual void ReInit(ReaderStream *input_stream, int startline, int startcolumn) {
     ReInit(input_stream, startline, startcolumn, INITIAL_BUFFER_SIZE);
   }
 
@@ -232,26 +242,26 @@ virtual inline JAVACC_CHAR_TYPE readChar() {
  protected:
   virtual void UpdateLineColumn(JAVACC_CHAR_TYPE c);
 
-  int *bufline;
-  int *bufcolumn;
-  ReaderStream *inputStream;
-  bool deleteStream;
-  JAVACC_CHAR_TYPE * buffer;
-  int bufpos;
-  int bufsize;
-  int tokenBegin;
-  int column;
-  int line;
-  bool prevCharIsCR ;
-  bool prevCharIsLF ;
-  int available;
-  int maxNextCharInd;
-  int inBuf ;
-  int tabSize ;
-  bool trackLineColumn;
+  int*               bufline;
+  int*               bufcolumn;
+  JAVACC_CHAR_TYPE*  buffer;
+  int                bufpos;
+  int                bufsize;
+  int                tokenBegin;
+  int                column;
+  int                line;
+  bool               prevCharIsCR;
+  bool               prevCharIsLF;
+  int                available;
+  int                maxNextCharInd;
+  int                inBuf;
+  int                tabSize;
+  bool               trackLineColumn;
+  ReaderStream*      inputStream;
+  bool               deleteStream;
 };
 
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=f8c313c692e78dec0bf9c85d18cb3b56 (do not edit this line) */
+/* JavaCC - OriginalChecksum=3f0e693d1617236429891c8c95713d73 (do not edit this line) */
diff --git a/vhdlparser/ErrorHandler.h b/vhdlparser/ErrorHandler.h
index d3778c3..9f7dc07 100644
--- a/vhdlparser/ErrorHandler.h
+++ b/vhdlparser/ErrorHandler.h
@@ -1,7 +1,8 @@
-/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. ErrorHandler.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,BUILD_PARSER=true,BUILD_TOKEN_MANAGER=true */
 #ifndef ERRORHANDLER_H
 #define ERRORHANDLER_H
+#include <stdio.h>
 #include <string>
 #include "JavaCC.h"
 #include "Token.h"
@@ -75,4 +76,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str);
 }
 
 #endif
-/* JavaCC - OriginalChecksum=0dce21f9359cd0e5094357ad5cbc315d (do not edit this line) */
+/* JavaCC - OriginalChecksum=c18f1105ba178be8e21cc9f279f94496 (do not edit this line) */
diff --git a/vhdlparser/ParseException.cc b/vhdlparser/ParseException.cc
index 2ebb875..6ef9738 100644
--- a/vhdlparser/ParseException.cc
+++ b/vhdlparser/ParseException.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "ParseException.h"
 
@@ -181,4 +181,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=e25164d58610a09ceb227db80376beba (do not edit this line) */
+/* JavaCC - OriginalChecksum=9f6af8fd72f5fe3e4210cf02acbd8387 (do not edit this line) */
diff --git a/vhdlparser/ParseException.h b/vhdlparser/ParseException.h
index d69c391..c36613f 100644
--- a/vhdlparser/ParseException.h
+++ b/vhdlparser/ParseException.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. ParseException.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef _PARSE_EXCEPTION_H
 #define _PARSE_EXCEPTION_H
@@ -96,4 +96,4 @@ class ParseException {
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=339b52f10b77d027ae2838b74a4934e1 (do not edit this line) */
+/* JavaCC - OriginalChecksum=bd87c2fc11a4306bd2c2482fd1025b7c (do not edit this line) */
diff --git a/vhdlparser/Token.cc b/vhdlparser/Token.cc
index d6fdebd..735091d 100644
--- a/vhdlparser/Token.cc
+++ b/vhdlparser/Token.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. Token.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #include "Token.h"
 
@@ -89,4 +89,4 @@ namespace parser {
 
 }
 }
-/* JavaCC - OriginalChecksum=ad49760663454c3609232308a7bb7379 (do not edit this line) */
+/* JavaCC - OriginalChecksum=dcb0f64486aa6455ae5af05d6bb539ec (do not edit this line) */
diff --git a/vhdlparser/Token.h b/vhdlparser/Token.h
index a1ac519..040899e 100644
--- a/vhdlparser/Token.h
+++ b/vhdlparser/Token.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. Token.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true,TOKEN_INCLUDES=,TOKEN_EXTENDS= */
 #ifndef TOKEN_H
 #define TOKEN_H
@@ -86,12 +86,13 @@ class Token
    */
   Token(int kind, JAVACC_STRING_TYPE image);
 
+  virtual ~Token();
+
   /**
    * Returns the image.
    */
   JAVACC_STRING_TYPE toString();
 
-  public: virtual ~Token();
 
   /**
    * Returns a new Token void *, by default. However, if you want, you
@@ -113,4 +114,4 @@ class Token
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=d80e40280c93973eed89266ba3cfbdca (do not edit this line) */
+/* JavaCC - OriginalChecksum=4748c3d6443aa3445d3c95ab54f14c2a (do not edit this line) */
diff --git a/vhdlparser/TokenManager.h b/vhdlparser/TokenManager.h
index 9aed782..0c2caa6 100644
--- a/vhdlparser/TokenManager.h
+++ b/vhdlparser/TokenManager.h
@@ -1,10 +1,12 @@
-/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. TokenManager.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef TOKENMANAGER_H
 #define TOKENMANAGER_H
+#include <iostream>
 #include "JavaCC.h"
 #include "Token.h"
 
+using namespace std;
 
 namespace vhdl {
 namespace parser {
@@ -19,10 +21,10 @@ public:
   /** This gets the next token from the input stream.
    *  A token of kind 0 (<EOF>) should be returned on EOF.
    */
-  public: virtual Token *getNextToken() = 0;
-  public: virtual ~TokenManager() { }
-  public: virtual void lexicalError() {
-    fprintf(stderr, "Lexical error encountered.\n");
+  virtual       ~TokenManager() { }
+  virtual Token *getNextToken() = 0;
+  virtual void   lexicalError() {
+  	cerr << "Lexical error encountered." << endl;
   }
 
 };
@@ -30,4 +32,4 @@ public:
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=c9208158050f6de2e723c580fee8011c (do not edit this line) */
+/* JavaCC - OriginalChecksum=918e2eba53e028d6c4142283ce3f498f (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.cc b/vhdlparser/TokenMgrError.cc
index d6c43ee..74908f0 100644
--- a/vhdlparser/TokenMgrError.cc
+++ b/vhdlparser/TokenMgrError.cc
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.cc Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #include "TokenMgrError.h"
 
@@ -64,7 +64,7 @@ namespace parser {
 // i < 16 - guaranteed
 char hexChar(int i) {
   if (i < 10) {
-    return i - '0';
+    return i + '0';
   }
   return 'a' + (i - 10);
 }
@@ -115,4 +115,4 @@ JAVACC_SIMPLE_STRING addUnicodeEscapes(JAVACC_STRING_TYPE str) {
 
 }
 }
-/* JavaCC - OriginalChecksum=c94a22f5e55a710d715f7e0d07db2460 (do not edit this line) */
+/* JavaCC - OriginalChecksum=72f292bc267bd0602e63291bf864f942 (do not edit this line) */
diff --git a/vhdlparser/TokenMgrError.h b/vhdlparser/TokenMgrError.h
index 32905ec..abb305d 100644
--- a/vhdlparser/TokenMgrError.h
+++ b/vhdlparser/TokenMgrError.h
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.1 */
+/* Generated By:JavaCC: Do not edit this line. TokenMgrError.h Version 6.2 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 #ifndef _TOKENMGRERROR_H
 #define _TOKENMGRERROR_H
@@ -8,7 +8,7 @@
 namespace vhdl {
 namespace parser {
 
- enum LexerErrors {
+enum LexerErrors {
   /**
    * Lexical error occurred.
    */
@@ -28,11 +28,10 @@ namespace parser {
    * Detected (and bailed out of) an infinite loop in the token manager.
    */
   LOOP_DETECTED = 3,
-  };
+};
 
-class TokenMgrError
-{
-  public:
+class TokenMgrError {
+public:
   /*
    * Ordinals for various reasons why an Error of this type can be thrown.
    */
@@ -57,7 +56,8 @@ class TokenMgrError
    */
     JAVACC_STRING_TYPE LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar);
 
-  private: JAVACC_STRING_TYPE message;
+private:
+   JAVACC_STRING_TYPE message;
 
   /**
    * You can also modify the body of this method to customize your error messages.
@@ -68,6 +68,7 @@ class TokenMgrError
    *
    * from this method for such cases in the release version of your parser.
    */
+public:
   JAVACC_STRING_TYPE getMessage() ;
 
   /*
@@ -75,16 +76,16 @@ class TokenMgrError
    */
 
   /** No arg constructor. */
-  public: TokenMgrError() ;
+  TokenMgrError() ;
 
   /** Constructor with message and reason. */
-  public: TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
+  TokenMgrError(JAVACC_STRING_TYPE message, int reason) ;
 
   /** Full Constructor. */
-  public: TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
+  TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, JAVACC_STRING_TYPE errorAfter, JAVACC_CHAR_TYPE curChar, int reason) ;
 };
 
 }
 }
 #endif
-/* JavaCC - OriginalChecksum=a97a71ddb969ae96c94e5d370217e1a8 (do not edit this line) */
+/* JavaCC - OriginalChecksum=c22a1b25630ec91deb47dcba22b6b39d (do not edit this line) */
diff --git a/vhdlparser/VhdlParser.cc b/vhdlparser/VhdlParser.cc
index 1c36d01..b360217 100644
--- a/vhdlparser/VhdlParser.cc
+++ b/vhdlparser/VhdlParser.cc
@@ -1,5 +1,6 @@
 /* VhdlParser.cc */
-#include "/Users/dimitri/doxygen/vhdlparser/VhdlParser.h"
+#include "VhdlParser.h"
+#include "TokenMgrError.h"
 namespace vhdl {
 namespace parser {
   unsigned int jj_la1_0[] = {
@@ -61,7 +62,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if (!hasError) {
@@ -75,7 +76,7 @@ QCString VhdlParser::access_type_definition() {Token *tok=0;QCString str,str1;if
     
 str=tok->image.c_str(); return str+str1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::actual_designator() {QCString str;Token *t=0;
@@ -117,7 +118,7 @@ return str;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) {
@@ -127,7 +128,7 @@ QCString VhdlParser::actual_parameter_part() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::actual_part() {QCString s,s1;
@@ -186,7 +187,7 @@ s+="(";s+=s1+")";return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::adding_operator() {
@@ -230,7 +231,7 @@ return "&";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::aggregate() {QCString s,s1,s2;if (!hasError) {
@@ -275,7 +276,7 @@ s+=","+s1;
     
 return "("+s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::alias_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -357,7 +358,7 @@ addVhdlType(s2.data(),getLine(ALIAS_T),Entry::VARIABLE_SEC,VhdlDocGen::ALIAS,0,s
 
  return s2+" "+s+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::alias_designator() {Token *tok=0;QCString s;
@@ -402,7 +403,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::allocator() {
@@ -434,7 +435,7 @@ void VhdlParser::allocator() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::architecture_body() {QCString s,s1;if (!hasError) {
@@ -527,7 +528,7 @@ error_skipto(BEGIN_T);
     }
     
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::architecture_declarative_part() {if (!hasError) {
@@ -567,7 +568,7 @@ void VhdlParser::architecture_declarative_part() {if (!hasError) {
     end_label_2: ;
     }
     
-  }
+}
 
 
 void VhdlParser::architecture_statement_part() {if (!hasError) {
@@ -600,7 +601,7 @@ void VhdlParser::architecture_statement_part() {if (!hasError) {
     end_label_3: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::array_type_definition() {QCString s;
@@ -633,7 +634,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::assertion() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
@@ -688,7 +689,7 @@ s.prepend("assert ");
    if(t1) s2.prepend(" report ");
     return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!hasError) {
@@ -723,7 +724,7 @@ QCString VhdlParser::assertion_statement() {QCString s,s1,s2;Token *t=0;if (!has
 if(t) s+=":";
     return s+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
@@ -748,7 +749,7 @@ QCString VhdlParser::association_element() {QCString s,s1;if (!hasError) {
     
 return s+" => "+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::association_list() {QCString s,s1;if (!hasError) {
@@ -785,7 +786,7 @@ s+=","+s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) {
@@ -812,7 +813,7 @@ QCString VhdlParser::attribute_declaration() {QCString s,s1;if (!hasError) {
 addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,s1.data(),Public);
     return " attribute "+s+":"+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_designator() {QCString s;Token *tok=0;
@@ -846,7 +847,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_name() {QCString s,s1;if (!hasError) {
@@ -895,7 +896,7 @@ s+"("+s1+")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::attribute_specification() {QCString s,s1,s2;if (!hasError) {
@@ -931,7 +932,7 @@ QCString t= s1+" is "+s2;
    addVhdlType(s.data(),getLine(ATTRIBUTE_T),Entry::VARIABLE_SEC,VhdlDocGen::ATTRIBUTE,0,t.data(),Public);
    return " attribute "+s+" of "+s1+ " is "+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::base() {Token *tok=0;if (!hasError) {
@@ -941,7 +942,7 @@ QCString VhdlParser::base() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) {
@@ -951,7 +952,7 @@ QCString VhdlParser::base_specifier() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) {
@@ -961,7 +962,7 @@ QCString VhdlParser::base_unit_declaration() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) {
@@ -971,7 +972,7 @@ QCString VhdlParser::based_integer() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) {
@@ -981,7 +982,7 @@ QCString VhdlParser::based_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) {
@@ -991,7 +992,7 @@ QCString VhdlParser::basic_identifier() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::binding_indication() {if (!hasError) {
@@ -1044,7 +1045,7 @@ void VhdlParser::binding_indication() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) {
@@ -1054,7 +1055,7 @@ QCString VhdlParser::bit_string_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) {
@@ -1064,7 +1065,7 @@ QCString VhdlParser::bit_value() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::block_configuration() {if (!hasError) {
@@ -1126,7 +1127,7 @@ void VhdlParser::block_configuration() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::block_declarative_item() {
@@ -1260,7 +1261,7 @@ void VhdlParser::block_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::block_declarative_part() {if (!hasError) {
@@ -1300,7 +1301,7 @@ void VhdlParser::block_declarative_part() {if (!hasError) {
     end_label_7: ;
     }
     
-  }
+}
 
 
 void VhdlParser::block_header() {if (!hasError) {
@@ -1368,7 +1369,7 @@ void VhdlParser::block_header() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::block_specification() {if (!hasError) {
@@ -1399,7 +1400,7 @@ void VhdlParser::block_specification() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::block_statement() {QCString s;if (!hasError) {
@@ -1502,7 +1503,7 @@ pushLabel(genLabels,s);
     }
     
 genLabels=popLabel(genLabels);
-  }
+}
 
 
 void VhdlParser::block_statement_part() {if (!hasError) {
@@ -1535,7 +1536,7 @@ void VhdlParser::block_statement_part() {if (!hasError) {
     end_label_8: ;
     }
     
-  }
+}
 
 
 void VhdlParser::case_statement() {QCString s;if (!hasError) {
@@ -1629,7 +1630,7 @@ QCString ca="case "+s;
     
 FlowChart::moveToPrevLevel();
          FlowChart::addFlowChart(FlowChart::END_CASE,"end case",0);
-  }
+}
 
 
 void VhdlParser::case_statement_alternative() {QCString s;if (!hasError) {
@@ -1656,7 +1657,7 @@ QCString t="when ";
     }
     
 FlowChart::moveToPrevLevel();
-  }
+}
 
 
 QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) {
@@ -1666,7 +1667,7 @@ QCString VhdlParser::character_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::choice() {QCString s;
@@ -1717,7 +1718,7 @@ return " others ";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::choices() {QCString s,s1;if (!hasError) {
@@ -1754,7 +1755,7 @@ s+="|";s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::component_configuration() {if (!hasError) {
@@ -1815,7 +1816,7 @@ void VhdlParser::component_configuration() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::component_declaration() {QCString s;if (!hasError) {
@@ -1909,7 +1910,7 @@ addVhdlType(s.data(),getLine(COMPONENT_T),Entry::VARIABLE_SEC,VhdlDocGen::COMPON
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::component_instantiation_statement() {QCString s,s1;if (!hasError) {
@@ -1965,7 +1966,7 @@ QCString s3;
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::component_specification() {if (!hasError) {
@@ -1981,7 +1982,7 @@ void VhdlParser::component_specification() {if (!hasError) {
     name();
     }
     
-  }
+}
 
 
 QCString VhdlParser::composite_type_definition() {QCString s,s1;
@@ -2014,7 +2015,7 @@ return s+"#";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
@@ -2056,7 +2057,7 @@ void VhdlParser::concurrent_assertion_statement() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
@@ -2098,7 +2099,7 @@ void VhdlParser::concurrent_procedure_call_statement() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
@@ -2155,7 +2156,7 @@ void VhdlParser::concurrent_signal_assignment_statement() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::concurrent_statement() {
@@ -2222,7 +2223,7 @@ void VhdlParser::concurrent_statement() {
         }
       }
     }
-  }
+}
 
 
 QCString VhdlParser::condition() {QCString s;if (!hasError) {
@@ -2232,7 +2233,7 @@ QCString VhdlParser::condition() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::condition_clause() {QCString s;if (!hasError) {
@@ -2246,7 +2247,7 @@ QCString VhdlParser::condition_clause() {QCString s;if (!hasError) {
     
 return " until "+s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::conditional_signal_assignment() {if (!hasError) {
@@ -2270,7 +2271,7 @@ void VhdlParser::conditional_signal_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::conditional_waveforms() {if (!hasError) {
@@ -2324,7 +2325,7 @@ void VhdlParser::conditional_waveforms() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::configuration_declaration() {QCString s,s1;if (!hasError) {
@@ -2403,7 +2404,7 @@ confName=s+"::"+s1;
     }
     
 genLabels.resize(0); confName="";
-  }
+}
 
 
 void VhdlParser::configuration_declarative_item() {
@@ -2434,7 +2435,7 @@ void VhdlParser::configuration_declarative_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::configuration_declarative_part() {if (!hasError) {
@@ -2459,7 +2460,7 @@ void VhdlParser::configuration_declarative_part() {if (!hasError) {
     end_label_12: ;
     }
     
-  }
+}
 
 
 void VhdlParser::configuration_item() {
@@ -2483,7 +2484,7 @@ void VhdlParser::configuration_item() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::configuration_specification() {if (!hasError) {
@@ -2503,7 +2504,7 @@ void VhdlParser::configuration_specification() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 QCString VhdlParser::constant_declaration() {QCString s,s1,s2;Token *t=0;if (!hasError) {
@@ -2553,7 +2554,7 @@ if(t)
      it.prepend("constant ");
      return it;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError) {
@@ -2575,7 +2576,7 @@ QCString VhdlParser::constraint_array_definition() {QCString s,s1;if (!hasError)
     
 return s+" "+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::context_clause() {if (!hasError) {
@@ -2599,7 +2600,7 @@ void VhdlParser::context_clause() {if (!hasError) {
     end_label_13: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::constraint() {QCString s;
@@ -2626,7 +2627,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::context_item() {
@@ -2650,7 +2651,7 @@ void VhdlParser::context_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) {
@@ -2660,7 +2661,7 @@ QCString VhdlParser::decimal_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::delay_mechanism() {QCString s;
@@ -2717,7 +2718,7 @@ return s+" inertial ";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::design_file() {
@@ -2772,7 +2773,7 @@ void VhdlParser::design_file() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::design_unit() {if (!hasError) {
@@ -2784,7 +2785,7 @@ void VhdlParser::design_unit() {if (!hasError) {
     library_unit();
     }
     
-  }
+}
 
 
 QCString VhdlParser::designator() {QCString s;
@@ -2818,7 +2819,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::direction() {Token *tok=0;
@@ -2851,7 +2852,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::disconnection_specification() {if (!hasError) {
@@ -2875,7 +2876,7 @@ void VhdlParser::disconnection_specification() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
@@ -2891,7 +2892,7 @@ void VhdlParser::guarded_signal_specificatio() {if (!hasError) {
     name();
     }
     
-  }
+}
 
 
 QCString VhdlParser::discrete_range() {QCString s;
@@ -2918,7 +2919,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::element_association() {QCString s,s1;if (!hasError) {
@@ -2945,7 +2946,7 @@ if(!s.isEmpty())
  return s+"=>"+s1;
 return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::element_declaration() {QCString s,s1;if (!hasError) {
@@ -2969,7 +2970,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::RECORD,0,s1.data(
   //addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
   return s+":"+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_aspect() {Token *tok=0;QCString s,s1;
@@ -3048,7 +3049,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_class() {
@@ -3246,7 +3247,7 @@ return "file";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_class_entry() {QCString s;if (!hasError) {
@@ -3275,7 +3276,7 @@ s+="<>";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_class_entry_list() {QCString s,s1,s2;if (!hasError) {
@@ -3319,7 +3320,7 @@ s2+=",";s2+=s;
     
 return s1+s2;
 assert(false);
-  }
+}
 
 
 void VhdlParser::entity_declaration() {QCString s;if (!hasError) {
@@ -3410,7 +3411,7 @@ lastEntity=current.get();
     }
     
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::entity_declarative_item() {
@@ -3555,7 +3556,7 @@ void VhdlParser::entity_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::entity_declarative_part() {if (!hasError) {
@@ -3595,7 +3596,7 @@ void VhdlParser::entity_declarative_part() {if (!hasError) {
     end_label_16: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
@@ -3620,7 +3621,7 @@ QCString VhdlParser::entity_designator() {QCString s,s1;if (!hasError) {
     
 return s+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::entity_header() {if (!hasError) {
@@ -3662,7 +3663,7 @@ currP=VhdlDocGen::PORT;
     }
     }
     
-  }
+}
 
 
 QCString VhdlParser::entity_name_list() {QCString s,s1;
@@ -3733,7 +3734,7 @@ return "all";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) {
@@ -3751,7 +3752,7 @@ QCString VhdlParser::entity_specification() {QCString s,s1;if (!hasError) {
     
 return s+":"+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::entity_statement() {
@@ -3784,7 +3785,7 @@ void VhdlParser::entity_statement() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::entity_statement_part() {if (!hasError) {
@@ -3813,7 +3814,7 @@ void VhdlParser::entity_statement_part() {if (!hasError) {
     end_label_18: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::entity_tag() {QCString s;
@@ -3849,7 +3850,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::enumeration_literal() {QCString s;
@@ -3883,7 +3884,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::enumeration_type_definition() {QCString s,s1;if (!hasError) {
@@ -3928,7 +3929,7 @@ s+=",";s+=s1;
     
 return "("+s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::exit_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
@@ -4002,7 +4003,7 @@ lab.resize(0);
 
   return s+s1+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::expression() {QCString s,s1,s2;if (!hasError) {
@@ -4044,7 +4045,7 @@ s+=s1;s+=s2;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::logop() {
@@ -4121,7 +4122,7 @@ return "or" ;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) {
@@ -4131,7 +4132,7 @@ QCString VhdlParser::extended_identifier() {Token *t;if (!hasError) {
     
 return t->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::factor() {QCString s,s1;
@@ -4217,7 +4218,7 @@ s1="not ";return s1+s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_declaration() {QCString s,s1,s2,s3;if (!hasError) {
@@ -4261,7 +4262,7 @@ QCString t1=s2+" "+s3;
    addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,t1.data(),Public);
    return " file "+s+":"+s2+" "+s3+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) {
@@ -4271,7 +4272,7 @@ QCString VhdlParser::file_logical_name() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
@@ -4304,7 +4305,7 @@ QCString VhdlParser::file_open_information() {QCString s,s1,s2;if (!hasError) {
     
 s2="open "+s+" is "+s1;  return s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) {
@@ -4322,7 +4323,7 @@ QCString VhdlParser::file_type_definition() {QCString s,s1;if (!hasError) {
     
 s1=" file of "+s; return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) {
@@ -4332,7 +4333,7 @@ QCString VhdlParser::floating_type_definition() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::formal_designator() {QCString s;Token *tok=0;
@@ -4368,7 +4369,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) {
@@ -4378,7 +4379,7 @@ QCString VhdlParser::formal_parameter_list() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::formal_part() {QCString s,s1;if (!hasError) {
@@ -4415,7 +4416,7 @@ s+"("+s1+")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::full_type_declaration() {Entry *tmpEntry;QCString s,s1,s2;if (!hasError) {
@@ -4471,7 +4472,7 @@ if (s2.contains("#")) {
       tmpEntry=0;
       return "type "+s+" is "+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) {
@@ -4493,7 +4494,7 @@ QCString VhdlParser::function_call() {QCString s,s1;if (!hasError) {
     
 return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 void VhdlParser::generate_statement() {QCString s;if (!hasError) {
@@ -4557,7 +4558,7 @@ error_skipto(GENERATE_T);
     }
     
 genLabels=popLabel(genLabels);
-  }
+}
 
 
 void VhdlParser::generate_scheme() {
@@ -4589,7 +4590,7 @@ void VhdlParser::generate_scheme() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::generic_clause() {QCString s;if (!hasError) {
@@ -4618,7 +4619,7 @@ parse_sec=GEN_SEC;
     }
     
 parse_sec=0;
-  }
+}
 
 
 QCString VhdlParser::generic_list() {QCString s;if (!hasError) {
@@ -4628,7 +4629,7 @@ QCString VhdlParser::generic_list() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::generic_map_aspect() {if (!hasError) {
@@ -4652,7 +4653,7 @@ void VhdlParser::generic_map_aspect() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 QCString VhdlParser::group_constituent() {QCString s;
@@ -4688,7 +4689,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::group_constituent_list() {QCString s,s1,s2;if (!hasError) {
@@ -4728,7 +4729,7 @@ s2+=",";s2+=s1;
     
 return s+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -4766,7 +4767,7 @@ QCString VhdlParser::group_declaration() {QCString s,s1,s2;if (!hasError) {
     
 return "group "+s+":"+s1+"("+s2+");";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError) {
@@ -4800,7 +4801,7 @@ QCString VhdlParser::group_template_declaration() {QCString s,s1;if (!hasError)
     
 return "group "+s+ "is ("+s1+");";
 assert(false);
-  }
+}
 
 
 void VhdlParser::guarded_signal_specification() {if (!hasError) {
@@ -4816,7 +4817,7 @@ void VhdlParser::guarded_signal_specification() {if (!hasError) {
     type_mark();
     }
     
-  }
+}
 
 
 QCString VhdlParser::identifier() {Token *tok=0;
@@ -4849,7 +4850,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::identifier_list() {QCString str,str1;if (!hasError) {
@@ -4886,7 +4887,7 @@ str+=",";str+=str1;
     
 return str;
 assert(false);
-  }
+}
 
 
 void VhdlParser::if_statement() {QCString s,s1;if (!hasError) {
@@ -5020,7 +5021,7 @@ FlowChart::addFlowChart(FlowChart::ELSE_NO,0,0);
     
 FlowChart::moveToPrevLevel();
           FlowChart::addFlowChart(FlowChart::ENDIF_NO,0,0);
-  }
+}
 
 
 QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) {
@@ -5038,7 +5039,7 @@ QCString VhdlParser::incomplete_type_declaration() {QCString s;if (!hasError) {
     
 return "type "+s+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::index_constraint() {QCString s="("; QCString s1,s2;if (!hasError) {
@@ -5087,7 +5088,7 @@ s+=",";s+=s1;
     
 return s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::index_specification() {QCString s;
@@ -5135,7 +5136,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) {
@@ -5153,7 +5154,7 @@ QCString VhdlParser::index_subtype_definition() {QCString s;if (!hasError) {
     
 return s+" range <> ";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::instantiation_unit() {QCString s,s1,s2;Token *tok;
@@ -5268,7 +5269,7 @@ s1="configuration ";return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::instantiation_list() {QCString s;Token *tok=0;
@@ -5313,7 +5314,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::integer() {Token *t;if (!hasError) {
@@ -5323,7 +5324,7 @@ QCString VhdlParser::integer() {Token *t;if (!hasError) {
     
 return t->image.c_str();
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) {
@@ -5333,7 +5334,7 @@ QCString VhdlParser::integer_type_definition() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_declaration() {QCString s,s1;
@@ -5422,7 +5423,7 @@ if (parse_sec==GEN_SEC)
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_element() {QCString s;if (!hasError) {
@@ -5432,7 +5433,7 @@ QCString VhdlParser::interface_element() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError) {
@@ -5455,7 +5456,7 @@ QCString VhdlParser::interface_file_declaration() {QCString s,s1;if (!hasError)
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::VFILE,0,s1.data(),Public);
    return " file "+s+":"+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_list() {QCString s,s1,s2;if (!hasError) {
@@ -5492,7 +5493,7 @@ s2+=";";s2+=s1;
     
 return s+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::interface_variable_declaration() {Token *tok=0;Token *tok1=0;Token *tok2=0;QCString s,s1,s2,s3,s4,s5;if (!hasError) {
@@ -5640,7 +5641,7 @@ if(tok)
                     } // if component
               return it;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::iteration_scheme() {QCString s;
@@ -5687,7 +5688,7 @@ QCString q=lab+" for "+s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::label() {QCString s;if (!hasError) {
@@ -5697,7 +5698,7 @@ QCString VhdlParser::label() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::library_clause() {QCString s;if (!hasError) {
@@ -5723,7 +5724,7 @@ if ( parse_sec==0 && Config_getBool(SHOW_INCLUDE_FILES) )
                    QCString s1="library "+s;
                    return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::library_unit() {QCString s;
@@ -5764,7 +5765,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::literal() {QCString s;
@@ -5826,7 +5827,7 @@ return "null";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::logical_operator() {QCString s;if (!hasError) {
@@ -5836,7 +5837,7 @@ QCString VhdlParser::logical_operator() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::loop_statement() {QCString s,s1,s2,s3;if (!hasError) {
@@ -5927,7 +5928,7 @@ QCString q = s+" loop "+s2+" end loop" +s3;
          FlowChart::addFlowChart(FlowChart::END_LOOP,endLoop.data(),0);
         return q;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::miscellaneous_operator() {Token *t=0;
@@ -5971,7 +5972,7 @@ return "not";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::mode() {Token *tok=0;
@@ -6037,7 +6038,7 @@ return "linkage";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::multiplying_operation() {Token *tok=0;
@@ -6092,7 +6093,7 @@ return tok->image.c_str();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::name() {QCString s,s1;if (!hasError) {
@@ -6144,7 +6145,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::name_ext1() {QCString s,s1,s2;if (!hasError) {
@@ -6173,7 +6174,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::name_ext() {QCString s,s1,s2;if (!hasError) {
@@ -6286,7 +6287,7 @@ s+=")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::test_att_name() {QCString s,s1;if (!hasError) {
@@ -6346,7 +6347,7 @@ s+="(";s+=s1;s+=")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::indexed_name() {QCString s,s1,s2;if (!hasError) {
@@ -6399,7 +6400,7 @@ s+=",";s+=s1;
     
 return s+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::next_statement() {QCString s,s1,s2;Token *t=0;Token *t1=0;if (!hasError) {
@@ -6472,7 +6473,7 @@ if(t) s+=":";
   if(t1) s2.prepend("when ");
   return s+s1+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::null_statement() {QCString s;if (!hasError) {
@@ -6510,7 +6511,7 @@ s+=":";
     
 return s+="null";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::numeric_literal() {QCString s;
@@ -6545,7 +6546,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::object_class() {
@@ -6626,7 +6627,7 @@ return "type";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) {
@@ -6636,7 +6637,7 @@ QCString VhdlParser::operator_symbol() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::options() {if (!hasError) {
@@ -6672,7 +6673,7 @@ void VhdlParser::options() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::package_body() {QCString s;if (!hasError) {
@@ -6748,7 +6749,7 @@ lastCompound=current.get();
     }
     
 lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::package_body_declarative_item() {
@@ -6836,7 +6837,7 @@ void VhdlParser::package_body_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::package_body_declarative_part() {if (!hasError) {
@@ -6871,7 +6872,7 @@ void VhdlParser::package_body_declarative_part() {if (!hasError) {
     end_label_29: ;
     }
     
-  }
+}
 
 
 void VhdlParser::package_declaration() {QCString s;if (!hasError) {
@@ -6946,7 +6947,7 @@ lastCompound=current.get();
     }
     
 lastEntity=0;lastCompound=0; genLabels.resize(0);
-  }
+}
 
 
 void VhdlParser::geninter() {if (!hasError) {
@@ -6988,7 +6989,7 @@ void VhdlParser::geninter() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::package_declarative_item() {
@@ -7133,7 +7134,7 @@ void VhdlParser::package_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::package_declarative_part() {if (!hasError) {
@@ -7173,7 +7174,7 @@ void VhdlParser::package_declarative_part() {if (!hasError) {
     end_label_30: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) {
@@ -7191,7 +7192,7 @@ QCString VhdlParser::parameter_specification() {QCString s,s1;if (!hasError) {
     
 return s+" in "+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
@@ -7212,7 +7213,7 @@ QCString VhdlParser::physical_literal() {QCString s,s1;if (!hasError) {
     
 s+=" ";s+=s1;s.prepend(" "); return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::physical_type_definition() {QCString s,s1,s2;if (!hasError) {
@@ -7280,7 +7281,7 @@ addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::UNITS,0,0,Public)
     
 return s+"%";
 assert(false);
-  }
+}
 
 
 void VhdlParser::port_clause() {if (!hasError) {
@@ -7305,7 +7306,7 @@ void VhdlParser::port_clause() {if (!hasError) {
     }
     
 currP=0;
-  }
+}
 
 
 QCString VhdlParser::port_list() {QCString s;if (!hasError) {
@@ -7315,7 +7316,7 @@ QCString VhdlParser::port_list() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::port_map_aspect() {if (!hasError) {
@@ -7339,7 +7340,7 @@ void VhdlParser::port_map_aspect() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 QCString VhdlParser::primary() {QCString s,s1;
@@ -7436,7 +7437,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::primary_unit() {
@@ -7483,7 +7484,7 @@ void VhdlParser::primary_unit() {
         }
       }
     }
-  }
+}
 
 
 QCString VhdlParser::procedure_call() {QCString s,s1;if (!hasError) {
@@ -7520,7 +7521,7 @@ s1.prepend("("); s1.append(")");
     
 return s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::procedure_call_statement() {QCString s,s1;if (!hasError) {
@@ -7553,7 +7554,7 @@ s+=":";
     
 return s+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::process_declarative_item() {QCString s;
@@ -7708,7 +7709,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::process_declarative_part() {QCString s,s1;if (!hasError) {
@@ -7750,7 +7751,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::process_statement() {QCString s,s1,s2;Token *tok=0;if (!hasError) {
@@ -7935,7 +7936,7 @@ if(s.isEmpty())
   createFlow();
    currName="";
    newEntry();
-  }
+}
 
 
 void VhdlParser::process_statement_part() {if (!hasError) {
@@ -7975,7 +7976,7 @@ void VhdlParser::process_statement_part() {if (!hasError) {
     end_label_33: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::qualified_expression() {QCString s,s1;if (!hasError) {
@@ -8032,7 +8033,7 @@ s+="(";s+=s1;s+=")";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::range() {QCString s,s1,s2;
@@ -8067,7 +8068,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) {
@@ -8081,7 +8082,7 @@ QCString VhdlParser::range_constraint() {QCString s,s1;if (!hasError) {
     
 return " range "+s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::record_type_definition() {if (!hasError) {
@@ -8135,7 +8136,7 @@ void VhdlParser::record_type_definition() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
@@ -8169,7 +8170,7 @@ QCString VhdlParser::relation() {QCString s,s1,s2;if (!hasError) {
     
 return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::relation_operator() {
@@ -8246,7 +8247,7 @@ return "/=";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::report_statement() {Token *t=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
@@ -8306,7 +8307,7 @@ if(t) s.append(":");
         if(t1) s2.prepend(" severity ");
         return s+s1+s2+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::return_statement() {QCString s,s1;if (!hasError) {
@@ -8374,7 +8375,7 @@ s+=":";
     
 return s+" return "+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::scalar_type_definition() {QCString s,s1;
@@ -8418,7 +8419,7 @@ return s+" "+s1+"%";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::secondary_unit() {
@@ -8442,7 +8443,7 @@ void VhdlParser::secondary_unit() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError) {
@@ -8467,7 +8468,7 @@ QCString VhdlParser::secondary_unit_declaration() {QCString s,s1;if (!hasError)
 
   return s+"="+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) {
@@ -8485,7 +8486,7 @@ QCString VhdlParser::selected_name() {QCString s,s1;if (!hasError) {
     
 return s+"."+s1;
 assert(false);
-  }
+}
 
 
 void VhdlParser::selected_signal_assignment() {if (!hasError) {
@@ -8521,7 +8522,7 @@ void VhdlParser::selected_signal_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::selected_waveforms() {if (!hasError) {
@@ -8568,7 +8569,7 @@ void VhdlParser::selected_waveforms() {if (!hasError) {
     end_label_35: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) {
@@ -8583,7 +8584,7 @@ QCString VhdlParser::sensitivity_clause() {QCString s;if (!hasError) {
 s.prepend(" on ");
   return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sensitivity_list() {QCString s,s1;if (!hasError) {
@@ -8620,7 +8621,7 @@ s+=",";s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sequence_of_statement() {QCString s,s1;if (!hasError) {
@@ -8645,7 +8646,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sequential_statement() {QCString s;
@@ -8779,7 +8780,7 @@ FlowChart::addFlowChart(FlowChart::TEXT_NO,s.data(),0);return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
@@ -8813,7 +8814,7 @@ QCString VhdlParser::shift_expression() {QCString s,s1,s2;if (!hasError) {
     
 return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::shift_operator() {
@@ -8890,7 +8891,7 @@ return "ror";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sign() {
@@ -8923,7 +8924,7 @@ return "-";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::signal_assignment_statement() {QCString s,s1,s2,s3;
@@ -9017,7 +9018,7 @@ return s+s1+"<="+s2+s3+";";
       }
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::semi() {if (!hasError) {
@@ -9025,7 +9026,7 @@ void VhdlParser::semi() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::signal_declaration() {Token* tok=0;QCString s,s1,s2,s3,s4;if (!hasError) {
@@ -9088,7 +9089,7 @@ if(tok)
       s3.prepend(":=");
      s4=s1+s2+s3;
      addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SIGNAL,0,s4.data(),Public);
-  }
+}
 
 
 QCString VhdlParser::signal_kind() {
@@ -9121,7 +9122,7 @@ return "bus";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::signal_list() {QCString s,s1;
@@ -9191,7 +9192,7 @@ return "all";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::signature() {QCString s,s1,s2;if (!hasError) {
@@ -9273,7 +9274,7 @@ s+="return ";s+=s1;
     
 s1="["+s+"]";return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::simple_expression() {QCString s,s1,s2;if (!hasError) {
@@ -9326,7 +9327,7 @@ s+=s1;s+=s2;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::simple_name() {if (!hasError) {
@@ -9334,7 +9335,7 @@ void VhdlParser::simple_name() {if (!hasError) {
     name();
     }
     
-  }
+}
 
 
 QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) {
@@ -9356,7 +9357,7 @@ QCString VhdlParser::slice_name() {QCString s,s1;if (!hasError) {
     
 return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) {
@@ -9366,7 +9367,7 @@ QCString VhdlParser::string_literal() {Token *tok=0;if (!hasError) {
     
 return tok->image.c_str();
 assert(false);
-  }
+}
 
 
 void VhdlParser::subprogram_body() {QCString s;if (!hasError) {
@@ -9439,7 +9440,7 @@ if (s.data())
 tempEntry->endBodyLine=getLine(END_T);
       createFlow();
       currP=0;
-  }
+}
 
 
 void VhdlParser::subprogram_declaration() {
@@ -9474,7 +9475,7 @@ currP=0;
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::subprogram_1() {
@@ -9498,7 +9499,7 @@ void VhdlParser::subprogram_1() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 QCString VhdlParser::subprogram_declarative_item() {QCString s;
@@ -9664,7 +9665,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::subprogram_declarative_part() {QCString s,s1;if (!hasError) {
@@ -9707,7 +9708,7 @@ s+=s1;
     
 return s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::subprogram_kind() {
@@ -9731,7 +9732,7 @@ void VhdlParser::subprogram_kind() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::subprogram_specification() {QCString s;Token *tok=0;Token *t;
@@ -9925,7 +9926,7 @@ tempEntry=current.get();
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::subprogram_statement_part() {if (!hasError) {
@@ -9965,7 +9966,7 @@ void VhdlParser::subprogram_statement_part() {if (!hasError) {
     end_label_42: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) {
@@ -9992,7 +9993,7 @@ QCString VhdlParser::subtype_declaration() {QCString s,s1;if (!hasError) {
 addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,VhdlDocGen::SUBTYPE,0,s1.data(),Public);
   return " subtype "+s+" is "+s1+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
@@ -10024,7 +10025,7 @@ QCString VhdlParser::subtype_indication() {QCString s,s1,s2;if (!hasError) {
     
 return s+" "+s1+" "+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::suffix() {QCString s;
@@ -10079,7 +10080,7 @@ return " all ";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::target() {QCString s;
@@ -10115,7 +10116,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::term() {QCString s,s1,s2;if (!hasError) {
@@ -10148,7 +10149,7 @@ s+=s1;s+=s2;
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) {
@@ -10162,7 +10163,7 @@ QCString VhdlParser::timeout_clause() {QCString s;if (!hasError) {
     
 return " for "+s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) {
@@ -10184,7 +10185,7 @@ QCString VhdlParser::type_conversion() {QCString s,s1;if (!hasError) {
     
 return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_declaration() {QCString s;
@@ -10217,7 +10218,7 @@ return s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_definition() {QCString s;
@@ -10301,7 +10302,7 @@ return "";
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::type_mark() {QCString s;if (!hasError) {
@@ -10311,7 +10312,7 @@ QCString VhdlParser::type_mark() {QCString s;if (!hasError) {
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::unconstraint_array_definition() {QCString s,s1,s2,s3;if (!hasError) {
@@ -10368,7 +10369,7 @@ s3+=",";s3+=s1;
     
 return "array("+s+s3+") of "+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::use_clause() {QCString s,s1;if (!hasError) {
@@ -10424,7 +10425,7 @@ QCStringList ql1=QCStringList::split(",",s);
                    s1="use "+s;
                    return s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::variable_assignment_statement() {QCString s,s1,s2;
@@ -10492,7 +10493,7 @@ return "";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::variable_declaration() {Token *tok=0;Token *t1=0;QCString s,s1,s2;if (!hasError) {
@@ -10571,7 +10572,7 @@ int spec;
     addVhdlType(s.data(),getLine(),Entry::VARIABLE_SEC,spec,0,it.data(),Public);
     return val;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasError) {
@@ -10651,7 +10652,7 @@ QCString VhdlParser::wait_statement() {QCString s,s1,s2,s3;Token *t=0;if (!hasEr
 if(t) s.append(":");
   return s+" wait "+s1+s2+s3+";";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::waveform() {QCString s,s1;
@@ -10726,7 +10727,7 @@ return " unaffected ";
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::waveform_element() {QCString s,s1;if (!hasError) {
@@ -10759,7 +10760,7 @@ s1.prepend(" after ");
     
 return s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::protected_type_body() {if (!hasError) {
@@ -10805,7 +10806,7 @@ QCString VhdlParser::protected_type_body() {if (!hasError) {
     
 return "";
 assert(false);
-  }
+}
 
 
 void VhdlParser::protected_type_body_declarative_item() {
@@ -10918,7 +10919,7 @@ void VhdlParser::protected_type_body_declarative_item() {
         }
       }
     }
-  }
+}
 
 
 void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
@@ -10955,7 +10956,7 @@ void VhdlParser::protected_type_body_declarative_part() {if (!hasError) {
     end_label_47: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::protected_type_declaration() {if (!hasError) {
@@ -11000,7 +11001,7 @@ error_skipto(END_T);
     
 return "";
 assert(false);
-  }
+}
 
 
 void VhdlParser::protected_type_declarative_item() {
@@ -11034,7 +11035,7 @@ void VhdlParser::protected_type_declarative_item() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::protected_type_declarative_part() {if (!hasError) {
@@ -11066,7 +11067,7 @@ void VhdlParser::protected_type_declarative_part() {if (!hasError) {
     end_label_48: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::context_ref() {QCString s;if (!hasError) {
@@ -11084,7 +11085,7 @@ QCString VhdlParser::context_ref() {QCString s;if (!hasError) {
     
 return "context "+s ;
 assert(false);
-  }
+}
 
 
 void VhdlParser::context_declaration() {QCString s,s1;if (!hasError) {
@@ -11166,7 +11167,7 @@ parse_sec=CONTEXT_SEC;
     
 parse_sec=0;
                           addVhdlType(s.data(),getLine(LIBRARY_T),Entry::VARIABLE_SEC,VhdlDocGen::LIBRARY,"context",s1.data(),Public);
-  }
+}
 
 
 QCString VhdlParser::libustcont_stats() {QCString s;
@@ -11210,7 +11211,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -11259,7 +11260,7 @@ void VhdlParser::package_instantiation_declaration() {QCString s,s1,s2;if (!hasE
     
 QCString q=" is new "+s1+s2;
       addVhdlType(s.data(),getLine(PACKAGE_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"package",q.data(),Public);
-  }
+}
 
 
 QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasError) {
@@ -11301,7 +11302,7 @@ QCString VhdlParser::interface_package_declaration() {QCString s,s1;if (!hasErro
 current->name=s;
                             return "package "+s+" is new "+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::subprogram_instantiation_declaration() {QCString s,s1,s2;if (!hasError) {
@@ -11352,7 +11353,7 @@ QCString q= " is new "+s1+s2;
       addVhdlType(s.data(),getLine(FUNCTION_T),Entry::VARIABLE_SEC,VhdlDocGen::INSTANTIATION,"function ",q.data(),Public);
     return q;
 assert(false);
-  }
+}
 
 
 void VhdlParser::gen_assoc_list() {if (!hasError) {
@@ -11376,7 +11377,7 @@ void VhdlParser::gen_assoc_list() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 void VhdlParser::gen_interface_list() {if (!hasError) {
@@ -11406,7 +11407,7 @@ void VhdlParser::gen_interface_list() {if (!hasError) {
     jj_consume_token(RPAREN_T);
     }
     
-  }
+}
 
 
 void VhdlParser::case_scheme() {if (!hasError) {
@@ -11453,7 +11454,7 @@ void VhdlParser::case_scheme() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::when_stats() {if (!hasError) {
@@ -11503,7 +11504,7 @@ void VhdlParser::when_stats() {if (!hasError) {
     end_label_50: ;
     }
     
-  }
+}
 
 
 void VhdlParser::ttend() {if (!hasError) {
@@ -11531,7 +11532,7 @@ void VhdlParser::ttend() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::generate_statement_body() {if (!hasError) {
@@ -11543,7 +11544,7 @@ void VhdlParser::generate_statement_body() {if (!hasError) {
     generate_statement_body();
     }
     
-  }
+}
 
 
 void VhdlParser::generate_statement_body1() {if (!hasError) {
@@ -11624,7 +11625,7 @@ void VhdlParser::generate_statement_body1() {if (!hasError) {
     end_label_52: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::external_name() {QCString s,s1,s2;if (!hasError) {
@@ -11656,7 +11657,7 @@ QCString t="<<"+s;
                          QCString t1=s1+":"+s2+">>";
                          return   s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::sig_stat() {Token *t;
@@ -11700,7 +11701,7 @@ return t->image.data();
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::external_pathname() {QCString s;
@@ -11744,7 +11745,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::absolute_pathname() {QCString s,s1;
@@ -11789,7 +11790,7 @@ return "."+s;
       }
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
@@ -11814,7 +11815,7 @@ QCString VhdlParser::relative_pathname() {QCString s,s1,s2;if (!hasError) {
     
 return s+s1+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::neg_list() {QCString s;if (!hasError) {
@@ -11847,7 +11848,7 @@ s+="^.";
     
 return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::pathname_element() {QCString s,s1;if (!hasError) {
@@ -11883,7 +11884,7 @@ if(!s1.isEmpty())
 
     return s;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::pathname_element_list() {QCString s,s1,s2;if (!hasError) {
@@ -11927,7 +11928,7 @@ s2+=s1;s2+=".";
     
 return s+s2;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::package_path_name() {QCString s;if (!hasError) {
@@ -11941,7 +11942,7 @@ QCString VhdlParser::package_path_name() {QCString s;if (!hasError) {
     
 return "@"+s;
 assert(false);
-  }
+}
 
 
 void VhdlParser::conditional_signal_assignment_wave() {
@@ -11969,7 +11970,7 @@ void VhdlParser::conditional_signal_assignment_wave() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
@@ -12029,7 +12030,7 @@ void VhdlParser::conditional_waveform_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::else_wave_list() {if (!hasError) {
@@ -12060,7 +12061,7 @@ void VhdlParser::else_wave_list() {if (!hasError) {
     }
     }
     
-  }
+}
 
 
 void VhdlParser::conditional_force_assignment() {if (!hasError) {
@@ -12138,7 +12139,7 @@ void VhdlParser::conditional_force_assignment() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::selected_signal_assignment_wave() {
@@ -12162,7 +12163,7 @@ void VhdlParser::selected_signal_assignment_wave() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::selected_variable_assignment() {if (!hasError) {
@@ -12205,7 +12206,7 @@ void VhdlParser::selected_variable_assignment() {if (!hasError) {
     sel_var_list();
     }
     
-  }
+}
 
 
 void VhdlParser::select_name() {
@@ -12232,7 +12233,7 @@ void VhdlParser::select_name() {
         errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
       }
     }
-  }
+}
 
 
 void VhdlParser::selected_waveform_assignment() {if (!hasError) {
@@ -12292,7 +12293,7 @@ void VhdlParser::selected_waveform_assignment() {if (!hasError) {
     sel_wave_list();
     }
     
-  }
+}
 
 
 void VhdlParser::selected_force_assignment() {if (!hasError) {
@@ -12355,7 +12356,7 @@ void VhdlParser::selected_force_assignment() {if (!hasError) {
     sel_var_list();
     }
     
-  }
+}
 
 
 void VhdlParser::sel_var_list() {if (!hasError) {
@@ -12443,7 +12444,7 @@ void VhdlParser::sel_var_list() {if (!hasError) {
     end_label_55: ;
     }
     
-  }
+}
 
 
 void VhdlParser::sel_wave_list() {if (!hasError) {
@@ -12486,7 +12487,7 @@ void VhdlParser::sel_wave_list() {if (!hasError) {
     jj_consume_token(SEMI_T);
     }
     
-  }
+}
 
 
 void VhdlParser::inout_stat() {
@@ -12510,7 +12511,7 @@ void VhdlParser::inout_stat() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
 void VhdlParser::else_stat() {if (!hasError) {
@@ -12556,7 +12557,7 @@ void VhdlParser::else_stat() {if (!hasError) {
     end_label_57: ;
     }
     
-  }
+}
 
 
 QCString VhdlParser::interface_subprogram_declaration() {QCString s;
@@ -12591,7 +12592,7 @@ return s;
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) {
@@ -12610,7 +12611,7 @@ QCString VhdlParser::iproc() {QCString s,s1;if (!hasError) {
 current->name=s;
   return "procedure "+s+s1;
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::ifunc() {QCString s,s1,s2,s3;Token *t=0;Token *t1=0;Token *t2=0;if (!hasError) {
@@ -12724,7 +12725,7 @@ QCString q;
                     }
          currP=0;return "";
 assert(false);
-  }
+}
 
 
 QCString VhdlParser::param() {QCString s,s1;Token *tok=0;if (!hasError) {
@@ -12778,7 +12779,7 @@ if(tok)
                       param_sec=0;
                       return s+"("+s1+")";
 assert(false);
-  }
+}
 
 
 void VhdlParser::parseInline() {
@@ -12808,31 +12809,21 @@ void VhdlParser::parseInline() {
       jj_consume_token(-1);
       errorHandler->handleParseError(token, getToken(1), __FUNCTION__, this), hasError = true;
     }
-  }
+}
 
 
  VhdlParser::VhdlParser(TokenManager *tm){
     head = NULL;
+    errorHandlerCreated = false;
     ReInit(tm);
 }
-   VhdlParser::~VhdlParser()
+VhdlParser::~VhdlParser()
 {
-  if (token_source) delete token_source;
-  if (head) {
-    Token *next, *t = head;
-    while (t) {
-      next = t->next;
-      delete t;
-      t = next;
-    }
-  }
-  if (errorHandlerCreated) {
-    delete errorHandler;
-  }
+  clear();
 }
 
 void VhdlParser::ReInit(TokenManager *tm){
-    if (head) delete head;
+    clear();
     errorHandler = new ErrorHandler();
     errorHandlerCreated = true;
     hasError = false;
@@ -12854,6 +12845,24 @@ void VhdlParser::ReInit(TokenManager *tm){
   }
 
 
+void VhdlParser::clear(){
+  //Since token manager was generate from outside,
+  //parser should not take care of deleting
+  //if (token_source) delete token_source;
+  if (head) {
+    Token *next, *t = head;
+    while (t) {
+      next = t->next;
+      delete t;
+      t = next;
+    }
+  }
+  if (errorHandlerCreated) {
+    delete errorHandler;
+  }
+}
+
+
 Token * VhdlParser::jj_consume_token(int kind)  {
     Token *oldToken;
     if ((oldToken = token)->next != NULL) token = token->next;
@@ -12876,7 +12885,8 @@ Token * VhdlParser::jj_consume_token(int kind)  {
     token = oldToken;
     jj_kind = kind;
     JAVACC_STRING_TYPE image = kind >= 0 ? tokenImage[kind] : tokenImage[0];
-    errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this), hasError = true;
+    errorHandler->handleUnexpectedToken(kind, image.substr(1, image.size() - 2), getToken(1), this);
+    hasError = true;
     return token;
   }
 
@@ -12933,26 +12943,23 @@ int VhdlParser::jj_ntk_f(){
   }
 
 
-void VhdlParser::jj_add_error_token(int kind, int pos)  {
+  void VhdlParser::jj_add_error_token(int kind, int pos)  {
   }
 
-  /** Generate ParseException. */
 
  void  VhdlParser::parseError()   {
       fprintf(stderr, "Parse error at: %d:%d, after token: %s encountered: %s\n", token->beginLine, token->beginColumn, addUnicodeEscapes(token->image).c_str(), addUnicodeEscapes(getToken(1)->image).c_str());
    }
 
 
- void VhdlParser::enable_tracing()  {
+  void VhdlParser::enable_tracing()  {
   }
 
-  /** Disable tracing. */
-
- void VhdlParser::disable_tracing()  {
+  void VhdlParser::disable_tracing()  {
   }
 
 
-void VhdlParser::jj_rescan_token(){
+  void VhdlParser::jj_rescan_token(){
     jj_rescan = true;
     for (int i = 0; i < 116; i++) {
       JJCalls *p = &jj_2_rtns[i];
@@ -13085,7 +13092,7 @@ void VhdlParser::jj_rescan_token(){
   }
 
 
-void VhdlParser::jj_save(int index, int xla){
+  void VhdlParser::jj_save(int index, int xla){
     JJCalls *p = &jj_2_rtns[index];
     while (p->gen > jj_gen) {
       if (p->next == NULL) { p = p->next = new JJCalls(); break; }
diff --git a/vhdlparser/VhdlParser.h b/vhdlparser/VhdlParser.h
index fffac50..efdfe33 100644
--- a/vhdlparser/VhdlParser.h
+++ b/vhdlparser/VhdlParser.h
@@ -12,12 +12,12 @@
 namespace vhdl {
 namespace parser {
   struct JJCalls {
-    int gen;
-    Token *first;
-    int arg;
-    JJCalls *next;
+    int        gen;
+    int        arg;
+    JJCalls*   next;
+    Token*     first;
     ~JJCalls() { if (next) delete next; }
-    JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
+     JJCalls() { next = NULL; arg = 0; gen = -1; first = NULL; }
   };
 
 class VhdlParser {
@@ -582,7 +582,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_1() || jj_done;
+    return (!jj_3_1() || jj_done);
  { jj_save(0, xla); }
   }
 
@@ -590,7 +590,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_2() || jj_done;
+    return (!jj_3_2() || jj_done);
  { jj_save(1, xla); }
   }
 
@@ -598,7 +598,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_3() || jj_done;
+    return (!jj_3_3() || jj_done);
  { jj_save(2, xla); }
   }
 
@@ -606,7 +606,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_4() || jj_done;
+    return (!jj_3_4() || jj_done);
  { jj_save(3, xla); }
   }
 
@@ -614,7 +614,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_5() || jj_done;
+    return (!jj_3_5() || jj_done);
  { jj_save(4, xla); }
   }
 
@@ -622,7 +622,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_6() || jj_done;
+    return (!jj_3_6() || jj_done);
  { jj_save(5, xla); }
   }
 
@@ -630,7 +630,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_7() || jj_done;
+    return (!jj_3_7() || jj_done);
  { jj_save(6, xla); }
   }
 
@@ -638,7 +638,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_8() || jj_done;
+    return (!jj_3_8() || jj_done);
  { jj_save(7, xla); }
   }
 
@@ -646,7 +646,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_9() || jj_done;
+    return (!jj_3_9() || jj_done);
  { jj_save(8, xla); }
   }
 
@@ -654,7 +654,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_10() || jj_done;
+    return (!jj_3_10() || jj_done);
  { jj_save(9, xla); }
   }
 
@@ -662,7 +662,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_11() || jj_done;
+    return (!jj_3_11() || jj_done);
  { jj_save(10, xla); }
   }
 
@@ -670,7 +670,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_12() || jj_done;
+    return (!jj_3_12() || jj_done);
  { jj_save(11, xla); }
   }
 
@@ -678,7 +678,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_13() || jj_done;
+    return (!jj_3_13() || jj_done);
  { jj_save(12, xla); }
   }
 
@@ -686,7 +686,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_14() || jj_done;
+    return (!jj_3_14() || jj_done);
  { jj_save(13, xla); }
   }
 
@@ -694,7 +694,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_15() || jj_done;
+    return (!jj_3_15() || jj_done);
  { jj_save(14, xla); }
   }
 
@@ -702,7 +702,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_16() || jj_done;
+    return (!jj_3_16() || jj_done);
  { jj_save(15, xla); }
   }
 
@@ -710,7 +710,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_17() || jj_done;
+    return (!jj_3_17() || jj_done);
  { jj_save(16, xla); }
   }
 
@@ -718,7 +718,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_18() || jj_done;
+    return (!jj_3_18() || jj_done);
  { jj_save(17, xla); }
   }
 
@@ -726,7 +726,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_19() || jj_done;
+    return (!jj_3_19() || jj_done);
  { jj_save(18, xla); }
   }
 
@@ -734,7 +734,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_20() || jj_done;
+    return (!jj_3_20() || jj_done);
  { jj_save(19, xla); }
   }
 
@@ -742,7 +742,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_21() || jj_done;
+    return (!jj_3_21() || jj_done);
  { jj_save(20, xla); }
   }
 
@@ -750,7 +750,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_22() || jj_done;
+    return (!jj_3_22() || jj_done);
  { jj_save(21, xla); }
   }
 
@@ -758,7 +758,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_23() || jj_done;
+    return (!jj_3_23() || jj_done);
  { jj_save(22, xla); }
   }
 
@@ -766,7 +766,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_24() || jj_done;
+    return (!jj_3_24() || jj_done);
  { jj_save(23, xla); }
   }
 
@@ -774,7 +774,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_25() || jj_done;
+    return (!jj_3_25() || jj_done);
  { jj_save(24, xla); }
   }
 
@@ -782,7 +782,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_26() || jj_done;
+    return (!jj_3_26() || jj_done);
  { jj_save(25, xla); }
   }
 
@@ -790,7 +790,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_27() || jj_done;
+    return (!jj_3_27() || jj_done);
  { jj_save(26, xla); }
   }
 
@@ -798,7 +798,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_28() || jj_done;
+    return (!jj_3_28() || jj_done);
  { jj_save(27, xla); }
   }
 
@@ -806,7 +806,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_29() || jj_done;
+    return (!jj_3_29() || jj_done);
  { jj_save(28, xla); }
   }
 
@@ -814,7 +814,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_30() || jj_done;
+    return (!jj_3_30() || jj_done);
  { jj_save(29, xla); }
   }
 
@@ -822,7 +822,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_31() || jj_done;
+    return (!jj_3_31() || jj_done);
  { jj_save(30, xla); }
   }
 
@@ -830,7 +830,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_32() || jj_done;
+    return (!jj_3_32() || jj_done);
  { jj_save(31, xla); }
   }
 
@@ -838,7 +838,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_33() || jj_done;
+    return (!jj_3_33() || jj_done);
  { jj_save(32, xla); }
   }
 
@@ -846,7 +846,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_34() || jj_done;
+    return (!jj_3_34() || jj_done);
  { jj_save(33, xla); }
   }
 
@@ -854,7 +854,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_35() || jj_done;
+    return (!jj_3_35() || jj_done);
  { jj_save(34, xla); }
   }
 
@@ -862,7 +862,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_36() || jj_done;
+    return (!jj_3_36() || jj_done);
  { jj_save(35, xla); }
   }
 
@@ -870,7 +870,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_37() || jj_done;
+    return (!jj_3_37() || jj_done);
  { jj_save(36, xla); }
   }
 
@@ -878,7 +878,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_38() || jj_done;
+    return (!jj_3_38() || jj_done);
  { jj_save(37, xla); }
   }
 
@@ -886,7 +886,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_39() || jj_done;
+    return (!jj_3_39() || jj_done);
  { jj_save(38, xla); }
   }
 
@@ -894,7 +894,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_40() || jj_done;
+    return (!jj_3_40() || jj_done);
  { jj_save(39, xla); }
   }
 
@@ -902,7 +902,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_41() || jj_done;
+    return (!jj_3_41() || jj_done);
  { jj_save(40, xla); }
   }
 
@@ -910,7 +910,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_42() || jj_done;
+    return (!jj_3_42() || jj_done);
  { jj_save(41, xla); }
   }
 
@@ -918,7 +918,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_43() || jj_done;
+    return (!jj_3_43() || jj_done);
  { jj_save(42, xla); }
   }
 
@@ -926,7 +926,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_44() || jj_done;
+    return (!jj_3_44() || jj_done);
  { jj_save(43, xla); }
   }
 
@@ -934,7 +934,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_45() || jj_done;
+    return (!jj_3_45() || jj_done);
  { jj_save(44, xla); }
   }
 
@@ -942,7 +942,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_46() || jj_done;
+    return (!jj_3_46() || jj_done);
  { jj_save(45, xla); }
   }
 
@@ -950,7 +950,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_47() || jj_done;
+    return (!jj_3_47() || jj_done);
  { jj_save(46, xla); }
   }
 
@@ -958,7 +958,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_48() || jj_done;
+    return (!jj_3_48() || jj_done);
  { jj_save(47, xla); }
   }
 
@@ -966,7 +966,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_49() || jj_done;
+    return (!jj_3_49() || jj_done);
  { jj_save(48, xla); }
   }
 
@@ -974,7 +974,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_50() || jj_done;
+    return (!jj_3_50() || jj_done);
  { jj_save(49, xla); }
   }
 
@@ -982,7 +982,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_51() || jj_done;
+    return (!jj_3_51() || jj_done);
  { jj_save(50, xla); }
   }
 
@@ -990,7 +990,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_52() || jj_done;
+    return (!jj_3_52() || jj_done);
  { jj_save(51, xla); }
   }
 
@@ -998,7 +998,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_53() || jj_done;
+    return (!jj_3_53() || jj_done);
  { jj_save(52, xla); }
   }
 
@@ -1006,7 +1006,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_54() || jj_done;
+    return (!jj_3_54() || jj_done);
  { jj_save(53, xla); }
   }
 
@@ -1014,7 +1014,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_55() || jj_done;
+    return (!jj_3_55() || jj_done);
  { jj_save(54, xla); }
   }
 
@@ -1022,7 +1022,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_56() || jj_done;
+    return (!jj_3_56() || jj_done);
  { jj_save(55, xla); }
   }
 
@@ -1030,7 +1030,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_57() || jj_done;
+    return (!jj_3_57() || jj_done);
  { jj_save(56, xla); }
   }
 
@@ -1038,7 +1038,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_58() || jj_done;
+    return (!jj_3_58() || jj_done);
  { jj_save(57, xla); }
   }
 
@@ -1046,7 +1046,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_59() || jj_done;
+    return (!jj_3_59() || jj_done);
  { jj_save(58, xla); }
   }
 
@@ -1054,7 +1054,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_60() || jj_done;
+    return (!jj_3_60() || jj_done);
  { jj_save(59, xla); }
   }
 
@@ -1062,7 +1062,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_61() || jj_done;
+    return (!jj_3_61() || jj_done);
  { jj_save(60, xla); }
   }
 
@@ -1070,7 +1070,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_62() || jj_done;
+    return (!jj_3_62() || jj_done);
  { jj_save(61, xla); }
   }
 
@@ -1078,7 +1078,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_63() || jj_done;
+    return (!jj_3_63() || jj_done);
  { jj_save(62, xla); }
   }
 
@@ -1086,7 +1086,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_64() || jj_done;
+    return (!jj_3_64() || jj_done);
  { jj_save(63, xla); }
   }
 
@@ -1094,7 +1094,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_65() || jj_done;
+    return (!jj_3_65() || jj_done);
  { jj_save(64, xla); }
   }
 
@@ -1102,7 +1102,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_66() || jj_done;
+    return (!jj_3_66() || jj_done);
  { jj_save(65, xla); }
   }
 
@@ -1110,7 +1110,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_67() || jj_done;
+    return (!jj_3_67() || jj_done);
  { jj_save(66, xla); }
   }
 
@@ -1118,7 +1118,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_68() || jj_done;
+    return (!jj_3_68() || jj_done);
  { jj_save(67, xla); }
   }
 
@@ -1126,7 +1126,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_69() || jj_done;
+    return (!jj_3_69() || jj_done);
  { jj_save(68, xla); }
   }
 
@@ -1134,7 +1134,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_70() || jj_done;
+    return (!jj_3_70() || jj_done);
  { jj_save(69, xla); }
   }
 
@@ -1142,7 +1142,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_71() || jj_done;
+    return (!jj_3_71() || jj_done);
  { jj_save(70, xla); }
   }
 
@@ -1150,7 +1150,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_72() || jj_done;
+    return (!jj_3_72() || jj_done);
  { jj_save(71, xla); }
   }
 
@@ -1158,7 +1158,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_73() || jj_done;
+    return (!jj_3_73() || jj_done);
  { jj_save(72, xla); }
   }
 
@@ -1166,7 +1166,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_74() || jj_done;
+    return (!jj_3_74() || jj_done);
  { jj_save(73, xla); }
   }
 
@@ -1174,7 +1174,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_75() || jj_done;
+    return (!jj_3_75() || jj_done);
  { jj_save(74, xla); }
   }
 
@@ -1182,7 +1182,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_76() || jj_done;
+    return (!jj_3_76() || jj_done);
  { jj_save(75, xla); }
   }
 
@@ -1190,7 +1190,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_77() || jj_done;
+    return (!jj_3_77() || jj_done);
  { jj_save(76, xla); }
   }
 
@@ -1198,7 +1198,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_78() || jj_done;
+    return (!jj_3_78() || jj_done);
  { jj_save(77, xla); }
   }
 
@@ -1206,7 +1206,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_79() || jj_done;
+    return (!jj_3_79() || jj_done);
  { jj_save(78, xla); }
   }
 
@@ -1214,7 +1214,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_80() || jj_done;
+    return (!jj_3_80() || jj_done);
  { jj_save(79, xla); }
   }
 
@@ -1222,7 +1222,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_81() || jj_done;
+    return (!jj_3_81() || jj_done);
  { jj_save(80, xla); }
   }
 
@@ -1230,7 +1230,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_82() || jj_done;
+    return (!jj_3_82() || jj_done);
  { jj_save(81, xla); }
   }
 
@@ -1238,7 +1238,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_83() || jj_done;
+    return (!jj_3_83() || jj_done);
  { jj_save(82, xla); }
   }
 
@@ -1246,7 +1246,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_84() || jj_done;
+    return (!jj_3_84() || jj_done);
  { jj_save(83, xla); }
   }
 
@@ -1254,7 +1254,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_85() || jj_done;
+    return (!jj_3_85() || jj_done);
  { jj_save(84, xla); }
   }
 
@@ -1262,7 +1262,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_86() || jj_done;
+    return (!jj_3_86() || jj_done);
  { jj_save(85, xla); }
   }
 
@@ -1270,7 +1270,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_87() || jj_done;
+    return (!jj_3_87() || jj_done);
  { jj_save(86, xla); }
   }
 
@@ -1278,7 +1278,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_88() || jj_done;
+    return (!jj_3_88() || jj_done);
  { jj_save(87, xla); }
   }
 
@@ -1286,7 +1286,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_89() || jj_done;
+    return (!jj_3_89() || jj_done);
  { jj_save(88, xla); }
   }
 
@@ -1294,7 +1294,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_90() || jj_done;
+    return (!jj_3_90() || jj_done);
  { jj_save(89, xla); }
   }
 
@@ -1302,7 +1302,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_91() || jj_done;
+    return (!jj_3_91() || jj_done);
  { jj_save(90, xla); }
   }
 
@@ -1310,7 +1310,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_92() || jj_done;
+    return (!jj_3_92() || jj_done);
  { jj_save(91, xla); }
   }
 
@@ -1318,7 +1318,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_93() || jj_done;
+    return (!jj_3_93() || jj_done);
  { jj_save(92, xla); }
   }
 
@@ -1326,7 +1326,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_94() || jj_done;
+    return (!jj_3_94() || jj_done);
  { jj_save(93, xla); }
   }
 
@@ -1334,7 +1334,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_95() || jj_done;
+    return (!jj_3_95() || jj_done);
  { jj_save(94, xla); }
   }
 
@@ -1342,7 +1342,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_96() || jj_done;
+    return (!jj_3_96() || jj_done);
  { jj_save(95, xla); }
   }
 
@@ -1350,7 +1350,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_97() || jj_done;
+    return (!jj_3_97() || jj_done);
  { jj_save(96, xla); }
   }
 
@@ -1358,7 +1358,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_98() || jj_done;
+    return (!jj_3_98() || jj_done);
  { jj_save(97, xla); }
   }
 
@@ -1366,7 +1366,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_99() || jj_done;
+    return (!jj_3_99() || jj_done);
  { jj_save(98, xla); }
   }
 
@@ -1374,7 +1374,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_100() || jj_done;
+    return (!jj_3_100() || jj_done);
  { jj_save(99, xla); }
   }
 
@@ -1382,7 +1382,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_101() || jj_done;
+    return (!jj_3_101() || jj_done);
  { jj_save(100, xla); }
   }
 
@@ -1390,7 +1390,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_102() || jj_done;
+    return (!jj_3_102() || jj_done);
  { jj_save(101, xla); }
   }
 
@@ -1398,7 +1398,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_103() || jj_done;
+    return (!jj_3_103() || jj_done);
  { jj_save(102, xla); }
   }
 
@@ -1406,7 +1406,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_104() || jj_done;
+    return (!jj_3_104() || jj_done);
  { jj_save(103, xla); }
   }
 
@@ -1414,7 +1414,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_105() || jj_done;
+    return (!jj_3_105() || jj_done);
  { jj_save(104, xla); }
   }
 
@@ -1422,7 +1422,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_106() || jj_done;
+    return (!jj_3_106() || jj_done);
  { jj_save(105, xla); }
   }
 
@@ -1430,7 +1430,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_107() || jj_done;
+    return (!jj_3_107() || jj_done);
  { jj_save(106, xla); }
   }
 
@@ -1438,7 +1438,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_108() || jj_done;
+    return (!jj_3_108() || jj_done);
  { jj_save(107, xla); }
   }
 
@@ -1446,7 +1446,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_109() || jj_done;
+    return (!jj_3_109() || jj_done);
  { jj_save(108, xla); }
   }
 
@@ -1454,7 +1454,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_110() || jj_done;
+    return (!jj_3_110() || jj_done);
  { jj_save(109, xla); }
   }
 
@@ -1462,7 +1462,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_111() || jj_done;
+    return (!jj_3_111() || jj_done);
  { jj_save(110, xla); }
   }
 
@@ -1470,7 +1470,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_112() || jj_done;
+    return (!jj_3_112() || jj_done);
  { jj_save(111, xla); }
   }
 
@@ -1478,7 +1478,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_113() || jj_done;
+    return (!jj_3_113() || jj_done);
  { jj_save(112, xla); }
   }
 
@@ -1486,7 +1486,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_114() || jj_done;
+    return (!jj_3_114() || jj_done);
  { jj_save(113, xla); }
   }
 
@@ -1494,7 +1494,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_115() || jj_done;
+    return (!jj_3_115() || jj_done);
  { jj_save(114, xla); }
   }
 
@@ -1502,7 +1502,7 @@ void parseInline();
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
     jj_done = false;
-    return !jj_3_116() || jj_done;
+    return (!jj_3_116() || jj_done);
  { jj_save(115, xla); }
   }
 
@@ -8894,39 +8894,46 @@ void parseInline();
     return false;
   }
 
-  public: TokenManager *token_source;
-  public: CharStream *jj_input_stream;
+
+public: 
+  TokenManager *token_source;
+  CharStream   *jj_input_stream;
   /** Current token. */
-  public: Token *token;
+  Token        *token;
   /** Next token. */
-  public: Token *jj_nt;
-  private: int jj_ntk;
-  private: JJCalls jj_2_rtns[117];
-  private: bool jj_rescan;
-  private: int jj_gc;
-  private: Token *jj_scanpos, *jj_lastpos;
-  private: int jj_la;
+  Token        *jj_nt;
+private: 
+  int           jj_ntk;
+  JJCalls       jj_2_rtns[117];
+  bool          jj_rescan;
+  int           jj_gc;
+  Token        *jj_scanpos, *jj_lastpos;
+  int           jj_la;
   /** Whether we are looking ahead. */
-  private: bool jj_lookingAhead;
-  private: bool jj_semLA;
-  private: int jj_gen;
-  private: int jj_la1[294];
-  private: ErrorHandler *errorHandler;
-  private: bool errorHandlerCreated;
-  protected: bool hasError;
-  public: void setErrorHandler(ErrorHandler *eh) {
+  bool          jj_lookingAhead;
+  bool          jj_semLA;
+  int           jj_gen;
+  int           jj_la1[294];
+  ErrorHandler *errorHandler;
+  bool          errorHandlerCreated;
+protected: 
+  bool          hasError;
+public: 
+  void setErrorHandler(ErrorHandler *eh) {
     if (errorHandlerCreated) delete errorHandler;
     errorHandler = eh;
     errorHandlerCreated = false;
   }
- Token *head; 
- public: 
+  Token *head; 
+public: 
 
  VhdlParser(TokenManager *tm);
-   public: virtual ~VhdlParser();
+  virtual ~VhdlParser();
 
 void ReInit(TokenManager *tm);
 
+void clear();
+
 Token * jj_consume_token(int kind);
 
 bool  jj_scan_token(int kind);
@@ -8936,24 +8943,29 @@ Token * getNextToken();
 Token * getToken(int index);
 
 int jj_ntk_f();
- private: int jj_kind;
+private:
+  int jj_kind;
   int **jj_expentries;
   int *jj_expentry;
 
-void jj_add_error_token(int kind, int pos);
+  void jj_add_error_token(int kind, int pos);
+protected:
+  /** Generate ParseException. */
+
+  virtual void  parseError();
+private:
+  int  trace_indent;
+  bool trace_enabled;
 
-protected: virtual void  parseError();
-  private: int trace_indent;
-  private: bool trace_enabled;
-  /** Enable tracing. */
+public:
 
-public: void enable_tracing();
+  void enable_tracing();
 
-public: void disable_tracing();
+  void disable_tracing();
 
-void jj_rescan_token();
+  void jj_rescan_token();
 
-void jj_save(int index, int xla);
+  void jj_save(int index, int xla);
 typedef unsigned long long uint64;
 
 static Entry* current_root;
@@ -8996,8 +9008,10 @@ static  void mapLibPackage( Entry* root);
 static void createFlow();
 static void error_skipto(int kind);
 static void oneLineComment(QCString qcs);
-static void setMultCommentLine();private: bool jj_done;
+static void setMultCommentLine();
 
+private:
+  bool jj_done;
 };
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 728e4c4..01e8d37 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -1,5 +1,6 @@
 /* VhdlParserTokenManager.cc */
-#include "/Users/dimitri/doxygen/vhdlparser/VhdlParserTokenManager.h"
+#include "VhdlParserTokenManager.h"
+#include "TokenMgrError.h"
 namespace vhdl {
 namespace parser {
 static const unsigned long long jjbitVec0[] = {
@@ -3321,10 +3322,10 @@ bool VhdlParserTokenManager::jjCanMove_1(int hiByte, int i1, int i2, unsigned lo
 Token * VhdlParserTokenManager::jjFillToken(){
    Token *t;
    JAVACC_STRING_TYPE curTokenImage;
-   int beginLine;
-   int endLine;
-   int beginColumn;
-   int endColumn;
+   int beginLine   = -1;
+   int endLine     = -1;
+   int beginColumn = -1;
+   int endColumn   = -1;
    JAVACC_STRING_TYPE im = jjstrLiteralImages[jjmatchedKind];
    curTokenImage = (im.length() == 0) ? input_stream->GetImage() : im;
    if (input_stream->getTrackLineColumn()) {
@@ -3333,7 +3334,9 @@ Token * VhdlParserTokenManager::jjFillToken(){
      endLine = input_stream->getEndLine();
      endColumn = input_stream->getEndColumn();
    }
-   t = Token::newToken(jjmatchedKind, curTokenImage);
+   t = Token::newToken(jjmatchedKind);
+   t->kind = jjmatchedKind;
+   t->image = curTokenImage;
    t->specialToken = NULL;
    t->next = NULL;
 
@@ -3591,7 +3594,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
 }
   /** Reinitialise parser. */
   void VhdlParserTokenManager::ReInit(JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg) {
-    if (input_stream) delete input_stream;
+    clear();
     jjmatchedPos = jjnewStateCnt = 0;
     curLexState = lexState;
     input_stream = stream;
@@ -3612,10 +3615,17 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
 
   /** Switch to specified lex state. */
   void VhdlParserTokenManager::SwitchTo(int lexState) {
-    if (lexState >= 1 || lexState < 0)
-      assert(false);
-      //throw 1;//new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-    else
+    if (lexState >= 1 || lexState < 0) {
+      JAVACC_STRING_TYPE message;
+#ifdef WIDE_CHAR
+      message += L"Error: Ignoring invalid lexical state : ";
+      message += lexState; message += L". State unchanged.";
+#else
+      message += "Error: Ignoring invalid lexical state : ";
+      message += lexState; message += ". State unchanged.";
+#endif
+      throw new TokenMgrError(message, INVALID_LEXICAL_STATE);
+    } else
       curLexState = lexState;
   }
 
@@ -3623,14 +3633,23 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   VhdlParserTokenManager::VhdlParserTokenManager (JAVACC_CHARSTREAM *stream, int lexState, VhdlParser *parserArg)
   {
     input_stream = NULL;
+    errorHandlerCreated = false;
     ReInit(stream, lexState, parserArg);
   }
 
   // Destructor
   VhdlParserTokenManager::~VhdlParserTokenManager () {
-    if (input_stream) delete input_stream;
-    if (errorHandlerCreated) delete errorHandler;
+    clear();
+  }
+
+  // clear
+  void VhdlParserTokenManager::clear() {
+    //Since input_stream was generated outside of TokenManager
+    //TokenManager should not take care of deleting it
+    //if (input_stream) delete input_stream;
+    if (errorHandlerCreated) delete errorHandler;    
   }
 
+
 }
 }
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index 12e20c4..8109bf0 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -1,5 +1,6 @@
 #ifndef VHDLPARSERTOKENMANAGER_H
 #define VHDLPARSERTOKENMANAGER_H
+#include "stdio.h"
 #include "JavaCC.h"
 #include "CharStream.h"
 #include "Token.h"
@@ -116,19 +117,22 @@ void  TokenLexicalActions(Token *matchedToken);
   public: virtual ~VhdlParserTokenManager();
   void ReInit(JAVACC_CHARSTREAM *stream, int lexState = 0, VhdlParser *parserArg = NULL);
   void SwitchTo(int lexState);
+  void clear();
   const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
   const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
-    JAVACC_CHARSTREAM  *input_stream;
-    int jjrounds[77];
-    int jjstateSet[2 * 77];
-    JAVACC_STRING_TYPE jjimage;
-    JAVACC_STRING_TYPE image;
-    int jjimageLen;
-    int lengthOfMatch;
-    JAVACC_CHAR_TYPE curChar;
-    TokenManagerErrorHandler *errorHandler;
-    bool errorHandlerCreated;
-    public: void setErrorHandler(TokenManagerErrorHandler *eh) {
+  JAVACC_CHARSTREAM*        input_stream;
+  int                       jjrounds[77];
+  int                       jjstateSet[2 * 77];
+  JAVACC_STRING_TYPE        jjimage;
+  JAVACC_STRING_TYPE        image;
+  int                       jjimageLen;
+  int                       lengthOfMatch;
+  JAVACC_CHAR_TYPE          curChar;
+  TokenManagerErrorHandler* errorHandler;
+  bool                      errorHandlerCreated;
+
+public: 
+  void setErrorHandler(TokenManagerErrorHandler *eh) {
       if (errorHandlerCreated && errorHandler != NULL) delete errorHandler;
       errorHandler = eh;
       errorHandlerCreated = false;
-- 
cgit v0.12


From 5698b7556966fe39c1a808f609a3e14bd648786d Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 12 Dec 2019 22:21:40 +0100
Subject: Minor fixes

---
 doc/docblocks.doc                    |   5 +-
 src/vhdljjparser.cpp                 |   2 +-
 vhdlparser/VhdlParserTokenManager.cc | 204 ++++++++++++++++++++---------------
 vhdlparser/VhdlParserTokenManager.h  |   4 +-
 4 files changed, 125 insertions(+), 90 deletions(-)

diff --git a/doc/docblocks.doc b/doc/docblocks.doc
index a427b76..8e99669 100644
--- a/doc/docblocks.doc
+++ b/doc/docblocks.doc
@@ -513,8 +513,9 @@ Here is an example VHDL file with doxygen comments:
  for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
  \endlatexonly
 
-As of VHDL 2008 it is also to use `/&zwj;*` type comments. Doxygen will handle `/&zwj;* ... *&zwj;/`
-as plain comments and `/&zwj;*! ... *&zwj;/` comments as special doxygen comments with documentaton.
+As of VHDL 2008 it is also possible to use `/&zwj;*` style comments.
+Doxygen will handle `/&zwj;* ... *&zwj;/`as plain comments and `/&zwj;*! ... *&zwj;/`
+style comments as special comments to be parsed by doxygen.
 
 To get proper looking output you need to set
 \ref cfg_optimize_output_vhdl "OPTIMIZE_OUTPUT_VHDL" to \c YES in the
diff --git a/src/vhdljjparser.cpp b/src/vhdljjparser.cpp
index 4848a3e..5dfa9f6 100644
--- a/src/vhdljjparser.cpp
+++ b/src/vhdljjparser.cpp
@@ -750,7 +750,7 @@ QCString filter2008VhdlComment(const char *s)
 {
   GrowBuf growBuf;
   const char *p=s+3; // skip /*!
-  char c,pc='\0';
+  char c='\0';
   while (*p == ' ' || *p == '\t') p++;
   while ((c=*p++))
   {
diff --git a/vhdlparser/VhdlParserTokenManager.cc b/vhdlparser/VhdlParserTokenManager.cc
index 01e8d37..5edbfc5 100644
--- a/vhdlparser/VhdlParserTokenManager.cc
+++ b/vhdlparser/VhdlParserTokenManager.cc
@@ -13,10 +13,10 @@ static const unsigned long long jjbitVec3[] = {
    0x0ULL, 0x0ULL, 0xffffffff00000000ULL, 0xffffffffffffffffULL
 };
 static const int jjnextStates[] = {
-   54, 55, 56, 57, 58, 61, 65, 66, 67, 76, 21, 48, 49, 2, 37, 38, 
+   58, 59, 60, 61, 62, 65, 69, 70, 71, 80, 21, 50, 51, 2, 37, 38, 
    0, 3, 4, 5, 7, 12, 13, 15, 16, 24, 23, 25, 33, 34, 36, 39, 
-   40, 42, 56, 57, 58, 61, 60, 59, 61, 65, 66, 67, 68, 69, 71, 9, 
-   10, 28, 29, 45, 47, 50, 52, 27, 30, 
+   40, 42, 46, 47, 49, 53, 54, 56, 60, 61, 62, 65, 64, 63, 65, 69, 
+   70, 71, 72, 73, 75, 9, 10, 28, 29, 27, 30, 
 };
 static JAVACC_CHAR_TYPE jjstrLiteralChars_0[] = {0};
 static JAVACC_CHAR_TYPE jjstrLiteralChars_1[] = {0};
@@ -2687,7 +2687,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
    curChar = input_stream->readChar();
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 77;
+   jjnewStateCnt = 81;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -2916,122 +2916,140 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 44:
                   if (curChar == 33)
-                     { jjCheckNAddTwoStates(45, 47); }
+                     { jjCheckNAddTwoStates(45, 46); }
                   break;
                case 45:
-                  { jjCheckNAddTwoStates(45, 47); }
+                  if ((0xfffffbffffffffffULL & l) != 0L)
+                     { jjCheckNAddTwoStates(45, 46); }
                   break;
                case 46:
-                  if (curChar == 47 && kind > 9)
-                     kind = 9;
+                  if (curChar == 42)
+                     { jjCheckNAddStates(34, 36); }
                   break;
                case 47:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 46;
+                  if ((0xffff7bffffffffffULL & l) != 0L)
+                     { jjCheckNAddTwoStates(48, 46); }
                   break;
                case 48:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 44;
+                  if ((0xfffffbffffffffffULL & l) != 0L)
+                     { jjCheckNAddTwoStates(48, 46); }
                   break;
                case 49:
-                  if (curChar == 42)
-                     { jjCheckNAddTwoStates(50, 52); }
+                  if (curChar == 47 && kind > 9)
+                     kind = 9;
                   break;
                case 50:
-                  { jjCheckNAddTwoStates(50, 52); }
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 44;
                   break;
                case 51:
-                  if (curChar == 47 && kind > 10)
-                     kind = 10;
+                  if (curChar == 42)
+                     { jjCheckNAddTwoStates(52, 53); }
                   break;
                case 52:
-                  if (curChar == 42)
-                     jjstateSet[jjnewStateCnt++] = 51;
+                  if ((0xfffffbffffffffffULL & l) != 0L)
+                     { jjCheckNAddTwoStates(52, 53); }
                   break;
                case 53:
+                  if (curChar == 42)
+                     { jjCheckNAddStates(37, 39); }
+                  break;
+               case 54:
+                  if ((0xffff7bffffffffffULL & l) != 0L)
+                     { jjCheckNAddTwoStates(55, 53); }
+                  break;
+               case 55:
+                  if ((0xfffffbffffffffffULL & l) != 0L)
+                     { jjCheckNAddTwoStates(55, 53); }
+                  break;
+               case 56:
+                  if (curChar == 47 && kind > 10)
+                     kind = 10;
+                  break;
+               case 57:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 165)
                      kind = 165;
                   { jjCheckNAddStates(0, 10); }
                   break;
-               case 55:
+               case 59:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 165)
                      kind = 165;
-                  { jjCheckNAddTwoStates(54, 55); }
+                  { jjCheckNAddTwoStates(58, 59); }
                   break;
-               case 57:
+               case 61:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 170)
                      kind = 170;
-                  { jjCheckNAddStates(34, 37); }
+                  { jjCheckNAddStates(40, 43); }
                   break;
-               case 58:
+               case 62:
                   if (curChar == 46)
-                     { jjCheckNAdd(59); }
+                     { jjCheckNAdd(63); }
                   break;
-               case 59:
+               case 63:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 170)
                      kind = 170;
-                  { jjCheckNAddStates(38, 40); }
+                  { jjCheckNAddStates(44, 46); }
                   break;
-               case 62:
+               case 66:
                   if ((0x280000000000ULL & l) != 0L)
-                     { jjCheckNAdd(63); }
+                     { jjCheckNAdd(67); }
                   break;
-               case 63:
+               case 67:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 170)
                      kind = 170;
-                  { jjCheckNAddTwoStates(64, 63); }
+                  { jjCheckNAddTwoStates(68, 67); }
                   break;
-               case 66:
+               case 70:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddStates(41, 43); }
+                     { jjCheckNAddStates(47, 49); }
                   break;
-               case 67:
+               case 71:
                   if (curChar == 35)
-                     { jjCheckNAdd(68); }
+                     { jjCheckNAdd(72); }
                   break;
-               case 68:
+               case 72:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddStates(44, 46); }
+                     { jjCheckNAddStates(50, 52); }
                   break;
-               case 69:
+               case 73:
                   if (curChar == 46)
-                     { jjCheckNAdd(70); }
+                     { jjCheckNAdd(74); }
                   break;
-               case 70:
+               case 74:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(70, 71); }
+                     { jjCheckNAddTwoStates(74, 75); }
                   break;
-               case 71:
+               case 75:
                   if (curChar != 35)
                      break;
                   if (kind > 172)
                      kind = 172;
-                  jjstateSet[jjnewStateCnt++] = 72;
+                  jjstateSet[jjnewStateCnt++] = 76;
                   break;
-               case 73:
+               case 77:
                   if ((0x280000000000ULL & l) != 0L)
-                     { jjCheckNAdd(74); }
+                     { jjCheckNAdd(78); }
                   break;
-               case 74:
+               case 78:
                   if ((0x3ff000000000000ULL & l) == 0L)
                      break;
                   if (kind > 172)
                      kind = 172;
-                  { jjCheckNAddTwoStates(75, 74); }
+                  { jjCheckNAddTwoStates(79, 78); }
                   break;
-               case 76:
+               case 80:
                   if ((0x3ff000000000000ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(76, 21); }
+                     { jjCheckNAddTwoStates(80, 21); }
                   break;
                default : break;
             }
@@ -3072,7 +3090,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 9:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     { jjAddStates(47, 48); }
+                     { jjAddStates(53, 54); }
                   break;
                case 12:
                   if (curChar == 95)
@@ -3126,7 +3144,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 28:
                   if ((0x7fffffffffffffffULL & l) != 0L)
-                     { jjAddStates(49, 50); }
+                     { jjAddStates(55, 56); }
                   break;
                case 30:
                   if ((0x7fffffffffffffffULL & l) == 0L)
@@ -3146,50 +3164,58 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   { jjAddStates(31, 33); }
                   break;
                case 45:
-                  { jjAddStates(51, 52); }
+                  { jjCheckNAddTwoStates(45, 46); }
                   break;
-               case 50:
-                  { jjAddStates(53, 54); }
+               case 47:
+               case 48:
+                  { jjCheckNAddTwoStates(48, 46); }
+                  break;
+               case 52:
+                  { jjCheckNAddTwoStates(52, 53); }
                   break;
                case 54:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 55;
+               case 55:
+                  { jjCheckNAddTwoStates(55, 53); }
                   break;
-               case 56:
+               case 58:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 57;
+                     jjstateSet[jjnewStateCnt++] = 59;
                   break;
                case 60:
                   if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 59;
-                  break;
-               case 61:
-                  if ((0x2000000020ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(62, 63); }
+                     jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 64:
                   if (curChar == 95)
-                     { jjCheckNAdd(63); }
+                     jjstateSet[jjnewStateCnt++] = 63;
                   break;
                case 65:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 66;
+                  if ((0x2000000020ULL & l) != 0L)
+                     { jjCheckNAddTwoStates(66, 67); }
                   break;
                case 68:
+                  if (curChar == 95)
+                     { jjCheckNAdd(67); }
+                  break;
+               case 69:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 70;
+                  break;
+               case 72:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjCheckNAddStates(44, 46); }
+                     { jjCheckNAddStates(50, 52); }
                   break;
-               case 70:
+               case 74:
                   if ((0x7fffffe07fffffeULL & l) != 0L)
-                     { jjCheckNAddTwoStates(70, 71); }
+                     { jjCheckNAddTwoStates(74, 75); }
                   break;
-               case 72:
+               case 76:
                   if ((0x2000000020ULL & l) != 0L)
-                     { jjCheckNAddTwoStates(73, 74); }
+                     { jjCheckNAddTwoStates(77, 78); }
                   break;
-               case 75:
+               case 79:
                   if (curChar == 95)
-                     { jjCheckNAdd(74); }
+                     { jjCheckNAdd(78); }
                   break;
                default : break;
             }
@@ -3215,7 +3241,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 9:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(47, 48); }
+                     { jjAddStates(53, 54); }
                   break;
                case 15:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -3227,14 +3253,14 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 28:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(49, 50); }
+                     { jjAddStates(55, 56); }
                   break;
                case 30:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 189)
                      kind = 189;
-                  { jjAddStates(55, 56); }
+                  { jjAddStates(57, 58); }
                   break;
                case 33:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -3252,11 +3278,21 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
                   break;
                case 45:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(51, 52); }
+                     { jjCheckNAddTwoStates(45, 46); }
                   break;
-               case 50:
+               case 47:
+               case 48:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(53, 54); }
+                     { jjCheckNAddTwoStates(48, 46); }
+                  break;
+               case 52:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddTwoStates(52, 53); }
+                  break;
+               case 54:
+               case 55:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddTwoStates(55, 53); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -3269,7 +3305,7 @@ int VhdlParserTokenManager::jjMoveNfa_0(int startState, int curPos){
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 77 - startsAt)))
+      if ((i = jjnewStateCnt), (jjnewStateCnt = startsAt), (i == (startsAt = 81 - startsAt)))
          break;
       if (input_stream->endOfInput()) { break; }
       curChar = input_stream->readChar();
@@ -3447,16 +3483,14 @@ void  VhdlParserTokenManager::SkipLexicalActions(Token *matchedToken){
       case 9 : {
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
    {
-     QCString q(image.data());
-     q.stripPrefix("/*!");
-     q.resize(q.length()-2);
+     QCString q = filter2008VhdlComment(image.data());
      ::vhdl::parser::VhdlParser::handleCommentBlock(q.data(),TRUE);image.clear();
    }
          break;
        }
       case 10 : {
          image.append(input_stream->GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1)));
-                                                    ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();
+      ::vhdl::parser::VhdlParser::lineCount(image.data());image.clear();
          break;
        }
       default :
@@ -3609,7 +3643,7 @@ void  VhdlParserTokenManager::TokenLexicalActions(Token *matchedToken){
   void VhdlParserTokenManager::ReInitRounds() {
     int i;
     jjround = 0x80000001;
-    for (i = 77; i-- > 0;)
+    for (i = 81; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
diff --git a/vhdlparser/VhdlParserTokenManager.h b/vhdlparser/VhdlParserTokenManager.h
index 8109bf0..96a2449 100644
--- a/vhdlparser/VhdlParserTokenManager.h
+++ b/vhdlparser/VhdlParserTokenManager.h
@@ -121,8 +121,8 @@ void  TokenLexicalActions(Token *matchedToken);
   const JAVACC_SIMPLE_STRING jjKindsForBitVector(int i, unsigned long long vec);
   const JAVACC_SIMPLE_STRING jjKindsForStateVector(int lexState, int vec[], int start, int end);
   JAVACC_CHARSTREAM*        input_stream;
-  int                       jjrounds[77];
-  int                       jjstateSet[2 * 77];
+  int                       jjrounds[81];
+  int                       jjstateSet[2 * 81];
   JAVACC_STRING_TYPE        jjimage;
   JAVACC_STRING_TYPE        image;
   int                       jjimageLen;
-- 
cgit v0.12


From a47c456eadf1895654a3e8c4a6232e67db20371b Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 14 Dec 2019 13:32:56 +0100
Subject: issue #7206: Problems with Fortran and `@cond`

---
 src/commentcnv.l | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/commentcnv.l b/src/commentcnv.l
index 66aada1..95d0347 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -791,7 +791,7 @@ MAILADR   ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
   				       BEGIN(yyextra->condCtx);
                                      }
   				   }
-<CondLine>[ \t]*
+<CondLine>[ \t]*/\n |
 <CComment,ReadLine>[\\@]"cond"[ \t\r]*/\n |
 <CondLine>.			   { // forgot section id?
   				     if (YY_START!=CondLine) yyextra->condCtx=YY_START;
@@ -942,24 +942,32 @@ static inline int computeIndent(const char *s)
 
 static inline void copyToOutput(yyscan_t yyscanner,const char *s,int len)
 {
+  int tabSize=Config_getInt(TAB_SIZE);
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   int i;
   if (yyextra->skip) // only add newlines.
   {
-    for (i=0;i<len;i++) 
+    for (i=0;i<len;i++)
     {
-      if (s[i]=='\n') 
+      switch(s[i])
       {
-	ADDCHAR('\n');
-	//fprintf(stderr,"---> skip %d\n",g_lineNr);
-	yyextra->lineNr++;
+        case '\n':
+	  ADDCHAR('\n');
+	  yyextra->lineNr++;
+          yyextra->col=0;
+          break;
+        case '\t':
+          yyextra->col+=tabSize-(yyextra->col%tabSize);
+          break;
+        default:
+          yyextra->col++;
+          break;
       }
     }
   }
   else if (len>0)
   {
     ADDARRAY(s,len);
-    static int tabSize=Config_getInt(TAB_SIZE);
     for (i=0;i<len;i++) 
     {
       switch (s[i])
-- 
cgit v0.12


From 169545c73335cf4a45a2d7a21a40cc2fb17c3aaf Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 14 Dec 2019 15:30:39 +0100
Subject: Fix logic bug in SVG detection

---
 src/docparser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docparser.cpp b/src/docparser.cpp
index 1e43993..b1e2486 100644
--- a/src/docparser.cpp
+++ b/src/docparser.cpp
@@ -2894,7 +2894,7 @@ bool DocImage::isSVG() const
   QCString  locName = m_url.isEmpty() ? m_name : m_url;
   int len = locName.length();
   int fnd = locName.find('?'); // ignore part from ? until end
-  if (fnd!=-1) fnd=len;
+  if (fnd==-1) fnd=len;
   return fnd>=4 && locName.mid(fnd-4,4)==".svg";
 }
 
-- 
cgit v0.12


From 1dda553a6c80aae974c0bb90c1870bdbc09004ab Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 14 Dec 2019 16:43:32 +0100
Subject: issue #7326: Incorrect display of multiline #define value

---
 src/pre.l | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pre.l b/src/pre.l
index 2a66146..1ac9cf8 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2814,7 +2814,15 @@ static void addDefine(yyscan_t yyscanner)
     while ((c=*p++) && (c==' ' || c=='\t')) k++;
     state->defLitText=state->defLitText.mid(l+1,k-l-1)+state->defLitText.stripWhiteSpace();
   }
-  md->setInitializer(state->defLitText.stripWhiteSpace());
+  QCString defLitTextStripped = state->defLitText.stripWhiteSpace();
+  if (defLitTextStripped.contains('\n')>=1)
+  {
+    md->setInitializer(state->defLitText);
+  }
+  else
+  {
+    md->setInitializer(defLitTextStripped);
+  }
 
   //printf("pre.l: md->setFileDef(%p)\n",state->inputFileDef);
   md->setFileDef(state->inputFileDef);
-- 
cgit v0.12


From 5b5db5372a769fc15b29981164014b42815f9ae6 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 15 Dec 2019 11:33:40 +0100
Subject: Prevent writing automatic anchors to the tag file

---
 src/definition.cpp | 2 +-
 src/tagreader.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/definition.cpp b/src/definition.cpp
index 86f8789..e18932e 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -528,7 +528,7 @@ void DefinitionImpl::writeDocAnchorsToTagFile(FTextStream &tagFile) const
     SectionInfo *si;
     for (;(si=sdi.current());++sdi)
     {
-      if (!si->generated && si->ref.isEmpty())
+      if (!si->generated && si->ref.isEmpty() && !si->label.startsWith("autotoc_md"))
       {
         //printf("write an entry!\n");
         if (definitionType()==TypeMember) tagFile << "  ";
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index e72db6a..4b99f0d 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -523,7 +523,7 @@ class TagFileParser : public QXmlDefaultHandler
         case InMember:    m_curMember->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
         case InPackage:   m_curPackage->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
         case InDir:       m_curDir->docAnchors.append(new TagAnchorInfo(m_fileName,m_curString,m_title)); break;
-        default:   warn("Unexpected tag 'docanchor' found"); break;  // Not really necessary anymore
+        default: break; // will not be reached
       }
     }
 
-- 
cgit v0.12


From a571e7669a835bc998cb96b226537a6e8093bc09 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Tue, 17 Dec 2019 20:24:22 +0100
Subject: Avoid warning in commentcnv.l about trailing context made variable
 due to preceding '|' action

---
 src/commentcnv.l | 82 +++++++++++++++++++++++---------------------------------
 1 file changed, 34 insertions(+), 48 deletions(-)

diff --git a/src/commentcnv.l b/src/commentcnv.l
index 95d0347..bd4ed5c 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -106,6 +106,7 @@ static void replaceCommentMarker(yyscan_t yyscanner,const char *s,int len);
 static inline void copyToOutput(yyscan_t yyscanner,const char *s,int len);
 static void startCondSection(yyscan_t yyscanner,const char *sectId);
 static void endCondSection(yyscan_t yyscanner);
+static void handleCondSectionId(yyscan_t yyscanner,const char *expression);
 static void replaceAliases(yyscan_t yyscanner,const char *s);
 static int yyread(yyscan_t yyscanner,char *buf,int max_size);
 static void replaceComment(yyscan_t yyscanner,int offset);
@@ -768,57 +769,15 @@ MAILADR   ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z
     				     }
 				    }
 <CondLine>[!()&| \ta-z_A-Z0-9.\-]+ {
-  				     bool oldSkip=yyextra->skip;
-                                     startCondSection(yyscanner,yytext);
-				     if ((yyextra->condCtx==CComment || yyextra->readLineCtx==SComment) && 
-                                         !oldSkip && yyextra->skip) 
-    			             {
-				       if (yyextra->lang!=SrcLangExt_Python &&
-					   yyextra->lang!=SrcLangExt_VHDL &&
-					   yyextra->lang!=SrcLangExt_Markdown &&
-					   yyextra->lang!=SrcLangExt_Fortran)
-				       {
- 				         ADDCHAR('*');
-     				         ADDCHAR('/');
-				       }
-    				     }
-                                     if (yyextra->readLineCtx==SComment)
-                                     {
-                                       BEGIN(SComment);
-                                     }
-                                     else
-                                     {
-  				       BEGIN(yyextra->condCtx);
-                                     }
+                                     handleCondSectionId(yyscanner,yytext);
   				   }
-<CondLine>[ \t]*/\n |
-<CComment,ReadLine>[\\@]"cond"[ \t\r]*/\n |
+<CComment,ReadLine>[\\@]"cond"[ \t\r]*/\n {
+  				     yyextra->condCtx=YY_START;
+                                     handleCondSectionId(yyscanner," "); // fake section id causing the section to be hidden unconditionally
+                                   }
 <CondLine>.			   { // forgot section id?
-  				     if (YY_START!=CondLine) yyextra->condCtx=YY_START;
-  				     bool oldSkip=yyextra->skip;
-  				     startCondSection(yyscanner," "); // fake section id causing the section to be hidden unconditionally
-				     if ((yyextra->condCtx==CComment || yyextra->readLineCtx==SComment) && 
-                                         !oldSkip && yyextra->skip) 
-    			             {
-				       //printf("** Adding terminator for comment!\n");
-				       if (yyextra->lang!=SrcLangExt_Python &&
-					   yyextra->lang!=SrcLangExt_VHDL &&
-					   yyextra->lang!=SrcLangExt_Markdown &&
-					   yyextra->lang!=SrcLangExt_Fortran)
-				       {
- 				         ADDCHAR('*');
-     				         ADDCHAR('/');
-				       }
-    				     }
+                                     handleCondSectionId(yyscanner," "); // fake section id causing the section to be hidden unconditionally
 				     if (*yytext=='\n') yyextra->lineNr++;
-                                     if (yyextra->readLineCtx==SComment)
-                                     {
-                                       BEGIN(SComment);
-                                     }
-                                     else
-                                     {
-  				       BEGIN(yyextra->condCtx);
-                                     }
   				   }
 <CComment,ReadLine>[\\@][a-z_A-Z][a-z_A-Z0-9]*  { // expand alias without arguments
 				     replaceAliases(yyscanner,yytext);
@@ -1011,6 +970,33 @@ static void endCondSection(yyscan_t yyscanner)
   //printf("endCondSection: skip=%d stack=%d\n",g_skip,g_condStack.count());
 }
 
+static void handleCondSectionId(yyscan_t yyscanner,const char *expression)
+{
+  struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
+  bool oldSkip=yyextra->skip;
+  startCondSection(yyscanner,expression);
+  if ((yyextra->condCtx==CComment || yyextra->readLineCtx==SComment) && 
+      !oldSkip && yyextra->skip) 
+  {
+    if (yyextra->lang!=SrcLangExt_Python &&
+        yyextra->lang!=SrcLangExt_VHDL &&
+        yyextra->lang!=SrcLangExt_Markdown &&
+        yyextra->lang!=SrcLangExt_Fortran)
+    {
+      ADDCHAR('*');
+      ADDCHAR('/');
+    }
+  }
+  if (yyextra->readLineCtx==SComment)
+  {
+    BEGIN(SComment);
+  }
+  else
+  {
+    BEGIN(yyextra->condCtx);
+  }
+}
+
 /** copies string \a s with length \a len to the output, while 
  *  replacing any alias commands found in the string.
  */
-- 
cgit v0.12


From c68ae6ebd44ae66ba35154d868c686cf14c7f6b8 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Wed, 18 Dec 2019 10:17:55 +0100
Subject: Made regexp more strict

---
 src/doctokenizer.l | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index bf9ccf6..a527672 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -344,8 +344,9 @@ PHPTYPE   [\\:a-z_A-Z0-9\x80-\xFF\-]+
 CITESCHAR [a-z_A-Z0-9\x80-\xFF\-\?]
 CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/\?]
 CITEID    {CITESCHAR}{CITEECHAR}*("."{CITESCHAR}{CITEECHAR}*)*|"\""{CITESCHAR}{CITEECHAR}*("."{CITESCHAR}{CITEECHAR}*)*"\""
-MAILADR   ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+
-MAILADR2  {BLANK}*[a-z_A-Z0-9+-]+({BLANK}*[Dd][Oo][Tt]{BLANK}*[a-z_A-Z0-9+-]+)?{BLANK}*[Aa][Tt]{BLANK}*[a-z_A-Z0-9-]+({BLANK}*[Dd][Oo][Tt]{BLANK}*[a-z_A-Z0-9\-]+)+{BLANK}*[a-z_A-Z0-9\-]+{BLANK}*
+MAILADDR  ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+
+MAILWS    [\t a-z_A-Z0-9+-]
+MAILADDR2 {MAILWS}+{BLANK}+("at"|"AT"|"_at_"|"_AT_"){BLANK}+{MAILWS}+("dot"|"DOT"|"_dot_"|"_DOT_"){BLANK}+{MAILWS}+
 OPTSTARS  ("//"{BLANK}*)?"*"*{BLANK}*
 LISTITEM  {BLANK}*[-]("#")?{WS}
 MLISTITEM {BLANK}*[+*]{WS}
@@ -643,20 +644,20 @@ REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
 			 g_token->isEMailAddr=FALSE;
 			 return TK_URL;
                        }
-<St_Para>{MAILADR}     { // Mail address
+<St_Para>{MAILADDR}    { // Mail address
                          g_token->name=yytext;
                          g_token->name.stripPrefix("mailto:");
 			 g_token->isEMailAddr=TRUE;
 			 return TK_URL;
                        }
-<St_Para>"<"{MAILADR}">" { // Mail address
+<St_Para>"<"{MAILADDR}">" { // Mail address
                          g_token->name=yytext;
                          g_token->name = g_token->name.mid(1,g_token->name.length()-2);
                          g_token->name.stripPrefix("mailto:");
 			 g_token->isEMailAddr=TRUE;
 			 return TK_URL;
                        }
-<St_Para>"<"{MAILADR2}">" { // anti spame mail address
+<St_Para>"<"{MAILADDR2}">" { // anti spam mail address
                          g_token->name=yytext;
 			 return TK_WORD;
                        }
-- 
cgit v0.12


From 149d5e8f19dda2fa4d898fbbc7d922b29c8aa281 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 18 Dec 2019 11:38:14 +0100
Subject: Incorrect warning "yyextra->inside" instead of "inside"

We get warnings like:
```
warning: reached end of file while yyextra->inside a 'code' block!

warning: Ignoring \brief command yyextra->inside argument documentation
```
this is due to the fact that the scanner has been made reentrant (inside becomes yyextra->inside and this slipped into the warning strings as well)
---
 src/scanner.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/scanner.l b/src/scanner.l
index 7115129..c1718dc 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4307,7 +4307,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <CopyArgComment,CopyArgVerbatim>.	{ yyextra->fullArgString+=*yytext; }
 <CopyArgComment>{CMD}("brief"|"short"){B}+ {
   					  warn(yyextra->yyFileName,yyextra->yyLineNr,
-					      "Ignoring %cbrief command yyextra->inside argument documentation",*yytext
+					      "Ignoring %cbrief command inside argument documentation",*yytext
 					     );
                                           yyextra->fullArgString+=' ';
                                         }
@@ -6421,7 +6421,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
   					}
 <DocCopyBlock><<EOF>>			{
   					  warn(yyextra->yyFileName,yyextra->yyLineNr,
-					      "reached end of file while yyextra->inside a '%s' block!\n"
+					      "reached end of file while inside a '%s' block!\n"
 					      "The command that should end the block seems to be missing!\n",
 					      yyextra->docBlockName.data());
   					  yyterminate();
-- 
cgit v0.12


From e282382e78e7381fda85894dc588793185ed77d0 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 18 Dec 2019 18:05:08 +0100
Subject: Warning whit Windows compilation using NMake

When using NMake Makefiles on windows we get messages like:
```
D:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\include\vector(960): warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
```
From the help information of `cl`:
```
/EHs enable C++ EH (no SEH exceptions)
/EHc extern "C" defaults to nothrow
```

Looking at the usage with the `msbuild / vsxproj` type builds (as done on appveyor), here the option `/EHsc` is used.
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ab5aa7..472b90f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,9 @@ if (WIN32)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # needed for language.cpp on 64bit
         add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS)
     endif()
+    if (CMAKE_GENERATOR MATCHES "NMake Makefiles")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+    endif()
 endif()
 
 if(POLICY CMP0063)
-- 
cgit v0.12


From 36607693bace9db1e45ffcd08fec5a3c7674c3de Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Wed, 18 Dec 2019 20:19:27 +0100
Subject: Making tests valid for python 3

Test 65 gave some problems with python3:
```
Traceback (most recent call last):
  File "D:/Programs/Doxygen/Doxygen-.git/doxygen/testing/runtests.py", line 487, in <module>
    main()
  File "D:/Programs/Doxygen/Doxygen-.git/doxygen/testing/runtests.py", line 484, in main
    sys.exit(testManager.perform_tests())
  File "D:/Programs/Doxygen/Doxygen-.git/doxygen/testing/runtests.py", line 388, in perform_tests
    tester = Tester(self.args,test)
  File "D:/Programs/Doxygen/Doxygen-.git/doxygen/testing/runtests.py", line 13, in __init__
    self.config    = self.get_config()
  File "D:/Programs/Doxygen/Doxygen-.git/doxygen/testing/runtests.py", line 71, in get_config
    for line in f.readlines():
  File "D:\Programs\Python\Python37\lib\encodings\cp1252.py", line 23, in decode
    return codecs.charmap_decode(input,self.errors,decoding_table)[0]
UnicodeDecodeError: 'charmap' codec can't decode byte 0x81 in position 236: character maps to <undefined>
```
this happened on multiple places and also with the `popen` command.

Created, analogous to `doc/translator.py`, special open functions so that the code works for Python 2 and Python 3.
---
 testing/runtests.py | 52 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/testing/runtests.py b/testing/runtests.py
index fa3c186..3e099ee 100755
--- a/testing/runtests.py
+++ b/testing/runtests.py
@@ -2,9 +2,35 @@
 
 from __future__ import print_function
 import argparse, glob, itertools, re, shutil, os, sys
+import subprocess
 
 config_reg = re.compile('.*\/\/\s*(?P<name>\S+):\s*(?P<value>.*)$')
 
+
+def xopen(fname, mode='r', encoding='utf-8'):
+	'''Unified file opening for Python 2 an Python 3.
+
+	Python 2 does not have the encoding argument. Python 3 has one.
+	'''
+
+	if sys.version_info[0] == 2:
+		return open(fname, mode=mode) # Python 2 without encoding
+	else:
+		return open(fname, mode=mode, encoding=encoding) # Python 3 with encoding
+
+def xpopen(cmd, encoding='utf-8-sig'):
+	'''Unified file pipe opening for Python 2 an Python 3.
+
+	Python 2 does not have the encoding argument. Python 3 has one. and
+	'''
+
+	if sys.version_info[0] == 2:
+		return os.popen(cmd).read() # Python 2 without encoding
+	else:
+		proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
+		proc.wait
+		return proc.stdout.read()
+
 class Tester:
 	def __init__(self,args,test):
 		self.args      = args
@@ -25,7 +51,7 @@ class Tester:
 		elif not os.path.isfile(expected_file):
 			return (True,'%s absent' % expected_file)
 		else:
-			diff = os.popen('diff -b -w -u %s %s' % (got_file,expected_file)).read()
+			diff = xpopen('diff -b -w -u %s %s' % (got_file,expected_file))
 			if diff and not diff.startswith("No differences"):
 				return (True,'Difference between generated output and reference:\n%s' % diff)
 		return (False,'')
@@ -67,7 +93,7 @@ class Tester:
 
 	def get_config(self):
 		config = {}
-		with open(self.args.inputdir+'/'+self.test,'r') as f:
+		with xopen(self.args.inputdir+'/'+self.test,'r') as f:
 			for line in f.readlines():
 				m = config_reg.match(line)
 				if m:
@@ -84,7 +110,7 @@ class Tester:
 		shutil.rmtree(self.test_out,ignore_errors=True)
 		os.mkdir(self.test_out)
 		shutil.copy(self.args.inputdir+'/Doxyfile',self.test_out)
-		with open(self.test_out+'/Doxyfile','a') as f:
+		with xopen(self.test_out+'/Doxyfile','a') as f:
 			print('INPUT=%s/%s' % (self.args.inputdir,self.test), file=f)
 			print('STRIP_FROM_PATH=%s' % self.args.inputdir, file=f)
 			print('EXAMPLE_PATH=%s' % self.args.inputdir, file=f)
@@ -154,7 +180,7 @@ class Tester:
 					print('Non-existing file %s after \'check:\' statement' % check_file)
 					return
 				# convert output to canonical form
-				data = os.popen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
+				data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
 				if data:
 					# strip version
 					data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n')
@@ -162,7 +188,7 @@ class Tester:
 					print('Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out))
 					return
 				out_file='%s/%s' % (self.test_out,check)
-				with open(out_file,'w') as f:
+				with xopen(out_file,'w') as f:
 					print(data,file=f)
 		shutil.rmtree(self.test_out+'/out',ignore_errors=True)
 		os.remove(self.test_out+'/Doxyfile')
@@ -204,7 +230,7 @@ class Tester:
 						else:
 							check_file = check_file[0]
 					# convert output to canonical form
-					data = os.popen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file)).read()
+					data = xpopen('%s --format --noblanks --nowarning %s' % (self.args.xmllint,check_file))
 					if data:
 						# strip version
 						data = re.sub(r'xsd" version="[0-9.-]+"','xsd" version=""',data).rstrip('\n')
@@ -212,7 +238,7 @@ class Tester:
 						msg += ('Failed to run %s on the doxygen output file %s' % (self.args.xmllint,self.test_out),)
 						break
 					out_file='%s/%s' % (self.test_out,check)
-					with open(out_file,'w') as f:
+					with xopen(out_file,'w') as f:
 						print(data,file=f)
 					ref_file='%s/%s/%s' % (self.args.inputdir,self.test_id,check)
 					(failed_xml,xml_msg) = self.compare_ok(out_file,ref_file,self.test_name)
@@ -238,7 +264,7 @@ class Tester:
 				exe_string = '%s --noout --schema %s %s %s' % (self.args.xmllint,index_xsd,index_xml,redirx)
 				exe_string += ' %s more "%s/temp"' % (separ,xmlxsd_output)
 
-				xmllint_out = os.popen(exe_string).read()
+				xmllint_out = xpopen(exe_string).read()
 				if xmllint_out:
 					xmllint_out = re.sub(r'.*validates','',xmllint_out).rstrip('\n')
 				else:
@@ -262,7 +288,7 @@ class Tester:
 				exe_string = '%s --noout --schema %s %s %s' % (self.args.xmllint,compound_xsd,compound_xml,redirx)
 				exe_string += ' %s more "%s/temp"' % (separ,xmlxsd_output)
 
-				xmllint_out = os.popen(exe_string).read()
+				xmllint_out = xpopen(exe_string).read()
 				if xmllint_out:
 					xmllint_out = re.sub(r'.*validates','',xmllint_out).rstrip('\n')
 				else:
@@ -296,7 +322,7 @@ class Tester:
 			exe_string += ' %s more "%s/temp"' % (separ,docbook_output)
 
 			failed_docbook=False
-			xmllint_out = os.popen(exe_string).read()
+			xmllint_out = xpopen(exe_string).read()
 			xmllint_out = self.cleanup_xmllint_docbook(xmllint_out)
 			if xmllint_out:
 				msg += (xmllint_out,)
@@ -313,7 +339,7 @@ class Tester:
 			exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml %s %s ' % (self.args.xmllint,html_output,redirx,separ)
 			exe_string += 'more "%s/temp"' % (html_output)
 			failed_html=False
-			xmllint_out = os.popen(exe_string).read()
+			xmllint_out = xpopen(exe_string).read()
 			xmllint_out = self.cleanup_xmllint(xmllint_out)
 			if xmllint_out:
 				msg += (xmllint_out,)
@@ -329,11 +355,11 @@ class Tester:
 				redirl='>/dev/null 2>temp'
 			exe_string = 'cd %s %s echo "q" | make %s %s' % (latex_output,separ,redirl,separ)
 			exe_string += 'more temp'
-			latex_out = os.popen(exe_string).read()
+			latex_out = xpopen(exe_string).read()
 			if latex_out.find("Error")!=-1:
 				msg += ("PDF generation failed\n  For a description of the problem see 'refman.log' in the latex directory of this test",)
 				failed_html=True
-			elif open(latex_output + "/refman.log",'r').read().find("Emergency stop")!= -1:
+			elif xopen(latex_output + "/refman.log",'r').read().find("Emergency stop")!= -1:
 				msg += ("PDF generation failed\n  For a description of the problem see 'refman.log' in the latex directory of this test",)
 				failed_html=True
 			elif not self.args.keep:
-- 
cgit v0.12


From d0638f35b341735f6ff897c56db9cfb10efaa4fb Mon Sep 17 00:00:00 2001
From: Reza Rastak <rezarastak@users.noreply.github.com>
Date: Wed, 18 Dec 2019 18:16:55 -0800
Subject: minor typo fixed

---
 doc/commands.doc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/commands.doc b/doc/commands.doc
index 5c6d067..9bd3f66 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -2599,7 +2599,7 @@ Commands for visual enhancements
   a Python file for instance, the syntax highlight will be done according
   to the Python syntax. 
 
-  If it unclear from the context which language is meant (for instance the
+  If it is unclear from the context which language is meant (for instance the
   comment is in a <code>.txt</code> or <code>.markdown</code> file) then you can also explicitly
   indicate the language, by putting the file extension typically
   that doxygen associated with the language in curly brackets after the
-- 
cgit v0.12


From 742927e23a728fffe53e7bfd1d220f7df4c6f552 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Thu, 19 Dec 2019 14:16:37 +0100
Subject: Extend built-in STL support with more classes

---
 src/CMakeLists.txt |  19 ++--
 src/doxygen.cpp    | 225 +-------------------------------------------
 src/stlsupport.cpp | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/stlsupport.h   |  29 ++++++
 4 files changed, 311 insertions(+), 232 deletions(-)
 create mode 100644 src/stlsupport.cpp
 create mode 100644 src/stlsupport.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 27c1687..23460d0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,11 +197,9 @@ add_library(_doxygen STATIC
     #
     ${GENERATED_SRC}/ce_parse.cpp
     #
-    plantuml.cpp
     arguments.cpp
     cite.cpp
     clangparser.cpp
-    fileparser.cpp
     classdef.cpp
     classlist.cpp
     cmdmapper.cpp
@@ -212,13 +210,16 @@ add_library(_doxygen STATIC
     defgen.cpp
     define.cpp
     definition.cpp
+    dia.cpp
     diagram.cpp
     dirdef.cpp
+    docbookgen.cpp
+    docbookvisitor.cpp
+    docgroup.cpp
     docparser.cpp
     docsets.cpp
     dot.cpp
     dotcallgraph.cpp
-    dotlegendgraph.cpp
     dotclassgraph.cpp
     dotdirdeps.cpp
     dotfilepatcher.cpp
@@ -226,6 +227,7 @@ add_library(_doxygen STATIC
     dotgraph.cpp
     dotgroupcollaboration.cpp
     dotincldepgraph.cpp
+    dotlegendgraph.cpp
     dotnode.cpp
     dotrunner.cpp
     doxygen.cpp
@@ -234,6 +236,7 @@ add_library(_doxygen STATIC
     entry.cpp
     filedef.cpp
     filename.cpp
+    fileparser.cpp
     formula.cpp
     ftextstream.cpp
     ftvhelp.cpp
@@ -241,7 +244,6 @@ add_library(_doxygen STATIC
     htags.cpp
     htmldocvisitor.cpp
     htmlentity.cpp
-    resourcemgr.cpp
     htmlgen.cpp
     htmlhelp.cpp
     image.cpp
@@ -252,7 +254,6 @@ add_library(_doxygen STATIC
     layout.cpp
     mandocvisitor.cpp
     mangen.cpp
-    sqlite3gen.cpp
     markdown.cpp
     memberdef.cpp
     membergroup.cpp
@@ -260,20 +261,23 @@ add_library(_doxygen STATIC
     membername.cpp
     message.cpp
     msc.cpp
-    dia.cpp
     namespacedef.cpp
     objcache.cpp
     outputgen.cpp
     outputlist.cpp
     pagedef.cpp
     perlmodgen.cpp
+    plantuml.cpp
     qhp.cpp
     qhpxmlwriter.cpp
     reflist.cpp
+    resourcemgr.cpp
     rtfdocvisitor.cpp
     rtfgen.cpp
     rtfstyle.cpp
     searchindex.cpp
+    sqlite3gen.cpp
+    stlsupport.cpp
     tagreader.cpp
     template.cpp
     textdocvisitor.cpp
@@ -283,9 +287,6 @@ add_library(_doxygen STATIC
     vhdljjparser.cpp
     xmldocvisitor.cpp
     xmlgen.cpp
-    docbookvisitor.cpp
-    docbookgen.cpp
-    docgroup.cpp
 )
 
 ##foreach(lex_file ${LEX_FILES})
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 4c489d2..cc1526f 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -106,6 +106,7 @@
 #include "fileparser.h"
 #include "emoji.h"
 #include "plantuml.h"
+#include "stlsupport.h"
 
 // provided by the generated file resources.cpp
 extern void initResources();
@@ -325,225 +326,6 @@ static bool findClassRelation(
                            bool isArtificial
                           );
 
-/** A struct contained the data for an STL class */
-struct STLInfo
-{
-  const char *className;
-  const char *baseClass1;
-  const char *baseClass2;
-  const char *templType1;
-  const char *templName1;
-  const char *templType2;
-  const char *templName2;
-  bool virtualInheritance;
-  bool iterators;
-};
-
-static STLInfo g_stlinfo[] =
-{
-  // className              baseClass1                      baseClass2             templType1     templName1     templType2    templName2     virtInheritance  // iterators
-  { "allocator",            0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
-  { "array",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE }, // C++11
-  { "auto_ptr",             0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // deprecated
-  { "smart_ptr",            0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
-  { "unique_ptr",           0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
-  { "shared_ptr",           0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++14
-  { "weak_ptr",             0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
-  { "ios_base",             0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
-  { "error_code",           0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
-  { "error_category",       0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
-  { "system_error",         0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
-  { "error_condition",      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
-  { "thread",               0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
-  { "basic_ios",            "ios_base",                     0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_istream",        "basic_ios<Char>",              0,                     "Char",        0,             0,            0,             TRUE,               FALSE },
-  { "basic_ostream",        "basic_ios<Char>",              0,                     "Char",        0,             0,            0,             TRUE,               FALSE },
-  { "basic_iostream",       "basic_istream<Char>",          "basic_ostream<Char>", "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_ifstream",       "basic_istream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_ofstream",       "basic_ostream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_fstream",        "basic_iostream<Char>",         0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_istringstream",  "basic_istream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_ostringstream",  "basic_ostream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "basic_stringstream",   "basic_iostream<Char>",         0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
-  { "ios",                  "basic_ios<char>",              0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wios",                 "basic_ios<wchar_t>",           0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "istream",              "basic_istream<char>",          0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wistream",             "basic_istream<wchar_t>",       0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "ostream",              "basic_ostream<char>",          0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wostream",             "basic_ostream<wchar_t>",       0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "ifstream",             "basic_ifstream<char>",         0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wifstream",            "basic_ifstream<wchar_t>",      0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "ofstream",             "basic_ofstream<char>",         0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wofstream",            "basic_ofstream<wchar_t>",      0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "fstream",              "basic_fstream<char>",          0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wfstream",             "basic_fstream<wchar_t>",       0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "istringstream",        "basic_istringstream<char>",    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wistringstream",       "basic_istringstream<wchar_t>", 0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "ostringstream",        "basic_ostringstream<char>",    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wostringstream",       "basic_ostringstream<wchar_t>", 0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "stringstream",         "basic_stringstream<char>",     0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "wstringstream",        "basic_stringstream<wchar_t>",  0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "basic_string",         0,                              0,                     "Char",        0,             0,            0,             FALSE,              TRUE  },
-  { "string",               "basic_string<char>",           0,                     0,             0,             0,            0,             FALSE,              TRUE  },
-  { "wstring",              "basic_string<wchar_t>",        0,                     0,             0,             0,            0,             FALSE,              TRUE  },
-  { "complex",              0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "bitset",               0,                              0,                     "Bits",        0,             0,            0,             FALSE,              FALSE },
-  { "deque",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  },
-  { "list",                 0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  },
-  { "forward_list",         0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  }, // C++11
-  { "map",                  0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  },
-  { "unordered_map",        0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  }, // C++11
-  { "multimap",             0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  },
-  { "unordered_multimap",   0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  }, // C++11
-  { "set",                  0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  },
-  { "unordered_set",        0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  }, // C++11
-  { "multiset",             0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  },
-  { "unordered_multiset",   0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  }, // C++11
-  { "vector",               0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  },
-  { "queue",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
-  { "priority_queue",       0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
-  { "stack",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
-  { "valarray",             0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
-  { "exception",            0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "bad_alloc",            "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "bad_cast",             "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "bad_typeid",           "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "logic_error",          "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "ios_base::failure",    "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "runtime_error",        "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "bad_exception",        "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "domain_error",         "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "invalid_argument",     "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "length_error",         "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "out_of_range",         "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "range_error",          "runtime_error",                0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "overflow_error",       "runtime_error",                0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { "underflow_error",      "runtime_error",                0,                     0,             0,             0,            0,             FALSE,              FALSE },
-  { 0,                      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }
-};
-
-static void addSTLMember(const std::shared_ptr<Entry> &root,const char *type,const char *name)
-{
-  std::shared_ptr<Entry> memEntry = std::make_shared<Entry>();
-  memEntry->name       = name;
-  memEntry->type       = type;
-  memEntry->protection = Public;
-  memEntry->section    = Entry::VARIABLE_SEC;
-  memEntry->brief      = "STL member";
-  memEntry->hidden     = FALSE;
-  memEntry->artificial = TRUE;
-  root->moveToSubEntryAndKeep(memEntry);
-}
-
-static void addSTLIterator(const std::shared_ptr<Entry> &classEntry,const char *name)
-{
-  std::shared_ptr<Entry> iteratorClassEntry = std::make_shared<Entry>();
-  iteratorClassEntry->fileName  = "[STL]";
-  iteratorClassEntry->startLine = 1;
-  iteratorClassEntry->name      = name;
-  iteratorClassEntry->section   = Entry::CLASS_SEC;
-  iteratorClassEntry->brief     = "STL iterator class";
-  iteratorClassEntry->hidden    = FALSE;
-  iteratorClassEntry->artificial= TRUE;
-  classEntry->moveToSubEntryAndKeep(iteratorClassEntry);
-}
-
-static void addSTLClass(const std::shared_ptr<Entry> &root,const STLInfo *info)
-{
-  //printf("Adding STL class %s\n",info->className);
-  QCString fullName = info->className;
-  fullName.prepend("std::");
-
-  // add fake Entry for the class
-  std::shared_ptr<Entry> classEntry = std::make_shared<Entry>();
-  classEntry->fileName  = "[STL]";
-  classEntry->startLine = 1;
-  classEntry->name      = fullName;
-  classEntry->section   = Entry::CLASS_SEC;
-  classEntry->brief     = "STL class";
-  classEntry->hidden    = FALSE;
-  classEntry->artificial= TRUE;
-
-  // add template arguments to class
-  if (info->templType1)
-  {
-    ArgumentList al;
-    Argument a;
-    a.type="typename";
-    a.name=info->templType1;
-    al.push_back(a);
-    if (info->templType2) // another template argument
-    {
-      a.type="typename";
-      a.name=info->templType2;
-      al.push_back(a);
-    }
-    classEntry->tArgLists.push_back(al);
-  }
-  // add member variables
-  if (info->templName1)
-  {
-    addSTLMember(classEntry,info->templType1,info->templName1);
-  }
-  if (info->templName2)
-  {
-    addSTLMember(classEntry,info->templType2,info->templName2);
-  }
-  if (fullName=="std::auto_ptr" || fullName=="std::smart_ptr" || fullName=="std::shared_ptr" ||
-      fullName=="std::shared_ptr" || fullName=="std::weak_ptr")
-  {
-    std::shared_ptr<Entry> memEntry = std::make_shared<Entry>();
-    memEntry->name       = "operator->";
-    memEntry->args       = "()";
-    memEntry->type       = "T*";
-    memEntry->protection = Public;
-    memEntry->section    = Entry::FUNCTION_SEC;
-    memEntry->brief      = "STL member";
-    memEntry->hidden     = FALSE;
-    memEntry->artificial = FALSE;
-    classEntry->moveToSubEntryAndKeep(memEntry);
-  }
-  if (info->baseClass1)
-  {
-    classEntry->extends.push_back(BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal));
-  }
-  if (info->baseClass2)
-  {
-    classEntry->extends.push_back(BaseInfo(info->baseClass2,Public,info->virtualInheritance?Virtual:Normal));
-  }
-  if (info->iterators)
-  {
-    // add iterator class
-    addSTLIterator(classEntry,fullName+"::iterator");
-    addSTLIterator(classEntry,fullName+"::const_iterator");
-    addSTLIterator(classEntry,fullName+"::reverse_iterator");
-    addSTLIterator(classEntry,fullName+"::const_reverse_iterator");
-  }
-  root->moveToSubEntryAndKeep(classEntry);
-}
-
-
-static void addSTLClasses(const std::shared_ptr<Entry> &root)
-{
-  std::shared_ptr<Entry> namespaceEntry = std::make_shared<Entry>();
-  namespaceEntry->fileName  = "[STL]";
-  namespaceEntry->startLine = 1;
-  namespaceEntry->name      = "std";
-  namespaceEntry->section   = Entry::NAMESPACE_SEC;
-  namespaceEntry->brief     = "STL namespace";
-  namespaceEntry->hidden    = FALSE;
-  namespaceEntry->artificial= TRUE;
-
-  STLInfo *info = g_stlinfo;
-  while (info->className)
-  {
-    addSTLClass(namespaceEntry,info);
-    info++;
-  }
-
-  root->moveToSubEntryAndKeep(namespaceEntry);
-}
-
 //----------------------------------------------------------------------------
 
 static Definition *findScopeFromQualifiedName(Definition *startScope,const QCString &n,
@@ -11281,10 +11063,7 @@ void parseInput()
    *             Parse source files                                         *
    **************************************************************************/
 
-  if (Config_getBool(BUILTIN_STL_SUPPORT))
-  {
-    addSTLClasses(root);
-  }
+  addSTLSupport(root);
 
   g_s.begin("Parsing files\n");
   parseFiles(root);
diff --git a/src/stlsupport.cpp b/src/stlsupport.cpp
new file mode 100644
index 0000000..096291a
--- /dev/null
+++ b/src/stlsupport.cpp
@@ -0,0 +1,270 @@
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
+#include "stlsupport.h"
+#include "entry.h"
+#include "config.h"
+
+/** A struct contained the data for an STL class */
+struct STLInfo
+{
+  const char *className;
+  const char *baseClass1;
+  const char *baseClass2;
+  const char *templType1;
+  const char *templName1;
+  const char *templType2;
+  const char *templName2;
+  bool virtualInheritance;
+  bool iterators;
+};
+
+static STLInfo g_stlinfo[] =
+{
+  // className              baseClass1                      baseClass2             templType1     templName1     templType2    templName2     virtInheritance  // iterators
+  { "allocator",            0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
+  { "auto_ptr",             0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // deprecated
+  { "smart_ptr",            0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
+  { "unique_ptr",           0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
+  { "shared_ptr",           0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++14
+  { "weak_ptr",             0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
+  { "atomic",               0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
+  { "atomic_ref",           0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++20
+  { "lock_guard",           0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
+  { "unique_lock",          0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++11
+  { "shared_lock",          0,                              0,                     "T",           "ptr",         0,            0,             FALSE,              FALSE }, // C++14
+  { "ios_base",             0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "error_code",           0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "error_category",       0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "system_error",         0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "error_condition",      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "thread",               0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "jthread",              0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "mutex",                0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "timed_mutex",          0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "recursive_mutex",      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "recursive_timed_mutex",0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++11
+  { "shared_mutex",         0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++17
+  { "shared_timed_mutex",   0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }, // C++14
+  { "basic_ios",            "ios_base",                     0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_istream",        "basic_ios<Char>",              0,                     "Char",        0,             0,            0,             TRUE,               FALSE },
+  { "basic_ostream",        "basic_ios<Char>",              0,                     "Char",        0,             0,            0,             TRUE,               FALSE },
+  { "basic_iostream",       "basic_istream<Char>",          "basic_ostream<Char>", "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_ifstream",       "basic_istream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_ofstream",       "basic_ostream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_fstream",        "basic_iostream<Char>",         0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_istringstream",  "basic_istream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_ostringstream",  "basic_ostream<Char>",          0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "basic_stringstream",   "basic_iostream<Char>",         0,                     "Char",        0,             0,            0,             FALSE,              FALSE },
+  { "ios",                  "basic_ios<char>",              0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wios",                 "basic_ios<wchar_t>",           0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "istream",              "basic_istream<char>",          0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wistream",             "basic_istream<wchar_t>",       0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "ostream",              "basic_ostream<char>",          0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wostream",             "basic_ostream<wchar_t>",       0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "ifstream",             "basic_ifstream<char>",         0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wifstream",            "basic_ifstream<wchar_t>",      0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "ofstream",             "basic_ofstream<char>",         0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wofstream",            "basic_ofstream<wchar_t>",      0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "fstream",              "basic_fstream<char>",          0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wfstream",             "basic_fstream<wchar_t>",       0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "istringstream",        "basic_istringstream<char>",    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wistringstream",       "basic_istringstream<wchar_t>", 0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "ostringstream",        "basic_ostringstream<char>",    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wostringstream",       "basic_ostringstream<wchar_t>", 0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "stringstream",         "basic_stringstream<char>",     0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "wstringstream",        "basic_stringstream<wchar_t>",  0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "basic_string",         0,                              0,                     "Char",        0,             0,            0,             FALSE,              TRUE  },
+  { "string",               "basic_string<char>",           0,                     0,             0,             0,            0,             FALSE,              TRUE  },
+  { "wstring",              "basic_string<wchar_t>",        0,                     0,             0,             0,            0,             FALSE,              TRUE  },
+  { "u8string",             "basic_string<char8_t>",        0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++20
+  { "u16string",            "basic_string<char16_t>",       0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++11
+  { "u32string",            "basic_string<char32_t>",       0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++11
+  { "basic_string_view",    0,                              0,                     "Char",        0,             0,            0,             FALSE,              TRUE  },
+  { "string_view",          "basic_string_view<char>",      0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++17
+  { "wstring_view",         "basic_string_view<wchar_t>",   0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++17
+  { "u8string_view",        "basic_string_view<char8_t>",   0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++20
+  { "u16string_view",       "basic_string_view<char16_t>",  0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++17
+  { "u32string_view",       "basic_string_view<char32_t>",  0,                     0,             0,             0,            0,             FALSE,              TRUE  }, // C++17
+  { "complex",              0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "bitset",               0,                              0,                     "Bits",        0,             0,            0,             FALSE,              FALSE },
+  { "deque",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  },
+  { "list",                 0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  },
+  { "forward_list",         0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  }, // C++11
+  { "map",                  0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  },
+  { "unordered_map",        0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  }, // C++11
+  { "multimap",             0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  },
+  { "unordered_multimap",   0,                              0,                     "K",           "keys",        "T",          "elements",    FALSE,              TRUE  }, // C++11
+  { "set",                  0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  },
+  { "unordered_set",        0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  }, // C++11
+  { "multiset",             0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  },
+  { "unordered_multiset",   0,                              0,                     "K",           "keys",        0,            0,             FALSE,              TRUE  }, // C++11
+  { "array",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  }, // C++11
+  { "vector",               0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  },
+  { "span",                 0,                              0,                     "T",           "elements",    0,            0,             FALSE,              TRUE  }, // C++20
+  { "queue",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
+  { "priority_queue",       0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
+  { "stack",                0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
+  { "valarray",             0,                              0,                     "T",           "elements",    0,            0,             FALSE,              FALSE },
+  { "exception",            0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "bad_alloc",            "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "bad_cast",             "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "bad_typeid",           "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "logic_error",          "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "ios_base::failure",    "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "runtime_error",        "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "bad_exception",        "exception",                    0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "domain_error",         "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "invalid_argument",     "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "length_error",         "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "out_of_range",         "logic_error",                  0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "range_error",          "runtime_error",                0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "overflow_error",       "runtime_error",                0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { "underflow_error",      "runtime_error",                0,                     0,             0,             0,            0,             FALSE,              FALSE },
+  { 0,                      0,                              0,                     0,             0,             0,            0,             FALSE,              FALSE }
+};
+
+static void addSTLMember(const std::shared_ptr<Entry> &root,const char *type,const char *name)
+{
+  std::shared_ptr<Entry> memEntry = std::make_shared<Entry>();
+  memEntry->name       = name;
+  memEntry->type       = type;
+  memEntry->protection = Public;
+  memEntry->section    = Entry::VARIABLE_SEC;
+  memEntry->brief      = "STL member";
+  memEntry->hidden     = FALSE;
+  memEntry->artificial = TRUE;
+  root->moveToSubEntryAndKeep(memEntry);
+}
+
+static void addSTLIterator(const std::shared_ptr<Entry> &classEntry,const char *name)
+{
+  std::shared_ptr<Entry> iteratorClassEntry = std::make_shared<Entry>();
+  iteratorClassEntry->fileName  = "[STL]";
+  iteratorClassEntry->startLine = 1;
+  iteratorClassEntry->name      = name;
+  iteratorClassEntry->section   = Entry::CLASS_SEC;
+  iteratorClassEntry->brief     = "STL iterator class";
+  iteratorClassEntry->hidden    = FALSE;
+  iteratorClassEntry->artificial= TRUE;
+  classEntry->moveToSubEntryAndKeep(iteratorClassEntry);
+}
+
+static void addSTLClass(const std::shared_ptr<Entry> &root,const STLInfo *info)
+{
+  //printf("Adding STL class %s\n",info->className);
+  QCString fullName = info->className;
+  fullName.prepend("std::");
+
+  // add fake Entry for the class
+  std::shared_ptr<Entry> classEntry = std::make_shared<Entry>();
+  classEntry->fileName  = "[STL]";
+  classEntry->startLine = 1;
+  classEntry->name      = fullName;
+  classEntry->section   = Entry::CLASS_SEC;
+  classEntry->brief     = "STL class";
+  classEntry->hidden    = FALSE;
+  classEntry->artificial= TRUE;
+
+  // add template arguments to class
+  if (info->templType1)
+  {
+    ArgumentList al;
+    Argument a;
+    a.type="typename";
+    a.name=info->templType1;
+    al.push_back(a);
+    if (info->templType2) // another template argument
+    {
+      a.type="typename";
+      a.name=info->templType2;
+      al.push_back(a);
+    }
+    classEntry->tArgLists.push_back(al);
+  }
+  // add member variables
+  if (info->templName1)
+  {
+    addSTLMember(classEntry,info->templType1,info->templName1);
+  }
+  if (info->templName2)
+  {
+    addSTLMember(classEntry,info->templType2,info->templName2);
+  }
+  if (fullName=="std::auto_ptr" ||
+      fullName=="std::smart_ptr" ||
+      fullName=="std::shared_ptr" ||
+      fullName=="std::weak_ptr" ||
+      fullName=="std::unique_ptr")
+  {
+    std::shared_ptr<Entry> memEntry = std::make_shared<Entry>();
+    memEntry->name       = "operator->";
+    memEntry->args       = "()";
+    memEntry->type       = "T*";
+    memEntry->protection = Public;
+    memEntry->section    = Entry::FUNCTION_SEC;
+    memEntry->brief      = "STL member";
+    memEntry->hidden     = FALSE;
+    memEntry->artificial = FALSE;
+    classEntry->moveToSubEntryAndKeep(memEntry);
+  }
+  if (info->baseClass1)
+  {
+    classEntry->extends.push_back(BaseInfo(info->baseClass1,Public,info->virtualInheritance?Virtual:Normal));
+  }
+  if (info->baseClass2)
+  {
+    classEntry->extends.push_back(BaseInfo(info->baseClass2,Public,info->virtualInheritance?Virtual:Normal));
+  }
+  if (info->iterators)
+  {
+    // add iterator class
+    addSTLIterator(classEntry,fullName+"::iterator");
+    addSTLIterator(classEntry,fullName+"::const_iterator");
+    addSTLIterator(classEntry,fullName+"::reverse_iterator");
+    addSTLIterator(classEntry,fullName+"::const_reverse_iterator");
+  }
+  root->moveToSubEntryAndKeep(classEntry);
+}
+
+
+static void addSTLClasses(const std::shared_ptr<Entry> &root)
+{
+  std::shared_ptr<Entry> namespaceEntry = std::make_shared<Entry>();
+  namespaceEntry->fileName  = "[STL]";
+  namespaceEntry->startLine = 1;
+  namespaceEntry->name      = "std";
+  namespaceEntry->section   = Entry::NAMESPACE_SEC;
+  namespaceEntry->brief     = "STL namespace";
+  namespaceEntry->hidden    = FALSE;
+  namespaceEntry->artificial= TRUE;
+
+  STLInfo *info = g_stlinfo;
+  while (info->className)
+  {
+    addSTLClass(namespaceEntry,info);
+    info++;
+  }
+
+  root->moveToSubEntryAndKeep(namespaceEntry);
+}
+
+void addSTLSupport(std::shared_ptr<Entry> &root)
+{
+  if (Config_getBool(BUILTIN_STL_SUPPORT))
+  {
+    addSTLClasses(root);
+  }
+}
diff --git a/src/stlsupport.h b/src/stlsupport.h
new file mode 100644
index 0000000..6712332
--- /dev/null
+++ b/src/stlsupport.h
@@ -0,0 +1,29 @@
+
+/******************************************************************************
+ *
+ * Copyright (C) 1997-2019 by Dimitri van Heesch.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
+ * for any purpose. It is provided "as is" without express or implied warranty.
+ * See the GNU General Public License for more details.
+ *
+ * Documents produced by Doxygen are derivative works derived from the
+ * input used in their production; they are not affected by this license.
+ *
+ */
+
+#ifndef STLSUPPORT_H
+#define STLSUPPORT_H
+
+#include <memory>
+
+class Entry;
+
+/** Add stub entries for the most used classes in the standard template library
+ *  @param root Root of the entry tree to add the entries to.
+ */
+void addSTLSupport(std::shared_ptr<Entry> &root);
+
+#endif
-- 
cgit v0.12


From 2dcdaa52ec90b7b5a8a6b0471b2eed3c82fa3db4 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 19 Dec 2019 16:01:28 +0100
Subject: Making tests valid for python 3

In #7254 the tests were made for python 3 for the standard xml tests, now this is extended for the other possible formats.
The subprocess call gave some problems as it handles only 1 command and no redirection.
---
 testing/runtests.py | 54 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/testing/runtests.py b/testing/runtests.py
index 3e099ee..a4118b8 100755
--- a/testing/runtests.py
+++ b/testing/runtests.py
@@ -18,7 +18,7 @@ def xopen(fname, mode='r', encoding='utf-8'):
 	else:
 		return open(fname, mode=mode, encoding=encoding) # Python 3 with encoding
 
-def xpopen(cmd, encoding='utf-8-sig'):
+def xpopen(cmd, cmd1="",encoding='utf-8-sig', getStderr=False):
 	'''Unified file pipe opening for Python 2 an Python 3.
 
 	Python 2 does not have the encoding argument. Python 3 has one. and
@@ -27,9 +27,12 @@ def xpopen(cmd, encoding='utf-8-sig'):
 	if sys.version_info[0] == 2:
 		return os.popen(cmd).read() # Python 2 without encoding
 	else:
-		proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
-		proc.wait
-		return proc.stdout.read()
+		if (getStderr):
+			proc = subprocess.run(cmd1,encoding=encoding,capture_output=True) # Python 3 with encoding
+			return proc.stderr
+		else:
+			proc = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,encoding=encoding) # Python 3 with encoding
+			return proc.stdout.read()
 
 class Tester:
 	def __init__(self,args,test):
@@ -139,6 +142,7 @@ class Tester:
 			print('HTML_FILE_EXTENSION=.xhtml', file=f)
 			if (self.args.pdf):
 				print('GENERATE_LATEX=YES', file=f)
+				print('LATEX_BATCHMODE=YES', file=f)
 				print('LATEX_OUTPUT=%s/latex' % self.test_out, file=f)
 			if self.args.subdirs:
 				print('CREATE_SUBDIRS=YES', file=f)
@@ -261,10 +265,12 @@ class Tester:
 				index_xsd.append(glob.glob('%s/index.xsd' % (xmlxsd_output)))
 				index_xsd.append(glob.glob('%s/*/*/index.xsd' % (xmlxsd_output)))
 				index_xsd = ' '.join(list(itertools.chain.from_iterable(index_xsd))).replace(self.args.outputdir +'/','').replace('\\','/')
-				exe_string = '%s --noout --schema %s %s %s' % (self.args.xmllint,index_xsd,index_xml,redirx)
+				exe_string = '%s --noout --schema %s %s' % (self.args.xmllint,index_xsd,index_xml)
+				exe_string1 = exe_string
+				exe_string += ' %s' % (redirx)
 				exe_string += ' %s more "%s/temp"' % (separ,xmlxsd_output)
 
-				xmllint_out = xpopen(exe_string).read()
+				xmllint_out = xpopen(exe_string,exe_string1,getStderr=True)
 				if xmllint_out:
 					xmllint_out = re.sub(r'.*validates','',xmllint_out).rstrip('\n')
 				else:
@@ -285,10 +291,12 @@ class Tester:
 				compound_xsd.append(glob.glob('%s/compound.xsd' % (xmlxsd_output)))
 				compound_xsd.append(glob.glob('%s/*/*/compound.xsd' % (xmlxsd_output)))
 				compound_xsd = ' '.join(list(itertools.chain.from_iterable(compound_xsd))).replace(self.args.outputdir +'/','').replace('\\','/')
-				exe_string = '%s --noout --schema %s %s %s' % (self.args.xmllint,compound_xsd,compound_xml,redirx)
+				exe_string = '%s --noout --schema %s %s' % (self.args.xmllint,compound_xsd,compound_xml)
+				exe_string1 = exe_string
+				exe_string += ' %s' % (redirx)
 				exe_string += ' %s more "%s/temp"' % (separ,xmlxsd_output)
 
-				xmllint_out = xpopen(exe_string).read()
+				xmllint_out = xpopen(exe_string,exe_string1,getStderr=True)
 				if xmllint_out:
 					xmllint_out = re.sub(r'.*validates','',xmllint_out).rstrip('\n')
 				else:
@@ -318,11 +326,13 @@ class Tester:
 			tests.append(glob.glob('%s/*.xml' % (docbook_output)))
 			tests.append(glob.glob('%s/*/*/*.xml' % (docbook_output)))
 			tests = ' '.join(list(itertools.chain.from_iterable(tests))).replace(self.args.outputdir +'/','').replace('\\','/')
-			exe_string = '%s --nonet --postvalid %s %s' % (self.args.xmllint,tests,redirx)
+			exe_string = '%s --nonet --postvalid %s' % (self.args.xmllint,tests)
+			exe_string1 = exe_string
+			exe_string += ' %s' % (redirx)
 			exe_string += ' %s more "%s/temp"' % (separ,docbook_output)
 
 			failed_docbook=False
-			xmllint_out = xpopen(exe_string).read()
+			xmllint_out = xpopen(exe_string,exe_string1,getStderr=True)
 			xmllint_out = self.cleanup_xmllint_docbook(xmllint_out)
 			if xmllint_out:
 				msg += (xmllint_out,)
@@ -336,10 +346,12 @@ class Tester:
 				redirx=' 2> %s/temp >nul:'%html_output
 			else:
 				redirx='2>%s/temp >/dev/null'%html_output
-			exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml %s %s ' % (self.args.xmllint,html_output,redirx,separ)
-			exe_string += 'more "%s/temp"' % (html_output)
+			exe_string = '%s --path dtd --nonet --postvalid %s/*xhtml' % (self.args.xmllint,html_output)
+			exe_string1 = exe_string
+			exe_string += ' %s' % (redirx)
+			exe_string += ' %s more "%s/temp"' % (separ,html_output)
 			failed_html=False
-			xmllint_out = xpopen(exe_string).read()
+			xmllint_out = xpopen(exe_string,exe_string1,getStderr=True)
 			xmllint_out = self.cleanup_xmllint(xmllint_out)
 			if xmllint_out:
 				msg += (xmllint_out,)
@@ -351,14 +363,24 @@ class Tester:
 			latex_output='%s/latex' % self.test_out
 			if (sys.platform == 'win32'):
 				redirl='>nul: 2>temp'
+				mk='make.bat'
 			else:
 				redirl='>/dev/null 2>temp'
-			exe_string = 'cd %s %s echo "q" | make %s %s' % (latex_output,separ,redirl,separ)
-			exe_string += 'more temp'
-			latex_out = xpopen(exe_string).read()
+				mk='make'
+			cur_directory = os.getcwd()
+			os.chdir(latex_output)
+			exe_string = mk
+			exe_string1 = exe_string
+			exe_string += ' %s' % (redirl)
+			exe_string += ' %s more temp' % (separ)
+			latex_out = xpopen(exe_string,exe_string1,getStderr=True)
+			os.chdir(cur_directory);
 			if latex_out.find("Error")!=-1:
 				msg += ("PDF generation failed\n  For a description of the problem see 'refman.log' in the latex directory of this test",)
 				failed_html=True
+			elif xopen(latex_output + "/refman.log",'r').read().find("Error")!= -1:
+				msg += ("PDF generation failed\n  For a description of the problem see 'refman.log' in the latex directory of this test",)
+				failed_html=True
 			elif xopen(latex_output + "/refman.log",'r').read().find("Emergency stop")!= -1:
 				msg += ("PDF generation failed\n  For a description of the problem see 'refman.log' in the latex directory of this test",)
 				failed_html=True
-- 
cgit v0.12


From 67d45042f2f30c1c6543c2cecfb608228a158a85 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 19 Dec 2019 16:13:48 +0100
Subject: Tests 86  with check against xsd gives error

When running test 86 with check against the xsd we get the error message:
```
not ok 1 - [086_style_tags.h]: test different HTML style tags
-------------------------------------
Element 'ins': This element is not expected. Expected is one of ( ulink, bold, strike, underline, emphasis, computeroutput, subscript, superscript, center, small ).
test_output_086/out/086__style__tags_8h.xml fails to validate
```

The element `ins` has been added.
---
 templates/xml/compound.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
index 7769c70..954141d 100644
--- a/templates/xml/compound.xsd
+++ b/templates/xml/compound.xsd
@@ -414,6 +414,7 @@
       <xsd:element name="underline" type="docMarkupType" />
       <xsd:element name="emphasis" type="docMarkupType" />
       <xsd:element name="computeroutput" type="docMarkupType" />
+      <xsd:element name="ins" type="docMarkupType" />
       <xsd:element name="subscript" type="docMarkupType" />
       <xsd:element name="superscript" type="docMarkupType" />
       <xsd:element name="center" type="docMarkupType" />
-- 
cgit v0.12


From 20853fc59e43fafe67986d219d2c5307dccd2e24 Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 19 Dec 2019 16:19:42 +0100
Subject: Tests 31 for XHTML output

When running test 31 for XHTML output, we get the error:
```
not ok 1 - [031_image.dox]: test the \image command
-------------------------------------
.../testing/test_output_031/html/index.xhtml:107: parser error : EntityRef: expecting ';'
"image/svg+xml" data="https://img.shields.io/badge/docs-Doxygen-blue.svg?foo&bar

```

For the SVG output the `src` was not properly converted (see also the other formats a few lines lower).
---
 src/htmldocvisitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
index 3dec509..e1466da 100644
--- a/src/htmldocvisitor.cpp
+++ b/src/htmldocvisitor.cpp
@@ -1725,7 +1725,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
     }
     if (typeSVG)
     {
-      m_t << "<object type=\"image/svg+xml\" data=\"" << src
+      m_t << "<object type=\"image/svg+xml\" data=\"" << convertToHtml(src)
         << "\"" << sizeAttribs << attrs;
       if (inlineImage)
       {
-- 
cgit v0.12


From 7cf6e640540954d974374b28f692e4d05ef22049 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Fri, 20 Dec 2019 09:07:27 +0100
Subject: issue #7456: function-like macros generate warnings

---
 src/memberdef.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 85d1cdf..4a9048a 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -4170,6 +4170,7 @@ void MemberDefImpl::warnIfUndocumentedParams() const
       !isReference() &&
       !Doxygen::suppressDocWarnings)
   {
+    QCString returnType = typeString();
     if (!m_impl->hasDocumentedParams)
     {
       warn_doc_error(getDefFileName(),getDefLine(),
@@ -4177,7 +4178,7 @@ void MemberDefImpl::warnIfUndocumentedParams() const
           qPrint(qualifiedName()));
     }
     if (!m_impl->hasDocumentedReturnType &&
-        isFunction() && hasDocumentation())
+        isFunction() && hasDocumentation() && !returnType.isEmpty())
     {
       warn_doc_error(getDefFileName(),getDefLine(),
           "return type of member %s is not documented",
-- 
cgit v0.12


From 0fc0de19ba79068ff7b6bad1e161393adcd865b8 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Fri, 20 Dec 2019 10:35:14 +0100
Subject: issue #7446: C#: parameter named `extends` is broken in the
 documentation

---
 src/classdef.cpp  |  2 +-
 src/classlist.cpp |  4 ++--
 src/defargs.h     |  4 +++-
 src/defargs.l     | 17 +++++++++++++----
 src/defgen.cpp    |  2 +-
 src/doxygen.cpp   |  8 ++++----
 src/memberdef.cpp |  6 +++---
 src/pre.l         |  2 +-
 src/scanner.l     |  8 ++++----
 src/tagreader.cpp |  2 +-
 src/util.cpp      | 10 +++++-----
 11 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/classdef.cpp b/src/classdef.cpp
index bba962e..61ae528 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -4274,7 +4274,7 @@ void ClassDefImpl::addMembersToTemplateInstance(const ClassDef *cd,const char *t
     for (mnii.toFirst();(mi=mnii.current());++mnii)
     {
       ArgumentList actualArguments;
-      stringToArgumentList(templSpec,actualArguments);
+      stringToArgumentList(getLanguage(),templSpec,actualArguments);
       MemberDef *md = mi->memberDef;
       MemberDef *imd = md->createTemplateInstanceMember(
                           cd->templateArguments(),actualArguments);
diff --git a/src/classlist.cpp b/src/classlist.cpp
index 2b284b1..f06f744 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -167,7 +167,7 @@ void GenericsSDict::insert(const QCString &key,ClassDef *cd)
   int i=key.find('<');
   if (i==-1) return;
   ArgumentList argList;
-  stringToArgumentList(key.mid(i),argList);
+  stringToArgumentList(SrcLangExt_CSharp, key.mid(i),argList);
   int c = argList.size();
   if (c==0) return;
   GenericsCollection *collection = m_dict.find(key.left(i));
@@ -200,7 +200,7 @@ ClassDef *GenericsSDict::find(const QCString &key)
     if (collection)
     {
       ArgumentList argList;
-      stringToArgumentList(key.mid(i),argList);
+      stringToArgumentList(SrcLangExt_CSharp,key.mid(i),argList);
       int c = argList.size();
       return collection->find(c);
     }
diff --git a/src/defargs.h b/src/defargs.h
index 1b08671..4a38723 100644
--- a/src/defargs.h
+++ b/src/defargs.h
@@ -18,10 +18,12 @@
 #ifndef DEFARGS_H
 #define DEFARGS_H
 
+#include "types.h"
+
 class ArgumentList;
 class QCString;
 
-extern void stringToArgumentList(const char *argsString,ArgumentList& argList,
+extern void stringToArgumentList(SrcLangExt lang, const char *argsString,ArgumentList& argList,
                                  QCString *extraTypeChars=0);
 
 #endif
diff --git a/src/defargs.l b/src/defargs.l
index eb454ce..9745f44 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -86,6 +86,7 @@ static int              g_lastDocContext;
 static int              g_lastDocChar;
 static int              g_lastExtendsContext;
 static QCString         g_delimiter;
+static SrcLangExt       g_lang;
 
 static const char *stateToString(int state);
 /* -----------------------------------------------------------------
@@ -481,9 +482,16 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  }
   					}
 <ReadFuncArgType,ReadFuncArgPtr>"extends" {
-                                          g_curTypeConstraint.resize(0);
-                                          g_lastExtendsContext=YY_START;
-                                          BEGIN(ReadTypeConstraint);
+                                           if (g_lang!=SrcLangExt_Java)
+                                           {
+                                             REJECT;
+                                           }
+                                           else
+                                           {
+                                             g_curTypeConstraint.resize(0);
+                                             g_lastExtendsContext=YY_START;
+                                             BEGIN(ReadTypeConstraint);
+                                           }
                                         }
 <ReadFuncArgType,ReadFuncArgPtr>"$"?{ID} { 
   					  QCString name=yytext; //resolveDefines(yytext);
@@ -601,7 +609,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
  *              for complex types are written to
  */
  
-void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extraTypeChars)
+void stringToArgumentList(SrcLangExt lang, const char *argsString,ArgumentList& al,QCString *extraTypeChars)
 {
   if (argsString==0) return;
   printlex(yy_flex_debug, TRUE, __FILE__, NULL);
@@ -623,6 +631,7 @@ void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extr
   g_curArgDefValue.resize(0);
   g_curArgName.resize(0);
   g_argList = &al;
+  g_lang = lang;
   defargsYYrestart( defargsYYin );
   BEGIN( Start );
   defargsYYlex();
diff --git a/src/defgen.cpp b/src/defgen.cpp
index f5e12aa..7590a7e 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -146,7 +146,7 @@ void generateDEFForMember(MemberDef *md,
   {
     const ArgumentList &defAl = md->argumentList();
     ArgumentList declAl;
-    stringToArgumentList(md->argsString(),declAl);
+    stringToArgumentList(md->getLanguage(),md->argsString(),declAl);
     QCString fcnPrefix = "  " + memPrefix + "param-";
 
     auto defIt = defAl.begin();
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index cc1526f..52f9ceb 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -1060,7 +1060,7 @@ static void addClassToContext(const Entry *root)
     {
       // a Java/C# generic class looks like a C++ specialization, so we need to split the
       // name and template arguments here
-      stringToArgumentList(fullName.mid(i),tArgList);
+      stringToArgumentList(root->lang,fullName.mid(i),tArgList);
       fullName=fullName.left(i);
     }
     else
@@ -3388,7 +3388,7 @@ static void buildFunctionList(const Entry *root)
                   if (md->documentation().isEmpty() && !root->doc.isEmpty())
                   {
                     ArgumentList argList;
-                    stringToArgumentList(root->args,argList);
+                    stringToArgumentList(root->lang,root->args,argList);
                     if (root->proto)
                     {
                       //printf("setDeclArgumentList to %p\n",argList);
@@ -4211,7 +4211,7 @@ static bool findTemplateInstanceRelation(const Entry *root,
       Debug::print(Debug::Classes,0,"        template root found %s templSpec=%s!\n",
           qPrint(templateRoot->name),qPrint(templSpec));
       ArgumentList templArgs;
-      stringToArgumentList(templSpec,templArgs);
+      stringToArgumentList(root->lang,templSpec,templArgs);
       findBaseClassesForClass(templateRoot,context,templateClass,instanceClass,
           TemplateInstances,isArtificial,templArgs,templateNames);
 
@@ -4825,7 +4825,7 @@ static void computeTemplateClassRelations()
         Debug::print(Debug::Classes,0,"    Template instance %s : \n",qPrint(tcd->name()));
         QCString templSpec = tdi.currentKey();
         ArgumentList templArgs;
-        stringToArgumentList(templSpec,templArgs);
+        stringToArgumentList(tcd->getLanguage(),templSpec,templArgs);
         for (const BaseInfo &bi : root->extends)
         {
           // check if the base class is a template argument
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 4a9048a..239d614 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -1503,7 +1503,7 @@ void MemberDefImpl::IMPL::init(Definition *def,
   // convert function declaration arguments (if any)
   if (!args.isEmpty())
   {
-    stringToArgumentList(args,declArgList,&extraTypeChars);
+    stringToArgumentList(def->getLanguage(),args,declArgList,&extraTypeChars);
     //printf("setDeclArgList %s to %s const=%d\n",args.data(),
     //    argListToString(declArgList).data(),declArgList->constSpecifier);
   }
@@ -6010,7 +6010,7 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
         if (mdefAl.hasParameters())
         {
           ArgumentList mdefAlComb;
-          stringToArgumentList(mdef->argsString(),mdefAlComb);
+          stringToArgumentList(mdef->getLanguage(),mdef->argsString(),mdefAlComb);
           transferArgumentDocumentation(mdefAl,mdefAlComb);
           mdec->setArgumentList(mdefAlComb);
         }
@@ -6023,7 +6023,7 @@ void combineDeclarationAndDefinition(MemberDef *mdec,MemberDef *mdef)
         if (mdecAl.hasParameters())
         {
           ArgumentList mdecAlComb;
-          stringToArgumentList(mdec->argsString(),mdecAlComb);
+          stringToArgumentList(mdec->getLanguage(),mdec->argsString(),mdecAlComb);
           transferArgumentDocumentation(mdecAl,mdecAlComb);
           mdef->setDeclArgumentList(mdecAlComb);
         }
diff --git a/src/pre.l b/src/pre.l
index 1ac9cf8..b6420e7 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -2795,7 +2795,7 @@ static void addDefine(yyscan_t yyscanner)
   {
     ArgumentList argList;
     //printf("addDefine() state->defName='%s' state->defArgsStr='%s'\n",state->defName.data(),state->defArgsStr.data());
-    stringToArgumentList(state->defArgsStr,argList);
+    stringToArgumentList(SrcLangExt_Cpp, state->defArgsStr,argList);
     md->setArgumentList(argList);
   }
   //printf("Setting initializer for '%s' to '%s'\n",state->defName.data(),state->defText.data());
diff --git a/src/scanner.l b/src/scanner.l
index c1718dc..6ad0860 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -4160,7 +4160,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <ReadFuncArgType>")"			{ 
   					  *yyextra->copyArgString+=*yytext;
   					  yyextra->fullArgString+=*yytext;
-					  stringToArgumentList(yyextra->fullArgString,yyextra->current->argList);
+					  stringToArgumentList(yyextra->language, yyextra->fullArgString,yyextra->current->argList);
 					  if (yyextra->insideJS)
 					  {
 					    fixArgumentListForJavaScript(yyextra->current->argList);
@@ -4187,7 +4187,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    {
 					      unput(yytext[i]);
 					    }
-					    stringToArgumentList(yyextra->fullArgString,yyextra->current->argList);
+					    stringToArgumentList(yyextra->language, yyextra->fullArgString,yyextra->current->argList);
                                             handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
 					    BEGIN( yyextra->currentArgumentContext );
 					  }
@@ -4240,7 +4240,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					    }
 					    *yyextra->copyArgString+=*yytext;
 					    yyextra->fullArgString+=*yytext;
-					    stringToArgumentList(yyextra->fullArgString,yyextra->current->argList);
+					    stringToArgumentList(yyextra->language, yyextra->fullArgString,yyextra->current->argList);
                                             handleParametersCommentBlocks(yyscanner,yyextra->current->argList);
 					    BEGIN( yyextra->currentArgumentContext );
 					  }
@@ -4321,7 +4321,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 					  *yyextra->copyArgString+=*yytext;
 					  yyextra->fullArgString+=*yytext;
 					  //printf("end template list '%s'\n",yyextra->copyArgString->data());
-					  stringToArgumentList(yyextra->fullArgString,*yyextra->currentArgumentList);
+					  stringToArgumentList(yyextra->language, yyextra->fullArgString,*yyextra->currentArgumentList);
 					  BEGIN( yyextra->currentArgumentContext );
 					}
 <CopyArgRound>"("			{
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 4b99f0d..3f9a7a1 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -1190,7 +1190,7 @@ void TagFileParser::buildMemberList(const std::shared_ptr<Entry> &ce,QList<TagMe
     me->args       = tmi->arglist;
     if (!me->args.isEmpty())
     {
-      stringToArgumentList(me->args,me->argList);
+      stringToArgumentList(SrcLangExt_Cpp,me->args,me->argList);
     }
     if (tmi->enumValues.count()>0)
     {
diff --git a/src/util.cpp b/src/util.cpp
index 55dcc19..aac0d4f 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1397,7 +1397,7 @@ static const ClassDef *getResolvedClassRec(const Definition *scope,
   ArgumentList actTemplParams;
   if (!strippedTemplateParams.isEmpty()) // template part that was stripped
   {
-    stringToArgumentList(strippedTemplateParams,actTemplParams);
+    stringToArgumentList(scope->getLanguage(),strippedTemplateParams,actTemplParams);
   }
 
   int qualifierIndex = computeQualifiedIndex(name);
@@ -3874,7 +3874,7 @@ static void findMembersWithSpecificName(MemberName *mn,
       {
         const ArgumentList &mdAl = md->argumentList();
         ArgumentList argList;
-        stringToArgumentList(args,argList);
+        stringToArgumentList(md->getLanguage(),args,argList);
         match=matchArguments2(
             md->getOuterScope(),fd,mdAl,
             Doxygen::globalScope,fd,argList,
@@ -4005,7 +4005,7 @@ bool getDefs(const QCString &scName,
         ArgumentList argList;
         if (args)
         {
-          stringToArgumentList(args,argList);
+          stringToArgumentList(fcd->getLanguage(),args,argList);
         }
         for (mmli.toFirst();(mmd=mmli.current());++mmli)
         {
@@ -4124,7 +4124,7 @@ bool getDefs(const QCString &scName,
 
     if (args)
     {
-      stringToArgumentList(args, argList);
+      stringToArgumentList(SrcLangExt_Cpp, args, argList);
     }
 
     for (mmli.toFirst(); (mmd = mmli.current()); ++mmli)
@@ -4227,7 +4227,7 @@ bool getDefs(const QCString &scName,
             if (args && qstrcmp(args,"()")!=0)
             {
               const ArgumentList &mmdAl = mmd->argumentList();
-              stringToArgumentList(args,argList);
+              stringToArgumentList(mmd->getLanguage(),args,argList);
               match=matchArguments2(
                   mmd->getOuterScope(),mmd->getFileDef(),mmdAl,
                   fnd,mmd->getFileDef(),argList,
-- 
cgit v0.12


From 4cd3cdfe95a2ed77963d1adc71a0de10135743da Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 21 Dec 2019 12:22:36 +0100
Subject: Reduced code duplication

---
 src/configimpl.l | 185 +++++++++++--------------------------------------------
 1 file changed, 37 insertions(+), 148 deletions(-)

diff --git a/src/configimpl.l b/src/configimpl.l
index 754d06a..a05293f 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -1321,6 +1321,38 @@ void Config::init()
   ConfigImpl::instance()->init();
 }
 
+static void checkList(QStrList &list,const char *name, bool equalRequired,bool valueRequired)
+{
+  const char *s=list.first();
+  while (s)
+  {
+    QCString item=s;
+    item=item.stripWhiteSpace();
+    int i=item.find('=');
+    if (i==-1 && equalRequired)
+    {
+      err("Illegal format for option %s, no equal sign ('=') specified for item '%s'\n",name,item.data());
+    }
+    if (i!=-1)
+    {
+      QCString myName=item.left(i).stripWhiteSpace();
+      if (myName.isEmpty())
+      {
+        err("Illegal format for option %s, no name specified for item '%s'\n",name,item.data());
+      }
+      else if (valueRequired)
+      {
+        QCString myValue=item.right(item.length()-i-1).stripWhiteSpace();
+        if (myValue.isEmpty())
+        {
+          err("Illegal format for option %s, no value specified for item '%s'\n",name,item.data());
+        }
+      }
+    }
+    s=list.next();
+  }
+}
+
 void Config::checkAndCorrect()
 {
   ConfigValues::instance().init();
@@ -1484,34 +1516,6 @@ void Config::checkAndCorrect()
     s=includePath.next();
   }
 
-  // check EXTENSION_MAPPING
-  QStrList &extmapList = Config_getList(EXTENSION_MAPPING);
-  s=extmapList.first();
-  while (s)
-  {
-    QCString extmap=s;
-    extmap=extmap.stripWhiteSpace();
-    int i_equals=extmap.find('=');
-    if (i_equals==-1)
-    {
-      err("Illegal EXTENSION_MAPPING format '%s', no equal sign specified use 'ext=language'\n",extmap.data());
-    }
-    else
-    {
-      QCString ext = extmap.left(i_equals);
-      QCString lang = extmap.mid(i_equals+1);
-      if (ext.isEmpty())
-      {
-        err("Illegal EXTENSION_MAPPING format '%s', no extension to replace specified use 'ext=language'\n",extmap.data());
-      }
-      else if (lang.isEmpty())
-      {
-        err("Illegal EXTENSION_MAPPING format '%s', no replacement language specified use 'ext=language'\n",extmap.data());
-      }
-    }
-    s=extmapList.next();
-  }
-
   // check PREDEFINED
   if (Config_getBool(ENABLE_PREPROCESSING))
   {
@@ -1549,137 +1553,22 @@ void Config::checkAndCorrect()
   }
 
   // check FILTER_PATTERNS
-  QStrList& filterList    = Config_getList(FILTER_PATTERNS);
-  s=filterList.first();
-  while (s)
-  {
-    QCString filter=s;
-    filter=filter.stripWhiteSpace();
-    int i=filter.find('=');
-    if (i==-1)
-    {
-      err("Illegal FILTER_PATTERNS format, no equal sign specified in '%s'\n",filter.data());
-    }
-    else
-    {
-      QCString myName=filter.left(i).stripWhiteSpace();
-      QCString myValue=filter.right(filter.length()-i-1).stripWhiteSpace();
-      if (myName.isEmpty())
-      {
-        err("Illegal FILTER_PATTERNS format '%s', no name specified\n",filter.data());
-      }
-      else if (myValue.isEmpty())
-      {
-        err("Illegal FILTER_PATTERNS format '%s', no filter specified\n",filter.data());
-      }
-    }
-    s=filterList.next();
-  }
+  checkList(Config_getList(FILTER_PATTERNS),"FILTER_PATTERNS",TRUE,TRUE);
 
   // check FILTER_SOURCE_PATTERNS
-  QStrList& filterSrcList = Config_getList(FILTER_SOURCE_PATTERNS);
-  s=filterSrcList.first();
-  while (s)
-  {
-    QCString filterSrc=s;
-    filterSrc=filterSrc.stripWhiteSpace();
-    int i=filterSrc.find('=');
-    if (i==-1)
-    {
-      err("Illegal FILTER_SOURCE_PATTERNS format, no name specified in '%s'\n",filterSrc.data());
-    }
-    else
-    {
-      QCString myName=filterSrc.left(i).stripWhiteSpace();
-      if (myName.isEmpty())
-      {
-        err("Illegal FILTER_SOURCE_PATTERNS format '%s', no name specified\n",filterSrc.data());
-      }
-    }
-    s=filterSrcList.next();
-  }
+  checkList(Config_getList(FILTER_SOURCE_PATTERNS),"FILTER_SOURCE_PATTERNS",FALSE,FALSE);
 
   // check TAGFILES
-  QStrList& tagfilesList    = Config_getList(TAGFILES);
-  s=tagfilesList.first();
-  while (s)
-  {
-    QCString tagfiles=s;
-    tagfiles=tagfiles.stripWhiteSpace();
-    int i=tagfiles.find('=');
-    if (i!=-1)
-    {
-      QCString myName=tagfiles.left(i).stripWhiteSpace();
-      QCString myValue=tagfiles.right(tagfiles.length()-i-1).stripWhiteSpace();
-      if (myName.isEmpty())
-      {
-        err("Illegal TAGFILES format '%s', no name specified\n",tagfiles.data());
-      }
-      else if (myValue.isEmpty())
-      {
-        err("Illegal TAGFILES format '%s', no tagfiles specified\n",tagfiles.data());
-      }
-    }
-    s=tagfilesList.next();
-  }
+  checkList(Config_getList(TAGFILES),"TAGFILES",FALSE,TRUE);
 
   // check EXTRA_SEARCH_MAPPINGS
   if (Config_getBool(SEARCHENGINE) && Config_getBool(GENERATE_HTML))
   {
-    QStrList& searchList = Config_getList(EXTRA_SEARCH_MAPPINGS);
-    s=searchList.first();
-    while (s)
-    {
-      QCString search=s;
-      search=search.stripWhiteSpace();
-      int i=search.find('=');
-      if (i==-1)
-      {
-        err("Illegal EXTRA_SEARCH_MAPPINGS format, no equal sign specified in '%s'\n",search.data());
-      }
-      else
-      {
-        QCString myName=search.left(i).stripWhiteSpace();
-        QCString myValue=search.right(search.length()-i-1).stripWhiteSpace();
-        if (myName.isEmpty())
-        {
-          err("Illegal EXTRA_SEARCH_MAPPINGS format '%s', no tagname specified\n",search.data());
-        }
-        else if (myValue.isEmpty())
-        {
-          err("Illegal EXTRA_SEARCH_MAPPINGS format '%s', no location specified\n",search.data());
-        }
-      }
-      s=searchList.next();
-    }
+    checkList(Config_getList(EXTRA_SEARCH_MAPPINGS),"EXTRA_SEARCH_MAPPING",TRUE,TRUE);
   }
 
   // check TCL_SUBST
-  QStrList tclsubstList = Config_getList(TCL_SUBST);
-  s=tclsubstList.first();
-  while (s)
-  {
-    QCString tclsubst=s;
-    int i=tclsubst.find('=');
-    if (i==-1)
-    {
-      err("Illegal TCL_SUBST format, no equal sign specified in '%s'\n",tclsubst.data());
-    }
-    else
-    {
-      QCString myName=tclsubst.left(i).stripWhiteSpace();
-      QCString myValue=tclsubst.right(tclsubst.length()-i-1).stripWhiteSpace();
-      if (myName.isEmpty())
-      {
-        err("Illegal TCL_SUBST format '%s', no name to replace specified\n",tclsubst.data());
-      }
-      else if (myValue.isEmpty())
-      {
-        err("Illegal TCL_SUBST format '%s', no replacement value specified\n",tclsubst.data());
-      }
-    }
-    s = tclsubstList.next();
-  }
+  checkList(Config_getList(TCL_SUBST),"TCL_SUBST",TRUE,TRUE);
 
   // check if GENERATE_TREEVIEW and GENERATE_HTMLHELP are both enabled
   if (Config_getBool(GENERATE_TREEVIEW) && Config_getBool(GENERATE_HTMLHELP))
-- 
cgit v0.12


From 369c65635de29af6fd92c835879d70fdac7d2270 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 21 Dec 2019 14:56:26 +0100
Subject: issue 3417: C++: friend template functions shown even with
 HIDE_FRIEND_COMPOUNDS=yes

---
 src/config.xml    |  2 +-
 src/memberdef.cpp | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/config.xml b/src/config.xml
index dfe22e2..bf74fff 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -927,7 +927,7 @@ Go to the <a href="commands.html">next</a> section or return to the
       <docs>
 <![CDATA[
  If the \c HIDE_FRIEND_COMPOUNDS tag is set to \c YES, doxygen will hide all
- friend (class|struct|union) declarations.
+ friend declarations.
  If set to \c NO, these declarations will be included in the
  documentation.
 ]]>
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 239d614..99ed224 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2145,11 +2145,11 @@ bool MemberDefImpl::isBriefSectionVisible() const
 
   // Hide friend (class|struct|union) declarations if HIDE_FRIEND_COMPOUNDS is true
   bool visibleIfFriendCompound = !(hideFriendCompounds &&
-                                   isFriend() &&
+                                   isFriend() /*&&
                                    (m_impl->type=="friend class" ||
                                     m_impl->type=="friend struct" ||
                                     m_impl->type=="friend union"
-                                   )
+                                   )*/
                                   );
 
   // only include members that are non-private unless EXTRACT_PRIVATE is
@@ -2719,11 +2719,11 @@ bool MemberDefImpl::isDetailedSectionLinkable() const
   // hide friend (class|struct|union) member if HIDE_FRIEND_COMPOUNDS
   // is true
   bool friendCompoundFilter = !(Config_getBool(HIDE_FRIEND_COMPOUNDS) &&
-                                isFriend() &&
+                                isFriend() /*&&
                                 (m_impl->type=="friend class" ||
                                  m_impl->type=="friend struct" ||
                                  m_impl->type=="friend union"
-                                )
+                                )*/
                                );
 
 
@@ -4187,13 +4187,6 @@ void MemberDefImpl::warnIfUndocumentedParams() const
   }
 }
 
-bool MemberDefImpl::isFriendClass() const
-{
-  return (isFriend() &&
-         (m_impl->type=="friend class" || m_impl->type=="friend struct" ||
-          m_impl->type=="friend union"));
-}
-
 bool MemberDefImpl::isDocumentedFriendClass() const
 {
   ClassDef *fcd=0;
@@ -6135,6 +6128,14 @@ bool MemberDefImpl::isFriendToHide() const
   return isFriendToHide;
 }
 
+bool MemberDefImpl::isFriendClass() const
+{
+  return (isFriend() &&
+         (m_impl->type=="friend class" || m_impl->type=="friend struct" ||
+          m_impl->type=="friend union"));
+}
+
+
 bool MemberDefImpl::isNotFriend() const
 {
   return !(isFriend() && isFriendToHide());
-- 
cgit v0.12


From 9450e98030627c38b0df37bd1d5501055c8a37f2 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sun, 22 Dec 2019 16:54:58 +0100
Subject: Removed exitCode parameter as it is always 1

---
 src/commentscan.l            |  2 +-
 src/configimpl.l             | 46 ++++++++++++++++++++++----------------------
 src/defgen.cpp               |  2 +-
 src/diagram.cpp              |  2 +-
 src/docbookgen.cpp           |  2 +-
 src/docsets.cpp              |  8 ++++----
 src/dot.cpp                  |  4 ++--
 src/dotgfxhierarchytable.cpp |  2 +-
 src/dotgraph.cpp             |  2 +-
 src/doxygen.cpp              | 16 +++++++--------
 src/eclipsehelp.cpp          |  2 +-
 src/formula.cpp              |  2 +-
 src/htmlgen.cpp              |  2 +-
 src/htmlhelp.cpp             |  6 +++---
 src/latexgen.cpp             |  6 +++---
 src/mangen.cpp               |  4 ++--
 src/message.cpp              | 18 ++---------------
 src/message.h                |  3 +--
 src/outputgen.cpp            |  2 +-
 src/perlmodgen.cpp           |  2 +-
 src/qhp.cpp                  |  2 +-
 src/rtfgen.cpp               |  2 +-
 src/util.cpp                 |  4 ++--
 23 files changed, 63 insertions(+), 78 deletions(-)

diff --git a/src/commentscan.l b/src/commentscan.l
index 89a97e3..35001c3 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -327,7 +327,7 @@ class DocCmdMapper
       {
 	if (m_map.find(p->cmdName)!=0)
 	{
-	  term(1,"DocCmdMapper: command %s already added\n",p->cmdName);
+	  term("DocCmdMapper: command %s already added\n",p->cmdName);
 	}
 	Cmd *cmd = new Cmd;
 	cmd->func = p->handler;
diff --git a/src/configimpl.l b/src/configimpl.l
index 9aae6f6..4da1634 100644
--- a/src/configimpl.l
+++ b/src/configimpl.l
@@ -56,14 +56,14 @@ void config_err(const char *fmt, ...)
   vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
   va_end(args); 
 }
-void config_term(const int exitVal, const char *fmt, ...)
+void config_term(const char *fmt, ...)
 {
   va_list args;
   va_start(args, fmt);
   vfprintf(stderr, (QCString(error_str) + fmt).data(), args);
   va_end(args);
   fprintf(stderr, "%s\n", "Exiting...");
-  exit(exitVal);
+  exit(1);
 }
 
 void config_warn(const char *fmt, ...)
@@ -223,11 +223,11 @@ QCString &ConfigImpl::getString(const char *fileName,int num,const char *name) c
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_String)
   {
-    config_term(1,"%s<%d>: Internal error: Requested option %s not of string type!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested option %s not of string type!\n",fileName,num,name);
   }
   return *((ConfigString *)opt)->valueRef();
 }
@@ -237,11 +237,11 @@ QStrList &ConfigImpl::getList(const char *fileName,int num,const char *name) con
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_List)
   {
-    config_term(1,"%s<%d>: Internal error: Requested option %s not of list type!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested option %s not of list type!\n",fileName,num,name);
   }
   return *((ConfigList *)opt)->valueRef();
 }
@@ -251,11 +251,11 @@ QCString &ConfigImpl::getEnum(const char *fileName,int num,const char *name) con
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Enum)
   {
-    config_term(1,"%s<%d>: Internal error: Requested option %s not of enum type!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested option %s not of enum type!\n",fileName,num,name);
   }
   return *((ConfigEnum *)opt)->valueRef();
 }
@@ -265,11 +265,11 @@ int &ConfigImpl::getInt(const char *fileName,int num,const char *name) const
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Int)
   {
-    config_term(1,"%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested option %s not of integer type!\n",fileName,num,name);
   }
   return *((ConfigInt *)opt)->valueRef();
 }
@@ -279,11 +279,11 @@ bool &ConfigImpl::getBool(const char *fileName,int num,const char *name) const
   ConfigOption *opt = m_dict->find(name);
   if (opt==0) 
   {
-    config_term(1,"%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested unknown option %s!\n",fileName,num,name);
   }
   else if (opt->kind()!=ConfigOption::O_Bool)
   {
-    config_term(1,"%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name);
+    config_term("%s<%d>: Internal error: Requested option %s not of boolean type!\n",fileName,num,name);
   }
   return *((ConfigBool *)opt)->valueRef();
 }
@@ -566,7 +566,7 @@ static QCString configStringRecode(
   void *cd = portable_iconv_open(outputEncoding,inputEncoding);
   if (cd==(void *)(-1)) 
   {
-    config_term(1,"Error: unsupported character conversion: '%s'->'%s'\n",
+    config_term("Error: unsupported character conversion: '%s'->'%s'\n",
         inputEncoding.data(),outputEncoding.data());
   }
   size_t iLeft=(size_t)inputSize;
@@ -582,7 +582,7 @@ static QCString configStringRecode(
   }
   else
   {
-    config_term(1,"Error: failed to translate characters from %s to %s: %s\n",
+    config_term("Error: failed to translate characters from %s to %s: %s\n",
         inputEncoding.data(),outputEncoding.data(),strerror(errno));
   }
   portable_iconv_close(cd);
@@ -636,7 +636,7 @@ static FILE *findFile(const char *fileName)
 static void readIncludeFile(const char *incName)
 {
   if (includeDepth==MAX_INCLUDE_DEPTH) {
-    config_term(1,"maximum include depth (%d) reached, %s is not included. Aborting...\n",
+    config_term("maximum include depth (%d) reached, %s is not included. Aborting...\n",
 	MAX_INCLUDE_DEPTH,incName);
   } 
 
@@ -675,7 +675,7 @@ static void readIncludeFile(const char *incName)
   } 
   else
   {
-    config_term(1,"@INCLUDE = %s: not found!\n",inc.data());
+    config_term("@INCLUDE = %s: not found!\n",inc.data());
   }
 }
 
@@ -1157,7 +1157,7 @@ void ConfigImpl::init()
       ConfigOption * opt = ConfigImpl::instance()->get(depName);
       if (opt==0)
       {
-        config_term(1,"Config option '%s' has invalid depends relation on unknown option '%s'\n",
+        config_term("Config option '%s' has invalid depends relation on unknown option '%s'\n",
             option->name().data(),depName.data());
       }
     }
@@ -1224,7 +1224,7 @@ static QCString configFileToString(const char *name)
   }
   if (!fileOpened)  
   {
-    config_term(1,"cannot open file '%s' for reading\n",name);
+    config_term("cannot open file '%s' for reading\n",name);
   }
   return "";
 }
@@ -1434,7 +1434,7 @@ void Config::checkAndCorrect()
     QFileInfo fi(headerFile);
     if (!fi.exists())
     {
-      term(1,"tag HTML_HEADER: header file '%s' "
+      config_term("tag HTML_HEADER: header file '%s' "
 	  "does not exist\n",headerFile.data());
     }
   }
@@ -1445,7 +1445,7 @@ void Config::checkAndCorrect()
     QFileInfo fi(footerFile);
     if (!fi.exists())
     {
-      term(1,"tag HTML_FOOTER: footer file '%s' "
+      config_term("tag HTML_FOOTER: footer file '%s' "
 	  "does not exist\n",footerFile.data());
     }
   }
@@ -1459,7 +1459,7 @@ void Config::checkAndCorrect()
       QFileInfo fi(MathJaxCodefile);
       if (!fi.exists())
       {
-        term(1,"tag MATHJAX_CODEFILE file '%s' "
+        config_term("tag MATHJAX_CODEFILE file '%s' "
 	    "does not exist\n",MathJaxCodefile.data());
       }
     }
@@ -1478,7 +1478,7 @@ void Config::checkAndCorrect()
     QFileInfo fi(latexHeaderFile);
     if (!fi.exists())
     {
-      term(1,"tag LATEX_HEADER: header file '%s' "
+      config_term("tag LATEX_HEADER: header file '%s' "
 	  "does not exist\n",latexHeaderFile.data());
     }
   }
@@ -1489,7 +1489,7 @@ void Config::checkAndCorrect()
     QFileInfo fi(latexFooterFile);
     if (!fi.exists())
     {
-      term(1,"tag LATEX_FOOTER: footer file '%s' "
+      config_term("tag LATEX_FOOTER: footer file '%s' "
 	  "does not exist\n",latexFooterFile.data());
     }
   }
diff --git a/src/defgen.cpp b/src/defgen.cpp
index 23fb674..b145f0e 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -572,7 +572,7 @@ void generateDEF()
       dir.setPath(QDir::currentDirPath());
       if (!dir.mkdir(outputDirectory))
       {
-        term(1,"tag OUTPUT_DIRECTORY: Output directory '%s' does not "
+        term("tag OUTPUT_DIRECTORY: Output directory '%s' does not "
             "exist and cannot be created\n",outputDirectory.data());
       }
       else
diff --git a/src/diagram.cpp b/src/diagram.cpp
index cce06ab..18817e9 100644
--- a/src/diagram.cpp
+++ b/src/diagram.cpp
@@ -1101,7 +1101,7 @@ void ClassDiagram::writeFigure(FTextStream &output,const char *path,
   f1.setName(epsName.data());
   if (!f1.open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",f1.name().data());
+    term("Could not open file %s for writing\n",f1.name().data());
   }
   FTextStream t(&f1);
   
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
index 8040c92..51f37db 100644
--- a/src/docbookgen.cpp
+++ b/src/docbookgen.cpp
@@ -289,7 +289,7 @@ void DocbookGenerator::init()
   QDir d(dir);
   if (!d.exists() && !d.mkdir(dir))
   {
-    term(1,"Could not create output directory %s\n",dir.data());
+    term("Could not create output directory %s\n",dir.data());
   }
 
   createSubDirs(d);
diff --git a/src/docsets.cpp b/src/docsets.cpp
index b33aea5..439e924 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -62,7 +62,7 @@ void DocSets::initialize()
   QFile makefile(mfName);
   if (!makefile.open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",mfName.data());
+    term("Could not open file %s for writing\n",mfName.data());
   }
   FTextStream ts(&makefile);
 
@@ -112,7 +112,7 @@ void DocSets::initialize()
   QFile plist(plName);
   if (!plist.open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",plName.data());
+    term("Could not open file %s for writing\n",plName.data());
   }
   FTextStream ts(&plist);
 
@@ -147,7 +147,7 @@ void DocSets::initialize()
   m_nf = new QFile(notes);
   if (!m_nf->open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",notes.data());
+    term("Could not open file %s for writing\n",notes.data());
   }
   //QCString indexName=Config_getBool(GENERATE_TREEVIEW)?"main":"index";
   QCString indexName="index";
@@ -167,7 +167,7 @@ void DocSets::initialize()
   m_tf = new QFile(tokens);
   if (!m_tf->open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",tokens.data());
+    term("Could not open file %s for writing\n",tokens.data());
   }
   m_tts.setDevice(m_tf);
   m_tts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
diff --git a/src/dot.cpp b/src/dot.cpp
index 2ba5e92..f26bee4 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -272,7 +272,7 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir,
   QDir d(outDir);
   if (!d.exists())
   {
-    term(1,"Output dir %s does not exist!\n",outDir);
+    term("Output dir %s does not exist!\n",outDir);
   }
 
   QCString imgExt = getDotImageExtension();
@@ -325,7 +325,7 @@ void writeDotImageMapFromFile(FTextStream &t,
   QDir d(outDir);
   if (!d.exists())
   {
-    term(1,"Output dir %s does not exist!\n",outDir.data());
+    term("Output dir %s does not exist!\n",outDir.data());
   }
 
   QCString mapName = baseName+".map";
diff --git a/src/dotgfxhierarchytable.cpp b/src/dotgfxhierarchytable.cpp
index df9f48f..3d56de8 100644
--- a/src/dotgfxhierarchytable.cpp
+++ b/src/dotgfxhierarchytable.cpp
@@ -86,7 +86,7 @@ void DotGfxHierarchyTable::writeGraph(FTextStream &out,
   // store the original directory
   if (!d.exists())
   {
-    term(1,"Output dir %s does not exist!\n",path);
+    term("Output dir %s does not exist!\n",path);
   }
 
   // put each connected subgraph of the hierarchy in a row of the HTML output
diff --git a/src/dotgraph.cpp b/src/dotgraph.cpp
index c17523b..0bfa712 100644
--- a/src/dotgraph.cpp
+++ b/src/dotgraph.cpp
@@ -147,7 +147,7 @@ bool DotGraph::prepareDotFile()
 {
   if (!m_dir.exists())
   {
-    term(1,"Output dir %s does not exist!\n", m_dir.path().data());
+    term("Output dir %s does not exist!\n", m_dir.path().data());
   }
 
   QCString sigStr(33);
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index f42838f..ed1c5a8 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -8584,7 +8584,7 @@ static void computePageRelations(Entry *root)
         PageDef *subPd = Doxygen::pageSDict->find(bi.name);
         if (pd==subPd)
         {
-         term(1,"page defined at line %d of file %s with label %s is a direct "
+         term("page defined at line %d of file %s with label %s is a direct "
              "subpage of itself! Please remove this cyclic dependency.\n",
               pd->docLine(),pd->docFile().data(),pd->name().data());
         }
@@ -8611,7 +8611,7 @@ static void checkPageRelations()
     {
       if (ppd==pd)
       {
-        term(1,"page defined at line %d of file %s with label %s is a subpage "
+        term("page defined at line %d of file %s with label %s is a subpage "
             "of itself! Please remove this cyclic dependency.\n",
             pd->docLine(),pd->docFile().data(),pd->name().data());
       }
@@ -8946,7 +8946,7 @@ static void generateConfigFile(const char *configFile,bool shortList,
   }
   else
   {
-    term(1,"Cannot open file %s for writing\n",configFile);
+    term("Cannot open file %s for writing\n",configFile);
   }
 }
 static void compareDoxyfile()
@@ -8963,7 +8963,7 @@ static void compareDoxyfile()
   }
   else
   {
-    term(1,"Cannot open file %s for writing\n",configFile);
+    term("Cannot open file %s for writing\n",configFile);
   }
 }
 //----------------------------------------------------------------------------
@@ -9602,14 +9602,14 @@ void readFormulaRepository(QCString dir, bool cmp)
         {
           if ((f=Doxygen::formulaDict->find(formText))==0)
           {
-            term(1,"discrepancy between formula repositories! Remove "
+            term("discrepancy between formula repositories! Remove "
                 "formula.repository and from_* files from output directories.");
           }
           QCString formLabel;
           formLabel.sprintf("\\form#%d",f->getId());
           if (formLabel != formName)
           {
-            term(1,"discrepancy between formula repositories! Remove "
+            term("discrepancy between formula repositories! Remove "
                 "formula.repository and from_* files from output directories.");
           }
           new_repository++;
@@ -9627,7 +9627,7 @@ void readFormulaRepository(QCString dir, bool cmp)
   }
   if (cmp && (current_repository != new_repository))
   {
-    term(1,"size discrepancy between formula repositories! Remove "
+    term("size discrepancy between formula repositories! Remove "
         "formula.repository and from_* files from output directories.");
   }
 }
@@ -11468,7 +11468,7 @@ void generateOutput()
     QDir searchDir(searchDirName);
     if (!searchDir.exists() && !searchDir.mkdir(searchDirName))
     {
-      term(1,"Could not create search results directory '%s' $PWD='%s'\n",
+      term("Could not create search results directory '%s' $PWD='%s'\n",
           searchDirName.data(),QDir::currentDirPath().data());
     }
     HtmlGenerator::writeSearchData(searchDirName);
diff --git a/src/eclipsehelp.cpp b/src/eclipsehelp.cpp
index 04f2947..bbb3b01 100644
--- a/src/eclipsehelp.cpp
+++ b/src/eclipsehelp.cpp
@@ -72,7 +72,7 @@ void EclipseHelp::initialize()
   m_tocfile = new QFile(name);
   if (!m_tocfile->open(IO_WriteOnly)) 
   {
-    term(1,"Could not open file %s for writing\n", name.data());
+    term("Could not open file %s for writing\n", name.data());
   }
 
   // -- initialize its text stream
diff --git a/src/formula.cpp b/src/formula.cpp
index d74681a..77085f8 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -53,7 +53,7 @@ void FormulaList::generateBitmaps(const char *path)
   // store the original directory
   if (!d.exists())
   {
-    term(1,"Output dir %s does not exist!\n",path);
+    term("Output dir %s does not exist!\n",path);
   }
   QCString oldDir = QDir::currentDirPath().utf8();
   // go to the html output directory (i.e. path)
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 926e04d..d47a38c 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -728,7 +728,7 @@ void HtmlGenerator::init()
   QDir d(dname);
   if (!d.exists() && !d.mkdir(dname))
   {
-    term(1,"Could not create output directory %s\n",dname.data());
+    term("Could not create output directory %s\n",dname.data());
   }
   //writeLogo(dname);
   if (!Config_getString(HTML_HEADER).isEmpty())
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 6101984..066e6f7 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -308,7 +308,7 @@ void HtmlHelp::initialize()
   m_fromUtf8 = portable_iconv_open(str,"UTF-8"); 
   if (m_fromUtf8==(void *)(-1))
   {
-    term(1,"unsupported character conversion for CHM_INDEX_ENCODING: '%s'->'UTF-8'\n", str);
+    term("unsupported character conversion for CHM_INDEX_ENCODING: '%s'->'UTF-8'\n", str);
   }
 
   /* open the contents file */
@@ -316,7 +316,7 @@ void HtmlHelp::initialize()
   cf = new QFile(fName);
   if (!cf->open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",fName.data());
+    term("Could not open file %s for writing\n",fName.data());
   }
   /* Write the header of the contents file */
   cts.setDevice(cf);
@@ -332,7 +332,7 @@ void HtmlHelp::initialize()
   kf = new QFile(fName);
   if (!kf->open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",fName.data());
+    term("Could not open file %s for writing\n",fName.data());
   }
   /* Write the header of the contents file */
   kts.setDevice(kf);
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 27be5b3..addde4c 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -288,7 +288,7 @@ static void writeLatexMakefile()
   QFile file(fileName);
   if (!file.open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",fileName.data());
+    term("Could not open file %s for writing\n",fileName.data());
   }
   // inserted by KONNO Akihisa <konno@researchers.jp> 2002-03-05
   QCString latex_command = theTranslator->latexCommandName();
@@ -386,7 +386,7 @@ static void writeMakeBat()
   bool generateBib = !Doxygen::citeDict->isEmpty();
   if (!file.open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",fileName.data());
+    term("Could not open file %s for writing\n",fileName.data());
   }
   FTextStream t(&file);
   t << "set Dir_Old=%cd%\n";
@@ -466,7 +466,7 @@ void LatexGenerator::init()
   QDir d(dir);
   if (!d.exists() && !d.mkdir(dir))
   {
-    term(1,"Could not create output directory %s\n",dir.data());
+    term("Could not create output directory %s\n",dir.data());
   }
 
   writeLatexMakefile();
diff --git a/src/mangen.cpp b/src/mangen.cpp
index f4eba20..832863e 100644
--- a/src/mangen.cpp
+++ b/src/mangen.cpp
@@ -112,12 +112,12 @@ void ManGenerator::init()
   QDir d(manOutput);
   if (!d.exists() && !d.mkdir(manOutput))
   {
-    term(1,"Could not create output directory %s\n",manOutput.data());
+    term("Could not create output directory %s\n",manOutput.data());
   }
   d.setPath(manOutput + "/" + getSubdir());
   if (!d.exists() && !d.mkdir(manOutput + "/" + getSubdir()))
   {
-    term(1,"Could not create output directory %s/%s\n",manOutput.data(), getSubdir().data());
+    term("Could not create output directory %s/%s\n",manOutput.data(), getSubdir().data());
   }
   createSubDirs(d);
 }
diff --git a/src/message.cpp b/src/message.cpp
index 70bcaac..d8f83ef 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -251,7 +251,7 @@ extern void err_full(const char *file,int line,const char *fmt, ...)
   va_end(args);
 }
 
-void term(const int exitVal, const char *fmt, ...)
+void term(const char *fmt, ...)
 {
   va_list args;
   va_start(args, fmt);
@@ -262,21 +262,7 @@ void term(const int exitVal, const char *fmt, ...)
     for (int i = 0; i < strlen(error_str); i++) fprintf(warnFile, " ");
     fprintf(warnFile, "%s\n", "Exiting...");
   }
-  exit(exitVal);
-}
-
-extern void term_full(const int exitVal, const char *file,int line,const char *fmt, ...)
-{
-  va_list args;
-  va_start(args, fmt);
-  do_warn(TRUE, file, line, error_str, fmt, args);
-  va_end(args);
-  if (warnFile != stderr)
-  {
-    for (int i = 0; i < strlen(error_str); i++) fprintf(warnFile, " ");
-    fprintf(warnFile, "%s\n", "Exiting...");
-  }
-  exit(exitVal);
+  exit(1);
 }
 
 void printlex(int dbg, bool enter, const char *lexName, const char *fileName)
diff --git a/src/message.h b/src/message.h
index 56e7e27..7b12ba8 100644
--- a/src/message.h
+++ b/src/message.h
@@ -30,8 +30,7 @@ extern void warn_doc_error(const char *file,int line,const char *fmt, ...);
 extern void warn_uncond(const char *fmt, ...);
 extern void err(const char *fmt, ...);
 extern void err_full(const char *file,int line,const char *fmt, ...);
-extern void term(const int exitVal, const char *fmt, ...);
-extern void term_full(const int exitVal, const char *file,int line,const char *fmt, ...);
+extern void term(const char *fmt, ...);
 void initWarningFormat();
 
 extern void printlex(int dbg, bool enter, const char *lexName, const char *fileName);
diff --git a/src/outputgen.cpp b/src/outputgen.cpp
index ea8fd5e..f54eaf1 100644
--- a/src/outputgen.cpp
+++ b/src/outputgen.cpp
@@ -46,7 +46,7 @@ void OutputGenerator::startPlainFile(const char *name)
   file = new QFile(fileName);
   if (!file->open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n",fileName.data());
+    term("Could not open file %s for writing\n",fileName.data());
   }
   t.setDevice(file);
 }
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
index bf20d45..97b3d3d 100644
--- a/src/perlmodgen.cpp
+++ b/src/perlmodgen.cpp
@@ -2271,7 +2271,7 @@ bool PerlModGenerator::createOutputDir(QDir &perlModDir)
       dir.setPath(QDir::currentDirPath());
       if (!dir.mkdir(outputDirectory))
       {
-	term(1,"tag OUTPUT_DIRECTORY: Output directory '%s' does not "
+	term("tag OUTPUT_DIRECTORY: Output directory '%s' does not "
 	    "exist and cannot be created\n",outputDirectory.data());
       }
       else
diff --git a/src/qhp.cpp b/src/qhp.cpp
index 484475c..50f43ff 100644
--- a/src/qhp.cpp
+++ b/src/qhp.cpp
@@ -168,7 +168,7 @@ void Qhp::finalize()
   QFile file(fileName);
   if (!file.open(IO_WriteOnly))
   {
-    term(1,"Could not open file %s for writing\n", fileName.data());
+    term("Could not open file %s for writing\n", fileName.data());
   }
   m_doc.dumpTo(file);
 }
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
index 2702cca..efc0f63 100644
--- a/src/rtfgen.cpp
+++ b/src/rtfgen.cpp
@@ -175,7 +175,7 @@ void RTFGenerator::init()
   QDir d(dir);
   if (!d.exists() && !d.mkdir(dir))
   {
-    term(1,"Could not create output directory %s\n",dir.data());
+    term("Could not create output directory %s\n",dir.data());
   }
   rtf_Style.setAutoDelete(TRUE);
 
diff --git a/src/util.cpp b/src/util.cpp
index 9cff297..4c3ebb0 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -7958,7 +7958,7 @@ static int transcodeCharacterBuffer(const char *fileName,BufStr &srcBuf,int size
   void *cd = portable_iconv_open(outputEncoding,inputEncoding);
   if (cd==(void *)(-1)) 
   {
-    term(1,"unsupported character conversion: '%s'->'%s': %s\n"
+    term("unsupported character conversion: '%s'->'%s': %s\n"
         "Check the INPUT_ENCODING setting in the config file!\n",
         inputEncoding,outputEncoding,strerror(errno));
   }
@@ -7978,7 +7978,7 @@ static int transcodeCharacterBuffer(const char *fileName,BufStr &srcBuf,int size
   }
   else
   {
-    term(1,"%s: failed to translate characters from %s to %s: check INPUT_ENCODING\n",
+    term("%s: failed to translate characters from %s to %s: check INPUT_ENCODING\n",
         fileName,inputEncoding,outputEncoding);
   }
   portable_iconv_close(cd);
-- 
cgit v0.12