Merge pull request #1 from nooneknowspeter/refactor/patch-system

Refactor/patch system

Author: nooneknowspeter

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing
+
+<!-- TODO: -->

build.zig

@@ -16,11 +16,14 @@ pub fn build(b: *STD.Build) !void {
 
     // cli
     {
-        const CPPLINGS_CLI = b.addExecutable(.{ .name = "cpplings_cli", .root_module = b.createModule(.{
-            .target = TARGET,
-            .optimize = OPTIMIZE,
-            .root_source_file = b.path("src/main.zig"),
-        }) });
+        const CPPLINGS_CLI = b.addExecutable(.{
+            .name = "cpplings_cli",
+            .root_module = b.createModule(.{
+                .target = TARGET,
+                .optimize = OPTIMIZE,
+                .root_source_file = b.path("src/main.zig"),
+            }),
+        });
 
         b.installArtifact(CPPLINGS_CLI);
         const CPPLINGS_CLI_ARTIFIACT = b.addRunArtifact(CPPLINGS_CLI);
@@ -36,6 +39,23 @@ pub fn build(b: *STD.Build) !void {
         }
     }
 
+    // tests
+    {
+        const CPPLINGS_CLI_TESTS = b.addTest(.{
+            .name = "cpplings_tests",
+            .root_module = b.createModule(.{
+                .target = TARGET,
+                .optimize = OPTIMIZE,
+                .root_source_file = b.path("src/test.zig"),
+            }),
+        });
+
+        const CPPLINGS_CLI_TESTS_ARTIFACT = b.addRunArtifact(CPPLINGS_CLI_TESTS);
+
+        const CPPLINGS_CLI_TESTS_STEP = b.step("tests", "Run cpplings tests");
+        CPPLINGS_CLI_TESTS_STEP.dependOn(&CPPLINGS_CLI_TESTS_ARTIFACT.step);
+    }
+
     // exercises
     {
         const COMPILER_FLAGS = [_][]const u8{ "-std=c++23", "-Wall", "-Werror", "-Wextra" };

src/cli.zig

@@ -339,4 +339,3 @@ pub fn run(allocator: STD.mem.Allocator, extra_options: struct { exercises_dir_p
 
     try userInput(self);
 }
-

src/cli/patch.zig

@@ -15,24 +15,26 @@ pub fn help_documentation() void {
 pub fn main() !void {
     var mem_arena = STD.heap.ArenaAllocator.init(STD.heap.page_allocator);
     defer mem_arena.deinit();
-    const MEM_ALLOCATOR = mem_arena.allocator();
+
+    const ALLOCATOR = mem_arena.allocator();
 
     if (STD.os.argv.len > 2) {
         STD.debug.print("Too many arguments\n", .{});
         help_documentation();
     }
 
     if (STD.os.argv.len == 1) {
-        try CLI.run(MEM_ALLOCATOR, .{});
+        try CLI.run(ALLOCATOR, .{});
         return;
     }
 
     const PROGRAM_ARGUMENT = STD.mem.span(STD.os.argv[1]);
 
     if (STD.mem.eql(u8, PROGRAM_ARGUMENT, "-s") or STD.mem.eql(u8, PROGRAM_ARGUMENT, "--solutions")) {
-        try CLI.run(MEM_ALLOCATOR, .{ .exercises_dir_path = ".patches/solutions" });
+        try CLI.run(ALLOCATOR, .{ .exercises_dir_path = ".patches/solutions" });
     } else if (STD.mem.eql(u8, PROGRAM_ARGUMENT, "-p") or STD.mem.eql(u8, PROGRAM_ARGUMENT, "--patch")) {
-        try PATCH_SYSTEM.run(MEM_ALLOCATOR);
+        const PATCH_SYSTEM_INSTANCE = try PATCH_SYSTEM.PatchSystem.init(ALLOCATOR, .{});
+        defer PATCH_SYSTEM_INSTANCE.deinit(ALLOCATOR);
     } else if (STD.mem.eql(u8, PROGRAM_ARGUMENT, "-h") or STD.mem.eql(u8, PROGRAM_ARGUMENT, "--help") or STD.mem.eql(u8, PROGRAM_ARGUMENT, "help")) {
         help_documentation();
     } else {