1 files changed, 48 insertions, 23 deletions

diff --git a/src/clangparser.h b/src/clangparser.h
index 8bb9aba..8ee1bdb 100644
--- a/src/clangparser.h
+++ b/src/clangparser.h
@@ -3,39 +3,41 @@
 
 #include <qcstring.h>
 #include <qstrlist.h>
+#include "containers.h"
+#include <memory>
 
 class CodeOutputInterface;
 class FileDef;
+class ClangParser;
+class Definition;
 
-/** @brief Wrapper for to let libclang assisted parsing. */
-class ClangParser
+namespace clang { namespace tooling {
+  class CompilationDatabase;
+} }
+
+/** @brief Clang parser object for a single translation unit, which consists of a source file
+ *  and the directly or indirectly included headers
+ */
+class ClangTUParser
 {
   public:
-    /** Returns the one and only instance of the class */
-    static ClangParser *instance();
-    
-    /** Start parsing a file.
-     *  @param[in] fileName The name of the file to parse.
-     *  @param[in,out] filesInTranslationUnit Other files that are
-     *                 part of the input and included by the file.
-     *                 The function will return a subset of the files,
-     *                 only including the ones that were actually found 
-     *                 during parsing.
+    ClangTUParser(const ClangParser &parser,const FileDef *fd);
+    virtual ~ClangTUParser();
+
+    /** Parse the file given at construction time as a translation unit
+     *  This file should already be preprocessed by doxygen preprocessor at the time of calling.
      */
-    void start(const char *fileName,QStrList &filesInTranslationUnit);
+    void parse();
 
-    /** Switches to another file within the translation unit started
-     *  with start().
+    /** Switches to another file within the translation unit started with start().
      *  @param[in] fileName The name of the file to switch to.
      */
-    void switchToFile(const char *fileName);
+    void switchToFile(FileDef *fd);
 
-    /** Finishes parsing a translation unit. Free any resources that
-     *  were needed for parsing.
-     */
-    void finish();
+    /** Returns the list of files for this translation unit */
+    StringVector filesInSameTU() const;
 
-    /** Looks for \a symbol which should be found at \a line and
+    /** Looks for \a symbol which should be found at \a line.
      *  returns a clang unique reference to the symbol.
      */
     QCString lookup(uint line,const char *symbol);
@@ -47,6 +49,13 @@ class ClangParser
     void writeSources(CodeOutputInterface &ol,FileDef *fd);
 
   private:
+    void detectFunctionBody(const char *s);
+    void writeLineNumber(CodeOutputInterface &ol,FileDef *fd,uint line);
+    void codifyLines(CodeOutputInterface &ol,FileDef *fd,const char *text,
+                     uint &line,uint &column,const char *fontClass=0);
+    void writeMultiLineCodeLink(CodeOutputInterface &ol,
+                                FileDef *fd,uint &line,uint &column,
+                                Definition *d, const char *text);
     void linkIdentifier(CodeOutputInterface &ol,FileDef *fd,
                         uint &line,uint &column,
                         const char *text,int tokenIndex);
@@ -56,9 +65,25 @@ class ClangParser
     void linkInclude(CodeOutputInterface &ol,FileDef *fd,
                    uint &line,uint &column,
                    const char *text);
-    void determineInputFilesInSameTu(QStrList &filesInTranslationUnit);
+    ClangTUParser(const ClangTUParser &) = delete;
+    ClangTUParser &operator=(const ClangTUParser &) = delete;
+    class Private;
+    std::unique_ptr<Private> p;
+};
+
+/** @brief Wrapper for to let libclang assisted parsing. */
+class ClangParser
+{
+    friend class ClangTUParser;
+  public:
+    /** Returns the one and only instance of the class */
+    static ClangParser *instance();
+    std::unique_ptr<ClangTUParser> createTUParser(const FileDef *fd) const;
+
+  private:
+    const clang::tooling::CompilationDatabase *database() const;
     class Private;
-    Private *p;
+    std::unique_ptr<Private> p;
     ClangParser();
     virtual ~ClangParser();
     static ClangParser *s_instance;