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

Preserve argument names

Browse Source
This commit is contained in:
Caio
2019-03-14 08:46:42 -03:00
parent 90c3196b7b
commit 70f5373348
10 changed files with 97 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,9 +75,22 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
/// Generates all bindings necessary for the signature in `Function`,
/// creating necessary argument conversions and return value processing.
pub fn process(&mut self, function: &Function) -> Result<&mut Self, Error> {
for arg in function.arguments.iter() {
self.argument(arg)?;
pub fn process<'c, I>(
&mut self,
function: &Function,
opt_arg_names: I,
) -> Result<&mut Self, Error>
where
I: Into<Option<&'c Vec<String>>>,
{
if let Some(arg_names) = opt_arg_names.into() {
for (arg, arg_name) in function.arguments.iter().zip(arg_names) {
self.argument(arg, arg_name.clone())?;
}
} else {
for arg in function.arguments.iter() {
self.argument(arg, None)?;
}
}
self.ret(&function.ret)?;
Ok(self)
@ -138,15 +151,22 @@ impl<'a, 'b> Js2Rust<'a, 'b> {
self
}
fn abi_arg(&mut self) -> String {
let s = format!("arg{}", self.arg_idx);
fn abi_arg(&mut self, opt_arg_name: Option<String>) -> String {
let ret = if let Some(x) = opt_arg_name {
x
} else {
format!("arg{}", self.arg_idx)
};
self.arg_idx += 1;
s
ret
}
pub fn argument(&mut self, arg: &Descriptor) -> Result<&mut Self, Error> {
pub fn argument<I>(&mut self, arg: &Descriptor, opt_arg_name: I) -> Result<&mut Self, Error>
where
I: Into<Option<String>>,
{
let i = self.arg_idx;
let name = self.abi_arg();
let name = self.abi_arg(opt_arg_name.into());
let (arg, optional) = match arg {
Descriptor::Option(t) => (&**t, true),