[Lldb-commits] [lldb] r156886 - in /lldb/trunk: include/lldb/Core/DataVisualization.h include/lldb/Core/FormatManager.h source/Core/DataVisualization.cpp source/Core/FormatManager.cpp source/Core/ValueObject.cpp

[Jason Molenda]

Author: jmolenda
Date: Tue May 15 19:38:08 2012
New Revision: 156886

URL: http://llvm.org/viewvc/llvm-project?rev=156886&view=rev
Log:
Add LLDB_DISABLE_PYTHON around newly added methods in
DataVisualization.h / DataVisualization.cpp / ValueObject.cpp
and
FormatManager.h / FormatManager.cpp

Modified:
    lldb/trunk/include/lldb/Core/DataVisualization.h
    lldb/trunk/include/lldb/Core/FormatManager.h
    lldb/trunk/source/Core/DataVisualization.cpp
    lldb/trunk/source/Core/FormatManager.cpp
    lldb/trunk/source/Core/ValueObject.cpp

Modified: lldb/trunk/include/lldb/Core/DataVisualization.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/DataVisualization.h?rev=156886&r1=156885&r2=156886&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/DataVisualization.h (original)
+++ lldb/trunk/include/lldb/Core/DataVisualization.h Tue May 15 19:38:08 2012
@@ -74,18 +74,24 @@
     static lldb::TypeSummaryImplSP
     GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp);
     
+#ifndef LLDB_DISABLE_PYTHON
     static lldb::SyntheticChildrenSP
     GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp);
+#endif
     
     static lldb::TypeFilterImplSP
     GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp);
 
+#ifndef LLDB_DISABLE_PYTHON
     static lldb::TypeSyntheticImplSP
     GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp);
+#endif
     
+#ifndef LLDB_DISABLE_PYTHON
     static lldb::SyntheticChildrenSP
     GetSyntheticChildren(ValueObject& valobj,
                          lldb::DynamicValueType use_dynamic);
+#endif
     
     static bool
     AnyMatches(ConstString type_name,

Modified: lldb/trunk/include/lldb/Core/FormatManager.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=156886&r1=156885&r2=156886&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/FormatManager.h (original)
+++ lldb/trunk/include/lldb/Core/FormatManager.h Tue May 15 19:38:08 2012
@@ -131,6 +131,7 @@
         return retval;
     }
     
+#ifndef LLDB_DISABLE_PYTHON
     SynthNavigator::MapValueType
     GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
     {
@@ -146,6 +147,7 @@
         
         return retval;
     }
+#endif
     
     lldb::TypeNameSpecifierImplSP
     GetTypeNameSpecifierForSummaryAtIndex (uint32_t index)
@@ -503,9 +505,11 @@
     GetSummaryFormat (ValueObject& valobj,
          lldb::DynamicValueType use_dynamic);
     
+#ifndef LLDB_DISABLE_PYTHON
     lldb::SyntheticChildrenSP
     GetSyntheticChildren (ValueObject& valobj,
                           lldb::DynamicValueType use_dynamic);
+#endif
     
 private:
     
@@ -655,18 +659,24 @@
     lldb::TypeFilterImplSP
     GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp);
 
+#ifndef LLDB_DISABLE_PYTHON
     lldb::TypeSyntheticImplSP
     GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp);
+#endif
     
+#ifndef LLDB_DISABLE_PYTHON
     lldb::SyntheticChildrenSP
     GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp);
+#endif
     
+#ifndef LLDB_DISABLE_PYTHON
     lldb::SyntheticChildrenSP
     GetSyntheticChildren (ValueObject& valobj,
                           lldb::DynamicValueType use_dynamic)
     {
         return m_categories_map.GetSyntheticChildren(valobj, use_dynamic);
     }
+#endif
     
     bool
     AnyMatches (ConstString type_name,

Modified: lldb/trunk/source/Core/DataVisualization.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataVisualization.cpp?rev=156886&r1=156885&r2=156886&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataVisualization.cpp (original)
+++ lldb/trunk/source/Core/DataVisualization.cpp Tue May 15 19:38:08 2012
@@ -109,18 +109,22 @@
     return GetFormatManager().GetSummaryForType(type_sp);
 }
 
+#ifndef LLDB_DISABLE_PYTHON
 lldb::SyntheticChildrenSP
 DataVisualization::GetSyntheticChildren (ValueObject& valobj,
                                          lldb::DynamicValueType use_dynamic)
 {
     return GetFormatManager().GetSyntheticChildren(valobj, use_dynamic);
 }
+#endif
 
+#ifndef LLDB_DISABLE_PYTHON
 lldb::SyntheticChildrenSP
 DataVisualization::GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp)
 {
     return GetFormatManager().GetSyntheticChildrenForType(type_sp);
 }
+#endif
 
 lldb::TypeFilterImplSP
 DataVisualization::GetFilterForType (lldb::TypeNameSpecifierImplSP type_sp)
@@ -128,11 +132,13 @@
     return GetFormatManager().GetFilterForType(type_sp);
 }
 
+#ifndef LLDB_DISABLE_PYTHON
 lldb::TypeSyntheticImplSP
 DataVisualization::GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
 {
     return GetFormatManager().GetSyntheticForType(type_sp);
 }
+#endif
 
 bool
 DataVisualization::AnyMatches (ConstString type_name,

Modified: lldb/trunk/source/Core/FormatManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/FormatManager.cpp?rev=156886&r1=156885&r2=156886&view=diff
==============================================================================
--- lldb/trunk/source/Core/FormatManager.cpp (original)
+++ lldb/trunk/source/Core/FormatManager.cpp Tue May 15 19:38:08 2012
@@ -497,6 +497,7 @@
     return filter_chosen_sp;
 }
 
+#ifndef LLDB_DISABLE_PYTHON
 lldb::TypeSyntheticImplSP
 FormatManager::GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp)
 {
@@ -522,7 +523,9 @@
     }
     return synth_chosen_sp;
 }
+#endif
 
+#ifndef LLDB_DISABLE_PYTHON
 lldb::SyntheticChildrenSP
 FormatManager::GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp)
 {
@@ -535,7 +538,9 @@
     else
         return lldb::SyntheticChildrenSP(synth_sp.get());
 }
+#endif
 
+#ifndef LLDB_DISABLE_PYTHON
 lldb::SyntheticChildrenSP
 CategoryMap::GetSyntheticChildren (ValueObject& valobj,
                                    lldb::DynamicValueType use_dynamic)
@@ -556,6 +561,7 @@
     }
     return lldb::SyntheticChildrenSP();
 }
+#endif
 
 void
 CategoryMap::LoopThrough(CallbackType callback, void* param)

Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=156886&r1=156885&r2=156886&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Tue May 15 19:38:08 2012
@@ -250,7 +250,9 @@
     {
         SetValueFormat(DataVisualization::ValueFormats::GetFormat (*this, eNoDynamicValues));
         SetSummaryFormat(DataVisualization::GetSummaryFormat (*this, use_dynamic));
+#ifndef LLDB_DISABLE_PYTHON
         SetSyntheticChildren(DataVisualization::GetSyntheticChildren (*this, use_dynamic));
+#endif
 
         m_last_format_mgr_revision = DataVisualization::GetCurrentRevision();
         m_last_format_mgr_dynamic = use_dynamic;