Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-01 12:43:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Objective-C SDK modernizer. When modernizing an enum to

Browse Source 
NS_ENUM/NS_OPTIONS use the underlying type if there is 
no associated type. rdar://19198042

llvm-svn: 223934
This commit is contained in:
Fariborz Jahanian 2014-12-10 18:25:24 +00:00
parent 8872d20788
commit 1406c878cb
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
clang/lib/ARCMigrate/ObjCMT.cpp
View File

@ -763,12 +763,21 @@ static bool rewriteToNSEnumDecl(const EnumDecl *EnumDcl,
return false;
}
static void rewriteToNSMacroDecl(const EnumDecl *EnumDcl,
static void rewriteToNSMacroDecl(ASTContext &Ctx,
const EnumDecl *EnumDcl,
const TypedefDecl *TypedefDcl,
const NSAPI &NS, edit::Commit &commit,
bool IsNSIntegerType) {
std::string ClassString =
IsNSIntegerType ? "NS_ENUM(NSInteger, " : "NS_OPTIONS(NSUInteger, ";
QualType EnumUnderlyingT = EnumDcl->getPromotionType();
assert(!EnumUnderlyingT.isNull()
&& "rewriteToNSMacroDecl - underlying enum type is null");
PrintingPolicy Policy(Ctx.getPrintingPolicy());
std::string TypeString = EnumUnderlyingT.getAsString(Policy);
std::string ClassString = IsNSIntegerType ? "NS_ENUM(" : "NS_OPTIONS(";
ClassString += TypeString;
ClassString += ", ";
ClassString += TypedefDcl->getIdentifier()->getName();
ClassString += ')';
SourceRange R(EnumDcl->getLocStart(), EnumDcl->getLocStart());
@ -927,7 +936,7 @@ bool ObjCMigrateASTConsumer::migrateNSEnumDecl(ASTContext &Ctx,
if (!InsertFoundation(Ctx, TypedefDcl->getLocStart()))
return false;
edit::Commit commit(*Editor);
rewriteToNSMacroDecl(EnumDcl, TypedefDcl, *NSAPIObj, commit, !NSOptions);
rewriteToNSMacroDecl(Ctx, EnumDcl, TypedefDcl, *NSAPIObj, commit, !NSOptions);
Editor->commit(commit);
return true;
}

30
clang/test/ARCMT/objcmt-ns-macros.m.result
View File

@ -37,7 +37,7 @@ typedef NS_ENUM(NSUInteger, UITableViewCellStyle) {
UIViewAutoresizingFlexibleBottomMargin
};
typedef NS_ENUM(NSInteger, UIViewAnimationTransition) {
typedef NS_ENUM(unsigned int, UIViewAnimationTransition) {
UIViewAnimationTransitionNone,
UIViewAnimationTransitionFlipFromLeft,
UIViewAnimationTransitionFlipFromRight,
@ -45,7 +45,7 @@ typedef NS_ENUM(NSInteger, UIViewAnimationTransition) {
UIViewAnimationTransitionCurlDown,
};
typedef NS_OPTIONS(NSUInteger, UITableView) {
typedef NS_OPTIONS(unsigned int, UITableView) {
UIViewOne = 0,
UIViewTwo = 1 << 0,
UIViewThree = 1 << 1,
@ -62,7 +62,7 @@ typedef NS_OPTIONS(NSUInteger, UI) {
UIFour = 0x100
};
typedef NS_OPTIONS(NSUInteger, UIPOWER2) {
typedef NS_OPTIONS(unsigned int, UIPOWER2) {
UIP2One = 0,
UIP2Two = 0x1,
UIP2three = 0x8,
@ -80,7 +80,7 @@ typedef NS_ENUM(NSInteger, UIK) {
UIKTwo = 2,
};
typedef NS_ENUM(NSInteger, NSTickMarkPosition) {
typedef NS_ENUM(unsigned int, NSTickMarkPosition) {
NSTickMarkBelow = 0,
NSTickMarkAbove = 1,
NSTickMarkLeft = NSTickMarkAbove,
@ -150,7 +150,7 @@ typedef NS_OPTIONS(NSUInteger, NSFOptions) {
NSFCopyIn NS_ENUM_AVAILABLE(10_5, 6_0) = (1UL << 16),
};
typedef NS_ENUM(NSInteger, UIP) {
typedef NS_ENUM(unsigned int, UIP) {
UIP0One = 0,
UIP0Two = 1,
UIP0Three = 2,
@ -158,7 +158,7 @@ typedef NS_ENUM(NSInteger, UIP) {
UIP0Last = 0x100
};
typedef NS_OPTIONS(NSUInteger, UIP_3) {
typedef NS_OPTIONS(unsigned int, UIP_3) {
UIPZero = 0x0,
UIPOne = 0x1,
UIPTwo = 0x2,
@ -166,7 +166,7 @@ typedef NS_OPTIONS(NSUInteger, UIP_3) {
UIPHundred = 0x100
};
typedef NS_ENUM(NSInteger, UIP4_3) {
typedef NS_ENUM(unsigned int, UIP4_3) {
UIP4Zero = 0x0,
UIP4One = 0x1,
UIP4Two = 0x2,
@ -174,14 +174,14 @@ typedef NS_ENUM(NSInteger, UIP4_3) {
UIP4Hundred = 100
};
typedef NS_OPTIONS(NSUInteger, UIP5_3) {
typedef NS_OPTIONS(unsigned int, UIP5_3) {
UIP5Zero = 0x0,
UIP5Two = 0x2,
UIP510 = 0x3,
UIP5Hundred = 0x4
};
typedef NS_ENUM(NSInteger, UIP6_3) {
typedef NS_ENUM(unsigned int, UIP6_3) {
UIP6Zero = 0x0,
UIP6One = 0x1,
UIP6Two = 0x2,
@ -189,7 +189,7 @@ typedef NS_ENUM(NSInteger, UIP6_3) {
UIP6Hundred = 0x100
};
typedef NS_ENUM(NSInteger, UIP7_3) {
typedef NS_ENUM(unsigned int, UIP7_3) {
UIP7Zero = 0x0,
UIP7One = 1,
UIP7Two = 0x2,
@ -198,7 +198,7 @@ typedef NS_ENUM(NSInteger, UIP7_3) {
};
typedef NS_ENUM(NSInteger, UIP8_3) {
typedef NS_ENUM(unsigned int, UIP8_3) {
Random = 0,
Random1 = 2,
Random2 = 4,
@ -298,19 +298,19 @@ typedef enum : NSUInteger {
} Thing;
// rdar://18498539
typedef NS_ENUM(NSInteger, NumericEnum) {
typedef NS_ENUM(unsigned int, NumericEnum) {
one = 1
};
typedef NS_ENUM(NSInteger, NumericEnum2) {
typedef NS_ENUM(unsigned int, NumericEnum2) {
Two = 2
};
typedef NS_ENUM(NSInteger, NumericEnum3) {
typedef NS_ENUM(unsigned int, NumericEnum3) {
Three = 3
};
typedef NS_OPTIONS(NSUInteger, NumericEnum4) {
typedef NS_OPTIONS(unsigned int, NumericEnum4) {
Four = 4
};

6
clang/test/ARCMT/objcmt-undefined-ns-macros.m.result
View File

@ -18,9 +18,9 @@ typedef NS_OPTIONS(NSUInteger, UITableStyle) {
typedef
NS_ENUM(NSInteger, NumericEnum2) { two = 1 };
NS_ENUM(unsigned int, NumericEnum2) { two = 1 };
typedef NS_ENUM(NSInteger, NumericEnum3) { three = 1 };
typedef NS_ENUM(unsigned int, NumericEnum3) { three = 1 };
typedef NS_ENUM(NSInteger, NumericEnum4) { four = 1 };
typedef NS_ENUM(unsigned int, NumericEnum4) { four = 1 };