<rdar://problem/12161825> Rephrase formatter for NSIndexSet in terms of indexes inste...

llvm-svn: 164149

diff --git a/lldb/examples/summaries/cocoa/NSIndexSet.py b/lldb/examples/summaries/cocoa/NSIndexSet.py
index 11cbb20..a112901 100644 (file)
--- a/lldb/examples/summaries/cocoa/NSIndexSet.py
+++ b/lldb/examples/summaries/cocoa/NSIndexSet.py
@@ -133,7 +133,7 @@ def NSIndexSet_SummaryProvider (valobj,dict):
                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'
 

diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
index 2f07bc8..b4340d5 100644 (file)
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
+++ b/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
@@ -338,7 +338,7 @@ class ObjCDataFormatterTestCase(TestBase):
         #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"',

diff --git a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py b/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
index f1180aa..69964ab 100644 (file)
--- a/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
+++ b/lldb/test/functionalities/data-formatter/rdar-3534688/TestFormattersOneIsSingular.py
@@ -80,9 +80,9 @@ class DataFormatterOneIsSingularTestCase(TestBase):
         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,