maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix single-line optimization for ObjC. 

Puts blocks always into multiple lines when they start with an ObjC
keyword or minus.

llvm-svn: 172238
This commit is contained in:
Manuel Klimek 2013-01-11 19:17:44 +00:00
parent aec10c6d44
commit 2acb7b7bb1
3 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Format/Format.cpp
View File

@ -1338,10 +1338,12 @@ private:
// brace.
FormatToken *Last = &Combined.RootToken;
bool AllowedTokens =
!Last->Tok.is(tok::kw_if) && !Last->Tok.is(tok::kw_while) &&
!Last->Tok.is(tok::kw_do) && !Last->Tok.is(tok::r_brace) &&
!Last->Tok.is(tok::kw_else) && !Last->Tok.is(tok::kw_try) &&
!Last->Tok.is(tok::kw_catch) && !Last->Tok.is(tok::kw_for);
Last->Tok.isNot(tok::kw_if) && Last->Tok.isNot(tok::kw_while) &&
Last->Tok.isNot(tok::kw_do) && Last->Tok.isNot(tok::r_brace) &&
Last->Tok.isNot(tok::kw_else) && Last->Tok.isNot(tok::kw_try) &&
Last->Tok.isNot(tok::kw_catch) && Last->Tok.isNot(tok::kw_for) &&
// This gets rid of all ObjC @ keywords and - based definitions.
Last->Tok.isNot(tok::at) && Last->Tok.isNot(tok::minus);
while (!Last->Children.empty())
Last = &Last->Children.back();
if (!Last->Tok.is(tok::l_brace))

6
clang/test/Index/comment-objc-decls.m
View File

@ -45,7 +45,7 @@
id IvarNSObject;
}
@end
// CHECK: Declaration>@interface NSObject { id IvarNSObject; }\n@end</Declaration>
// CHECK: Declaration>@interface NSObject {\n id IvarNSObject;\n}\n@end</Declaration>
// CHECK: <Declaration>id IvarNSObject</Declaration>
/**
@ -73,7 +73,7 @@
*/
@property (copy) id PropertyMyClass;
@end
// CHECK: <Declaration>@interface MyClass : NSObject &lt;MyProto&gt; { id IvarMyClass; }\n@end</Declaration>
// CHECK: <Declaration>@interface MyClass : NSObject &lt;MyProto&gt; {\n id IvarMyClass;\n}\n@end</Declaration>
// CHECK: <Declaration>id IvarMyClass</Declaration>
// CHECK: <Declaration>- (id)MethodMyClass;</Declaration>
// CHECK: <Declaration>+ (id)ClassMethodMyClass;</Declaration>
@ -90,7 +90,7 @@
id IvarMyClassExtension;
}
@end
// CHECK: <Declaration>@interface MyClass () { id IvarMyClassExtension; }\n@end</Declaration>
// CHECK: <Declaration>@interface MyClass () {\n id IvarMyClassExtension;\n}\n@end</Declaration>
// CHECK: <Declaration>id IvarMyClassExtension</Declaration>

56
clang/unittests/Format/FormatTest.cpp
View File

@ -405,9 +405,15 @@ TEST_F(FormatTest, FormatTryCatch) {
}
TEST_F(FormatTest, FormatObjCTryCatch) {
verifyFormat("@try { f(); }\n"
"@catch (NSException e) { @throw; }\n"
"@finally { exit(42); }");
verifyFormat("@try {\n"
" f();\n"
"}\n"
"@catch (NSException e) {\n"
" @throw;\n"
"}\n"
"@finally {\n"
" exit(42);\n"
"}");
}
TEST_F(FormatTest, StaticInitializers) {
@ -1305,27 +1311,39 @@ TEST_F(FormatTest, FormatObjCInterface) {
"+(id) init;\n"
"@end");
verifyFormat("@interface Foo { int _i; }\n"
verifyFormat("@interface Foo {\n"
" int _i;\n"
"}\n"
"+ (id)init;\n"
"@end");
verifyFormat("@interface Foo : Bar { int _i; }\n"
verifyFormat("@interface Foo : Bar {\n"
" int _i;\n"
"}\n"
"+ (id)init;\n"
"@end");
verifyFormat("@interface Foo : Bar <Baz, Quux> { int _i; }\n"
verifyFormat("@interface Foo : Bar <Baz, Quux> {\n"
" int _i;\n"
"}\n"
"+ (id)init;\n"
"@end");
verifyFormat("@interface Foo (HackStuff) { int _i; }\n"
verifyFormat("@interface Foo (HackStuff) {\n"
" int _i;\n"
"}\n"
"+ (id)init;\n"
"@end");
verifyFormat("@interface Foo () { int _i; }\n"
verifyFormat("@interface Foo () {\n"
" int _i;\n"
"}\n"
"+ (id)init;\n"
"@end");
verifyFormat("@interface Foo (HackStuff) <MyProtocol> { int _i; }\n"
verifyFormat("@interface Foo (HackStuff) <MyProtocol> {\n"
" int _i;\n"
"}\n"
"+ (id)init;\n"
"@end");
}
@ -1363,7 +1381,9 @@ TEST_F(FormatTest, FormatObjCImplementation) {
" return nil;\n"
"}\n"
"// Look, a comment!\n"
"- (int)answerWith:(int)i { return i; }\n"
"- (int)answerWith:(int)i {\n"
" return i;\n"
"}\n"
"@end");
verifyFormat("@implementation Foo\n"
@ -1375,11 +1395,15 @@ TEST_F(FormatTest, FormatObjCImplementation) {
"+ (id)init {}\n"
"@end");
verifyFormat("@implementation Foo { int _i; }\n"
verifyFormat("@implementation Foo {\n"
" int _i;\n"
"}\n"
"+ (id)init {}\n"
"@end");
verifyFormat("@implementation Foo : Bar { int _i; }\n"
verifyFormat("@implementation Foo : Bar {\n"
" int _i;\n"
"}\n"
"+ (id)init {}\n"
"@end");
@ -1469,14 +1493,18 @@ TEST_F(FormatTest, ObjCAt) {
TEST_F(FormatTest, ObjCSnippets) {
// FIXME: Make the uncommented lines below pass.
verifyFormat("@autoreleasepool { foo(); }");
verifyFormat("@autoreleasepool {\n"
" foo();\n"
"}");
verifyFormat("@class Foo, Bar;");
verifyFormat("@compatibility_alias AliasName ExistingClass;");
verifyFormat("@dynamic textColor;");
//verifyFormat("char *buf1 = @encode(int **);");
verifyFormat("Protocol *proto = @protocol(p1);");
//verifyFormat("SEL s = @selector(foo:);");
verifyFormat("@synchronized(self) { f(); }");
verifyFormat("@synchronized(self) {\n"
" f();\n"
"}");
verifyFormat("@synthesize dropArrowPosition = dropArrowPosition_;");
verifyGoogleFormat("@synthesize dropArrowPosition = dropArrowPosition_;");