Fix js_str macro to correctly handle latin1 strings

boa-dev · Aug 19, 2024 · 3a964e7 · 3a964e7
1 parent 424896d
commit 3a964e7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/macros/src/lib.rs b/core/macros/src/lib.rs
@@ -185,10 +185,9 @@ pub fn utf16(input: TokenStream) -> TokenStream {
 #[proc_macro]
 pub fn js_str(input: TokenStream) -> TokenStream {
     let literal = parse_macro_input!(input as LitStr);
-    let utf8 = literal.value();
 
     let mut is_latin1 = true;
-    let utf16 = utf8
+    let utf16 = literal.value()
         .encode_utf16()
         .inspect(|x| {
             if *x > u8::MAX.into() {
@@ -197,8 +196,9 @@ pub fn js_str(input: TokenStream) -> TokenStream {
         })
         .collect::<Vec<_>>();
     if is_latin1 {
+        let latin1 = utf16.iter().map(|&c| c as u8).collect::<Vec<_>>();
         quote! {
-            ::boa_engine::string::JsStr::latin1(#utf8.as_bytes())
+            ::boa_engine::string::JsStr::latin1([#(#latin1),*].as_slice())
         }
     } else {
         quote! {