Skip to content

Commit 50a3f0e

Browse files
committed
[ExpressionParser] Fix formatting and whitespace (NFC)
Fix formatting and whitespace before making changes to this file. llvm-svn: 366852
1 parent b27fc95 commit 50a3f0e

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,12 @@ namespace {
196196
/// the type.
197197
class Completer : public clang::RecursiveASTVisitor<Completer> {
198198
private:
199-
clang::ASTImporter &m_exporter; /// Used to import Decl contents
200-
clang::FileID m_file; /// The file that's going away
201-
llvm::DenseSet<clang::Decl *> m_completed; /// Visited Decls, to avoid cycles
199+
/// Used to import Decl contents
200+
clang::ASTImporter &m_exporter;
201+
/// The file that's going away
202+
clang::FileID m_file;
203+
/// Visited Decls, to avoid cycles
204+
llvm::DenseSet<clang::Decl *> m_completed;
202205

203206
bool ImportAndCheckCompletable(clang::Decl *decl) {
204207
(void)m_exporter.Import(decl);
@@ -237,7 +240,7 @@ class Completer : public clang::RecursiveASTVisitor<Completer> {
237240
public:
238241
Completer(clang::ASTImporter &exporter, clang::FileID file)
239242
: m_exporter(exporter), m_file(file) {}
240-
243+
241244
// Implements the RecursiveASTVisitor's core API. It is called on each Decl
242245
// that the RecursiveASTVisitor encounters, and returns true if the traversal
243246
// should continue.
@@ -246,11 +249,10 @@ class Completer : public clang::RecursiveASTVisitor<Completer> {
246249
return true;
247250
}
248251
};
249-
}
252+
} // namespace
250253

251254
static void CompleteAllDeclContexts(clang::ASTImporter &exporter,
252-
clang::FileID file,
253-
clang::QualType root) {
255+
clang::FileID file, clang::QualType root) {
254256
clang::QualType canonical_type = root.getCanonicalType();
255257
if (clang::TagDecl *tag_decl = canonical_type->getAsTagDecl()) {
256258
Completer(exporter, file).TraverseDecl(tag_decl);
@@ -263,12 +265,12 @@ static void CompleteAllDeclContexts(clang::ASTImporter &exporter,
263265
}
264266

265267
static clang::QualType ExportAllDeclaredTypes(
266-
clang::ExternalASTMerger &merger,
267-
clang::ASTContext &source, clang::FileManager &source_file_manager,
268+
clang::ExternalASTMerger &merger, clang::ASTContext &source,
269+
clang::FileManager &source_file_manager,
268270
const clang::ExternalASTMerger::OriginMap &source_origin_map,
269271
clang::FileID file, clang::QualType root) {
270-
clang::ExternalASTMerger::ImporterSource importer_source =
271-
{ source, source_file_manager, source_origin_map };
272+
clang::ExternalASTMerger::ImporterSource importer_source = {
273+
source, source_file_manager, source_origin_map};
272274
merger.AddSources(importer_source);
273275
clang::ASTImporter &exporter = merger.ImporterForOrigin(source);
274276
CompleteAllDeclContexts(exporter, file, root);
@@ -286,10 +288,10 @@ static clang::QualType ExportAllDeclaredTypes(
286288
TypeFromUser ClangExpressionDeclMap::DeportType(ClangASTContext &target,
287289
ClangASTContext &source,
288290
TypeFromParser parser_type) {
289-
assert (&target == m_target->GetScratchClangASTContext());
290-
assert ((TypeSystem*)&source == parser_type.GetTypeSystem());
291-
assert (source.getASTContext() == m_ast_context);
292-
291+
assert(&target == m_target->GetScratchClangASTContext());
292+
assert((TypeSystem *)&source == parser_type.GetTypeSystem());
293+
assert(source.getASTContext() == m_ast_context);
294+
293295
if (m_ast_importer_sp) {
294296
return TypeFromUser(m_ast_importer_sp->DeportType(
295297
target.getASTContext(), source.getASTContext(),
@@ -299,13 +301,11 @@ TypeFromUser ClangExpressionDeclMap::DeportType(ClangASTContext &target,
299301
clang::FileID source_file =
300302
source.getASTContext()->getSourceManager().getFileID(
301303
source.getASTContext()->getTranslationUnitDecl()->getLocation());
302-
auto scratch_ast_context = static_cast<ClangASTContextForExpressions*>(
304+
auto scratch_ast_context = static_cast<ClangASTContextForExpressions *>(
303305
m_target->GetScratchClangASTContext());
304306
clang::QualType exported_type = ExportAllDeclaredTypes(
305-
scratch_ast_context->GetMergerUnchecked(),
306-
*source.getASTContext(), *source.getFileManager(),
307-
m_merger_up->GetOrigins(),
308-
source_file,
307+
scratch_ast_context->GetMergerUnchecked(), *source.getASTContext(),
308+
*source.getFileManager(), m_merger_up->GetOrigins(), source_file,
309309
clang::QualType::getFromOpaquePtr(parser_type.GetOpaqueQualType()));
310310
return TypeFromUser(exported_type.getAsOpaquePtr(), &target);
311311
} else {
@@ -828,7 +828,7 @@ void ClangExpressionDeclMap::FindExternalVisibleDecls(
828828
log->Printf(" CEDM::FEVD[%u] Inspecting (NamespaceMap*)%p (%d entries)",
829829
current_id, static_cast<void *>(namespace_map.get()),
830830
(int)namespace_map->size());
831-
831+
832832
for (ClangASTImporter::NamespaceMap::iterator i = namespace_map->begin(),
833833
e = namespace_map->end();
834834
i != e; ++i) {
@@ -848,7 +848,7 @@ void ClangExpressionDeclMap::FindExternalVisibleDecls(
848848
FindExternalVisibleDecls(context, lldb::ModuleSP(), namespace_decl,
849849
current_id);
850850
}
851-
851+
852852
ClangASTSource::FindExternalVisibleDecls(context);
853853
}
854854

@@ -1048,7 +1048,7 @@ void ClangExpressionDeclMap::FindExternalVisibleDecls(
10481048
return;
10491049

10501050
AddOneType(context, TypeFromUser(m_ctx_obj->GetCompilerType()),
1051-
current_id);
1051+
current_id);
10521052

10531053
m_struct_vars->m_object_pointer_type =
10541054
TypeFromUser(ctx_obj_ptr->GetCompilerType());
@@ -1858,7 +1858,7 @@ bool ClangExpressionDeclMap::ResolveUnknownTypes() {
18581858
Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr();
18591859

18601860
ClangASTContextForExpressions *scratch_ast_context =
1861-
static_cast<ClangASTContextForExpressions*>(
1861+
static_cast<ClangASTContextForExpressions *>(
18621862
target->GetScratchClangASTContext());
18631863

18641864
for (size_t index = 0, num_entities = m_found_entities.GetSize();
@@ -1897,9 +1897,9 @@ bool ClangExpressionDeclMap::ResolveUnknownTypes() {
18971897
var_type.getAsOpaquePtr());
18981898
} else if (HasMerger()) {
18991899
copied_type = CopyTypeWithMerger(
1900-
var_decl->getASTContext(),
1901-
scratch_ast_context->GetMergerUnchecked(),
1902-
var_type).getAsOpaquePtr();
1900+
var_decl->getASTContext(),
1901+
scratch_ast_context->GetMergerUnchecked(), var_type)
1902+
.getAsOpaquePtr();
19031903
} else {
19041904
lldbassert(0 && "No mechanism to copy a resolved unknown type!");
19051905
return false;
@@ -2016,24 +2016,24 @@ void ClangExpressionDeclMap::AddOneFunction(NameSearchContext &context,
20162016
if (copied_function_template) {
20172017
if (log) {
20182018
ASTDumper ast_dumper((clang::Decl *)copied_function_template);
2019-
2019+
20202020
StreamString ss;
2021-
2021+
20222022
function->DumpSymbolContext(&ss);
2023-
2023+
20242024
log->Printf(" CEDM::FEVD[%u] Imported decl for function template"
20252025
" %s (description %s), returned %s",
20262026
current_id,
20272027
copied_function_template->getNameAsString().c_str(),
20282028
ss.GetData(), ast_dumper.GetCString());
20292029
}
2030-
2030+
20312031
context.AddNamedDecl(copied_function_template);
20322032
}
20332033
} else if (src_function_decl) {
20342034
if (clang::FunctionDecl *copied_function_decl =
20352035
llvm::dyn_cast_or_null<clang::FunctionDecl>(
2036-
CopyDecl(src_function_decl))) {
2036+
CopyDecl(src_function_decl))) {
20372037
if (log) {
20382038
ASTDumper ast_dumper((clang::Decl *)copied_function_decl);
20392039

0 commit comments

Comments
 (0)