lab/sx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ffi-linkage): Phase 7.3 — migrate 14xx ffi-jni examples #foreign→extern

Browse Source 
13 JNI examples migrated (1410-1419/1423/1424/1425): import runtime classes
'#foreign #jni_class("X") {' → '#jni_class("X") extern {'. 1417 (all-runtimes)
also exercises #jni_interface/#objc_class/#objc_protocol/#swift_class/#swift_struct/
#swift_protocol — all take the postfix modifier (verified by probe), migrated via a
generalized '#foreign #<directive>("X") {' → '… extern {' rewrite. No 14xx snapshot
asserts on 'foreign'; empty snapshot diff, corpus-validated.

KEPT comment-only #foreign in 1426 (jni-extern-class test, no decls). Suite green
(647 corpus / 444 unit, 0 failed).
This commit is contained in:
agra
2026-06-15 07:00:32 +03:00
parent a68f7c2e64
commit 2888f6fc00
13 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/1410-ffi-jni-call-11-unsupported-return-diag.sx
View File

@@ -13,7 +13,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
Buf :: #foreign #jni_class("java/nio/ByteBuffer") { Buf :: #jni_class("java/nio/ByteBuffer") extern {
get :: (self: *Self) -> i8; get :: (self: *Self) -> i8;
} }

4
examples/1411-ffi-jni-class-01-empty.sx
View File

@@ -1,5 +1,5 @@
// Phase 2 step 2.0 (PLAN-FFI.md): xfail parser test for the // Phase 2 step 2.0 (PLAN-FFI.md): xfail parser test for the
// type-introducer `Foo :: #foreign #jni_class("java/path/Foo") { }` directive. // type-introducer `Foo :: #jni_class("java/path/Foo") extern { }` directive.
// //
// Today's parser doesn't recognize `#jni_class` as a known hash // Today's parser doesn't recognize `#jni_class` as a known hash
// directive after `::`, so it falls through to expression parsing // directive after `::`, so it falls through to expression parsing
@@ -10,7 +10,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
Foo :: #foreign #jni_class("java/path/Foo") { } Foo :: #jni_class("java/path/Foo") extern { }
main :: () -> i32 { main :: () -> i32 {
print("parse-only ok\n"); print("parse-only ok\n");

2
examples/1412-ffi-jni-class-02-method.sx
View File

@@ -10,7 +10,7 @@
// `Self` here refers to the enclosing `View` type — resolved at // `Self` here refers to the enclosing `View` type — resolved at
// 2.x sema, not at parse time. // 2.x sema, not at parse time.
View :: #foreign #jni_class("android/view/View") { View :: #jni_class("android/view/View") extern {
getId :: (self: *Self) -> i32; getId :: (self: *Self) -> i32;
} }

2
examples/1413-ffi-jni-class-03-static.sx
View File

@@ -9,7 +9,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
Math :: #foreign #jni_class("java/lang/Math") { Math :: #jni_class("java/lang/Math") extern {
abs :: (n: i32) -> i32; // no `self: *Self` → class method abs :: (n: i32) -> i32; // no `self: *Self` → class method
} }

4
examples/1414-ffi-jni-class-04-extends.sx
View File

@@ -12,9 +12,9 @@
#import "modules/std.sx"; #import "modules/std.sx";
View :: #foreign #jni_class("android/view/View") { } View :: #jni_class("android/view/View") extern { }
Window :: #foreign #jni_class("android/view/Window") { Window :: #jni_class("android/view/Window") extern {
#extends View; #extends View;
getDecorView :: (self: *Self) -> *View; getDecorView :: (self: *Self) -> *View;
} }

2
examples/1415-ffi-jni-class-05-field.sx
View File

@@ -8,7 +8,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
Point :: #foreign #jni_class("android/graphics/Point") { Point :: #jni_class("android/graphics/Point") extern {
x: i32; x: i32;
y: i32; y: i32;
} }

2
examples/1416-ffi-jni-class-06-desc.sx
View File

@@ -10,7 +10,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
Foo :: #foreign #jni_class("com/example/Foo") { Foo :: #jni_class("com/example/Foo") extern {
weirdMethod :: (self: *Self) -> i32 #jni_method_descriptor("()I"); weirdMethod :: (self: *Self) -> i32 #jni_method_descriptor("()I");
} }

12
examples/1417-ffi-jni-class-07-all-runtimes.sx
View File

