59f0aa7716
allocators/fs/process/socket/log/trace/test move under modules/std/ (allocators.sx becomes std/mem.sx; the Allocator protocol moves into the std.sx prelude, impls stay in mem.sx). New std/xml.sx holds xml_escape as xml.escape. std.sx gains the carried namespace tail — flat-importing std.sx now also provides mem./xml./log. — with the remaining modules (fs/process/socket/json/cli/hash/test) deferred from the tail until the global last-wins maps are fully own-wins (pulling them into every closure collides bare names corpus-wide; they stay direct imports: modules/std/fs.sx etc.). log.sx's internal emit renamed log_emit (it clobbered consumer fns named emit program-wide). bundle.sx uses xml.escape via the carried alias. Consumer import paths swept mechanically; .ir snapshots recaptured for the larger std closure. m3te + game build unchanged.
93 lines
2.2 KiB
Plaintext
93 lines
2.2 KiB
Plaintext
#import "modules/std.sx";
|
|
#import "modules/math/math.sx";
|
|
#import "modules/compiler.sx";
|
|
#import "modules/std/test.sx";
|
|
pkg :: #import "modules/testpkg";
|
|
|
|
Point :: struct { x, y: s32; }
|
|
|
|
add :: (a: s32, b: s32) -> s32 { a + b }
|
|
|
|
Counter :: protocol {
|
|
inc :: ();
|
|
get :: () -> s32;
|
|
}
|
|
|
|
Summable :: protocol {
|
|
sum :: () -> s32;
|
|
}
|
|
|
|
SimpleCounter :: struct { val: s32; }
|
|
|
|
impl Counter for SimpleCounter {
|
|
inc :: (self: *SimpleCounter) { self.val += 1; }
|
|
get :: (self: *SimpleCounter) -> s32 { self.val }
|
|
}
|
|
|
|
impl Summable for Point {
|
|
sum :: (self: *Point) -> s32 { self.x + self.y }
|
|
}
|
|
|
|
// Phase 2: #inline protocol for dynamic dispatch
|
|
|
|
// Phase 2: #inline protocol for dynamic dispatch
|
|
Adder :: protocol #inline {
|
|
add :: (n: s32);
|
|
value :: () -> s32;
|
|
}
|
|
|
|
Accumulator :: struct {
|
|
total: s32;
|
|
}
|
|
|
|
impl Adder for Accumulator {
|
|
add :: (self: *Accumulator, n: s32) { self.total += n; }
|
|
value :: (self: *Accumulator) -> s32 { self.total }
|
|
}
|
|
|
|
main :: () {
|
|
|
|
// --- Auto type erasure (AE) ---
|
|
print("=== Auto Type Erasure ===\n");
|
|
|
|
// AE1: function argument — concrete passed where protocol expected (no xx)
|
|
{
|
|
use_counter :: (c: Counter) -> s32 { c.inc(); c.inc(); c.get() }
|
|
sc := SimpleCounter.{ val = 10 };
|
|
result := use_counter(sc);
|
|
print("AE1: {}\n", result);
|
|
}
|
|
|
|
// AE2: variable assignment — concrete to protocol variable (no xx)
|
|
{
|
|
acc := Accumulator.{ total = 0 };
|
|
a: Adder = acc;
|
|
a.add(5);
|
|
a.add(3);
|
|
print("AE2: {}\n", a.value());
|
|
}
|
|
|
|
// AE3: struct literal passed directly (no xx)
|
|
{
|
|
use_counter :: (c: Counter) -> s32 { c.inc(); c.inc(); c.get() }
|
|
result := use_counter(SimpleCounter.{ val = 100 });
|
|
print("AE3: {}\n", result);
|
|
}
|
|
|
|
// AE4: explicit xx still works (not broken)
|
|
{
|
|
use_counter :: (c: Counter) -> s32 { c.inc(); c.get() }
|
|
result := use_counter(xx SimpleCounter.{ val = 50 });
|
|
print("AE4: {}\n", result);
|
|
}
|
|
|
|
// AE5: pointer auto-erasure — *ConcreteType to protocol
|
|
{
|
|
use_adder :: (a: Adder) { a.add(10); }
|
|
acc := Accumulator.{ total = 5 };
|
|
p := @acc;
|
|
use_adder(p);
|
|
print("AE5: {}\n", acc.total);
|
|
}
|
|
}
|