rollback noexcept

pachadotdev · pachadotdev · commit b0b3f472b28b · 2025-05-09T19:11:38.000-04:00
diff --git a/inst/include/cpp11/attribute_proxy.hpp b/inst/include/cpp11/attribute_proxy.hpp
@@ -42,7 +42,7 @@ class attribute_proxy {
     return *this;
   }
 
-  operator SEXP() const noexcept { return safe[Rf_getAttrib](parent_.data(), symbol_); }
+  operator SEXP() const { return safe[Rf_getAttrib](parent_.data(), symbol_); }
 };
 
 }  // namespace cpp11
diff --git a/inst/include/cpp11/data_frame.hpp b/inst/include/cpp11/data_frame.hpp
@@ -35,8 +35,7 @@ class data_frame : public list {
     return R_NilValue;
   }
 
-  // @pachadotdev: + noexcept
-  static R_xlen_t calc_nrow(SEXP x) noexcept {
+  static R_xlen_t calc_nrow(SEXP x) {
     auto nms = get_attrib0(x, R_RowNamesSymbol);
     bool has_short_rownames =
         (Rf_isInteger(nms) && Rf_xlength(nms) == 2 && INTEGER(nms)[0] == NA_INTEGER);
@@ -59,8 +58,8 @@ class data_frame : public list {
   /* Adapted from
    * https://github.com/wch/r-source/blob/f2a0dfab3e26fb42b8b296fcba40cbdbdbec767d/src/main/attrib.c#L198-L207
    */
-  R_xlen_t nrow() const noexcept { return calc_nrow(*this); }
-  R_xlen_t ncol() const noexcept { return size(); }
+  R_xlen_t nrow() const { return calc_nrow(*this); }
+  R_xlen_t ncol() const { return size(); }
 };
 
 namespace writable {
@@ -90,16 +89,15 @@ class data_frame : public cpp11::data_frame {
   using cpp11::data_frame::ncol;
   using cpp11::data_frame::nrow;
 
-  // @pachadotdev: + noexcept
-  attribute_proxy<data_frame> attr(const char* name) const noexcept const {
+  attribute_proxy<data_frame> attr(const char* name) const const {
     return {*this, name};
   }
 
-  attribute_proxy<data_frame> attr(const std::string& name) const noexcept {
+  attribute_proxy<data_frame> attr(const std::string& name) const {
     return {*this, name.c_str()};
   }
 
-  attribute_proxy<data_frame> attr(SEXP name) const noexcept { return {*this, name}; }
+  attribute_proxy<data_frame> attr(SEXP name) const { return {*this, name}; }
 
   attribute_proxy<data_frame> names() const { return {*this, R_NamesSymbol}; }
 };
diff --git a/inst/include/cpp11/doubles.hpp b/inst/include/cpp11/doubles.hpp
@@ -16,7 +16,7 @@
 namespace cpp11 {
 
 template <>
-inline constexpr SEXPTYPE r_vector<double>::get_sexptype() {
+inline SEXPTYPE r_vector<double>::get_sexptype() {
   return REALSXP;
 }
 
diff --git a/inst/include/cpp11/environment.hpp b/inst/include/cpp11/environment.hpp
@@ -48,10 +48,9 @@ class environment {
 
   void remove(const char* name) { remove(safe[Rf_install](name)); }
 
-  // @pachadotdev: + noexcept
-  R_xlen_t size() const noexcept { return Rf_xlength(env_); }
+  R_xlen_t size() const { return Rf_xlength(env_); }
 
-  operator SEXP() const noexcept { return env_; }
+  operator SEXP() const { return env_; }
 };
 
 }  // namespace cpp11
diff --git a/inst/include/cpp11/external_pointer.hpp b/inst/include/cpp11/external_pointer.hpp
@@ -12,9 +12,8 @@
 
 namespace cpp11 {
 
-// @pachadotdev: + noexcept
 template <typename T>
-void default_deleter(T* obj) noexcept {
+void default_deleter(T* obj) {
   delete obj;
 }
 
@@ -34,8 +33,7 @@ class external_pointer {
     return data;
   }
 
-  // @pachadotdev: + noexcept
-  static void r_deleter(SEXP p) noexcept {
+  static void r_deleter(SEXP p) {
     if (detail::r_typeof(p) != EXTPTRSXP) return;
 
     T* ptr = static_cast<T*>(R_ExternalPtrAddr(p));
diff --git a/inst/include/cpp11/integers.hpp b/inst/include/cpp11/integers.hpp
@@ -17,7 +17,7 @@
 namespace cpp11 {
 
 template <>
-inline constexpr SEXPTYPE r_vector<int>::get_sexptype() {
+inline SEXPTYPE r_vector<int>::get_sexptype() {
   return INTSXP;
 }
 
diff --git a/inst/include/cpp11/list.hpp b/inst/include/cpp11/list.hpp
@@ -14,7 +14,7 @@
 namespace cpp11 {
 
 template <>
-inline constexpr SEXPTYPE r_vector<SEXP>::get_sexptype() {
+inline SEXPTYPE r_vector<SEXP>::get_sexptype() {
   return VECSXP;
 }
 
diff --git a/inst/include/cpp11/logicals.hpp b/inst/include/cpp11/logicals.hpp
@@ -16,7 +16,7 @@
 namespace cpp11 {
 
 template <>
-inline constexpr SEXPTYPE r_vector<r_bool>::get_sexptype() {
+inline SEXPTYPE r_vector<r_bool>::get_sexptype() {
   return LGLSXP;
 }
 
diff --git a/inst/include/cpp11/matrix.hpp b/inst/include/cpp11/matrix.hpp
@@ -184,10 +184,9 @@ class matrix : public matrix_slices<S> {
 
   SEXP data() const { return vector_.data(); }
 
-  // @pachadotdev: + noexcept
-  R_xlen_t size() const noexcept { return vector_.size(); }
+  R_xlen_t size() const { return vector_.size(); }
 
-  operator SEXP() const noexcept { return SEXP(vector_); }
+  operator SEXP() const { return SEXP(vector_); }
 
   // operator sexp() { return sexp(vector_); }
 
diff --git a/inst/include/cpp11/named_arg.hpp b/inst/include/cpp11/named_arg.hpp
@@ -11,8 +11,7 @@
 namespace cpp11 {
 class named_arg {
  public:
-  // @pachadotdev: + noexcept
-  explicit named_arg(const char* name) noexcept : name_(name), value_(R_NilValue) {}
+  explicit named_arg(const char* name) : name_(name), value_(R_NilValue) {}
   named_arg& operator=(std::initializer_list<int> il) {
     value_ = as_sexp(il);
     return *this;
@@ -40,8 +39,7 @@ class named_arg {
 
 namespace literals {
 
-// @pachadotdev: + noexcept
-inline named_arg operator""_nm(const char* name, std::size_t) noexcept {
+inline named_arg operator""_nm(const char* name, std::size_t) {
   return named_arg(name);
 }
 
diff --git a/inst/include/cpp11/protect.hpp b/inst/include/cpp11/protect.hpp
@@ -186,8 +186,7 @@ struct protect {
 };
 constexpr struct protect safe = {};
 
-// @pachadotdev: + noexcept
-inline void check_user_interrupt() noexcept { safe[R_CheckUserInterrupt](); }
+inline void check_user_interrupt() { safe[R_CheckUserInterrupt](); }
 
 #ifdef CPP11_USE_FMT
 template <typename... Args>
diff --git a/inst/include/cpp11/r_vector.hpp b/inst/include/cpp11/r_vector.hpp
@@ -65,9 +65,8 @@ class r_vector {
   r_vector& operator=(const r_vector& rhs);
   r_vector& operator=(r_vector&& rhs);
 
-  // @pachadotdev: + noexcept
-  operator SEXP() noexcept const;
-  operator sexp() noexcept const;
+  operator SEXP() const;
+  operator sexp() const;
 
 #ifdef LONG_VECTOR_SUPPORT
   T operator[](const int pos) const;
@@ -86,22 +85,20 @@ class r_vector {
   bool contains(const r_string& name) const;
   bool is_altrep() const;
   bool named() const;
-  // @pachadotdev: + noexcept
   R_xlen_t size() noexcept const;
-  bool empty() no except const;
-  SEXP data() noexcept const;
+  bool empty() const;
+  SEXP data() const;
 
   const sexp attr(const char* name) const;
   const sexp attr(const std::string& name) const;
   const sexp attr(SEXP name) const;
 
   r_vector<r_string> names() const;
 
-  // @pachadotdev: + noexcept
-  const_iterator begin() noexcept const;
-  const_iterator end() noexcept const;
-  const_iterator cbegin() noexcept const;
-  const_iterator cend() noexcept const;
+  const_iterator begin() const;
+  const_iterator end() const;
+  const_iterator cbegin() const;
+  const_iterator cend() const;
   const_iterator find(const r_string& name) const;
 
   class const_iterator {
@@ -451,15 +448,13 @@ inline r_vector<T>& r_vector<T>::operator=(r_vector&& rhs) {
   return *this;
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline r_vector<T>::operator SEXP() const noexcept {
+inline r_vector<T>::operator SEXP() const {
   return data_;
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline r_vector<T>::operator sexp() const noexcept {
+inline r_vector<T>::operator sexp() const {
   return data_;
 }
 
@@ -641,27 +636,23 @@ inline SEXP r_vector<T>::valid_length(SEXP x, R_xlen_t n) {
   throw std::length_error(message);
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline typename r_vector<T>::const_iterator r_vector<T>::begin() const noexcept {
+inline typename r_vector<T>::const_iterator r_vector<T>::begin() const {
   return const_iterator(this, 0);
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline typename r_vector<T>::const_iterator r_vector<T>::end() const noexcept {
+inline typename r_vector<T>::const_iterator r_vector<T>::end() const {
   return const_iterator(this, length_);
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline typename r_vector<T>::const_iterator r_vector<T>::cbegin() const noexcept {
+inline typename r_vector<T>::const_iterator r_vector<T>::cbegin() const {
   return const_iterator(this, 0);
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline typename r_vector<T>::const_iterator r_vector<T>::cend() const noexcept {
+inline typename r_vector<T>::const_iterator r_vector<T>::cend() const {
   return const_iterator(this, length_);
 }
 
@@ -1079,9 +1070,8 @@ inline void r_vector<T>::push_back(T value) {
   ++length_;
 }
 
-// @pachadotdev: + noexcept
 template <typename T>
-inline void r_vector<T>::pop_back() noexcept {
+inline void r_vector<T>::pop_back() {
   --length_;
 }
 
@@ -1138,7 +1128,7 @@ inline typename r_vector<T>::iterator r_vector<T>::erase(R_xlen_t pos) {
 }
 
 template <typename T>
-inline void r_vector<T>::clear() noexcept {
+inline void r_vector<T>::clear() {
   length_ = 0;
 }
 
diff --git a/inst/include/cpp11/raws.hpp b/inst/include/cpp11/raws.hpp
@@ -67,10 +67,9 @@ typedef r_vector<uint8_t> raws;
 
 namespace writable {
 
-// @pachadotdev: + noexcept
 template <>
 inline void r_vector<uint8_t>::set_elt(
-    SEXP x, R_xlen_t i, typename r_vector::underlying_type value) noexcept {
+    SEXP x, R_xlen_t i, typename r_vector::underlying_type value) {
   // NOPROTECT: Likely too costly to unwind protect every set elt
 #if R_VERSION >= R_Version(4, 2, 0)
   SET_RAW_ELT(x, i, value);
diff --git a/inst/include/cpp11/sexp.hpp b/inst/include/cpp11/sexp.hpp
@@ -64,17 +64,15 @@ class sexp {
     return attribute_proxy<sexp>(*this, R_NamesSymbol);
   }
 
-  // @pachadotdev: + noexcept
-  operator SEXP() const noexcept { return data_; }
-  SEXP data() const noexcept { return data_; }
+  operator SEXP() const { return data_; }
+  SEXP data() const { return data_; }
 
-  // @pachadotdev: + noexcept
   /// DEPRECATED: Do not use this, it will be removed soon.
-  operator double() const noexcept { return REAL_ELT(data_, 0); }
+  operator double() const { return REAL_ELT(data_, 0); }
   /// DEPRECATED: Do not use this, it will be removed soon.
-  operator size_t() const noexcept { returnv REAL_ELT(data_, 0); }
+  operator size_t() const { returnv REAL_ELT(data_, 0); }
   /// DEPRECATED: Do not use this, it will be removed soon.
-  operator bool() const noexcept { return LOGICAL_ELT(data_, 0); }
+  operator bool() const { return LOGICAL_ELT(data_, 0); }
 };
 
 }  // namespace cpp11

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class attribute_proxy {`
`42`	`42`	`return *this;`
`43`	`43`	`}`
`44`	`44`
`45`		`- operator SEXP() const noexcept { return safe[Rf_getAttrib](parent_.data(), symbol_); }`
	`45`	`+ operator SEXP() const { return safe[Rf_getAttrib](parent_.data(), symbol_); }`
`46`	`46`	`};`
`47`	`47`
`48`	`48`	`} // namespace cpp11`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`namespace cpp11 {`
`17`	`17`
`18`	`18`	`template <>`
`19`		`-inline constexpr SEXPTYPE r_vector<double>::get_sexptype() {`
	`19`	`+inline SEXPTYPE r_vector<double>::get_sexptype() {`
`20`	`20`	`return REALSXP;`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`namespace cpp11 {`
`18`	`18`
`19`	`19`	`template <>`
`20`		`-inline constexpr SEXPTYPE r_vector<int>::get_sexptype() {`
	`20`	`+inline SEXPTYPE r_vector<int>::get_sexptype() {`
`21`	`21`	`return INTSXP;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`namespace cpp11 {`
`15`	`15`
`16`	`16`	`template <>`
`17`		`-inline constexpr SEXPTYPE r_vector<SEXP>::get_sexptype() {`
	`17`	`+inline SEXPTYPE r_vector<SEXP>::get_sexptype() {`
`18`	`18`	`return VECSXP;`
`19`	`19`	`}`
`20`	`20`