From ea401ec7f402c56cb403c00ae0a7b79b285a0fb8 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Wed, 6 Mar 2019 22:43:25 +0000 Subject: Factor the clang specific parts of ExpressionSourceCode.{h,cpp} into the clang plugin. NFC Differential Revision: https://reviews.llvm.org/D59040 llvm-svn: 355560 --- lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp') diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp index bc725c9af16..10d76d5a23a 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp @@ -21,6 +21,7 @@ #include "ClangDiagnostic.h" #include "ClangExpressionDeclMap.h" #include "ClangExpressionParser.h" +#include "ClangExpressionSourceCode.h" #include "ClangModulesDeclVendor.h" #include "ClangPersistentVariables.h" @@ -404,8 +405,8 @@ void ClangUserExpression::UpdateLanguageForExpr( if (m_options.GetExecutionPolicy() == eExecutionPolicyTopLevel) { m_transformed_text = m_expr_text; } else { - std::unique_ptr source_code( - ExpressionSourceCode::CreateWrapped(prefix.c_str(), + std::unique_ptr source_code( + ClangExpressionSourceCode::CreateWrapped(prefix.c_str(), m_expr_text.c_str())); if (m_in_cplusplus_method) @@ -529,7 +530,7 @@ bool ClangUserExpression::Parse(DiagnosticManager &diagnostic_manager, size_t fixed_end; const std::string &fixed_expression = diagnostic_manager.GetFixedExpression(); - if (ExpressionSourceCode::GetOriginalBodyBounds( + if (ClangExpressionSourceCode::GetOriginalBodyBounds( fixed_expression, m_expr_lang, fixed_start, fixed_end)) m_fixed_text = fixed_expression.substr(fixed_start, fixed_end - fixed_start); -- cgit v1.2.3