[Lldb-commits] [lldb] r164149 - in /lldb/trunk: examples/summaries/cocoa/NSIndexSet.py test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py

[Enrico Granata]

Author: enrico
Date: Tue Sep 18 13:06:37 2012
New Revision: 164149

URL: http://llvm.org/viewvc/llvm-project?rev=164149&view=rev
Log:
<rdar://problem/12161825> Rephrase formatter for NSIndexSet in terms of indexes instead of objects

Modified:
    lldb/trunk/examples/summaries/cocoa/NSIndexSet.py
    lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
    lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py

Modified: lldb/trunk/examples/summaries/cocoa/NSIndexSet.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/summaries/cocoa/NSIndexSet.py?rev=164149&r1=164148&r2=164149&view=diff
==============================================================================
--- lldb/trunk/examples/summaries/cocoa/NSIndexSet.py (original)
+++ lldb/trunk/examples/summaries/cocoa/NSIndexSet.py Tue Sep 18 13:06:37 2012
@@ -133,7 +133,7 @@
 		if isinstance(summary, basestring):
 			return summary
 		else:
-			summary = str(summary) + (' objects' if summary != 1 else ' object')
+			summary = str(summary) + (' indexes' if summary != 1 else ' index')
 		return summary
 	return 'Summary Unavailable'
 

Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py?rev=164149&r1=164148&r2=164149&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py Tue Sep 18 13:06:37 2012
@@ -338,7 +338,7 @@
         #self.runCmd("p (int)[imset count]")
 
         self.expect('frame variable iset1 iset2 imset',
-                    substrs = ['4 objects','512 objects','10 objects'])
+                    substrs = ['4 indexes','512 indexes','10 indexes'])
 
         self.expect('frame variable cupertino home europe',
                     substrs = ['@"America/Los_Angeles"',

Modified: lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py?rev=164149&r1=164148&r2=164149&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py (original)
+++ lldb/trunk/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py Tue Sep 18 13:06:37 2012
@@ -80,9 +80,9 @@
         self.expect('frame variable nscounted_set', matching=False,
                     substrs = ['1 objects'])
         self.expect('frame variable imset',
-                    substrs = ['1 object'])
+                    substrs = ['1 index'])
         self.expect('frame variable imset', matching=False,
-                    substrs = ['1 objects'])
+                    substrs = ['1 indexes'])
         self.expect('frame variable binheap_ref',
                     substrs = ['@"1 item"'])
         self.expect('frame variable binheap_ref', matching=False,