diff options
Diffstat (limited to 'src/z/Env/root.zig')
| -rw-r--r-- | src/z/Env/root.zig | 93 |
1 files changed, 48 insertions, 45 deletions
diff --git a/src/z/Env/root.zig b/src/z/Env/root.zig index c4979b9..99b47c5 100644 --- a/src/z/Env/root.zig +++ b/src/z/Env/root.zig @@ -6,7 +6,9 @@ const js = @import("js.zig"); const Self = @This(); pub const Call = @import("call.zig").Call; -pub const Future = @import("Future.zig"); +const future = @import("future.zig"); +pub const AnyFuture = future.AnyFuture; +pub const Future = future.Future; pub const Value = @import("value.zig").Value; pub const Object = extern struct {}; @@ -22,15 +24,15 @@ pub fn init(gpa: std.mem.Allocator) Self { return .{ .gpa = gpa }; } -pub fn getProp(self: *Self, object: *Object, key: anytype) !Future { - try self.calls.append(self.gpa, .{ +pub fn getProp(self: *Self, object: *Object, key: anytype) AnyFuture { + self.calls.append(self.gpa, .{ .kind = .get_prop, .num_args = 2, - }); - try self.values.append(self.gpa, .from(object)); - try self.values.append(self.gpa, .from(key)); + }) catch |err| return .{ .err = err }; + self.values.append(self.gpa, .from(object)) catch |err| return .{ .err = err }; + self.values.append(self.gpa, .from(key)) catch |err| return .{ .err = err }; - return self.registerFuture(); + return self.registerFuture() catch |err| .{ .err = err }; } pub fn setProp( @@ -38,33 +40,33 @@ pub fn setProp( object: *Object, key: anytype, value: anytype, -) !Future { - try self.calls.append(self.gpa, .{ +) Future(.undefined) { + self.calls.append(self.gpa, .{ .kind = .set_prop, .num_args = 3, - }); + }) catch |err| return .fromAny(.{ .err = err }); - try self.values.append(self.gpa, .from(object)); - try self.values.append(self.gpa, .from(key)); - try self.values.append(self.gpa, .from(value)); + self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); + self.values.append(self.gpa, .from(key)) catch |err| return .fromAny(.{ .err = err }); + self.values.append(self.gpa, .from(value)) catch |err| return .fromAny(.{ .err = err }); - return self.registerFuture(); + return .fromAny(self.registerFuture() catch |err| .{ .err = err }); } pub fn deleteProp( self: *Self, object: *Object, key: []const u8, -) !Future { - try self.calls.append(self.gpa, .{ +) Future(.undefined) { + self.calls.append(self.gpa, .{ .kind = .del_prop, .num_args = 2, - }); + }) catch |err| return .fromAny(.{ .err = err }); - try self.values.append(self.gpa, .from(object)); - try self.values.append(self.gpa, .from(key)); + self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); + self.values.append(self.gpa, .from(key)) catch |err| return .fromAny(.{ .err = err }); - return self.registerFuture(); + return .fromAny(self.registerFuture() catch |err| .{ .err = err }); } pub fn callMethod( @@ -72,65 +74,66 @@ pub fn callMethod( object: *Object, key: []const u8, args: anytype, -) !Future { - try self.calls.append(self.gpa, .{ +) AnyFuture { + self.calls.append(self.gpa, .{ .kind = .call_method, .num_args = 2 + args.len, - }); + }) catch |err| return .{ .err = err }; - try self.values.append(self.gpa, .from(object)); - try self.values.append(self.gpa, .from(key)); + self.values.append(self.gpa, .from(object)) catch |err| return .{ .err = err }; + self.values.append(self.gpa, .from(key)) catch |err| return .{ .err = err }; inline for (args) |arg| { - try self.values.append(self.gpa, .from(arg)); + self.values.append(self.gpa, .from(arg)) catch |err| return .{ .err = err }; } - return self.registerFuture(); + return self.registerFuture() catch |err| return .{ .err = err }; } -pub fn call(self: *Self, object: *Object, args: anytype) !Future { - try self.calls.append(self.gpa, .{ +pub fn call(self: *Self, object: *Object, args: anytype) AnyFuture { + self.calls.append(self.gpa, .{ .kind = .call, .num_args = 1 + args.len, - }); + }) catch |err| return .{ .err = err }; - try self.values.append(self.gpa, .from(object)); + self.values.append(self.gpa, .from(object)) catch |err| return .{ .err = err }; inline for (args) |arg| { - try self.values.append(self.gpa, .from(arg)); + self.values.append(self.gpa, .from(arg)) catch |err| return .{ .err = err }; } - return self.registerFuture(); + return self.registerFuture() catch |err| return .{ .err = err }; } -pub fn free(self: *Self, object: *Object) !Future { - try self.calls.append(self.gpa, .{ +pub fn free(self: *Self, object: *Object) Future(.undefined) { + self.calls.append(self.gpa, .{ .kind = .free, .num_args = 1, - }); + }) catch |err| return .fromAny(.{ .err = err }); - try self.values.append(self.gpa, .from(object)); + self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); - return self.registerFuture(); + return .fromAny(self.registerFuture() catch |err| .{ .err = err }); } -pub fn new(self: *Self, object: *Object, args: anytype) !Future { - try self.calls.append(self.gpa, .{ +pub fn new(self: *Self, object: *Object, args: anytype) Future(.object) { + self.calls.append(self.gpa, .{ .kind = .new, .num_args = 1 + args.len, - }); + }) catch |err| return .fromAny(.{ .err = err }); - try self.values.append(self.gpa, .from(object)); + self.values.append(self.gpa, .from(object)) catch |err| return .fromAny(.{ .err = err }); inline for (args) |arg| { - try self.values.append(self.gpa, .from(arg)); + self.values.append(self.gpa, .from(arg)) catch |err| return .fromAny(.{ .err = err }); } - return self.registerFuture(); + return .fromAny(self.registerFuture() catch |err| .{ .err = err }); } -fn registerFuture(self: *Self) !Future { +fn registerFuture(self: *Self) !AnyFuture { const result = try self.pool.create(self.gpa); + errdefer self.pool.destroy(result); result.kind = .uninit; try self.results.append(self.gpa, result); return .{ .result = result }; |