Skip to content

Allow parser to take optional secondary std.mem.Allocator parameter #159

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

Open
maxbol wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow parser to take optional secondary std.mem.Allocator parameter #159

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d263275
Allow parsers to take parser allocator as parameter
maxbol Apr 30, 2025
5150118
Simplify parser wrapping function
maxbol Apr 30, 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
38 changes: 30 additions & 8 deletions clap.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,17 +768,18 @@ pub fn parseEx(
// This is a trick to emulate a runtime `continue` in an `inline for`.
break :continue_params_loop;

const parser = comptime switch (param.takes_value) {
const Parser = comptime switch (param.takes_value) {
.none => null,
.one, .many => @field(value_parsers, param.id.value()),
.one, .many => VariadicParser(@field(value_parsers, param.id.value())),
};

const name = longest.name[0..longest.name.len].*;

switch (param.takes_value) {
.none => @field(arguments, &name) +|= 1,
.one => @field(arguments, &name) = try parser(arg.value.?),
.one => @field(arguments, &name) = try Parser.parse(arg.value.?, allocator),
.many => {
const value = try parser(arg.value.?);
const value = try Parser.parse(arg.value.?, allocator);
try @field(arguments, &name).append(allocator, value);
},
}
Expand All @@ -799,9 +800,9 @@ pub fn parseEx(
// This is a trick to emulate a runtime `continue` in an `inline for`.
break :continue_params_loop;

const parser = comptime switch (param.takes_value) {
const Parser = comptime switch (param.takes_value) {
.none => null,
.one, .many => @field(value_parsers, param.id.value()),
.one, .many => VariadicParser(@field(value_parsers, param.id.value())),
};

// We keep track of how many positionals we have received. This is used to pick which
Expand All @@ -811,8 +812,8 @@ pub fn parseEx(
const last = positionals.len == i + 1;
if ((last and positional_count >= i) or positional_count == i) {
switch (@typeInfo(@TypeOf(pos.*))) {
.optional => pos.* = try parser(arg.value.?),
else => try pos.append(allocator, try parser(arg.value.?)),
.optional => pos.* = try Parser.parse(arg.value.?, allocator),
else => try pos.append(allocator, try Parser.parse(arg.value.?, allocator)),
}

if (opt.terminating_positional <= positional_count)
Expand Down Expand Up @@ -852,6 +853,27 @@ pub fn parseEx(
};
}

fn VariadicParser(parser: anytype) type {
const parser_info = switch (@typeInfo(@TypeOf(parser))) {
.@"fn" => |info| info,
else => {
return void;
},
};
return struct {
pub fn parse(value: anytype, allocator: std.mem.Allocator) (parser_info.return_type orelse void) {
switch (parser_info.params.len) {
inline 2 => {
return parser(value, allocator);
},
inline else => {
return parser(value);
},
}
}
};
}

/// The result of `parseEx`. Is owned by the caller and should be freed with `deinit`.
pub fn ResultEx(
comptime Id: type,
Expand Down