Author: enrico
Date: Thu Nov 6 15:55:30 2014
New Revision: 221486
URL: http://llvm.org/viewvc/llvm-project?rev=221486&view=rev
Log:
This is a large, but clearical, commit that enables the C++ formatters to take
on the additional TypeSummaryOptions argument. It is still not used for
anything, but it is now there. Adding support for this extra argument to Python
formatters will follow suit
Modified:
lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h
lldb/trunk/include/lldb/DataFormatters/TypeSummary.h
lldb/trunk/source/Core/Debugger.cpp
lldb/trunk/source/Core/ValueObject.cpp
lldb/trunk/source/DataFormatters/CF.cpp
lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp
lldb/trunk/source/DataFormatters/Cocoa.cpp
lldb/trunk/source/DataFormatters/LibCxx.cpp
lldb/trunk/source/DataFormatters/NSArray.cpp
lldb/trunk/source/DataFormatters/NSDictionary.cpp
lldb/trunk/source/DataFormatters/NSSet.cpp
lldb/trunk/source/DataFormatters/TypeSummary.cpp
Modified: lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/CXXFormatterFunctions.h Thu Nov 6
15:55:30 2014
@@ -61,127 +61,127 @@ namespace lldb_private {
GetOSXEpoch ();
bool
- Char16StringSummaryProvider (ValueObject& valobj, Stream& stream); //
char16_t* and unichar*
+ Char16StringSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options); // char16_t* and unichar*
bool
- Char32StringSummaryProvider (ValueObject& valobj, Stream& stream); //
char32_t*
+ Char32StringSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options); // char32_t*
bool
- WCharStringSummaryProvider (ValueObject& valobj, Stream& stream); //
wchar_t*
+ WCharStringSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options); // wchar_t*
bool
- Char16SummaryProvider (ValueObject& valobj, Stream& stream); //
char16_t and unichar
+ Char16SummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options); // char16_t and unichar
bool
- Char32SummaryProvider (ValueObject& valobj, Stream& stream); //
char32_t
+ Char32SummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options); // char32_t
bool
- WCharSummaryProvider (ValueObject& valobj, Stream& stream); // wchar_t
+ WCharSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options); // wchar_t
bool
- LibcxxStringSummaryProvider (ValueObject& valobj, Stream& stream); //
libc++ std::string
+ LibcxxStringSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options); // libc++ std::string
bool
- LibcxxWStringSummaryProvider (ValueObject& valobj, Stream& stream); //
libc++ std::wstring
+ LibcxxWStringSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options); // libc++ std::wstring
bool
- LibcxxSmartPointerSummaryProvider (ValueObject& valobj, Stream&
stream); // libc++ std::shared_ptr<> and std::weak_ptr<>
+ LibcxxSmartPointerSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options); // libc++ std::shared_ptr<> and
std::weak_ptr<>
bool
- ObjCClassSummaryProvider (ValueObject& valobj, Stream& stream);
+ ObjCClassSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
SyntheticChildrenFrontEnd* ObjCClassSyntheticFrontEndCreator
(CXXSyntheticChildren*, lldb::ValueObjectSP);
template<bool name_entries>
bool
- NSDictionarySummaryProvider (ValueObject& valobj, Stream& stream);
+ NSDictionarySummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options);
bool
- NSIndexSetSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSIndexSetSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- NSArraySummaryProvider (ValueObject& valobj, Stream& stream);
+ NSArraySummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
template<bool cf_style>
bool
- NSSetSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSSetSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
template<bool needs_at>
bool
- NSDataSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSDataSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- NSNumberSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSNumberSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- NSNotificationSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSNotificationSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options);
bool
- NSTimeZoneSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSTimeZoneSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- NSMachPortSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSMachPortSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- CFBagSummaryProvider (ValueObject& valobj, Stream& stream);
+ CFBagSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- CFBinaryHeapSummaryProvider (ValueObject& valobj, Stream& stream);
+ CFBinaryHeapSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options);
bool
- CFBitVectorSummaryProvider (ValueObject& valobj, Stream& stream);
+ CFBitVectorSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- NSDateSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSDateSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- CFAbsoluteTimeSummaryProvider (ValueObject& valobj, Stream& stream);
+ CFAbsoluteTimeSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options);
bool
- NSBundleSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSBundleSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- NSStringSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSStringSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
NSTaggedString_SummaryProvider (ObjCLanguageRuntime::ClassDescriptorSP
descriptor, Stream& stream);
bool
- NSAttributedStringSummaryProvider (ValueObject& valobj, Stream&
stream);
+ NSAttributedStringSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options);
bool
- NSMutableAttributedStringSummaryProvider (ValueObject& valobj, Stream&
stream);
+ NSMutableAttributedStringSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options);
bool
- NSURLSummaryProvider (ValueObject& valobj, Stream& stream);
+ NSURLSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- ObjCBOOLSummaryProvider (ValueObject& valobj, Stream& stream);
+ ObjCBOOLSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
template <bool is_sel_ptr>
bool
- ObjCSELSummaryProvider (ValueObject& valobj, Stream& stream);
+ ObjCSELSummaryProvider (ValueObject& valobj, Stream& stream, const
TypeSummaryOptions& options);
bool
- RuntimeSpecificDescriptionSummaryProvider (ValueObject& valobj,
Stream& stream);
+ RuntimeSpecificDescriptionSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options);
extern template bool
- NSDictionarySummaryProvider<true> (ValueObject&, Stream&) ;
+ NSDictionarySummaryProvider<true> (ValueObject&, Stream&, const
TypeSummaryOptions&) ;
extern template bool
- NSDictionarySummaryProvider<false> (ValueObject&, Stream&) ;
+ NSDictionarySummaryProvider<false> (ValueObject&, Stream&, const
TypeSummaryOptions&) ;
extern template bool
- NSDataSummaryProvider<true> (ValueObject&, Stream&) ;
+ NSDataSummaryProvider<true> (ValueObject&, Stream&, const
TypeSummaryOptions&) ;
extern template bool
- NSDataSummaryProvider<false> (ValueObject&, Stream&) ;
+ NSDataSummaryProvider<false> (ValueObject&, Stream&, const
TypeSummaryOptions&) ;
extern template bool
- ObjCSELSummaryProvider<true> (ValueObject&, Stream&);
+ ObjCSELSummaryProvider<true> (ValueObject&, Stream&, const
TypeSummaryOptions&);
extern template bool
- ObjCSELSummaryProvider<false> (ValueObject&, Stream&);
+ ObjCSELSummaryProvider<false> (ValueObject&, Stream&, const
TypeSummaryOptions&);
SyntheticChildrenFrontEnd* NSArraySyntheticFrontEndCreator
(CXXSyntheticChildren*, lldb::ValueObjectSP);
@@ -224,7 +224,7 @@ namespace lldb_private {
SyntheticChildrenFrontEnd* LibcxxVectorBoolSyntheticFrontEndCreator
(CXXSyntheticChildren*, lldb::ValueObjectSP);
bool
- LibcxxContainerSummaryProvider (ValueObject& valobj, Stream& stream);
+ LibcxxContainerSummaryProvider (ValueObject& valobj, Stream& stream,
const TypeSummaryOptions& options);
class LibstdcppVectorBoolSyntheticFrontEnd : public
SyntheticChildrenFrontEnd
{
Modified: lldb/trunk/include/lldb/DataFormatters/TypeSummary.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/DataFormatters/TypeSummary.h?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/include/lldb/DataFormatters/TypeSummary.h (original)
+++ lldb/trunk/include/lldb/DataFormatters/TypeSummary.h Thu Nov 6 15:55:30
2014
@@ -339,7 +339,8 @@ namespace lldb_private {
// for us to generate its summary
virtual bool
FormatObject (ValueObject *valobj,
- std::string& dest) = 0;
+ std::string& dest,
+ const TypeSummaryOptions& options) = 0;
virtual std::string
GetDescription () = 0;
@@ -398,7 +399,8 @@ namespace lldb_private {
virtual bool
FormatObject(ValueObject *valobj,
- std::string& dest);
+ std::string& dest,
+ const TypeSummaryOptions& options);
virtual std::string
GetDescription();
@@ -423,10 +425,11 @@ namespace lldb_private {
// summaries implemented via a C++ function
struct CXXFunctionSummaryFormat : public TypeSummaryImpl
{
-
// we should convert these to SBValue and SBStream if we ever cross
// the boundary towards the external world
- typedef bool (*Callback)(ValueObject& valobj, Stream& dest);
+ typedef bool (*Callback)(ValueObject&,
+ Stream&,
+ const TypeSummaryOptions&);
Callback m_impl;
std::string m_description;
@@ -469,7 +472,8 @@ namespace lldb_private {
virtual bool
FormatObject (ValueObject *valobj,
- std::string& dest);
+ std::string& dest,
+ const TypeSummaryOptions& options);
virtual std::string
GetDescription ();
@@ -543,7 +547,8 @@ namespace lldb_private {
virtual bool
FormatObject (ValueObject *valobj,
- std::string& dest);
+ std::string& dest,
+ const TypeSummaryOptions& options);
virtual std::string
GetDescription ();
Modified: lldb/trunk/source/Core/Debugger.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/Core/Debugger.cpp (original)
+++ lldb/trunk/source/Core/Debugger.cpp Thu Nov 6 15:55:30 2014
@@ -2490,7 +2490,7 @@ FormatPromptRecurse
.SetHideItemNames(false)
.SetShowMembersOneLiner(true),
"");
-
format.FormatObject(var_value_sp.get(), buffer);
+
format.FormatObject(var_value_sp.get(), buffer, TypeSummaryOptions());
var_representation
= buffer.c_str();
}
else
Modified: lldb/trunk/source/Core/ValueObject.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Thu Nov 6 15:55:30 2014
@@ -872,7 +872,7 @@ ValueObject::GetSummaryAsCString (TypeSu
{
if (HasSyntheticValue())
m_synthetic_value->UpdateValueIfNeeded(); // the summary might
depend on the synthetic children being up-to-date (e.g. ${svar%#})
- summary_ptr->FormatObject(this, destination);
+ summary_ptr->FormatObject(this, destination, options);
}
else
{
Modified: lldb/trunk/source/DataFormatters/CF.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/CF.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/CF.cpp (original)
+++ lldb/trunk/source/DataFormatters/CF.cpp Thu Nov 6 15:55:30 2014
@@ -26,7 +26,7 @@ using namespace lldb_private;
using namespace lldb_private::formatters;
bool
-lldb_private::formatters::CFAbsoluteTimeSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::CFAbsoluteTimeSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
time_t epoch = GetOSXEpoch();
epoch = epoch + (time_t)valobj.GetValueAsUnsigned(0);
@@ -41,7 +41,7 @@ lldb_private::formatters::CFAbsoluteTime
}
bool
-lldb_private::formatters::CFBagSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::CFBagSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -105,7 +105,7 @@ lldb_private::formatters::CFBagSummaryPr
}
bool
-lldb_private::formatters::CFBitVectorSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::CFBitVectorSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -235,7 +235,7 @@ lldb_private::formatters::CFBitVectorSum
}
bool
-lldb_private::formatters::CFBinaryHeapSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::CFBinaryHeapSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
Modified: lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp (original)
+++ lldb/trunk/source/DataFormatters/CXXFormatterFunctions.cpp Thu Nov 6
15:55:30 2014
@@ -191,7 +191,7 @@ lldb_private::formatters::CallSelectorOn
}
bool
-lldb_private::formatters::Char16StringSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::Char16StringSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions&)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -218,7 +218,7 @@ lldb_private::formatters::Char16StringSu
}
bool
-lldb_private::formatters::Char32StringSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::Char32StringSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions&)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -245,7 +245,7 @@ lldb_private::formatters::Char32StringSu
}
bool
-lldb_private::formatters::WCharStringSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::WCharStringSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions&)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -291,7 +291,7 @@ lldb_private::formatters::WCharStringSum
}
bool
-lldb_private::formatters::Char16SummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::Char16SummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions&)
{
DataExtractor data;
Error error;
@@ -316,7 +316,7 @@ lldb_private::formatters::Char16SummaryP
}
bool
-lldb_private::formatters::Char32SummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::Char32SummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions&)
{
DataExtractor data;
Error error;
@@ -341,7 +341,7 @@ lldb_private::formatters::Char32SummaryP
}
bool
-lldb_private::formatters::WCharSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::WCharSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions&)
{
DataExtractor data;
Error error;
@@ -443,7 +443,7 @@ ExtractLibcxxStringInfo (ValueObject& va
}
bool
-lldb_private::formatters::LibcxxWStringSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::LibcxxWStringSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
uint64_t size = 0;
ValueObjectSP location_sp((ValueObject*)nullptr);
@@ -456,11 +456,11 @@ lldb_private::formatters::LibcxxWStringS
}
if (!location_sp)
return false;
- return WCharStringSummaryProvider(*location_sp.get(), stream);
+ return WCharStringSummaryProvider(*location_sp.get(), stream, options);
}
bool
-lldb_private::formatters::LibcxxStringSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::LibcxxStringSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions&)
{
uint64_t size = 0;
ValueObjectSP location_sp((ValueObject*)nullptr);
@@ -493,7 +493,7 @@ lldb_private::formatters::LibcxxStringSu
}
bool
-lldb_private::formatters::ObjCClassSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::ObjCClassSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -570,7 +570,7 @@ lldb_private::formatters::ObjCClassSynth
template<bool needs_at>
bool
-lldb_private::formatters::NSDataSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::NSDataSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -742,7 +742,7 @@ GetNSPathStore2Type (Target &target)
}
bool
-lldb_private::formatters::NSStringSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSStringSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -940,7 +940,7 @@ lldb_private::formatters::NSStringSummar
}
bool
-lldb_private::formatters::NSAttributedStringSummaryProvider (ValueObject&
valobj, Stream& stream)
+lldb_private::formatters::NSAttributedStringSummaryProvider (ValueObject&
valobj, Stream& stream, const TypeSummaryOptions& options)
{
TargetSP target_sp(valobj.GetTargetSP());
if (!target_sp)
@@ -963,25 +963,25 @@ lldb_private::formatters::NSAttributedSt
ValueObjectSP
child_sp(child_ptr_sp->CreateValueObjectFromData("string_data", data, exe_ctx,
type));
child_sp->GetValueAsUnsigned(0);
if (child_sp)
- return NSStringSummaryProvider(*child_sp, stream);
+ return NSStringSummaryProvider(*child_sp, stream, options);
return false;
}
bool
-lldb_private::formatters::NSMutableAttributedStringSummaryProvider
(ValueObject& valobj, Stream& stream)
+lldb_private::formatters::NSMutableAttributedStringSummaryProvider
(ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options)
{
- return NSAttributedStringSummaryProvider(valobj, stream);
+ return NSAttributedStringSummaryProvider(valobj, stream, options);
}
bool
-lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider
(ValueObject& valobj, Stream& stream)
+lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider
(ValueObject& valobj, Stream& stream, const TypeSummaryOptions& options)
{
stream.Printf("%s",valobj.GetObjectDescription());
return true;
}
bool
-lldb_private::formatters::ObjCBOOLSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::ObjCBOOLSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
const uint32_t type_info = valobj.GetClangType().GetTypeInfo();
@@ -1012,7 +1012,7 @@ lldb_private::formatters::ObjCBOOLSummar
template <bool is_sel_ptr>
bool
-lldb_private::formatters::ObjCSELSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::ObjCSELSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
lldb::ValueObjectSP valobj_sp;
@@ -1159,13 +1159,13 @@ lldb_private::formatters::VectorIterator
}
template bool
-lldb_private::formatters::NSDataSummaryProvider<true> (ValueObject&, Stream&) ;
+lldb_private::formatters::NSDataSummaryProvider<true> (ValueObject&, Stream&,
const TypeSummaryOptions&) ;
template bool
-lldb_private::formatters::NSDataSummaryProvider<false> (ValueObject&, Stream&)
;
+lldb_private::formatters::NSDataSummaryProvider<false> (ValueObject&, Stream&,
const TypeSummaryOptions&) ;
template bool
-lldb_private::formatters::ObjCSELSummaryProvider<true> (ValueObject&, Stream&)
;
+lldb_private::formatters::ObjCSELSummaryProvider<true> (ValueObject&, Stream&,
const TypeSummaryOptions&) ;
template bool
-lldb_private::formatters::ObjCSELSummaryProvider<false> (ValueObject&,
Stream&) ;
+lldb_private::formatters::ObjCSELSummaryProvider<false> (ValueObject&,
Stream&, const TypeSummaryOptions&) ;
Modified: lldb/trunk/source/DataFormatters/Cocoa.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/Cocoa.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/Cocoa.cpp (original)
+++ lldb/trunk/source/DataFormatters/Cocoa.cpp Thu Nov 6 15:55:30 2014
@@ -26,7 +26,7 @@ using namespace lldb_private;
using namespace lldb_private::formatters;
bool
-lldb_private::formatters::NSBundleSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSBundleSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -60,7 +60,7 @@ lldb_private::formatters::NSBundleSummar
ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset,
valobj.GetClangType().GetBasicTypeFromAST(lldb::eBasicTypeObjCID), true));
StreamString summary_stream;
- bool was_nsstring_ok = NSStringSummaryProvider(*text.get(),
summary_stream);
+ bool was_nsstring_ok = NSStringSummaryProvider(*text.get(),
summary_stream, options);
if (was_nsstring_ok && summary_stream.GetSize() > 0)
{
stream.Printf("%s",summary_stream.GetData());
@@ -73,7 +73,7 @@ lldb_private::formatters::NSBundleSummar
}
bool
-lldb_private::formatters::NSTimeZoneSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSTimeZoneSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -106,7 +106,7 @@ lldb_private::formatters::NSTimeZoneSumm
uint64_t offset = ptr_size;
ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset,
valobj.GetClangType(), true));
StreamString summary_stream;
- bool was_nsstring_ok = NSStringSummaryProvider(*text.get(),
summary_stream);
+ bool was_nsstring_ok = NSStringSummaryProvider(*text.get(),
summary_stream, options);
if (was_nsstring_ok && summary_stream.GetSize() > 0)
{
stream.Printf("%s",summary_stream.GetData());
@@ -117,7 +117,7 @@ lldb_private::formatters::NSTimeZoneSumm
}
bool
-lldb_private::formatters::NSNotificationSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSNotificationSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -150,7 +150,7 @@ lldb_private::formatters::NSNotification
uint64_t offset = ptr_size;
ValueObjectSP text(valobj.GetSyntheticChildAtOffset(offset,
valobj.GetClangType(), true));
StreamString summary_stream;
- bool was_nsstring_ok = NSStringSummaryProvider(*text.get(),
summary_stream);
+ bool was_nsstring_ok = NSStringSummaryProvider(*text.get(),
summary_stream, options);
if (was_nsstring_ok && summary_stream.GetSize() > 0)
{
stream.Printf("%s",summary_stream.GetData());
@@ -163,7 +163,7 @@ lldb_private::formatters::NSNotification
}
bool
-lldb_private::formatters::NSMachPortSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSMachPortSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -212,7 +212,7 @@ lldb_private::formatters::NSMachPortSumm
}
bool
-lldb_private::formatters::NSIndexSetSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSIndexSetSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -290,7 +290,7 @@ lldb_private::formatters::NSIndexSetSumm
}
bool
-lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSNumberSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -413,7 +413,7 @@ lldb_private::formatters::NSNumberSummar
}
bool
-lldb_private::formatters::NSURLSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::NSURLSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -453,7 +453,7 @@ lldb_private::formatters::NSURLSummaryPr
if (text->GetValueAsUnsigned(0) == 0)
return false;
StreamString summary;
- if (!NSStringSummaryProvider(*text, summary))
+ if (!NSStringSummaryProvider(*text, summary, options))
return false;
if (base && base->GetValueAsUnsigned(0))
{
@@ -461,7 +461,7 @@ lldb_private::formatters::NSURLSummaryPr
summary.GetString().resize(summary.GetSize()-1);
summary.Printf(" -- ");
StreamString base_summary;
- if (NSURLSummaryProvider(*base, base_summary) &&
base_summary.GetSize() > 0)
+ if (NSURLSummaryProvider(*base, base_summary, options) &&
base_summary.GetSize() > 0)
summary.Printf("%s",base_summary.GetSize() > 2 ?
base_summary.GetData() + 2 : base_summary.GetData());
}
if (summary.GetSize())
@@ -478,7 +478,7 @@ lldb_private::formatters::NSURLSummaryPr
}
bool
-lldb_private::formatters::NSDateSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::NSDateSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
Modified: lldb/trunk/source/DataFormatters/LibCxx.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/LibCxx.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/LibCxx.cpp (original)
+++ lldb/trunk/source/DataFormatters/LibCxx.cpp Thu Nov 6 15:55:30 2014
@@ -27,7 +27,7 @@ using namespace lldb_private;
using namespace lldb_private::formatters;
bool
-lldb_private::formatters::LibcxxSmartPointerSummaryProvider (ValueObject&
valobj, Stream& stream)
+lldb_private::formatters::LibcxxSmartPointerSummaryProvider (ValueObject&
valobj, Stream& stream, const TypeSummaryOptions& options)
{
ValueObjectSP valobj_sp(valobj.GetNonSyntheticValue());
if (!valobj_sp)
@@ -451,7 +451,7 @@ lldb_private::formatters::LibcxxSharedPt
}
bool
-lldb_private::formatters::LibcxxContainerSummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::LibcxxContainerSummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
if (valobj.IsPointerType())
{
Modified: lldb/trunk/source/DataFormatters/NSArray.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/NSArray.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/NSArray.cpp (original)
+++ lldb/trunk/source/DataFormatters/NSArray.cpp Thu Nov 6 15:55:30 2014
@@ -228,7 +228,7 @@ namespace lldb_private {
}
bool
-lldb_private::formatters::NSArraySummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::NSArraySummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
Modified: lldb/trunk/source/DataFormatters/NSDictionary.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/NSDictionary.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/NSDictionary.cpp (original)
+++ lldb/trunk/source/DataFormatters/NSDictionary.cpp Thu Nov 6 15:55:30 2014
@@ -196,7 +196,7 @@ namespace lldb_private {
template<bool name_entries>
bool
-lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj,
Stream& stream)
+lldb_private::formatters::NSDictionarySummaryProvider (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -692,7 +692,7 @@ lldb_private::formatters::NSDictionaryMS
}
template bool
-lldb_private::formatters::NSDictionarySummaryProvider<true> (ValueObject&,
Stream&) ;
+lldb_private::formatters::NSDictionarySummaryProvider<true> (ValueObject&,
Stream&, const TypeSummaryOptions&) ;
template bool
-lldb_private::formatters::NSDictionarySummaryProvider<false> (ValueObject&,
Stream&) ;
+lldb_private::formatters::NSDictionarySummaryProvider<false> (ValueObject&,
Stream&, const TypeSummaryOptions&) ;
Modified: lldb/trunk/source/DataFormatters/NSSet.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/NSSet.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/NSSet.cpp (original)
+++ lldb/trunk/source/DataFormatters/NSSet.cpp Thu Nov 6 15:55:30 2014
@@ -183,7 +183,7 @@ namespace lldb_private {
template<bool cf_style>
bool
-lldb_private::formatters::NSSetSummaryProvider (ValueObject& valobj, Stream&
stream)
+lldb_private::formatters::NSSetSummaryProvider (ValueObject& valobj, Stream&
stream, const TypeSummaryOptions& options)
{
ProcessSP process_sp = valobj.GetProcessSP();
if (!process_sp)
@@ -713,7 +713,7 @@ lldb_private::formatters::NSOrderedSetSy
}
template bool
-lldb_private::formatters::NSSetSummaryProvider<true> (ValueObject& valobj,
Stream& stream);
+lldb_private::formatters::NSSetSummaryProvider<true> (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options);
template bool
-lldb_private::formatters::NSSetSummaryProvider<false> (ValueObject& valobj,
Stream& stream);
+lldb_private::formatters::NSSetSummaryProvider<false> (ValueObject& valobj,
Stream& stream, const TypeSummaryOptions& options);
Modified: lldb/trunk/source/DataFormatters/TypeSummary.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/TypeSummary.cpp?rev=221486&r1=221485&r2=221486&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/TypeSummary.cpp (original)
+++ lldb/trunk/source/DataFormatters/TypeSummary.cpp Thu Nov 6 15:55:30 2014
@@ -95,7 +95,8 @@ m_format()
bool
StringSummaryFormat::FormatObject (ValueObject *valobj,
- std::string& retval)
+ std::string& retval,
+ const TypeSummaryOptions& options)
{
if (!valobj)
{
@@ -159,11 +160,12 @@ m_description(description ? description
bool
CXXFunctionSummaryFormat::FormatObject (ValueObject *valobj,
- std::string& dest)
+ std::string& dest,
+ const TypeSummaryOptions& options)
{
dest.clear();
StreamString stream;
- if (!m_impl || m_impl(*valobj,stream) == false)
+ if (!m_impl || m_impl(*valobj,stream,options) == false)
return false;
dest.assign(stream.GetData());
return true;
@@ -204,7 +206,8 @@ m_script_function_sp()
bool
ScriptSummaryFormat::FormatObject (ValueObject *valobj,
- std::string& retval)
+ std::string& retval,
+ const TypeSummaryOptions& options)
{
Timer scoped_timer (__PRETTY_FUNCTION__, __PRETTY_FUNCTION__);
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
