From 25050a0c5a6c416c6a5376ebc459d8ea4a46d99a Mon Sep 17 00:00:00 2001 From: Rerumu Date: Fri, 20 May 2022 23:01:42 -0400 Subject: [PATCH] Wrap import names too --- codegen-luajit/src/translator.rs | 8 ++++---- codegen-luau/src/translator.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/codegen-luajit/src/translator.rs b/codegen-luajit/src/translator.rs index 60d992e..0c63b38 100644 --- a/codegen-luajit/src/translator.rs +++ b/codegen-luajit/src/translator.rs @@ -17,7 +17,7 @@ use crate::{ backend::manager::{Driver, Manager}, }; -fn aux_internal_index(internal: Internal) -> u32 { +fn to_internal_index(internal: Internal) -> u32 { match internal { Internal::Function(v) | Internal::Table(v) | Internal::Memory(v) | Internal::Global(v) => v, } @@ -70,7 +70,7 @@ where let field = v.field(); let module = v.module(); - write!(w, "{upper}[{i}] = wasm.{module}.{lower}.{field} ")?; + write!(w, r#"{upper}[{i}] = wasm["{module}"].{lower}["{field}"]"#)?; } Ok(()) @@ -90,9 +90,9 @@ where for v in export.iter().filter(|v| cond(v.internal())) { 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, "}},") diff --git a/codegen-luau/src/translator.rs b/codegen-luau/src/translator.rs index f09874c..74337fb 100644 --- a/codegen-luau/src/translator.rs +++ b/codegen-luau/src/translator.rs @@ -17,7 +17,7 @@ use crate::{ backend::manager::{Driver, Manager}, }; -fn aux_internal_index(internal: Internal) -> u32 { +fn to_internal_index(internal: Internal) -> u32 { match internal { Internal::Function(v) | Internal::Table(v) | Internal::Memory(v) | Internal::Global(v) => v, } @@ -69,7 +69,7 @@ where let field = v.field(); let module = v.module(); - write!(w, "{upper}[{i}] = wasm.{module}.{lower}.{field} ")?; + write!(w, r#"{upper}[{i}] = wasm["{module}"].{lower}["{field}"]"#)?; } Ok(()) @@ -89,9 +89,9 @@ where for v in export.iter().filter(|v| cond(v.internal())) { 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, "}},")