Replace GetNameOfScalarTypedef with kPreserve flag in ToString

Author: lucic71

cpp2rust/converter/converter_lib.cpp

@@ -753,17 +753,6 @@ 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,8 +159,6 @@ 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

@@ -403,15 +403,17 @@ TranslationRule::ExprRule *search(const clang::Expr *expr) {
 
 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 sugared = ToString(qual_type, ScalarSugar::kPreserve);
+  if (auto res = search(types_, sugared, GetTypeMapKey(sugared)); res.first) {
+    log() << "search type " << sugared
+          << ", result: " << res.first->type_info.type << '\n';
+    return res;
   }
   auto type = ToString(qual_type);
+  if (type == sugared) {
+    log() << "search type " << type << ", result: None\n";
+    return {};
+  }
   auto res = search(types_, type, GetTypeMapKey(type));
   log() << "search type " << type
         << ", result: " << (res.first ? res.first->type_info.type : "None")
@@ -742,9 +744,17 @@ void AddRuleForUserDefinedType(clang::NamedDecl *decl) {
   }
 }
 
-std::string ToString(clang::QualType qual_type) {
+std::string ToString(clang::QualType qual_type, ScalarSugar sugar) {
   assert(ctx_);
 
+  if (sugar == ScalarSugar::kPreserve) {
+    if (const auto *typedef_type = qual_type->getAs<clang::TypedefType>()) {
+      if (qual_type.getCanonicalType()->isBuiltinType()) {
+        return typedef_type->getDecl()->getNameAsString();
+      }
+    }
+  }
+
   if (auto cxx_record_decl = qual_type->getAsCXXRecordDecl()) {
     if (cxx_record_decl->isLambda()) {
       return ToString(cxx_record_decl->getLambdaCallOperator());

cpp2rust/converter/mapper.h

@@ -38,7 +38,13 @@ bool ParamIsPointer(const clang::Expr *expr, unsigned index);
 bool MapsToPointer(clang::QualType qual_type);
 bool MapsToRefcountPointer(clang::QualType qual_type);
 
-std::string ToString(clang::QualType qual_type);
+enum class ScalarSugar {
+  kDesugar,
+  kPreserve,
+};
+
+std::string ToString(clang::QualType qual_type,
+                     ScalarSugar sugar = ScalarSugar::kDesugar);
 std::string ToString(const clang::Expr *expr);
 std::string ToString(const clang::NamedDecl *decl);
 

cpp2rust/cpp_rule_preprocessor.cpp

@@ -114,10 +114,7 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
           type = lookupType(tdecl);
         }
       }
-      auto src = GetNameOfScalarTypedef(type);
-      if (src.empty()) {
-        src = Mapper::ToString(type);
-      }
+      auto src = Mapper::ToString(type, Mapper::ScalarSugar::kPreserve);
       out_.try_emplace(var->getQualifiedNameAsString(), std::move(src));
       return;
     }