This revision was automatically updated to reflect the committed changes.
Closed by commit rL247915: DataFormatters: Rename clang_type to compiler_type.
(authored by brucem).
Changed prior to commit:
http://reviews.llvm.org/D12930?vs=34975&id=35023#toc
Repository:
rL LLVM
http://reviews.llvm.org/D12930
Files:
lldb/trunk/include/lldb/DataFormatters/FormatManager.h
lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h
lldb/trunk/source/DataFormatters/FormatManager.cpp
lldb/trunk/source/DataFormatters/TypeFormat.cpp
lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
Index: lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h
===================================================================
--- lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h
+++ lldb/trunk/include/lldb/DataFormatters/ValueObjectPrinter.h
@@ -413,7 +413,7 @@
Stream *m_stream;
DumpValueObjectOptions options;
Flags m_type_flags;
- CompilerType m_clang_type;
+ CompilerType m_compiler_type;
DumpValueObjectOptions::PointerDepth m_ptr_depth;
uint32_t m_curr_depth;
LazyBool m_should_print;
Index: lldb/trunk/include/lldb/DataFormatters/FormatManager.h
===================================================================
--- lldb/trunk/include/lldb/DataFormatters/FormatManager.h
+++ lldb/trunk/include/lldb/DataFormatters/FormatManager.h
@@ -290,7 +290,7 @@
static void
GetPossibleMatches (ValueObject& valobj,
- CompilerType clang_type,
+ CompilerType compiler_type,
uint32_t reason,
lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries,
Index: lldb/trunk/source/DataFormatters/TypeFormat.cpp
===================================================================
--- lldb/trunk/source/DataFormatters/TypeFormat.cpp
+++ lldb/trunk/source/DataFormatters/TypeFormat.cpp
@@ -91,13 +91,13 @@
}
else
{
- CompilerType clang_type = value.GetCompilerType ();
- if (clang_type)
+ CompilerType compiler_type = value.GetCompilerType ();
+ if (compiler_type)
{
// put custom bytes to display in the DataExtractor to override the default value logic
if (GetFormat() == eFormatCString)
{
- lldb_private::Flags type_flags(clang_type.GetTypeInfo(NULL)); // disambiguate w.r.t. TypeFormatImpl::Flags
+ lldb_private::Flags type_flags(compiler_type.GetTypeInfo(NULL)); // disambiguate w.r.t. TypeFormatImpl::Flags
if (type_flags.Test(eTypeIsPointer) && !type_flags.Test(eTypeIsObjC))
{
// if we are dumping a pointer as a c-string, get the pointee data as a string
@@ -122,7 +122,7 @@
}
StreamString sstr;
- clang_type.DumpTypeValue (&sstr, // The stream to use for display
+ compiler_type.DumpTypeValue (&sstr, // The stream to use for display
GetFormat(), // Format to display this type with
data, // Data to extract from
0, // Byte offset into "m_data"
Index: lldb/trunk/source/DataFormatters/FormatManager.cpp
===================================================================
--- lldb/trunk/source/DataFormatters/FormatManager.cpp
+++ lldb/trunk/source/DataFormatters/FormatManager.cpp
@@ -190,17 +190,17 @@
void
FormatManager::GetPossibleMatches (ValueObject& valobj,
- CompilerType clang_type,
+ CompilerType compiler_type,
uint32_t reason,
lldb::DynamicValueType use_dynamic,
FormattersMatchVector& entries,
bool did_strip_ptr,
bool did_strip_ref,
bool did_strip_typedef,
bool root_level)
{
- clang_type = ClangASTContext::RemoveFastQualifiers(clang_type);
- ConstString type_name(clang_type.GetConstTypeName());
+ compiler_type = ClangASTContext::RemoveFastQualifiers(compiler_type);
+ ConstString type_name(compiler_type.GetConstTypeName());
if (valobj.GetBitfieldBitSize() > 0)
{
StreamString sstring;
@@ -211,13 +211,13 @@
}
entries.push_back({type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef});
- ConstString display_type_name(clang_type.GetDisplayTypeName());
+ ConstString display_type_name(compiler_type.GetDisplayTypeName());
if (display_type_name != type_name)
entries.push_back({display_type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef});
- for (bool is_rvalue_ref = true, j = true; j && clang_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false)
+ for (bool is_rvalue_ref = true, j = true; j && compiler_type.IsReferenceType(nullptr, &is_rvalue_ref); j = false)
{
- CompilerType non_ref_type = clang_type.GetNonReferenceType();
+ CompilerType non_ref_type = compiler_type.GetNonReferenceType();
GetPossibleMatches(valobj,
non_ref_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@@ -241,9 +241,9 @@
}
}
- if (clang_type.IsPointerType())
+ if (compiler_type.IsPointerType())
{
- CompilerType non_ptr_type = clang_type.GetPointeeType();
+ CompilerType non_ptr_type = compiler_type.GetPointeeType();
GetPossibleMatches(valobj,
non_ptr_type,
reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
@@ -282,9 +282,9 @@
}
// try to strip typedef chains
- if (clang_type.IsTypedefType())
+ if (compiler_type.IsTypedefType())
{
- CompilerType deffed_type = clang_type.GetTypedefedType();
+ CompilerType deffed_type = compiler_type.GetTypedefedType();
GetPossibleMatches(valobj,
deffed_type,
reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
@@ -298,15 +298,15 @@
if (root_level)
{
do {
- if (!clang_type.IsValid())
+ if (!compiler_type.IsValid())
break;
- CompilerType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType();
- if (!unqual_clang_ast_type.IsValid())
+ CompilerType unqual_compiler_ast_type = compiler_type.GetFullyUnqualifiedType();
+ if (!unqual_compiler_ast_type.IsValid())
break;
- if (unqual_clang_ast_type.GetOpaqueQualType() != clang_type.GetOpaqueQualType())
+ if (unqual_compiler_ast_type.GetOpaqueQualType() != compiler_type.GetOpaqueQualType())
GetPossibleMatches (valobj,
- unqual_clang_ast_type,
+ unqual_compiler_ast_type,
reason,
use_dynamic,
entries,
Index: lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
===================================================================
--- lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
+++ lldb/trunk/source/DataFormatters/ValueObjectPrinter.cpp
@@ -176,8 +176,8 @@
}
}
}
- m_clang_type = m_valobj->GetCompilerType();
- m_type_flags = m_clang_type.GetTypeInfo ();
+ m_compiler_type = m_valobj->GetCompilerType();
+ m_type_flags = m_compiler_type.GetTypeInfo ();
return true;
}
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
