989e18b760
Replace the bare-paren tuple grammar with explicit, position-unambiguous
forms, mirroring how structs work:
type `(A, B)` -> `Tuple(A, B)` (named keeps `:`)
value `(a, b)` -> `.(a, b)` (named uses `=`)
typed (new) -> `Tuple(A, B).(a, b)` (like `Point.{...}`)
failable `-> (T, !)` -> `-> T !`
`-> (T1, T2, !)`-> `-> Tuple(T1, T2) !` (channel outside Tuple)
Bare `(...)` is now grouping only, everywhere; a comma in bare parens is a
hard error with a migration hint. Grouping, function types `(A, B) -> R`,
param lists, lambdas, and match bindings are unaffected.
`Tuple(...)` is strictly a TYPE in every position (including `size_of` /
`type_info` args); a tuple VALUE comes only from `.(...)` (anonymous) or
`Tuple(...).(...)` (explicitly typed). A bare `Tuple(1, 2)` is a tuple
type with non-type elements -> rejected.
The ~110 tuple-bearing corpus files were migrated with a one-shot
AST-aware migrator (the `sx migrate` tool from the prior commit, removed
here). New examples: 0130 (new syntax), 0131 (typed construction), 1060
(named-tuple failable return). 1116 golden updated for the new hint text.
37 lines
1.4 KiB
Plaintext
37 lines
1.4 KiB
Plaintext
// Phase 6 — the canonical heterogeneous `map`, end to end. A pack-fn whose
|
|
// return type `$R` is inferred from the mapper's closure return:
|
|
// - `mapper: Closure(..sources.T) -> $R` types the lambda's params from the
|
|
// projected pack element types, and its body (`a + b`) drives `$R`.
|
|
// - `$R` is inferred at the call site from the lowered mapper's closure ret,
|
|
// bound into the mono (`-> VL($R)` ⇒ `VL(i64)`, `Combined($R, ..)` ⇒
|
|
// `Combined(i64, ..)`), and folded into the mangle.
|
|
// - `(..sources)` materializes the pack into the `(..VL(Ts))` field (per-element
|
|
// erase) and `mapper(..sources.get)` projects+spreads; `xx c` erases the
|
|
// generic-struct instance to `VL(i64)` via the generic impl's monomorphized
|
|
// thunk.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
VL :: protocol(T: Type) { get :: (self: *Self) -> T; }
|
|
IntCell :: struct { v: i64; }
|
|
impl VL(i64) for IntCell { get :: (self: *IntCell) -> i64 => self.v; }
|
|
|
|
Combined :: struct($R: Type, ..$Ts: []Type) {
|
|
sources: Tuple(..VL(Ts));
|
|
value: $R;
|
|
}
|
|
impl VL($R) for Combined($R, ..$Ts) { get :: (self: *Combined) -> $R => self.value; }
|
|
|
|
map :: (mapper: Closure(..sources.T) -> $R, ..sources: VL) -> VL($R) {
|
|
c : Combined($R, ..sources.T) = ---;
|
|
c.sources = .(..sources);
|
|
c.value = mapper(..sources.get);
|
|
return xx c;
|
|
}
|
|
|
|
main :: () -> i32 {
|
|
r := map((a, b) => a + b, IntCell.{ v = 40 }, IntCell.{ v = 2 });
|
|
print("{}\n", r.get()); // 42
|
|
0
|
|
}
|