Fix bug in printf %c

Author: nunoplopes

cpp2rust/converter/models/converter_refcount.cpp

@@ -1154,9 +1154,8 @@ static std::vector<const char *> printf2fmt(std::string &format) {
       pos += 2;
       continue;
     case '%':
-      types.emplace_back();
       format.replace(pos, 2, "%");
-      pos += 2;
+      pos += 1;
       continue;
     case 'l':
       if (pos + 2 < format.size() &&
@@ -1268,8 +1267,8 @@ void ConverterRefCount::ConvertPrintf(clang::CallExpr *expr) {
   for (unsigned i = is_fprintf + 1, e = expr->getNumArgs(); i < e; ++i) {
     StrCat(token::kComma);
     Convert(expr->getArg(i));
-    if (types[j])
-      StrCat(keyword::kAs, types[j++]);
+    if (auto *type = types[j++])
+      StrCat(keyword::kAs, type);
   }
   StrCat(')');
 }

tests/unit/out/refcount/printf_char.rs

@@ -0,0 +1,27 @@
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+use std::io::prelude::*;
+use std::io::{Read, Seek, Write};
+use std::os::fd::AsFd;
+use std::rc::{Rc, Weak};
+pub fn main() {
+    __cpp2rust_init_globals();
+    std::process::exit(main_0());
+}
+fn main_0() -> i32 {
+    let mut c: i8 = (('a' as i32) as i8);
+    let mut n: i32 = 3;
+    println!("{}", (c as i32) as u8 as char);
+    println!("{} {}", n, (c as i32) as u8 as char);
+    println!("100% {}", (c as i32) as u8 as char);
+    println!(
+        "{}{}{}",
+        (c as i32) as u8 as char,
+        ((c as i32) + 1) as u8 as char,
+        n
+    );
+    return 0;
+}
+pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/printf_char.rs

@@ -0,0 +1,39 @@
+extern crate libc;
+use libc::*;
+extern crate libcc2rs;
+use libcc2rs::*;
+use std::collections::BTreeMap;
+use std::io::{Read, Seek, Write};
+use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
+use std::rc::Rc;
+pub fn main() {
+    unsafe {
+        __cpp2rust_init_globals();
+        std::process::exit(main_0() as i32);
+    }
+}
+unsafe fn main_0() -> i32 {
+    let mut c: libc::c_char = (('a' as i32) as libc::c_char);
+    let mut n: i32 = 3;
+    printf(
+        (c"%c\n".as_ptr().cast_mut()).cast_const() as *const i8,
+        (c as i32),
+    );
+    printf(
+        (c"%d %c\n".as_ptr().cast_mut()).cast_const() as *const i8,
+        n,
+        (c as i32),
+    );
+    printf(
+        (c"100%% %c\n".as_ptr().cast_mut()).cast_const() as *const i8,
+        (c as i32),
+    );
+    printf(
+        (c"%c%c%d\n".as_ptr().cast_mut()).cast_const() as *const i8,
+        (c as i32),
+        ((c as i32) + (1)),
+        n,
+    );
+    return 0;
+}
+pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/printf_char.c

@@ -0,0 +1,11 @@
+#include <stdio.h>
+
+int main() {
+  char c = 'a';
+  int n = 3;
+  printf("%c\n", c);
+  printf("%d %c\n", n, c);
+  printf("100%% %c\n", c);
+  printf("%c%c%d\n", c, c + 1, n);
+  return 0;
+}