Pass main allocator to all solution functions.

Author: ACSimon33

2024/00/zig_template/benchmarks/puzzle_benchmarks.zig

@@ -5,13 +5,13 @@ const zig_template = @import("zig_template");
 const puzzle_input = @embedFile("puzzle_input");
 
 // Benchmark of part 1
-fn task_1(_: std.mem.Allocator) void {
-    _ = zig_template.solution_1(puzzle_input) catch {};
+fn task_1(allocator: std.mem.Allocator) void {
+    _ = zig_template.solution_1(puzzle_input, allocator) catch {};
 }
 
 // Benchmark of part 2
-fn task_2(_: std.mem.Allocator) void {
-    _ = zig_template.solution_2(puzzle_input) catch {};
+fn task_2(allocator: std.mem.Allocator) void {
+    _ = zig_template.solution_2(puzzle_input, allocator) catch {};
 }
 
 pub fn main() !void {

2024/00/zig_template/src/main.zig

@@ -50,11 +50,17 @@ pub fn main() !void {
         return;
     }
 
-    const result_1 = zig_template.solution_1(file_content);
+    const result_1 = zig_template.solution_1(
+        file_content,
+        allocator,
+    );
     try stdout.print("1. Solution: {!}\n", .{result_1});
     try bw.flush();
 
-    const result_2 = zig_template.solution_2(file_content);
+    const result_2 = zig_template.solution_2(
+        file_content,
+        allocator,
+    );
     try stdout.print("2. Solution: {!}\n", .{result_2});
     try bw.flush();
 }

2024/00/zig_template/src/zig_template.zig

@@ -1,16 +1,18 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
+const ArrayList = std.ArrayList;
 const string = []const u8;
 
 /// Task 1 -
 ///
 /// Arguments:
 ///   - `contents`: Input file contents.
+///   - `main_allocator`: Base allocator for everything.
 ///
 /// Returns:
 ///   - Solution for task 1.
-pub fn solution_1(contents: string) !i32 {
-    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
+pub fn solution_1(contents: string, main_allocator: Allocator) !i32 {
+    var arena = std.heap.ArenaAllocator.init(main_allocator);
     defer arena.deinit();
 
     const allocator = arena.allocator();
@@ -23,12 +25,16 @@ pub fn solution_1(contents: string) !i32 {
 ///
 /// Arguments:
 ///   - `contents`: Input file contents.
+///   - `main_allocator`: Base allocator for everything.
 ///
 /// Returns:
 ///   - Solution for task 2.
-pub fn solution_2(contents: string) !i32 {
-    const lines = std.mem.split(u8, contents, "\n");
-    _ = lines;
+pub fn solution_2(contents: string, main_allocator: Allocator) !i32 {
+    var arena = std.heap.ArenaAllocator.init(main_allocator);
+    defer arena.deinit();
+
+    const allocator = arena.allocator();
+    _ = try parse(contents, allocator);
 
     return 1;
 }
@@ -39,6 +45,7 @@ pub fn solution_2(contents: string) !i32 {
 ///
 /// Arguments:
 ///   - `contents`: Input file contents.
+///   - `main_allocator`: Base allocator for everything.
 ///   - `allocator`: Allocator for the containers.
 ///
 /// Returns:

2024/00/zig_template/tests/example_tests.zig

@@ -7,7 +7,7 @@ test "task_1" {
     const example_input = @embedFile("example_input");
     try testing.expectEqual(
         0,
-        zig_template.solution_1(example_input),
+        zig_template.solution_1(example_input, std.testing.allocator),
     );
 }
 
@@ -16,6 +16,6 @@ test "task_2" {
     const example_input = @embedFile("example_input");
     try testing.expectEqual(
         1,
-        zig_template.solution_2(example_input),
+        zig_template.solution_2(example_input, std.testing.allocator),
     );
 }

2024/01/historian_hysteria/benchmarks/puzzle_benchmarks.zig

@@ -5,13 +5,13 @@ const historian_hysteria = @import("historian_hysteria");
 const puzzle_input = @embedFile("puzzle_input");
 
 // Benchmark of part 1
-fn task_1(_: std.mem.Allocator) void {
-    _ = historian_hysteria.list_distance(puzzle_input) catch {};
+fn task_1(allocator: std.mem.Allocator) void {
+    _ = historian_hysteria.list_distance(puzzle_input, allocator) catch {};
 }
 
 // Benchmark of part 2
-fn task_2(_: std.mem.Allocator) void {
-    _ = historian_hysteria.list_similarity(puzzle_input) catch {};
+fn task_2(allocator: std.mem.Allocator) void {
+    _ = historian_hysteria.list_similarity(puzzle_input, allocator) catch {};
 }
 
 pub fn main() !void {

2024/01/historian_hysteria/src/historian_hysteria.zig

@@ -7,11 +7,12 @@ const string = []const u8;
 ///
 /// Arguments:
 ///   - `contents`: Input file contents.
+///   - `main_allocator`: Base allocator for everything.
 ///
 /// Returns:
 ///   - Distance of the two lists.
-pub fn list_distance(contents: string) !u32 {
-    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
+pub fn list_distance(contents: string, main_allocator: Allocator) !u32 {
+    var arena = std.heap.ArenaAllocator.init(main_allocator);
     defer arena.deinit();
 
     const allocator = arena.allocator();
@@ -32,11 +33,12 @@ pub fn list_distance(contents: string) !u32 {
 ///
 /// Arguments:
 ///   - `contents`: Input file contents.
+///   - `main_allocator`: Base allocator for everything.
 ///
 /// Returns:
 ///   - Similarity of the two lists.
-pub fn list_similarity(contents: string) !i32 {
-    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
+pub fn list_similarity(contents: string, main_allocator: Allocator) !i32 {
+    var arena = std.heap.ArenaAllocator.init(main_allocator);
     defer arena.deinit();
 
     const allocator = arena.allocator();
@@ -57,6 +59,7 @@ pub fn list_similarity(contents: string) !i32 {
 ///
 /// Arguments:
 ///   - `contents`: Input file contents.
+///   - `main_allocator`: Base allocator for everything.
 ///   - `allocator`: Allocator for the containers.
 ///
 /// Returns:

2024/01/historian_hysteria/src/main.zig

@@ -50,11 +50,17 @@ pub fn main() !void {
         return;
     }
 
-    const result_1 = historian_hysteria.list_distance(file_content);
+    const result_1 = historian_hysteria.list_distance(
+        file_content,
+        allocator,
+    );
     try stdout.print("List distance: {!}\n", .{result_1});
     try bw.flush();
 
-    const result_2 = historian_hysteria.list_similarity(file_content);
+    const result_2 = historian_hysteria.list_similarity(
+        file_content,
+        allocator,
+    );
     try stdout.print("List similarity: {!}\n", .{result_2});
     try bw.flush();
 }

2024/01/historian_hysteria/tests/example_tests.zig

@@ -7,7 +7,7 @@ test "task_1" {
     const example_input = @embedFile("example_input");
     try testing.expectEqual(
         11,
-        historian_hysteria.list_distance(example_input),
+        historian_hysteria.list_distance(example_input, std.testing.allocator),
     );
 }
 
@@ -16,6 +16,6 @@ test "task_2" {
     const example_input = @embedFile("example_input");
     try testing.expectEqual(
         31,
-        historian_hysteria.list_similarity(example_input),
+        historian_hysteria.list_similarity(example_input, std.testing.allocator),
     );
 }

2024/02/red_nosed_reports/benchmarks/puzzle_benchmarks.zig

@@ -5,13 +5,13 @@ const red_nosed_reports = @import("red_nosed_reports");
 const puzzle_input = @embedFile("puzzle_input");
 
 // Benchmark of part 1
-fn task_1(_: std.mem.Allocator) void {
-    _ = red_nosed_reports.number_of_safe_reports(puzzle_input) catch {};
+fn task_1(allocator: std.mem.Allocator) void {
+    _ = red_nosed_reports.number_of_safe_reports(puzzle_input, allocator) catch {};
 }
 
 // Benchmark of part 2
-fn task_2(_: std.mem.Allocator) void {
-    _ = red_nosed_reports.number_of_partially_safe_reports(puzzle_input) catch {};
+fn task_2(allocator: std.mem.Allocator) void {
+    _ = red_nosed_reports.number_of_partially_safe_reports(puzzle_input, allocator) catch {};
 }
 
 pub fn main() !void {

2024/02/red_nosed_reports/src/main.zig

@@ -50,11 +50,17 @@ pub fn main() !void {
         return;
     }
 
-    const safe_reports = red_nosed_reports.number_of_safe_reports(file_content);
+    const safe_reports = red_nosed_reports.number_of_safe_reports(
+        file_content,
+        allocator,
+    );
     try stdout.print("Number of safe reports: {!}\n", .{safe_reports});
     try bw.flush();
 
-    const partially_safe_reports = red_nosed_reports.number_of_partially_safe_reports(file_content);
+    const partially_safe_reports = red_nosed_reports.number_of_partially_safe_reports(
+        file_content,
+        allocator,
+    );
     try stdout.print("Number of partially safe reports: {!}\n", .{partially_safe_reports});
     try bw.flush();
 }