lang F1 6: pack-spread in parameterized-type args (Combined($R, ..sources.T))
Parser now accepts a `..` spread in a parameterized-type arg list; in instantiateGenericStruct a spread arg bound to the variadic type-param expands via packTypeElems (so `..sources.T` projects each source pack element protocol type-arg into ..$Ts). `Combined(s64, ..sources.T)` for a VL(s64) source instantiates Combined(s64, s64). examples/209 (with explicit per-element xx erase). 244 examples + unit green. Next: (..sources) whole-pack materialization with per-element erasure into the protocol-typed field (c.sources = (..sources) currently segfaults).
This commit is contained in:
27
examples/209-pack-type-arg-spread.sx
Normal file
27
examples/209-pack-type-arg-spread.sx
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
// Phase 6 — pack-spread in a parameterized-type's arg list:
|
||||||
|
// `Combined($R, ..sources.T)`. Inside a pack-fn, `..sources.T` projects each
|
||||||
|
// source's protocol type-arg and spreads them into the generic struct's pack
|
||||||
|
// type-param `..$Ts`, so `Combined(s64, ..sources.T)` for a single `VL(s64)`
|
||||||
|
// source instantiates `Combined(s64, s64)` (field `sources: (VL(s64))`).
|
||||||
|
|
||||||
|
#import "modules/std.sx";
|
||||||
|
|
||||||
|
VL :: protocol(T: Type) { get :: () -> T; }
|
||||||
|
IntCell :: struct { v: s64; }
|
||||||
|
impl VL(s64) for IntCell { get :: (self: *IntCell) -> s64 => self.v; }
|
||||||
|
|
||||||
|
Combined :: struct($R: Type, ..$Ts: []Type) {
|
||||||
|
sources: (..VL(Ts));
|
||||||
|
value: $R;
|
||||||
|
}
|
||||||
|
|
||||||
|
make :: (..sources: VL) -> s64 {
|
||||||
|
c : Combined(s64, ..sources.T) = ---; // instantiate with the spread type-arg
|
||||||
|
c.sources.0 = xx sources[0]; // erase the concrete source to VL(s64)
|
||||||
|
return c.sources.0.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
main :: () -> s32 {
|
||||||
|
print("{}\n", make(IntCell.{ v = 7 })); // 7
|
||||||
|
0;
|
||||||
|
}
|
||||||
@@ -11495,6 +11495,19 @@ pub const Lowering = struct {
|
|||||||
if (tp.is_variadic) {
|
if (tp.is_variadic) {
|
||||||
var pack_tys = std.ArrayList(TypeId).empty;
|
var pack_tys = std.ArrayList(TypeId).empty;
|
||||||
for (args[i..]) |a| {
|
for (args[i..]) |a| {
|
||||||
|
// A spread arg `..sources.T` expands to the source pack's
|
||||||
|
// per-element (projected) types; a plain arg is one type.
|
||||||
|
if (a.data == .spread_expr) {
|
||||||
|
if (self.packTypeElems(a.data.spread_expr.operand)) |elems| {
|
||||||
|
defer self.alloc.free(elems);
|
||||||
|
for (elems) |ty| {
|
||||||
|
pack_tys.append(self.alloc, ty) catch {};
|
||||||
|
name_parts.appendSlice(self.alloc, "__") catch {};
|
||||||
|
name_parts.appendSlice(self.alloc, self.formatTypeName(ty)) catch {};
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
const ty = self.resolveTypeWithBindings(a);
|
const ty = self.resolveTypeWithBindings(a);
|
||||||
pack_tys.append(self.alloc, ty) catch {};
|
pack_tys.append(self.alloc, ty) catch {};
|
||||||
name_parts.appendSlice(self.alloc, "__") catch {};
|
name_parts.appendSlice(self.alloc, "__") catch {};
|
||||||
|
|||||||
@@ -688,6 +688,12 @@ pub const Parser = struct {
|
|||||||
};
|
};
|
||||||
self.advance();
|
self.advance();
|
||||||
try args.append(self.allocator, try self.createNode(arg_start, .{ .int_literal = .{ .value = value } }));
|
try args.append(self.allocator, try self.createNode(arg_start, .{ .int_literal = .{ .value = value } }));
|
||||||
|
} else if (self.current.tag == .dot_dot) {
|
||||||
|
// Pack-spread type arg: `Combined($R, ..sources.T)`.
|
||||||
|
const sp_start = self.current.loc.start;
|
||||||
|
self.advance(); // skip '..'
|
||||||
|
const operand = try self.parseTypeExpr();
|
||||||
|
try args.append(self.allocator, try self.createNode(sp_start, .{ .spread_expr = .{ .operand = operand } }));
|
||||||
} else {
|
} else {
|
||||||
try args.append(self.allocator, try self.parseTypeExpr());
|
try args.append(self.allocator, try self.parseTypeExpr());
|
||||||
}
|
}
|
||||||
|
|||||||
1
tests/expected/209-pack-type-arg-spread.exit
Normal file
1
tests/expected/209-pack-type-arg-spread.exit
Normal file
@@ -0,0 +1 @@
|
|||||||
|
0
|
||||||
1
tests/expected/209-pack-type-arg-spread.txt
Normal file
1
tests/expected/209-pack-type-arg-spread.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
7
|
||||||
Reference in New Issue
Block a user