From c02bfb9a85465a58730ef15a66e85aa7a627762e Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Tue, 10 Sep 2013 18:39:32 +0000 Subject: [PATCH] ObjectiveC migrator: rename inferred isXXX property, with a suitable 'getter' attribute. llvm-svn: 190420 --- clang/lib/ARCMigrate/ObjCMT.cpp | 2 +- clang/test/ARCMT/objcmt-property.m | 1 + clang/test/ARCMT/objcmt-property.m.result | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/lib/ARCMigrate/ObjCMT.cpp b/clang/lib/ARCMigrate/ObjCMT.cpp index f91741abf894..efe2e858c42b 100644 --- a/clang/lib/ARCMigrate/ObjCMT.cpp +++ b/clang/lib/ARCMigrate/ObjCMT.cpp @@ -770,7 +770,7 @@ bool ObjCMigrateASTConsumer::migrateProperty(ASTContext &Ctx, // as a 'readonly' property. edit::Commit commit(*Editor); rewriteToObjCProperty(Method, 0 /*SetterMethod*/, *NSAPIObj, commit, - false /*GetterHasIsPrefix*/); + GetterHasIsPrefix); Editor->commit(commit); return true; } diff --git a/clang/test/ARCMT/objcmt-property.m b/clang/test/ARCMT/objcmt-property.m index 2f655b9a2a3b..8f9c5f7fc50d 100644 --- a/clang/test/ARCMT/objcmt-property.m +++ b/clang/test/ARCMT/objcmt-property.m @@ -97,6 +97,7 @@ typedef char BOOL; - (id) object; + (double) D; - (void *)JSObject WEBKIT_OBJC_METHOD_ANNOTATION(AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER); +- (BOOL)isIgnoringInteractionEvents; @end diff --git a/clang/test/ARCMT/objcmt-property.m.result b/clang/test/ARCMT/objcmt-property.m.result index 751b85e3db62..a2cecd5dcf86 100644 --- a/clang/test/ARCMT/objcmt-property.m.result +++ b/clang/test/ARCMT/objcmt-property.m.result @@ -89,7 +89,7 @@ typedef char BOOL; @property(nonatomic, readonly) id isAnObject; - (void)setAnObject : (id) object; -@property(nonatomic, readonly) BOOL isinValid; +@property(nonatomic, getter=isinValid, readonly) BOOL inValid; - (void) setInValid : (BOOL) arg; - (void) Nothing; @@ -97,6 +97,7 @@ typedef char BOOL; @property(nonatomic, readonly) id object; + (double) D; @property(nonatomic, readonly) void * JSObject WEBKIT_OBJC_METHOD_ANNOTATION(AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER); +@property(nonatomic, getter=isIgnoringInteractionEvents, readonly) BOOL ignoringInteractionEvents; @end