Refactor to use enum class HardFailMode

dilijev · dilijev · commit 593571e6bb4f · 2017-11-06T16:23:35.000-08:00
diff --git a/lib/Parser/RegexRuntime.cpp b/lib/Parser/RegexRuntime.cpp
@@ -166,9 +166,9 @@ namespace UnifiedRegex
     {
         switch (mode)
         {
-        case BacktrackAndLater:
+        case HardFailMode::BacktrackAndLater:
             return Fail(FAIL_PARAMETERS);
-        case BacktrackOnly:
+        case HardFailMode::BacktrackOnly:
             if (Fail(FAIL_PARAMETERS))
             {
                 // No use trying any more start positions
@@ -179,7 +179,7 @@ namespace UnifiedRegex
             {
                 return false;
             }
-        case LaterOnly:
+        case HardFailMode::LaterOnly:
 #if ENABLE_REGEX_CONFIG_OPTIONS
             if (w != 0)
             {
@@ -189,7 +189,7 @@ namespace UnifiedRegex
             contStack.Clear();
             assertionStack.Clear();
             return true; // STOP EXECUTING
-        case ImmediateFail:
+        case HardFailMode::ImmediateFail:
             // No use trying any more start positions
             matchStart = inputLength;
             return true; // STOP EXECUTING
@@ -1264,7 +1264,7 @@ namespace UnifiedRegex
             if (canHardFail)
             {
                 // Clearly trying to start from later in the input won't help, and we know backtracking can't take us earlier in the input
-                return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+                return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
             }
             else
             {
@@ -1312,7 +1312,7 @@ namespace UnifiedRegex
             if (canHardFail)
             {
                 // We know backtracking can never take us later in the input, but starting from later in the input could help
-                return matcher.HardFail(HARDFAIL_PARAMETERS(LaterOnly));
+                return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::LaterOnly));
             }
             else
             {
@@ -1931,7 +1931,7 @@ namespace UnifiedRegex
     {
         if (!this->Match(matcher, input, inputLength, inputOffset))
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         matchStart = inputOffset;
@@ -2026,7 +2026,7 @@ namespace UnifiedRegex
 
         if (inputOffset >= inputLength)
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         matchStart = inputOffset++;
@@ -2066,7 +2066,7 @@ namespace UnifiedRegex
 
         if (inputOffset >= inputLength)
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         matchStart = inputOffset++;
@@ -2106,7 +2106,7 @@ namespace UnifiedRegex
 
         if (inputOffset >= inputLength)
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         matchStart = inputOffset++;
@@ -2144,7 +2144,7 @@ namespace UnifiedRegex
     {
         if (!this->Match(matcher, input, inputLength, inputOffset))
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         matchStart = inputOffset;
@@ -2229,7 +2229,7 @@ namespace UnifiedRegex
         if (backup.lower > inputLength - matchStart)
         {
             // Even match at very end doesn't allow for minimum backup
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         if (inputOffset < nextSyncInputOffset)
@@ -2257,7 +2257,7 @@ namespace UnifiedRegex
 
         if (inputOffset >= inputLength)
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         nextSyncInputOffset = inputOffset + 1;
@@ -2299,7 +2299,7 @@ namespace UnifiedRegex
         if (backup.lower > inputLength - matchStart)
         {
             // Even match at very end doesn't allow for minimum backup
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         if (inputOffset < nextSyncInputOffset)
@@ -2327,7 +2327,7 @@ namespace UnifiedRegex
 
         if (inputOffset >= inputLength)
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         nextSyncInputOffset = inputOffset + 1;
@@ -2378,7 +2378,7 @@ namespace UnifiedRegex
         if (backup.lower > inputLength - matchStart)
         {
             // Even match at very end doesn't allow for minimum backup
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         if(inputOffset < nextSyncInputOffset)
@@ -2397,7 +2397,7 @@ namespace UnifiedRegex
 
         if (!this->Match(matcher, input, inputLength, inputOffset))
         {
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         nextSyncInputOffset = inputOffset + 1;
@@ -2503,7 +2503,7 @@ namespace UnifiedRegex
         if (backup.lower > inputLength - matchStart)
         {
             // Even match at very end doesn't allow for minimum backup
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         if (inputOffset < nextSyncInputOffset)
@@ -2586,7 +2586,7 @@ namespace UnifiedRegex
         if (besti < 0)
         {
             // No literals matched
-            return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));
+            return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));
         }
 
         nextSyncInputOffset = bestMatchOffset + 1;
diff --git a/lib/Parser/RegexRuntime.h b/lib/Parser/RegexRuntime.h
@@ -1755,7 +1755,7 @@ namespace UnifiedRegex
         AssertionStack assertionStack;
     };
 
-    enum HardFailMode
+    enum class HardFailMode
     {
         BacktrackAndLater,
         BacktrackOnly,

Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,9 @@ namespace UnifiedRegex`
`166`	`166`	`{`
`167`	`167`	`switch (mode)`
`168`	`168`	`{`
`169`		`- case BacktrackAndLater:`
	`169`	`+ case HardFailMode::BacktrackAndLater:`
`170`	`170`	`return Fail(FAIL_PARAMETERS);`
`171`		`- case BacktrackOnly:`
	`171`	`+ case HardFailMode::BacktrackOnly:`
`172`	`172`	`if (Fail(FAIL_PARAMETERS))`
`173`	`173`	`{`
`174`	`174`	`// No use trying any more start positions`
`@@ -179,7 +179,7 @@ namespace UnifiedRegex`
`179`	`179`	`{`
`180`	`180`	`return false;`
`181`	`181`	`}`
`182`		`- case LaterOnly:`
	`182`	`+ case HardFailMode::LaterOnly:`
`183`	`183`	`#if ENABLE_REGEX_CONFIG_OPTIONS`
`184`	`184`	`if (w != 0)`
`185`	`185`	`{`
`@@ -189,7 +189,7 @@ namespace UnifiedRegex`
`189`	`189`	`contStack.Clear();`
`190`	`190`	`assertionStack.Clear();`
`191`	`191`	`return true; // STOP EXECUTING`
`192`		`- case ImmediateFail:`
	`192`	`+ case HardFailMode::ImmediateFail:`
`193`	`193`	`// No use trying any more start positions`
`194`	`194`	`matchStart = inputLength;`
`195`	`195`	`return true; // STOP EXECUTING`
`@@ -1264,7 +1264,7 @@ namespace UnifiedRegex`
`1264`	`1264`	`if (canHardFail)`
`1265`	`1265`	`{`
`1266`	`1266`	`// 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));`
`1268`	`1268`	`}`
`1269`	`1269`	`else`
`1270`	`1270`	`{`
`@@ -1312,7 +1312,7 @@ namespace UnifiedRegex`
`1312`	`1312`	`if (canHardFail)`
`1313`	`1313`	`{`
`1314`	`1314`	`// 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));`
`1316`	`1316`	`}`
`1317`	`1317`	`else`
`1318`	`1318`	`{`
`@@ -1931,7 +1931,7 @@ namespace UnifiedRegex`
`1931`	`1931`	`{`
`1932`	`1932`	`if (!this->Match(matcher, input, inputLength, inputOffset))`
`1933`	`1933`	`{`
`1934`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`1934`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`1935`	`1935`	`}`
`1936`	`1936`
`1937`	`1937`	`matchStart = inputOffset;`
`@@ -2026,7 +2026,7 @@ namespace UnifiedRegex`
`2026`	`2026`
`2027`	`2027`	`if (inputOffset >= inputLength)`
`2028`	`2028`	`{`
`2029`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2029`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2030`	`2030`	`}`
`2031`	`2031`
`2032`	`2032`	`matchStart = inputOffset++;`
`@@ -2066,7 +2066,7 @@ namespace UnifiedRegex`
`2066`	`2066`
`2067`	`2067`	`if (inputOffset >= inputLength)`
`2068`	`2068`	`{`
`2069`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2069`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2070`	`2070`	`}`
`2071`	`2071`
`2072`	`2072`	`matchStart = inputOffset++;`
`@@ -2106,7 +2106,7 @@ namespace UnifiedRegex`
`2106`	`2106`
`2107`	`2107`	`if (inputOffset >= inputLength)`
`2108`	`2108`	`{`
`2109`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2109`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2110`	`2110`	`}`
`2111`	`2111`
`2112`	`2112`	`matchStart = inputOffset++;`
`@@ -2144,7 +2144,7 @@ namespace UnifiedRegex`
`2144`	`2144`	`{`
`2145`	`2145`	`if (!this->Match(matcher, input, inputLength, inputOffset))`
`2146`	`2146`	`{`
`2147`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2147`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2148`	`2148`	`}`
`2149`	`2149`
`2150`	`2150`	`matchStart = inputOffset;`
`@@ -2229,7 +2229,7 @@ namespace UnifiedRegex`
`2229`	`2229`	`if (backup.lower > inputLength - matchStart)`
`2230`	`2230`	`{`
`2231`	`2231`	`// 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));`
`2233`	`2233`	`}`
`2234`	`2234`
`2235`	`2235`	`if (inputOffset < nextSyncInputOffset)`
`@@ -2257,7 +2257,7 @@ namespace UnifiedRegex`
`2257`	`2257`
`2258`	`2258`	`if (inputOffset >= inputLength)`
`2259`	`2259`	`{`
`2260`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2260`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2261`	`2261`	`}`
`2262`	`2262`
`2263`	`2263`	`nextSyncInputOffset = inputOffset + 1;`
`@@ -2299,7 +2299,7 @@ namespace UnifiedRegex`
`2299`	`2299`	`if (backup.lower > inputLength - matchStart)`
`2300`	`2300`	`{`
`2301`	`2301`	`// 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));`
`2303`	`2303`	`}`
`2304`	`2304`
`2305`	`2305`	`if (inputOffset < nextSyncInputOffset)`
`@@ -2327,7 +2327,7 @@ namespace UnifiedRegex`
`2327`	`2327`
`2328`	`2328`	`if (inputOffset >= inputLength)`
`2329`	`2329`	`{`
`2330`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2330`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2331`	`2331`	`}`
`2332`	`2332`
`2333`	`2333`	`nextSyncInputOffset = inputOffset + 1;`
`@@ -2378,7 +2378,7 @@ namespace UnifiedRegex`
`2378`	`2378`	`if (backup.lower > inputLength - matchStart)`
`2379`	`2379`	`{`
`2380`	`2380`	`// 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));`
`2382`	`2382`	`}`
`2383`	`2383`
`2384`	`2384`	`if(inputOffset < nextSyncInputOffset)`
`@@ -2397,7 +2397,7 @@ namespace UnifiedRegex`
`2397`	`2397`
`2398`	`2398`	`if (!this->Match(matcher, input, inputLength, inputOffset))`
`2399`	`2399`	`{`
`2400`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2400`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2401`	`2401`	`}`
`2402`	`2402`
`2403`	`2403`	`nextSyncInputOffset = inputOffset + 1;`
`@@ -2503,7 +2503,7 @@ namespace UnifiedRegex`
`2503`	`2503`	`if (backup.lower > inputLength - matchStart)`
`2504`	`2504`	`{`
`2505`	`2505`	`// 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));`
`2507`	`2507`	`}`
`2508`	`2508`
`2509`	`2509`	`if (inputOffset < nextSyncInputOffset)`
`@@ -2586,7 +2586,7 @@ namespace UnifiedRegex`
`2586`	`2586`	`if (besti < 0)`
`2587`	`2587`	`{`
`2588`	`2588`	`// No literals matched`
`2589`		`- return matcher.HardFail(HARDFAIL_PARAMETERS(ImmediateFail));`
	`2589`	`+ return matcher.HardFail(HARDFAIL_PARAMETERS(HardFailMode::ImmediateFail));`
`2590`	`2590`	`}`
`2591`	`2591`
`2592`	`2592`	`nextSyncInputOffset = bestMatchOffset + 1;`
Original file line number	Diff line number	Diff line change
`@@ -1755,7 +1755,7 @@ namespace UnifiedRegex`
`1755`	`1755`	`AssertionStack assertionStack;`
`1756`	`1756`	`};`
`1757`	`1757`
`1758`		`- enum HardFailMode`
	`1758`	`+ enum class HardFailMode`
`1759`	`1759`	`{`
`1760`	`1760`	`BacktrackAndLater,`
`1761`	`1761`	`BacktrackOnly,`