@@ -17,27 +17,27 @@
#import "modules/std.sx"; #import "modules/std.sx";
IFoo :: #foreign #jni_interface("com/example/IFoo") { IFoo :: #jni_interface("com/example/IFoo") extern {
bar :: (self: *Self) -> i32; bar :: (self: *Self) -> i32;
} }
NSString :: #foreign #objc_class("NSString") { NSString :: #objc_class("NSString") extern {
length :: (self: *Self) -> i32; length :: (self: *Self) -> i32;
} }
NSCopying :: #foreign #objc_protocol("NSCopying") { NSCopying :: #objc_protocol("NSCopying") extern {
copy :: (self: *Self) -> *Self; copy :: (self: *Self) -> *Self;
} }
URL :: #foreign #swift_class("Foundation.URL") { URL :: #swift_class("Foundation.URL") extern {
absoluteString :: (self: *Self) -> *void; absoluteString :: (self: *Self) -> *void;
} }
Date :: #foreign #swift_struct("Foundation.Date") { Date :: #swift_struct("Foundation.Date") extern {
timeIntervalSince1970 :: (self: *Self) -> f64; timeIntervalSince1970 :: (self: *Self) -> f64;
} }
Hashable :: #foreign #swift_protocol("Swift.Hashable") { Hashable :: #swift_protocol("Swift.Hashable") extern {
hash :: (self: *Self) -> i32; hash :: (self: *Self) -> i32;
} }

2
examples/1418-ffi-jni-class-08-call.sx
View File

@@ -8,7 +8,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
Activity :: #foreign #jni_class("android/app/Activity") { Activity :: #jni_class("android/app/Activity") extern {
getWindow :: (self: *Self) -> *void; getWindow :: (self: *Self) -> *void;
} }

2
examples/1419-ffi-jni-class-09-multi-float-args.sx
View File

@@ -15,7 +15,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
MotionEvent :: #foreign #jni_class("android/view/MotionEvent") { MotionEvent :: #jni_class("android/view/MotionEvent") extern {
getAction :: (self: *Self) -> i32; getAction :: (self: *Self) -> i32;
getX :: (self: *Self) -> f32; getX :: (self: *Self) -> f32;
getY :: (self: *Self) -> f32; getY :: (self: *Self) -> f32;

2
examples/1423-ffi-jni-main-01-emit.sx
View File

@@ -19,7 +19,7 @@
// `*Bundle` resolves through the class registry to `android.os.Bundle` // `*Bundle` resolves through the class registry to `android.os.Bundle`
// in the emitted Java — needed for `onCreate`'s @Override to match // in the emitted Java — needed for `onCreate`'s @Override to match
// NativeActivity's superclass signature. // NativeActivity's superclass signature.
Bundle :: #foreign #jni_class("android/os/Bundle") { } Bundle :: #jni_class("android/os/Bundle") extern { }
// `#jni_main` flags this as the launchable Android Activity class. The // `#jni_main` flags this as the launchable Android Activity class. The
// `onCreate` body is empty for now — slice 4 wires `RegisterNatives` // `onCreate` body is empty for now — slice 4 wires `RegisterNatives`

2
examples/1424-ffi-jni-main-02-super.sx
View File

@@ -13,7 +13,7 @@
#import "modules/std.sx"; #import "modules/std.sx";
#import "modules/build.sx"; #import "modules/build.sx";
Bundle :: #foreign #jni_class("android/os/Bundle") { } Bundle :: #jni_class("android/os/Bundle") extern { }
SxApp :: #jni_main #jni_class("co/swipelab/sxjnimainsuper/SxApp") { SxApp :: #jni_main #jni_class("co/swipelab/sxjnimainsuper/SxApp") {
onCreate :: (self: *Self, b: *Bundle) { onCreate :: (self: *Self, b: *Bundle) {

8
examples/1425-ffi-jni-main-03-ctor.sx
View File

@@ -1,4 +1,4 @@
// `Alias.new(args)` constructor dispatch on a `#foreign #jni_class` // `Alias.new(args)` constructor dispatch on a `extern #jni_class`
// (chess-on-Pixel migration, R.6). The sx-side `static new :: (...) -> // (chess-on-Pixel migration, R.6). The sx-side `static new :: (...) ->
// *Self;` member lowers to JNI `FindClass + GetMethodID("<init>", sig) // *Self;` member lowers to JNI `FindClass + GetMethodID("<init>", sig)
// + NewObject(env, clazz, mid, args...)`. // + NewObject(env, clazz, mid, args...)`.
@@ -9,10 +9,10 @@
#import "modules/std.sx"; #import "modules/std.sx";
#import "modules/build.sx"; #import "modules/build.sx";
Bundle :: #foreign #jni_class("android/os/Bundle") { } Bundle :: #jni_class("android/os/Bundle") extern { }
JContext :: #foreign #jni_class("android/content/Context") { } JContext :: #jni_class("android/content/Context") extern { }
SurfaceView :: #foreign #jni_class("android/view/SurfaceView") { SurfaceView :: #jni_class("android/view/SurfaceView") extern {
new :: (ctx: *JContext) -> *Self; // no `self: *Self` → class method new :: (ctx: *JContext) -> *Self; // no `self: *Self` → class method
} }