sam_oneal/ziglings
1
0
Fork 0
mirror of https://codeberg.org/ziglings/exercises.git synced 2026-06-08 07:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Improve command line style' (#451) from manliop/exercises:improve-command-line-style into main

Browse Source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/451
This commit is contained in:
Chris Boesch
2026-06-06 22:11:53 +02:00
parent 6aaf048935 72a441a6bd
commit 83a89702b2
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
rivendell/elrond.zig
View File

@@ -21,6 +21,7 @@ const builtin = @import("builtin");
const Process = std.process; const Process = std.process;
const print = std.debug.print; const print = std.debug.print;
const cutPrefix = std.mem.cutPrefix;
const progress_filename = ".progress.txt"; const progress_filename = ".progress.txt";
@@ -102,6 +103,16 @@ pub const Exercise = struct {
} }
}; };
// Shared, read-only run context threaded through the helpers.
const Context = struct {
io: std.Io,
arena: std.mem.Allocator,
zig_exe: []const u8,
work_path: []const u8,
};
const Error = error{Failed};
// Ansi colors. // Ansi colors.
var use_color_escapes = false; var use_color_escapes = false;
var red_text: []const u8 = ""; var red_text: []const u8 = "";
@@ -138,7 +149,8 @@ pub fn main(init: std.process.Init) !void {
const io = init.io; const io = init.io;
const arena = init.arena.allocator(); const arena = init.arena.allocator();
const args = try init.minimal.args.toSlice(arena); var args_it = try init.minimal.args.iterateAllocator(arena);
if (!args_it.skip()) @panic("expected self arg");
setupColors(io); setupColors(io);
@@ -150,22 +162,21 @@ pub fn main(init: std.process.Init) !void {
var only_n: ?usize = null; var only_n: ?usize = null;
var start_n: ?usize = null; var start_n: ?usize = null;
for (1..args.len) |n| { while (args_it.next()) |arg| {
const arg = args[n];
if (std.mem.eql(u8, arg, "--logo")) { if (std.mem.eql(u8, arg, "--logo")) {
print("{s}{s}{s}", .{ yellow_text, logo, reset_text }); print("{s}{s}{s}", .{ yellow_text, logo, reset_text });
return; return;
} else if (prefix(arg, "--zig=")) |v| { } else if (cutPrefix(u8, arg, "--zig=")) |v| {
zig_exe = v; zig_exe = v;
} else if (prefix(arg, "--work-path=")) |v| { } else if (cutPrefix(u8, arg, "--work-path=")) |v| {
work_path = v; work_path = v;
} else if (prefix(arg, "--only=")) |v| { } else if (cutPrefix(u8, arg, "--only=")) |v| {
only_n = std.fmt.parseInt(usize, v, 10) catch { only_n = std.fmt.parseInt(usize, v, 10) catch {
print("invalid --only value: {s}\n", .{v}); print("invalid --only value: {s}\n", .{v});
std.process.exit(1); std.process.exit(1);
}; };
mode = .named; mode = .named;
} else if (prefix(arg, "--start=")) |v| { } else if (cutPrefix(u8, arg, "--start=")) |v| {
start_n = std.fmt.parseInt(usize, v, 10) catch { start_n = std.fmt.parseInt(usize, v, 10) catch {
print("invalid --start value: {s}\n", .{v}); print("invalid --start value: {s}\n", .{v});
std.process.exit(1); std.process.exit(1);
@@ -181,7 +192,12 @@ pub fn main(init: std.process.Init) !void {
print("{s}", .{logo}); print("{s}", .{logo});
const ctx: Context = .{ .io = io, .arena = arena, .zig_exe = zig_exe, .work_path = work_path }; const ctx: Context = .{
.io = io,
.arena = arena,
.zig_exe = zig_exe,
.work_path = work_path,
};
switch (mode) { switch (mode) {
.named => { .named => {
@@ -230,21 +246,6 @@ pub fn main(init: std.process.Init) !void {
} }
} }
fn prefix(arg: []const u8, pre: []const u8) ?[]const u8 {
if (std.mem.startsWith(u8, arg, pre)) return arg[pre.len..];
return null;
}
// Shared, read-only run context threaded through the helpers.
const Context = struct {
io: std.Io,
arena: std.mem.Allocator,
zig_exe: []const u8,
work_path: []const u8,
};
const Error = error{Failed};
// Iterates exercises from `start_index` to the end, stopping at the first failure. // Iterates exercises from `start_index` to the end, stopping at the first failure.
// Progress is written after each passed exercise. // Progress is written after each passed exercise.
fn iterateFrom(ctx: Context, start_index: usize) Error!void { fn iterateFrom(ctx: Context, start_index: usize) Error!void {