Merge pull request #4995 from MartinNowak/fix16626

MartinNowak · web-flow · commit 9cbc862544a9 · 2016-12-27T00:33:32.000+01:00
disable kickstart in ctfe to workaround Issue 16626
diff --git a/std/regex/internal/parser.d b/std/regex/internal/parser.d
@@ -1501,13 +1501,12 @@ pure:
             }
         }
         checkIfOneShot();
-        if (!(flags & RegexInfo.oneShot))
+        if (!(flags & RegexInfo.oneShot) && !__ctfe)
         {
             kickstart = new ShiftOr!Char(zis);
             if (kickstart.empty)
             {
-                if (!__ctfe)
-                    kickstart = new BitMatcher!Char(zis);
+                kickstart = new BitMatcher!Char(zis);
                 if (kickstart.empty)
                     kickstart = null;
             }

Original file line number	Diff line number	Diff line change
`@@ -1501,13 +1501,12 @@ pure:`
`1501`	`1501`	`}`
`1502`	`1502`	`}`
`1503`	`1503`	`checkIfOneShot();`
`1504`		`- if (!(flags & RegexInfo.oneShot))`
	`1504`	`+ if (!(flags & RegexInfo.oneShot) && !__ctfe)`
`1505`	`1505`	`{`
`1506`	`1506`	`kickstart = new ShiftOr!Char(zis);`
`1507`	`1507`	`if (kickstart.empty)`
`1508`	`1508`	`{`
`1509`		`- if (!__ctfe)`
`1510`		`- kickstart = new BitMatcher!Char(zis);`
	`1509`	`+ kickstart = new BitMatcher!Char(zis);`
`1511`	`1510`	`if (kickstart.empty)`
`1512`	`1511`	`kickstart = null;`
`1513`	`1512`	`}`