Port to latest zig-master

src/regex.zigmodified+25-27

Changes to src/regex.zig

		@@ -41,6 +41,7 @@ pub const EngineType = enum {
41	41	/// Main regex type - represents a compiled regular expression pattern
42	42	pub const Regex = struct {
43	43	allocator: std.mem.Allocator,
	44	+ io: std.Io,
44	45	pattern: []const u8,
45	46	nfa: compiler.NFA,
46	47	backtrack_engine: ?backtrack.BacktrackEngine,
		@@ -52,12 +53,12 @@ pub const Regex = struct {
52	53	named_captures: std.StringHashMap(usize), // name -> capture_index mapping
53	54
54	55	/// Compile a regex pattern with default flags
55		- pub fn compile(allocator: std.mem.Allocator, pattern: []const u8) !Regex {
56		- return compileWithFlags(allocator, pattern, .{});
	56	+ pub fn compile(allocator: std.mem.Allocator, io: std.Io, pattern: []const u8) !Regex {
	57	+ return compileWithFlags(allocator, io, pattern, .{});
57	58	}
58	59
59	60	/// Compile a regex pattern with custom flags
60		- pub fn compileWithFlags(allocator: std.mem.Allocator, pattern: []const u8, flags: common.CompileFlags) !Regex {
	61	+ pub fn compileWithFlags(allocator: std.mem.Allocator, io: std.Io, pattern: []const u8, flags: common.CompileFlags) !Regex {
61	62	if (pattern.len == 0) {
62	63	return RegexError.EmptyPattern;
63	64	}
		@@ -92,12 +93,7 @@ pub const Regex = struct {
92	93
93	94	if (needs_backtracking) {
94	95	// Use backtracking engine
95		- var backtrack_engine = try backtrack.BacktrackEngine.init(
96		- allocator,
97		- tree.root,
98		- tree.capture_count,
99		- flags
100		- );
	96	+ var backtrack_engine = try backtrack.BacktrackEngine.init(allocator, tree.root, tree.capture_count, flags);
101	97	errdefer backtrack_engine.deinit();
102	98
103	99	// Create a dummy NFA (not used)
		@@ -106,6 +102,7 @@ pub const Regex = struct {
106	102	_ = try dummy_nfa.addState();
107	103
108	104	return Regex{
	105	+ .io = io,
109	106	.allocator = allocator,
110	107	.pattern = owned_pattern,
111	108	.nfa = dummy_nfa,
		@@ -126,6 +123,7 @@ pub const Regex = struct {
126	123	_ = try comp.compile(&tree);
127	124
128	125	return Regex{
	126	+ .io = io,
129	127	.allocator = allocator,
130	128	.pattern = owned_pattern,
131	129	.nfa = comp.nfa,

formatting only · 13 hidden lines

Changes to src/regex.zig

		@@ -676,11 +674,11 @@ fn requiresBacktracking(node: *ast.Node) bool { formatting only
676	674	// Recursively check compound nodes
677	675	.concat => {
678	676	return requiresBacktracking(node.data.concat.left) or
679		- requiresBacktracking(node.data.concat.right);
	677	+ requiresBacktracking(node.data.concat.right);
680	678	},
681	679	.alternation => {
682	680	return requiresBacktracking(node.data.alternation.left) or
683		- requiresBacktracking(node.data.alternation.right);
	681	+ requiresBacktracking(node.data.alternation.right);
684	682	},
685	683	.group => return requiresBacktracking(node.data.group.child),
686	684

Changes to src/regex.zig

		@@ -727,20 +725,20 @@ fn collectNamedCaptures(node: *ast.Node, map: *std.StringHashMap(usize)) !void {
727	725
728	726	test "compile empty pattern" {
729	727	const allocator = std.testing.allocator;
730		- const result = Regex.compile(allocator, "");
	728	+ const result = Regex.compile(allocator, std.testing.io, "");
731	729	try std.testing.expectError(RegexError.EmptyPattern, result);
732	730	}
733	731
734	732	test "compile basic pattern" {
735	733	const allocator = std.testing.allocator;
736		- var regex = try Regex.compile(allocator, "test");
	734	+ var regex = try Regex.compile(allocator, std.testing.io, "test");
737	735	defer regex.deinit();
738	736	try std.testing.expectEqualStrings("test", regex.pattern);
739	737	}
740	738
741	739	test "match literal" {
742	740	const allocator = std.testing.allocator;
743		- var regex = try Regex.compile(allocator, "hello");
	741	+ var regex = try Regex.compile(allocator, std.testing.io, "hello");
744	742	defer regex.deinit();
745	743
746	744	try std.testing.expect(try regex.isMatch("hello"));
		@@ -749,7 +747,7 @@ test "match literal" {
749	747
750	748	test "find literal" {
751	749	const allocator = std.testing.allocator;
752		- var regex = try Regex.compile(allocator, "world");
	750	+ var regex = try Regex.compile(allocator, std.testing.io, "world");
753	751	defer regex.deinit();
754	752
755	753	if (try regex.find("hello world")) |match_result| {
		@@ -765,7 +763,7 @@ test "find literal" {
765	763
766	764	test "alternation" {
767	765	const allocator = std.testing.allocator;
768		- var regex = try Regex.compile(allocator, "cat|dog");
	766	+ var regex = try Regex.compile(allocator, std.testing.io, "cat|dog");
769	767	defer regex.deinit();
770	768
771	769	try std.testing.expect(try regex.isMatch("cat"));
		@@ -775,7 +773,7 @@ test "alternation" {
775	773
776	774	test "star quantifier" {
777	775	const allocator = std.testing.allocator;
778		- var regex = try Regex.compile(allocator, "a*");
	776	+ var regex = try Regex.compile(allocator, std.testing.io, "a*");
779	777	defer regex.deinit();
780	778
781	779	try std.testing.expect(try regex.isMatch(""));
		@@ -785,7 +783,7 @@ test "star quantifier" {
785	783
786	784	test "plus quantifier" {
787	785	const allocator = std.testing.allocator;
788		- var regex = try Regex.compile(allocator, "a+");
	786	+ var regex = try Regex.compile(allocator, std.testing.io, "a+");
789	787	defer regex.deinit();
790	788
791	789	try std.testing.expect(!try regex.isMatch(""));
		@@ -795,7 +793,7 @@ test "plus quantifier" {
795	793
796	794	test "optional quantifier" {
797	795	const allocator = std.testing.allocator;
798		- var regex = try Regex.compile(allocator, "a?");
	796	+ var regex = try Regex.compile(allocator, std.testing.io, "a?");
799	797	defer regex.deinit();
800	798
801	799	try std.testing.expect(try regex.isMatch(""));
		@@ -804,7 +802,7 @@ test "optional quantifier" {
804	802
805	803	test "dot wildcard" {
806	804	const allocator = std.testing.allocator;
807		- var regex = try Regex.compile(allocator, "a.c");
	805	+ var regex = try Regex.compile(allocator, std.testing.io, "a.c");
808	806	defer regex.deinit();
809	807
810	808	try std.testing.expect(try regex.isMatch("abc"));
		@@ -814,7 +812,7 @@ test "dot wildcard" {
814	812
815	813	test "character class \\d" {
816	814	const allocator = std.testing.allocator;
817		- var regex = try Regex.compile(allocator, "\\d+");
	815	+ var regex = try Regex.compile(allocator, std.testing.io, "\\d+");
818	816	defer regex.deinit();
819	817
820	818	if (try regex.find("abc123def")) |match_result| {
		@@ -828,7 +826,7 @@ test "character class \\d" {
828	826
829	827	test "replace" {
830	828	const allocator = std.testing.allocator;
831		- var regex = try Regex.compile(allocator, "world");
	829	+ var regex = try Regex.compile(allocator, std.testing.io, "world");
832	830	defer regex.deinit();
833	831
834	832	const result = try regex.replace(allocator, "hello world", "Zig");
		@@ -839,7 +837,7 @@ test "replace" {
839	837
840	838	test "replace all" {
841	839	const allocator = std.testing.allocator;
842		- var regex = try Regex.compile(allocator, "a");
	840	+ var regex = try Regex.compile(allocator, std.testing.io, "a");
843	841	defer regex.deinit();
844	842
845	843	const result = try regex.replaceAll(allocator, "banana", "o");
		@@ -850,7 +848,7 @@ test "replace all" {
850	848
851	849	test "split" {
852	850	const allocator = std.testing.allocator;
853		- var regex = try Regex.compile(allocator, ",");
	851	+ var regex = try Regex.compile(allocator, std.testing.io, ",");
854	852	defer regex.deinit();
855	853
856	854	const parts = try regex.split(allocator, "a,b,c");
		@@ -866,7 +864,7 @@ test "compile rejects dangerous nested quantifiers" {
866	864	const allocator = std.testing.allocator;
867	865
868	866	// This pattern should be rejected as critical risk
869		- const result = Regex.compile(allocator, "(a+)+");
	867	+ const result = Regex.compile(allocator, std.testing.io, "(a+)+");
870	868	try std.testing.expectError(RegexError.PatternTooComplex, result);
871	869	}
872	870
		@@ -874,7 +872,7 @@ test "compile rejects nested stars" {
874	872	const allocator = std.testing.allocator;
875	873
876	874	// This pattern should be rejected
877		- const result = Regex.compile(allocator, "(a*)*");
	875	+ const result = Regex.compile(allocator, std.testing.io, "(a*)*");
878	876	try std.testing.expectError(RegexError.PatternTooComplex, result);
879	877	}
880	878
		@@ -882,6 +880,6 @@ test "compile accepts safe complex patterns" {
882	880	const allocator = std.testing.allocator;
883	881
884	882	// This pattern should be accepted (medium risk is OK)
885		- var regex = try Regex.compile(allocator, "a+b*c?d{2,5}");
	883	+ var regex = try Regex.compile(allocator, std.testing.io, "a+b*c?d{2,5}");
886	884	defer regex.deinit();
887	885	}