ffi 2.8: JNI descriptor derivation + table-driven Zig unit tests
New `src/ir/jni_descriptor.zig`:
- `writeType(allocator, buf, ctx, type_node)` appends one JNI
descriptor for an sx type AST node.
- `deriveMethod(allocator, ctx, method)` returns the full
`(args)ret` descriptor for a `ForeignMethodDecl`, skipping the
implicit `self` for instance methods.
- `Context.enclosing_path` resolves `*Self` to its `L<path>;` form.
Primitive table: void→V, bool→Z, s8/u8→B, s16→S, u16→C, s32→I,
s64→J, f32→F, f64→D. Arrays: `[]T` / `[*]T` / `[N]T` → `[<elem>`.
`*Self` → `L<enclosing>;`. Cross-class `*Foo` → explicit
`CrossClassRefNotYetSupported` error (lands in step 2.9 with the
ForeignClassDecl registry lookup).
Tests in `src/ir/jni_descriptor.test.zig`: primitive table coverage,
void-on-null, *Self, slice, cross-class-fail-fast, plus three
deriveMethod scenarios (instance, static, multi-param, slice param).
Step 2.8 is internal compiler work — derivation isn't observable at
the sx surface until call-site lowering at step 2.11. The cadence
rule's xfail-then-green pattern presupposes a snapshot harness that
doesn't apply to internal-only functions; the rule re-applies at
2.11 where end-to-end observation returns.
zig build test passes; 126/126 examples still green.
This commit is contained in:
agra
208
src/ir/jni_descriptor.test.zig
Normal file
208
src/ir/jni_descriptor.test.zig
Normal file
@@ -0,0 +1,208 @@
|
||||
// Tests for jni_descriptor.zig — Phase 2 step 2.8.
|
||||
// Table-driven golden test for the primitive / array / *Self JNI
|
||||
// signature alphabet. Cross-class references land in 2.9.
|
||||
|
||||
const std = @import("std");
|
||||
const ast = @import("../ast.zig");
|
||||
const desc = @import("jni_descriptor.zig");
|
||||
|
||||
const Node = ast.Node;
|
||||
|
||||
fn makeTypeExpr(allocator: std.mem.Allocator, name: []const u8) !*Node {
|
||||
const node = try allocator.create(Node);
|
||||
node.* = .{
|
||||
.span = .{ .start = 0, .end = 0 },
|
||||
.data = .{ .type_expr = .{ .name = name } },
|
||||
};
|
||||
return node;
|
||||
}
|
||||
|
||||
fn makePointer(allocator: std.mem.Allocator, pointee: *Node) !*Node {
|
||||
const node = try allocator.create(Node);
|
||||
node.* = .{
|
||||
.span = .{ .start = 0, .end = 0 },
|
||||
.data = .{ .pointer_type_expr = .{ .pointee_type = pointee } },
|
||||
};
|
||||
return node;
|
||||
}
|
||||
|
||||
fn makeSlice(allocator: std.mem.Allocator, element: *Node) !*Node {
|
||||
const node = try allocator.create(Node);
|
||||
node.* = .{
|
||||
.span = .{ .start = 0, .end = 0 },
|
||||
.data = .{ .slice_type_expr = .{ .element_type = element } },
|
||||
};
|
||||
return node;
|
||||
}
|
||||
|
||||
fn expectType(name: []const u8, expected: []const u8) !void {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
const tn = try makeTypeExpr(aa, name);
|
||||
var buf: std.ArrayList(u8) = .empty;
|
||||
defer buf.deinit(a);
|
||||
try desc.writeType(a, &buf, .{ .enclosing_path = "" }, tn);
|
||||
try std.testing.expectEqualStrings(expected, buf.items);
|
||||
}
|
||||
|
||||
test "primitive descriptors" {
|
||||
try expectType("void", "V");
|
||||
try expectType("bool", "Z");
|
||||
try expectType("s8", "B");
|
||||
try expectType("u8", "B");
|
||||
try expectType("s16", "S");
|
||||
try expectType("u16", "C");
|
||||
try expectType("s32", "I");
|
||||
try expectType("s64", "J");
|
||||
try expectType("f32", "F");
|
||||
try expectType("f64", "D");
|
||||
}
|
||||
|
||||
test "void return is V (null type_node)" {
|
||||
const a = std.testing.allocator;
|
||||
var buf: std.ArrayList(u8) = .empty;
|
||||
defer buf.deinit(a);
|
||||
try desc.writeType(a, &buf, .{ .enclosing_path = "" }, null);
|
||||
try std.testing.expectEqualStrings("V", buf.items);
|
||||
}
|
||||
|
||||
test "*Self resolves to enclosing class L-form" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
const self_te = try makeTypeExpr(aa, "Self");
|
||||
const ptr = try makePointer(aa, self_te);
|
||||
|
||||
var buf: std.ArrayList(u8) = .empty;
|
||||
defer buf.deinit(a);
|
||||
try desc.writeType(a, &buf, .{ .enclosing_path = "android/view/View" }, ptr);
|
||||
try std.testing.expectEqualStrings("Landroid/view/View;", buf.items);
|
||||
}
|
||||
|
||||
test "slice of primitive is array descriptor" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
const s32 = try makeTypeExpr(aa, "s32");
|
||||
const slice = try makeSlice(aa, s32);
|
||||
|
||||
var buf: std.ArrayList(u8) = .empty;
|
||||
defer buf.deinit(a);
|
||||
try desc.writeType(a, &buf, .{ .enclosing_path = "" }, slice);
|
||||
try std.testing.expectEqualStrings("[I", buf.items);
|
||||
}
|
||||
|
||||
test "cross-class *Foo is not yet supported (2.9)" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
const foo = try makeTypeExpr(aa, "Window");
|
||||
const ptr = try makePointer(aa, foo);
|
||||
|
||||
var buf: std.ArrayList(u8) = .empty;
|
||||
defer buf.deinit(a);
|
||||
const result = desc.writeType(a, &buf, .{ .enclosing_path = "android/view/View" }, ptr);
|
||||
try std.testing.expectError(desc.DeriveError.CrossClassRefNotYetSupported, result);
|
||||
}
|
||||
|
||||
test "deriveMethod skips implicit self for instance methods" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
// method: getId :: (self: *Self) -> s32 → ()I
|
||||
const self_te = try makeTypeExpr(aa, "Self");
|
||||
const self_ptr = try makePointer(aa, self_te);
|
||||
const ret = try makeTypeExpr(aa, "s32");
|
||||
|
||||
const method: ast.ForeignMethodDecl = .{
|
||||
.name = "getId",
|
||||
.params = &.{self_ptr},
|
||||
.param_names = &.{"self"},
|
||||
.return_type = ret,
|
||||
.is_static = false,
|
||||
};
|
||||
const out = try desc.deriveMethod(a, .{ .enclosing_path = "android/view/View" }, method);
|
||||
defer a.free(out);
|
||||
try std.testing.expectEqualStrings("()I", out);
|
||||
}
|
||||
|
||||
test "deriveMethod for static method emits all params" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
// static abs :: (n: s32) -> s32 → (I)I
|
||||
const n_ty = try makeTypeExpr(aa, "s32");
|
||||
const ret = try makeTypeExpr(aa, "s32");
|
||||
|
||||
const method: ast.ForeignMethodDecl = .{
|
||||
.name = "abs",
|
||||
.params = &.{n_ty},
|
||||
.param_names = &.{"n"},
|
||||
.return_type = ret,
|
||||
.is_static = true,
|
||||
};
|
||||
const out = try desc.deriveMethod(a, .{ .enclosing_path = "java/lang/Math" }, method);
|
||||
defer a.free(out);
|
||||
try std.testing.expectEqualStrings("(I)I", out);
|
||||
}
|
||||
|
||||
test "deriveMethod with multiple primitive params and void return" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
// setBounds :: (self: *Self, x: s32, y: s32, w: s32, h: s32) -> void → (IIII)V
|
||||
const self_te = try makeTypeExpr(aa, "Self");
|
||||
const self_ptr = try makePointer(aa, self_te);
|
||||
const s = try makeTypeExpr(aa, "s32");
|
||||
|
||||
const method: ast.ForeignMethodDecl = .{
|
||||
.name = "setBounds",
|
||||
.params = &.{ self_ptr, s, s, s, s },
|
||||
.param_names = &.{ "self", "x", "y", "w", "h" },
|
||||
.return_type = null,
|
||||
.is_static = false,
|
||||
};
|
||||
const out = try desc.deriveMethod(a, .{ .enclosing_path = "android/graphics/Rect" }, method);
|
||||
defer a.free(out);
|
||||
try std.testing.expectEqualStrings("(IIII)V", out);
|
||||
}
|
||||
|
||||
test "deriveMethod with slice param" {
|
||||
const a = std.testing.allocator;
|
||||
var arena = std.heap.ArenaAllocator.init(a);
|
||||
defer arena.deinit();
|
||||
const aa = arena.allocator();
|
||||
|
||||
// copy :: (self: *Self, src: []s8) -> s32 → ([B)I
|
||||
const self_te = try makeTypeExpr(aa, "Self");
|
||||
const self_ptr = try makePointer(aa, self_te);
|
||||
const s8 = try makeTypeExpr(aa, "s8");
|
||||
const src_slice = try makeSlice(aa, s8);
|
||||
const ret = try makeTypeExpr(aa, "s32");
|
||||
|
||||
const method: ast.ForeignMethodDecl = .{
|
||||
.name = "copy",
|
||||
.params = &.{ self_ptr, src_slice },
|
||||
.param_names = &.{ "self", "src" },
|
||||
.return_type = ret,
|
||||
.is_static = false,
|
||||
};
|
||||
const out = try desc.deriveMethod(a, .{ .enclosing_path = "java/nio/ByteBuffer" }, method);
|
||||
defer a.free(out);
|
||||
try std.testing.expectEqualStrings("([B)I", out);
|
||||
}
|
||||
Reference in New Issue
Block a user