zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

js-runtime: Create String view type and renamed Value.value() to

Browse source 
Value.view() without allocator param
This commit is contained in:
iddev5 2022-07-07 18:51:29 +05:30 • committed by Stephen Gutekanst
parent 51c702aebc
commit 8ec61055e3
1 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

40
js-runtime/src/main.zig
View file

@ -62,11 +62,11 @@ pub const Value = extern struct {
}; };
} }
pub fn value(val: *const Value, comptime tag: Tag, allocator: ?std.mem.Allocator) switch (tag) { pub fn view(val: *const Value, comptime tag: Tag) switch (tag) {
.object => Object, .object => Object,
.num => f64, .num => f64,
.bool => bool, .bool => bool,
.str => std.mem.Allocator.Error![]const u8, .str => String,
.func => Function, .func => Function,
.nulled, .undef => @compileError("Cannot get null or undefined as a value"), .nulled, .undef => @compileError("Cannot get null or undefined as a value"),
} { } {
@ -74,12 +74,7 @@ pub const Value = extern struct {
.object => Object{ .ref = val.val.ref }, .object => Object{ .ref = val.val.ref },
.num => val.val.num, .num => val.val.num,
.bool => val.val.bool, .bool => val.val.bool,
.str => blk: { .str => String{ .ref = val.val.ref },
const len = js.zigGetStringLength(val.val.ref);
var slice = try allocator.?.alloc(u8, len);
js.zigGetString(val.val.ref, slice.ptr);
break :blk slice;
},
.func => Function{ .ref = val.val.ref }, .func => Function{ .ref = val.val.ref },
else => unreachable, else => unreachable,
}; };
@ -156,6 +151,29 @@ pub const Function = struct {
} }
}; };
pub const String = struct {
ref: u64,
pub fn deinit(string: *const String) void {
js.zigCleanupObject(string.ref);
}
pub fn toValue(string: *const String) Value {
return .{ .tag = .str, .val = .{ .ref = string.ref } };
}
pub fn getLength(string: *const String) usize {
return js.zigGetStringLength(string.ref);
}
pub fn getOwnedSlice(string: *const String, allocator: std.mem.Allocator) ![]const u8 {
var slice = try allocator.alloc(u8, string.getLength());
errdefer allocator.free(slice);
js.zigGetString(string.ref, slice.ptr);
return slice;
}
};
export fn wasmCallFunction(id: *anyopaque, args: u32, len: u32) void { export fn wasmCallFunction(id: *anyopaque, args: u32, len: u32) void {
const obj = Object{ .ref = args }; const obj = Object{ .ref = args };
if (builtin.zig_backend == .stage1) { if (builtin.zig_backend == .stage1) {
@ -178,8 +196,8 @@ pub fn createArray() Object {
return .{ .ref = js.zigCreateArray() }; return .{ .ref = js.zigCreateArray() };
} }
pub fn createString(string: []const u8) Value { pub fn createString(string: []const u8) String {
return .{ .tag = .str, .val = .{ .ref = js.zigCreateString(string.ptr, string.len) } }; return .{ .ref = js.zigCreateString(string.ptr, string.len) };
} }
pub fn createNumber(num: f64) Value { pub fn createNumber(num: f64) Value {
@ -211,7 +229,7 @@ pub fn createFunction(fun: FunType) Function {
} }
pub fn constructType(t: []const u8, args: []const Value) Value { pub fn constructType(t: []const u8, args: []const Value) Value {
const constructor = global().get(t).value(.func, null); const constructor = global().get(t).view(.func);
defer constructor.deinit(); defer constructor.deinit();
return constructor.construct(args); return constructor.construct(args);