Skip to content

fix: prevent early args.deinit #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nolanderc merged 2 commits into from
Oct 16, 2025
Merged

fix: prevent early args.deinit #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15f461e
fix: prevent early args.deinit on windows
lesleyrs May 26, 2025
01cc94b
remove pointer indirection from `*ArgIterator` (#77)
nolanderc Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/cli.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub const Arguments = struct {
\\ --print-ast Prints the parse tree. Only valid with --parse-file.
\\
\\
;
;

fn printHelp() noreturn {
std.io.getStdOut().writer().writeAll(usage) catch {};
Expand Down Expand Up @@ -61,9 +61,7 @@ pub const Arguments = struct {
}
};

pub fn parse(allocator: std.mem.Allocator) !Arguments {
var args = try std.process.argsWithAllocator(allocator);
defer args.deinit();
pub fn parse(args: *std.process.ArgIterator) !Arguments {
_ = args.skip();

var parsed = Arguments{};
Expand All @@ -73,7 +71,7 @@ pub const Arguments = struct {
const option = arg[0..option_end];

var value_parser = ValueParser{
.args = &args,
.args = args,
.option = option,
.value = if (option_end == arg.len) null else arg[option_end + 1 ..],
};
Expand Down
5 changes: 4 additions & 1 deletion src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ pub fn main() !u8 {
var static_arena = std.heap.ArenaAllocator.init(allocator);
defer static_arena.deinit();

const args = try cli.Arguments.parse(allocator);
var alloc_args = try std.process.argsWithAllocator(allocator);
defer alloc_args.deinit();

const args = try cli.Arguments.parse(&alloc_args);

if (args.dev_mode) |stderr_target| {
if (enableDevelopmentMode(stderr_target)) {
Expand Down