diff options
| author | Enrico Granata <egranata@apple.com> | 2012-09-18 18:06:37 +0000 |
|---|---|---|
| committer | Enrico Granata <egranata@apple.com> | 2012-09-18 18:06:37 +0000 |
| commit | 69277bac232367da156aa87ee2b1c8dbb5cd8c64 (patch) | |
| tree | 8f35e5f6574a0616ea7471ac523b4f6f118f8fbb | |
| parent | 43e0af06b4b69d784c87c4bfcaea01d825de1e65 (diff) | |
| download | bcm5719-llvm-69277bac232367da156aa87ee2b1c8dbb5cd8c64.tar.gz bcm5719-llvm-69277bac232367da156aa87ee2b1c8dbb5cd8c64.zip | |
<rdar://problem/12161825> Rephrase formatter for NSIndexSet in terms of indexes instead of objects
llvm-svn: 164149
3 files changed, 4 insertions, 4 deletions
diff --git a/lldb/examples/summaries/cocoa/NSIndexSet.py b/lldb/examples/summaries/cocoa/NSIndexSet.py index 11cbb20b63f..a1129014135 100644 --- 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 2f07bc8a1f1..b4340d5cb80 100644 --- 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 f1180aa4078..69964abcc47 100644 --- 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, |
