1 files changed, 89 insertions, 62 deletions

diff --git a/source/API/SBTypeSummary.cpp b/source/API/SBTypeSummary.cpp
index 2c114545419c..2985b7659547 100644
--- a/source/API/SBTypeSummary.cpp
+++ b/source/API/SBTypeSummary.cpp
@@ -8,16 +8,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/API/SBTypeSummary.h"
-
 #include "lldb/API/SBStream.h"
-
+#include "lldb/API/SBValue.h"
 #include "lldb/DataFormatters/DataVisualization.h"
 
+#include "llvm/Support/Casting.h"
+
 using namespace lldb;
 using namespace lldb_private;
 
-#ifndef LLDB_DISABLE_PYTHON
-
 SBTypeSummaryOptions::SBTypeSummaryOptions()
 {
     m_opaque_ap.reset(new TypeSummaryOptions());
@@ -147,6 +146,28 @@ SBTypeSummary::CreateWithScriptCode (const char* data, uint32_t options)
     return SBTypeSummary(TypeSummaryImplSP(new ScriptSummaryFormat(options, "", data)));
 }
 
+SBTypeSummary
+SBTypeSummary::CreateWithCallback (FormatCallback cb, uint32_t options, const char* description)
+{
+    SBTypeSummary retval;
+    if (cb)
+    {
+        retval.SetSP(TypeSummaryImplSP(new CXXFunctionSummaryFormat(options,
+                                                                    [cb] (ValueObject& valobj, Stream& stm, const TypeSummaryOptions& opt) -> bool {
+                                                                        SBStream stream;
+                                                                        SBValue sb_value(valobj.GetSP());
+                                                                        SBTypeSummaryOptions options(&opt);
+                                                                        if (!cb(sb_value, options, stream))
+                                                                            return false;
+                                                                        stm.Write(stream.GetData(), stream.GetSize());
+                                                                        return true;
+                                                                    },
+                                                                    description ? description : "callback summary formatter")));
+    }
+    
+    return retval;
+}
+
 SBTypeSummary::SBTypeSummary (const lldb::SBTypeSummary &rhs) :
 m_opaque_sp(rhs.m_opaque_sp)
 {
@@ -167,9 +188,8 @@ SBTypeSummary::IsFunctionCode()
 {
     if (!IsValid())
         return false;
-    if (m_opaque_sp->IsScripted())
+    if (ScriptSummaryFormat* script_summary_ptr = llvm::dyn_cast<ScriptSummaryFormat>(m_opaque_sp.get()))
     {
-        ScriptSummaryFormat* script_summary_ptr = (ScriptSummaryFormat*)m_opaque_sp.get();
         const char* ftext = script_summary_ptr->GetPythonScript();
         return (ftext && *ftext != 0);
     }
@@ -181,9 +201,8 @@ SBTypeSummary::IsFunctionName()
 {
     if (!IsValid())
         return false;
-    if (m_opaque_sp->IsScripted())
+    if (ScriptSummaryFormat* script_summary_ptr = llvm::dyn_cast<ScriptSummaryFormat>(m_opaque_sp.get()))
     {
-        ScriptSummaryFormat* script_summary_ptr = (ScriptSummaryFormat*)m_opaque_sp.get();
         const char* ftext = script_summary_ptr->GetPythonScript();
         return (!ftext || *ftext == 0);
     }
@@ -196,10 +215,7 @@ SBTypeSummary::IsSummaryString()
     if (!IsValid())
         return false;
     
-    if (m_opaque_sp->GetType() == lldb_private::TypeSummaryImpl::eTypeCallback)
-        return false;
-    
-    return !m_opaque_sp->IsScripted();
+    return m_opaque_sp->GetKind() == TypeSummaryImpl::Kind::eSummaryString;
 }
 
 const char*
@@ -207,22 +223,17 @@ SBTypeSummary::GetData ()
 {
     if (!IsValid())
         return NULL;
-    if (m_opaque_sp->GetType() == lldb_private::TypeSummaryImpl::eTypeCallback)
-        return NULL;
-    if (m_opaque_sp->IsScripted())
+    if (ScriptSummaryFormat* script_summary_ptr = llvm::dyn_cast<ScriptSummaryFormat>(m_opaque_sp.get()))
     {
-        ScriptSummaryFormat* script_summary_ptr = (ScriptSummaryFormat*)m_opaque_sp.get();
         const char* fname = script_summary_ptr->GetFunctionName();
         const char* ftext = script_summary_ptr->GetPythonScript();
         if (ftext && *ftext)
             return ftext;
         return fname;
     }
-    else
-    {
-        StringSummaryFormat* string_summary_ptr = (StringSummaryFormat*)m_opaque_sp.get();
+    else if (StringSummaryFormat* string_summary_ptr = llvm::dyn_cast<StringSummaryFormat>(m_opaque_sp.get()))
         return string_summary_ptr->GetSummaryString();
-    }
+    return nullptr;
 }
 
 uint32_t
@@ -246,9 +257,10 @@ SBTypeSummary::SetSummaryString (const char* data)
 {
     if (!IsValid())
         return;
-    if (m_opaque_sp->IsScripted() || (m_opaque_sp->GetType() == lldb_private::TypeSummaryImpl::eTypeCallback))
+    if (!llvm::isa<StringSummaryFormat>(m_opaque_sp.get()))
         ChangeSummaryType(false);
-    ((StringSummaryFormat*)m_opaque_sp.get())->SetSummaryString(data);
+    if (StringSummaryFormat* string_summary_ptr = llvm::dyn_cast<StringSummaryFormat>(m_opaque_sp.get()))
+        string_summary_ptr->SetSummaryString(data);
 }
 
 void
@@ -256,9 +268,10 @@ SBTypeSummary::SetFunctionName (const char* data)
 {
     if (!IsValid())
         return;
-    if (!m_opaque_sp->IsScripted())
+    if (!llvm::isa<ScriptSummaryFormat>(m_opaque_sp.get()))
         ChangeSummaryType(true);
-    ((ScriptSummaryFormat*)m_opaque_sp.get())->SetFunctionName(data);
+    if (ScriptSummaryFormat* script_summary_ptr = llvm::dyn_cast<ScriptSummaryFormat>(m_opaque_sp.get()))
+        script_summary_ptr->SetFunctionName(data);
 }
 
 void
@@ -266,9 +279,10 @@ SBTypeSummary::SetFunctionCode (const char* data)
 {
     if (!IsValid())
         return;
-    if (!m_opaque_sp->IsScripted())
+    if (!llvm::isa<ScriptSummaryFormat>(m_opaque_sp.get()))
         ChangeSummaryType(true);
-    ((ScriptSummaryFormat*)m_opaque_sp.get())->SetPythonScript(data);
+    if (ScriptSummaryFormat* script_summary_ptr = llvm::dyn_cast<ScriptSummaryFormat>(m_opaque_sp.get()))
+        script_summary_ptr->SetPythonScript(data);
 }
 
 bool
@@ -284,6 +298,15 @@ SBTypeSummary::GetDescription (lldb::SBStream &description,
     }
 }
 
+bool
+SBTypeSummary::DoesPrintValue (lldb::SBValue value)
+{
+    if (!IsValid())
+        return false;
+    lldb::ValueObjectSP value_sp = value.GetSP();
+    return m_opaque_sp->DoesPrintValue(value_sp.get());
+}
+
 lldb::SBTypeSummary &
 SBTypeSummary::operator = (const lldb::SBTypeSummary &rhs)
 {
@@ -305,36 +328,44 @@ SBTypeSummary::operator == (lldb::SBTypeSummary &rhs)
 bool
 SBTypeSummary::IsEqualTo (lldb::SBTypeSummary &rhs)
 {
-    if (IsValid() == false)
-        return !rhs.IsValid();
-
-    if (m_opaque_sp->GetType() != rhs.m_opaque_sp->GetType())
-        return false;
-    
-    if (m_opaque_sp->GetType() == lldb_private::TypeSummaryImpl::eTypeCallback)
+    if (IsValid())
     {
-        lldb_private::CXXFunctionSummaryFormat *self_cxx = (lldb_private::CXXFunctionSummaryFormat*)m_opaque_sp.get();
-        lldb_private::CXXFunctionSummaryFormat *other_cxx = (lldb_private::CXXFunctionSummaryFormat*)rhs.m_opaque_sp.get();
-        return (self_cxx->m_impl == other_cxx->m_impl);
+        // valid and invalid are different
+        if (!rhs.IsValid())
+            return false;
+    }
+    else
+    {
+        // invalid and valid are different
+        if (rhs.IsValid())
+            return false;
+        else
+        // both invalid are the same
+            return true;
     }
-    
-    if (m_opaque_sp->IsScripted() != rhs.m_opaque_sp->IsScripted())
-        return false;
-    
-    if (IsFunctionCode() != rhs.IsFunctionCode())
-        return false;
-
-    if (IsSummaryString() != rhs.IsSummaryString())
-        return false;
 
-    if (IsFunctionName() != rhs.IsFunctionName())
-        return false;
-    
-    if ( GetData() == NULL || rhs.GetData() == NULL || strcmp(GetData(), rhs.GetData()) )
+    if (m_opaque_sp->GetKind() != rhs.m_opaque_sp->GetKind())
         return false;
     
-    return GetOptions() == rhs.GetOptions();
+    switch (m_opaque_sp->GetKind())
+    {
+        case TypeSummaryImpl::Kind::eCallback:
+            return llvm::dyn_cast<CXXFunctionSummaryFormat>(m_opaque_sp.get()) == llvm::dyn_cast<CXXFunctionSummaryFormat>(rhs.m_opaque_sp.get());
+        case TypeSummaryImpl::Kind::eScript:
+            if (IsFunctionCode() != rhs.IsFunctionCode())
+                return false;
+            if (IsFunctionName() != rhs.IsFunctionName())
+                return false;
+            return GetOptions() == rhs.GetOptions();
+        case TypeSummaryImpl::Kind::eSummaryString:
+            if (IsSummaryString() != rhs.IsSummaryString())
+                return false;
+            return GetOptions() == rhs.GetOptions();
+        case TypeSummaryImpl::Kind::eInternal:
+            return (m_opaque_sp.get() == rhs.m_opaque_sp.get());
+    }
     
+    return false;
 }
 
 bool
@@ -373,29 +404,27 @@ SBTypeSummary::CopyOnWrite_Impl()
     
     TypeSummaryImplSP new_sp;
     
-    if (m_opaque_sp->GetType() == lldb_private::TypeSummaryImpl::eTypeCallback)
+    if (CXXFunctionSummaryFormat* current_summary_ptr = llvm::dyn_cast<CXXFunctionSummaryFormat>(m_opaque_sp.get()))
     {
-        CXXFunctionSummaryFormat* current_summary_ptr = (CXXFunctionSummaryFormat*)m_opaque_sp.get();
         new_sp = TypeSummaryImplSP(new CXXFunctionSummaryFormat(GetOptions(),
                                                                 current_summary_ptr->m_impl,
                                                                 current_summary_ptr->m_description.c_str()));
     }
-    else if (m_opaque_sp->IsScripted())
+    else if (ScriptSummaryFormat* current_summary_ptr = llvm::dyn_cast<ScriptSummaryFormat>(m_opaque_sp.get()))
     {
-        ScriptSummaryFormat* current_summary_ptr = (ScriptSummaryFormat*)m_opaque_sp.get();
         new_sp = TypeSummaryImplSP(new ScriptSummaryFormat(GetOptions(),
                                                            current_summary_ptr->GetFunctionName(),
                                                            current_summary_ptr->GetPythonScript()));
     }
-    else {
-        StringSummaryFormat* current_summary_ptr = (StringSummaryFormat*)m_opaque_sp.get();
+    else if (StringSummaryFormat* current_summary_ptr = llvm::dyn_cast<StringSummaryFormat>(m_opaque_sp.get()))
+    {
         new_sp = TypeSummaryImplSP(new StringSummaryFormat(GetOptions(),
                                                            current_summary_ptr->GetSummaryString()));
     }
-    
+
     SetSP(new_sp);
     
-    return true;
+    return nullptr != new_sp.get();
 }
 
 bool
@@ -406,9 +435,9 @@ SBTypeSummary::ChangeSummaryType (bool want_script)
     
     TypeSummaryImplSP new_sp;
     
-    if (want_script == m_opaque_sp->IsScripted())
+    if (want_script == (m_opaque_sp->GetKind() == TypeSummaryImpl::Kind::eScript))
     {
-        if (m_opaque_sp->GetType() == lldb_private::TypeSummaryImpl::eTypeCallback && !want_script)
+        if (m_opaque_sp->GetKind() == lldb_private::TypeSummaryImpl::Kind::eCallback && !want_script)
             new_sp = TypeSummaryImplSP(new StringSummaryFormat(GetOptions(), ""));
         else
             return CopyOnWrite_Impl();
@@ -426,5 +455,3 @@ SBTypeSummary::ChangeSummaryType (bool want_script)
     
     return true;
 }
-
-#endif // LLDB_DISABLE_PYTHON