language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

wasm_interp: allow WASI to take bytes rather than strings for argv

Browse source
This commit is contained in:
Brian Carroll 2022-12-16 00:31:23 +00:00
parent 4501f2af0e
commit ca0f159386
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/wasm_interp/src/instance.rs
View file

@ -192,7 +192,7 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
&mut self,
module: &WasmModule<'a>,
fn_name: &str,
arg_strings: &'a [&'a String],
arg_strings: &'a [&'a [u8]],
) -> Result<Option<Value>, String> {
// We have two different mechanisms for handling CLI arguments!
// 1. Basic numbers:
@ -208,12 +208,13 @@ impl<'a, I: ImportDispatcher> Instance<'a, I> {
// Implement the "basic numbers" CLI
// Check if the called Wasm function takes numeric arguments, and if so, try to parse them from the CLI.
let arg_type_bytes = self.prepare_to_call_export(module, fn_name)?;
for (value_str, type_byte) in arg_strings
for (value_bytes, type_byte) in arg_strings
.iter()
.skip(1) // first string is the .wasm filename
.zip(arg_type_bytes.iter().copied())
{
use ValueType::*;
let value_str = String::from_utf8_lossy(value_bytes);
let value = match ValueType::from(type_byte) {
I32 => Value::I32(value_str.parse::<i32>().map_err(|e| e.to_string())?),
I64 => Value::I64(value_str.parse::<i64>().map_err(|e| e.to_string())?),