alexnask
diff --git a/Collapse file
‎ctregex.zig‎
Copy file name to clipboardExpand all lines: ctregex.zig
+26-1Lines changed: 26 additions & 1 deletion b/Collapse file
‎ctregex.zig‎
Copy file name to clipboardExpand all lines: ctregex.zig
+26-1Lines changed: 26 additions & 1 deletion
diff --git a/Collapse file
‎tests.zig‎
Copy file name to clipboardExpand all lines: tests.zig
+21Lines changed: 21 additions & 0 deletions b/Collapse file
‎tests.zig‎
Copy file name to clipboardExpand all lines: tests.zig
+21Lines changed: 21 additions & 0 deletions
@@ -910,6 +910,10 @@ pub fn MatchResult(comptime regex: []const u8, comptime options: MatchOptions) t
             slice: []const CharT,
             captures: [capture_len]?[]const CharT = [1]?[]const CharT{null} ** capture_len,
 
+            inline fn resetCaptures(self: *Self) void {
+                self.captures = [1]?[]const CharT{null} ** capture_len;
+            }
+
             pub usingnamespace if (capture_len != 0)
                 struct {
                     pub fn capture(self: Self, comptime name: []const u8) ?[]const CharT {
@@ -946,6 +950,27 @@ pub fn match(comptime regex: []const u8, comptime options: MatchOptions, str: []
     return {};
 }
 
-// TODO search, findAll, etc.
+pub fn search(comptime regex: []const u8, comptime options: MatchOptions, str: []const options.encoding.CharT()) !?MatchResult(regex, options) {
+    if (comptime RegexParser.parse(regex)) |parsed| {
+        var result: MatchResult(regex, options) = .{
+            .slice = undefined,
+        };
+        const min_len = comptime parsed.root.minLen(options.encoding);
+        // TODO Better strategy.
+        var start_idx: usize = 0;
+        while (start_idx < (str.len - min_len)) : (start_idx += 1) {
+            if (try matchExpr(parsed.root, options, str[start_idx..], &result)) |slice| {
+                result.slice = slice;
+                return result;
+            }
+            result.resetCaptures();
+        }
+        return null;
+    }
+
+    return {};
+}
+
+// TODO findAll, etc.
 // TODO Convert to DFA when we can (otherwise some mix of DFA + DFS?)
 // TODO More features, aim for PCRE compatibility
@@ -28,6 +28,20 @@ fn testMatch(comptime regex: []const u8, comptime encoding: ctregex.Encoding, co
     comptime expect((try ctregex.match(regex, .{.encoding = encoding}, encoded_str)) != null);
 }
 
+fn testSearchInner(comptime regex: []const u8, comptime encoding: ctregex.Encoding, comptime str: []const encoding.CharT(), comptime found: []const encoding.CharT()) !void {
+    const result = try ctregex.search(regex, .{.encoding = encoding}, str);
+    expect(result != null);
+    expect(std.mem.eql(encoding.CharT(), result.?.slice, found));
+}
+
+fn testSearch(comptime regex: []const u8, comptime encoding: ctregex.Encoding, comptime str: []const u8, comptime found: []const u8) !void {
+    const encoded_str = comptime encodeStr(encoding, str);
+    const encoded_found = comptime encodeStr(encoding, found);
+
+    try testSearchInner(regex, encoding, encoded_str, encoded_found);
+    comptime try testSearchInner(regex, encoding, encoded_str, encoded_found);
+}
+
 fn testCapturesInner(comptime regex: []const u8, comptime encoding: ctregex.Encoding, comptime str: []const encoding.CharT(), comptime captures: []const ?[]const encoding.CharT()) !void {
     const result = try ctregex.match(regex, .{.encoding = encoding}, str);
     expect(result != null);
@@ -83,3 +97,10 @@ test "regex matching" {
     });
 }
 
+test "regex searching" {
+    @setEvalBranchQuota(3800);
+    try testSearch("foo|bar", .ascii, "some very interesting test string including foobar.", "foo");
+    try testSearch("(abc|αβγ)+", .utf8, "a lorem ipsum αβγαβγαβγ abcabc", "αβγαβγαβγ");
+    try testSearch("(abc|αβγ)+", .utf16le, "a lorem ipsum αβγαβγαβγ abcabc", "αβγαβγαβγ");
+    try testSearch("(abc|αβγ)+", .codepoint, "a lorem ipsum αβγαβγαβγ abcabc", "αβγαβγαβγ");
+}