diff options
22 files changed, 198 insertions, 194 deletions
diff --git a/lldb/examples/summaries/cocoa/CFArray.py b/lldb/examples/summaries/cocoa/CFArray.py index 45d18b50126..da2b6ae24d6 100644 --- a/lldb/examples/summaries/cocoa/CFArray.py +++ b/lldb/examples/summaries/cocoa/CFArray.py @@ -152,10 +152,10 @@ class NSArray_SynthProvider: logger = lldb.formatters.Logger.Logger() if self.valobj.GetValueAsUnsigned() == 0: self.error = True - return objc_runtime.InvalidPointer_Description(True) + returnlldb.runtime.objc.objc_runtime.InvalidPointer_Description(True) else: global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(self.valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(self.valobj,statistics) if wrapper: self.error = True return wrapper diff --git a/lldb/examples/summaries/cocoa/CFBag.py b/lldb/examples/summaries/cocoa/CFBag.py index c3d5460515e..7c7493e2a77 100644 --- a/lldb/examples/summaries/cocoa/CFBag.py +++ b/lldb/examples/summaries/cocoa/CFBag.py @@ -85,7 +85,7 @@ class CFBagUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -115,7 +115,7 @@ def CFBag_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.length(); diff --git a/lldb/examples/summaries/cocoa/CFBinaryHeap.py b/lldb/examples/summaries/cocoa/CFBinaryHeap.py index 91aff78602e..1b7183d1417 100644 --- a/lldb/examples/summaries/cocoa/CFBinaryHeap.py +++ b/lldb/examples/summaries/cocoa/CFBinaryHeap.py @@ -82,7 +82,7 @@ class CFBinaryHeapUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -111,7 +111,7 @@ def CFBinaryHeap_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.length(); diff --git a/lldb/examples/summaries/cocoa/CFBitVector.py b/lldb/examples/summaries/cocoa/CFBitVector.py index 3a6a07e369d..b0c9e791210 100644 --- a/lldb/examples/summaries/cocoa/CFBitVector.py +++ b/lldb/examples/summaries/cocoa/CFBitVector.py @@ -126,7 +126,7 @@ class CFBitVectorUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -159,7 +159,7 @@ def CFBitVector_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.contents(); diff --git a/lldb/examples/summaries/cocoa/CFDictionary.py b/lldb/examples/summaries/cocoa/CFDictionary.py index 0fcda17f0da..9607613058b 100644 --- a/lldb/examples/summaries/cocoa/CFDictionary.py +++ b/lldb/examples/summaries/cocoa/CFDictionary.py @@ -165,7 +165,7 @@ class NSDictionaryUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -191,7 +191,7 @@ def CFDictionary_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.num_children(); @@ -209,7 +209,7 @@ def CFDictionary_SummaryProvider2 (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.num_children(); diff --git a/lldb/examples/summaries/cocoa/Class.py b/lldb/examples/summaries/cocoa/Class.py index 15fb7cb8143..9c9dda858ac 100644 --- a/lldb/examples/summaries/cocoa/Class.py +++ b/lldb/examples/summaries/cocoa/Class.py @@ -11,7 +11,7 @@ import lldb.formatters.Logger def Class_Summary(valobj,dict): logger = lldb.formatters.Logger.Logger() - runtime = objc_runtime.ObjCRuntime.runtime_from_isa(valobj) + runtime =lldb.runtime.objc.objc_runtime.ObjCRuntime.runtime_from_isa(valobj) if runtime == None or not runtime.is_valid(): return '<error: unknown Class>' class_data = runtime.read_class_data() diff --git a/lldb/examples/summaries/cocoa/NSBundle.py b/lldb/examples/summaries/cocoa/NSBundle.py index 7ef61d7ff4b..342ccfac7d9 100644 --- a/lldb/examples/summaries/cocoa/NSBundle.py +++ b/lldb/examples/summaries/cocoa/NSBundle.py @@ -88,7 +88,7 @@ class NSBundleUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -110,7 +110,7 @@ def NSBundle_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.url_text(); diff --git a/lldb/examples/summaries/cocoa/NSData.py b/lldb/examples/summaries/cocoa/NSData.py index 1a5eafa4d88..eef51981d16 100644 --- a/lldb/examples/summaries/cocoa/NSData.py +++ b/lldb/examples/summaries/cocoa/NSData.py @@ -92,7 +92,7 @@ def GetSummary_Impl(valobj): global statistics logger = lldb.formatters.Logger.Logger() logger >> "NSData GetSummary_Impl" - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: logger >> "got a wrapper summary - using it" return wrapper @@ -138,7 +138,7 @@ def NSData_SummaryProvider2 (valobj,dict): provider = GetSummary_Impl(valobj); logger >> "found a summary provider, it is: " + str(provider) if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.length(); diff --git a/lldb/examples/summaries/cocoa/NSDate.py b/lldb/examples/summaries/cocoa/NSDate.py index 3a7f26f388b..082cd190037 100644 --- a/lldb/examples/summaries/cocoa/NSDate.py +++ b/lldb/examples/summaries/cocoa/NSDate.py @@ -190,7 +190,7 @@ class NSUnknownDate_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -220,7 +220,7 @@ def NSDate_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.value(); @@ -235,7 +235,7 @@ def NSTimeZone_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.timezone(); diff --git a/lldb/examples/summaries/cocoa/NSException.py b/lldb/examples/summaries/cocoa/NSException.py index 6e0c6f33191..72bf895bdbc 100644 --- a/lldb/examples/summaries/cocoa/NSException.py +++ b/lldb/examples/summaries/cocoa/NSException.py @@ -79,7 +79,7 @@ class NSUnknownException_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -98,7 +98,7 @@ def NSException_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.description(); diff --git a/lldb/examples/summaries/cocoa/NSIndexSet.py b/lldb/examples/summaries/cocoa/NSIndexSet.py index 793f9fea33f..11cbb20b63f 100644 --- a/lldb/examples/summaries/cocoa/NSIndexSet.py +++ b/lldb/examples/summaries/cocoa/NSIndexSet.py @@ -101,7 +101,7 @@ class NSIndexSetUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -121,7 +121,7 @@ def NSIndexSet_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.count(); diff --git a/lldb/examples/summaries/cocoa/NSMachPort.py b/lldb/examples/summaries/cocoa/NSMachPort.py index a4f32fc67c9..ecb4b7590ca 100644 --- a/lldb/examples/summaries/cocoa/NSMachPort.py +++ b/lldb/examples/summaries/cocoa/NSMachPort.py @@ -85,7 +85,7 @@ class NSMachPortUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -104,7 +104,7 @@ def NSMachPort_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.port(); diff --git a/lldb/examples/summaries/cocoa/NSNotification.py b/lldb/examples/summaries/cocoa/NSNotification.py index f624cfe133d..8d49caa93d3 100644 --- a/lldb/examples/summaries/cocoa/NSNotification.py +++ b/lldb/examples/summaries/cocoa/NSNotification.py @@ -74,7 +74,7 @@ class NSNotificationUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -93,7 +93,7 @@ def NSNotification_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.name(); diff --git a/lldb/examples/summaries/cocoa/NSNumber.py b/lldb/examples/summaries/cocoa/NSNumber.py index 75ba635ddf4..fb35c765919 100644 --- a/lldb/examples/summaries/cocoa/NSNumber.py +++ b/lldb/examples/summaries/cocoa/NSNumber.py @@ -187,7 +187,7 @@ class NSUnknownNumber_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -212,7 +212,7 @@ def NSNumber_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.value(); diff --git a/lldb/examples/summaries/cocoa/NSSet.py b/lldb/examples/summaries/cocoa/NSSet.py index a9b37dfeac7..71665dbc9f7 100644 --- a/lldb/examples/summaries/cocoa/NSSet.py +++ b/lldb/examples/summaries/cocoa/NSSet.py @@ -188,7 +188,7 @@ class NSCountedSet_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -234,7 +234,7 @@ def NSSet_SummaryProvider2 (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.count(); diff --git a/lldb/examples/summaries/cocoa/NSURL.py b/lldb/examples/summaries/cocoa/NSURL.py index 3f3690c4999..29f81a840ad 100644 --- a/lldb/examples/summaries/cocoa/NSURL.py +++ b/lldb/examples/summaries/cocoa/NSURL.py @@ -99,7 +99,7 @@ class NSURLUnknown_SummaryProvider: def GetSummary_Impl(valobj): logger = lldb.formatters.Logger.Logger() global statistics - class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics) + class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics) if wrapper: return wrapper @@ -118,7 +118,7 @@ def NSURL_SummaryProvider (valobj,dict): logger = lldb.formatters.Logger.Logger() provider = GetSummary_Impl(valobj); if provider != None: - if isinstance(provider,objc_runtime.SpecialSituation_Description): + if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description): return provider.message() try: summary = provider.url_text(); diff --git a/lldb/examples/summaries/cocoa/objc_runtime.py b/lldb/examples/summaries/cocoa/objc_runtime.py index a11e62255b0..722b20f872c 100644 --- a/lldb/examples/summaries/cocoa/objc_runtime.py +++ b/lldb/examples/summaries/cocoa/objc_runtime.py @@ -593,7 +593,7 @@ class SystemParameters: if types_caches.look_for_key(self.pid): self.types_cache = types_caches.get_value(self.pid) else: - self.types_cache = attrib_fromdict.AttributesDictionary(allow_reset=False) + self.types_cache = lldb.formatters.attrib_fromdict.AttributesDictionary(allow_reset=False) self.types_cache.addr_type = valobj.GetType().GetBasicType(lldb.eBasicTypeUnsignedLong) self.types_cache.addr_ptr_type = self.types_cache.addr_type.GetPointerType() self.types_cache.uint32_t = valobj.GetType().GetBasicType(lldb.eBasicTypeUnsignedInt) diff --git a/lldb/examples/synthetic/gnu_libstdcpp.py b/lldb/examples/synthetic/gnu_libstdcpp.py index 24bdcf3f1c6..2d2801a5833 100644 --- a/lldb/examples/synthetic/gnu_libstdcpp.py +++ b/lldb/examples/synthetic/gnu_libstdcpp.py @@ -10,28 +10,28 @@ import lldb.formatters.Logger class StdListSynthProvider: def __init__(self, valobj, dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.valobj = valobj self.count = None logger >> "Providing synthetic children for a map named " + str(valobj.GetName()) def next_node(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetChildMemberWithName('_M_next') def is_valid(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.value(self.next_node(node)) != self.node_address def value(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetValueAsUnsigned() # Floyd's cyle-finding algorithm # try to detect if this list has a loop def has_loop(self): global _list_uses_loop_detector - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if _list_uses_loop_detector == False: logger >> "Asked not to use loop detection" return False @@ -49,7 +49,7 @@ class StdListSynthProvider: def num_children(self): global _list_capping_size - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.count == None: self.count = self.num_children_impl() if self.count > _list_capping_size: @@ -57,7 +57,7 @@ class StdListSynthProvider: return self.count def num_children_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() global _list_capping_size try: next_val = self.next.GetValueAsUnsigned(0) @@ -83,14 +83,14 @@ class StdListSynthProvider: return 0; def get_child_index(self,name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return int(name.lstrip('[').rstrip(']')) except: return -1 def get_child_at_index(self,index): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() logger >> "Fetching child " + str(index) if index < 0: return None; @@ -107,7 +107,7 @@ class StdListSynthProvider: return None def extract_type(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() list_type = self.valobj.GetType().GetUnqualifiedType() if list_type.IsReferenceType(): list_type = list_type.GetDereferencedType() @@ -118,7 +118,7 @@ class StdListSynthProvider: return data_type def update(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() # preemptively setting this to None - we might end up changing our mind later self.count = None try: @@ -135,25 +135,25 @@ class StdListSynthProvider: class StdVectorSynthProvider: def __init__(self, valobj, dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.count = None self.valobj = valobj logger >> "Providing synthetic children for a map named " + str(valobj.GetName()) def num_children(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.count == None: self.count = self.num_children_impl() return self.count def is_valid_pointer(ptr,process): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() error = lldb.SBError() process.ReadMemory(ptr,1,error) return False if error.Fail() else True def num_children_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: start_val = self.start.GetValueAsUnsigned(0) finish_val = self.finish.GetValueAsUnsigned(0) @@ -188,14 +188,14 @@ class StdVectorSynthProvider: return 0; def get_child_index(self,name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return int(name.lstrip('[').rstrip(']')) except: return -1 def get_child_at_index(self,index): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() logger >> "Retrieving child " + str(index) if index < 0: return None; @@ -208,7 +208,7 @@ class StdVectorSynthProvider: return None def update(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() # preemptively setting this to None - we might end up changing our mind later self.count = None try: @@ -230,7 +230,7 @@ class StdVectorSynthProvider: class StdMapSynthProvider: def __init__(self, valobj, dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.valobj = valobj; self.count = None logger >> "Providing synthetic children for a map named " + str(valobj.GetName()) @@ -243,7 +243,7 @@ class StdMapSynthProvider: # to replace the longer versions of std::string with the shorter one in order to be able # to find the type name def fixup_class_name(self, class_name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if class_name == 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >': return 'std::basic_string<char>',True if class_name == 'basic_string<char, std::char_traits<char>, std::allocator<char> >': @@ -255,7 +255,7 @@ class StdMapSynthProvider: return class_name,False def update(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() # preemptively setting this to None - we might end up changing our mind later self.count = None try: @@ -313,7 +313,7 @@ class StdMapSynthProvider: def num_children(self): global _map_capping_size - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.count == None: self.count = self.num_children_impl() if self.count > _map_capping_size: @@ -321,7 +321,7 @@ class StdMapSynthProvider: return self.count def num_children_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: root_ptr_val = self.node_ptr_value(self.Mroot) if root_ptr_val == 0: @@ -333,14 +333,14 @@ class StdMapSynthProvider: return 0; def get_child_index(self,name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return int(name.lstrip('[').rstrip(']')) except: return -1 def get_child_at_index(self,index): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() logger >> "Being asked to fetch child[" + str(index) + "]" if index < 0: return None @@ -362,24 +362,24 @@ class StdMapSynthProvider: # utility functions def node_ptr_value(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetValueAsUnsigned(0) def right(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetChildMemberWithName("_M_right"); def left(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetChildMemberWithName("_M_left"); def parent(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetChildMemberWithName("_M_parent"); # from libstdc++ implementation of iterator for rbtree def increment_node(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() max_steps = self.num_children() if self.node_ptr_value(self.right(node)) != 0: x = self.right(node); diff --git a/lldb/examples/synthetic/libcxx.py b/lldb/examples/synthetic/libcxx.py index a1cd39a9849..99f4c0e650c 100644 --- a/lldb/examples/synthetic/libcxx.py +++ b/lldb/examples/synthetic/libcxx.py @@ -28,7 +28,7 @@ def extract_short_size(value): # no external significance - we access them by index since this saves a name lookup that would add # no information for readers of the code, but when possible try to use meaningful variable names def stdstring_SummaryProvider(valobj,dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() r = valobj.GetChildAtIndex(0) B = r.GetChildAtIndex(0) first = B.GetChildAtIndex(0) @@ -57,11 +57,11 @@ def stdstring_SummaryProvider(valobj,dict): class stdvector_SynthProvider: def __init__(self, valobj, dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.valobj = valobj; def num_children(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: start_val = self.start.GetValueAsUnsigned(0) finish_val = self.finish.GetValueAsUnsigned(0) @@ -89,14 +89,14 @@ class stdvector_SynthProvider: return 0; def get_child_index(self,name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return int(name.lstrip('[').rstrip(']')) except: return -1 def get_child_at_index(self,index): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() logger >> "Retrieving child " + str(index) if index < 0: return None; @@ -109,7 +109,7 @@ class stdvector_SynthProvider: return None def update(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: self.start = self.valobj.GetChildMemberWithName('__begin_') self.finish = self.valobj.GetChildMemberWithName('__end_') @@ -129,27 +129,27 @@ def stdvector_SummaryProvider(valobj,dict): class stdlist_entry: def __init__(self,entry): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.entry = entry def _next_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return stdlist_entry(self.entry.GetChildMemberWithName('__next_')) def _prev_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return stdlist_entry(self.entry.GetChildMemberWithName('__prev_')) def _value_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.entry.GetValueAsUnsigned(0) def _isnull_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self._value_impl() == 0 def _sbvalue_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.entry next = property(_next_impl,None) @@ -160,21 +160,21 @@ class stdlist_entry: class stdlist_iterator: def increment_node(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if node.is_null: return None return node.next def __init__(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.node = stdlist_entry(node) # we convert the SBValue to an internal node object on entry def value(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.node.sbvalue # and return the SBValue back on exit def next(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() node = self.increment_node(self.node) if node != None and node.sbvalue.IsValid() and not(node.is_null): self.node = node @@ -183,7 +183,7 @@ class stdlist_iterator: return None def advance(self,N): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if N < 0: return None if N == 0: @@ -198,22 +198,22 @@ class stdlist_iterator: class stdlist_SynthProvider: def __init__(self, valobj, dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.valobj = valobj def next_node(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetChildMemberWithName('__next_') def value(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return node.GetValueAsUnsigned() # Floyd's cyle-finding algorithm # try to detect if this list has a loop def has_loop(self): global _list_uses_loop_detector - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if _list_uses_loop_detector == False: logger >> "Asked not to use loop detection" return False @@ -231,7 +231,7 @@ class stdlist_SynthProvider: def num_children(self): global _list_capping_size - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.count == None: self.count = self.num_children_impl() if self.count > _list_capping_size: @@ -240,7 +240,7 @@ class stdlist_SynthProvider: def num_children_impl(self): global _list_capping_size - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: next_val = self.head.GetValueAsUnsigned(0) prev_val = self.tail.GetValueAsUnsigned(0) @@ -265,14 +265,14 @@ class stdlist_SynthProvider: return 0; def get_child_index(self,name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return int(name.lstrip('[').rstrip(']')) except: return -1 def get_child_at_index(self,index): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() logger >> "Fetching child " + str(index) if index < 0: return None; @@ -290,7 +290,7 @@ class stdlist_SynthProvider: return None def extract_type(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() list_type = self.valobj.GetType().GetUnqualifiedType() if list_type.IsReferenceType(): list_type = list_type.GetDereferencedType() @@ -301,7 +301,7 @@ class stdlist_SynthProvider: return data_type def update(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.count = None try: impl = self.valobj.GetChildMemberWithName('__end_') @@ -321,31 +321,31 @@ def stdlist_SummaryProvider(valobj,dict): # a tree node - this class makes the syntax in the actual iterator nicer to read and maintain class stdmap_iterator_node: def _left_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return stdmap_iterator_node(self.node.GetChildMemberWithName("__left_")) def _right_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return stdmap_iterator_node(self.node.GetChildMemberWithName("__right_")) def _parent_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return stdmap_iterator_node(self.node.GetChildMemberWithName("__parent_")) def _value_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.node.GetValueAsUnsigned(0) def _sbvalue_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.node def _null_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.value == 0 def __init__(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.node = node left = property(_left_impl,None) @@ -359,7 +359,7 @@ class stdmap_iterator_node: class stdmap_iterator: def tree_min(self,x): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() steps = 0 if x.is_null: return None @@ -372,7 +372,7 @@ class stdmap_iterator: return x def tree_max(self,x): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if x.is_null: return None while (not x.right.is_null): @@ -380,13 +380,13 @@ class stdmap_iterator: return x def tree_is_left_child(self,x): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if x.is_null: return None return True if x.value == x.parent.left.value else False def increment_node(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if node.is_null: return None if not node.right.is_null: @@ -401,16 +401,16 @@ class stdmap_iterator: return node.parent def __init__(self,node,max_count=0): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.node = stdmap_iterator_node(node) # we convert the SBValue to an internal node object on entry self.max_count = max_count def value(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() return self.node.sbvalue # and return the SBValue back on exit def next(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() node = self.increment_node(self.node) if node != None and node.sbvalue.IsValid() and not(node.is_null): self.node = node @@ -419,7 +419,7 @@ class stdmap_iterator: return None def advance(self,N): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if N < 0: return None if N == 0: @@ -435,12 +435,12 @@ class stdmap_iterator: class stdmap_SynthProvider: def __init__(self, valobj, dict): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.valobj = valobj; self.pointer_size = self.valobj.GetProcess().GetAddressByteSize() def update(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() self.count = None try: # we will set this to True if we find out that discovering a node in the map takes more steps than the overall size of the RB tree @@ -458,7 +458,7 @@ class stdmap_SynthProvider: def num_children(self): global _map_capping_size - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.count == None: self.count = self.num_children_impl() if self.count > _map_capping_size: @@ -466,14 +466,14 @@ class stdmap_SynthProvider: return self.count def num_children_impl(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return self.valobj.GetChildMemberWithName('__tree_').GetChildMemberWithName('__pair3_').GetChildMemberWithName('__first_').GetValueAsUnsigned() except: return 0; def get_data_type(self): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.data_type == None or self.data_size == None: if self.num_children() == 0: return False @@ -491,7 +491,7 @@ class stdmap_SynthProvider: return True def get_value_offset(self,node): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() if self.skip_size == None: node_type = node.GetType() fields_count = node_type.GetNumberOfFields() @@ -503,14 +503,14 @@ class stdmap_SynthProvider: return (self.skip_size != None) def get_child_index(self,name): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() try: return int(name.lstrip('[').rstrip(']')) except: return -1 def get_child_at_index(self,index): - logger = lldb.formatters.Logger() + logger = lldb.formatters.Logger.Logger() logger >> "Retrieving child " + str(index) if index < 0: return None diff --git a/lldb/scripts/Python/finish-swig-Python-LLDB.sh b/lldb/scripts/Python/finish-swig-Python-LLDB.sh index 3f024950db6..a86aeda364e 100755 --- a/lldb/scripts/Python/finish-swig-Python-LLDB.sh +++ b/lldb/scripts/Python/finish-swig-Python-LLDB.sh @@ -147,6 +147,8 @@ fi function create_python_package { package_dir="${framework_python_dir}$1" package_files="$2" + package_name=`echo $1 | tr '/' '.'` + package_name="lldb${package_name}" if [ ! -d "${package_dir}" ] then @@ -179,6 +181,8 @@ function create_python_package { fi done echo "]" >> "${package_init_file}" + echo "for x in __all__:" >> "${package_init_file}" + echo " __import__('${package_name}.'+x)" >> "${package_init_file}" fi diff --git a/lldb/source/Core/FormatManager.cpp b/lldb/source/Core/FormatManager.cpp index a14203fd7a0..45762434423 100644 --- a/lldb/source/Core/FormatManager.cpp +++ b/lldb/source/Core/FormatManager.cpp @@ -641,13 +641,13 @@ FormatManager::LoadSTLFormatters() gnu_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::vector<.+>(( )?&)?$")), SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags, - "gnu_libstdcpp.StdVectorSynthProvider"))); + "lldb.formatters.cpp.gnu_libstdcpp.StdVectorSynthProvider"))); gnu_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::map<.+> >(( )?&)?$")), SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags, - "gnu_libstdcpp.StdMapSynthProvider"))); + "lldb.formatters.cpp.gnu_libstdcpp.StdMapSynthProvider"))); gnu_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::list<.+>(( )?&)?$")), SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags, - "gnu_libstdcpp.StdListSynthProvider"))); + "lldb.formatters.cpp.gnu_libstdcpp.StdListSynthProvider"))); stl_summary_flags.SetDontShowChildren(false); gnu_category_sp->GetRegexSummaryNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::vector<.+>(( )?&)?$")), @@ -675,8 +675,8 @@ FormatManager::LoadLibcxxFormatters() .SetHideItemNames(false); #ifndef LLDB_DISABLE_PYTHON - std::string code(" libcxx.stdstring_SummaryProvider(valobj,dict)"); - lldb::TypeSummaryImplSP std_string_summary_sp(new ScriptSummaryFormat(stl_summary_flags, "libcxx.stdstring_SummaryProvider",code.c_str())); + std::string code(" lldb.formatters.cpp.libcxx.stdstring_SummaryProvider(valobj,dict)"); + lldb::TypeSummaryImplSP std_string_summary_sp(new ScriptSummaryFormat(stl_summary_flags, "lldb.formatters.cpp.libcxx.stdstring_SummaryProvider",code.c_str())); TypeCategoryImpl::SharedPointer libcxx_category_sp = GetCategory(m_libcxx_category_name); @@ -690,13 +690,13 @@ FormatManager::LoadLibcxxFormatters() libcxx_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::__1::vector<.+>(( )?&)?$")), SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags, - "libcxx.stdvector_SynthProvider"))); + "lldb.formatters.cpp.libcxx.stdvector_SynthProvider"))); libcxx_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::__1::list<.+>(( )?&)?$")), SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags, - "libcxx.stdlist_SynthProvider"))); + "lldb.formatters.cpp.libcxx.stdlist_SynthProvider"))); libcxx_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::__1::map<.+> >(( )?&)?$")), SyntheticChildrenSP(new TypeSyntheticImpl(stl_synth_flags, - "libcxx.stdmap_SynthProvider"))); + "lldb.formatters.cpp.libcxx.stdmap_SynthProvider"))); stl_summary_flags.SetDontShowChildren(false); libcxx_category_sp->GetRegexSummaryNavigator()->Add(RegularExpressionSP(new RegularExpression("^std::__1::vector<.+>(( )?&)?")), @@ -784,7 +784,7 @@ FormatManager::LoadObjCFormatters() .SetHideItemNames(false); lldb::TypeSummaryImplSP ObjC_BOOL_summary(new ScriptSummaryFormat(objc_flags, - "objc.BOOL_SummaryProvider", + "lldb.formatters.objc.objc.BOOL_SummaryProvider", "")); TypeCategoryImpl::SharedPointer objc_category_sp = GetCategory(m_objc_category_name); objc_category_sp->GetSummaryNavigator()->Add(ConstString("BOOL"), @@ -792,11 +792,11 @@ FormatManager::LoadObjCFormatters() // we need to skip pointers here since we are special casing a SEL* when retrieving its value objc_flags.SetSkipPointers(true); - AddScriptSummary(objc_category_sp, "Selector.SEL_Summary", ConstString("SEL"), objc_flags); - AddScriptSummary(objc_category_sp, "Selector.SEL_Summary", ConstString("struct objc_selector"), objc_flags); - AddScriptSummary(objc_category_sp, "Selector.SEL_Summary", ConstString("objc_selector"), objc_flags); - AddScriptSummary(objc_category_sp, "Selector.SELPointer_Summary", ConstString("objc_selector *"), objc_flags); - AddScriptSummary(objc_category_sp, "Class.Class_Summary", ConstString("Class"), objc_flags); + AddScriptSummary(objc_category_sp, "lldb.formatters.objc.Selector.SEL_Summary", ConstString("SEL"), objc_flags); + AddScriptSummary(objc_category_sp, "lldb.formatters.objc.Selector.SEL_Summary", ConstString("struct objc_selector"), objc_flags); + AddScriptSummary(objc_category_sp, "lldb.formatters.objc.Selector.SEL_Summary", ConstString("objc_selector"), objc_flags); + AddScriptSummary(objc_category_sp, "lldb.formatters.objc.Selector.SELPointer_Summary", ConstString("objc_selector *"), objc_flags); + AddScriptSummary(objc_category_sp, "lldb.formatters.objc.Class.Class_Summary", ConstString("Class"), objc_flags); objc_flags.SetSkipPointers(false); TypeCategoryImpl::SharedPointer corefoundation_category_sp = GetCategory(m_corefoundation_category_name); @@ -887,94 +887,94 @@ FormatManager::LoadObjCFormatters() .SetShowMembersOneLiner(false) .SetHideItemNames(false); - AddScriptSummary(appkit_category_sp, "CFArray.CFArray_SummaryProvider", ConstString("NSArray"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFArray.CFArray_SummaryProvider", ConstString("__NSArrayI"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFArray.CFArray_SummaryProvider", ConstString("__NSArrayM"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFArray.CFArray_SummaryProvider", ConstString("__NSCFArray"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFArray.CFArray_SummaryProvider", ConstString("CFArrayRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFArray.CFArray_SummaryProvider", ConstString("CFMutableArrayRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFArray.CFArray_SummaryProvider", ConstString("NSArray"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFArray.CFArray_SummaryProvider", ConstString("__NSArrayI"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFArray.CFArray_SummaryProvider", ConstString("__NSArrayM"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFArray.CFArray_SummaryProvider", ConstString("__NSCFArray"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFArray.CFArray_SummaryProvider", ConstString("CFArrayRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFArray.CFArray_SummaryProvider", ConstString("CFMutableArrayRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBag.CFBag_SummaryProvider", ConstString("CFBagRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBag.CFBag_SummaryProvider", ConstString("__CFBag"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBag.CFBag_SummaryProvider", ConstString("const struct __CFBag"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBag.CFBag_SummaryProvider", ConstString("CFMutableBagRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBag.CFBag_SummaryProvider", ConstString("CFBagRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBag.CFBag_SummaryProvider", ConstString("__CFBag"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBag.CFBag_SummaryProvider", ConstString("const struct __CFBag"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBag.CFBag_SummaryProvider", ConstString("CFMutableBagRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBinaryHeap.CFBinaryHeap_SummaryProvider", ConstString("CFBinaryHeapRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBinaryHeap.CFBinaryHeap_SummaryProvider", ConstString("__CFBinaryHeap"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBinaryHeap.CFBinaryHeap_SummaryProvider", ConstString("CFBinaryHeapRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBinaryHeap.CFBinaryHeap_SummaryProvider", ConstString("__CFBinaryHeap"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFDictionary.CFDictionary_SummaryProvider", ConstString("NSDictionary"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFDictionary.CFDictionary_SummaryProvider2", ConstString("CFDictionaryRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFDictionary.CFDictionary_SummaryProvider2", ConstString("CFMutableDictionaryRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFDictionary.CFDictionary_SummaryProvider", ConstString("__NSCFDictionary"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFDictionary.CFDictionary_SummaryProvider", ConstString("__NSDictionaryI"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFDictionary.CFDictionary_SummaryProvider", ConstString("__NSDictionaryM"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFDictionary.CFDictionary_SummaryProvider", ConstString("NSDictionary"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFDictionary.CFDictionary_SummaryProvider2", ConstString("CFDictionaryRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFDictionary.CFDictionary_SummaryProvider2", ConstString("CFMutableDictionaryRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFDictionary.CFDictionary_SummaryProvider", ConstString("__NSCFDictionary"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFDictionary.CFDictionary_SummaryProvider", ConstString("__NSDictionaryI"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFDictionary.CFDictionary_SummaryProvider", ConstString("__NSDictionaryM"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("NSString"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("CFStringRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("CFMutableStringRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFAttributedString_SummaryProvider", ConstString("NSAttributedString"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("__NSCFConstantString"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("__NSCFString"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("NSCFConstantString"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFString.CFString_SummaryProvider", ConstString("NSCFString"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("NSString"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("CFStringRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("CFMutableStringRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFAttributedString_SummaryProvider", ConstString("NSAttributedString"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("__NSCFConstantString"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("__NSCFString"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("NSCFConstantString"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFString.CFString_SummaryProvider", ConstString("NSCFString"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSBundle.NSBundle_SummaryProvider", ConstString("NSBundle"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSBundle.NSBundle_SummaryProvider", ConstString("NSBundle"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSData.NSData_SummaryProvider", ConstString("NSData"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSData.NSData_SummaryProvider2", ConstString("CFDataRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSData.NSData_SummaryProvider2", ConstString("CFMutableDataRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSData.NSData_SummaryProvider", ConstString("NSConcreteData"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSData.NSData_SummaryProvider", ConstString("NSConcreteMutableData"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSData.NSData_SummaryProvider", ConstString("__NSCFData"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSData.NSData_SummaryProvider", ConstString("NSData"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSData.NSData_SummaryProvider2", ConstString("CFDataRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSData.NSData_SummaryProvider2", ConstString("CFMutableDataRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSData.NSData_SummaryProvider", ConstString("NSConcreteData"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSData.NSData_SummaryProvider", ConstString("NSConcreteMutableData"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSData.NSData_SummaryProvider", ConstString("__NSCFData"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSException.NSException_SummaryProvider", ConstString("NSException"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSException.NSException_SummaryProvider", ConstString("NSException"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSMachPort.NSMachPort_SummaryProvider", ConstString("NSMachPort"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSMachPort.NSMachPort_SummaryProvider", ConstString("NSMachPort"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNotification.NSNotification_SummaryProvider", ConstString("NSNotification"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNotification.NSNotification_SummaryProvider", ConstString("NSConcreteNotification"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNotification.NSNotification_SummaryProvider", ConstString("NSNotification"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNotification.NSNotification_SummaryProvider", ConstString("NSConcreteNotification"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNumber.NSNumber_SummaryProvider", ConstString("NSNumber"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNumber.NSNumber_SummaryProvider", ConstString("__NSCFBoolean"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNumber.NSNumber_SummaryProvider", ConstString("__NSCFNumber"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNumber.NSNumber_SummaryProvider", ConstString("NSCFBoolean"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSNumber.NSNumber_SummaryProvider", ConstString("NSCFNumber"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNumber.NSNumber_SummaryProvider", ConstString("NSNumber"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNumber.NSNumber_SummaryProvider", ConstString("__NSCFBoolean"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNumber.NSNumber_SummaryProvider", ConstString("__NSCFNumber"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNumber.NSNumber_SummaryProvider", ConstString("NSCFBoolean"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSNumber.NSNumber_SummaryProvider", ConstString("NSCFNumber"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider", ConstString("NSSet"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider2", ConstString("CFSetRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider2", ConstString("CFMutableSetRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider", ConstString("__NSCFSet"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider", ConstString("__NSSetI"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider", ConstString("__NSSetM"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSSet.NSSet_SummaryProvider", ConstString("NSCountedSet"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider", ConstString("NSSet"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider2", ConstString("CFSetRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider2", ConstString("CFMutableSetRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider", ConstString("__NSCFSet"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider", ConstString("__NSSetI"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider", ConstString("__NSSetM"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSSet.NSSet_SummaryProvider", ConstString("NSCountedSet"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSURL.NSURL_SummaryProvider", ConstString("NSURL"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSURL.NSURL_SummaryProvider", ConstString("CFURLRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSURL.NSURL_SummaryProvider", ConstString("NSURL"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSURL.NSURL_SummaryProvider", ConstString("CFURLRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSDate_SummaryProvider", ConstString("NSDate"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSDate_SummaryProvider", ConstString("__NSDate"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSDate_SummaryProvider", ConstString("__NSTaggedDate"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSDate_SummaryProvider", ConstString("NSCalendarDate"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSDate_SummaryProvider", ConstString("NSDate"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSDate_SummaryProvider", ConstString("__NSDate"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSDate_SummaryProvider", ConstString("__NSTaggedDate"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSDate_SummaryProvider", ConstString("NSCalendarDate"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSTimeZone_SummaryProvider", ConstString("NSTimeZone"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSTimeZone_SummaryProvider", ConstString("CFTimeZoneRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSDate.NSTimeZone_SummaryProvider", ConstString("__NSTimeZone"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSTimeZone_SummaryProvider", ConstString("NSTimeZone"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSTimeZone_SummaryProvider", ConstString("CFTimeZoneRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.NSTimeZone_SummaryProvider", ConstString("__NSTimeZone"), appkit_flags); // CFAbsoluteTime is actually a double rather than a pointer to an object // we do not care about the numeric value, since it is probably meaningless to users appkit_flags.SetDontShowValue(true); - AddScriptSummary(appkit_category_sp, "NSDate.CFAbsoluteTime_SummaryProvider", ConstString("CFAbsoluteTime"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSDate.CFAbsoluteTime_SummaryProvider", ConstString("CFAbsoluteTime"), appkit_flags); appkit_flags.SetDontShowValue(false); - AddScriptSummary(appkit_category_sp, "NSIndexSet.NSIndexSet_SummaryProvider", ConstString("NSIndexSet"), appkit_flags); - AddScriptSummary(appkit_category_sp, "NSIndexSet.NSIndexSet_SummaryProvider", ConstString("NSMutableIndexSet"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSIndexSet.NSIndexSet_SummaryProvider", ConstString("NSIndexSet"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.NSIndexSet.NSIndexSet_SummaryProvider", ConstString("NSMutableIndexSet"), appkit_flags); AddSummary(appkit_category_sp, "@\"${var.month%d}/${var.day%d}/${var.year%d} ${var.hour%d}:${var.minute%d}:${var.second}\"", ConstString("CFGregorianDate"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBitVector.CFBitVector_SummaryProvider", ConstString("CFBitVectorRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBitVector.CFBitVector_SummaryProvider", ConstString("CFMutableBitVectorRef"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBitVector.CFBitVector_SummaryProvider", ConstString("__CFBitVector"), appkit_flags); - AddScriptSummary(appkit_category_sp, "CFBitVector.CFBitVector_SummaryProvider", ConstString("__CFMutableBitVector"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBitVector.CFBitVector_SummaryProvider", ConstString("CFBitVectorRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBitVector.CFBitVector_SummaryProvider", ConstString("CFMutableBitVectorRef"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBitVector.CFBitVector_SummaryProvider", ConstString("__CFBitVector"), appkit_flags); + AddScriptSummary(appkit_category_sp, "lldb.formatters.objc.CFBitVector.CFBitVector_SummaryProvider", ConstString("__CFMutableBitVector"), appkit_flags); TypeCategoryImpl::SharedPointer vectors_category_sp = GetCategory(m_vectortypes_category_name); diff --git a/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/lldb/source/Interpreter/ScriptInterpreterPython.cpp index 1865a3d3cc6..9272b7e8f7d 100644 --- a/lldb/source/Interpreter/ScriptInterpreterPython.cpp +++ b/lldb/source/Interpreter/ScriptInterpreterPython.cpp @@ -303,7 +303,7 @@ ScriptInterpreterPython::ScriptInterpreterPython (CommandInterpreter &interprete // and letting the individual formatter classes exploit APIs to check whether they can/cannot do their task run_string.Clear(); //run_string.Printf ("run_one_line (%s, 'from lldb.formatters import *; from lldb.formatters.objc import *; from lldb.formatters.cpp import *')", m_dictionary_name.c_str()); - run_string.Printf ("run_one_line (%s, 'import lldb.formatters.cache, lldb.formatters.Logger, lldb.formatters.attrib_fromdict, lldb.formatters.metrics')", m_dictionary_name.c_str()); + run_string.Printf ("run_one_line (%s, 'import lldb.runtime.objc, lldb.formatters, lldb.formatters.objc, lldb.formatters.cpp')", m_dictionary_name.c_str()); PyRun_SimpleString (run_string.GetData()); int new_count = Debugger::TestDebuggerRefCount(); |
