Skip to content

Commit 51edf8a

Browse files
authored
bpo-38644: Cleanup ceval.h (GH-17185)
Move CPython API (Py_LIMITED_API macro not defined) from ceval.h to cpython/ceval.h
1 parent 7c6130c commit 51edf8a

File tree

2 files changed

+25
-36
lines changed

2 files changed

+25
-36
lines changed

Include/ceval.h

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,13 @@ Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallFunction(
2828
Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallMethod(
2929
PyObject *obj, const char *name, const char *format, ...);
3030

31-
#ifndef Py_LIMITED_API
32-
PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
33-
PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
34-
PyAPI_FUNC(int) _PyEval_GetCoroutineOriginTrackingDepth(void);
35-
PyAPI_FUNC(void) _PyEval_SetAsyncGenFirstiter(PyObject *);
36-
PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void);
37-
PyAPI_FUNC(void) _PyEval_SetAsyncGenFinalizer(PyObject *);
38-
PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
39-
#endif
40-
4131
struct _frame; /* Avoid including frameobject.h */
4232

4333
PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void);
4434
PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void);
4535
PyAPI_FUNC(PyObject *) PyEval_GetLocals(void);
4636
PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void);
4737

48-
#ifndef Py_LIMITED_API
49-
/* Helper to look up a builtin object */
50-
PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *);
51-
/* Look at the current frame's (if any) code's co_flags, and turn on
52-
the corresponding compiler flags in cf->cf_flags. Return 1 if any
53-
flag was set, else return 0. */
54-
PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
55-
#endif
56-
5738
PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg);
5839
PyAPI_FUNC(int) Py_MakePendingCalls(void);
5940

@@ -101,9 +82,6 @@ PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *);
10182

10283
PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *);
10384
PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc);
104-
#ifndef Py_LIMITED_API
105-
PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(struct _frame *f, int exc);
106-
#endif
10785

10886
/* Interface for threads.
10987
@@ -160,15 +138,6 @@ Py_DEPRECATED(3.2) PyAPI_FUNC(void) PyEval_AcquireLock(void);
160138
PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate);
161139
PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate);
162140

163-
#ifndef Py_LIMITED_API
164-
PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
165-
PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
166-
#endif
167-
168-
#ifndef Py_LIMITED_API
169-
PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
170-
#endif
171-
172141
#define Py_BEGIN_ALLOW_THREADS { \
173142
PyThreadState *_save; \
174143
_save = PyEval_SaveThread();
@@ -177,11 +146,6 @@ PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
177146
#define Py_END_ALLOW_THREADS PyEval_RestoreThread(_save); \
178147
}
179148

180-
#ifndef Py_LIMITED_API
181-
PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
182-
PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
183-
#endif
184-
185149
/* Masks and values used by FORMAT_VALUE opcode. */
186150
#define FVC_MASK 0x3
187151
#define FVC_NONE 0x0

Include/cpython/ceval.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,31 @@
66
extern "C" {
77
#endif
88

9+
PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *);
10+
PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *);
11+
PyAPI_FUNC(int) _PyEval_GetCoroutineOriginTrackingDepth(void);
12+
PyAPI_FUNC(void) _PyEval_SetAsyncGenFirstiter(PyObject *);
13+
PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void);
14+
PyAPI_FUNC(void) _PyEval_SetAsyncGenFinalizer(PyObject *);
15+
PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void);
16+
17+
/* Helper to look up a builtin object */
18+
PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *);
19+
/* Look at the current frame's (if any) code's co_flags, and turn on
20+
the corresponding compiler flags in cf->cf_flags. Return 1 if any
21+
flag was set, else return 0. */
22+
PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf);
23+
24+
PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(struct _frame *f, int exc);
25+
26+
PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds);
27+
PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void);
28+
29+
PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc);
30+
31+
PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *);
32+
PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *);
33+
934
PyAPI_DATA(int) _Py_CheckRecursionLimit;
1035

1136
#ifdef USE_STACKCHECK

0 commit comments

Comments
 (0)