Fix signed printing of integers

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2533,8 +2533,11 @@ bool Converter::VisitStringLiteral(clang::StringLiteral *expr) {
   }
   if (expr->getString().contains('\0')) {
     std::string out = "(&[";
-    for (unsigned char c : expr->getString()) {
-      out += getTypedLiteral(std::to_string(c).c_str(), CharRustType()) + ", ";
+    for (char c : expr->getString()) {
+      auto value = CharRustTypeIsSigned()
+                       ? std::to_string(static_cast<signed char>(c))
+                       : std::to_string(static_cast<unsigned char>(c));
+      out += getTypedLiteral(value.c_str(), CharRustType()) + ", ";
     }
     out += getTypedLiteral("0", CharRustType()) + "])";
     StrCat(out);

cpp2rust/converter/converter_lib.cpp

@@ -319,15 +319,15 @@ llvm::APSInt GetIntegerLiteralValue(const clang::ASTContext &ctx,
                                     const clang::QualType *type,
                                     bool char_is_signed) {
   auto value = expr->getValue();
+  auto target = type ? *type : expr->getType();
   bool is_signed = false;
-  if (type && (*type)->isBuiltinType() && (*type)->isIntegerType() &&
-      !(*type)->isBooleanType()) {
-    value = value.zextOrTrunc(ctx.getIntWidth(*type));
-    is_signed =
-        (*type)->isSpecificBuiltinType(clang::BuiltinType::Char_S) ||
-                (*type)->isSpecificBuiltinType(clang::BuiltinType::Char_U)
-            ? char_is_signed
-            : (*type)->isSignedIntegerType();
+  if (target->isBuiltinType() && target->isIntegerType() &&
+      !target->isBooleanType()) {
+    value = value.zextOrTrunc(ctx.getIntWidth(target));
+    is_signed = target->isSpecificBuiltinType(clang::BuiltinType::Char_S) ||
+                        target->isSpecificBuiltinType(clang::BuiltinType::Char_U)
+                    ? char_is_signed
+                    : target->isSignedIntegerType();
   }
   return llvm::APSInt(value, !is_signed);
 }

tests/unit/size_t_template_param.cpp

@@ -16,6 +16,12 @@ template <class T> struct RefCtor {
   RefCtor(const T &x) : v(x + 1) {}
 };
 
+template <long long N> static long long neg_ll() { return N; }
+
+template <char C> static char neg_char() { return C; }
+
+template <int N> static int neg_int() { return N; }
+
 int main() {
   size_t a1[] = {1, 2, 3};
   assert(array_ref(a1) == 3);
@@ -28,5 +34,9 @@ int main() {
   size_t v1 = 6;
   RefCtor<size_t> rc(v1);
   assert(rc.v == 7);
+
+  assert(neg_ll<-9000000>() == -9000000);
+  assert(neg_char<'\x80'>() == '\x80');
+  assert(neg_int<-1>() == -1);
   return 0;
 }

tests/unit/string_literal_interior_null.cpp

@@ -18,6 +18,9 @@ int main() {
   assert(a == b);
   assert(a == 1);
 
+  int high = sum_bytes("\xc2\x00\x41", 3);
+  assert(high == 0xc2 + 0x41);
+
   int c = "\r\n.\r\n"[0] + "\r\n.\r\n"[3];
   assert(c == '\r' + '\r');