Flip the surface semantics for type-introducer directives: bare
`Foo :: #jni_class("path") { ... }` now means "DEFINE a new Java class
at that path" (sx-side provides the implementations). The `#foreign`
prefix modifier flips it back to "REFERENCE an existing class on the
foreign runtime." Matches how `#foreign` already reads in sx for C
function declarations (`printf :: ... #foreign;`).
Foo :: #foreign #jni_class("path/to/Foo") { ... } // reference
Foo :: #jni_class("path/to/Foo") { ... } // define
Foo :: #jni_main #jni_class("path/to/Foo") { ... } // define + main Activity
Compiler-side changes:
- New `hash_jni_main` lexer token (the launchable-Activity marker).
Existing `hash_foreign` is reused; no new modifier token there.
- `ForeignClassDecl` gains `is_foreign: bool` + `is_main: bool`.
`ForeignMethodDecl` gains `body: ?*Node` so defined-class methods
can carry sx-side implementations (foreign-class methods stay
`;`-terminated).
- Parser learns `tryParseForeignClassPrefix` — peek-and-consume the
modifier tokens, then dispatch to the unchanged
`parseForeignClassDecl` with the flags threaded through.
- Sema rejects two illegal combinations: `#foreign + #jni_main`
(can't be both an external reference and the app's main entry),
and bodied methods on `#foreign` decls (foreign methods are
runtime-provided).
- Lower's foreign-class dispatch errors on non-foreign decls with
a pointer to the runtime-synthesis follow-up; defined-class
codegen (Java class emission, RegisterNatives wiring, manifest
entry generation) lands in a separate session.
Migration:
- `library/modules/platform/android_jni.sx`: all four foreign class
decls (`Activity`, `Window`, `View`, `WindowInsets`) gain `#foreign`.
- `examples/ffi-jni-class-{01..08}*.sx`: every test's `#jni_class` /
`#jni_interface` / `#objc_class` / `#objc_protocol` / `#swift_class`
/ `#swift_struct` / `#swift_protocol` usage gains `#foreign`. All
9 files mechanical perl rename; snapshots unchanged.
Verified locally:
- `zig build test` clean.
- `bash tests/run_examples.sh` 129/129.
- `bash tests/cross_compile.sh` 3/3.
- Chess APK rebuilds, reinstalls, launches on Pixel; safe-area
clearance preserved.
48 lines
1.4 KiB
Plaintext
48 lines
1.4 KiB
Plaintext
// Phase 2 step 2.7 (PLAN-FFI.md): xfail then green for the remaining
|
|
// six type-introducer directive forms parsing with the same body
|
|
// grammar as `#jni_class`. No codegen yet — Phase 3 picks up Obj-C
|
|
// codegen, Phase 4 picks up Swift.
|
|
//
|
|
// The directives this step turns on:
|
|
// #jni_interface — Java interface binding
|
|
// #objc_class — Obj-C class binding
|
|
// #objc_protocol — Obj-C protocol binding
|
|
// #swift_class — Swift class binding (via @_cdecl bridge)
|
|
// #swift_struct — Swift @frozen value-type binding
|
|
// #swift_protocol — Swift @objc-bridgeable protocol binding
|
|
//
|
|
// Internally the AST collapses into one `foreign_class_decl` node
|
|
// carrying a `runtime` discriminator. Today the parser rejects each
|
|
// of these because the lexer doesn't recognise the directive name.
|
|
|
|
#import "modules/std.sx";
|
|
|
|
IFoo :: #foreign #jni_interface("com/example/IFoo") {
|
|
bar :: (self: *Self) -> s32;
|
|
}
|
|
|
|
NSString :: #foreign #objc_class("NSString") {
|
|
length :: (self: *Self) -> s32;
|
|
}
|
|
|
|
NSCopying :: #foreign #objc_protocol("NSCopying") {
|
|
copy :: (self: *Self) -> *Self;
|
|
}
|
|
|
|
URL :: #foreign #swift_class("Foundation.URL") {
|
|
absoluteString :: (self: *Self) -> *void;
|
|
}
|
|
|
|
Date :: #foreign #swift_struct("Foundation.Date") {
|
|
timeIntervalSince1970 :: (self: *Self) -> f64;
|
|
}
|
|
|
|
Hashable :: #foreign #swift_protocol("Swift.Hashable") {
|
|
hash :: (self: *Self) -> s32;
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
print("parse-only ok\n");
|
|
0;
|
|
}
|