fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-06-14 21:41:23 +00:00
Code Issues Projects Releases Wiki Activity

Simplify ABI for Option<char>

Browse Source 
Flatten None to a special u32 value instead of using an intermediate pointer.
This commit is contained in:
Ingvar Stepanyan
2019-03-26 18:12:24 +00:00
parent 11bb8f03c2
commit 5f742ca4c4
3 changed files with 13 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/cli-support/src/js/js2rust.rs
View File

@ -343,9 +343,8 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self.cx.expose_is_like_none();
self.js_arguments
.push((name.clone(), "string | undefined".to_string()));
self.rust_arguments.push(format!("!isLikeNone({0})", name));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0 : {0}.codePointAt(0)", name));
.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0}.codePointAt(0)", name));
return Ok(self);
}
Descriptor::Enum { hole } => {
@ -632,17 +631,10 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
}
Descriptor::Char => {
self.ret_ty = "string | undefined".to_string();
self.cx.expose_global_argument_ptr()?;
self.cx.expose_uint32_memory();
self.prelude("const retptr = globalArgumentPtr();");
self.rust_arguments.insert(0, "retptr".to_string());
self.ret_expr = "
RET;
const present = getUint32Memory()[retptr / 4];
const value = getUint32Memory()[retptr / 4 + 1];
return present === 0 ? undefined : String.fromCodePoint(value);
"
.to_string();
const ret = RET;
return ret === 0xFFFFFF ? undefined : String.fromCodePoint(ret);
".to_string();
return Ok(self);
}
Descriptor::Enum { hole } => {