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

Simplifying the output

Browse Source
This commit is contained in:
Pauan
2019-07-16 23:03:18 +02:00
parent 4e504654d1
commit 1e4cac9c95
3 changed files with 27 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
crates/cli-support/src/js/outgoing.rs
View File

@ -139,16 +139,10 @@ impl<'a, 'b> Outgoing<'a, 'b> {
let len = self.arg(*length);
let tmp = self.js.tmp();
self.js.typescript_required("string");
self.cx.expose_get_object();
self.cx.expose_get_string_from_wasm()?;
self.js.typescript_optional("string");
self.cx.expose_get_cached_string_from_wasm()?;
self.js.prelude(&format!(
"const v{tmp} = {ptr} === 0 ? getObject({len}) : getStringFromWasm({ptr}, {len});",
tmp = tmp,
ptr = ptr,
len = len,
));
self.js.prelude(&format!("const v{} = getCachedStringFromWasm({}, {});", tmp, ptr, len));
if *owned {
self.prelude_free_cached_string(&ptr, &len)?;
@ -332,35 +326,6 @@ impl<'a, 'b> Outgoing<'a, 'b> {
self.js.prelude("}");
Ok(format!("v{}", i))
}
NonstandardOutgoing::OptionCachedString {
offset,
length,
owned,
} => {
let ptr = self.arg(*offset);
let len = self.arg(*length);
let tmp = self.js.tmp();
self.js.typescript_optional("string");
self.cx.expose_get_object();
self.cx.expose_get_string_from_wasm()?;
self.js.prelude(&format!("let v{};", tmp));
self.js.prelude(&format!(
"if ({ptr} === 0) {{ if ({len} !== 0) {{ v{tmp} = getObject({len}); }} }} else {{ v{tmp} = getStringFromWasm({ptr}, {len}); }}",
tmp = tmp,
ptr = ptr,
len = len,
));
if *owned {
self.prelude_free_cached_string(&ptr, &len)?;
}
Ok(format!("v{}", tmp))
}
}
}