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

Work on review comments

Browse Source
This commit is contained in:
Richard Dodd
2018-08-21 12:55:09 +01:00
parent 003cf102f1
commit 385e805509
4 changed files with 145 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/cli-support/src/js/rust2js.rs
View File

@ -548,19 +548,12 @@ impl<'a, 'b> Rust2Js<'a, 'b> {
unreachable!("the last argument of a variadic must be a slice");
}
let last_arg = self.js_arguments.len() - 1; // check implies >= 0
// The variadic part of the arguments could be passed as as a typed array in
// javascript, so we cannot just do `.concat(..)`, as this seems to convert the
// contents to strings (javascript is very strange).
write!(ret, "\
let args = [{}];\n\
{}.forEach(extra_arg => args.push(extra_arg));\n\
",
self.js_arguments[..last_arg].join(", "),
self.js_arguments[last_arg]
).unwrap();
self.ret_expr.replace(
"JS",
&format!("{}.apply(this, args)", invoc),
&format!("{}({}, ...{})",
invoc,
self.js_arguments[..last_arg].join(", "),
self.js_arguments[last_arg])
)
} else {
self.ret_expr.replace(