Repository navigation
Commit 9c03215
authored
Move PyUnstable_ExecutableKinds and associated macros from the
internal C API to the public C API.
Rename constants: replace "PY_" prefix with "PyUnstable_" prefix.
1 parent b89b838 commit 9c03215
3 files changed
Lines changed: 14 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,3 +33,11 @@ PyAPI_FUNC(int) PyUnstable_InterpreterFrame_GetLasti(struct _PyInterpreterFrame | |||
| 33 | 33 | /* Returns the currently executing line number, or -1 if there is no line number. | |
| 34 | 34 | * Does not raise an exception. */ | |
| 35 | 35 | PyAPI_FUNC(int) PyUnstable_InterpreterFrame_GetLine(struct _PyInterpreterFrame *frame); | |
| 36 | + | ||
| 37 | + #define PyUnstable_EXECUTABLE_KIND_SKIP 0 | ||
| 38 | + #define PyUnstable_EXECUTABLE_KIND_PY_FUNCTION 1 | ||
| 39 | + #define PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION 3 | ||
| 40 | + #define PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR 4 | ||
| 41 | + #define PyUnstable_EXECUTABLE_KINDS 5 | ||
| 42 | + | ||
| 43 | + PyAPI_DATA(const PyTypeObject *) const PyUnstable_ExecutableKinds[PyUnstable_EXECUTABLE_KINDS+1]; | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -311,14 +311,6 @@ PyGenObject *_PyFrame_GetGenerator(_PyInterpreterFrame *frame) | |||
| 311 | 311 | return (PyGenObject *)(((char *)frame) - offset_in_gen); | |
| 312 | 312 | } | |
| 313 | 313 | ||
| 314 | - #define PY_EXECUTABLE_KIND_SKIP 0 | ||
| 315 | - #define PY_EXECUTABLE_KIND_PY_FUNCTION 1 | ||
| 316 | - #define PY_EXECUTABLE_KIND_BUILTIN_FUNCTION 3 | ||
| 317 | - #define PY_EXECUTABLE_KIND_METHOD_DESCRIPTOR 4 | ||
| 318 | - #define PY_EXECUTABLE_KINDS 5 | ||
| 319 | - | ||
| 320 | - PyAPI_DATA(const PyTypeObject *) const PyUnstable_ExecutableKinds[PY_EXECUTABLE_KINDS+1]; | ||
| 321 | - | ||
| 322 | 314 | #ifdef __cplusplus | |
| 323 | 315 | } | |
| 324 | 316 | #endif | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -167,10 +167,10 @@ PyUnstable_InterpreterFrame_GetLine(_PyInterpreterFrame *frame) | |||
| 167 | 167 | return PyCode_Addr2Line(_PyFrame_GetCode(frame), addr); | |
| 168 | 168 | } | |
| 169 | 169 | ||
| 170 | - const PyTypeObject *const PyUnstable_ExecutableKinds[PY_EXECUTABLE_KINDS+1] = { | ||
| 171 | - [PY_EXECUTABLE_KIND_SKIP] = &_PyNone_Type, | ||
| 172 | - [PY_EXECUTABLE_KIND_PY_FUNCTION] = &PyCode_Type, | ||
| 173 | - [PY_EXECUTABLE_KIND_BUILTIN_FUNCTION] = &PyMethod_Type, | ||
| 174 | - [PY_EXECUTABLE_KIND_METHOD_DESCRIPTOR] = &PyMethodDescr_Type, | ||
| 175 | - [PY_EXECUTABLE_KINDS] = NULL, | ||
| 170 | + const PyTypeObject *const PyUnstable_ExecutableKinds[PyUnstable_EXECUTABLE_KINDS+1] = { | ||
| 171 | + [PyUnstable_EXECUTABLE_KIND_SKIP] = &_PyNone_Type, | ||
| 172 | + [PyUnstable_EXECUTABLE_KIND_PY_FUNCTION] = &PyCode_Type, | ||
| 173 | + [PyUnstable_EXECUTABLE_KIND_BUILTIN_FUNCTION] = &PyMethod_Type, | ||
| 174 | + [PyUnstable_EXECUTABLE_KIND_METHOD_DESCRIPTOR] = &PyMethodDescr_Type, | ||
| 175 | + [PyUnstable_EXECUTABLE_KINDS] = NULL, | ||
| 176 | 176 | }; | |
0 commit comments