The Cocoa formatters now provide error messages for many of the common things-went-wrong situations. Previously they would say nothing or log failures to the Python console

llvm-svn: 152673

1 files changed, 33 insertions, 31 deletions

diff --git a/lldb/examples/summaries/cocoa/NSSet.py b/lldb/examples/summaries/cocoa/NSSet.py
index ea410cf46f2..567e35e7431 100644
--- a/lldb/examples/summaries/cocoa/NSSet.py
+++ b/lldb/examples/summaries/cocoa/NSSet.py
@@ -1,3 +1,10 @@
+"""
+LLDB AppKit formatters
+
+part of The LLVM Compiler Infrastructure
+This file is distributed under the University of Illinois Open Source
+License. See LICENSE.TXT for details.
+"""
 # summary provider for NSSet
 import lldb
 import ctypes
@@ -63,8 +70,10 @@ class NSSetUnknown_SummaryProvider:
 		stream = lldb.SBStream()
 		self.valobj.GetExpressionPath(stream)
 		expr = "(int)[" + stream.GetData() + " count]"
-		num_children_vo = self.valobj.CreateValueFromExpression("count",expr);
-		return num_children_vo.GetValueAsUnsigned(0)
+		num_children_vo = self.valobj.CreateValueFromExpression("count",expr)
+		if num_children_vo.IsValid():
+			return num_children_vo.GetValueAsUnsigned(0)
+		return '<variable is not NSSet>'
 
 class NSSetI_SummaryProvider:
 	def adjust_for_architecture(self):
@@ -158,22 +167,9 @@ class NSCountedSet_SummaryProvider:
 
 def GetSummary_Impl(valobj):
 	global statistics
-	class_data = objc_runtime.ObjCRuntime(valobj)
-	if class_data.is_valid() == False:
-		statistics.metric_hit('invalid_pointer',valobj)
-		wrapper = None
-		return
-	class_data = class_data.read_class_data()
-	if class_data.is_valid() == False:
-		statistics.metric_hit('invalid_isa',valobj)
-		wrapper = None
-		return
-	if class_data.is_kvo():
-		class_data = class_data.get_superclass()
-	if class_data.is_valid() == False:
-		statistics.metric_hit('invalid_isa',valobj)
-		wrapper = None
-		return
+	class_data,wrapper = objc_runtime.Utilities.prepare_class_detection(valobj,statistics)
+	if wrapper:
+		return wrapper
 	
 	name_string = class_data.class_name()
 	if name_string == '__NSCFSet':
@@ -197,20 +193,24 @@ def GetSummary_Impl(valobj):
 def NSSet_SummaryProvider (valobj,dict):
 	provider = GetSummary_Impl(valobj);
 	if provider != None:
-	    #try:
-	    summary = provider.count();
-	    #except:
-	    #    summary = None
-	    if summary == None:
-	        summary = 'no valid set here'
-	    else:
-	        summary = str(summary) + (' objects' if summary > 1 else ' object')
-	    return summary
-	return ''
+		try:
+			summary = provider.count();
+		except:
+			summary = None
+		if summary == None:
+			summary = '<variable is not NSSet>'
+		if isinstance(summary, basestring):
+			return summary
+		else:
+			summary = str(summary) + (' objects' if summary != 1 else ' object')
+		return summary
+	return 'Summary Unavailable'
 
 def NSSet_SummaryProvider2 (valobj,dict):
 	provider = GetSummary_Impl(valobj);
 	if provider != None:
+		if isinstance(provider,objc_runtime.SpecialSituation_Description):
+			return provider.message()
 		try:
 			summary = provider.count();
 		except:
@@ -221,13 +221,15 @@ def NSSet_SummaryProvider2 (valobj,dict):
 		# experimentation (if counts start looking weird, then most probably
 		#                  the mask needs to be changed)
 		if summary == None:
-			summary = 'no valid set here'
+			summary = '<variable is not CFSet>'
+		if isinstance(summary, basestring):
+			return summary
 		else:
 			if provider.sys_params.is_64_bit:
 				summary = summary & ~0x1fff000000000000
-		 	summary = '@"' + str(summary) + (' values"' if summary > 1 else ' value"')
+		 	summary = '@"' + str(summary) + (' values"' if summary != 1 else ' value"')
 		return summary
-	return ''
+	return 'Summary Unavailable'
 
 
 def __lldb_init_module(debugger,dict):