Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for isize/usize arrays #1448

Merged
merged 1 commit into from
Apr 12, 2019
Merged

Add support for isize/usize arrays #1448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/convert/slices.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ macro_rules! vectors {
}

vectors! {
u8 i8 u16 i16 u32 i32 u64 i64 f32 f64
u8 i8 u16 i16 u32 i32 u64 i64 usize isize f32 f64
}

if_std! {
Expand Down
12 changes: 12 additions & 0 deletions tests/wasm/slice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,12 @@ exports.js_export = () => {
i32[0] = 1;
i32[1] = 2;
assert.deepStrictEqual(wasm.export_i32(i32), i32);
assert.deepStrictEqual(wasm.export_isize(i32), i32);
const u32 = new Uint32Array(2);
u32[0] = 1;
u32[1] = 2;
assert.deepStrictEqual(wasm.export_u32(u32), u32);
assert.deepStrictEqual(wasm.export_usize(u32), u32);

const f32 = new Float32Array(2);
f32[0] = 1;
Expand Down Expand Up @@ -73,13 +75,15 @@ exports.import_js_i32 = a => {
assert.strictEqual(a[1], 2);
return a;
};
exports.import_js_isize = exports.import_js_i32;

exports.import_js_u32 = a => {
assert.strictEqual(a.length, 2);
assert.strictEqual(a[0], 1);
assert.strictEqual(a[1], 2);
return a;
};
exports.import_js_usize = exports.import_js_u32;

exports.import_js_f32 = a => {
assert.strictEqual(a.length, 2);
Expand Down Expand Up @@ -118,10 +122,12 @@ exports.js_import = () => {
i32[0] = 1;
i32[1] = 2;
assert.deepStrictEqual(wasm.import_rust_i32(i32), i32);
assert.deepStrictEqual(wasm.import_rust_isize(i32), i32);
const u32 = new Uint32Array(2);
u32[0] = 1;
u32[1] = 2;
assert.deepStrictEqual(wasm.import_rust_u32(u32), u32);
assert.deepStrictEqual(wasm.import_rust_usize(u32), u32);

const f32 = new Float32Array(2);
f32[0] = 1;
Expand All @@ -140,6 +146,8 @@ exports.js_pass_array = () => {
wasm.pass_array_rust_u16([1, 2]);
wasm.pass_array_rust_i32([1, 2]);
wasm.pass_array_rust_u32([1, 2]);
wasm.pass_array_rust_isize([1, 2]);
wasm.pass_array_rust_usize([1, 2]);
wasm.pass_array_rust_f32([1, 2]);
wasm.pass_array_rust_f64([1, 2]);
};
Expand All @@ -158,6 +166,8 @@ exports.import_mut_js_i16 = import_mut_foo;
exports.import_mut_js_u16 = import_mut_foo;
exports.import_mut_js_i32 = import_mut_foo;
exports.import_mut_js_u32 = import_mut_foo;
exports.import_mut_js_isize = import_mut_foo;
exports.import_mut_js_usize = import_mut_foo;
exports.import_mut_js_f32 = import_mut_foo;
exports.import_mut_js_f64 = import_mut_foo;

Expand All @@ -182,6 +192,8 @@ exports.js_export_mut = () => {
export_mut_run(new Uint16Array(3), wasm.export_mut_u16);
export_mut_run(new Int32Array(3), wasm.export_mut_i32);
export_mut_run(new Uint32Array(3), wasm.export_mut_u32);
export_mut_run(new Int32Array(3), wasm.export_mut_isize);
export_mut_run(new Uint32Array(3), wasm.export_mut_usize);
export_mut_run(new Float32Array(3), wasm.export_mut_f32);
export_mut_run(new Float64Array(3), wasm.export_mut_f64);
};
Expand Down
8 changes: 8 additions & 0 deletions tests/wasm/slice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export_macro! {
(u16, export_u16)
(i32, export_i32)
(u32, export_u32)
(isize, export_isize)
(usize, export_usize)
(f32, export_f32)
(f64, export_f64)
}
Expand Down Expand Up @@ -73,6 +75,8 @@ import_macro! {
(import_rust_u16, import_js_u16, u16)
(import_rust_i32, import_js_i32, i32)
(import_rust_u32, import_js_u32, u32)
(import_rust_isize, import_js_isize, isize)
(import_rust_usize, import_js_usize, usize)
(import_rust_f32, import_js_f32, f32)
(import_rust_f64, import_js_f64, f64)
}
Expand Down Expand Up @@ -100,6 +104,8 @@ pass_array_marco! {
(pass_array_rust_u16, u16)
(pass_array_rust_i32, i32)
(pass_array_rust_u32, u32)
(pass_array_rust_isize, isize)
(pass_array_rust_usize, usize)
(pass_array_rust_f32, f32)
(pass_array_rust_f64, f64)
}
Expand Down Expand Up @@ -169,6 +175,8 @@ export_mut_macro! {
(u16, export_mut_u16)
(i32, export_mut_i32)
(u32, export_mut_u32)
(isize, export_mut_isize)
(usize, export_mut_usize)
(f32, export_mut_f32)
(f64, export_mut_f64)
}
Expand Down