@@ -63,7 +63,7 @@ PragmaHandler::~PragmaHandler() = default;
63
63
EmptyPragmaHandler::EmptyPragmaHandler (StringRef Name) : PragmaHandler(Name) {}
64
64
65
65
void EmptyPragmaHandler::HandlePragma (Preprocessor &PP,
66
- PragmaIntroducerKind Introducer,
66
+ PragmaIntroducer Introducer,
67
67
Token &FirstToken) {}
68
68
69
69
// ===----------------------------------------------------------------------===//
@@ -98,8 +98,7 @@ void PragmaNamespace::RemovePragmaHandler(PragmaHandler *Handler) {
98
98
}
99
99
100
100
void PragmaNamespace::HandlePragma (Preprocessor &PP,
101
- PragmaIntroducerKind Introducer,
102
- Token &Tok) {
101
+ PragmaIntroducer Introducer, Token &Tok) {
103
102
// Read the 'namespace' that the directive is in, e.g. STDC. Do not macro
104
103
// expand it, the user can have a STDC #define, that should not affect this.
105
104
PP.LexUnexpandedToken (Tok);
@@ -124,10 +123,9 @@ void PragmaNamespace::HandlePragma(Preprocessor &PP,
124
123
125
124
// / HandlePragmaDirective - The "\#pragma" directive has been parsed. Lex the
126
125
// / rest of the pragma, passing it to the registered pragma handlers.
127
- void Preprocessor::HandlePragmaDirective (SourceLocation IntroducerLoc,
128
- PragmaIntroducerKind Introducer) {
126
+ void Preprocessor::HandlePragmaDirective (PragmaIntroducer Introducer) {
129
127
if (Callbacks)
130
- Callbacks->PragmaDirective (IntroducerLoc , Introducer);
128
+ Callbacks->PragmaDirective (Introducer. Loc , Introducer. Kind );
131
129
132
130
if (!PragmasEnabled)
133
131
return ;
@@ -321,7 +319,7 @@ void Preprocessor::Handle_Pragma(Token &Tok) {
321
319
EnterSourceFileWithLexer (TL, nullptr );
322
320
323
321
// With everything set up, lex this as a #pragma directive.
324
- HandlePragmaDirective (PragmaLoc, PIK__Pragma );
322
+ HandlePragmaDirective ({PIK__Pragma, PragmaLoc} );
325
323
326
324
// Finally, return whatever came after the pragma directive.
327
325
return Lex (Tok);
@@ -371,7 +369,7 @@ void Preprocessor::HandleMicrosoft__pragma(Token &Tok) {
371
369
/* IsReinject*/ false );
372
370
373
371
// With everything set up, lex this as a #pragma directive.
374
- HandlePragmaDirective (PragmaLoc, PIK___pragma );
372
+ HandlePragmaDirective ({PIK___pragma, PragmaLoc} );
375
373
376
374
// Finally, return whatever came after the pragma directive.
377
375
return Lex (Tok);
@@ -959,7 +957,7 @@ namespace {
959
957
struct PragmaOnceHandler : public PragmaHandler {
960
958
PragmaOnceHandler () : PragmaHandler(" once" ) {}
961
959
962
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
960
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
963
961
Token &OnceTok) override {
964
962
PP.CheckEndOfDirective (" pragma once" );
965
963
PP.HandlePragmaOnce (OnceTok);
@@ -971,7 +969,7 @@ struct PragmaOnceHandler : public PragmaHandler {
971
969
struct PragmaMarkHandler : public PragmaHandler {
972
970
PragmaMarkHandler () : PragmaHandler(" mark" ) {}
973
971
974
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
972
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
975
973
Token &MarkTok) override {
976
974
PP.HandlePragmaMark ();
977
975
}
@@ -981,7 +979,7 @@ struct PragmaMarkHandler : public PragmaHandler {
981
979
struct PragmaPoisonHandler : public PragmaHandler {
982
980
PragmaPoisonHandler () : PragmaHandler(" poison" ) {}
983
981
984
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
982
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
985
983
Token &PoisonTok) override {
986
984
PP.HandlePragmaPoison ();
987
985
}
@@ -992,7 +990,7 @@ struct PragmaPoisonHandler : public PragmaHandler {
992
990
struct PragmaSystemHeaderHandler : public PragmaHandler {
993
991
PragmaSystemHeaderHandler () : PragmaHandler(" system_header" ) {}
994
992
995
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
993
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
996
994
Token &SHToken) override {
997
995
PP.HandlePragmaSystemHeader (SHToken);
998
996
PP.CheckEndOfDirective (" pragma" );
@@ -1002,7 +1000,7 @@ struct PragmaSystemHeaderHandler : public PragmaHandler {
1002
1000
struct PragmaDependencyHandler : public PragmaHandler {
1003
1001
PragmaDependencyHandler () : PragmaHandler(" dependency" ) {}
1004
1002
1005
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1003
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1006
1004
Token &DepToken) override {
1007
1005
PP.HandlePragmaDependency (DepToken);
1008
1006
}
@@ -1011,7 +1009,7 @@ struct PragmaDependencyHandler : public PragmaHandler {
1011
1009
struct PragmaDebugHandler : public PragmaHandler {
1012
1010
PragmaDebugHandler () : PragmaHandler(" __debug" ) {}
1013
1011
1014
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1012
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1015
1013
Token &DebugToken) override {
1016
1014
Token Tok;
1017
1015
PP.LexUnexpandedToken (Tok);
@@ -1151,7 +1149,7 @@ struct PragmaDiagnosticHandler : public PragmaHandler {
1151
1149
explicit PragmaDiagnosticHandler (const char *NS)
1152
1150
: PragmaHandler(" diagnostic" ), Namespace(NS) {}
1153
1151
1154
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1152
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1155
1153
Token &DiagToken) override {
1156
1154
SourceLocation DiagLoc = DiagToken.getLocation ();
1157
1155
Token Tok;
@@ -1230,7 +1228,7 @@ struct PragmaDiagnosticHandler : public PragmaHandler {
1230
1228
// / "\#pragma hdrstop [<header-name-string>]"
1231
1229
struct PragmaHdrstopHandler : public PragmaHandler {
1232
1230
PragmaHdrstopHandler () : PragmaHandler(" hdrstop" ) {}
1233
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1231
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1234
1232
Token &DepToken) override {
1235
1233
PP.HandlePragmaHdrstop (DepToken);
1236
1234
}
@@ -1242,7 +1240,7 @@ struct PragmaHdrstopHandler : public PragmaHandler {
1242
1240
struct PragmaWarningHandler : public PragmaHandler {
1243
1241
PragmaWarningHandler () : PragmaHandler(" warning" ) {}
1244
1242
1245
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1243
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1246
1244
Token &Tok) override {
1247
1245
// Parse things like:
1248
1246
// warning(push, 1)
@@ -1365,7 +1363,7 @@ struct PragmaWarningHandler : public PragmaHandler {
1365
1363
struct PragmaExecCharsetHandler : public PragmaHandler {
1366
1364
PragmaExecCharsetHandler () : PragmaHandler(" execution_character_set" ) {}
1367
1365
1368
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1366
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1369
1367
Token &Tok) override {
1370
1368
// Parse things like:
1371
1369
// execution_character_set(push, "UTF-8")
@@ -1427,7 +1425,7 @@ struct PragmaExecCharsetHandler : public PragmaHandler {
1427
1425
struct PragmaIncludeAliasHandler : public PragmaHandler {
1428
1426
PragmaIncludeAliasHandler () : PragmaHandler(" include_alias" ) {}
1429
1427
1430
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1428
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1431
1429
Token &IncludeAliasTok) override {
1432
1430
PP.HandlePragmaIncludeAlias (IncludeAliasTok);
1433
1431
}
@@ -1470,7 +1468,7 @@ struct PragmaMessageHandler : public PragmaHandler {
1470
1468
: PragmaHandler(PragmaKind(Kind, true )), Kind(Kind),
1471
1469
Namespace (Namespace) {}
1472
1470
1473
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1471
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1474
1472
Token &Tok) override {
1475
1473
SourceLocation MessageLoc = Tok.getLocation ();
1476
1474
PP.Lex (Tok);
@@ -1526,7 +1524,7 @@ struct PragmaMessageHandler : public PragmaHandler {
1526
1524
struct PragmaModuleImportHandler : public PragmaHandler {
1527
1525
PragmaModuleImportHandler () : PragmaHandler(" import" ) {}
1528
1526
1529
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1527
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1530
1528
Token &Tok) override {
1531
1529
SourceLocation ImportLoc = Tok.getLocation ();
1532
1530
@@ -1563,7 +1561,7 @@ struct PragmaModuleImportHandler : public PragmaHandler {
1563
1561
struct PragmaModuleBeginHandler : public PragmaHandler {
1564
1562
PragmaModuleBeginHandler () : PragmaHandler(" begin" ) {}
1565
1563
1566
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1564
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1567
1565
Token &Tok) override {
1568
1566
SourceLocation BeginLoc = Tok.getLocation ();
1569
1567
@@ -1623,7 +1621,7 @@ struct PragmaModuleBeginHandler : public PragmaHandler {
1623
1621
struct PragmaModuleEndHandler : public PragmaHandler {
1624
1622
PragmaModuleEndHandler () : PragmaHandler(" end" ) {}
1625
1623
1626
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1624
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1627
1625
Token &Tok) override {
1628
1626
SourceLocation Loc = Tok.getLocation ();
1629
1627
@@ -1643,7 +1641,7 @@ struct PragmaModuleEndHandler : public PragmaHandler {
1643
1641
struct PragmaModuleBuildHandler : public PragmaHandler {
1644
1642
PragmaModuleBuildHandler () : PragmaHandler(" build" ) {}
1645
1643
1646
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1644
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1647
1645
Token &Tok) override {
1648
1646
PP.HandlePragmaModuleBuild (Tok);
1649
1647
}
@@ -1653,7 +1651,7 @@ struct PragmaModuleBuildHandler : public PragmaHandler {
1653
1651
struct PragmaModuleLoadHandler : public PragmaHandler {
1654
1652
PragmaModuleLoadHandler () : PragmaHandler(" load" ) {}
1655
1653
1656
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1654
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1657
1655
Token &Tok) override {
1658
1656
SourceLocation Loc = Tok.getLocation ();
1659
1657
@@ -1677,7 +1675,7 @@ struct PragmaModuleLoadHandler : public PragmaHandler {
1677
1675
struct PragmaPushMacroHandler : public PragmaHandler {
1678
1676
PragmaPushMacroHandler () : PragmaHandler(" push_macro" ) {}
1679
1677
1680
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1678
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1681
1679
Token &PushMacroTok) override {
1682
1680
PP.HandlePragmaPushMacro (PushMacroTok);
1683
1681
}
@@ -1688,7 +1686,7 @@ struct PragmaPushMacroHandler : public PragmaHandler {
1688
1686
struct PragmaPopMacroHandler : public PragmaHandler {
1689
1687
PragmaPopMacroHandler () : PragmaHandler(" pop_macro" ) {}
1690
1688
1691
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1689
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1692
1690
Token &PopMacroTok) override {
1693
1691
PP.HandlePragmaPopMacro (PopMacroTok);
1694
1692
}
@@ -1699,7 +1697,7 @@ struct PragmaPopMacroHandler : public PragmaHandler {
1699
1697
struct PragmaARCCFCodeAuditedHandler : public PragmaHandler {
1700
1698
PragmaARCCFCodeAuditedHandler () : PragmaHandler(" arc_cf_code_audited" ) {}
1701
1699
1702
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1700
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1703
1701
Token &NameTok) override {
1704
1702
SourceLocation Loc = NameTok.getLocation ();
1705
1703
bool IsBegin;
@@ -1754,7 +1752,7 @@ struct PragmaARCCFCodeAuditedHandler : public PragmaHandler {
1754
1752
struct PragmaAssumeNonNullHandler : public PragmaHandler {
1755
1753
PragmaAssumeNonNullHandler () : PragmaHandler(" assume_nonnull" ) {}
1756
1754
1757
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1755
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1758
1756
Token &NameTok) override {
1759
1757
SourceLocation Loc = NameTok.getLocation ();
1760
1758
bool IsBegin;
@@ -1823,7 +1821,7 @@ struct PragmaAssumeNonNullHandler : public PragmaHandler {
1823
1821
struct PragmaRegionHandler : public PragmaHandler {
1824
1822
PragmaRegionHandler (const char *pragma) : PragmaHandler(pragma) {}
1825
1823
1826
- void HandlePragma (Preprocessor &PP, PragmaIntroducerKind Introducer,
1824
+ void HandlePragma (Preprocessor &PP, PragmaIntroducer Introducer,
1827
1825
Token &NameTok) override {
1828
1826
// #pragma region: endregion matches can be verified
1829
1827
// __pragma(region): no sense, but ignored by msvc
0 commit comments