renamed a function in the detail:: namespace, super-minor tweaks

wjakob · Nov 7, 2022 · 12f17e2 · 12f17e2
1 parent e0fded4
commit 12f17e2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/include/nanobind/nb_accessor.h b/include/nanobind/nb_accessor.h
@@ -46,7 +46,7 @@ struct str_attr {
     using key_type = const char *;
 
     NB_INLINE static void get(PyObject *obj, const char *key, PyObject **cache) {
-        detail::getattr_maybe(obj, key, cache);
+        detail::getattr_or_raise(obj, key, cache);
     }
 
     NB_INLINE static void set(PyObject *obj, const char *key, PyObject *v) {
@@ -63,7 +63,7 @@ struct obj_attr {
     using key_type = handle;
 
     NB_INLINE static void get(PyObject *obj, handle key, PyObject **cache) {
-        detail::getattr_maybe(obj, key.ptr(), cache);
+        detail::getattr_or_raise(obj, key.ptr(), cache);
     }
 
     NB_INLINE static void set(PyObject *obj, handle key, PyObject *v) {
@@ -81,7 +81,7 @@ struct str_item {
     using key_type = const char *;
 
     NB_INLINE static void get(PyObject *obj, const char *key, PyObject **cache) {
-        detail::getitem_maybe(obj, key, cache);
+        detail::getitem_or_raise(obj, key, cache);
     }
 
     NB_INLINE static void set(PyObject *obj, const char *key, PyObject *v) {
@@ -94,7 +94,7 @@ struct obj_item {
     using key_type = handle;
 
     NB_INLINE static void get(PyObject *obj, handle key, PyObject **cache) {
-        detail::getitem_maybe(obj, key.ptr(), cache);
+        detail::getitem_or_raise(obj, key.ptr(), cache);
     }
 
     NB_INLINE static void set(PyObject *obj, handle key, PyObject *v) {
@@ -107,7 +107,7 @@ struct num_item {
     using key_type = Py_ssize_t;
 
     NB_INLINE static void get(PyObject *obj, Py_ssize_t index, PyObject **cache) {
-        detail::getitem_maybe(obj, index, cache);
+        detail::getitem_or_raise(obj, index, cache);
     }
 
     NB_INLINE static void set(PyObject *obj, Py_ssize_t index, PyObject *v) {

diff --git a/include/nanobind/nb_lib.h b/include/nanobind/nb_lib.h
@@ -124,8 +124,8 @@ NB_CORE PyObject *getattr(PyObject *obj, const char *key, PyObject *def) noexcep
 NB_CORE PyObject *getattr(PyObject *obj, PyObject *key, PyObject *def) noexcept;
 
 /// Get an object attribute or raise an exception. Skip if 'out' is non-null
-NB_CORE void getattr_maybe(PyObject *obj, const char *key, PyObject **out);
-NB_CORE void getattr_maybe(PyObject *obj, PyObject *key, PyObject **out);
+NB_CORE void getattr_or_raise(PyObject *obj, const char *key, PyObject **out);
+NB_CORE void getattr_or_raise(PyObject *obj, PyObject *key, PyObject **out);
 
 /// Set an object attribute / item
 NB_CORE void setattr(PyObject *obj, const char *key, PyObject *value);
@@ -134,9 +134,9 @@ NB_CORE void setattr(PyObject *obj, PyObject *key, PyObject *value);
 // ========================================================================
 
 /// Index into an object or raise an exception. Skip if 'out' is non-null
-NB_CORE void getitem_maybe(PyObject *obj, Py_ssize_t, PyObject **out);
-NB_CORE void getitem_maybe(PyObject *obj, const char *key, PyObject **out);
-NB_CORE void getitem_maybe(PyObject *obj, PyObject *key, PyObject **out);
+NB_CORE void getitem_or_raise(PyObject *obj, Py_ssize_t, PyObject **out);
+NB_CORE void getitem_or_raise(PyObject *obj, const char *key, PyObject **out);
+NB_CORE void getitem_or_raise(PyObject *obj, PyObject *key, PyObject **out);
 
 /// Set an item or raise an exception
 NB_CORE void setitem(PyObject *obj, Py_ssize_t, PyObject *value);

diff --git a/src/common.cpp b/src/common.cpp
@@ -301,7 +301,7 @@ PyObject *getattr(PyObject *obj, PyObject *key, PyObject *def) noexcept {
     return def;
 }
 
-void getattr_maybe(PyObject *obj, const char *key, PyObject **out) {
+void getattr_or_raise(PyObject *obj, const char *key, PyObject **out) {
     if (*out)
         return;
 
@@ -312,7 +312,7 @@ void getattr_maybe(PyObject *obj, const char *key, PyObject **out) {
     *out = res;
 }
 
-void getattr_maybe(PyObject *obj, PyObject *key, PyObject **out) {
+void getattr_or_raise(PyObject *obj, PyObject *key, PyObject **out) {
     if (*out)
         return;
 
@@ -337,7 +337,7 @@ void setattr(PyObject *obj, PyObject *key, PyObject *value) {
 
 // ========================================================================
 
-void getitem_maybe(PyObject *obj, Py_ssize_t key, PyObject **out) {
+void getitem_or_raise(PyObject *obj, Py_ssize_t key, PyObject **out) {
     if (*out)
         return;
 
@@ -348,7 +348,7 @@ void getitem_maybe(PyObject *obj, Py_ssize_t key, PyObject **out) {
     *out = res;
 }
 
-void getitem_maybe(PyObject *obj, const char *key_, PyObject **out) {
+void getitem_or_raise(PyObject *obj, const char *key_, PyObject **out) {
     if (*out)
         return;
 
@@ -367,7 +367,7 @@ void getitem_maybe(PyObject *obj, const char *key_, PyObject **out) {
     *out = res;
 }
 
-void getitem_maybe(PyObject *obj, PyObject *key, PyObject **out) {
+void getitem_or_raise(PyObject *obj, PyObject *key, PyObject **out) {
     if (*out)
         return;
 
@@ -707,6 +707,8 @@ bool load_f64(PyObject *o, uint8_t flags, double *out) noexcept {
         *out = (double) PyFloat_AS_DOUBLE(o);
         return true;
     }
+
+    is_float = false;
 #endif
 
     if (is_float || (flags & (uint8_t) cast_flags::convert)) {
@@ -731,6 +733,8 @@ bool load_f32(PyObject *o, uint8_t flags, float *out) noexcept {
         *out = (float) PyFloat_AS_DOUBLE(o);
         return true;
     }
+
+    is_float = false;
 #endif
 
     if (is_float || (flags & (uint8_t) cast_flags::convert)) {