r191240 - ObjectiveC migrator. When migrating to property declaration
Fariborz Jahanian
fjahanian at apple.com
Mon Sep 23 16:18:46 PDT 2013
Author: fjahanian
Date: Mon Sep 23 18:18:46 2013
New Revision: 191240
URL: http://llvm.org/viewvc/llvm-project?rev=191240&view=rev
Log:
ObjectiveC migrator. When migrating to property declaration
use Cocoa's naming convention for properties of ObjC
object type. // rdar://15045005
Modified:
cfe/trunk/lib/ARCMigrate/ObjCMT.cpp
cfe/trunk/test/ARCMT/objcmt-property.m.result
Modified: cfe/trunk/lib/ARCMigrate/ObjCMT.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ObjCMT.cpp?rev=191240&r1=191239&r2=191240&view=diff
==============================================================================
--- cfe/trunk/lib/ARCMigrate/ObjCMT.cpp (original)
+++ cfe/trunk/lib/ARCMigrate/ObjCMT.cpp Mon Sep 23 18:18:46 2013
@@ -304,7 +304,9 @@ static bool rewriteToObjCProperty(const
}
PropertyString += " ";
PropertyString += RT.getAsString(Context.getPrintingPolicy());
- PropertyString += " ";
+ char LastChar = PropertyString[PropertyString.size()-1] ;
+ if (LastChar != '*')
+ PropertyString += " ";
if (LengthOfPrefix > 0) {
// property name must strip off "is" and lower case the first character
// after that; e.g. isContinuous will become continuous.
Modified: cfe/trunk/test/ARCMT/objcmt-property.m.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/objcmt-property.m.result?rev=191240&r1=191239&r2=191240&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/objcmt-property.m.result (original)
+++ cfe/trunk/test/ARCMT/objcmt-property.m.result Mon Sep 23 18:18:46 2013
@@ -22,21 +22,21 @@ typedef char BOOL;
int ivarVal;
}
- at property(nonatomic, weak) NSString * WeakProp;
+ at property(nonatomic, weak) NSString *WeakProp;
- at property(nonatomic, retain) NSString * StrongProp;
+ at property(nonatomic, retain) NSString *StrongProp;
- (NSString *) UnavailProp __attribute__((unavailable));
- (void) setUnavailProp : (NSString *)Val;
- at property(nonatomic, retain) NSString * UnavailProp1 __attribute__((unavailable));
+ at property(nonatomic, retain) NSString *UnavailProp1 __attribute__((unavailable));
- (NSString *) UnavailProp2;
- (void) setUnavailProp2 : (NSString *)Val __attribute__((unavailable));
- at property(nonatomic, copy) NSDictionary * undoAction;
+ at property(nonatomic, copy) NSDictionary *undoAction;
@end
@@ -56,10 +56,10 @@ typedef char BOOL;
- at property(nonatomic, retain) NSArray * names2;
- at property(nonatomic, retain) NSArray * names3;
- at property(nonatomic, retain) NSArray * names4;
- at property(nonatomic, retain) NSArray * names1;
+ at property(nonatomic, retain) NSArray *names2;
+ at property(nonatomic, retain) NSArray *names3;
+ at property(nonatomic, retain) NSArray *names4;
+ at property(nonatomic, retain) NSArray *names1;
@end
// Properties that contain the name "delegate" or "dataSource",
@@ -97,13 +97,13 @@ typedef char BOOL;
@property(nonatomic, readonly) int Length;
@property(nonatomic, readonly) id object;
+ (double) D;
- at property(nonatomic, readonly) void * JSObject WEBKIT_OBJC_METHOD_ANNOTATION(AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER);
+ at property(nonatomic, readonly) void *JSObject WEBKIT_OBJC_METHOD_ANNOTATION(AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER);
@property(nonatomic, getter=isIgnoringInteractionEvents, readonly) BOOL ignoringInteractionEvents;
- at property(nonatomic, getter=getStringValue, retain) NSString * stringValue;
+ at property(nonatomic, getter=getStringValue, retain) NSString *stringValue;
@property(nonatomic, getter=getCounterValue, readonly) BOOL counterValue;
- at property(nonatomic, getter=getns_dixtionary, readonly) NSDictionary * ns_dixtionary;
+ at property(nonatomic, getter=getns_dixtionary, readonly) NSDictionary *ns_dixtionary;
- (BOOL)is3bar; // watch out
- (NSString *)get3foo; // watch out
@@ -187,7 +187,7 @@ DEPRECATED
- (NSURL *)appStoreReceiptURL NS_AVAILABLE;
- (void) setAppStoreReceiptURL : (NSURL *)object;
- at property(nonatomic, retain) NSURL * appStoreReceiptURLX NS_AVAILABLE;
+ at property(nonatomic, retain) NSURL *appStoreReceiptURLX NS_AVAILABLE;
// Do not infer a property.
More information about the cfe-commits
mailing list