mirror of
https://github.com/python/cpython
synced 2024-10-14 15:57:14 +00:00
bpo-35134: Add Include/cpython/complexobject.h header (GH-32383)
Move the private _PyComplex_FormatAdvancedWriter() function to the internal C API. This function is no longer exported.
This commit is contained in:
parent
612e422c6e
commit
ca219f6dfc
|
@ -6,61 +6,22 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef Py_LIMITED_API
|
|
||||||
typedef struct {
|
|
||||||
double real;
|
|
||||||
double imag;
|
|
||||||
} Py_complex;
|
|
||||||
|
|
||||||
/* Operations on complex numbers from complexmodule.c */
|
|
||||||
|
|
||||||
PyAPI_FUNC(Py_complex) _Py_c_sum(Py_complex, Py_complex);
|
|
||||||
PyAPI_FUNC(Py_complex) _Py_c_diff(Py_complex, Py_complex);
|
|
||||||
PyAPI_FUNC(Py_complex) _Py_c_neg(Py_complex);
|
|
||||||
PyAPI_FUNC(Py_complex) _Py_c_prod(Py_complex, Py_complex);
|
|
||||||
PyAPI_FUNC(Py_complex) _Py_c_quot(Py_complex, Py_complex);
|
|
||||||
PyAPI_FUNC(Py_complex) _Py_c_pow(Py_complex, Py_complex);
|
|
||||||
PyAPI_FUNC(double) _Py_c_abs(Py_complex);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Complex object interface */
|
/* Complex object interface */
|
||||||
|
|
||||||
/*
|
|
||||||
PyComplexObject represents a complex number with double-precision
|
|
||||||
real and imaginary parts.
|
|
||||||
*/
|
|
||||||
#ifndef Py_LIMITED_API
|
|
||||||
typedef struct {
|
|
||||||
PyObject_HEAD
|
|
||||||
Py_complex cval;
|
|
||||||
} PyComplexObject;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
PyAPI_DATA(PyTypeObject) PyComplex_Type;
|
PyAPI_DATA(PyTypeObject) PyComplex_Type;
|
||||||
|
|
||||||
#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type)
|
#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type)
|
||||||
#define PyComplex_CheckExact(op) Py_IS_TYPE(op, &PyComplex_Type)
|
#define PyComplex_CheckExact(op) Py_IS_TYPE(op, &PyComplex_Type)
|
||||||
|
|
||||||
#ifndef Py_LIMITED_API
|
|
||||||
PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex);
|
|
||||||
#endif
|
|
||||||
PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag);
|
PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag);
|
||||||
|
|
||||||
PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op);
|
PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op);
|
||||||
PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op);
|
PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op);
|
||||||
#ifndef Py_LIMITED_API
|
|
||||||
PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Format the object based on the format_spec, as defined in PEP 3101
|
|
||||||
(Advanced String Formatting). */
|
|
||||||
#ifndef Py_LIMITED_API
|
#ifndef Py_LIMITED_API
|
||||||
PyAPI_FUNC(int) _PyComplex_FormatAdvancedWriter(
|
# define Py_CPYTHON_COMPLEXOBJECT_H
|
||||||
_PyUnicodeWriter *writer,
|
# include "cpython/complexobject.h"
|
||||||
PyObject *obj,
|
# undef Py_CPYTHON_COMPLEXOBJECT_H
|
||||||
PyObject *format_spec,
|
|
||||||
Py_ssize_t start,
|
|
||||||
Py_ssize_t end);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
44
Include/cpython/complexobject.h
Normal file
44
Include/cpython/complexobject.h
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
#ifndef Py_CPYTHON_COMPLEXOBJECT_H
|
||||||
|
# error "this header file must not be included directly"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
double real;
|
||||||
|
double imag;
|
||||||
|
} Py_complex;
|
||||||
|
|
||||||
|
/* Operations on complex numbers from complexmodule.c */
|
||||||
|
|
||||||
|
PyAPI_FUNC(Py_complex) _Py_c_sum(Py_complex, Py_complex);
|
||||||
|
PyAPI_FUNC(Py_complex) _Py_c_diff(Py_complex, Py_complex);
|
||||||
|
PyAPI_FUNC(Py_complex) _Py_c_neg(Py_complex);
|
||||||
|
PyAPI_FUNC(Py_complex) _Py_c_prod(Py_complex, Py_complex);
|
||||||
|
PyAPI_FUNC(Py_complex) _Py_c_quot(Py_complex, Py_complex);
|
||||||
|
PyAPI_FUNC(Py_complex) _Py_c_pow(Py_complex, Py_complex);
|
||||||
|
PyAPI_FUNC(double) _Py_c_abs(Py_complex);
|
||||||
|
|
||||||
|
/* Complex object interface */
|
||||||
|
|
||||||
|
/*
|
||||||
|
PyComplexObject represents a complex number with double-precision
|
||||||
|
real and imaginary parts.
|
||||||
|
*/
|
||||||
|
typedef struct {
|
||||||
|
PyObject_HEAD
|
||||||
|
Py_complex cval;
|
||||||
|
} PyComplexObject;
|
||||||
|
|
||||||
|
PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex);
|
||||||
|
|
||||||
|
PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op);
|
||||||
|
|
||||||
|
#ifdef Py_BUILD_CORE
|
||||||
|
/* Format the object based on the format_spec, as defined in PEP 3101
|
||||||
|
(Advanced String Formatting). */
|
||||||
|
extern int _PyComplex_FormatAdvancedWriter(
|
||||||
|
_PyUnicodeWriter *writer,
|
||||||
|
PyObject *obj,
|
||||||
|
PyObject *format_spec,
|
||||||
|
Py_ssize_t start,
|
||||||
|
Py_ssize_t end);
|
||||||
|
#endif // Py_BUILD_CORE
|
|
@ -1522,6 +1522,7 @@ PYTHON_HEADERS= \
|
||||||
$(srcdir)/Include/cpython/classobject.h \
|
$(srcdir)/Include/cpython/classobject.h \
|
||||||
$(srcdir)/Include/cpython/code.h \
|
$(srcdir)/Include/cpython/code.h \
|
||||||
$(srcdir)/Include/cpython/compile.h \
|
$(srcdir)/Include/cpython/compile.h \
|
||||||
|
$(srcdir)/Include/cpython/complexobject.h \
|
||||||
$(srcdir)/Include/cpython/context.h \
|
$(srcdir)/Include/cpython/context.h \
|
||||||
$(srcdir)/Include/cpython/descrobject.h \
|
$(srcdir)/Include/cpython/descrobject.h \
|
||||||
$(srcdir)/Include/cpython/dictobject.h \
|
$(srcdir)/Include/cpython/dictobject.h \
|
||||||
|
|
|
@ -141,6 +141,7 @@
|
||||||
<ClInclude Include="..\Include\cpython\classobject.h" />
|
<ClInclude Include="..\Include\cpython\classobject.h" />
|
||||||
<ClInclude Include="..\Include\cpython\code.h" />
|
<ClInclude Include="..\Include\cpython\code.h" />
|
||||||
<ClInclude Include="..\Include\cpython\compile.h" />
|
<ClInclude Include="..\Include\cpython\compile.h" />
|
||||||
|
<ClInclude Include="..\Include\cpython\complexobject.h" />
|
||||||
<ClInclude Include="..\Include\cpython\context.h" />
|
<ClInclude Include="..\Include\cpython\context.h" />
|
||||||
<ClInclude Include="..\Include\cpython\descrobject.h" />
|
<ClInclude Include="..\Include\cpython\descrobject.h" />
|
||||||
<ClInclude Include="..\Include\cpython\dictobject.h" />
|
<ClInclude Include="..\Include\cpython\dictobject.h" />
|
||||||
|
|
|
@ -357,6 +357,9 @@
|
||||||
<ClInclude Include="..\Include\cpython\compile.h">
|
<ClInclude Include="..\Include\cpython\compile.h">
|
||||||
<Filter>Include</Filter>
|
<Filter>Include</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\Include\cpython\complexobject.h">
|
||||||
|
<Filter>Include</Filter>
|
||||||
|
</ClInclude>
|
||||||
<ClInclude Include="..\Include\cpython\context.h">
|
<ClInclude Include="..\Include\cpython\context.h">
|
||||||
<Filter>Include\cpython</Filter>
|
<Filter>Include\cpython</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
|
Loading…
Reference in a new issue