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

module: improve validation of missing mod name

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2024-04-08 21:39:47 -07:00 • committed by Stephen Gutekanst
parent c46d949b98
commit c32c1df00a
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/module/module.zig
View file

@ -69,13 +69,19 @@ const is_debug = @import("Archetype.zig").is_debug;
/// Verifies that M matches the basic layout of a Mach module /// Verifies that M matches the basic layout of a Mach module
fn ModuleInterface(comptime M: type) type { fn ModuleInterface(comptime M: type) type {
validateModule(M, true);
return M;
}
fn validateModule(comptime M: type, comptime events: bool) void {
if (@typeInfo(M) != .Struct) @compileError("mach: expected module struct, found: " ++ @typeName(M)); if (@typeInfo(M) != .Struct) @compileError("mach: expected module struct, found: " ++ @typeName(M));
if (!@hasDecl(M, "name")) @compileError("mach: module must have `pub const name = .foobar;`"); if (!@hasDecl(M, "name")) @compileError("mach: module must have `pub const name = .foobar;`: " ++ @typeName(M));
if (@typeInfo(@TypeOf(M.name)) != .EnumLiteral) @compileError("mach: module must have `pub const name = .foobar;`, found type:" ++ @typeName(M.name)); if (@typeInfo(@TypeOf(M.name)) != .EnumLiteral) @compileError("mach: module must have `pub const name = .foobar;`, found type:" ++ @typeName(M.name));
if (events) {
if (@hasDecl(M, "global_events")) validateEvents("mach: module ." ++ @tagName(M.name) ++ " global_events ", M.global_events); if (@hasDecl(M, "global_events")) validateEvents("mach: module ." ++ @tagName(M.name) ++ " global_events ", M.global_events);
if (@hasDecl(M, "local_events")) validateEvents("mach: module ." ++ @tagName(M.name) ++ " local_events ", M.local_events); if (@hasDecl(M, "local_events")) validateEvents("mach: module ." ++ @tagName(M.name) ++ " local_events ", M.local_events);
_ = ComponentTypesM(M); _ = ComponentTypesM(M);
return M; }
} }
/// TODO: implement serialization constraints /// TODO: implement serialization constraints
@ -908,6 +914,7 @@ pub fn ComponentTypesByName(comptime modules: anytype) type {
/// } /// }
/// ``` /// ```
fn ComponentTypesM(comptime M: anytype) type { fn ComponentTypesM(comptime M: anytype) type {
validateModule(M, false);
const error_prefix = "mach: module ." ++ @tagName(M.name) ++ " .components "; const error_prefix = "mach: module ." ++ @tagName(M.name) ++ " .components ";
if (!@hasDecl(M, "components")) { if (!@hasDecl(M, "components")) {
return struct {}; return struct {};