[Lldb-commits] [lldb] r248631 - Moved ClangExpressionHelper.h into the Clang expression parser plug-in.

Sean Callanan via lldb-commits lldb-commits at lists.llvm.org
Fri Sep 25 15:47:08 PDT 2015


Author: spyffe
Date: Fri Sep 25 17:47:07 2015
New Revision: 248631

URL: http://llvm.org/viewvc/llvm-project?rev=248631&view=rev
Log:
Moved ClangExpressionHelper.h into the Clang expression parser plug-in.

Added:
    lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionHelper.h
      - copied unchanged from r248629, lldb/trunk/include/lldb/Expression/ClangExpressionHelper.h
Removed:
    lldb/trunk/include/lldb/Expression/ClangExpressionHelper.h
Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj
    lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h
    lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.h

Removed: lldb/trunk/include/lldb/Expression/ClangExpressionHelper.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangExpressionHelper.h?rev=248630&view=auto
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangExpressionHelper.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangExpressionHelper.h (removed)
@@ -1,79 +0,0 @@
-//===-- ClangExpression.h ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_ClangExpression_h_
-#define liblldb_ClangExpression_h_
-
-// C Includes
-// C++ Includes
-#include <string>
-#include <map>
-#include <vector>
-
-// Other libraries and framework includes
-// Project includes
-
-#include "lldb/lldb-forward.h"
-#include "lldb/lldb-private.h"
-#include "lldb/Core/ClangForward.h"
-#include "lldb/Expression/ExpressionTypeSystemHelper.h"
-
-namespace lldb_private {
-
-class RecordingMemoryManager;
-
-//----------------------------------------------------------------------
-// ClangExpressionHelper
-//----------------------------------------------------------------------
-class ClangExpressionHelper : public ExpressionTypeSystemHelper
-{
-public:
-    static bool classof(const ExpressionTypeSystemHelper *ts)
-    {
-        return ts->getKind() == eKindClangHelper;
-    }
-
-    ClangExpressionHelper () :
-        ExpressionTypeSystemHelper(ExpressionTypeSystemHelper::LLVMCastKind::eKindClangHelper)
-    {
-    }
-
-    //------------------------------------------------------------------
-    /// Destructor
-    //------------------------------------------------------------------
-    virtual ~ClangExpressionHelper ()
-    {
-    }
-    
-    //------------------------------------------------------------------
-    /// Return the object that the parser should use when resolving external
-    /// values.  May be NULL if everything should be self-contained.
-    //------------------------------------------------------------------
-    virtual ClangExpressionDeclMap *
-    DeclMap () = 0;
-    
-    //------------------------------------------------------------------
-    /// Return the object that the parser should allow to access ASTs.
-    /// May be NULL if the ASTs do not need to be transformed.
-    ///
-    /// @param[in] passthrough
-    ///     The ASTConsumer that the returned transformer should send
-    ///     the ASTs to after transformation.
-    //------------------------------------------------------------------
-    virtual clang::ASTConsumer *
-    ASTTransformer (clang::ASTConsumer *passthrough) = 0;
-    
-
-protected:
-
-};
-
-} // namespace lldb_private
-
-#endif  // liblldb_ClangExpression_h_

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=248631&r1=248630&r2=248631&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Sep 25 17:47:07 2015
@@ -1880,7 +1880,7 @@
 		26BC7D8410F1B77400F91463 /* ValueObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueObjectList.h; path = include/lldb/Core/ValueObjectList.h; sourceTree = "<group>"; };
 		26BC7D8510F1B77400F91463 /* ValueObjectVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ValueObjectVariable.h; path = include/lldb/Core/ValueObjectVariable.h; sourceTree = "<group>"; };
 		26BC7D8610F1B77400F91463 /* VMRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VMRange.h; path = include/lldb/Core/VMRange.h; sourceTree = "<group>"; };
-		26BC7DC010F1B79500F91463 /* ClangExpressionHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangExpressionHelper.h; path = include/lldb/Expression/ClangExpressionHelper.h; sourceTree = "<group>"; };
+		26BC7DC010F1B79500F91463 /* ClangExpressionHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClangExpressionHelper.h; path = ExpressionParser/Clang/ClangExpressionHelper.h; sourceTree = "<group>"; };
 		26BC7DC310F1B79500F91463 /* DWARFExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DWARFExpression.h; path = include/lldb/Expression/DWARFExpression.h; sourceTree = "<group>"; };
 		26BC7DD210F1B7D500F91463 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Condition.h; path = include/lldb/Host/Condition.h; sourceTree = "<group>"; };
 		26BC7DD310F1B7D500F91463 /* Endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Endian.h; path = include/lldb/Host/Endian.h; sourceTree = "<group>"; };
@@ -4397,7 +4397,6 @@
 				4C00832C1B9A58A700D5CF24 /* Expression.h */,
 				4C88BC291BA3722B00AA0964 /* Expression.cpp */,
 				4C29E77D1BA2403F00DFF855 /* ExpressionTypeSystemHelper.h */,
-				26BC7DC010F1B79500F91463 /* ClangExpressionHelper.h */,
 				4C00832D1B9A58A700D5CF24 /* FunctionCaller.h */,
 				4C0083321B9A5DE200D5CF24 /* FunctionCaller.cpp */,
 				4C00832E1B9A58A700D5CF24 /* UserExpression.h */,
@@ -5088,6 +5087,7 @@
 			children = (
 				4C98D3E0118FB98F00E575D0 /* ClangFunctionCaller.h */,
 				4C98D3DA118FB96F00E575D0 /* ClangFunctionCaller.cpp */,
+				26BC7DC010F1B79500F91463 /* ClangExpressionHelper.h */,
 				49445E341225AB6A00C11A81 /* ClangUserExpression.h */,
 				26BC7ED510F1B86700F91463 /* ClangUserExpression.cpp */,
 				497C86C1122823F300B54702 /* ClangUtilityFunction.h */,

Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h?rev=248631&r1=248630&r2=248631&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangFunctionCaller.h Fri Sep 25 17:47:07 2015
@@ -16,12 +16,13 @@
 #include <list>
 // Other libraries and framework includes
 // Project includes
+#include "ClangExpressionHelper.h"
+
 #include "lldb/Core/ClangForward.h"
 #include "lldb/Core/Address.h"
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/Value.h"
 #include "lldb/Core/ValueObjectList.h"
-#include "lldb/Expression/ClangExpressionHelper.h"
 #include "lldb/Expression/FunctionCaller.h"
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Target/Process.h"

Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.h?rev=248631&r1=248630&r2=248631&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.h (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangUtilityFunction.h Fri Sep 25 17:47:07 2015
@@ -18,11 +18,11 @@
 
 // Other libraries and framework includes
 // Project includes
+#include "ClangExpressionHelper.h"
 
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-private.h"
 #include "lldb/Core/ClangForward.h"
-#include "lldb/Expression/ClangExpressionHelper.h"
 #include "lldb/Expression/UtilityFunction.h"
 
 namespace lldb_private 




More information about the lldb-commits mailing list