Merge branch 'master' into rules-in-tu

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -52,7 +52,7 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void EmitFilePreamble();
 
-  static void EmitOpaqueRecords(std::string &out);
+  static void EmitOpaqueRecords(Model model, std::string &out);
   static void EmitGlobalInits(Model model, std::string &out);
 
   static void EmitVirtualMethods(std::string &out);
@@ -173,6 +173,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual bool VisitNamespaceDecl(clang::NamespaceDecl *decl);
 
+  bool VisitLinkageSpecDecl(clang::LinkageSpecDecl *decl);
+
   virtual bool VisitTypedefDecl(clang::TypedefDecl *decl);
   virtual bool VisitTypeAliasDecl(clang::TypeAliasDecl *decl);
   virtual bool VisitTypeAliasTemplateDecl(clang::TypeAliasTemplateDecl *decl);
@@ -327,9 +329,14 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   void ConvertGenericCallExpr(clang::CallExpr *expr);
 
-  virtual void EmitFnPtrCall(clang::Expr *callee);
+  virtual void EmitFnPtrCall(clang::CallExpr *expr);
+
+  void ConvertLambdaCall(clang::CallExpr *expr,
+                         const clang::CXXRecordDecl *lambda);
 
-  virtual void ConvertLambdaToFunctionPointer(clang::Expr *lambda);
+  virtual void
+  ConvertLambdaToFunctionPointer(clang::Expr *lambda,
+                                 const clang::CXXConversionDecl *conversion);
 
   virtual void
   ConvertFunctionToFunctionPointer(const clang::FunctionDecl *fn_decl);
@@ -380,8 +387,14 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
                                       uint64_t pad_nulls = 0) const;
   virtual bool VisitStringLiteral(clang::StringLiteral *expr);
 
+  bool VisitSourceLocExpr(clang::SourceLocExpr *expr);
+
+  virtual std::string GetSourceFileAsString(clang::QualType type);
+
   virtual bool VisitCXXBoolLiteralExpr(clang::CXXBoolLiteralExpr *expr);
 
+  bool VisitCXXNoexceptExpr(clang::CXXNoexceptExpr *expr);
+
   void ConvertIntegerToEnumeralCast(clang::Expr *to, clang::Expr *from);
 
   void ConvertIntegralToBooleanCast(clang::ImplicitCastExpr *expr);
@@ -401,6 +414,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual bool VisitStmtExpr(clang::StmtExpr *expr);
 
+  bool ConvertLValueConditional(clang::ConditionalOperator *expr);
+
   virtual bool VisitConditionalOperator(clang::ConditionalOperator *expr);
 
   virtual bool VisitDeclRefExpr(clang::DeclRefExpr *expr);
@@ -469,7 +484,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   virtual void ConvertLambdaCapture(const clang::FieldDecl *field,
                                     clang::Expr *init);
 
-  void ConvertLambdaClosure(const clang::CXXRecordDecl *decl);
+  void ConvertLambdaClosure(const clang::CXXRecordDecl *decl,
+                            clang::CXXMethodDecl *call_operator);
 
   virtual bool VisitImplicitValueInitExpr(clang::ImplicitValueInitExpr *expr);
   virtual bool VisitCXXScalarValueInitExpr(clang::CXXScalarValueInitExpr *expr);
@@ -488,6 +504,15 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual bool VisitClassTemplateDecl(clang::ClassTemplateDecl *decl);
 
+  bool TraverseClassTemplateSpecializationDecl(
+      clang::ClassTemplateSpecializationDecl *) {
+    return true;
+  }
+
+  bool TraverseExplicitInstantiationDecl(clang::ExplicitInstantiationDecl *) {
+    return true;
+  }
+
   virtual bool
   VisitCXXStdInitializerListExpr(clang::CXXStdInitializerListExpr *expr);
 
@@ -661,6 +686,10 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
                                 const clang::CXXRecordDecl *decl,
                                 std::string_view lhs, std::string_view rhs);
 
+  std::string GetComparisonBool(const clang::FunctionDecl *op,
+                                const clang::CXXRecordDecl *decl,
+                                std::string_view lhs, std::string_view rhs);
+
   virtual std::string
   GetComparisonReferenceArg(const clang::CXXRecordDecl *decl,
                             std::string_view value);