zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

module: remove NamespacedState; module state is literally its struct type

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2024-03-27 11:25:15 -07:00 • committed by Stephen Gutekanst
parent 17c751a2e7
commit e6a170a07a
1 changed files with 3 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/module.zig
View file

@ -64,9 +64,8 @@ pub fn Modules(comptime modules2: anytype) type {
entities: Entities(component_types_by_name), entities: Entities(component_types_by_name),
pub fn Mod(comptime M: type) type { pub fn Mod(comptime M: type) type {
const StateT = NamespacedState(ModulesT.modules);
const NSComponents = ComponentTypesByName(ModulesT.modules); const NSComponents = ComponentTypesByName(ModulesT.modules);
return Module(M, ModulesT, StateT, NSComponents); return Module(M, ModulesT, NSComponents);
} }
pub fn init(m: *@This(), allocator: std.mem.Allocator) !void { pub fn init(m: *@This(), allocator: std.mem.Allocator) !void {
@ -347,9 +346,8 @@ pub fn Modules(comptime modules2: anytype) type {
pub fn ModsByName(comptime modules: anytype, comptime ModulesT: type) type { pub fn ModsByName(comptime modules: anytype, comptime ModulesT: type) type {
var fields: []const std.builtin.Type.StructField = &[0]std.builtin.Type.StructField{}; var fields: []const std.builtin.Type.StructField = &[0]std.builtin.Type.StructField{};
for (modules) |M| { for (modules) |M| {
const StateT = NamespacedState(modules);
const NSComponents = ComponentTypesByName(modules); const NSComponents = ComponentTypesByName(modules);
const Mod = Module(M, ModulesT, StateT, NSComponents); const Mod = Module(M, ModulesT, NSComponents);
fields = fields ++ [_]std.builtin.Type.StructField{.{ fields = fields ++ [_]std.builtin.Type.StructField{.{
.name = @tagName(M.name), .name = @tagName(M.name),
.type = Mod, .type = Mod,
@ -371,14 +369,12 @@ pub fn ModsByName(comptime modules: anytype, comptime ModulesT: type) type {
pub fn Module( pub fn Module(
comptime M: anytype, comptime M: anytype,
comptime ModulesT: type, comptime ModulesT: type,
comptime StateT: type,
comptime NSComponents: type, comptime NSComponents: type,
) type { ) type {
const module_tag = M.name; const module_tag = M.name;
const State = @TypeOf(@field(@as(StateT, undefined), @tagName(module_tag)));
const components = MComponentTypes(M){}; const components = MComponentTypes(M){};
return struct { return struct {
state: State, state: M,
entities: *Entities(NSComponents{}), entities: *Entities(NSComponents{}),
// TODO: eliminate this global allocator and/or rethink allocation strategies for modules // TODO: eliminate this global allocator and/or rethink allocation strategies for modules
allocator: std.mem.Allocator, allocator: std.mem.Allocator,
@ -816,38 +812,6 @@ fn MComponentTypes(comptime M: anytype) type {
}); });
} }
// TODO: reconsider state concept
fn NamespacedState(comptime modules: anytype) type {
var fields: []const std.builtin.Type.StructField = &[0]std.builtin.Type.StructField{};
inline for (modules) |M| {
_ = ModuleInterface(M); // Validate the module
const state_fields = std.meta.fields(M);
const State = if (state_fields.len > 0) @Type(.{
.Struct = .{
.layout = .Auto,
.is_tuple = false,
.fields = state_fields,
.decls = &[_]std.builtin.Type.Declaration{},
},
}) else struct {};
fields = fields ++ [_]std.builtin.Type.StructField{.{
.name = @tagName(M.name),
.type = State,
.default_value = null,
.is_comptime = false,
.alignment = @alignOf(State),
}};
}
return @Type(.{
.Struct = .{
.layout = .Auto,
.is_tuple = false,
.fields = fields,
.decls = &[_]std.builtin.Type.Declaration{},
},
});
}
fn isString(comptime S: type) bool { fn isString(comptime S: type) bool {
return switch (@typeInfo(S)) { return switch (@typeInfo(S)) {
.Pointer => |p| switch (p.size) { .Pointer => |p| switch (p.size) {