Fix string matcher to accept size_type rules for each container

Author: lucic71

cpp2rust/converter/printer.cpp

@@ -134,7 +134,14 @@ std::string ToString(clang::ASTContext &ctx, clang::QualType qual_type,
     }
     if (const auto *typedef_type = t->getAs<clang::TypedefType>()) {
       if (t.getCanonicalType()->isBuiltinType()) {
-        return typedef_type->getDecl()->getNameAsString();
+        auto decl = typedef_type->getDecl();
+        if (auto record =
+                clang::dyn_cast<clang::RecordDecl>(decl->getDeclContext());
+            record && !record->isDependentContext()) {
+          return ToString(ctx, ctx.getCanonicalTagType(record)) +
+                 "::" + decl->getNameAsString();
+        }
+        return decl->getNameAsString();
       }
     } else if (const auto *predef = t->getAs<clang::PredefinedSugarType>()) {
       return predef->getIdentifier()->getName().str();

cpp2rust/converter/rules/rules_loader.cpp

@@ -153,6 +153,13 @@ class RuleUsageCollector
       return;
     }
     AddKey(TypeKey(type));
+    if (const auto *alias =
+            llvm::dyn_cast<clang::TypedefType>(type.getTypePtr())) {
+      if (const auto *record = llvm::dyn_cast<clang::RecordDecl>(
+              alias->getDecl()->getDeclContext())) {
+        AddKey(ClassKey(record));
+      }
+    }
     if (auto desugared = type.getSingleStepDesugaredType(ctx_);
         desugared != type) {
       if (const auto *spec = llvm::dyn_cast<clang::TemplateSpecializationType>(
@@ -454,6 +461,8 @@ void PragmaHandler::HandlePragma(clang::Preprocessor &PP,
   auto &ctx = CI_.getASTContext();
   auto &src_mgr = ctx.getSourceManager();
 
+  CI_.getSema().PerformPendingInstantiations();
+
   std::unordered_set<std::string> keys;
   RuleUsageCollector collector(CI_.getSema(), keys);
   collector.TraverseDecl(ctx.getTranslationUnitDecl());

cpp2rust/converter/rules/string_matcher.cpp

@@ -372,6 +372,12 @@ Match<TranslationRule::TypeRule> Find(clang::ASTContext &ctx,
           << ", result: " << res.first->type_info.type << '\n';
     return res;
   }
+  if (auto alias = type->getAs<clang::TypedefType>();
+      alias && type.getCanonicalType()->isBuiltinType() &&
+      clang::isa<clang::RecordDecl>(alias->getDecl()->getDeclContext())) {
+    log() << "search type " << sugared << ", result: None\n";
+    return Find(ctx, alias->getDecl()->getUnderlyingType());
+  }
   auto desugared = Printer::ToString(ctx, type);
   if (desugared == sugared) {
     log() << "search type " << desugared << ", result: None\n";

rules/vector/src.cpp

@@ -24,6 +24,9 @@ using t7 = typename std::vector<T1, T2>::const_iterator;
 
 template <typename T1> using t8 = typename std::vector<T1>::size_type;
 
+template <typename T1, typename T2 = std::allocator<T1>>
+using t9 = typename std::vector<T1, T2>::size_type;
+
 template <typename T1>
 typename std::vector<T1>::iterator
 f1(std::vector<T1> &o, typename std::vector<T1>::const_iterator it) {

rules/vector/tgt_unsafe.rs

@@ -37,6 +37,10 @@ fn t8() -> usize {
     0_usize
 }
 
+fn t9() -> usize {
+    0_usize
+}
+
 unsafe fn f1<T1>(a0: &mut Vec<T1>, a1: *const T1) -> *const T1 {
     let pos = a1.offset_from(a0.as_ptr()) as usize;
     a0.remove(pos);