*** This commit represents a complete reformatting of the LLDB source code
*** to conform to clang-format’s LLVM style. This kind of mass change has
*** two obvious implications:
Firstly, merging this particular commit into a downstream fork may be a huge
effort. Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit. The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):
find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;
The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.
Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit. There are alternatives available that will attempt
to look through this change and find the appropriate prior commit. YMMV.
llvm-svn: 280751
diff --git a/lldb/examples/summaries/cocoa/NSNotification.py b/lldb/examples/summaries/cocoa/NSNotification.py
index 33c2006..319d756 100644
--- a/lldb/examples/summaries/cocoa/NSNotification.py
+++ b/lldb/examples/summaries/cocoa/NSNotification.py
@@ -19,92 +19,108 @@
statistics.add_metric('unknown_class')
statistics.add_metric('code_notrun')
+
class NSConcreteNotification_SummaryProvider:
- def adjust_for_architecture(self):
- pass
- def __init__(self, valobj, params):
- logger = lldb.formatters.Logger.Logger()
- self.valobj = valobj;
- self.sys_params = params
- if not (self.sys_params.types_cache.id):
- self.sys_params.types_cache.id = self.valobj.GetType().GetBasicType(lldb.eBasicTypeObjCID)
- self.update();
+ def adjust_for_architecture(self):
+ pass
- def update(self):
- logger = lldb.formatters.Logger.Logger()
- self.adjust_for_architecture();
+ def __init__(self, valobj, params):
+ logger = lldb.formatters.Logger.Logger()
+ self.valobj = valobj
+ self.sys_params = params
+ if not (self.sys_params.types_cache.id):
+ self.sys_params.types_cache.id = self.valobj.GetType(
+ ).GetBasicType(lldb.eBasicTypeObjCID)
+ self.update()
- # skip the ISA and go to the name pointer
- def offset(self):
- logger = lldb.formatters.Logger.Logger()
- return self.sys_params.pointer_size
+ def update(self):
+ logger = lldb.formatters.Logger.Logger()
+ self.adjust_for_architecture()
- def name(self):
- logger = lldb.formatters.Logger.Logger()
- string_ptr = self.valobj.CreateChildAtOffset("name",
- self.offset(),
- self.sys_params.types_cache.id)
- return CFString.CFString_SummaryProvider(string_ptr,None)
+ # skip the ISA and go to the name pointer
+ def offset(self):
+ logger = lldb.formatters.Logger.Logger()
+ return self.sys_params.pointer_size
+
+ def name(self):
+ logger = lldb.formatters.Logger.Logger()
+ string_ptr = self.valobj.CreateChildAtOffset(
+ "name", self.offset(), self.sys_params.types_cache.id)
+ return CFString.CFString_SummaryProvider(string_ptr, None)
class NSNotificationUnknown_SummaryProvider:
- def adjust_for_architecture(self):
- pass
- def __init__(self, valobj, params):
- logger = lldb.formatters.Logger.Logger()
- self.valobj = valobj;
- self.sys_params = params
- self.update()
+ def adjust_for_architecture(self):
+ pass
- def update(self):
- logger = lldb.formatters.Logger.Logger()
- self.adjust_for_architecture();
+ def __init__(self, valobj, params):
+ logger = lldb.formatters.Logger.Logger()
+ self.valobj = valobj
+ self.sys_params = params
+ self.update()
- def name(self):
- logger = lldb.formatters.Logger.Logger()
- stream = lldb.SBStream()
- self.valobj.GetExpressionPath(stream)
- name_vo = self.valobj.CreateValueFromExpression("name","(NSString*)[" + stream.GetData() + " name]")
- if name_vo.IsValid():
- return CFString.CFString_SummaryProvider(name_vo,None)
- return '<variable is not NSNotification>'
+ def update(self):
+ logger = lldb.formatters.Logger.Logger()
+ self.adjust_for_architecture()
+
+ def name(self):
+ logger = lldb.formatters.Logger.Logger()
+ stream = lldb.SBStream()
+ self.valobj.GetExpressionPath(stream)
+ name_vo = self.valobj.CreateValueFromExpression(
+ "name", "(NSString*)[" + stream.GetData() + " name]")
+ if name_vo.IsValid():
+ return CFString.CFString_SummaryProvider(name_vo, None)
+ return '<variable is not NSNotification>'
def GetSummary_Impl(valobj):
- logger = lldb.formatters.Logger.Logger()
- global statistics
- class_data,wrapper =lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(valobj,statistics)
- if wrapper:
- return wrapper
-
- name_string = class_data.class_name()
- logger >> "class name is: " + str(name_string)
+ logger = lldb.formatters.Logger.Logger()
+ global statistics
+ class_data, wrapper = lldb.runtime.objc.objc_runtime.Utilities.prepare_class_detection(
+ valobj, statistics)
+ if wrapper:
+ return wrapper
- if name_string == 'NSConcreteNotification':
- wrapper = NSConcreteNotification_SummaryProvider(valobj, class_data.sys_params)
- statistics.metric_hit('code_notrun',valobj)
- else:
- wrapper = NSNotificationUnknown_SummaryProvider(valobj, class_data.sys_params)
- statistics.metric_hit('unknown_class',valobj.GetName() + " seen as " + name_string)
- return wrapper;
+ name_string = class_data.class_name()
+ logger >> "class name is: " + str(name_string)
-def NSNotification_SummaryProvider (valobj,dict):
- logger = lldb.formatters.Logger.Logger()
- provider = GetSummary_Impl(valobj);
- if provider != None:
- if isinstance(provider,lldb.runtime.objc.objc_runtime.SpecialSituation_Description):
- return provider.message()
- try:
- summary = provider.name();
- except:
- summary = None
- logger >> "got summary " + str(summary)
- if summary == None:
- summary = '<variable is not NSNotification>'
- return str(summary)
- return 'Summary Unavailable'
+ if name_string == 'NSConcreteNotification':
+ wrapper = NSConcreteNotification_SummaryProvider(
+ valobj, class_data.sys_params)
+ statistics.metric_hit('code_notrun', valobj)
+ else:
+ wrapper = NSNotificationUnknown_SummaryProvider(
+ valobj, class_data.sys_params)
+ statistics.metric_hit(
+ 'unknown_class',
+ valobj.GetName() +
+ " seen as " +
+ name_string)
+ return wrapper
-def __lldb_init_module(debugger,dict):
- debugger.HandleCommand("type summary add -F NSNotification.NSNotification_SummaryProvider NSNotification")
+
+def NSNotification_SummaryProvider(valobj, dict):
+ logger = lldb.formatters.Logger.Logger()
+ provider = GetSummary_Impl(valobj)
+ if provider is not None:
+ if isinstance(
+ provider,
+ lldb.runtime.objc.objc_runtime.SpecialSituation_Description):
+ return provider.message()
+ try:
+ summary = provider.name()
+ except:
+ summary = None
+ logger >> "got summary " + str(summary)
+ if summary is None:
+ summary = '<variable is not NSNotification>'
+ return str(summary)
+ return 'Summary Unavailable'
+
+
+def __lldb_init_module(debugger, dict):
+ debugger.HandleCommand(
+ "type summary add -F NSNotification.NSNotification_SummaryProvider NSNotification")