lock(reify): meta.sx surface + bodyless #builtin decls + loud bails
REIFY Phase 0.0. Add the comptime type-metaprogramming surface as the
on-demand module modules/std/meta.sx (NOT the prelude — declaring its
data types in always-loaded core.sx interns them into every module's
type table and shifts every .ir snapshot):
- EnumVariant / EnumInfo / TypeInfo data types. TypeInfo's variant uses
the backtick raw escape `enum so it reads as the keyword.
- reify / type_info / field_type as bodyless #builtin decls.
Each builtin bails LOUDLY when reached unimplemented (no silent default):
- reify(...) in a :: type-alias position -> decl.zig .call branch
(also the Phase 0.2 construction hook); poisons the alias .unresolved.
- reify / field_type in any other type position ->
generic.zig resolveTypeCallWithBindings.
- type_info(...) in expression position -> call.zig tryLowerReflectionCall.
Unit test src/parser.test.zig (registered in root.zig) locks that the
decls parse. zig build test green (447 unit, 669 examples).
This commit is contained in:
@@ -1676,6 +1676,16 @@ pub fn tryLowerReflectionCall(self: *Lowering, name: []const u8, c: *const ast.C
|
||||
// classification covers all 7; it runs before dispatch.
|
||||
if (self.reflectionTypeArgGuard(name, c)) |sentinel| return sentinel;
|
||||
|
||||
if (std.mem.eql(u8, name, "type_info")) {
|
||||
// Comptime reflection-into-data (REIFY). Until the interpreter-side
|
||||
// reflection lands (Phase 2), bail loudly rather than fall through to
|
||||
// the no-body `#builtin` const_decl path (which would mis-lower as a
|
||||
// zero-arg call). A silent fall-through would hand the caller a
|
||||
// garbage TypeInfo value.
|
||||
if (self.diagnostics) |d|
|
||||
d.addFmt(.err, c.callee.span, "type_info is not yet implemented (REIFY Phase 2)", .{});
|
||||
return Ref.none;
|
||||
}
|
||||
if (std.mem.eql(u8, name, "size_of")) {
|
||||
// size_of(T) → const_int(sizeof(T))
|
||||
const ty = self.resolveTypeArg(c.args[0]);
|
||||
|
||||
@@ -651,6 +651,17 @@ pub fn scanDecls(self: *Lowering, decls: []const *const Node) void {
|
||||
.field_access => |fa| fa.field,
|
||||
else => "",
|
||||
};
|
||||
// `E :: reify(...)` — mint a nominal type from a `TypeInfo`
|
||||
// and register `E` as an alias to it. The interpreter-side
|
||||
// construction lands in Phase 0.2; until then bail LOUDLY
|
||||
// and poison `E` to `.unresolved` (so downstream `E.value`
|
||||
// gets a clean follow-on, not a silent default type).
|
||||
if (std.mem.eql(u8, callee_name, "reify")) {
|
||||
if (self.diagnostics) |d|
|
||||
d.addFmt(.err, cd.value.span, "reify is not yet implemented (REIFY Phase 0.2)", .{});
|
||||
self.putTypeAlias(self.current_source_file, cd.name, .unresolved);
|
||||
continue;
|
||||
}
|
||||
// A namespaced callee (`ns.Box(..)`) is an explicit qualified
|
||||
// reach, exempt from the bare-head visibility gate (E4).
|
||||
const head_qualified = call_data.callee.data == .field_access;
|
||||
|
||||
@@ -1219,6 +1219,22 @@ pub fn resolveTypeCallWithBindings(self: *Lowering, cl: *const ast.Call) TypeId
|
||||
.field_access => |fa| fa.field,
|
||||
else => return .unresolved,
|
||||
};
|
||||
// Comptime type-construction builtins (REIFY). `reify`/`field_type`
|
||||
// appear in type position (`E :: reify(...)`, `field_type(T, i)` as a
|
||||
// type arg). Until the interpreter-side construction lands (Phase 0.2 /
|
||||
// Phase 2), bail LOUDLY rather than fall through to the misleading
|
||||
// "unknown type 'reify'" diagnostic below — a silent default here would
|
||||
// poison every downstream use of the type.
|
||||
if (std.mem.eql(u8, callee_name, "reify")) {
|
||||
if (self.diagnostics) |d|
|
||||
d.addFmt(.err, cl.callee.span, "reify is not yet implemented (REIFY Phase 0.2)", .{});
|
||||
return .unresolved;
|
||||
}
|
||||
if (std.mem.eql(u8, callee_name, "field_type")) {
|
||||
if (self.diagnostics) |d|
|
||||
d.addFmt(.err, cl.callee.span, "field_type is not yet implemented (REIFY Phase 2)", .{});
|
||||
return .unresolved;
|
||||
}
|
||||
// Built-in: Vector(N, T)
|
||||
if (std.mem.eql(u8, callee_name, "Vector") and cl.args.len == 2) {
|
||||
const length = self.resolveVectorLane(cl.args[0]) orelse return .unresolved;
|
||||
|
||||
79
src/parser.test.zig
Normal file
79
src/parser.test.zig
Normal file
@@ -0,0 +1,79 @@
|
||||
// Parser tests — pin parse-level shapes the example corpus can't isolate
|
||||
// (the corpus runs the full `sx run` pipeline, never the parser alone).
|
||||
|
||||
const std = @import("std");
|
||||
const ast = @import("ast.zig");
|
||||
const Node = ast.Node;
|
||||
const Parser = @import("parser.zig").Parser;
|
||||
|
||||
// REIFY Phase 0.0 (lock): the comptime type-metaprogramming surface added to
|
||||
// `library/modules/std/meta.sx` must PARSE — the data types as struct/enum
|
||||
// decls, and `reify`/`type_info`/`field_type` as bodyless `#builtin` consts.
|
||||
// This locks the declared shape before the interpreter-side construction lands
|
||||
// (Phase 0.2). Mirrors the exact spellings in meta.sx.
|
||||
test "parser: reify TypeInfo data types + #builtin decls parse" {
|
||||
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
||||
defer arena.deinit();
|
||||
const alloc = arena.allocator();
|
||||
|
||||
const src =
|
||||
\\EnumVariant :: struct {
|
||||
\\ name: string;
|
||||
\\ payload: Type;
|
||||
\\}
|
||||
\\EnumInfo :: struct {
|
||||
\\ variants: []EnumVariant;
|
||||
\\}
|
||||
\\TypeInfo :: enum {
|
||||
\\ `enum: EnumInfo;
|
||||
\\}
|
||||
\\reify :: (info: TypeInfo) -> Type #builtin;
|
||||
\\type_info :: ($T: Type) -> TypeInfo #builtin;
|
||||
\\field_type :: ($T: Type, idx: i64) -> Type #builtin;
|
||||
\\
|
||||
;
|
||||
var parser = Parser.init(alloc, src);
|
||||
const root = try parser.parse();
|
||||
|
||||
try std.testing.expect(root.data == .root);
|
||||
const decls = root.data.root.decls;
|
||||
try std.testing.expectEqual(@as(usize, 6), decls.len);
|
||||
|
||||
const Found = struct {
|
||||
// A top-level `Name :: struct/enum {…}` parses to a `.struct_decl` /
|
||||
// `.enum_decl` node DIRECTLY (not wrapped in a const_decl); only the
|
||||
// `#builtin` forms are `.const_decl`. Match on the shared `declName`.
|
||||
fn byName(ds: []const *Node, name: []const u8) ?*const Node {
|
||||
for (ds) |d| {
|
||||
if (d.data.declName()) |n| {
|
||||
if (std.mem.eql(u8, n, name)) return d;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
// Data types: struct / struct / enum, parsed as their decl nodes directly.
|
||||
const ev = Found.byName(decls, "EnumVariant") orelse return error.MissingDecl;
|
||||
try std.testing.expect(ev.data == .struct_decl);
|
||||
const ei = Found.byName(decls, "EnumInfo") orelse return error.MissingDecl;
|
||||
try std.testing.expect(ei.data == .struct_decl);
|
||||
const ti = Found.byName(decls, "TypeInfo") orelse return error.MissingDecl;
|
||||
try std.testing.expect(ti.data == .enum_decl);
|
||||
|
||||
// The single `` `enum `` variant of TypeInfo. The backtick raw escape
|
||||
// stores the bare keyword as the variant name.
|
||||
const ed = ti.data.enum_decl;
|
||||
try std.testing.expectEqual(@as(usize, 1), ed.variant_names.len);
|
||||
try std.testing.expectEqualStrings("enum", ed.variant_names[0]);
|
||||
|
||||
// Builtins: the `(params) -> Ret #builtin;` form parses as a `.fn_decl`
|
||||
// (the `->` triggers the function-def path) whose body is a `#builtin`
|
||||
// marker — same shape as the existing reflection builtins in core.sx.
|
||||
for ([_][]const u8{ "reify", "type_info", "field_type" }) |bn| {
|
||||
const d = Found.byName(decls, bn) orelse return error.MissingDecl;
|
||||
try std.testing.expect(d.data == .fn_decl);
|
||||
try std.testing.expect(d.data.fn_decl.body.data == .builtin_expr);
|
||||
try std.testing.expect(d.data.fn_decl.return_type != null);
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ pub const lexer = @import("lexer.zig");
|
||||
pub const lexer_tests = @import("lexer.test.zig");
|
||||
pub const ast = @import("ast.zig");
|
||||
pub const parser = @import("parser.zig");
|
||||
pub const parser_tests = @import("parser.test.zig");
|
||||
pub const print = @import("print.zig");
|
||||
pub const types = @import("types.zig");
|
||||
pub const target = @import("target.zig");
|
||||
|
||||
Reference in New Issue
Block a user