Add support for typedef'ed rules

Author: lucic71

cpp2rust/converter/converter_lib.cpp

@@ -753,6 +753,17 @@ bool IsBuiltinVaStart(const clang::CallExpr *expr) {
   return false;
 }
 
+std::string GetNameOfScalarTypedef(clang::QualType qual_type) {
+  qual_type = qual_type.getNonReferenceType();
+  const auto *typedef_type =
+      llvm::dyn_cast<clang::TypedefType>(qual_type.getTypePtr());
+  if (!typedef_type || !qual_type.getCanonicalType()->isBuiltinType()) {
+    return {};
+  }
+  std::string name = typedef_type->getDecl()->getNameAsString();
+  return qual_type.isConstQualified() ? "const " + name : name;
+}
+
 bool IsBuiltinVaEnd(const clang::CallExpr *expr) {
   if (auto *fn = expr->getDirectCallee()) {
     return fn->getBuiltinID() == clang::Builtin::BI__builtin_va_end;

cpp2rust/converter/converter_lib.h

@@ -159,6 +159,8 @@ std::string GetClassName(clang::QualType type);
 
 bool IsVaListType(clang::QualType type);
 
+std::string GetNameOfScalarTypedef(clang::QualType qual_type);
+
 bool IsBuiltinVaStart(const clang::CallExpr *expr);
 
 bool IsBuiltinVaEnd(const clang::CallExpr *expr);

cpp2rust/converter/mapper.cpp

@@ -400,12 +400,22 @@ TranslationRule::ExprRule *search(const clang::Expr *expr) {
   return rule;
 }
 
-TranslationRule::TypeRule *search(clang::QualType qual_type) {
+std::pair<TranslationRule::TypeRule *, std::vector<std::optional<std::string>>>
+search(clang::QualType qual_type) {
+  if (auto name = GetNameOfScalarTypedef(qual_type); !name.empty()) {
+    auto res = search(types_, name, GetTypeMapKey(name));
+    if (res.first) {
+      log() << "search type " << name
+            << ", result: " << res.first->type_info.type << '\n';
+      return res;
+    }
+  }
   auto type = ToString(qual_type);
-  auto [rule, subs] = search(types_, type, GetTypeMapKey(type));
+  auto res = search(types_, type, GetTypeMapKey(type));
   log() << "search type " << type
-        << ", result: " << (rule ? rule->type_info.type : "None") << '\n';
-  return rule;
+        << ", result: " << (res.first ? res.first->type_info.type : "None")
+        << '\n';
+  return res;
 }
 
 void addRulesFromDirectory(const std::filesystem::path &dir, Model model) {
@@ -579,7 +589,7 @@ PushASTContext::PushASTContext(clang::ASTContext &ctx) : prev_(ctx_) {
 PushASTContext::~PushASTContext() { ctx_ = prev_; }
 
 bool Contains(clang::QualType qual_type) {
-  return search(qual_type) != nullptr;
+  return search(qual_type).first != nullptr;
 }
 
 bool Contains(const clang::Expr *expr) { return search(expr) != nullptr; }
@@ -614,8 +624,7 @@ std::string InstantiateTemplate(const clang::Expr *expr, unsigned n) {
 }
 
 std::string Map(clang::QualType qual_type) {
-  auto type_str = ToString(qual_type);
-  auto [rule, subs] = search(types_, type_str, GetTypeMapKey(type_str));
+  auto [rule, subs] = search(qual_type);
   if (rule) {
     for (auto &ty : subs) {
       if (ty) {
@@ -628,8 +637,7 @@ std::string Map(clang::QualType qual_type) {
 }
 
 std::string MapInitializer(clang::QualType qual_type) {
-  auto type_str = ToString(qual_type);
-  auto [rule, subs] = search(types_, type_str, GetTypeMapKey(type_str));
+  auto [rule, subs] = search(qual_type);
   if (rule && !rule->initializer.empty()) {
     for (auto &ty : subs) {
       if (ty) {
@@ -642,12 +650,12 @@ std::string MapInitializer(clang::QualType qual_type) {
 }
 
 bool MapsToPointer(clang::QualType qual_type) {
-  auto rule = search(qual_type);
+  auto rule = search(qual_type).first;
   return rule && rule->type_info.is_pointer();
 }
 
 bool MapsToRefcountPointer(clang::QualType qual_type) {
-  auto rule = search(qual_type);
+  auto rule = search(qual_type).first;
   return rule && rule->type_info.is_refcount_pointer;
 }
 

cpp2rust/cpp_rule_preprocessor.cpp

@@ -26,6 +26,7 @@
 #include <string>
 
 #include "compat/platform_flags.h"
+#include "converter/converter_lib.h"
 #include "converter/mapper.h"
 
 namespace fs = std::filesystem;
@@ -113,7 +114,11 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
       } else {
         type = var->getUnderlyingType();
       }
-      out_.try_emplace(var->getQualifiedNameAsString(), Mapper::ToString(type));
+      auto src = GetNameOfScalarTypedef(type);
+      if (src.empty()) {
+        src = Mapper::ToString(type);
+      }
+      out_.try_emplace(var->getQualifiedNameAsString(), std::move(src));
       return;
     }