Delete comments and move function in converter_lib

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -128,7 +128,6 @@ bool Converter::VisitBuiltinType(clang::BuiltinType *type) {
 
 bool Converter::VisitRecordType(clang::RecordType *type) {
   auto *decl = type->getDecl();
-
   if (auto lambda = clang::dyn_cast<clang::CXXRecordDecl>(decl)) {
     if (lambda->isLambda()) {
       auto call_op = lambda->getLambdaCallOperator();
@@ -360,9 +359,9 @@ bool Converter::VisitFunctionTemplateDecl(clang::FunctionTemplateDecl *decl) {
 
 void Converter::ConvertVaListVarDecl(clang::VarDecl *decl) {
   if (clang::isa<clang::ParmVarDecl>(decl)) {
-    // va_list parameter (decayed to __va_list_tag *): emit "mut ap: VaList"
+    // va_list parameter (decayed to __va_list_tag *)
   } else {
-    // va_list local variable: emit "let mut ap: VaList"
+    // va_list local variable
     StrCat(keyword::kLet);
   }
   StrCat(keyword_mut_, GetNamedDeclAsString(decl), token::kColon, "VaList");

cpp2rust/converter/converter_lib.cpp

@@ -600,4 +600,16 @@ bool IsBuiltinVaCopy(const clang::CallExpr *expr) {
   return false;
 }
 
+bool ContainsVAArgExpr(const clang::Stmt *stmt) {
+  if (clang::isa<clang::VAArgExpr>(stmt)) {
+    return true;
+  }
+  for (auto *child : stmt->children()) {
+    if (ContainsVAArgExpr(child)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 } // namespace cpp2rust

cpp2rust/converter/converter_lib.h

@@ -150,4 +150,6 @@ bool IsBuiltinVaEnd(const clang::CallExpr *expr);
 
 bool IsBuiltinVaCopy(const clang::CallExpr *expr);
 
+bool ContainsVAArgExpr(const clang::Stmt *stmt);
+
 } // namespace cpp2rust

cpp2rust/converter/models/converter_refcount.cpp

@@ -479,9 +479,9 @@ void ConverterRefCount::EmitFunctionPreamble(clang::FunctionDecl *decl) {
 
 void ConverterRefCount::ConvertVaListVarDecl(clang::VarDecl *decl) {
   if (clang::isa<clang::ParmVarDecl>(decl)) {
-    // va_list parameter (decayed to __va_list_tag *): emit "mut ap: VaList"
+    // va_list parameter (decayed to __va_list_tag *)
   } else {
-    // va_list local variable: emit "let mut ap: VaList"
+    // va_list local variable
     StrCat(keyword::kLet);
   }
 
@@ -1495,18 +1495,6 @@ void ConverterRefCount::ConvertVarInit(clang::QualType qual_type,
   in_function_formals_ = false;
 }
 
-static bool ContainsVAArgExpr(const clang::Stmt *stmt) {
-  if (clang::isa<clang::VAArgExpr>(stmt)) {
-    return true;
-  }
-  for (auto *child : stmt->children()) {
-    if (ContainsVAArgExpr(child)) {
-      return true;
-    }
-  }
-  return false;
-}
-
 static std::unordered_set<const clang::ValueDecl *>
 GetAllVars(const clang::Stmt *stmt) {
   std::unordered_set<const clang::ValueDecl *> vars;

tests/unit/va_arg_chain.c

@@ -1,4 +1,3 @@
-// Pattern from curl's trc_write chain: variadic -> va_list -> va_list forwarding
 #include <assert.h>
 #include <stdarg.h>
 
@@ -22,7 +21,6 @@ int top_level(int n, ...) {
 }
 
 int main() {
-  // Extract the 3rd arg (0-indexed): 100, 200, 300, 400 -> 300
   assert(top_level(2, 100, 200, 300, 400) == 300);
   assert(top_level(0, 42, 99) == 42);
   assert(top_level(3, 1, 2, 3, 4) == 4);

tests/unit/va_arg_conditional.c

@@ -1,4 +1,3 @@
-// Pattern from Curl_failf: va_start only under a condition
 #include <assert.h>
 #include <stdarg.h>
 

tests/unit/va_arg_copy.c

@@ -1,4 +1,3 @@
-// va_copy: save position, consume from copy, original still usable
 #include <assert.h>
 #include <stdarg.h>
 
@@ -28,7 +27,6 @@ int sum_with_copy(int count, ...) {
 }
 
 int main() {
-  // sum1 = 10+20+30 = 60, sum2 = 10+20+30 = 60, total = 120
   assert(sum_with_copy(3, 10, 20, 30) == 120);
   return 0;
 }

tests/unit/va_arg_mixed_int_ptr.c

@@ -1,4 +1,3 @@
-// va_arg with mixed int and pointer types in the same call
 #include <assert.h>
 #include <stdarg.h>
 
@@ -23,7 +22,6 @@ int mixed_args(int count, ...) {
 
 int main() {
   int x = 100;
-  // tag=0 val=10, tag=1 ptr=&x(100), tag=0 val=20
   assert(mixed_args(3, 0, 10, 1, &x, 0, 20) == 130);
 
   int y = 50;

tests/unit/va_arg_mixed_types.c

@@ -21,7 +21,6 @@ int sum_mixed(int count, ...) {
 }
 
 int main() {
-  // tag=0 int=10, tag=1 double=20.5, tag=2 long=30
   assert(sum_mixed(3, 0, 10, 1, 20.5, 2, 30L) == 60);
   assert(sum_mixed(1, 0, 42) == 42);
   assert(sum_mixed(2, 1, 3.7, 2, 100L) == 103);

tests/unit/va_arg_promotion.c

@@ -1,4 +1,3 @@
-// C promotion rules: char/short promote to int, float promotes to double
 #include <assert.h>
 #include <stdarg.h>
 
@@ -23,7 +22,7 @@ int test_promotions(int count, ...) {
 }
 
 int main() {
-  char x = 'A';     // 65
+  char x = 'A';
   short y = 10;
   float z = 3.0f;
   // 65 + 10 + 3 = 78