diff options
| author | Enrico Granata <egranata@apple.com> | 2014-10-29 01:03:09 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2014-10-29 01:03:09 +0000 |
| commit | b6d7cba1416f39eaaaa25c33f3d3d673110fd4ac (patch) | |
| tree | 0739c54bce9122c2caaa44dca4e332f6260a2eb0 /lldb/source/DataFormatters/FormatManager.cpp | |
| parent | 937224777a3fdcd73b065523274eb1d2273f1af2 (diff) | |
| download | llvm-b6d7cba1416f39eaaaa25c33f3d3d673110fd4ac.zip llvm-b6d7cba1416f39eaaaa25c33f3d3d673110fd4ac.tar.gz llvm-b6d7cba1416f39eaaaa25c33f3d3d673110fd4ac.tar.bz2 | |
Shuffle a couple of formatters around. This should fix the bug that never dies, aka rdar://15154623
llvm-svn: 220836
Diffstat (limited to 'lldb/source/DataFormatters/FormatManager.cpp')
| -rw-r--r-- | lldb/source/DataFormatters/FormatManager.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index c425d0d..cfd6e0c 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -1212,6 +1212,10 @@ FormatManager::LoadObjCFormatters() .SetHideItemNames(false); TypeCategoryImpl::SharedPointer objc_category_sp = GetCategory(m_objc_category_name); + TypeCategoryImpl::SharedPointer appkit_category_sp = GetCategory(m_appkit_category_name); + TypeCategoryImpl::SharedPointer corefoundation_category_sp = GetCategory(m_corefoundation_category_name); + TypeCategoryImpl::SharedPointer coregraphics_category_sp = GetCategory(m_coregraphics_category_name); + TypeCategoryImpl::SharedPointer coreservices_category_sp = GetCategory(m_coreservices_category_name); lldb::TypeSummaryImplSP ObjC_BOOL_summary(new CXXFunctionSummaryFormat(objc_flags, lldb_private::formatters::ObjCBOOLSummaryProvider,"")); objc_category_sp->GetTypeSummariesContainer()->Add(ConstString("BOOL"), @@ -1247,8 +1251,6 @@ FormatManager::LoadObjCFormatters() ConstString("__block_literal_generic"), objc_flags); - TypeCategoryImpl::SharedPointer corefoundation_category_sp = GetCategory(m_corefoundation_category_name); - AddStringSummary(corefoundation_category_sp, "${var.years} years, ${var.months} months, ${var.days} days, ${var.hours} hours, ${var.minutes} minutes ${var.seconds} seconds", ConstString("CFGregorianUnits"), @@ -1257,28 +1259,28 @@ FormatManager::LoadObjCFormatters() "location=${var.location} length=${var.length}", ConstString("CFRange"), objc_flags); - AddStringSummary(corefoundation_category_sp, + + AddStringSummary(appkit_category_sp, "(x=${var.x}, y=${var.y})", ConstString("NSPoint"), objc_flags); - AddStringSummary(corefoundation_category_sp, + AddStringSummary(appkit_category_sp, "location=${var.location}, length=${var.length}", ConstString("NSRange"), objc_flags); - AddStringSummary(corefoundation_category_sp, + AddStringSummary(appkit_category_sp, "${var.origin}, ${var.size}", ConstString("NSRect"), objc_flags); - AddStringSummary(corefoundation_category_sp, + AddStringSummary(appkit_category_sp, "(${var.origin}, ${var.size}), ...", ConstString("NSRectArray"), objc_flags); - AddStringSummary(objc_category_sp, + AddStringSummary(appkit_category_sp, "(width=${var.width}, height=${var.height})", ConstString("NSSize"), objc_flags); - TypeCategoryImpl::SharedPointer coregraphics_category_sp = GetCategory(m_coregraphics_category_name); AddStringSummary(coregraphics_category_sp, "(width=${var.width}, height=${var.height})", @@ -1293,8 +1295,6 @@ FormatManager::LoadObjCFormatters() ConstString("CGRect"), objc_flags); - TypeCategoryImpl::SharedPointer coreservices_category_sp = GetCategory(m_coreservices_category_name); - AddStringSummary(coreservices_category_sp, "red=${var.red} green=${var.green} blue=${var.blue}", ConstString("RGBColor"), @@ -1324,8 +1324,6 @@ FormatManager::LoadObjCFormatters() ConstString("HIRect"), objc_flags); - TypeCategoryImpl::SharedPointer appkit_category_sp = GetCategory(m_appkit_category_name); - TypeSummaryImpl::Flags appkit_flags; appkit_flags.SetCascades(true) .SetSkipPointers(false) |