From 6c25a753b8d56470be0f96a91011037486f559d6 Mon Sep 17 00:00:00 2001
From: Ethan Smith <ethan@ethanhs.me>
Date: Thu, 1 Mar 2018 13:36:16 -0800
Subject: [PATCH] Add PEP 523 frame eval API things

---
 src/ffi3/ceval.rs     |  9 +++++++++
 src/ffi3/code.rs      |  9 +++++++++
 src/ffi3/pystate.rs   | 17 +++++++++++++++--
 src/ffi3/pythonrun.rs |  2 +-
 src/ffi3/sysmodule.rs |  2 ++
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/ffi3/ceval.rs b/src/ffi3/ceval.rs
index e981003e..b0361581 100644
--- a/src/ffi3/ceval.rs
+++ b/src/ffi3/ceval.rs
@@ -1,6 +1,7 @@
 use std::os::raw::{c_void, c_char, c_int};
 use ffi3::object::PyObject;
 use ffi3::pystate::PyThreadState;
+use ffi3::code::FreeFunc;
 
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_CallObjectWithKeywords(func: *mut PyObject,
@@ -37,11 +38,19 @@ pub unsafe fn PyEval_CallObject(func: *mut PyObject, arg: *mut PyObject) -> *mut
 
 // TODO: Py_EnterRecursiveCall etc.
 
+#[cfg(Py_3_6)]
+pub type _PyFrameEvalFunction = extern "C" fn(*mut ::ffi3::PyFrameObject, c_int) -> *mut PyObject;
+
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyEval_GetFuncName(arg1: *mut PyObject) -> *const c_char;
     pub fn PyEval_GetFuncDesc(arg1: *mut PyObject) -> *const c_char;
     pub fn PyEval_GetCallStats(arg1: *mut PyObject) -> *mut PyObject;
     pub fn PyEval_EvalFrame(arg1: *mut ::ffi3::PyFrameObject) -> *mut PyObject;
+    #[cfg(Py_3_6)]
+    pub fn _PyEval_EvalFrameDefault(arg1: *mut ::ffi3::PyFrameObject,
+                                    exc: c_int) -> *mut PyObject;
+    #[cfg(Py_3_6)]
+    pub fn _PyEval_RequestCodeExtraIndex(func: FreeFunc) -> c_int;
     pub fn PyEval_EvalFrameEx(f: *mut ::ffi3::PyFrameObject, exc: c_int)
      -> *mut PyObject;
     pub fn PyEval_SaveThread() -> *mut PyThreadState;
diff --git a/src/ffi3/code.rs b/src/ffi3/code.rs
index e2af9f9b..5c51540b 100644
--- a/src/ffi3/code.rs
+++ b/src/ffi3/code.rs
@@ -64,8 +64,17 @@ pub const CO_FUTURE_GENERATOR_STOP : c_int = 0x8_0000;
 
 pub const CO_MAXBLOCKS: usize = 20;
 
+#[cfg(Py_3_6)]
+pub type FreeFunc = extern "C" fn(*mut c_void) -> c_void;
+
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub static mut PyCode_Type: PyTypeObject;
+    #[cfg(Py_3_6)]
+    pub fn _PyCode_GetExtra(code: *mut PyObject, index: Py_ssize_t,
+                            extra: *const *mut c_void) -> c_int;
+    #[cfg(Py_3_6)]
+    pub fn _PyCode_SetExtra(code: *mut PyObject, index: Py_ssize_t,
+                            extra: *mut c_void) -> c_int;
 
     pub fn PyCode_New(arg1: c_int, arg2: c_int,
                       arg3: c_int, arg4: c_int,
diff --git a/src/ffi3/pystate.rs b/src/ffi3/pystate.rs
index 8260ee00..cbef42dc 100644
--- a/src/ffi3/pystate.rs
+++ b/src/ffi3/pystate.rs
@@ -1,12 +1,25 @@
 use std::os::raw::{c_int, c_long};
 use ffi3::object::PyObject;
 use ffi3::moduleobject::PyModuleDef;
+use ffi3::ceval::_PyFrameEvalFunction;
 
 #[cfg(Py_3_6)]
 pub const MAX_CO_EXTRA_USERS: c_int = 255;
 
-pub enum PyInterpreterState { }
-pub enum PyThreadState { }
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct PyInterpreterState {
+    pub ob_base: PyObject,
+    #[cfg(Py_3_6)]
+    pub eval_frame: _PyFrameEvalFunction,
+}
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct PyThreadState { 
+    pub ob_base: PyObject,
+    pub interp: *mut PyInterpreterState,
+}
 
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
     pub fn PyInterpreterState_New() -> *mut PyInterpreterState;
diff --git a/src/ffi3/pythonrun.rs b/src/ffi3/pythonrun.rs
index cbc14188..309573c8 100644
--- a/src/ffi3/pythonrun.rs
+++ b/src/ffi3/pythonrun.rs
@@ -25,7 +25,7 @@ use ffi3::pyarena::PyArena;
 #[derive(Copy, Clone)]
 #[cfg(not(Py_LIMITED_API))]
 pub struct PyCompilerFlags {
-    cf_flags : c_int
+    pub cf_flags : c_int
 }
 
 #[cfg(not(Py_LIMITED_API))]
diff --git a/src/ffi3/sysmodule.rs b/src/ffi3/sysmodule.rs
index 65e85070..7fe13796 100644
--- a/src/ffi3/sysmodule.rs
+++ b/src/ffi3/sysmodule.rs
@@ -1,8 +1,10 @@
 use std::os::raw::{c_char, c_int};
 use libc::wchar_t;
 use ffi3::object::PyObject;
+use ffi3::pyport::Py_ssize_t;
 
 #[cfg_attr(windows, link(name="pythonXY"))] extern "C" {
+    pub fn Py_DecodeLocale(arg1: *const c_char, arg2: Py_ssize_t) -> *mut wchar_t;
     pub fn PySys_GetObject(arg1: *const c_char) -> *mut PyObject;
     pub fn PySys_SetObject(arg1: *const c_char, arg2: *mut PyObject)
      -> c_int;