use PY_ prefix, add Py_UNREACHABLE() to switches

carljm · Mar 6, 2023 · 239981c · 239981c
1 parent 33dda2a
commit 239981c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/Include/cpython/code.h b/Include/cpython/code.h
@@ -224,13 +224,13 @@ PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int);
 
 PyAPI_FUNC(int) PyCode_Addr2Location(PyCodeObject *, int, int *, int *, int *, int *);
 
-#define FOREACH_CODE_EVENT(V) \
+#define PY_FOREACH_CODE_EVENT(V) \
     V(CREATE)                 \
     V(DESTROY)
 
 typedef enum {
     #define DEF_EVENT(op) PY_CODE_EVENT_##op,
-    FOREACH_CODE_EVENT(DEF_EVENT)
+    PY_FOREACH_CODE_EVENT(DEF_EVENT)
     #undef DEF_EVENT
 } PyCodeEvent;
 

diff --git a/Include/cpython/dictobject.h b/Include/cpython/dictobject.h
@@ -90,17 +90,17 @@ PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
 
 /* Dictionary watchers */
 
-#define FOREACH_DICT_EVENT(V) \
-    V(ADDED)                  \
-    V(MODIFIED)               \
-    V(DELETED)                \
-    V(CLONED)                 \
-    V(CLEARED)                \
+#define PY_FOREACH_DICT_EVENT(V) \
+    V(ADDED)                     \
+    V(MODIFIED)                  \
+    V(DELETED)                   \
+    V(CLONED)                    \
+    V(CLEARED)                   \
     V(DEALLOCATED)
 
 typedef enum {
     #define DEF_EVENT(EVENT) PyDict_EVENT_##EVENT,
-    FOREACH_DICT_EVENT(DEF_EVENT)
+    PY_FOREACH_DICT_EVENT(DEF_EVENT)
     #undef DEF_EVENT
 } PyDict_WatchEvent;
 

diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h
@@ -131,16 +131,16 @@ PyAPI_DATA(PyTypeObject) PyStaticMethod_Type;
 PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *);
 PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *);
 
-#define FOREACH_FUNC_EVENT(V) \
-    V(CREATE)                 \
-    V(DESTROY)                \
-    V(MODIFY_CODE)            \
-    V(MODIFY_DEFAULTS)        \
+#define PY_FOREACH_FUNC_EVENT(V) \
+    V(CREATE)                    \
+    V(DESTROY)                   \
+    V(MODIFY_CODE)               \
+    V(MODIFY_DEFAULTS)           \
     V(MODIFY_KWDEFAULTS)
 
 typedef enum {
     #define DEF_EVENT(EVENT) PyFunction_EVENT_##EVENT,
-    FOREACH_FUNC_EVENT(DEF_EVENT)
+    PY_FOREACH_FUNC_EVENT(DEF_EVENT)
     #undef DEF_EVENT
 } PyFunction_WatchEvent;
 

diff --git a/Modules/_testcapi/watchers.c b/Modules/_testcapi/watchers.c
@@ -683,7 +683,7 @@ _PyTestCapi_Init_Watchers(PyObject *mod)
                        PyFunction_EVENT_##event)) {   \
         return -1;                                    \
     }
-    FOREACH_FUNC_EVENT(ADD_EVENT);
+    PY_FOREACH_FUNC_EVENT(ADD_EVENT);
 #undef ADD_EVENT
 
     return 0;

diff --git a/Objects/codeobject.c b/Objects/codeobject.c
@@ -19,9 +19,10 @@ code_event_name(PyCodeEvent event) {
         #define CASE(op)                \
         case PY_CODE_EVENT_##op:         \
             return "PY_CODE_EVENT_" #op;
-        FOREACH_CODE_EVENT(CASE)
+        PY_FOREACH_CODE_EVENT(CASE)
         #undef CASE
     }
+    Py_UNREACHABLE();
 }
 
 static void

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
@@ -5745,9 +5745,10 @@ dict_event_name(PyDict_WatchEvent event) {
         #define CASE(op)                \
         case PyDict_EVENT_##op:         \
             return "PyDict_EVENT_" #op;
-        FOREACH_DICT_EVENT(CASE)
+        PY_FOREACH_DICT_EVENT(CASE)
         #undef CASE
     }
+    Py_UNREACHABLE();
 }
 
 void

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -16,9 +16,10 @@ func_event_name(PyFunction_WatchEvent event) {
         #define CASE(op)                \
         case PyFunction_EVENT_##op:         \
             return "PyFunction_EVENT_" #op;
-        FOREACH_FUNC_EVENT(CASE)
+        PY_FOREACH_FUNC_EVENT(CASE)
         #undef CASE
     }
+    Py_UNREACHABLE();
 }
 
 static void