Skip to content

Commit c52b9f9

Browse files
committed
Run clang-format on the PrintAsObjC.cpp file
1 parent 611b1fe commit c52b9f9

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

lib/PrintAsObjC/PrintAsObjC.cpp

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ namespace {
137137
using DelayedMemberSet = llvm::SmallSetVector<const ValueDecl *, 32>;
138138

139139
class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
140-
private TypeVisitor<ObjCPrinter, void,
140+
private TypeVisitor<ObjCPrinter, void,
141141
Optional<OptionalTypeKind>>
142142
{
143143
friend ASTVisitor;
@@ -528,7 +528,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
528528
return sel.getNumArgs() == 0 &&
529529
sel.getSelectorPieces().front().str() == "init";
530530
}
531-
531+
532532
void printAbstractFunctionAsMethod(AbstractFunctionDecl *AFD,
533533
bool isClassMethod,
534534
bool isNSUIntegerSubscript = false) {
@@ -553,7 +553,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
553553
auto resultTy = getForeignResultType(AFD, methodTy, errorConvention);
554554

555555
// Constructors and methods returning DynamicSelf return
556-
// instancetype.
556+
// instancetype.
557557
if (isa<ConstructorDecl>(AFD) ||
558558
(isa<FuncDecl>(AFD) && cast<FuncDecl>(AFD)->hasDynamicSelf())) {
559559
if (errorConvention && errorConvention->stripsResultOptionality()) {
@@ -774,8 +774,8 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
774774
No = false,
775775
Yes = true
776776
};
777-
778-
/// Returns \c true if anything was printed.
777+
778+
/// Returns \c true if anything was printed.
779779
bool printAvailability(const Decl *D, PrintLeadingSpace printLeadingSpace =
780780
PrintLeadingSpace::Yes) {
781781
bool hasPrintedAnything = false;
@@ -928,14 +928,15 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
928928
UnqualifiedLookup::Flags::TypeLookup);
929929
return lookup.getSingleTypeResult();
930930
}
931-
931+
932932
TypeDecl *typeDecl = declContext->getSelfNominalTypeDecl();
933-
933+
934934
const ValueDecl *renamedDecl = nullptr;
935935
SmallVector<ValueDecl *, 4> lookupResults;
936-
declContext->lookupQualified(typeDecl->getDeclaredInterfaceType(), renamedDeclName,
937-
NL_QualifiedDefault, nullptr, lookupResults);
938-
936+
declContext->lookupQualified(typeDecl->getDeclaredInterfaceType(),
937+
renamedDeclName, NL_QualifiedDefault, nullptr,
938+
lookupResults);
939+
939940
if (lookupResults.size() == 1) {
940941
auto candidate = lookupResults[0];
941942
if (!shouldInclude(candidate))
@@ -944,40 +945,41 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
944945
(candidate->isInstanceMember() !=
945946
cast<ValueDecl>(D)->isInstanceMember()))
946947
return nullptr;
947-
948+
948949
renamedDecl = candidate;
949950
} else {
950951
for (auto candidate : lookupResults) {
951952
if (!shouldInclude(candidate))
952953
continue;
953-
954+
954955
if (candidate->getKind() != D->getKind() ||
955956
(candidate->isInstanceMember() !=
956957
cast<ValueDecl>(D)->isInstanceMember()))
957958
continue;
958-
959+
959960
if (isa<AbstractFunctionDecl>(candidate)) {
960961
auto cParams = cast<AbstractFunctionDecl>(candidate)->getParameters();
961962
auto dParams = cast<AbstractFunctionDecl>(D)->getParameters();
962-
963+
963964
if (cParams->size() != dParams->size())
964965
continue;
965-
966+
966967
bool hasSameParameterTypes = true;
967968
for (auto index : indices(*cParams)) {
968969
auto cParamsType = cParams->get(index)->getType();
969970
auto dParamsType = dParams->get(index)->getType();
970-
if (!cParamsType->matchesParameter(dParamsType, TypeMatchOptions())) {
971+
if (!cParamsType->matchesParameter(dParamsType,
972+
TypeMatchOptions())) {
971973
hasSameParameterTypes = false;
972974
break;
973975
}
974976
}
975-
977+
976978
if (!hasSameParameterTypes) {
977979
continue;
978980
}
979981
}
980-
982+
981983
if (renamedDecl) {
982984
// If we found a duplicated candidate then we would silently fail.
983985
renamedDecl = nullptr;
@@ -993,7 +995,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
993995
bool includeQuotes) {
994996
assert(!AvAttr->Rename.empty());
995997

996-
const swift::ValueDecl *renamedDecl =
998+
const ValueDecl *renamedDecl =
997999
getRenameDecl(D, parseDeclName(AvAttr->Rename));
9981000

9991001
if (renamedDecl) {
@@ -1005,7 +1007,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
10051007
printEncodedString(AvAttr->Rename, includeQuotes);
10061008
}
10071009
}
1008-
1010+
10091011
void printSwift3ObjCDeprecatedInference(ValueDecl *VD) {
10101012
const LangOptions &langOpts = M.getASTContext().LangOpts;
10111013
if (!langOpts.EnableSwift3ObjCInference ||
@@ -1514,9 +1516,9 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
15141516
MAP(UnsafeMutableRawPointer, "void *", true);
15151517

15161518
Identifier ID_ObjectiveC = ctx.Id_ObjectiveC;
1517-
specialNames[{ID_ObjectiveC, ctx.getIdentifier("ObjCBool")}]
1519+
specialNames[{ID_ObjectiveC, ctx.getIdentifier("ObjCBool")}]
15181520
= { "BOOL", false};
1519-
specialNames[{ID_ObjectiveC, ctx.getIdentifier("Selector")}]
1521+
specialNames[{ID_ObjectiveC, ctx.getIdentifier("Selector")}]
15201522
= { "SEL", true };
15211523
specialNames[{ID_ObjectiveC,
15221524
ctx.getIdentifier(
@@ -1643,7 +1645,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
16431645
os << clangDecl->getKindName() << " ";
16441646
}
16451647

1646-
void visitStructType(StructType *ST,
1648+
void visitStructType(StructType *ST,
16471649
Optional<OptionalTypeKind> optionalKind) {
16481650
const StructDecl *SD = ST->getStructOrBoundGenericStruct();
16491651

@@ -1867,7 +1869,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
18671869
visitExistentialType(PT, optionalKind, /*isMetatype=*/false);
18681870
}
18691871

1870-
void visitProtocolCompositionType(ProtocolCompositionType *PCT,
1872+
void visitProtocolCompositionType(ProtocolCompositionType *PCT,
18711873
Optional<OptionalTypeKind> optionalKind) {
18721874
visitExistentialType(PCT, optionalKind, /*isMetatype=*/false);
18731875
}
@@ -1878,7 +1880,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
18781880
visitExistentialType(instanceTy, optionalKind, /*isMetatype=*/true);
18791881
}
18801882

1881-
void visitMetatypeType(MetatypeType *MT,
1883+
void visitMetatypeType(MetatypeType *MT,
18821884
Optional<OptionalTypeKind> optionalKind) {
18831885
Type instanceTy = MT->getInstanceType();
18841886
if (auto classTy = instanceTy->getAs<ClassType>()) {
@@ -1913,7 +1915,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
19131915
os << cast<clang::ObjCTypeParamDecl>(decl->getClangDecl())->getName();
19141916
printNullability(optionalKind);
19151917
}
1916-
1918+
19171919
void printFunctionType(FunctionType *FT, char pointerSigil,
19181920
Optional<OptionalTypeKind> optionalKind) {
19191921
visitPart(FT->getResult(), OTK_None);
@@ -1922,7 +1924,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
19221924
openFunctionTypes.push_back(FT);
19231925
}
19241926

1925-
void visitFunctionType(FunctionType *FT,
1927+
void visitFunctionType(FunctionType *FT,
19261928
Optional<OptionalTypeKind> optionalKind) {
19271929
switch (FT->getRepresentation()) {
19281930
case AnyFunctionType::Representation::Thin:
@@ -1966,18 +1968,18 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
19661968
visitPart(PT->getSinglyDesugaredType(), optionalKind);
19671969
}
19681970

1969-
void visitSyntaxSugarType(SyntaxSugarType *SST,
1971+
void visitSyntaxSugarType(SyntaxSugarType *SST,
19701972
Optional<OptionalTypeKind> optionalKind) {
19711973
visitPart(SST->getSinglyDesugaredType(), optionalKind);
19721974
}
19731975

1974-
void visitDynamicSelfType(DynamicSelfType *DST,
1976+
void visitDynamicSelfType(DynamicSelfType *DST,
19751977
Optional<OptionalTypeKind> optionalKind) {
19761978
printNullability(optionalKind, NullabilityPrintKind::ContextSensitive);
19771979
os << "instancetype";
19781980
}
19791981

1980-
void visitReferenceStorageType(ReferenceStorageType *RST,
1982+
void visitReferenceStorageType(ReferenceStorageType *RST,
19811983
Optional<OptionalTypeKind> optionalKind) {
19821984
visitPart(RST->getReferentType(), optionalKind);
19831985
}
@@ -2015,7 +2017,7 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
20152017
/// finishFunctionType()). If only a part of a type is being printed, use
20162018
/// visitPart().
20172019
public:
2018-
void print(Type ty, Optional<OptionalTypeKind> optionalKind,
2020+
void print(Type ty, Optional<OptionalTypeKind> optionalKind,
20192021
Identifier name = Identifier(),
20202022
IsFunctionParam_t isFuncParam = IsNotFunctionParam) {
20212023
PrettyStackTraceType trace(M.getASTContext(), "printing", ty);
@@ -2867,9 +2869,9 @@ class ModuleWriter {
28672869
// FIXME: This will end up taking linear time.
28682870
auto lhsMembers = cast<ExtensionDecl>(*lhs)->getMembers();
28692871
auto rhsMembers = cast<ExtensionDecl>(*rhs)->getMembers();
2870-
unsigned numLHSMembers = std::distance(lhsMembers.begin(),
2872+
unsigned numLHSMembers = std::distance(lhsMembers.begin(),
28712873
lhsMembers.end());
2872-
unsigned numRHSMembers = std::distance(rhsMembers.begin(),
2874+
unsigned numRHSMembers = std::distance(rhsMembers.begin(),
28732875
rhsMembers.end());
28742876
if (numLHSMembers != numRHSMembers)
28752877
return numLHSMembers < numRHSMembers ? Descending : Ascending;

0 commit comments

Comments
 (0)