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

Consistently expose is_like_none

Browse Source 
Aside from visual deduplication, this actually fixes a bug in js2rust.rs where it didn't call `expose_is_like_none` but used `isLikeNone` inside of `arg.get_64()` branch.
This commit is contained in:
Ingvar Stepanyan
2019-03-26 18:27:49 +00:00
parent 72672ff42a
commit a5f5c7a9e8
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,8 +248,9 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
}
if optional {
self.cx.expose_is_like_none();
if arg.is_wasm_native() {
self.cx.expose_is_like_none();
self.js_arguments
.push((name.clone(), "number | undefined".to_string()));
@ -272,7 +273,6 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
}
if arg.is_abi_as_u32() {
self.cx.expose_is_like_none();
self.js_arguments
.push((name.clone(), "number | undefined".to_string()));
@ -321,7 +321,6 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
match *arg {
Descriptor::Boolean => {
self.cx.expose_is_like_none();
self.js_arguments
.push((name.clone(), "boolean | undefined".to_string()));
if self.cx.config.debug {
@ -337,42 +336,38 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
}
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0} ? 1 : 0", name));
return Ok(self);
}
Descriptor::Char => {
self.cx.expose_is_like_none();
self.js_arguments
.push((name.clone(), "string | undefined".to_string()));
self.rust_arguments
.push(format!("isLikeNone({0}) ? 0xFFFFFF : {0}.codePointAt(0)", name));
return Ok(self);
}
Descriptor::Enum { hole } => {
self.cx.expose_is_like_none();
self.js_arguments
.push((name.clone(), "number | undefined".to_string()));
self.rust_arguments
.push(format!("isLikeNone({0}) ? {1} : {0}", name, hole));
return Ok(self);
}
Descriptor::RustStruct(ref s) => {
self.js_arguments
.push((name.clone(), format!("{} | undefined", s)));
self.prelude(&format!("let ptr{} = 0;", i));
self.prelude(&format!("if ({0} !== null && {0} !== undefined) {{", name));
self.prelude(&format!("if (!isLikeNone({0})) {{", name));
self.assert_class(&name, s);
self.assert_not_moved(&name);
self.prelude(&format!("ptr{} = {}.ptr;", i, name));
self.prelude(&format!("{}.ptr = 0;", name));
self.prelude("}");
self.rust_arguments.push(format!("ptr{}", i));
return Ok(self);
}
_ => bail!(
"unsupported optional argument type for calling Rust function from JS: {:?}",
arg
),
};
}
return Ok(self);
}
if let Some(s) = arg.rust_struct() {