motiejus/zig
1
Fork 0
Code Releases Activity

std: update std.builtin.Type fields to follow naming conventions

Browse Source 
The compiler actually doesn't need any functional changes for this: Sema
does reification based on the tag indices of `std.builtin.Type` already!
So, no zig1.wasm update is necessary.

This change is necessary to disallow name clashes between fields and
decls on a type, which is a prerequisite of #9938.
This commit is contained in:
mlugg
2024-08-28 02:35:53 +01:00
parent 1a178d4995
commit 0fe3fd01dd
336 changed files with 4105 additions and 4112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/std/Build/Step/ConfigHeader.zig
View File

@@ -109,47 +109,47 @@ pub fn getOutput(config_header: *ConfigHeader) std.Build.LazyPath {
}
fn addValuesInner(config_header: *ConfigHeader, values: anytype) !void {
inline for (@typeInfo(@TypeOf(values)).Struct.fields) |field| {
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 {
switch (@typeInfo(T)) {
.Null => {
.null => {
try config_header.values.put(field_name, .undef);
},
.Void => {
.void => {
try config_header.values.put(field_name, .defined);
},
.Bool => {
.bool => {
try config_header.values.put(field_name, .{ .boolean = v });
},
.Int => {
.int => {
try config_header.values.put(field_name, .{ .int = v });
},
.ComptimeInt => {
.comptime_int => {
try config_header.values.put(field_name, .{ .int = v });
},
.EnumLiteral => {
.enum_literal => {
try config_header.values.put(field_name, .{ .ident = @tagName(v) });
},
.Optional => {
.optional => {
if (v) |x| {
return putValue(config_header, field_name, @TypeOf(x), x);
} else {
try config_header.values.put(field_name, .undef);
}
},
.Pointer => |ptr| {
.pointer => |ptr| {
switch (@typeInfo(ptr.child)) {
.Array => |array| {
.array => |array| {
if (ptr.size == .One and array.child == u8) {
try config_header.values.put(field_name, .{ .string = v });
return;
}
},
.Int => {
.int => {
if (ptr.size == .Slice and ptr.child == u8) {
try config_header.values.put(field_name, .{ .string = v });
return;