summaryrefslogtreecommitdiff
path: root/src/regexp.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/regexp.zig')
-rw-r--r--src/regexp.zig11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/regexp.zig b/src/regexp.zig
index 4cbca57e..6d281859 100644
--- a/src/regexp.zig
+++ b/src/regexp.zig
@@ -283,7 +283,10 @@ pub const Regex = struct {
/// its top level and every branch starts with `^`; null when it is not
/// one, or no branch does.
fn anchoredAlternation(pat: []const u8, out: *[5 * max_ops + 2]u8) error{ Bad, Mixed }!?[]const u8 {
- var bars: [16]usize = undefined;
+ // No rewrite is longer than `out`, so neither is any pattern it
+ // takes, nor its count of bars.
+ if (pat.len > out.len) return error.Bad;
+ var bars: [5 * max_ops + 2]u16 = undefined;
var n: usize = 0;
var depth: usize = 0;
var in_class = false;
@@ -301,8 +304,7 @@ pub const Regex = struct {
} else if (c == ')') {
depth -|= 1;
} else if (c == '|' and depth == 0) {
- if (n == bars.len) return error.Bad;
- bars[n] = i;
+ bars[n] = @intCast(i);
n += 1;
}
}
@@ -518,6 +520,9 @@ test "a ^ after | anchors that branch: ^def|^ finds a line that starts either w
try std.testing.expectError(error.Mixed, Regex.compile("^def|x"));
var plain = try Regex.compile("a|b");
try std.testing.expectEqual(@as(usize, 7), (try plain.find(text, 0, text.len, text.len)).?.start);
+ // Seventeen branches and more are a pattern like any other.
+ var many = try Regex.compile("q|r|s|t|u|v|w|x|y|z|k|l|m|n|o|p|j|b");
+ try std.testing.expectEqual(@as(usize, 0), (try many.find(text, 0, text.len, text.len)).?.start);
}
test "a quoted backslash before n is no newline, and a class ends where mvzr ends it" {