clang format + vendor/unvendor with "make install"

pachadotdev · pachadotdev · commit 07f513a1dbf2 · 2025-12-02T18:33:04.000Z
diff --git a/Makefile b/Makefile
@@ -10,6 +10,8 @@ register:
 
 install:
 	@Rscript -e 'devtools::install("./")'
+	@Rscript -e 'cpp4r::unvendor("./extended-tests/cpp4r4rtest/src/vendor");
+		cpp4r::vendor("./extended-tests/cpp4r4rtest/src/vendor")'
 
 docs:
 	@Rscript -e 'devtools::document("./"); pkgsite::build_site("./")'
diff --git a/extended-tests/cpp4rtest/src/matrix.h b/extended-tests/cpp4rtest/src/matrix.h
@@ -122,9 +122,8 @@
 
 // Test function specifically for integer matrix coercion
 // This takes doubles_matrix<> but should accept integer matrices via implicit coercion
-[[cpp4r::register]] cpp4r::doubles_matrix<>
-matrix_add_coerce_test(const cpp4r::doubles_matrix<>& x,
-                       const cpp4r::doubles_matrix<>& y) {
+[[cpp4r::register]] cpp4r::doubles_matrix<> matrix_add_coerce_test(
+    const cpp4r::doubles_matrix<>& x, const cpp4r::doubles_matrix<>& y) {
   int nrow = x.nrow();
   int ncol = x.ncol();
 
@@ -140,9 +139,8 @@ matrix_add_coerce_test(const cpp4r::doubles_matrix<>& x,
 }
 
 // Test function for integer + double mixed coercion
-[[cpp4r::register]] cpp4r::doubles_matrix<>
-matrix_mixed_add(const cpp4r::doubles_matrix<>& int_mat,
-                 const cpp4r::doubles_matrix<>& dbl_mat) {
+[[cpp4r::register]] cpp4r::doubles_matrix<> matrix_mixed_add(
+    const cpp4r::doubles_matrix<>& int_mat, const cpp4r::doubles_matrix<>& dbl_mat) {
   int nrow = int_mat.nrow();
   int ncol = int_mat.ncol();
 
diff --git a/extended-tests/cpp4rtest/src/vendor/cpp4r/matrix.hpp b/extended-tests/cpp4rtest/src/vendor/cpp4r/matrix.hpp
@@ -161,7 +161,10 @@ class matrix : public matrix_slices<S> {
       using iterator_category = std::forward_iterator_tag;
 
       iterator(const slice& s, R_xlen_t pos) : slice_(s), pos_(pos) {}
-      iterator& operator++() { ++pos_; return *this; }
+      iterator& operator++() {
+        ++pos_;
+        return *this;
+      }
       bool operator==(const iterator& rhs) const {
         return pos_ == rhs.pos_ && slice_ == rhs.slice_;
       }
@@ -185,7 +188,10 @@ class matrix : public matrix_slices<S> {
     using iterator_category = std::forward_iterator_tag;
 
     slice_iterator(const matrix& parent, R_xlen_t pos) : parent_(parent), pos_(pos) {}
-    slice_iterator& operator++() { ++pos_; return *this; }
+    slice_iterator& operator++() {
+      ++pos_;
+      return *this;
+    }
     bool operator==(const slice_iterator& rhs) const {
       return pos_ == rhs.pos_ && parent_.data() == rhs.parent_.data();
     }
@@ -194,8 +200,7 @@ class matrix : public matrix_slices<S> {
   };
 
   matrix(SEXP data)
-      : matrix_slices<S>(data),
-        vector_(detail::coerce_matrix_sexp<scalar_type>(data)) {}
+      : matrix_slices<S>(data), vector_(detail::coerce_matrix_sexp<scalar_type>(data)) {}
 
   template <typename V2, typename T2, typename S2>
   matrix(const cpp4r::matrix<V2, T2, S2>& rhs)
@@ -284,9 +289,11 @@ using integers_matrix = matrix<r_vector<int>, typename r_vector<int>::reference,
 template <typename S = by_column>
 using logicals_matrix = matrix<r_vector<r_bool>, typename r_vector<r_bool>::reference, S>;
 template <typename S = by_column>
-using strings_matrix = matrix<r_vector<r_string>, typename r_vector<r_string>::reference, S>;
+using strings_matrix =
+    matrix<r_vector<r_string>, typename r_vector<r_string>::reference, S>;
 template <typename S = by_column>
-using complexes_matrix = matrix<r_vector<r_complex>, typename r_vector<r_complex>::reference, S>;
+using complexes_matrix =
+    matrix<r_vector<r_complex>, typename r_vector<r_complex>::reference, S>;
 }  // namespace writable
 
 }  // namespace cpp4r
diff --git a/extended-tests/cpp4rtest/src/vendor/cpp4r/r_string.hpp b/extended-tests/cpp4rtest/src/vendor/cpp4r/r_string.hpp
@@ -35,7 +35,9 @@ class r_string {
     return data_.data() == rhs.data_.data();
   }
   bool operator==(const SEXP rhs) const noexcept { return data_.data() == rhs; }
-  bool operator==(const char* rhs) const { return static_cast<std::string>(*this) == rhs; }
+  bool operator==(const char* rhs) const {
+    return static_cast<std::string>(*this) == rhs;
+  }
   bool operator==(const std::string& rhs) const {
     return static_cast<std::string>(*this) == rhs;
   }
diff --git a/inst/include/cpp4r/matrix.hpp b/inst/include/cpp4r/matrix.hpp
@@ -161,7 +161,10 @@ class matrix : public matrix_slices<S> {
       using iterator_category = std::forward_iterator_tag;
 
       iterator(const slice& s, R_xlen_t pos) : slice_(s), pos_(pos) {}
-      iterator& operator++() { ++pos_; return *this; }
+      iterator& operator++() {
+        ++pos_;
+        return *this;
+      }
       bool operator==(const iterator& rhs) const {
         return pos_ == rhs.pos_ && slice_ == rhs.slice_;
       }
@@ -185,7 +188,10 @@ class matrix : public matrix_slices<S> {
     using iterator_category = std::forward_iterator_tag;
 
     slice_iterator(const matrix& parent, R_xlen_t pos) : parent_(parent), pos_(pos) {}
-    slice_iterator& operator++() { ++pos_; return *this; }
+    slice_iterator& operator++() {
+      ++pos_;
+      return *this;
+    }
     bool operator==(const slice_iterator& rhs) const {
       return pos_ == rhs.pos_ && parent_.data() == rhs.parent_.data();
     }
@@ -194,8 +200,7 @@ class matrix : public matrix_slices<S> {
   };
 
   matrix(SEXP data)
-      : matrix_slices<S>(data),
-        vector_(detail::coerce_matrix_sexp<scalar_type>(data)) {}
+      : matrix_slices<S>(data), vector_(detail::coerce_matrix_sexp<scalar_type>(data)) {}
 
   template <typename V2, typename T2, typename S2>
   matrix(const cpp4r::matrix<V2, T2, S2>& rhs)
@@ -284,9 +289,11 @@ using integers_matrix = matrix<r_vector<int>, typename r_vector<int>::reference,
 template <typename S = by_column>
 using logicals_matrix = matrix<r_vector<r_bool>, typename r_vector<r_bool>::reference, S>;
 template <typename S = by_column>
-using strings_matrix = matrix<r_vector<r_string>, typename r_vector<r_string>::reference, S>;
+using strings_matrix =
+    matrix<r_vector<r_string>, typename r_vector<r_string>::reference, S>;
 template <typename S = by_column>
-using complexes_matrix = matrix<r_vector<r_complex>, typename r_vector<r_complex>::reference, S>;
+using complexes_matrix =
+    matrix<r_vector<r_complex>, typename r_vector<r_complex>::reference, S>;
 }  // namespace writable
 
 }  // namespace cpp4r
diff --git a/inst/include/cpp4r/r_string.hpp b/inst/include/cpp4r/r_string.hpp
@@ -35,7 +35,9 @@ class r_string {
     return data_.data() == rhs.data_.data();
   }
   bool operator==(const SEXP rhs) const noexcept { return data_.data() == rhs; }
-  bool operator==(const char* rhs) const { return static_cast<std::string>(*this) == rhs; }
+  bool operator==(const char* rhs) const {
+    return static_cast<std::string>(*this) == rhs;
+  }
   bool operator==(const std::string& rhs) const {
     return static_cast<std::string>(*this) == rhs;
   }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,9 @@ class r_string {`
`35`	`35`	`return data_.data() == rhs.data_.data();`
`36`	`36`	`}`
`37`	`37`	`bool operator==(const SEXP rhs) const noexcept { return data_.data() == rhs; }`
`38`		`- bool operator==(const char* rhs) const { return static_cast<std::string>(*this) == rhs; }`
	`38`	`+ bool operator==(const char* rhs) const {`
	`39`	`+ return static_cast<std::string>(*this) == rhs;`
	`40`	`+ }`
`39`	`41`	`bool operator==(const std::string& rhs) const {`
`40`	`42`	`return static_cast<std::string>(*this) == rhs;`
`41`	`43`	`}`