Skip to content

Commit 593571e

Browse files
committed
Refactor to use enum class HardFailMode
1 parent f8be967 commit 593571e

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

lib/Parser/RegexRuntime.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ namespace UnifiedRegex
166166
{
167167
switch (mode)
168168
{
169-
case BacktrackAndLater:
169+
case HardFailMode::BacktrackAndLater:
170170
return Fail(FAIL_PARAMETERS);
171-
case BacktrackOnly:
171+
case HardFailMode::BacktrackOnly:
172172
if (Fail(FAIL_PARAMETERS))
173173
{
174174
// No use trying any more start positions
@@ -179,7 +179,7 @@ namespace UnifiedRegex
179179
{
180180
return false;
181181
}
182-
case LaterOnly:
182+
case HardFailMode::LaterOnly:
183183
#if ENABLE_REGEX_CONFIG_OPTIONS
184184
if (w != 0)
185185
{
@@ -189,7 +189,7 @@ namespace UnifiedRegex
189189
contStack.Clear();
190190
assertionStack.Clear();
191191
return true; // STOP EXECUTING
192-
case ImmediateFail:
192+
case HardFailMode::ImmediateFail:
193193
// No use trying any more start positions
194194
matchStart = inputLength;
195195
return true; // STOP EXECUTING
@@ -1264,7 +1264,7 @@ namespace UnifiedRegex
12641264
if (canHardFail)
12651265
{
12661266
// Clearly trying to start from later in the input won't help, and we know backtracking can't take us earlier in the input
1267-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
1267+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
12681268
}
12691269
else
12701270
{
@@ -1312,7 +1312,7 @@ namespace UnifiedRegex
13121312
if (canHardFail)
13131313
{
13141314
// We know backtracking can never take us later in the input, but starting from later in the input could help
1315-
return matcher.HardFail(HARDFAIL_PARAMETERS(LaterOnly));
1315+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::LaterOnly));
13161316
}
13171317
else
13181318
{
@@ -1931,7 +1931,7 @@ namespace UnifiedRegex
19311931
{
19321932
if (!this->Match(matcher, input, inputLength, inputOffset))
19331933
{
1934-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
1934+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
19351935
}
19361936

19371937
matchStart = inputOffset;
@@ -2026,7 +2026,7 @@ namespace UnifiedRegex
20262026

20272027
if (inputOffset >= inputLength)
20282028
{
2029-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2029+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
20302030
}
20312031

20322032
matchStart = inputOffset++;
@@ -2066,7 +2066,7 @@ namespace UnifiedRegex
20662066

20672067
if (inputOffset >= inputLength)
20682068
{
2069-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2069+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
20702070
}
20712071

20722072
matchStart = inputOffset++;
@@ -2106,7 +2106,7 @@ namespace UnifiedRegex
21062106

21072107
if (inputOffset >= inputLength)
21082108
{
2109-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2109+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
21102110
}
21112111

21122112
matchStart = inputOffset++;
@@ -2144,7 +2144,7 @@ namespace UnifiedRegex
21442144
{
21452145
if (!this->Match(matcher, input, inputLength, inputOffset))
21462146
{
2147-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2147+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
21482148
}
21492149

21502150
matchStart = inputOffset;
@@ -2229,7 +2229,7 @@ namespace UnifiedRegex
22292229
if (backup.lower > inputLength - matchStart)
22302230
{
22312231
// Even match at very end doesn't allow for minimum backup
2232-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2232+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
22332233
}
22342234

22352235
if (inputOffset < nextSyncInputOffset)
@@ -2257,7 +2257,7 @@ namespace UnifiedRegex
22572257

22582258
if (inputOffset >= inputLength)
22592259
{
2260-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2260+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
22612261
}
22622262

22632263
nextSyncInputOffset = inputOffset + 1;
@@ -2299,7 +2299,7 @@ namespace UnifiedRegex
22992299
if (backup.lower > inputLength - matchStart)
23002300
{
23012301
// Even match at very end doesn't allow for minimum backup
2302-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2302+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
23032303
}
23042304

23052305
if (inputOffset < nextSyncInputOffset)
@@ -2327,7 +2327,7 @@ namespace UnifiedRegex
23272327

23282328
if (inputOffset >= inputLength)
23292329
{
2330-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2330+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
23312331
}
23322332

23332333
nextSyncInputOffset = inputOffset + 1;
@@ -2378,7 +2378,7 @@ namespace UnifiedRegex
23782378
if (backup.lower > inputLength - matchStart)
23792379
{
23802380
// Even match at very end doesn't allow for minimum backup
2381-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2381+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
23822382
}
23832383

23842384
if(inputOffset < nextSyncInputOffset)
@@ -2397,7 +2397,7 @@ namespace UnifiedRegex
23972397

23982398
if (!this->Match(matcher, input, inputLength, inputOffset))
23992399
{
2400-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2400+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
24012401
}
24022402

24032403
nextSyncInputOffset = inputOffset + 1;
@@ -2503,7 +2503,7 @@ namespace UnifiedRegex
25032503
if (backup.lower > inputLength - matchStart)
25042504
{
25052505
// Even match at very end doesn't allow for minimum backup
2506-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2506+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
25072507
}
25082508

25092509
if (inputOffset < nextSyncInputOffset)
@@ -2586,7 +2586,7 @@ namespace UnifiedRegex
25862586
if (besti < 0)
25872587
{
25882588
// No literals matched
2589-
return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
2589+
return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
25902590
}
25912591

25922592
nextSyncInputOffset = bestMatchOffset + 1;

lib/Parser/RegexRuntime.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@ namespace UnifiedRegex
17551755
AssertionStack assertionStack;
17561756
};
17571757

1758-
enum HardFailMode
1758+
enum class HardFailMode
17591759
{
17601760
BacktrackAndLater,
17611761
BacktrackOnly,

0 commit comments

Comments
 (0)