Renamte vtable impl -> virtual methods

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -29,7 +29,7 @@ std::unordered_set<std::string> Converter::globals_;
 std::vector<std::string> Converter::global_inits_;
 std::unordered_set<std::string> Converter::abstract_structs_;
 Converter::RecordIndex Converter::record_decls_;
-std::map<std::string, Converter::DeferredBlock> Converter::vtable_impls_;
+std::map<std::string, Converter::DeferredBlock> Converter::virtual_methods_;
 
 void Converter::ConvertUniquePtrDeref(clang::CXXOperatorCallExpr *expr) {
   bool is_star = expr->getOperator() == clang::OverloadedOperatorKind::OO_Star;
@@ -68,8 +68,8 @@ void Converter::EmitDeferredBlock(const DeferredBlock &block,
   out += "}\n";
 }
 
-void Converter::EmitVTableImpls(std::string &out) {
-  for (const auto &[name, impl] : vtable_impls_) {
+void Converter::EmitVirtualMethods(std::string &out) {
+  for (const auto &[name, impl] : virtual_methods_) {
     EmitDeferredBlock(impl, out);
   }
 }
@@ -868,7 +868,7 @@ void Converter::EmitRustStructOrUnion(clang::RecordDecl *decl) {
   // C++ method decls
   if (auto *cxx = clang::dyn_cast<clang::CXXRecordDecl>(decl)) {
     ConvertCXXRecordMethods(cxx);
-    ConvertVTableMethods(cxx);
+    ConvertVirtualMethods(cxx);
   }
 
   // Traits
@@ -1065,7 +1065,7 @@ bool Converter::VisitCXXMethodDecl(clang::CXXMethodDecl *decl) {
   PushCurrFunction push_fn(*this, decl);
 
   if (decl->isOutOfLine() && !decl->overridden_methods().empty()) {
-    return ConvertVTableMethod(decl);
+    return ConvertOutOfLineVirtualMethod(decl);
   }
   if (decl->isOutOfLine() && !decl->isTemplateInstantiation()) {
     return ConvertOutOfLineMethod(decl);
@@ -4465,9 +4465,9 @@ void Converter::ConvertCXXMethodDecls(
 }
 
 Converter::DeferredBlock &
-Converter::VTableImplFor(const clang::CXXRecordDecl *decl) {
+Converter::VirtualMethodsFor(const clang::CXXRecordDecl *decl) {
   auto name = GetRecordName(decl);
-  auto [it, inserted] = vtable_impls_.try_emplace(name);
+  auto [it, inserted] = virtual_methods_.try_emplace(name);
   if (inserted) {
     it->second.header = std::format(
         "{} impl {} for {}", keyword_unsafe_,
@@ -4476,7 +4476,7 @@ Converter::VTableImplFor(const clang::CXXRecordDecl *decl) {
   return it->second;
 }
 
-void Converter::ConvertVTableMethods(clang::CXXRecordDecl *decl) {
+void Converter::ConvertVirtualMethods(clang::CXXRecordDecl *decl) {
   if (decl->bases_begin() == decl->bases_end()) {
     return;
   }
@@ -4492,17 +4492,17 @@ void Converter::ConvertVTableMethods(clang::CXXRecordDecl *decl) {
   if (!any) {
     return;
   }
-  VTableImplFor(decl).body += body;
+  VirtualMethodsFor(decl).body += body;
 }
 
-bool Converter::ConvertVTableMethod(clang::CXXMethodDecl *decl) {
+bool Converter::ConvertOutOfLineVirtualMethod(clang::CXXMethodDecl *decl) {
   auto *record = decl->getParent();
   if (record->bases_begin() == record->bases_end()) {
     return false;
   }
   Buffer buf(*this);
   auto emitted = ConvertCXXMethodDecl(decl);
-  VTableImplFor(record).body += std::move(buf).str();
+  VirtualMethodsFor(record).body += std::move(buf).str();
   return emitted;
 }
 

cpp2rust/converter/converter.h

@@ -55,7 +55,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   static void EmitOpaqueRecords(std::string &out);
   static void EmitGlobalInits(Model model, std::string &out);
 
-  static void EmitVTableImpls(std::string &out);
+  static void EmitVirtualMethods(std::string &out);
 
   virtual bool VisitBuiltinType(clang::BuiltinType *type);
 
@@ -603,9 +603,9 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
                              const std::string_view signature,
                              bool (*predicate)(clang::CXXMethodDecl *));
 
-  void ConvertVTableMethods(clang::CXXRecordDecl *decl);
+  void ConvertVirtualMethods(clang::CXXRecordDecl *decl);
 
-  bool ConvertVTableMethod(clang::CXXMethodDecl *decl);
+  bool ConvertOutOfLineVirtualMethod(clang::CXXMethodDecl *decl);
 
   void AddOrdTrait(const clang::CXXRecordDecl *decl);
 
@@ -914,11 +914,11 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     std::string header;
     std::string body;
   };
-  static std::map<std::string, DeferredBlock> vtable_impls_;
+  static std::map<std::string, DeferredBlock> virtual_methods_;
 
   static void EmitDeferredBlock(const DeferredBlock &block, std::string &out);
 
-  DeferredBlock &VTableImplFor(const clang::CXXRecordDecl *decl);
+  DeferredBlock &VirtualMethodsFor(const clang::CXXRecordDecl *decl);
 
   std::string hoisted_records_;
 

cpp2rust/cpp2rust_lib.cpp

@@ -32,7 +32,7 @@ std::string TranspileSrc(std::string_view cc_code, Model model,
       cc_code, tool_args, std::filesystem::path(filename).filename().string(),
       filename.ends_with(".c") ? CLANG_C_COMPILER : CLANG_CXX_COMPILER);
   Converter::EmitOpaqueRecords(rs_code);
-  Converter::EmitVTableImpls(rs_code);
+  Converter::EmitVirtualMethods(rs_code);
   if (model == Model::kRefCount) {
     ConverterRefCount::EmitMethodsOnPtr(rs_code);
   }
@@ -77,7 +77,7 @@ std::string TranspileDir(std::string_view build_dir, Model model,
   FrontendActionFactory factory(rs_code, model, rules_dir);
   Tool.run(&factory);
   Converter::EmitOpaqueRecords(rs_code);
-  Converter::EmitVTableImpls(rs_code);
+  Converter::EmitVirtualMethods(rs_code);
   if (model == Model::kRefCount) {
     ConverterRefCount::EmitMethodsOnPtr(rs_code);
   }