1f9f944ca1
Makes the F0.4 fixes exhaustive across every resolution / nesting path.
0083 — named-const array dimension, stateless paths. Attempt 1 fixed the
stateful resolver (direct local decls, struct fields, params, returns) but the
binding-free registration-time resolver (`type_bridge`, used for type aliases
`Arr :: [N]T` and inline union/enum field types) still resolved a named dim with
a silent `else 0`, so `Arr :: [N]s64; a : Arr` and `union { a: [N]s64 }` were
still miscompiled (garbage / bus error). Thread the module-global const table
(`ProgramIndex.module_const_map`) into `type_bridge` alongside the alias map, so
`StatelessInner.resolveArrayLen` resolves a named module-const dim to the same
length everywhere. The remaining unresolvable case (a computed/comptime dim on
the binding-free path, which the stateful path hard-errors) now bails LOUDLY
instead of fabricating a 0 length.
0085 — nested slice-literal elements. `lowerArrayLiteral` lowered each element
with the element type as target but appended the raw value. A nested `.[...]`
element at a slice element type (`[][]s64`) still lowers to an aggregate array
`[N]T`, so the outer aggregate held raw arrays where slice {ptr,len} headers
were expected — indexing the inner slice read a garbage pointer and segfaulted.
After lowering each element, coerce a same-element array to the slice element
type via the existing `array_to_slice` op. The coercion recurses with the
nesting, so `[][]T` and deeper materialize at every level — local-bound AND
direct-call-argument forms.
Regressions (fail-before/pass-after demonstrated on the pre-fix compiler):
examples/0140-types-named-const-array-dim.sx — extended with type-alias,
nested [N][M]T, and union-field named dims (s64 / string / struct elems)
examples/0142-types-nested-slice-literal-elements.sx — [][]s64 + [][]string,
local-bound vs direct-arg
src/ir/type_bridge.test.zig — named-const dim resolves to literal length
Gate: zig build, zig build test, bash tests/run_examples.sh (388 passed).
Issues 0083 and 0085 marked RESOLVED.
45 lines
1.6 KiB
Plaintext
45 lines
1.6 KiB
Plaintext
// A nested array/slice literal (`.[.[1, 2], .[3, 4]]`) at an expected slice-of-
|
|
// slices type (`[][]s64`) materializes each inner `[N]T` literal as a real `[]T`
|
|
// slice, so indexing the inner slice in the callee reads element contents
|
|
// correctly — for both the local-bound form and the direct-call-argument form.
|
|
// Regression (issue 0085): inner literals were appended as raw `[N]T` arrays
|
|
// under an element type of `[]T`, so the outer aggregate's elements were arrays
|
|
// where slice {ptr,len} headers were expected; indexing the inner slice read a
|
|
// garbage pointer and segfaulted. The per-element array->slice materialization
|
|
// recurses with the nesting, so every level coerces.
|
|
#import "modules/std.sx";
|
|
|
|
sum_nested :: (xss: [][]s64) -> s64 {
|
|
total := 0;
|
|
i := 0;
|
|
while i < xss.len {
|
|
j := 0;
|
|
while j < xss[i].len { total += xss[i][j]; j += 1; }
|
|
i += 1;
|
|
}
|
|
return total;
|
|
}
|
|
|
|
count_x :: (xss: [][]string) -> s64 {
|
|
n := 0;
|
|
i := 0;
|
|
while i < xss.len {
|
|
j := 0;
|
|
while j < xss[i].len { if xss[i][j] == "x" { n += 1; } j += 1; }
|
|
i += 1;
|
|
}
|
|
return n;
|
|
}
|
|
|
|
main :: () {
|
|
// numeric [][]s64 — local-bound vs direct-arg both sum to 10.
|
|
local : [][]s64 = .[.[1, 2], .[3, 4]];
|
|
print("num local={}\n", sum_nested(local));
|
|
print("num direct={}\n", sum_nested(.[.[1, 2], .[3, 4]]));
|
|
|
|
// string [][]string — local-bound vs direct-arg both count 4 "x"s.
|
|
slocal : [][]string = .[.["x", "a"], .["b", "x"], .["x", "x"]];
|
|
print("str local={}\n", count_x(slocal));
|
|
print("str direct={}\n", count_x(.[.["x", "a"], .["b", "x"], .["x", "x"]]));
|
|
}
|