Wrap import names too
This commit is contained in:
parent
8464d70a93
commit
25050a0c5a
@ -17,7 +17,7 @@ use crate::{
|
|||||||
backend::manager::{Driver, Manager},
|
backend::manager::{Driver, Manager},
|
||||||
};
|
};
|
||||||
|
|
||||||
fn aux_internal_index(internal: Internal) -> u32 {
|
fn to_internal_index(internal: Internal) -> u32 {
|
||||||
match internal {
|
match internal {
|
||||||
Internal::Function(v) | Internal::Table(v) | Internal::Memory(v) | Internal::Global(v) => v,
|
Internal::Function(v) | Internal::Table(v) | Internal::Memory(v) | Internal::Global(v) => v,
|
||||||
}
|
}
|
||||||
@ -70,7 +70,7 @@ where
|
|||||||
let field = v.field();
|
let field = v.field();
|
||||||
let module = v.module();
|
let module = v.module();
|
||||||
|
|
||||||
write!(w, "{upper}[{i}] = wasm.{module}.{lower}.{field} ")?;
|
write!(w, r#"{upper}[{i}] = wasm["{module}"].{lower}["{field}"]"#)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -90,9 +90,9 @@ where
|
|||||||
|
|
||||||
for v in export.iter().filter(|v| cond(v.internal())) {
|
for v in export.iter().filter(|v| cond(v.internal())) {
|
||||||
let field = v.field();
|
let field = v.field();
|
||||||
let index = aux_internal_index(*v.internal());
|
let index = to_internal_index(*v.internal());
|
||||||
|
|
||||||
write!(w, "[\"{field}\"] = {upper}[{index}],")?;
|
write!(w, r#"["{field}"] = {upper}[{index}],"#)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
write!(w, "}},")
|
write!(w, "}},")
|
||||||
|
@ -17,7 +17,7 @@ use crate::{
|
|||||||
backend::manager::{Driver, Manager},
|
backend::manager::{Driver, Manager},
|
||||||
};
|
};
|
||||||
|
|
||||||
fn aux_internal_index(internal: Internal) -> u32 {
|
fn to_internal_index(internal: Internal) -> u32 {
|
||||||
match internal {
|
match internal {
|
||||||
Internal::Function(v) | Internal::Table(v) | Internal::Memory(v) | Internal::Global(v) => v,
|
Internal::Function(v) | Internal::Table(v) | Internal::Memory(v) | Internal::Global(v) => v,
|
||||||
}
|
}
|
||||||
@ -69,7 +69,7 @@ where
|
|||||||
let field = v.field();
|
let field = v.field();
|
||||||
let module = v.module();
|
let module = v.module();
|
||||||
|
|
||||||
write!(w, "{upper}[{i}] = wasm.{module}.{lower}.{field} ")?;
|
write!(w, r#"{upper}[{i}] = wasm["{module}"].{lower}["{field}"]"#)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@ -89,9 +89,9 @@ where
|
|||||||
|
|
||||||
for v in export.iter().filter(|v| cond(v.internal())) {
|
for v in export.iter().filter(|v| cond(v.internal())) {
|
||||||
let field = v.field();
|
let field = v.field();
|
||||||
let index = aux_internal_index(*v.internal());
|
let index = to_internal_index(*v.internal());
|
||||||
|
|
||||||
write!(w, "[\"{field}\"] = {upper}[{index}],")?;
|
write!(w, r#"["{field}"] = {upper}[{index}],"#)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
write!(w, "}},")
|
write!(w, "}},")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user