Refactoring: making xmlcode.l reentrant

doxygen · Sep 14, 2020 · 0fc06d6 · 0fc06d6
1 parent 5162dab
commit 0fc06d6
Show file tree

Hide file tree

Showing 3 changed files with 331 additions and 295 deletions.
diff --git a/src/sqlcode.l b/src/sqlcode.l
@@ -395,9 +395,6 @@ void SQLCodeParser::resetCodeParserState()
   yyextra->currentMemberDef = 0;
 }
 
-
-//---------------------------------------------------------------------------------
-
 void SQLCodeParser::parseCode(CodeOutputInterface &codeOutIntf,
                const char *scopeName,
                const QCString &input,
@@ -417,6 +414,8 @@ void SQLCodeParser::parseCode(CodeOutputInterface &codeOutIntf,
   yyscan_t yyscanner = p->yyscanner;
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
 
+  if (input.isEmpty()) return;
+
   printlex(yy_flex_debug, true, __FILE__, fileDef ? fileDef->fileName().data(): NULL);
 
   yyextra->code = &codeOutIntf;

diff --git a/src/xmlcode.h b/src/xmlcode.h
@@ -1,12 +1,10 @@
 /******************************************************************************
  *
- * 
- *
- * Copyright (C) 1997-2014 by Dimitri van Heesch.
+ * Copyright (C) 1997-2020 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 
+ * 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.
  *
@@ -32,6 +30,8 @@ class Definition;
 class XMLCodeParser : public CodeParserInterface
 {
   public:
+    XMLCodeParser();
+    virtual ~XMLCodeParser();
     void parseCode(CodeOutputInterface &codeOutIntf,
                    const char *scopeName,
                    const QCString &input,
@@ -48,6 +48,9 @@ class XMLCodeParser : public CodeParserInterface
                    bool collectXRefs=TRUE
                   );
     void resetCodeParserState();
+  private:
+    struct Private;
+    std::unique_ptr<Private> p;
 };