Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-12 09:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASTPrinter: Objective-C method declarations don't need a space after

Browse Source 
the return type

rdar://32332039

llvm-svn: 304553
This commit is contained in:
Alex Lorenz 2017-06-02 15:02:59 +00:00
parent 57d8a417e7
commit bbf4f7091f
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/AST/DeclPrinter.cpp
View File

@ -1189,7 +1189,9 @@ void DeclPrinter::VisitObjCMethodDecl(ObjCMethodDecl *OMD) {
for (const auto *PI : OMD->parameters()) { for (const auto *PI : OMD->parameters()) {
// FIXME: selector is missing here! // FIXME: selector is missing here!
pos = name.find_first_of(':', lastPos); pos = name.find_first_of(':', lastPos);
Out << " " << name.substr(lastPos, pos - lastPos) << ':'; if (lastPos != 0)
Out << " ";
Out << name.substr(lastPos, pos - lastPos) << ':';
PrintObjCMethodType(OMD->getASTContext(), PrintObjCMethodType(OMD->getASTContext(),
PI->getObjCDeclQualifier(), PI->getObjCDeclQualifier(),
PI->getType()); PI->getType());
@ -1198,7 +1200,7 @@ void DeclPrinter::VisitObjCMethodDecl(ObjCMethodDecl *OMD) {
} }
if (OMD->param_begin() == OMD->param_end()) if (OMD->param_begin() == OMD->param_end())
Out << " " << name; Out << name;
if (OMD->isVariadic()) if (OMD->isVariadic())
Out << ", ..."; Out << ", ...";

15
clang/test/Misc/ast-print-objectivec.m
View File

@ -17,25 +17,30 @@
@implementation I @implementation I
- (void)MethP __attribute__((availability(macosx,introduced=10.1.0,deprecated=10.2))) {} - (void)MethP __attribute__((availability(macosx,introduced=10.1.0,deprecated=10.2))) {}
- (void)MethI __attribute__((availability(macosx,introduced=10.1.0,deprecated=10.2))) {} - (void)MethI __attribute__((availability(macosx,introduced=10.1.0,deprecated=10.2))) {}
- (void)methodWithArg:(int)x andAnotherOne:(int)y { }
@end @end
// CHECK: @protocol P // CHECK: @protocol P
// CHECK: - (void) MethP __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2))); // CHECK: - (void)MethP __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2)));
// CHECK: @end // CHECK: @end
// CHECK: @interface I : NSObject<P> // CHECK: @interface I : NSObject<P>
// CHECK: - (void) MethI __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2))); // CHECK: - (void)MethI __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2)));
// CHECK: @end // CHECK: @end
// CHECK: @interface I(CAT) // CHECK: @interface I(CAT)
// CHECK: - (void) MethCAT __attribute__((availability(macos, introduced=10_1_0, deprecated=10_2))); // CHECK: - (void)MethCAT __attribute__((availability(macos, introduced=10_1_0, deprecated=10_2)));
// CHECK: @end // CHECK: @end
// CHECK: @implementation I // CHECK: @implementation I
// CHECK: - (void) MethP __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2))) { // CHECK: - (void)MethP __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2))) {
// CHECK: } // CHECK: }
// CHECK: - (void) MethI __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2))) { // CHECK: - (void)MethI __attribute__((availability(macos, introduced=10.1.0, deprecated=10.2))) {
// CHECK: }
// CHECK: - (void)methodWithArg:(int)x andAnotherOne:(int)y {
// CHECK: } // CHECK: }
// CHECK: @end // CHECK: @end

4
clang/test/Modules/lookup.m
View File

@ -14,7 +14,7 @@ void test(id x) {
// expected-note@Inputs/lookup_right.h:3{{also found}} // expected-note@Inputs/lookup_right.h:3{{also found}}
} }
// CHECK-PRINT: - (int) method; // CHECK-PRINT: - (int)method;
// CHECK-PRINT: - (double) method // CHECK-PRINT: - (double)method
// CHECK-PRINT: void test(id x) // CHECK-PRINT: void test(id x)

2
clang/unittests/AST/DeclPrinterTest.cpp
View File

@ -1228,7 +1228,7 @@ TEST(DeclPrinter, TestObjCMethod1) {
"@end\n", "@end\n",
namedDecl(hasName("A:inRange:"), namedDecl(hasName("A:inRange:"),
hasDescendant(namedDecl(hasName("printThis")))).bind("id"), hasDescendant(namedDecl(hasName("printThis")))).bind("id"),
"- (int) A:(id)anObject inRange:(long)range")); "- (int)A:(id)anObject inRange:(long)range"));
} }
TEST(DeclPrinter, TestObjCProtocol1) { TEST(DeclPrinter, TestObjCProtocol1) {