fix: literal element typing — typed-array null element, tuple coercion, positional var element (0173-0175)
0173: resolveArrayLiteralType gained no arm for [N]T/[]T heads, so a
([2]?i64).[...] head lost its ?i64 element type and a bare null reached
LLVM as const_null(.unresolved). Route structural heads through
resolveTypeWithBindings; validate an undefined element name in the head
via UnknownTypeChecker (semantic_diagnostics.zig) instead of a silent
empty-struct stub (no-silent-fallback).
0174: positional .{...} against a TUPLE target now coerces each element
to TupleInfo.fields[i] (was neither struct nor array, so uncoerced).
0175: a positional struct literal with a bare-variable element was
misclassified as a named shorthand (parser puns .{x} -> x=x), zeroing
the fields. has_names now consults the struct definition to reclassify a
punned non-field name as positional; positional coercion uses the
lowered value's real getRefType.
Regressions: optionals/0914, types/0199, types/0200, diagnostics/1196.
Verified by 4 adversarial reviews; suite 784/0. Filed adjacent bug 0176
(protocol-typed struct field method call aborts).
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
// A positional literal `.{ a, b }` whose target is a TUPLE coerces each
|
||||
// element to the tuple's per-position field type — so an optional field gets a
|
||||
// properly wrapped `{T,i1}` value, an int element narrows/widens to a float
|
||||
// field, etc.
|
||||
//
|
||||
// Regression (issue 0174): the positional struct-literal path coerced
|
||||
// array/vector elements and struct fields but NOT tuple fields, so a bare
|
||||
// `i64` was stored straight into a `{i64,i1}` optional slot — a present
|
||||
// optional read back as absent.
|
||||
#import "modules/std.sx";
|
||||
|
||||
main :: () {
|
||||
// Optional + float fields.
|
||||
t : (?i64, f64) = .{ 7, 3.0 };
|
||||
print("{} {}\n", t.0 ?? -1, t.1); // 7 3.000000
|
||||
|
||||
// int -> float coercion on a tuple element.
|
||||
u : (f64, i64) = .{ 3, 4 };
|
||||
print("{} {}\n", u.0, u.1); // 3.000000 4
|
||||
|
||||
// Named tuple.
|
||||
n : (x: ?i64, y: f64) = .{ 5, 2.5 };
|
||||
print("{} {}\n", n.x ?? -1, n.y); // 5 2.500000
|
||||
|
||||
// Variable elements flowing into an optional tuple field.
|
||||
a := 9;
|
||||
b := 1.5;
|
||||
v : (?i64, f64) = .{ a, b };
|
||||
print("{} {}\n", v.0 ?? -1, v.1); // 9 1.500000
|
||||
|
||||
// A bare `null` element into an optional tuple field.
|
||||
w : (?i64, i64) = .{ null, 8 };
|
||||
print("{} {}\n", w.0 ?? -1, w.1); // -1 8
|
||||
}
|
||||
@@ -0,0 +1,63 @@
|
||||
// A positional struct literal `S.{ x, ... }` whose first element is a bare
|
||||
// VARIABLE reference stores the variable's value, not zero.
|
||||
//
|
||||
// Regression (issue 0175): the parser PUNS a leading bare identifier into a
|
||||
// named field `x = x` (the `Vec4.{ w, z }` shorthand), because it can't tell —
|
||||
// without the struct definition — whether `x` names a field or is a positional
|
||||
// value. A genuinely positional `.{ x, 2 }` (x not a field) arrived as a
|
||||
// spurious mixed named/positional literal and the named branch left every real
|
||||
// field at its default (`0 0`). Lowering now reclassifies a punned name that
|
||||
// does NOT match any field as positional, and coerces positional elements from
|
||||
// the lowered value's actual type.
|
||||
#import "modules/std.sx";
|
||||
|
||||
P :: struct { a: i64 = 0; b: i64 = 0; }
|
||||
Q :: struct { a: i64 = 0; b: f64 = 0.0; }
|
||||
Inner :: struct { v: i64 = 0; }
|
||||
Outer :: struct { inner: Inner; tag: i64 = 0; }
|
||||
|
||||
foo :: () -> i64 { return 9; }
|
||||
|
||||
main :: () {
|
||||
x := 5;
|
||||
|
||||
// Positional, variable first element (the core repro).
|
||||
p : P = .{ x, 2 };
|
||||
print("{} {}\n", p.a, p.b); // 5 2
|
||||
|
||||
// Mixed variable + expression elements.
|
||||
m : P = .{ x, x + 10 };
|
||||
print("{} {}\n", m.a, m.b); // 5 15
|
||||
|
||||
// i32 variable -> i64 field coercion.
|
||||
y : i32 = 7;
|
||||
c : P = .{ y, 2 };
|
||||
print("{} {}\n", c.a, c.b); // 7 2
|
||||
|
||||
// int -> float field coercion (positional).
|
||||
q : Q = .{ 3, 2 };
|
||||
print("{} {}\n", q.a, q.b); // 3 2.000000
|
||||
|
||||
// Call-expression element.
|
||||
e : P = .{ foo(), 1 };
|
||||
print("{} {}\n", e.a, e.b); // 9 1
|
||||
|
||||
// Genuine shorthand: `a`/`b` ARE fields of P, so punning is correct.
|
||||
a := 11;
|
||||
b := 22;
|
||||
sh : P = .{ a, b };
|
||||
print("{} {}\n", sh.a, sh.b); // 11 22
|
||||
|
||||
// Mixed named + shorthand (spec form): `b = 99, a`.
|
||||
mn : P = .{ b = 99, a };
|
||||
print("{} {}\n", mn.a, mn.b); // 11 99
|
||||
|
||||
// Nested [N]Struct positional with a variable element.
|
||||
arr : [2]P = .{ .{ x, 2 }, .{ 3, 4 } };
|
||||
print("{} {} {} {}\n", arr[0].a, arr[0].b, arr[1].a, arr[1].b); // 5 2 3 4
|
||||
|
||||
// Struct-literal-valued positional field (nested untyped literal resolves
|
||||
// against its slot type).
|
||||
o : Outer = .{ .{ v = x }, 9 };
|
||||
print("{} {}\n", o.inner.v, o.tag); // 5 9
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
0
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
7 3.000000
|
||||
3.000000 4
|
||||
5 2.500000
|
||||
9 1.500000
|
||||
-1 8
|
||||
@@ -0,0 +1 @@
|
||||
0
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
5 2
|
||||
5 15
|
||||
7 2
|
||||
3 2.000000
|
||||
9 1
|
||||
11 22
|
||||
11 99
|
||||
5 2 3 4
|
||||
5 9
|
||||
Reference in New Issue
Block a user