- objc.sx, objc_block.sx (from std/) + sdl3/opengl/raylib/stb/stb_truetype/ wasm vendor bindings (from modules/ root) -> modules/ffi/ - std/uikit.sx deleted: platform/uikit.sx already declares UIApplicationMain and imports objc; '#framework "UIKit"' cannot live in a file imported on macOS targets (unconditional link directive, UIKit is iOS-only), so the three iOS-only examples carry the 3-line glue inline. 1607/1608/1616 also un-rotted (dead ns_string -> 'xx "..."' Into conversions, callconv(.c) msgSend fn-ptrs) — all three build for ios-sim/ios again. - math/math.sx -> math/scalar.sx; one spelling '#import "modules/math"' everywhere (4 pinned IR snapshots regenerated: dir import adds Vec2/Mat4 to the type tables). - compiler.sx -> build.sx (imports, CLAUDE.md bundling table, specs.md). - testpkg/ + test_c.sx -> tests/fixtures/ (resolve CWD-relative from repo root, same as vendors/). - library-internal imports use full modules/... paths (std.sx tail, platform/bundle.sx, fixtures).
62 lines
2.1 KiB
Plaintext
62 lines
2.1 KiB
Plaintext
// `xx closure : Block` for an arbitrary closure signature.
|
|
//
|
|
// The stdlib (modules/ffi/objc_block.sx) declares hand-rolled
|
|
// `Into(Block) for Closure() -> void` and `Closure(bool) -> void`
|
|
// impls — the two most common Apple block shapes. Other signatures
|
|
// need a per-shape `__block_invoke_<sig>` trampoline + `Into(Block)`
|
|
// impl declared somewhere reachable (stdlib if shared, in-file if
|
|
// app-specific).
|
|
//
|
|
// This test exercises the user-declared variant: signature
|
|
// `Closure(s32, *void) -> void` (a two-arg block — not in stdlib).
|
|
// If the impl is missing, the compiler emits a focused diagnostic
|
|
// pointing at modules/ffi/objc_block.sx as the template.
|
|
|
|
#import "modules/std.sx";
|
|
#import "modules/ffi/objc_block.sx";
|
|
|
|
// Trampoline matching `void (^)(int, void*)` — the C ABI Apple's
|
|
// runtime calls. Forwards through to the sx closure with the
|
|
// standard `(__sx_ctx, env, ...args)` shape.
|
|
__block_invoke_void_s32_p :: (block_self: *Block, arg0: s32, arg1: *void) callconv(.c) {
|
|
typed_fn : (*void, s32, *void) -> void = xx block_self.sx_fn;
|
|
typed_fn(block_self.sx_env, arg0, arg1);
|
|
}
|
|
|
|
impl Into(Block) for Closure(s32, *void) -> void {
|
|
convert :: (self: Closure(s32, *void) -> void) -> Block {
|
|
.{
|
|
isa = @_NSConcreteStackBlock,
|
|
flags = 0,
|
|
reserved = 0,
|
|
invoke = xx @__block_invoke_void_s32_p,
|
|
descriptor = xx @__sx_block_descriptor,
|
|
sx_env = self.env,
|
|
sx_fn = self.fn_ptr,
|
|
}
|
|
}
|
|
}
|
|
|
|
// Side-effect capture so we can observe both args reached the
|
|
// closure body.
|
|
g_sum: s32 = 0;
|
|
g_tag: *void = null;
|
|
|
|
main :: () -> s32 {
|
|
cl := (n: s32, tag: *void) => {
|
|
g_sum = n + 1;
|
|
g_tag = tag;
|
|
};
|
|
b : Block = xx cl;
|
|
|
|
invoke_fn : (*Block, s32, *void) -> void callconv(.c) = xx b.invoke;
|
|
sentinel: s32 = 42;
|
|
invoke_fn(@b, 41, xx @sentinel);
|
|
|
|
if g_sum != 42 { print("FAIL: g_sum expected 42, got {}\n", g_sum); return 1; }
|
|
if g_tag == null { print("FAIL: g_tag null\n"); return 1; }
|
|
|
|
print("block multi-arg ok: sum={}\n", g_sum);
|
|
0
|
|
}
|