Merge pull request #1732 from blackwhale/revert-wa-regex

[TRIVIAL] CTFE bug 9634 was fixed, remove the workaround
dlang · Nov 28, 2013 · a419cd2 · a419cd2
2 parents 90e7c10 + 3e22b63
commit a419cd2
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/std/regex.d b/std/regex.d
@@ -1330,14 +1330,7 @@ struct Parser(R)
             }
             put(Bytecode(greedy ? IR.InfiniteStart : IR.InfiniteQStart, len));
             enforce(ir.length + len < maxCompiledLength,  "maximum compiled pattern length is exceeded");
-            //workaround @@@BUG@@@ 9634
-            if(__ctfe)
-            {
-                foreach(v; ir[offset .. offset+len])
-                    ir ~= v;
-            }
-            else
-                ir ~= ir[offset .. offset+len];
+            ir ~= ir[offset .. offset+len];
             //IR.InfinteX is always a hotspot
             put(Bytecode(greedy ? IR.InfiniteEnd : IR.InfiniteQEnd, len));
             put(Bytecode.init); //merge index