Merge pull request #1830 from deantvv/ffi-cleanup-0825

ffi cleanup: pystrtod to pythonrun
PyO3 · Aug 28, 2021 · cf0e8a6 · cf0e8a6
2 parents 9c03227 + 86dacd4
commit cf0e8a6
Show file tree

Hide file tree

Showing 6 changed files with 308 additions and 169 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Deprecate `PyTuple::split_from`. [#1804](https://github.com/PyO3/pyo3/pull/1804)
 - Deprecate `PyTuple::slice`, new method `PyTuple::get_slice` added with `usize` indices. [#1828](https://github.com/PyO3/pyo3/pull/1828)
 - Mark `PyString::data` as `unsafe` and disable it and some supporting PyUnicode FFI APIs (which depend on a C bitfield) on big-endian targets. [#1834](https://github.com/PyO3/pyo3/pull/1834)
+- Deprecate FFI definitions `PyParser_SimpleParseStringFlags`, `PyParser_SimpleParseStringFlagsFilename`, `PyParser_SimpleParseFileFlags` when building for Python 3.9. [#1830](https://github.com/PyO3/pyo3/pull/1830)
+- Mark FFI definitions removed in Python 3.10 `PyParser_ASTFromString`, `PyParser_ASTFromStringObject`, `PyParser_ASTFromFile`, `PyParser_ASTFromFileObject`, `PyParser_SimpleParseStringFlags`, `PyParser_SimpleParseStringFlagsFilename`, `PyParser_SimpleParseFileFlags`, `PyParser_SimpleParseString`, `PyParser_SimpleParseFile`, `Py_SymtableString`, and `Py_SymtableStringObject`. [#1830](https://github.com/PyO3/pyo3/pull/1830)
+
 
 ## [0.14.3] - 2021-08-22
 

diff --git a/src/ffi/cpython/compile.rs b/src/ffi/cpython/compile.rs
@@ -1,8 +1,14 @@
+#[cfg(not(Py_3_10))]
 use crate::ffi::object::PyObject;
+#[cfg(not(Py_3_10))]
 use crate::ffi::pyarena::*;
+#[cfg(not(Py_3_10))]
 use crate::ffi::pythonrun::*;
+#[cfg(not(Py_3_10))]
 use crate::ffi::PyCodeObject;
-use std::os::raw::{c_char, c_int};
+#[cfg(not(Py_3_10))]
+use std::os::raw::c_char;
+use std::os::raw::c_int;
 
 // skipped non-limited PyCF_MASK
 // skipped non-limited PyCF_MASK_OBSOLETE
@@ -36,8 +42,10 @@ pub const FUTURE_GENERATOR_STOP: &str = "generator_stop";
 // skipped non-limited FUTURE_ANNOTATIONS
 
 extern "C" {
+    #[cfg(not(Py_3_10))]
     pub fn PyNode_Compile(arg1: *mut _node, arg2: *const c_char) -> *mut PyCodeObject;
 
+    #[cfg(not(Py_3_10))]
     pub fn PyAST_CompileEx(
         _mod: *mut _mod,
         filename: *const c_char,
@@ -46,6 +54,7 @@ extern "C" {
         arena: *mut PyArena,
     ) -> *mut PyCodeObject;
 
+    #[cfg(not(Py_3_10))]
     pub fn PyAST_CompileObject(
         _mod: *mut _mod,
         filename: *mut PyObject,
@@ -54,8 +63,10 @@ extern "C" {
         arena: *mut PyArena,
     ) -> *mut PyCodeObject;
 
+    #[cfg(not(Py_3_10))]
     pub fn PyFuture_FromAST(_mod: *mut _mod, filename: *const c_char) -> *mut PyFutureFeatures;
 
+    #[cfg(not(Py_3_10))]
     pub fn PyFuture_FromASTObject(
         _mod: *mut _mod,
         filename: *mut PyObject,

diff --git a/src/ffi/cpython/mod.rs b/src/ffi/cpython/mod.rs
@@ -20,6 +20,7 @@ pub(crate) mod pydebug;
 #[cfg(all(Py_3_8, not(PyPy)))]
 pub(crate) mod pylifecycle;
 pub(crate) mod pystate;
+pub(crate) mod pythonrun;
 pub(crate) mod unicodeobject;
 
 pub use self::abstract_::*;
@@ -41,4 +42,5 @@ pub use self::pydebug::*;
 #[cfg(all(Py_3_8, not(PyPy)))]
 pub use self::pylifecycle::*;
 pub use self::pystate::*;
+pub use self::pythonrun::*;
 pub use self::unicodeobject::*;
diff --git a/src/ffi/cpython/pythonrun.rs b/src/ffi/cpython/pythonrun.rs
@@ -0,0 +1,253 @@
+use crate::ffi::object::*;
+#[cfg(all(not(Py_LIMITED_API), not(Py_3_10)))]
+use crate::ffi::pyarena::PyArena;
+use crate::ffi::PyCompilerFlags;
+#[cfg(not(Py_3_10))]
+use crate::ffi::{_mod, _node};
+use libc::FILE;
+use std::os::raw::{c_char, c_int};
+
+extern "C" {
+    pub fn PyRun_SimpleStringFlags(arg1: *const c_char, arg2: *mut PyCompilerFlags) -> c_int;
+    pub fn _PyRun_SimpleFileObject(
+        fp: *mut FILE,
+        filename: *mut PyObject,
+        closeit: c_int,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn PyRun_AnyFileExFlags(
+        fp: *mut FILE,
+        filename: *const c_char,
+        closeit: c_int,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn _PyRun_AnyFileObject(
+        fp: *mut FILE,
+        filename: *mut PyObject,
+        closeit: c_int,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn PyRun_SimpleFileExFlags(
+        fp: *mut FILE,
+        filename: *const c_char,
+        closeit: c_int,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn PyRun_InteractiveOneFlags(
+        fp: *mut FILE,
+        filename: *const c_char,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn PyRun_InteractiveOneObject(
+        fp: *mut FILE,
+        filename: *mut PyObject,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn PyRun_InteractiveLoopFlags(
+        fp: *mut FILE,
+        filename: *const c_char,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+    pub fn _PyRun_InteractiveLoopObject(
+        fp: *mut FILE,
+        filename: *mut PyObject,
+        flags: *mut PyCompilerFlags,
+    ) -> c_int;
+
+    #[cfg(not(Py_3_10))]
+    pub fn PyParser_ASTFromString(
+        s: *const c_char,
+        filename: *const c_char,
+        start: c_int,
+        flags: *mut PyCompilerFlags,
+        arena: *mut PyArena,
+    ) -> *mut _mod;
+    #[cfg(not(Py_3_10))]
+    pub fn PyParser_ASTFromStringObject(
+        s: *const c_char,
+        filename: *mut PyObject,
+        start: c_int,
+        flags: *mut PyCompilerFlags,
+        arena: *mut PyArena,
+    ) -> *mut _mod;
+    #[cfg(not(Py_3_10))]
+    pub fn PyParser_ASTFromFile(
+        fp: *mut FILE,
+        filename: *const c_char,
+        enc: *const c_char,
+        start: c_int,
+        ps1: *const c_char,
+        ps2: *const c_char,
+        flags: *mut PyCompilerFlags,
+        errcode: *mut c_int,
+        arena: *mut PyArena,
+    ) -> *mut _mod;
+    #[cfg(not(Py_3_10))]
+    pub fn PyParser_ASTFromFileObject(
+        fp: *mut FILE,
+        filename: *mut PyObject,
+        enc: *const c_char,
+        start: c_int,
+        ps1: *const c_char,
+        ps2: *const c_char,
+        flags: *mut PyCompilerFlags,
+        errcode: *mut c_int,
+        arena: *mut PyArena,
+    ) -> *mut _mod;
+}
+
+extern "C" {
+    #[cfg_attr(PyPy, link_name = "PyPyRun_StringFlags")]
+    pub fn PyRun_StringFlags(
+        arg1: *const c_char,
+        arg2: c_int,
+        arg3: *mut PyObject,
+        arg4: *mut PyObject,
+        arg5: *mut PyCompilerFlags,
+    ) -> *mut PyObject;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_FileExFlags(
+        fp: *mut FILE,
+        filename: *const c_char,
+        start: c_int,
+        globals: *mut PyObject,
+        locals: *mut PyObject,
+        closeit: c_int,
+        flags: *mut PyCompilerFlags,
+    ) -> *mut PyObject;
+
+    #[cfg(not(PyPy))]
+    pub fn Py_CompileStringExFlags(
+        str: *const c_char,
+        filename: *const c_char,
+        start: c_int,
+        flags: *mut PyCompilerFlags,
+        optimize: c_int,
+    ) -> *mut PyObject;
+    #[cfg(not(Py_LIMITED_API))]
+    pub fn Py_CompileStringObject(
+        str: *const c_char,
+        filename: *mut PyObject,
+        start: c_int,
+        flags: *mut PyCompilerFlags,
+        optimize: c_int,
+    ) -> *mut PyObject;
+}
+
+#[inline]
+pub unsafe fn Py_CompileString(string: *const c_char, p: *const c_char, s: c_int) -> *mut PyObject {
+    #[cfg(not(PyPy))]
+    return Py_CompileStringExFlags(string, p, s, std::ptr::null_mut(), -1);
+
+    #[cfg(PyPy)]
+    Py_CompileStringFlags(string, p, s, std::ptr::null_mut())
+}
+
+#[inline]
+#[cfg(not(PyPy))]
+pub unsafe fn Py_CompileStringFlags(
+    string: *const c_char,
+    p: *const c_char,
+    s: c_int,
+    f: *mut PyCompilerFlags,
+) -> *mut PyObject {
+    Py_CompileStringExFlags(string, p, s, f, -1)
+}
+
+// skipped _Py_SourceAsString
+
+extern "C" {
+    #[cfg_attr(PyPy, link_name = "PyPyRun_String")]
+    pub fn PyRun_String(
+        string: *const c_char,
+        s: c_int,
+        g: *mut PyObject,
+        l: *mut PyObject,
+    ) -> *mut PyObject;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_AnyFile(fp: *mut FILE, name: *const c_char) -> c_int;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_AnyFileEx(fp: *mut FILE, name: *const c_char, closeit: c_int) -> c_int;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_AnyFileFlags(
+        arg1: *mut FILE,
+        arg2: *const c_char,
+        arg3: *mut PyCompilerFlags,
+    ) -> c_int;
+    #[cfg_attr(PyPy, link_name = "PyPyRun_SimpleString")]
+    pub fn PyRun_SimpleString(s: *const c_char) -> c_int;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_SimpleFile(f: *mut FILE, p: *const c_char) -> c_int;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_SimpleFileEx(f: *mut FILE, p: *const c_char, c: c_int) -> c_int;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_InteractiveOne(f: *mut FILE, p: *const c_char) -> c_int;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_InteractiveLoop(f: *mut FILE, p: *const c_char) -> c_int;
+    #[cfg_attr(PyPy, link_name = "PyPyRun_File")]
+    pub fn PyRun_File(
+        fp: *mut FILE,
+        p: *const c_char,
+        s: c_int,
+        g: *mut PyObject,
+        l: *mut PyObject,
+    ) -> *mut PyObject;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_FileEx(
+        fp: *mut FILE,
+        p: *const c_char,
+        s: c_int,
+        g: *mut PyObject,
+        l: *mut PyObject,
+        c: c_int,
+    ) -> *mut PyObject;
+    #[cfg(not(PyPy))]
+    pub fn PyRun_FileFlags(
+        fp: *mut FILE,
+        p: *const c_char,
+        s: c_int,
+        g: *mut PyObject,
+        l: *mut PyObject,
+        flags: *mut PyCompilerFlags,
+    ) -> *mut PyObject;
+}
+
+// skipped macro PyRun_String
+// skipped macro PyRun_AnyFile
+// skipped macro PyRun_AnyFileEx
+// skipped macro PyRun_AnyFileFlags
+
+extern "C" {
+    #[cfg(not(Py_3_10))]
+    #[cfg_attr(Py_3_9, deprecated(note = "Python 3.9"))]
+    pub fn PyParser_SimpleParseStringFlags(
+        arg1: *const c_char,
+        arg2: c_int,
+        arg3: c_int,
+    ) -> *mut _node;
+    #[cfg(not(Py_3_10))]
+    #[cfg_attr(Py_3_9, deprecated(note = "Python 3.9"))]
+    pub fn PyParser_SimpleParseStringFlagsFilename(
+        arg1: *const c_char,
+        arg2: *const c_char,
+        arg3: c_int,
+        arg4: c_int,
+    ) -> *mut _node;
+    #[cfg(not(Py_3_10))]
+    #[cfg_attr(Py_3_9, deprecated(note = "Python 3.9"))]
+    pub fn PyParser_SimpleParseFileFlags(
+        arg1: *mut FILE,
+        arg2: *const c_char,
+        arg3: c_int,
+        arg4: c_int,
+    ) -> *mut _node;
+
+    #[cfg(PyPy)]
+    #[cfg_attr(PyPy, link_name = "PyPy_CompileStringFlags")]
+    pub fn Py_CompileStringFlags(
+        string: *const c_char,
+        p: *const c_char,
+        s: c_int,
+        f: *mut PyCompilerFlags,
+    ) -> *mut PyObject;
+}
diff --git a/src/ffi/pystrtod.rs b/src/ffi/pystrtod.rs
@@ -18,6 +18,9 @@ extern "C" {
     ) -> *mut c_char;
 }
 
+// skipped non-limited _Py_string_to_number_with_underscores
+// skipped non-limited _Py_parse_inf_or_nan
+
 /* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */
 pub const Py_DTSF_SIGN: c_int = 0x01; /* always add the sign */
 pub const Py_DTSF_ADD_DOT_0: c_int = 0x02; /* if the result is an integer add ".0" */