Skip to content

std.Build: Allow ConfigHeader values to be added outside of comptime #22795

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
merged 1 commit into from
Feb 23, 2025
Merged

std.Build: Allow ConfigHeader values to be added outside of comptime #22795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 19 additions & 19 deletions lib/std/Build/Step/ConfigHeader.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,58 +100,58 @@ pub fn create(owner: *std.Build, options: Options) *ConfigHeader {
return config_header;
}

pub fn addValue(config_header: *ConfigHeader, name: []const u8, comptime T: type, value: T) void {
return addValueInner(config_header, name, T, value) catch @panic("OOM");
}

pub fn addValues(config_header: *ConfigHeader, values: anytype) void {
return addValuesInner(config_header, values) catch @panic("OOM");
inline for (@typeInfo(@TypeOf(values)).@"struct".fields) |field| {
addValue(config_header, field.name, field.type, @field(values, field.name));
}
}

pub fn getOutput(config_header: *ConfigHeader) std.Build.LazyPath {
return .{ .generated = .{ .file = &config_header.output_file } };
}

fn addValuesInner(config_header: *ConfigHeader, values: anytype) !void {
inline for (@typeInfo(@TypeOf(values)).@"struct".fields) |field| {
try putValue(config_header, field.name, field.type, @field(values, field.name));
}
}

fn putValue(config_header: *ConfigHeader, field_name: []const u8, comptime T: type, v: T) !void {
fn addValueInner(config_header: *ConfigHeader, name: []const u8, comptime T: type, value: T) !void {
switch (@typeInfo(T)) {
.null => {
try config_header.values.put(field_name, .undef);
try config_header.values.put(name, .undef);
},
.void => {
try config_header.values.put(field_name, .defined);
try config_header.values.put(name, .defined);
},
.bool => {
try config_header.values.put(field_name, .{ .boolean = v });
try config_header.values.put(name, .{ .boolean = value });
},
.int => {
try config_header.values.put(field_name, .{ .int = v });
try config_header.values.put(name, .{ .int = value });
},
.comptime_int => {
try config_header.values.put(field_name, .{ .int = v });
try config_header.values.put(name, .{ .int = value });
},
.@"enum", .enum_literal => {
try config_header.values.put(field_name, .{ .ident = @tagName(v) });
try config_header.values.put(name, .{ .ident = @tagName(value) });
},
.optional => {
if (v) |x| {
return putValue(config_header, field_name, @TypeOf(x), x);
if (value) |x| {
return addValueInner(config_header, name, @TypeOf(x), x);
} else {
try config_header.values.put(field_name, .undef);
try config_header.values.put(name, .undef);
}
},
.pointer => |ptr| {
switch (@typeInfo(ptr.child)) {
.array => |array| {
if (ptr.size == .one and array.child == u8) {
try config_header.values.put(field_name, .{ .string = v });
try config_header.values.put(name, .{ .string = value });
return;
}
},
.int => {
if (ptr.size == .slice and ptr.child == u8) {
try config_header.values.put(field_name, .{ .string = v });
try config_header.values.put(name, .{ .string = value });
return;
}
},
Expand Down
Loading