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

Support closures with "rich" arguments

Browse Source 
This commit adds support for closures with arguments like strings and such. In
other words, closures passed to JS can now have the same suite of arguments as
all functions that can be exported from Rust, as one might expect!

At this time due to the way trait objects work closures still cannot use types
with references like `&str`, but bare values like `String` or `ImportedType`
should work just fine.

Closes #104
This commit is contained in:
Alex Crichton
2018-04-14 09:13:07 -07:00
parent c1df44189e
commit c64f178543
7 changed files with 577 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/cli-support/src/descriptor.rs
View File

@ -48,7 +48,7 @@ pub enum Descriptor {
F64,
Boolean,
Function(Box<Function>),
Closure(Box<Function>),
Closure(Box<Function>, bool),
Ref(Box<Descriptor>),
RefMut(Box<Descriptor>),
Slice(Box<Descriptor>),
@ -101,8 +101,9 @@ impl Descriptor {
BOOLEAN => Descriptor::Boolean,
FUNCTION => Descriptor::Function(Box::new(Function::decode(data))),
CLOSURE => {
let mutable = get(data) == REFMUT;
assert_eq!(get(data), FUNCTION);
Descriptor::Closure(Box::new(Function::decode(data)))
Descriptor::Closure(Box::new(Function::decode(data)), mutable)
}
REF => Descriptor::Ref(Box::new(Descriptor::_decode(data))),
REFMUT => Descriptor::RefMut(Box::new(Descriptor::_decode(data))),
@ -152,16 +153,16 @@ impl Descriptor {
}
}
pub fn ref_closure(&self) -> Option<&Function> {
pub fn ref_closure(&self) -> Option<(&Function, bool)> {
match *self {
Descriptor::Ref(ref s) => s.closure(),
_ => None,
}
}
pub fn closure(&self) -> Option<&Function> {
pub fn closure(&self) -> Option<(&Function, bool)> {
match *self {
Descriptor::Closure(ref s) => Some(s),
Descriptor::Closure(ref s, mutable) => Some((s, mutable)),
_ => None,
}
}