mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-13 15:52:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5657 from DmitryOlshansky/issue-17668

Browse source 
Fix issue 17668 - assert failure regex(q"<[^]>")
merged-on-behalf-of: Dmitry Olshansky <DmitryOlshansky@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-08-07 13:12:33 +02:00 • committed by GitHub
commit bcb17a6d88
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
std/regex/internal/parser.d
View file

@ -1304,6 +1304,7 @@ if (isForwardRange!R && is(ElementType!R : dchar))
switch (op) switch (op)
{ {
case Operator.Negate: case Operator.Negate:
enforce(!stack.empty, "no operand for '^'");
stack.top = stack.top.inverted; stack.top = stack.top.inverted;
break; break;
case Operator.Union: case Operator.Union:

8
std/regex/internal/tests.d
View file

@ -1098,3 +1098,11 @@ alias Sequence(int B, int E) = staticIota!(B, E);
willThrow([r"[a-\", r"123"], "invalid escape sequence"); willThrow([r"[a-\", r"123"], "invalid escape sequence");
willThrow([r"\", r"123"], "invalid escape sequence"); willThrow([r"\", r"123"], "invalid escape sequence");
} }
// bugzilla 17668
@safe unittest
{
import std.algorithm.searching;
auto e = collectException!RegexException(regex(q"<[^]>"));
assert(e.msg.canFind("no operand for '^'"));
}