Add libcc2rs::char_array to initialize fixed sized arrays

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1927,13 +1927,17 @@ bool Converter::VisitStringLiteral(clang::StringLiteral *expr) {
       uint64_t pad = arr_size > expr->getString().size()
                          ? arr_size - expr->getString().size()
                          : 0;
-      StrCat(token::kStar,
-             std::format("b{}", GetEscapedStringLiteral(expr, pad)));
+      StrCat(std::format("libcc2rs::char_array(b{})",
+                         GetEscapedStringLiteral(expr, pad)));
       return false;
     }
-    StrCat(token::kStar);
+    StrCat(std::format("libcc2rs::char_array(b{})",
+                       GetEscapedStringLiteral(expr, 1)));
+    return false;
   }
-  StrCat(std::format("b{}", GetEscapedStringLiteral(expr, 1)));
+  assert(!expr->getString().contains('\0') &&
+         "interior null byte in string literal");
+  StrCat(std::format("c{}", GetEscapedStringLiteral(expr, 0)));
   return false;
 }
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -1045,7 +1045,7 @@ bool ConverterRefCount::VisitStringLiteral(clang::StringLiteral *expr) {
                 ? arr_size - expr->getString().size()
                 : 0;
     }
-    StrCat(std::format("Box::<[u8]>::from(b{}.as_slice())",
+    StrCat(std::format("Box::from(libcc2rs::char_array(b{}))",
                        GetEscapedStringLiteral(expr, pad)));
     return false;
   }

libcc2rs/src/lib.rs

@@ -35,3 +35,13 @@ mod va_args;
 pub use va_args::*;
 
 pub use libcc2rs_macros::{goto, goto_block, switch};
+
+pub const fn char_array<const N: usize>(s: &[u8; N]) -> [core::ffi::c_char; N] {
+    let mut out = [0 as core::ffi::c_char; N];
+    let mut i = 0;
+    while i < N {
+        out[i] = s[i] as core::ffi::c_char;
+        i += 1;
+    }
+    out
+}