Escape special chars (#9)

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1552,26 +1552,27 @@ bool Converter::VisitCharacterLiteral(clang::CharacterLiteral *expr) {
 }
 
 std::string Converter::GetEscapedCharLiteral(char character) const {
-  std::string esc;
-  esc = character;
   switch (character) {
   case '"':
-    esc = "\\\"";
-    break;
+    return "\\\"";
+  case '\'':
+    return "\\'";
+  case '\\':
+    return "\\\\";
   case '\n':
-    esc = "\\n";
-    break;
+    return "\\n";
   case '\r':
-    esc = "\\r";
-    break;
+    return "\\r";
   case '\t':
-    esc = "\\t";
-    break;
+    return "\\t";
   case '\0':
-    esc = "\\0";
-    break;
+    return "\\0";
+  }
+  auto uc = static_cast<unsigned char>(character);
+  if (uc < 0x20 || uc == 0x7F) {
+    return std::format("\\x{:02x}", uc);
   }
-  return esc;
+  return std::string(1, character);
 }
 
 std::string Converter::GetEscapedUTF8CharLiteral(clang::Expr *expr) const {
@@ -1590,14 +1591,17 @@ std::string Converter::GetEscapedStringLiteral(clang::Expr *expr,
                                                bool add_null_char) const {
   auto str_expr = clang::dyn_cast<clang::StringLiteral>(expr->IgnoreCasts());
   assert(str_expr);
-  std::string string = str_expr->getString().str();
-  // escape quotes
-  size_t pos = 0;
-  while ((pos = string.find_first_of("\"\n\r\t\0", pos)) != std::string::npos) {
-    string.replace(pos, 1, GetEscapedCharLiteral(string[pos]));
-    pos += 2;
-  }
-  return '"' + std::move(string) + (add_null_char ? "\\0\"" : "\"");
+  auto raw = str_expr->getString();
+  std::string out;
+  out.push_back('"');
+  for (unsigned char c : raw) {
+    out += GetEscapedCharLiteral(static_cast<char>(c));
+  }
+  if (add_null_char) {
+    out += "\\0";
+  }
+  out.push_back('"');
+  return out;
 }
 
 bool Converter::VisitStringLiteral(clang::StringLiteral *expr) {

tests/unit/out/refcount/string_escape.rs

@@ -0,0 +1,37 @@
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+use std::io::prelude::*;
+use std::io::Seek;
+use std::io::{Read, Write};
+use std::os::fd::AsFd;
+use std::rc::{Rc, Weak};
+pub fn main() {
+    std::process::exit(main_0());
+}
+fn main_0() -> i32 {
+    let special: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
+        "\x07\x08\t\n\x0b\x0c\r !\"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~",
+    )));
+    thread_local!(
+        static expected: Value<Box<[u8]>> = Rc::new(RefCell::new(Box::new([
+            7_u8, 8_u8, 9_u8, 10_u8, 11_u8, 12_u8, 13_u8, 32_u8, 33_u8, 34_u8, 35_u8, 36_u8, 37_u8,
+            38_u8, 39_u8, 40_u8, 41_u8, 42_u8, 43_u8, 44_u8, 45_u8, 46_u8, 47_u8, 58_u8, 59_u8,
+            60_u8, 61_u8, 62_u8, 63_u8, 64_u8, 91_u8, 92_u8, 93_u8, 94_u8, 95_u8, 96_u8, 123_u8,
+            124_u8, 125_u8, 126_u8,
+        ])));
+    );
+    let i: Value<i32> = Rc::new(RefCell::new(0));
+    'loop_: while ((*i.borrow())
+        < ((((::std::mem::size_of::<[u8; 40]>() as u64 as u64)
+            .wrapping_div(::std::mem::size_of::<u8>() as u64 as u64)) as u64) as i32))
+    {
+        assert!({
+            let _lhs = (((*special.borrow()).offset((*i.borrow()) as isize).read()) as i32);
+            _lhs == ((*expected.with(Value::clone).borrow())[(*i.borrow()) as usize] as i32)
+        });
+        (*i.borrow_mut()).postfix_inc();
+    }
+    return 0;
+}

tests/unit/out/unsafe/string_escape.rs

@@ -0,0 +1,33 @@
+extern crate libc;
+use libc::*;
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::collections::BTreeMap;
+use std::io::Seek;
+use std::io::{Read, Write};
+use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
+use std::rc::Rc;
+pub fn main() {
+    unsafe {
+        std::process::exit(main_0() as i32);
+    }
+}
+unsafe fn main_0() -> i32 {
+    let mut special: *const u8 =
+        b"\x07\x08\t\n\x0b\x0c\r !\"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~\0".as_ptr();
+    static expected: [u8; 40] = [
+        7_u8, 8_u8, 9_u8, 10_u8, 11_u8, 12_u8, 13_u8, 32_u8, 33_u8, 34_u8, 35_u8, 36_u8, 37_u8,
+        38_u8, 39_u8, 40_u8, 41_u8, 42_u8, 43_u8, 44_u8, 45_u8, 46_u8, 47_u8, 58_u8, 59_u8, 60_u8,
+        61_u8, 62_u8, 63_u8, 64_u8, 91_u8, 92_u8, 93_u8, 94_u8, 95_u8, 96_u8, 123_u8, 124_u8,
+        125_u8, 126_u8,
+    ];;
+    let mut i: i32 = 0;
+    'loop_: while ((i)
+        < ((((::std::mem::size_of::<[u8; 40]>() as u64 as u64)
+            .wrapping_div(::std::mem::size_of::<u8>() as u64 as u64)) as u64) as i32))
+    {
+        assert!((((*special.offset((i) as isize)) as i32) == (expected[(i) as usize] as i32)));
+        i.postfix_inc();
+    }
+    return 0;
+}

tests/unit/string_escape.cpp

@@ -0,0 +1,16 @@
+#include <assert.h>
+#include <string.h>
+
+int main() {
+  const char *special = "\a\b\t\n\v\f\r !\"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~";
+  static const char expected[] = {
+      7,  8,  9,  10, 11, 12, 13, 32, 33,  34,  35,  36,  37, 38,
+      39, 40, 41, 42, 43, 44, 45, 46, 47,  58,  59,  60,  61, 62,
+      63, 64, 91, 92, 93, 94, 95, 96, 123, 124, 125, 126,
+  };
+  for (int i = 0; i < (int)(sizeof(expected) / sizeof(expected[0])); i++) {
+    assert(special[i] == expected[i]);
+  }
+
+  return 0;
+}