diff options
Diffstat (limited to 'src/z/Env')
| -rw-r--r-- | src/z/Env/Future.zig | 7 | ||||
| -rw-r--r-- | src/z/Env/call.zig | 1 | ||||
| -rw-r--r-- | src/z/Env/root.zig | 77 | ||||
| -rw-r--r-- | src/z/Env/value.zig | 7 |
4 files changed, 90 insertions, 2 deletions
diff --git a/src/z/Env/Future.zig b/src/z/Env/Future.zig index 2a74936..1e28ac7 100644 --- a/src/z/Env/Future.zig +++ b/src/z/Env/Future.zig @@ -1,5 +1,6 @@ const std = @import("std"); const Env = @import("root.zig"); +const z = @import("../root.zig"); const Self = @This(); @@ -7,7 +8,11 @@ result: *Env.Value, pub fn await(self: *const Self, env: *Env, comptime kind: Env.Value.Kind) kind.asType() { const result = self.awaitAny(env); - std.debug.assert(kind == result.kind); + + if (kind != result.kind) { + std.log.err("unexpected {}, expected {}", .{result.kind, kind}); + @panic("type error"); + } return switch (kind) { .uninit => @panic("uninitialized result"), diff --git a/src/z/Env/call.zig b/src/z/Env/call.zig index bf64392..a5db835 100644 --- a/src/z/Env/call.zig +++ b/src/z/Env/call.zig @@ -10,6 +10,7 @@ pub const Call = extern struct { del_prop = 3, call_method = 4, call = 5, + new = 6, }; }; diff --git a/src/z/Env/root.zig b/src/z/Env/root.zig index c2ebade..c4979b9 100644 --- a/src/z/Env/root.zig +++ b/src/z/Env/root.zig @@ -22,7 +22,7 @@ pub fn init(gpa: std.mem.Allocator) Self { return .{ .gpa = gpa }; } -pub fn getProp(self: *Self, object: *Object, key: []const u8) !Future { +pub fn getProp(self: *Self, object: *Object, key: anytype) !Future { try self.calls.append(self.gpa, .{ .kind = .get_prop, .num_args = 2, @@ -33,6 +33,40 @@ pub fn getProp(self: *Self, object: *Object, key: []const u8) !Future { return self.registerFuture(); } +pub fn setProp( + self: *Self, + object: *Object, + key: anytype, + value: anytype, +) !Future { + try self.calls.append(self.gpa, .{ + .kind = .set_prop, + .num_args = 3, + }); + + try self.values.append(self.gpa, .from(object)); + try self.values.append(self.gpa, .from(key)); + try self.values.append(self.gpa, .from(value)); + + return self.registerFuture(); +} + +pub fn deleteProp( + self: *Self, + object: *Object, + key: []const u8, +) !Future { + try self.calls.append(self.gpa, .{ + .kind = .del_prop, + .num_args = 2, + }); + + try self.values.append(self.gpa, .from(object)); + try self.values.append(self.gpa, .from(key)); + + return self.registerFuture(); +} + pub fn callMethod( self: *Self, object: *Object, @@ -54,6 +88,47 @@ pub fn callMethod( return self.registerFuture(); } +pub fn call(self: *Self, object: *Object, args: anytype) !Future { + try self.calls.append(self.gpa, .{ + .kind = .call, + .num_args = 1 + args.len, + }); + + try self.values.append(self.gpa, .from(object)); + + inline for (args) |arg| { + try self.values.append(self.gpa, .from(arg)); + } + + return self.registerFuture(); +} + +pub fn free(self: *Self, object: *Object) !Future { + try self.calls.append(self.gpa, .{ + .kind = .free, + .num_args = 1, + }); + + try self.values.append(self.gpa, .from(object)); + + return self.registerFuture(); +} + +pub fn new(self: *Self, object: *Object, args: anytype) !Future { + try self.calls.append(self.gpa, .{ + .kind = .new, + .num_args = 1 + args.len, + }); + + try self.values.append(self.gpa, .from(object)); + + inline for (args) |arg| { + try self.values.append(self.gpa, .from(arg)); + } + + return self.registerFuture(); +} + fn registerFuture(self: *Self) !Future { const result = try self.pool.create(self.gpa); result.kind = .uninit; diff --git a/src/z/Env/value.zig b/src/z/Env/value.zig index b22b88a..b077fb2 100644 --- a/src/z/Env/value.zig +++ b/src/z/Env/value.zig @@ -47,6 +47,13 @@ pub const Value = extern struct { .kind = .object, .value = .{ .object = value }, }, + comptime_int => if (value >= 0) .{ + .kind = .uint, + .value = .{ .uint = value }, + } else .{ + .kind = .int, + .value = .{ .int = value }, + }, usize => .{ .kind = .uint, .value = .{ .uint = value }, |