Skip to content

Commit 43f078e

Browse files
benlangmuirbenlangmuir
committed
[ReconstructType] Remove an unnecessary typedef NFC
Eventually all three of these should go away. I want to keep ConstString around for now, because it makes it easier to audit where you should consider using a StringRef. I'm hoping only a few of those actually need std::string.
1 parent acbebfa commit 43f078e

File tree

1 file changed

+40
-38
lines changed

1 file changed

+40
-38
lines changed

‎lib/IDE/ReconstructType.cpp

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@
2424

2525
using namespace swift;
2626

27+
// FIXME: replace with std::string and StringRef as appropriate to each case.
2728
typedef const std::string ConstString;
29+
30+
// FIXME: remove log parameters or replace with something useful.
2831
typedef void Log;
29-
typedef ASTContext SwiftASTContext;
3032

3133
static std::string stringWithFormat(const std::string fmt_str, ...) {
3234
int final_n, n = ((int)fmt_str.size()) * 2;
@@ -623,7 +625,7 @@ struct VisitNodeResult {
623625
};
624626

625627
static Identifier
626-
GetIdentifier (SwiftASTContext *ast,
628+
GetIdentifier (ASTContext *ast,
627629
const DeclsLookupSource::PrivateDeclIdentifier& priv_decl_id)
628630
{
629631
do {
@@ -637,7 +639,7 @@ GetIdentifier (SwiftASTContext *ast,
637639
}
638640

639641
static bool
640-
FindFirstNamedDeclWithKind (SwiftASTContext *ast,
642+
FindFirstNamedDeclWithKind (ASTContext *ast,
641643
const StringRef &name,
642644
DeclKind decl_kind,
643645
VisitNodeResult &result,
@@ -778,7 +780,7 @@ FindFirstNamedDeclWithKind (SwiftASTContext *ast,
778780
}
779781

780782
static size_t
781-
FindNamedDecls (SwiftASTContext *ast,
783+
FindNamedDecls (ASTContext *ast,
782784
const StringRef &name,
783785
VisitNodeResult &result,
784786
DeclsLookupSource::PrivateDeclIdentifier priv_decl_id = DeclsLookupSource::PrivateDeclIdentifier())
@@ -948,15 +950,15 @@ FixCallingConv (Decl *in_decl, TypeBase *in_type)
948950
}
949951

950952
static void
951-
VisitNode (SwiftASTContext *ast,
953+
VisitNode (ASTContext *ast,
952954
std::vector<Demangle::NodePointer> &nodes,
953955
VisitNodeResult &result,
954956
const VisitNodeResult &generic_context, // set by GenericType case
955957
Log *log);
956958

957959

958960
static void
959-
VisitNodeAddressor (SwiftASTContext *ast,
961+
VisitNodeAddressor (ASTContext *ast,
960962
std::vector<Demangle::NodePointer> &nodes,
961963
Demangle::NodePointer& cur_node,
962964
VisitNodeResult &result,
@@ -969,7 +971,7 @@ VisitNodeAddressor (SwiftASTContext *ast,
969971
}
970972

971973
static void
972-
VisitNodeGenerics (SwiftASTContext *ast,
974+
VisitNodeGenerics (ASTContext *ast,
973975
std::vector<Demangle::NodePointer> &nodes,
974976
Demangle::NodePointer& cur_node,
975977
VisitNodeResult &result,
@@ -1013,7 +1015,7 @@ VisitNodeGenerics (SwiftASTContext *ast,
10131015
}
10141016

10151017
static void
1016-
VisitNodeArchetype(SwiftASTContext *ast,
1018+
VisitNodeArchetype(ASTContext *ast,
10171019
std::vector<Demangle::NodePointer> &nodes,
10181020
Demangle::NodePointer& cur_node,
10191021
VisitNodeResult &result,
@@ -1058,7 +1060,7 @@ VisitNodeArchetype(SwiftASTContext *ast,
10581060

10591061

10601062
static void
1061-
VisitNodeArchetypeRef(SwiftASTContext *ast,
1063+
VisitNodeArchetypeRef(ASTContext *ast,
10621064
std::vector<Demangle::NodePointer> &nodes,
10631065
Demangle::NodePointer& cur_node,
10641066
VisitNodeResult &result,
@@ -1098,7 +1100,7 @@ VisitNodeArchetypeRef(SwiftASTContext *ast,
10981100
}
10991101

11001102
static void
1101-
VisitNodeAssociatedTypeRef (SwiftASTContext *ast,
1103+
VisitNodeAssociatedTypeRef (ASTContext *ast,
11021104
std::vector<Demangle::NodePointer> &nodes,
11031105
Demangle::NodePointer& cur_node,
11041106
VisitNodeResult &result,
@@ -1139,7 +1141,7 @@ VisitNodeAssociatedTypeRef (SwiftASTContext *ast,
11391141
}
11401142

11411143
static void
1142-
VisitNodeBoundGeneric (SwiftASTContext *ast,
1144+
VisitNodeBoundGeneric (ASTContext *ast,
11431145
std::vector<Demangle::NodePointer> &nodes,
11441146
Demangle::NodePointer& cur_node,
11451147
VisitNodeResult &result,
@@ -1187,7 +1189,7 @@ VisitNodeBoundGeneric (SwiftASTContext *ast,
11871189
}
11881190

11891191
static void
1190-
VisitNodeBuiltinTypeName (SwiftASTContext *ast,
1192+
VisitNodeBuiltinTypeName (ASTContext *ast,
11911193
std::vector<Demangle::NodePointer> &nodes,
11921194
Demangle::NodePointer& cur_node,
11931195
VisitNodeResult &result,
@@ -1220,7 +1222,7 @@ VisitNodeBuiltinTypeName (SwiftASTContext *ast,
12201222
}
12211223

12221224
static void
1223-
VisitNodeConstructor (SwiftASTContext *ast,
1225+
VisitNodeConstructor (ASTContext *ast,
12241226
std::vector<Demangle::NodePointer> &nodes,
12251227
Demangle::NodePointer& cur_node,
12261228
VisitNodeResult &result,
@@ -1300,7 +1302,7 @@ VisitNodeConstructor (SwiftASTContext *ast,
13001302
}
13011303

13021304
static void
1303-
VisitNodeDestructor (SwiftASTContext *ast,
1305+
VisitNodeDestructor (ASTContext *ast,
13041306
std::vector<Demangle::NodePointer> &nodes,
13051307
Demangle::NodePointer& cur_node,
13061308
VisitNodeResult &result,
@@ -1368,7 +1370,7 @@ VisitNodeDestructor (SwiftASTContext *ast,
13681370
}
13691371

13701372
static void
1371-
VisitNodeDeclContext (SwiftASTContext *ast,
1373+
VisitNodeDeclContext (ASTContext *ast,
13721374
std::vector<Demangle::NodePointer> &nodes,
13731375
Demangle::NodePointer& cur_node,
13741376
VisitNodeResult &result,
@@ -1431,7 +1433,7 @@ VisitNodeDeclContext (SwiftASTContext *ast,
14311433
}
14321434

14331435
static void
1434-
VisitNodeExplicitClosure (SwiftASTContext *ast,
1436+
VisitNodeExplicitClosure (ASTContext *ast,
14351437
std::vector<Demangle::NodePointer> &nodes,
14361438
Demangle::NodePointer& cur_node,
14371439
VisitNodeResult &result,
@@ -1485,7 +1487,7 @@ VisitNodeExplicitClosure (SwiftASTContext *ast,
14851487
}
14861488

14871489
static void
1488-
VisitNodeExtension (SwiftASTContext *ast,
1490+
VisitNodeExtension (ASTContext *ast,
14891491
std::vector<Demangle::NodePointer> &nodes,
14901492
Demangle::NodePointer& cur_node,
14911493
VisitNodeResult &result,
@@ -1590,7 +1592,7 @@ CompareFunctionTypes (const AnyFunctionType *f,
15901592

15911593
// VisitNodeFunction gets used for Function, Variable and Allocator:
15921594
static void
1593-
VisitNodeFunction (SwiftASTContext *ast,
1595+
VisitNodeFunction (ASTContext *ast,
15941596
std::vector<Demangle::NodePointer> &nodes,
15951597
Demangle::NodePointer& cur_node,
15961598
VisitNodeResult &result,
@@ -1703,7 +1705,7 @@ VisitNodeFunction (SwiftASTContext *ast,
17031705
}
17041706

17051707
static void
1706-
VisitNodeFunctionType (SwiftASTContext *ast,
1708+
VisitNodeFunctionType (ASTContext *ast,
17071709
std::vector<Demangle::NodePointer> &nodes,
17081710
Demangle::NodePointer& cur_node,
17091711
VisitNodeResult &result,
@@ -1794,7 +1796,7 @@ VisitNodeFunctionType (SwiftASTContext *ast,
17941796
}
17951797

17961798
static void
1797-
VisitNodeGenericType (SwiftASTContext *ast,
1799+
VisitNodeGenericType (ASTContext *ast,
17981800
std::vector<Demangle::NodePointer> &nodes,
17991801
Demangle::NodePointer& cur_node,
18001802
VisitNodeResult &result,
@@ -1824,7 +1826,7 @@ VisitNodeGenericType (SwiftASTContext *ast,
18241826
}
18251827

18261828
static void
1827-
VisitNodeSetterGetter (SwiftASTContext *ast,
1829+
VisitNodeSetterGetter (ASTContext *ast,
18281830
std::vector<Demangle::NodePointer> &nodes,
18291831
Demangle::NodePointer& cur_node,
18301832
VisitNodeResult &result,
@@ -2011,7 +2013,7 @@ VisitNodeSetterGetter (SwiftASTContext *ast,
20112013
}
20122014

20132015
static void
2014-
VisitNodeIdentifier (SwiftASTContext *ast,
2016+
VisitNodeIdentifier (ASTContext *ast,
20152017
std::vector<Demangle::NodePointer> &nodes,
20162018
Demangle::NodePointer& cur_node,
20172019
VisitNodeResult &result,
@@ -2029,7 +2031,7 @@ VisitNodeIdentifier (SwiftASTContext *ast,
20292031
}
20302032

20312033
static void
2032-
VisitNodeLocalDeclName (SwiftASTContext *ast,
2034+
VisitNodeLocalDeclName (ASTContext *ast,
20332035
std::vector<Demangle::NodePointer> &nodes,
20342036
Demangle::NodePointer& cur_node,
20352037
VisitNodeResult &result,
@@ -2059,7 +2061,7 @@ VisitNodeLocalDeclName (SwiftASTContext *ast,
20592061
}
20602062

20612063
static void
2062-
VisitNodePrivateDeclName (SwiftASTContext *ast,
2064+
VisitNodePrivateDeclName (ASTContext *ast,
20632065
std::vector<Demangle::NodePointer> &nodes,
20642066
Demangle::NodePointer& cur_node,
20652067
VisitNodeResult &result,
@@ -2094,7 +2096,7 @@ VisitNodePrivateDeclName (SwiftASTContext *ast,
20942096
}
20952097

20962098
static void
2097-
VisitNodeInOut (SwiftASTContext *ast,
2099+
VisitNodeInOut (ASTContext *ast,
20982100
std::vector<Demangle::NodePointer> &nodes,
20992101
Demangle::NodePointer& cur_node,
21002102
VisitNodeResult &result,
@@ -2115,7 +2117,7 @@ VisitNodeInOut (SwiftASTContext *ast,
21152117
}
21162118

21172119
static void
2118-
VisitNodeMetatype (SwiftASTContext *ast,
2120+
VisitNodeMetatype (ASTContext *ast,
21192121
std::vector<Demangle::NodePointer> &nodes,
21202122
Demangle::NodePointer& cur_node,
21212123
VisitNodeResult &result,
@@ -2165,7 +2167,7 @@ VisitNodeMetatype (SwiftASTContext *ast,
21652167
}
21662168

21672169
static void
2168-
VisitNodeModule (SwiftASTContext *ast,
2170+
VisitNodeModule (ASTContext *ast,
21692171
std::vector<Demangle::NodePointer> &nodes,
21702172
Demangle::NodePointer& cur_node,
21712173
VisitNodeResult &result,
@@ -2189,7 +2191,7 @@ VisitNodeModule (SwiftASTContext *ast,
21892191
}
21902192

21912193
static void
2192-
VisitNodeNonVariadicTuple (SwiftASTContext *ast,
2194+
VisitNodeNonVariadicTuple (ASTContext *ast,
21932195
std::vector<Demangle::NodePointer> &nodes,
21942196
Demangle::NodePointer& cur_node,
21952197
VisitNodeResult &result,
@@ -2242,7 +2244,7 @@ VisitNodeNonVariadicTuple (SwiftASTContext *ast,
22422244
}
22432245

22442246
static void
2245-
VisitNodeProtocolList (SwiftASTContext *ast,
2247+
VisitNodeProtocolList (ASTContext *ast,
22462248
std::vector<Demangle::NodePointer> &nodes,
22472249
Demangle::NodePointer& cur_node,
22482250
VisitNodeResult &result,
@@ -2269,7 +2271,7 @@ VisitNodeProtocolList (SwiftASTContext *ast,
22692271
}
22702272

22712273
static void
2272-
VisitNodeQualifiedArchetype (SwiftASTContext *ast,
2274+
VisitNodeQualifiedArchetype (ASTContext *ast,
22732275
std::vector<Demangle::NodePointer> &nodes,
22742276
Demangle::NodePointer& cur_node,
22752277
VisitNodeResult &result,
@@ -2339,7 +2341,7 @@ VisitNodeQualifiedArchetype (SwiftASTContext *ast,
23392341
}
23402342

23412343
static void
2342-
VisitNodeSelfTypeRef (SwiftASTContext *ast,
2344+
VisitNodeSelfTypeRef (ASTContext *ast,
23432345
std::vector<Demangle::NodePointer> &nodes,
23442346
Demangle::NodePointer& cur_node,
23452347
VisitNodeResult &result,
@@ -2388,7 +2390,7 @@ VisitNodeSelfTypeRef (SwiftASTContext *ast,
23882390
}
23892391

23902392
static void
2391-
VisitNodeTupleElement (SwiftASTContext *ast,
2393+
VisitNodeTupleElement (ASTContext *ast,
23922394
std::vector<Demangle::NodePointer> &nodes,
23932395
Demangle::NodePointer& cur_node,
23942396
VisitNodeResult &result,
@@ -2426,7 +2428,7 @@ VisitNodeTupleElement (SwiftASTContext *ast,
24262428
}
24272429

24282430
static void
2429-
VisitNodeTypeList (SwiftASTContext *ast,
2431+
VisitNodeTypeList (ASTContext *ast,
24302432
std::vector<Demangle::NodePointer> &nodes,
24312433
Demangle::NodePointer& cur_node,
24322434
VisitNodeResult &result,
@@ -2468,7 +2470,7 @@ VisitNodeTypeList (SwiftASTContext *ast,
24682470
}
24692471

24702472
static void
2471-
VisitNodeUnowned (SwiftASTContext *ast,
2473+
VisitNodeUnowned (ASTContext *ast,
24722474
std::vector<Demangle::NodePointer> &nodes,
24732475
Demangle::NodePointer& cur_node,
24742476
VisitNodeResult &result,
@@ -2497,7 +2499,7 @@ VisitNodeUnowned (SwiftASTContext *ast,
24972499
}
24982500

24992501
static void
2500-
VisitNodeWeak (SwiftASTContext *ast,
2502+
VisitNodeWeak (ASTContext *ast,
25012503
std::vector<Demangle::NodePointer> &nodes,
25022504
Demangle::NodePointer& cur_node,
25032505
VisitNodeResult &result,
@@ -2526,7 +2528,7 @@ VisitNodeWeak (SwiftASTContext *ast,
25262528
}
25272529

25282530
static void
2529-
VisitFirstChildNode (SwiftASTContext *ast,
2531+
VisitFirstChildNode (ASTContext *ast,
25302532
std::vector<Demangle::NodePointer> &nodes,
25312533
Demangle::NodePointer& cur_node,
25322534
VisitNodeResult &result,
@@ -2541,7 +2543,7 @@ VisitFirstChildNode (SwiftASTContext *ast,
25412543
}
25422544

25432545
static void
2544-
VisitAllChildNodes (SwiftASTContext *ast,
2546+
VisitAllChildNodes (ASTContext *ast,
25452547
std::vector<Demangle::NodePointer> &nodes,
25462548
Demangle::NodePointer& cur_node,
25472549
VisitNodeResult &result,
@@ -2557,7 +2559,7 @@ VisitAllChildNodes (SwiftASTContext *ast,
25572559
}
25582560

25592561
static void
2560-
VisitNode (SwiftASTContext *ast,
2562+
VisitNode (ASTContext *ast,
25612563
std::vector<Demangle::NodePointer> &nodes,
25622564
VisitNodeResult &result,
25632565
const VisitNodeResult &generic_context, // set by GenericType case

0 commit comments

Comments
 (0)