Skip to content

Fix std.regex.internal.shiftor #5243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kinke wants to merge 1 commit into from
Closed

Fix std.regex.internal.shiftor #5243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions std/regex/internal/shiftor.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ uint effectiveSize(Char)()
Kickstart engine using ShiftOr algorithm,
a bit parallel technique for inexact string searching.
*/
class ShiftOr(Char) : Kickstart!Char
class ShiftOr(Char)
{
private:
pure:
Expand Down Expand Up @@ -242,9 +242,9 @@ public:
static immutable codeBounds = [0x0, 0x7F, 0x80, 0x7FF, 0x800, 0xFFFF, 0x10000, 0x10FFFF];
else //== 2
static immutable codeBounds = [0x0, 0xFFFF, 0x10000, 0x10FFFF];
uint[] arr = new uint[set.length * 2];
uint[] arr = new uint[set.byInterval.length * 2];
size_t ofs = 0;
foreach (ival; set)
foreach (ival; set.byInterval)
{
arr[ofs++] = ival.a;
arr[ofs++] = ival.b;
Expand All @@ -263,8 +263,7 @@ public:
auto chars = set.length;
if (chars > charsetThreshold)
goto L_StopThread;
foreach (ival; set)
foreach (ch; ival.a..ival.b)
foreach (ch; set.byCodepoint)
{
//avoid surrogate pairs
if (0xD800 <= ch && ch <= 0xDFFF)
Expand Down