The codegen-side resolver was already raw-aware for the universal model; the sema/LSP editor index (the second classifier) only honored the DIRECT raw type. A COMPOUND raw type (`*`s2`, `?`s2`, `[N]`s2`, `[]`s2`, `[*]`s2`) stores its inner type-name as a bare string on the Type info struct, and every resolution site re-read it with skip_builtin=false — so the index reclassified a user type named `s2` as the builtin int, diverging from codegen (issue-0083 class, LSP surface only; codegen unchanged). Structural cure: every compound info struct (Pointer/Optional/Slice/ ManyPointer/Array) carries a REQUIRED is_raw bit (no default — a future construction site cannot drop it). is_raw is set at every construction site (resolveTypeNode arms, fieldType arms, variadic slice, .ptr/slice_expr derivation, for-loop by-ref, substType) and passed as skip_builtin at every resolution site (elementTypeOf, field-access pointer unwrap, index, deref, optional unwrap/null-coalesce, if/while optional binding, match subject). Optional-unwrap + deref sites converted from Type.fromName/pointerPointeeType (builtin-only, divergent) to resolveTypeNameStr(name, is_raw); the now-dead pointerPointeeType removed. Tests: src/sema.test.zig gains pointer/optional/array raw-vs-bare regressions (raw → user type, bare → builtin control) — each FAILS on pre-fix sema, PASSES after — plus a parameterized-raw coverage test.
216 lines
9.0 KiB
Zig
216 lines
9.0 KiB
Zig
// Tests for sema.zig — the editor/LSP type classifier (the SECOND resolver,
|
|
// distinct from the codegen-side `ir/type_resolver.zig`). These pin behavior
|
|
// the example suite can't reach: the example runner exercises the codegen
|
|
// path (`sx run`), never sema's hover/completion/index resolution.
|
|
|
|
const std = @import("std");
|
|
const ast = @import("ast.zig");
|
|
const Node = ast.Node;
|
|
const Parser = @import("parser.zig").Parser;
|
|
const sema = @import("sema.zig");
|
|
const types = @import("types.zig");
|
|
const Type = types.Type;
|
|
|
|
// issue 0089 — the backtick raw escape must hold in BOTH classifiers. A raw
|
|
// reserved-name type reference (`` `s2 ``) resolves to the user-declared type,
|
|
// while a BARE `s2` stays the builtin int. Before the fix sema's
|
|
// `resolveTypeNode` ran `Type.fromName` first and ignored `is_raw`, so the
|
|
// editor index would show the builtin for backtick code (the issue-0083
|
|
// two-resolver divergence applied to raw types).
|
|
test "sema: backtick raw type reference resolves to the user type; bare stays builtin" {
|
|
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
|
defer arena.deinit();
|
|
const alloc = arena.allocator();
|
|
|
|
const src =
|
|
\\`s2 :: struct { x: s64; }
|
|
\\
|
|
;
|
|
var parser = Parser.init(alloc, src);
|
|
const root = try parser.parse();
|
|
|
|
var analyzer = sema.Analyzer.init(alloc);
|
|
_ = try analyzer.analyze(root);
|
|
|
|
// The reserved-spelled user type registered under its plain name.
|
|
try std.testing.expect(analyzer.struct_types.contains("s2"));
|
|
|
|
// RAW reference (`` `s2 ``) → the user struct, NOT the 2-bit signed int.
|
|
var raw_node = Node{ .span = .{ .start = 0, .end = 0 }, .data = .{ .type_expr = .{ .name = "s2", .is_raw = true } } };
|
|
const raw_ty = analyzer.resolveTypeNode(&raw_node);
|
|
try std.testing.expect(raw_ty == .struct_type);
|
|
try std.testing.expectEqualStrings("s2", raw_ty.struct_type);
|
|
|
|
// BARE `s2` → the builtin 2-bit signed int.
|
|
var bare_node = Node{ .span = .{ .start = 0, .end = 0 }, .data = .{ .type_expr = .{ .name = "s2", .is_raw = false } } };
|
|
const bare_ty = analyzer.resolveTypeNode(&bare_node);
|
|
try std.testing.expect(bare_ty == .signed);
|
|
try std.testing.expectEqual(@as(u8, 2), bare_ty.signed);
|
|
}
|
|
|
|
// The same divergence guard for the string-keyed entry (`resolveTypeNameStr`,
|
|
// reached via `fieldType` when registering struct field types): a raw field
|
|
// annotation (`` `u8 ``) resolves to the user struct, a bare one (`u8`) to the
|
|
// builtin. Driven through the real analyze pipeline (no private access).
|
|
test "sema: a raw struct-field annotation resolves to the user type; bare stays builtin" {
|
|
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
|
defer arena.deinit();
|
|
const alloc = arena.allocator();
|
|
|
|
const src =
|
|
\\`u8 :: struct { y: s64; }
|
|
\\Holder :: struct { a: `u8; b: u8; }
|
|
\\
|
|
;
|
|
var parser = Parser.init(alloc, src);
|
|
const root = try parser.parse();
|
|
|
|
var analyzer = sema.Analyzer.init(alloc);
|
|
_ = try analyzer.analyze(root);
|
|
|
|
const holder = analyzer.struct_types.get("Holder").?;
|
|
var a_ty: ?Type = null;
|
|
var b_ty: ?Type = null;
|
|
for (holder.field_names, holder.field_types) |fname, fty| {
|
|
if (std.mem.eql(u8, fname, "a")) a_ty = fty;
|
|
if (std.mem.eql(u8, fname, "b")) b_ty = fty;
|
|
}
|
|
|
|
// field `a : `u8` → the user struct named "u8".
|
|
try std.testing.expect(a_ty.? == .struct_type);
|
|
try std.testing.expectEqualStrings("u8", a_ty.?.struct_type);
|
|
|
|
// field `b : u8` → the builtin unsigned 8-bit int.
|
|
try std.testing.expect(b_ty.? == .unsigned);
|
|
try std.testing.expectEqual(@as(u8, 8), b_ty.?.unsigned);
|
|
}
|
|
|
|
// ── issue 0089: raw provenance through sema's COMPOUND type metadata ────────
|
|
//
|
|
// The direct-case fix (above) only covered a bare `` `s2 `` reference. A
|
|
// COMPOUND raw type (`*`s2`, `?`s2`, `[N]`s2`, …) stores its inner name as a
|
|
// bare string on the Type's info struct; the resolver re-reads that name via
|
|
// `resolveTypeNameStr`. Before threading `is_raw` ALONGSIDE the stored name,
|
|
// the resolver passed `skip_builtin = false`, so the LSP index reclassified a
|
|
// user type named `s2` as the builtin int — diverging from codegen. These
|
|
// pin every compound form: the raw inner resolves to the user type (FAILS on
|
|
// pre-fix sema), the bare inner stays the builtin (control, preserved).
|
|
|
|
fn symType(res: sema.SemaResult, name: []const u8) ?Type {
|
|
for (res.symbols) |sym| {
|
|
if (std.mem.eql(u8, sym.name, name)) return sym.ty;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
test "sema: field access through a raw `*`s2` pointer resolves the user field; bare `*s2` stays builtin" {
|
|
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
|
defer arena.deinit();
|
|
const alloc = arena.allocator();
|
|
|
|
const src =
|
|
\\`s2 :: struct { x: s64; }
|
|
\\f :: (p: *`s2) { y := p.x; }
|
|
\\g :: (q: *s2) { w := q.*; }
|
|
\\
|
|
;
|
|
var parser = Parser.init(alloc, src);
|
|
const root = try parser.parse();
|
|
var analyzer = sema.Analyzer.init(alloc);
|
|
const res = try analyzer.analyze(root);
|
|
|
|
// RAW: `p: *`s2` → field `x` on the user struct → s64. (Pre-fix: the
|
|
// pointee `s2` reclassified to the 2-bit int, `.x` not found → unresolved.)
|
|
const y = symType(res, "y") orelse return error.MissingSymbol;
|
|
try std.testing.expect(y == .signed);
|
|
try std.testing.expectEqual(@as(u8, 64), y.signed);
|
|
|
|
// CONTROL: `q: *s2` (bare) → deref yields the builtin 2-bit signed int.
|
|
const w = symType(res, "w") orelse return error.MissingSymbol;
|
|
try std.testing.expect(w == .signed);
|
|
try std.testing.expectEqual(@as(u8, 2), w.signed);
|
|
}
|
|
|
|
test "sema: unwrapping a raw `?`s2` optional resolves the user field; bare `?s2` stays builtin" {
|
|
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
|
defer arena.deinit();
|
|
const alloc = arena.allocator();
|
|
|
|
const src =
|
|
\\`s2 :: struct { x: s64; }
|
|
\\f :: (o: ?`s2) { if val := o { y := val.x; } }
|
|
\\g :: (b: ?s2) { if v := b { w := v; } }
|
|
\\
|
|
;
|
|
var parser = Parser.init(alloc, src);
|
|
const root = try parser.parse();
|
|
var analyzer = sema.Analyzer.init(alloc);
|
|
const res = try analyzer.analyze(root);
|
|
|
|
// RAW: `o: ?`s2` → `if val := o` unwraps to the user struct → `val.x` is s64.
|
|
// (Pre-fix: the optional child `s2` reclassified to the 2-bit int.)
|
|
const y = symType(res, "y") orelse return error.MissingSymbol;
|
|
try std.testing.expect(y == .signed);
|
|
try std.testing.expectEqual(@as(u8, 64), y.signed);
|
|
|
|
// CONTROL: `b: ?s2` (bare) unwraps to the builtin 2-bit signed int.
|
|
const w = symType(res, "w") orelse return error.MissingSymbol;
|
|
try std.testing.expect(w == .signed);
|
|
try std.testing.expectEqual(@as(u8, 2), w.signed);
|
|
}
|
|
|
|
test "sema: indexing a raw `[N]`s2` array resolves the user element; bare `[N]s2` stays builtin" {
|
|
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
|
defer arena.deinit();
|
|
const alloc = arena.allocator();
|
|
|
|
const src =
|
|
\\`s2 :: struct { x: s64; }
|
|
\\f :: (a: [4]`s2, b: [4]s2) { y := a[0]; w := b[0]; }
|
|
\\
|
|
;
|
|
var parser = Parser.init(alloc, src);
|
|
const root = try parser.parse();
|
|
var analyzer = sema.Analyzer.init(alloc);
|
|
const res = try analyzer.analyze(root);
|
|
|
|
// RAW: `a: [4]`s2` → element is the user struct. (Pre-fix: reclassified to
|
|
// the 2-bit int.)
|
|
const y = symType(res, "y") orelse return error.MissingSymbol;
|
|
try std.testing.expect(y == .struct_type);
|
|
try std.testing.expectEqualStrings("s2", y.struct_type);
|
|
|
|
// CONTROL: `b: [4]s2` (bare) → element is the builtin 2-bit signed int.
|
|
const w = symType(res, "w") orelse return error.MissingSymbol;
|
|
try std.testing.expect(w == .signed);
|
|
try std.testing.expectEqual(@as(u8, 2), w.signed);
|
|
}
|
|
|
|
// Parameterized raw type (`` `s2(s64) ``). Unlike the shapes above this never
|
|
// had the divergence — instantiation resolves the base name straight against
|
|
// `struct_types` (no builtin classifier in the path), so it passes before AND
|
|
// after. Included as coverage that the universal model holds for the
|
|
// parameterized form too: a `` `s2 ``-declared generic instantiates and its
|
|
// field resolves.
|
|
test "sema: a raw parameterized type `` `s2(s64) `` instantiates the user generic" {
|
|
var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
|
|
defer arena.deinit();
|
|
const alloc = arena.allocator();
|
|
|
|
const src =
|
|
\\`s2 :: struct ($T: Type) { items: [*]T = null; n: s64 = 0; }
|
|
\\f :: (v: `s2(s64)) { y := v.n; }
|
|
\\
|
|
;
|
|
var parser = Parser.init(alloc, src);
|
|
const root = try parser.parse();
|
|
var analyzer = sema.Analyzer.init(alloc);
|
|
const res = try analyzer.analyze(root);
|
|
|
|
// `v: `s2(s64)` instantiates the `` `s2 ``-declared generic; its concrete
|
|
// field `n` resolves to s64 (the raw base name was not misread as a builtin).
|
|
const y = symType(res, "y") orelse return error.MissingSymbol;
|
|
try std.testing.expect(y == .signed);
|
|
try std.testing.expectEqual(@as(u8, 64), y.signed);
|
|
}
|