Hide DeclCollectorPPAdapter and use DeclCollector for setup.

No need for these details to be public.

Author: marsupial

interpreter/cling/lib/Interpreter/DeclCollector.cpp

@@ -18,6 +18,7 @@
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/DeclGroup.h"
 #include "clang/Lex/MacroInfo.h"
+#include "clang/Lex/Preprocessor.h"
 #include "clang/Lex/Token.h"
 
 using namespace clang;
@@ -59,6 +60,45 @@ namespace {
 }
 
 namespace cling {
+  ///\brief Serves as DeclCollector's connector to the PPCallbacks interface.
+  ///
+  class DeclCollector::PPAdapter : public clang::PPCallbacks {
+    cling::DeclCollector* m_Parent;
+
+    void MacroDirective(const clang::Token& MacroNameTok,
+                        const clang::MacroDirective* MD) {
+      assert(m_Parent->m_CurTransaction && "Missing transction");
+      Transaction::MacroDirectiveInfo MDE(MacroNameTok.getIdentifierInfo(), MD);
+      m_Parent->m_CurTransaction->append(MDE);
+    }
+
+  public:
+    PPAdapter(cling::DeclCollector* P) : m_Parent(P) {}
+
+    /// \name PPCallbacks overrides
+    /// Macro support
+    void MacroDefined(const clang::Token& MacroNameTok,
+                      const clang::MacroDirective* MD) final {
+      MacroDirective(MacroNameTok, MD);
+    }
+
+    /// \name PPCallbacks overrides
+    /// Macro support
+    void MacroUndefined(const clang::Token& MacroNameTok,
+                        const clang::MacroDefinition& MD,
+                        const clang::MacroDirective* Undef) final {
+      if (Undef)
+        MacroDirective(MacroNameTok, Undef);
+    }
+  };
+
+  void DeclCollector::Setup(IncrementalParser* IncrParser, ASTConsumer* Consumer,
+                            clang::Preprocessor& PP) {
+    m_IncrParser = IncrParser;
+    m_Consumer = Consumer;
+    PP.addPPCallbacks(std::unique_ptr<PPCallbacks>(new PPAdapter(this)));
+  }
+  
   bool DeclCollector::comesFromASTReader(DeclGroupRef DGR) const {
     assert(!DGR.isNull() && "DeclGroupRef is Null!");
     assert(m_CurTransaction && "No current transaction when deserializing");
@@ -271,26 +311,4 @@ namespace cling {
     m_Consumer->HandleCXXStaticMemberVarInstantiation(D);
   }
 
-  void DeclCollector::MacroDirective(const clang::Token &MacroNameTok,
-                                     const clang::MacroDirective *MD) {
-    assert(m_CurTransaction && "Missing transction");
-    Transaction::MacroDirectiveInfo MDE(MacroNameTok.getIdentifierInfo(), MD);
-    m_CurTransaction->append(MDE);
-  }
-
-  void
-  DeclCollectorPPAdapter::MacroDefined(const clang::Token &MacroNameTok,
-                                       const clang::MacroDirective *MD) {
-    m_parent->MacroDirective(MacroNameTok, MD);
-  }
-
-  void
-  DeclCollectorPPAdapter::MacroUndefined(const clang::Token &MacroNameTok,
-                                         const clang::MacroDefinition &MD,
-                                         const clang::MacroDirective *Undef) {
-    // If Undef is null, the macro was never defined
-    if (Undef)
-      m_parent->MacroDirective(MacroNameTok, Undef);
-  }
-
 } // namespace cling

interpreter/cling/lib/Interpreter/DeclCollector.h

@@ -11,7 +11,6 @@
 #define CLING_DECL_COLLECTOR_H
 
 #include "clang/AST/ASTConsumer.h"
-#include "clang/Lex/PPCallbacks.h"
 
 #include "ASTTransformer.h"
 
@@ -23,6 +22,7 @@ namespace clang {
   class CodeGenerator;
   class Decl;
   class DeclGroupRef;
+  class Preprocessor;
   class Token;
 }
 
@@ -34,36 +34,16 @@ namespace cling {
   class IncrementalParser;
   class Transaction;
 
-  ///\brief Serves as DeclCollector's connector to the PPCallbacks interface.
-  ///
-  class DeclCollectorPPAdapter: public clang::PPCallbacks {
-    DeclCollector* m_parent;
-  public:
-    DeclCollectorPPAdapter(DeclCollector* parent):
-      m_parent(parent)
-    {}
-
-    /// \name PPCallbacks overrides
-    /// Macro support
-    void MacroDefined(const clang::Token &MacroNameTok,
-                      const clang::MacroDirective *MD) final;
-    /// \}
-
-    /// \name PPCallbacks overrides
-    /// Macro support
-    void MacroUndefined(const clang::Token &MacroNameTok,
-                        const clang::MacroDefinition &MD,
-                        const clang::MacroDirective *Undef) final;
-  };
-
   ///\brief Collects declarations and fills them in cling::Transaction.
   ///
   /// cling::Transaction becomes is a main building block in the interpreter.
   /// cling::DeclCollector is responsible for appending all the declarations
   /// seen by clang.
   ///
-  class DeclCollector: public clang::ASTConsumer  {
-  private:
+  class DeclCollector : public clang::ASTConsumer {
+    /// \brief PPCallbacks overrides/ Macro support
+    class PPAdapter;
+
     ///\brief Contains the transaction AST transformers.
     ///
     std::vector<std::unique_ptr<ASTTransformer>> m_TransactionTransformers;
@@ -99,11 +79,6 @@ namespace cling {
 
     virtual ~DeclCollector();
 
-    std::unique_ptr<DeclCollectorPPAdapter> MakePPAdapter() {
-      return std::unique_ptr<DeclCollectorPPAdapter>
-        (new DeclCollectorPPAdapter(this));
-    }
-
     void SetTransformers(std::vector<std::unique_ptr<ASTTransformer>>&& allTT,
                       std::vector<std::unique_ptr<WrapperTransformer>>&& allWT){
       m_TransactionTransformers.swap(allTT);
@@ -114,16 +89,8 @@ namespace cling {
         WT->SetConsumer(this);
     }
 
-    void setContext(IncrementalParser* IncrParser, ASTConsumer* Consumer) {
-      m_IncrParser = IncrParser;
-      m_Consumer = Consumer;
-    }
-
-    /// \name PPCallbacks overrides
-    /// Macro support
-    void MacroDirective(const clang::Token &MacroNameTok,
-                        const clang::MacroDirective *MD);
-    /// \}
+    void Setup(IncrementalParser* IncrParser, ASTConsumer* Consumer,
+               clang::Preprocessor& PP);
 
     /// \{
     /// \name ASTConsumer overrides

interpreter/cling/lib/Interpreter/IncrementalParser.cpp

@@ -181,20 +181,18 @@ namespace cling {
       cling::errs() << "No AST consumer available.\n";
       return;
     }
-    // Add the callback keeping track of the macro definitions.
-    m_CI->getPreprocessor().addPPCallbacks(m_Consumer->MakePPAdapter());
 
     DiagnosticsEngine& Diag = m_CI->getDiagnostics();
     if (m_CI->getFrontendOpts().ProgramAction != frontend::ParseSyntaxOnly) {
       m_CodeGen.reset(CreateLLVMCodeGen(
           Diag, makeModuleName(), m_CI->getHeaderSearchOpts(),
           m_CI->getPreprocessorOpts(), m_CI->getCodeGenOpts(),
           *m_Interpreter->getLLVMContext()));
-      m_Consumer->setContext(this, m_CodeGen.get());
-    } else {
-      m_Consumer->setContext(this, 0);
     }
 
+    // Initialize the DeclCollector and add callbacks keeping track of macros.
+    m_Consumer->Setup(this, m_CodeGen.get(), m_CI->getPreprocessor());
+
     m_DiagConsumer.reset(new FilteringDiagConsumer(Diag, false));
 
     initializeVirtualFile();