Add single_file flag

Author: lucic71

cpp2rust/ast_consumer.cpp

@@ -7,7 +7,8 @@
 
 namespace cpp2rust {
 void ASTConsumer::HandleTranslationUnit(clang::ASTContext &ctx) {
-  auto converter = CreateConverter(rs_code_, ctx, model_, rules_dir_);
+  auto converter =
+      CreateConverter(rs_code_, ctx, model_, single_file_, rules_dir_);
   converter->SetSema(CI_.getSema());
   if (first_) {
     converter->EmitFilePreamble();

cpp2rust/ast_consumer.h

@@ -15,17 +15,18 @@ namespace cpp2rust {
 class ASTConsumer : public clang::ASTConsumer {
 public:
   explicit ASTConsumer(std::string &rs_code, Model model, bool first,
-                       clang::CompilerInstance &CI,
+                       bool single_file, clang::CompilerInstance &CI,
                        const std::string &rules_dir)
-      : rs_code_(rs_code), model_(model), first_(first), CI_(CI),
-        rules_dir_(rules_dir) {}
+      : rs_code_(rs_code), model_(model), first_(first),
+        single_file_(single_file), CI_(CI), rules_dir_(rules_dir) {}
 
   void HandleTranslationUnit(clang::ASTContext &ctx) override;
 
 private:
   std::string &rs_code_;
   Model model_;
   bool first_;
+  bool single_file_;
   clang::CompilerInstance &CI_;
   const std::string &rules_dir_;
 };

cpp2rust/converter/converter.cpp

@@ -275,7 +275,9 @@ bool Converter::VisitUsingType(clang::UsingType *type) {
 bool Converter::Convert(clang::Decl *decl) { return TraverseDecl(decl); }
 
 bool Converter::VisitTranslationUnitDecl(clang::TranslationUnitDecl *decl) {
-  StrCat("\n//", GetMainFileName(ctx_) + ".rs\n");
+  if (!single_file_) {
+    StrCat("\n//", GetMainFileName(ctx_) + ".rs\n");
+  }
   for (auto *child : decl->decls()) {
     if (IsConvertibleDecl(child) &&
         (IsInMainFile(child) || !decl_ids_.contains(GetID(child)))) {

cpp2rust/converter/converter.h

@@ -24,12 +24,14 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
 public:
   explicit Converter(std::string &rs_code, clang::ASTContext &ctx,
+                     bool single_file = false,
                      const char *keyword_unsafe = "unsafe",
                      const char *keyword_mut = "mut",
                      const char *keyword_ptr_decay = ".as_mut_ptr()",
                      const char *keyword_const_fn = keyword::kConst)
-      : rs_code_(&rs_code), ctx_(ctx), keyword_unsafe_(keyword_unsafe),
-        keyword_mut_(keyword_mut), keyword_ptr_decay_(keyword_ptr_decay),
+      : rs_code_(&rs_code), ctx_(ctx), single_file_(single_file),
+        keyword_unsafe_(keyword_unsafe), keyword_mut_(keyword_mut),
+        keyword_ptr_decay_(keyword_ptr_decay),
         keyword_const_fn_(keyword_const_fn) {}
 
   virtual ~Converter() = default;
@@ -525,6 +527,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   std::string *rs_code_;
   clang::ASTContext &ctx_;
+  bool single_file_ = false;
   clang::FunctionDecl *curr_function_ = nullptr;
   bool in_function_formals_ = false;
   bool in_const_initializer_ = false;

cpp2rust/converter/factory.cpp

@@ -10,13 +10,14 @@ namespace cpp2rust {
 
 std::unique_ptr<Converter> CreateConverter(std::string &rs_code,
                                            clang::ASTContext &ctx, Model model,
+                                           bool single_file,
                                            const std::string &rules_dir) {
   Mapper::LoadTranslationRules(model, ctx, rules_dir);
   switch (model) {
   case Model::kUnsafe:
-    return std::make_unique<Converter>(rs_code, ctx);
+    return std::make_unique<Converter>(rs_code, ctx, single_file);
   case Model::kRefCount:
-    return std::make_unique<ConverterRefCount>(rs_code, ctx);
+    return std::make_unique<ConverterRefCount>(rs_code, ctx, single_file);
   }
   std::unreachable();
 }

cpp2rust/converter/factory.h

@@ -18,5 +18,6 @@ class Converter;
 
 std::unique_ptr<Converter> CreateConverter(std::string &rs_code,
                                            clang::ASTContext &ctx, Model model,
+                                           bool single_file,
                                            const std::string &rules_dir);
 } // namespace cpp2rust

cpp2rust/converter/models/converter_refcount.cpp

@@ -14,8 +14,8 @@
 
 namespace cpp2rust {
 ConverterRefCount::ConverterRefCount(std::string &rs_code,
-                                     clang::ASTContext &ctx)
-    : Converter(rs_code, ctx, "", "", ".as_pointer()", ""),
+                                     clang::ASTContext &ctx, bool single_file)
+    : Converter(rs_code, ctx, single_file, "", "", ".as_pointer()", ""),
       conversion_kind_({ConversionKind::Unboxed}) {}
 
 void ConverterRefCount::EmitFilePreamble() {

cpp2rust/converter/models/converter_refcount.h

@@ -8,7 +8,8 @@
 namespace cpp2rust {
 class ConverterRefCount final : public Converter {
 public:
-  ConverterRefCount(std::string &rs_code, clang::ASTContext &ctx);
+  ConverterRefCount(std::string &rs_code, clang::ASTContext &ctx,
+                    bool single_file = false);
 
   void EmitFilePreamble() override;
 

cpp2rust/cpp2rust_lib.cpp

@@ -25,7 +25,8 @@ std::string TranspileSrc(std::string_view cc_code, Model model,
 
   std::string rs_code;
   clang::tooling::runToolOnCodeWithArgs(
-      std::make_unique<FrontendAction>(rs_code, model, true, rules_dir),
+      std::make_unique<FrontendAction>(rs_code, model, /*first=*/true,
+                                       /*single_file=*/true, rules_dir),
       cc_code, tool_args, std::filesystem::path(filename).filename().string(),
       filename.ends_with(".c") ? CLANG_C_COMPILER : CLANG_CXX_COMPILER);
   return rs_code;

cpp2rust/frontend_action.h

@@ -18,21 +18,22 @@ namespace cpp2rust {
 class FrontendAction : public clang::ASTFrontendAction {
 public:
   explicit FrontendAction(std::string &rs_code, Model model, bool first,
-                          const std::string &rules_dir)
-      : rs_code_(rs_code), model_(model), first_(first), rules_dir_(rules_dir) {
-  }
+                          bool single_file, const std::string &rules_dir)
+      : rs_code_(rs_code), model_(model), first_(first),
+        single_file_(single_file), rules_dir_(rules_dir) {}
 
   std::unique_ptr<clang::ASTConsumer>
   CreateASTConsumer(clang::CompilerInstance &CI,
                     llvm::StringRef InFile) override {
-    return std::make_unique<ASTConsumer>(rs_code_, model_, first_, CI,
-                                         rules_dir_);
+    return std::make_unique<ASTConsumer>(rs_code_, model_, first_, single_file_,
+                                         CI, rules_dir_);
   }
 
 private:
   std::string &rs_code_;
   Model model_;
   bool first_;
+  bool single_file_;
   const std::string &rules_dir_;
 };
 
@@ -45,7 +46,8 @@ class FrontendActionFactory : public clang::tooling::FrontendActionFactory {
   std::unique_ptr<clang::FrontendAction> create() override {
     bool f = first_;
     first_ = false;
-    return std::make_unique<FrontendAction>(rs_code_, model_, f, rules_dir_);
+    return std::make_unique<FrontendAction>(rs_code_, model_, f,
+                                            /*single_file=*/false, rules_dir_);
   }
 
 private: