commit 6c61803d8b7281ffb4517cfbc335e4e0dfcdea66 (tree)
parent 8aec13b6ab1f0a8586f3e5cf5600d70697ac209d
Author: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 2 Mar 2026 20:56:48 -0800
maker: implement module printing
Diffstat:
3 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/lib/compiler/Maker.zig b/lib/compiler/Maker.zig
@@ -429,19 +429,29 @@ pub fn main(init: process.Init.Minimal) !void {
break :c Configuration.loadFile(arena, io, file) catch |err|
fatal("failed to load configuration file {s}: {t}", .{ configure_path, err });
};
+ const c = &configuration;
var top_level_steps: std.StringArrayHashMapUnmanaged(Configuration.Step.Index) = .empty;
+ var modules: std.AutoArrayHashMapUnmanaged(Configuration.Module.Index, void) = .empty;
for (configuration.steps, 0..) |*conf_step, step_index_usize| {
if (conf_step.owner != .root) continue;
const step_index: Configuration.Step.Index = @enumFromInt(step_index_usize);
- const flags = conf_step.flags(&configuration);
- if (flags.tag == .top_level) {
- const name = step_index.ptr(&configuration).name.slice(&configuration);
- try top_level_steps.put(arena, name, step_index);
+ const flags = conf_step.flags(c);
+ switch (flags.tag) {
+ .top_level => {
+ const name = step_index.ptr(c).name.slice(c);
+ try top_level_steps.put(arena, name, step_index);
+ },
+ .compile => {
+ const root_module = step_index.ptr(c).extended.get(configuration.extra).compile.root_module;
+ try modules.put(arena, root_module, {});
+ },
+ else => {},
}
}
break :sc .{
.configuration = configuration,
.top_level_steps = top_level_steps,
+ .modules = modules,
};
};
diff --git a/lib/compiler/Maker/ScannedConfig.zig b/lib/compiler/Maker/ScannedConfig.zig
@@ -9,13 +9,13 @@ const Graph = @import("Graph.zig");
configuration: Configuration,
top_level_steps: std.StringArrayHashMapUnmanaged(Configuration.Step.Index),
+modules: std.AutoArrayHashMapUnmanaged(Configuration.Module.Index, void),
pub fn print(sc: *const ScannedConfig, w: *Writer) Writer.Error!void {
std.log.err("TODO also print paths", .{});
std.log.err("TODO also print unlazy deps", .{});
std.log.err("TODO also print system integrations", .{});
std.log.err("TODO also print available options", .{});
- std.log.err("TODO also print modules", .{});
const c = &sc.configuration;
var serializer: Serializer = .{ .writer = w };
var s = try serializer.beginStruct(.{});
@@ -31,7 +31,7 @@ pub fn print(sc: *const ScannedConfig, w: *Writer) Writer.Error!void {
{
var tf = try s.beginTupleField("steps", .{});
- for (c.steps) |*step| {
+ for (c.steps) |step| {
var step_field = try tf.beginStructField(.{});
try printStruct(sc, &step_field, Configuration.Step, step);
try step_field.end();
@@ -39,10 +39,23 @@ pub fn print(sc: *const ScannedConfig, w: *Writer) Writer.Error!void {
try tf.end();
}
+ {
+ var sf = try s.beginStructField("modules", .{});
+
+ for (sc.modules.keys()) |module_index| {
+ var int_buf: [50]u8 = undefined;
+ const int_str = std.fmt.bufPrint(&int_buf, "{d}", .{module_index}) catch unreachable;
+ var step_field = try sf.beginStructField(int_str, .{});
+ try printStruct(sc, &step_field, Configuration.Module, module_index.get(c));
+ try step_field.end();
+ }
+ try sf.end();
+ }
+
try s.end();
}
-fn printStruct(sc: *const ScannedConfig, s: *Serializer.Struct, comptime S: type, v: *const S) !void {
+fn printStruct(sc: *const ScannedConfig, s: *Serializer.Struct, comptime S: type, v: S) !void {
inline for (@typeInfo(S).@"struct".fields) |field| {
try s.fieldPrefix(field.name);
try printValue(sc, s.container.serializer, field.type, @field(v, field.name));
@@ -78,7 +91,11 @@ fn printValue(sc: *const ScannedConfig, s: *Serializer, comptime Field: type, fi
if (@hasDecl(Field, "storage")) switch (Field.storage) {
.extended => {
var sub_struct = try s.beginStruct(.{});
- try printTaggedUnion(sc, &sub_struct, field_value.get(c.extra));
+ switch (field_value.get(c.extra)) {
+ inline else => |u| {
+ try printStruct(sc, &sub_struct, @TypeOf(u), u);
+ },
+ }
try sub_struct.end();
},
.flag_optional => comptime unreachable,
@@ -98,6 +115,11 @@ fn printValue(sc: *const ScannedConfig, s: *Serializer, comptime Field: type, fi
.@"packed" => {
try s.value(field_value, .{});
},
+ .@"extern" => {
+ var sub_struct = try s.beginStruct(.{});
+ try printStruct(sc, &sub_struct, Field, field_value);
+ try sub_struct.end();
+ },
.auto => switch (Field.storage) {
.flag_optional, .enum_optional => {
if (field_value.value) |some| {
@@ -110,35 +132,41 @@ fn printValue(sc: *const ScannedConfig, s: *Serializer, comptime Field: type, fi
try printValue(sc, s, @TypeOf(field_value.slice), field_value.slice);
},
.extended => @compileError("TODO"),
- .union_list => @compileError("TODO"),
+ .union_list => {
+ var slice_field = try s.beginTuple(.{});
+ for (field_value.get(c.extra), 0..) |elem, i| switch (field_value.tag(c.extra, i)) {
+ inline else => |tag| {
+ var sub_struct = try s.beginStruct(.{});
+ try sub_struct.fieldPrefix(@tagName(tag));
+ try printValue(sc, s, @FieldType(Field.Union, @tagName(tag)), @enumFromInt(elem));
+ try sub_struct.end();
+ },
+ };
+ try slice_field.end();
+ },
.flag_union => try printValue(sc, s, Field.Union, field_value.u),
.multi_list => @compileError("TODO"),
},
- else => @compileError("not implemented: " ++ @typeName(Field)),
},
.@"union" => {
- switch (field_value) {
- inline else => |u, tag| {
- if (@TypeOf(u) == void) {
- try s.ident(@tagName(tag));
- } else {
- var sub_struct = try s.beginStruct(.{});
- try sub_struct.fieldPrefix(@tagName(tag));
- try printValue(sc, s, @TypeOf(u), u);
- try sub_struct.end();
- }
- },
- }
+ try printTaggedUnion(sc, s, field_value);
},
else => @compileError("not implemented: " ++ @typeName(Field)),
},
}
}
-fn printTaggedUnion(sc: *const ScannedConfig, s: *Serializer.Struct, value: anytype) !void {
+fn printTaggedUnion(sc: *const ScannedConfig, s: *Serializer, value: anytype) !void {
switch (value) {
- inline else => |*u| {
- try printStruct(sc, s, @TypeOf(u.*), u);
+ inline else => |u, tag| {
+ if (@TypeOf(u) == void) {
+ try s.ident(@tagName(tag));
+ } else {
+ var sub_struct = try s.beginStruct(.{});
+ try sub_struct.fieldPrefix(@tagName(tag));
+ try printValue(sc, s, @TypeOf(u), u);
+ try sub_struct.end();
+ }
},
}
}
diff --git a/lib/std/zig/Configuration.zig b/lib/std/zig/Configuration.zig
@@ -1219,7 +1219,7 @@ pub const Module = struct {
win32_resource_file: RcSourceFile.Index,
};
- pub const Framework = struct {
+ pub const Framework = extern struct {
flags: @This().Flags,
name: String,
@@ -2122,7 +2122,7 @@ pub const Storage = enum {
},
.auto => switch (Field.storage) {
.flag_optional, .enum_optional, .extended => 1,
- .length_prefixed_list, .flag_length_prefixed_list => field.slice.len + 1,
+ .length_prefixed_list, .flag_length_prefixed_list => 1 + @divExact(@sizeOf(Field.Elem), @sizeOf(u32)) * field.slice.len,
.multi_list => 1 + field.mal.len * @typeInfo(Field.Elem).@"struct".fields.len,
.union_list => Field.extraLen(field.len),
.flag_union => switch (field.u) {
