ffi: drop static keyword on foreign-class methods; param type discriminates
`static name :: ...` was redundant — instance methods always declare `self: *Self` as their first param by convention. The parser now derives `is_static` from the first param's TYPE: if it's `*Self` the method is an instance method; anything else (including no params at all) is a class method. Removes a token from the surface, keeps the dispatch behavior identical. The receiver param's NAME doesn't matter — only its type. Calling the first param `this`, `me`, `receiver`, etc. is fine as long as the type is `*Self`. This mirrors how the rest of sx handles receiver dispatch. Migration of every site that used the keyword: - `library/modules/platform/android.sx` — `SurfaceView.new(ctx)`. - `examples/ffi-jni-class-03-static.sx` — `Math.abs(n)`. - `examples/ffi-jni-main-03-ctor.sx` — `SurfaceView.new(ctx)` in the `#jni_main` body. - `examples/ffi-objc-dsl-05-static.sx` — NSObject's `.class()` / `.description()`. 164/164 example tests; chess clean on macOS / iOS sim / Android via `tools/verify-step.sh`.
This commit is contained in:
@@ -501,6 +501,16 @@ plan's notional `::` — avoids a new postfix operator. Test:
|
|||||||
and `+description` class methods (NSObject is always available at
|
and `+description` class methods (NSObject is always available at
|
||||||
module-load, unlike test classes created in main's body).
|
module-load, unlike test classes created in main's body).
|
||||||
|
|
||||||
|
Class-method declarations no longer need an explicit `static` keyword.
|
||||||
|
The parser derives `is_static` from the first param's TYPE: if it's
|
||||||
|
`*Self` the method is an instance method; anything else (including no
|
||||||
|
params at all) is a class method. Surface examples now write
|
||||||
|
`new :: (ctx: *JContext) -> *Self;` instead of
|
||||||
|
`static new :: (...)`. The receiver param NAME doesn't matter — the
|
||||||
|
type is the contract. Updated: `library/modules/platform/android.sx`,
|
||||||
|
`examples/ffi-jni-class-03-static.sx`, `examples/ffi-jni-main-03-ctor.sx`,
|
||||||
|
`examples/ffi-objc-dsl-05-static.sx`.
|
||||||
|
|
||||||
Open work, in roughly the order they make sense:
|
Open work, in roughly the order they make sense:
|
||||||
- **Phase 3 step 3.2** — `#selector("explicit:")` override + golden
|
- **Phase 3 step 3.2** — `#selector("explicit:")` override + golden
|
||||||
test for the default-mangling table. Escape hatch for selectors
|
test for the default-mangling table. Escape hatch for selectors
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
// Phase 2 step 2.3 (PLAN-FFI.md): xfail then green for the `static`
|
// Phase 2 step 2.3 (PLAN-FFI.md): xfail then green for class/static
|
||||||
// method body item inside a `#jni_class` declaration.
|
// method declarations inside a `#jni_class` body.
|
||||||
//
|
//
|
||||||
// `static name :: (args...) -> Ret;` declares a class/static method —
|
// Instance vs class method is determined by the first param's TYPE:
|
||||||
// no implicit `self`, dispatched via `GetStaticMethodID` / `CallStatic*`
|
// `(self: *Self, ...)` ⇒ instance, anything else (here, `(n: s32)`)
|
||||||
// at lowering time (Phase 2.12). Step 2.3 extends `parseJniClassDecl`
|
// ⇒ class method, dispatched via `GetStaticMethodID` /
|
||||||
// to recognise the `static` prefix and mark the resulting
|
// `CallStatic*` at lowering time (Phase 2.12). No explicit `static`
|
||||||
// `JniMethodDecl` with `is_static = true`.
|
// keyword; the param shape carries the signal.
|
||||||
|
|
||||||
#import "modules/std.sx";
|
#import "modules/std.sx";
|
||||||
|
|
||||||
Math :: #foreign #jni_class("java/lang/Math") {
|
Math :: #foreign #jni_class("java/lang/Math") {
|
||||||
static abs :: (n: s32) -> s32;
|
abs :: (n: s32) -> s32; // no `self: *Self` → class method
|
||||||
}
|
}
|
||||||
|
|
||||||
main :: () -> s32 {
|
main :: () -> s32 {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Bundle :: #foreign #jni_class("android/os/Bundle") { }
|
|||||||
JContext :: #foreign #jni_class("android/content/Context") { }
|
JContext :: #foreign #jni_class("android/content/Context") { }
|
||||||
|
|
||||||
SurfaceView :: #foreign #jni_class("android/view/SurfaceView") {
|
SurfaceView :: #foreign #jni_class("android/view/SurfaceView") {
|
||||||
static new :: (ctx: *JContext) -> *Self;
|
new :: (ctx: *JContext) -> *Self; // no `self: *Self` → class method
|
||||||
}
|
}
|
||||||
|
|
||||||
g_held_view : *void = null;
|
g_held_view : *void = null;
|
||||||
|
|||||||
@@ -17,11 +17,12 @@
|
|||||||
|
|
||||||
NSObject :: #foreign #objc_class("NSObject") {
|
NSObject :: #foreign #objc_class("NSObject") {
|
||||||
// `+(Class)class` — niladic, name verbatim, selector = "class".
|
// `+(Class)class` — niladic, name verbatim, selector = "class".
|
||||||
// Returns the class object itself.
|
// Returns the class object itself. No `self: *Self` first param ⇒
|
||||||
static class :: () -> *void;
|
// class method (sx parser keys on the param TYPE).
|
||||||
|
class :: () -> *void;
|
||||||
// `+(NSString *)description` on the class returns a description
|
// `+(NSString *)description` on the class returns a description
|
||||||
// string. Niladic, selector = "description".
|
// string. Niladic, selector = "description".
|
||||||
static description :: () -> *void;
|
description :: () -> *void;
|
||||||
}
|
}
|
||||||
|
|
||||||
main :: () -> s32 {
|
main :: () -> s32 {
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ SurfaceHolder :: #foreign #jni_class("android/view/SurfaceHolder") {
|
|||||||
addCallback :: (self: *Self, cb: *SurfaceHolderCallback);
|
addCallback :: (self: *Self, cb: *SurfaceHolderCallback);
|
||||||
}
|
}
|
||||||
SurfaceView :: #foreign #jni_class("android/view/SurfaceView") {
|
SurfaceView :: #foreign #jni_class("android/view/SurfaceView") {
|
||||||
static new :: (ctx: *JContext) -> *Self;
|
new :: (ctx: *JContext) -> *Self; // no `self: *Self` → class method
|
||||||
getHolder :: (self: *Self) -> *SurfaceHolder;
|
getHolder :: (self: *Self) -> *SurfaceHolder;
|
||||||
}
|
}
|
||||||
SurfaceHolderCallback :: #foreign #jni_class("android/view/SurfaceHolder$Callback") { }
|
SurfaceHolderCallback :: #foreign #jni_class("android/view/SurfaceHolder$Callback") { }
|
||||||
|
|||||||
@@ -1163,17 +1163,6 @@ pub const Parser = struct {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Optional `static` prefix → class method (no implicit `self`).
|
|
||||||
// Context-sensitive — `static` is a plain identifier elsewhere.
|
|
||||||
var is_static = false;
|
|
||||||
if (self.current.tag == .identifier and
|
|
||||||
std.mem.eql(u8, self.tokenSlice(self.current), "static") and
|
|
||||||
self.peekNext() == .identifier)
|
|
||||||
{
|
|
||||||
is_static = true;
|
|
||||||
self.advance(); // consume `static`
|
|
||||||
}
|
|
||||||
|
|
||||||
// Field: name: Type; (instance field — JNI Get/Set<Type>Field)
|
// Field: name: Type; (instance field — JNI Get/Set<Type>Field)
|
||||||
// Method: name :: (args...) -> Ret;
|
// Method: name :: (args...) -> Ret;
|
||||||
if (self.current.tag != .identifier) {
|
if (self.current.tag != .identifier) {
|
||||||
@@ -1183,9 +1172,6 @@ pub const Parser = struct {
|
|||||||
self.advance();
|
self.advance();
|
||||||
|
|
||||||
if (self.current.tag == .colon) {
|
if (self.current.tag == .colon) {
|
||||||
if (is_static) {
|
|
||||||
return self.fail("static fields not yet supported in '#jni_class' body");
|
|
||||||
}
|
|
||||||
self.advance(); // consume `:`
|
self.advance(); // consume `:`
|
||||||
const field_type = try self.parseTypeExpr();
|
const field_type = try self.parseTypeExpr();
|
||||||
try self.expect(.semicolon);
|
try self.expect(.semicolon);
|
||||||
@@ -1218,6 +1204,21 @@ pub const Parser = struct {
|
|||||||
}
|
}
|
||||||
try self.expect(.r_paren);
|
try self.expect(.r_paren);
|
||||||
|
|
||||||
|
// Instance vs class method is determined by the first param's
|
||||||
|
// TYPE: `*Self` (pointer-to-Self) ⇒ instance method, anything
|
||||||
|
// else (including a method with no params at all) ⇒ class
|
||||||
|
// method. Keying on the type, not the param name, means the
|
||||||
|
// user can call the receiver whatever they like — `this`,
|
||||||
|
// `me`, etc. — without changing the dispatch shape.
|
||||||
|
const is_static = blk: {
|
||||||
|
if (param_types.items.len == 0) break :blk true;
|
||||||
|
const first = param_types.items[0];
|
||||||
|
if (first.data != .pointer_type_expr) break :blk true;
|
||||||
|
const pointee = first.data.pointer_type_expr.pointee_type;
|
||||||
|
if (pointee.data != .type_expr) break :blk true;
|
||||||
|
break :blk !std.mem.eql(u8, pointee.data.type_expr.name, "Self");
|
||||||
|
};
|
||||||
|
|
||||||
var return_type: ?*Node = null;
|
var return_type: ?*Node = null;
|
||||||
if (self.current.tag == .arrow) {
|
if (self.current.tag == .arrow) {
|
||||||
self.advance();
|
self.advance();
|
||||||
|
|||||||
Reference in New Issue
Block a user