Recognize macros in Mapper

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1626,6 +1626,11 @@ std::string Converter::getIntegerLiteral(clang::IntegerLiteral *expr,
 }
 
 bool Converter::VisitIntegerLiteral(clang::IntegerLiteral *expr) {
+  if (auto str = GetMappedAsString(expr); !str.empty()) {
+    StrCat(str);
+    computed_expr_type_ = ComputedExprType::FreshValue;
+    return false;
+  }
   StrCat(getIntegerLiteral(expr, Mapper::Map(expr->getType()) != "i32"));
   computed_expr_type_ = ComputedExprType::FreshValue;
   return false;

cpp2rust/converter/mapper.cpp

@@ -5,6 +5,7 @@
 
 #include <clang/AST/ExprCXX.h>
 #include <clang/Basic/SourceManager.h>
+#include <clang/Lex/Lexer.h>
 #include <llvm/Support/ThreadPool.h>
 
 #include <format>
@@ -804,6 +805,16 @@ std::string ToString(const clang::Expr *expr) {
 
   expr = expr->IgnoreParenImpCasts();
 
+  if (llvm::isa<clang::IntegerLiteral>(expr) &&
+      expr->getBeginLoc().isMacroID()) {
+    auto &sm = ctx_->getSourceManager();
+    auto name = clang::Lexer::getImmediateMacroName(expr->getBeginLoc(), sm,
+                                                    ctx_->getLangOpts());
+    if (!name.empty()) {
+      return name.str();
+    }
+  }
+
   if (const auto *CE = llvm::dyn_cast<clang::CallExpr>(expr)) {
     if (const auto *decl = CE->getDirectCallee()) {
       return ToString(decl);

cpp2rust/converter/rule_src_parser.cpp

@@ -188,6 +188,13 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
         add(Mapper::ToString(decl));
         return;
       }
+      if (const auto *lit = R.Nodes.getNodeAs<clang::Expr>("lit")) {
+        auto src = Mapper::ToString(lit);
+        if (!src.empty()) {
+          add(std::move(src));
+        }
+        return;
+      }
     }
   }
 
@@ -689,7 +696,8 @@ class ActionFactory : public clang::tooling::FrontendActionFactory {
                                   declRefExpr(to(decl(unless(parmVarDecl()))))))
                     .bind("udeclref"),
                 cxxDependentScopeMemberExpr().bind("dsme"),
-                cxxUnresolvedConstructExpr().bind("uctor"))))),
+                cxxUnresolvedConstructExpr().bind("uctor"),
+                integerLiteral().bind("lit"))))),
             hasAncestor(functionDecl(isDefinition(),
                                      matchesName("(^|::)f[0-9]+$"),
                                      isExpansionInMainFile())
@@ -701,7 +709,6 @@ class ActionFactory : public clang::tooling::FrontendActionFactory {
             .bind("tvar"),
         &cb_);
 
-    // Collect every f<n> for the post-run diff against bound bodies.
     finder_.addMatcher(functionDecl(isDefinition(),
                                     matchesName("(^|::)f[0-9]+$"),
                                     isExpansionInMainFile())
@@ -767,10 +774,7 @@ bool Extract(const std::filesystem::path &src_path, llvm::json::Object &out) {
     if (out.find(name) == out.end()) {
       llvm::errs() << src_path.string() << ": " << name
                    << ": matcher did not bind to the function body.\n"
-                   << "  body: " << body_src << '\n'
-                   << "  Likely cause: return expression shape not handled by "
-                      "rule_src_parser.cpp's ActionFactory matcher (e.g. a "
-                      "literal from a macro expansion).\n";
+                   << "  body: " << body_src << '\n';
       ok = false;
     }
   }