updated for version 7.3.569
Problem: Evaluating Vim expression in Python is insufficient.
Solution: Add vim.bindeval(). Also add pyeval() and py3eval(). (ZyX)
diff --git a/src/if_python3.c b/src/if_python3.c
index ac6f166..c4e122c 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -77,7 +77,7 @@
#define PyInt Py_ssize_t
#define PyString_Check(obj) PyUnicode_Check(obj)
-#define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER);
+#define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER)
#define PyString_FreeBytes(obj) Py_XDECREF(bytes)
#define PyString_AsString(obj) PyBytes_AsString(obj)
#define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
@@ -109,6 +109,7 @@
# undef PyArg_ParseTuple
# define PyArg_ParseTuple py3_PyArg_ParseTuple
# define PyMem_Free py3_PyMem_Free
+# define PyMem_Malloc py3_PyMem_Malloc
# define PyDict_SetItemString py3_PyDict_SetItemString
# define PyErr_BadArgument py3_PyErr_BadArgument
# define PyErr_Clear py3_PyErr_Clear
@@ -128,14 +129,27 @@
# define PyList_New py3_PyList_New
# define PyList_SetItem py3_PyList_SetItem
# define PyList_Size py3_PyList_Size
+# define PySequence_Check py3_PySequence_Check
+# define PySequence_Size py3_PySequence_Size
+# define PySequence_GetItem py3_PySequence_GetItem
+# define PyTuple_Size py3_PyTuple_Size
+# define PyTuple_GetItem py3_PyTuple_GetItem
# define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
# define PyImport_ImportModule py3_PyImport_ImportModule
+# define PyImport_AddModule py3_PyImport_AddModule
# define PyObject_Init py3__PyObject_Init
# define PyDict_New py3_PyDict_New
# define PyDict_GetItemString py3_PyDict_GetItemString
+# define PyDict_Next py3_PyDict_Next
+# define PyMapping_Check py3_PyMapping_Check
+# define PyMapping_Items py3_PyMapping_Items
+# define PyIter_Next py3_PyIter_Next
+# define PyObject_GetIter py3_PyObject_GetIter
# define PyModule_GetDict py3_PyModule_GetDict
#undef PyRun_SimpleString
# define PyRun_SimpleString py3_PyRun_SimpleString
+#undef PyRun_String
+# define PyRun_String py3_PyRun_String
# define PySys_SetObject py3_PySys_SetObject
# define PySys_SetArgv py3_PySys_SetArgv
# define PyType_Type (*py3_PyType_Type)
@@ -147,6 +161,7 @@
# define Py_Finalize py3_Py_Finalize
# define Py_IsInitialized py3_Py_IsInitialized
# define _Py_NoneStruct (*py3__Py_NoneStruct)
+# define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented)
# define PyModule_AddObject py3_PyModule_AddObject
# define PyImport_AppendInittab py3_PyImport_AppendInittab
# define _PyUnicode_AsString py3__PyUnicode_AsString
@@ -154,8 +169,13 @@
# define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString
# undef PyBytes_AsString
# define PyBytes_AsString py3_PyBytes_AsString
+# undef PyBytes_FromString
+# define PyBytes_FromString py3_PyBytes_FromString
+# define PyFloat_FromDouble py3_PyFloat_FromDouble
+# define PyFloat_AsDouble py3_PyFloat_AsDouble
# define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
# define PySlice_Type (*py3_PySlice_Type)
+# define PyFloat_Type (*py3_PyFloat_Type)
# define PyErr_NewException py3_PyErr_NewException
# ifdef Py_DEBUG
# define _Py_NegativeRefcount py3__Py_NegativeRefcount
@@ -174,6 +194,9 @@
# define PyUnicode_FromString py3_PyUnicode_FromString
# undef PyUnicode_Decode
# define PyUnicode_Decode py3_PyUnicode_Decode
+# define PyType_IsSubtype py3_PyType_IsSubtype
+# define PyCapsule_New py3_PyCapsule_New
+# define PyCapsule_GetPointer py3_PyCapsule_GetPointer
# ifdef Py_DEBUG
# undef PyObject_NEW
@@ -194,22 +217,34 @@
static int (*py3_PySys_SetObject)(char *, PyObject *);
static PyObject* (*py3_PyList_Append)(PyObject *, PyObject *);
static Py_ssize_t (*py3_PyList_Size)(PyObject *);
+static int (*py3_PySequence_Check)(PyObject *);
+static Py_ssize_t (*py3_PySequence_Size)(PyObject *);
+static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t);
+static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
+static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
+static int (*py3_PyMapping_Check)(PyObject *);
+static PyObject* (*py3_PyMapping_Items)(PyObject *);
static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length,
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength);
static PyObject* (*py3_PyErr_NoMemory)(void);
static void (*py3_Py_Finalize)(void);
static void (*py3_PyErr_SetString)(PyObject *, const char *);
static int (*py3_PyRun_SimpleString)(char *);
+static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *);
static PyObject* (*py3_PyList_GetItem)(PyObject *, Py_ssize_t);
static PyObject* (*py3_PyImport_ImportModule)(const char *);
+static PyObject* (*py3_PyImport_AddModule)(const char *);
static int (*py3_PyErr_BadArgument)(void);
static PyTypeObject* py3_PyType_Type;
static PyObject* (*py3_PyErr_Occurred)(void);
static PyObject* (*py3_PyModule_GetDict)(PyObject *);
static int (*py3_PyList_SetItem)(PyObject *, Py_ssize_t, PyObject *);
static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *);
+static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **);
static PyObject* (*py3_PyLong_FromLong)(long);
static PyObject* (*py3_PyDict_New)(void);
+static PyObject* (*py3_PyIter_Next)(PyObject *);
+static PyObject* (*py3_PyObject_GetIter)(PyObject *);
static PyObject* (*py3_Py_BuildValue)(char *, ...);
static int (*py3_PyType_Ready)(PyTypeObject *type);
static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
@@ -224,21 +259,29 @@
static int (*py3_PyArg_Parse)(PyObject *, char *, ...);
static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...);
static int (*py3_PyMem_Free)(void *);
+static void* (*py3_PyMem_Malloc)(size_t);
static int (*py3_Py_IsInitialized)(void);
static void (*py3_PyErr_Clear)(void);
static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *);
+static iternextfunc py3__PyObject_NextNotImplemented;
static PyObject* py3__Py_NoneStruct;
static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors);
static char* (*py3_PyBytes_AsString)(PyObject *bytes);
+static PyObject* (*py3_PyBytes_FromString)(char *str);
+static PyObject* (*py3_PyFloat_FromDouble)(double num);
+static double (*py3_PyFloat_AsDouble)(PyObject *);
static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name);
static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version);
static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems);
static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds);
static PyTypeObject* py3_PySlice_Type;
+static PyTypeObject* py3_PyFloat_Type;
static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict);
+static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
+static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *);
# ifdef Py_DEBUG
static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op);
static Py_ssize_t* py3__Py_RefTotal;
@@ -249,6 +292,7 @@
static void (*py3_PyObject_Free)(void*);
static void* (*py3_PyObject_Malloc)(size_t);
# endif
+static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */
@@ -280,25 +324,38 @@
{"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
{"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
{"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free},
+ {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc},
{"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
{"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure},
{"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release},
{"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject},
{"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append},
{"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size},
+ {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check},
+ {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size},
+ {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem},
+ {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size},
+ {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem},
{"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
{"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
{"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},
{"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
{"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString},
+ {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String},
{"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem},
{"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule},
+ {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule},
{"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument},
{"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
{"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred},
{"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
{"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
{"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
+ {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next},
+ {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check},
+ {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items},
+ {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next},
+ {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
{"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
{"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
{"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
@@ -311,6 +368,7 @@
{"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread},
{"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse},
{"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized},
+ {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented},
{"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct},
{"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},
{"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
@@ -318,11 +376,15 @@
{"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
{"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
{"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
+ {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
+ {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble},
+ {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble},
{"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr},
{"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
{"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
{"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
{"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
+ {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type},
{"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException},
# ifdef Py_DEBUG
{"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
@@ -334,6 +396,9 @@
{"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc},
{"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free},
# endif
+ {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype},
+ {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New},
+ {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer},
{"", NULL},
};
@@ -472,11 +537,41 @@
static PyTypeObject RangeType;
+static int py3initialised = 0;
+
+#define PYINITIALISED py3initialised
+
+/* Add conversion from PyInt? */
+#define DICTKEY_GET(err) \
+ if (PyBytes_Check(keyObject)) \
+ key = (char_u *) PyBytes_AsString(keyObject); \
+ else if (PyUnicode_Check(keyObject)) \
+ { \
+ bytes = PyString_AsBytes(keyObject); \
+ if (bytes == NULL) \
+ return err; \
+ key = (char_u *) PyBytes_AsString(bytes); \
+ if (key == NULL) \
+ return err; \
+ } \
+ else \
+ { \
+ PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \
+ return err; \
+ }
+#define DICTKEY_UNREF \
+ if (bytes != NULL) \
+ Py_XDECREF(bytes);
+
+#define DICTKEY_DECL PyObject *bytes = NULL;
+
/*
* Include the code shared with if_python.c
*/
#include "if_py_both.h"
+#define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0)
+
static void
call_PyObject_Free(void *p)
{
@@ -506,6 +601,8 @@
static Py_ssize_t RangeStart;
static Py_ssize_t RangeEnd;
+static PyObject *globals;
+
static int PythonIO_Init(void);
static void PythonIO_Fini(void);
PyMODINIT_FUNC Py3Init_vim(void);
@@ -514,8 +611,6 @@
* 1. Python interpreter main program.
*/
-static int py3initialised = 0;
-
static PyGILState_STATE pygilstate = PyGILState_UNLOCKED;
void
@@ -593,6 +688,8 @@
PyImport_AppendInittab("vim", Py3Init_vim);
+ globals = PyModule_GetDict(PyImport_AddModule("__main__"));
+
/* Remove the element from sys.path that was added because of our
* argv[0] value in Py3Init_vim(). Previously we used an empty
* string, but dependinding on the OS we then get an empty entry or
@@ -629,7 +726,7 @@
* External interface
*/
static void
-DoPy3Command(exarg_T *eap, const char *cmd)
+DoPy3Command(exarg_T *eap, const char *cmd, typval_T *rettv)
{
#if defined(MACOS) && !defined(MACOS_X_UNIX)
GrafPtr oldPort;
@@ -649,8 +746,16 @@
if (Python3_Init())
goto theend;
- RangeStart = eap->line1;
- RangeEnd = eap->line2;
+ if (rettv == NULL)
+ {
+ RangeStart = eap->line1;
+ RangeEnd = eap->line2;
+ }
+ else
+ {
+ RangeStart = (PyInt) curwin->w_cursor.lnum;
+ RangeEnd = RangeStart;
+ }
Python_Release_Vim(); /* leave vim */
#if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
@@ -674,7 +779,24 @@
(char *)ENC_OPT, CODEC_ERROR_HANDLER);
cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER);
Py_XDECREF(cmdstr);
- PyRun_SimpleString(PyBytes_AsString(cmdbytes));
+ if (rettv == NULL)
+ PyRun_SimpleString(PyBytes_AsString(cmdbytes));
+ else
+ {
+ PyObject *r;
+
+ r = PyRun_String(PyBytes_AsString(cmdbytes), Py_eval_input,
+ globals, globals);
+ if (r == NULL)
+ EMSG(_("E860: Eval did not return a valid python 3 object"));
+ else
+ {
+ if (ConvertFromPyObject(r, rettv) == -1)
+ EMSG(_("E861: Failed to convert returned python 3 object to vim value"));
+ Py_DECREF(r);
+ }
+ PyErr_Clear();
+ }
Py_XDECREF(cmdbytes);
PyGILState_Release(pygilstate);
@@ -709,9 +831,9 @@
if (!eap->skip)
{
if (script == NULL)
- DoPy3Command(eap, (char *)eap->arg);
+ DoPy3Command(eap, (char *)eap->arg, NULL);
else
- DoPy3Command(eap, (char *)script);
+ DoPy3Command(eap, (char *)script, NULL);
}
vim_free(script);
}
@@ -772,7 +894,7 @@
/* Execute the file */
- DoPy3Command(eap, buffer);
+ DoPy3Command(eap, buffer, NULL);
}
/******************************************************
@@ -802,14 +924,16 @@
if (PyUnicode_Check(nameobj))
name = _PyUnicode_AsString(nameobj);
- if (val == NULL) {
+ if (val == NULL)
+ {
PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
return -1;
}
if (strcmp(name, "softspace") == 0)
{
- if (!PyLong_Check(val)) {
+ if (!PyLong_Check(val))
+ {
PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
return -1;
}
@@ -1030,20 +1154,25 @@
static PyObject *
BufferSubscript(PyObject *self, PyObject* idx)
{
- if (PyLong_Check(idx)) {
+ if (PyLong_Check(idx))
+ {
long _idx = PyLong_AsLong(idx);
return BufferItem(self,_idx);
- } else if (PySlice_Check(idx)) {
+ } else if (PySlice_Check(idx))
+ {
Py_ssize_t start, stop, step, slicelen;
if (PySlice_GetIndicesEx((PyObject *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
&start, &stop,
- &step, &slicelen) < 0) {
+ &step, &slicelen) < 0)
+ {
return NULL;
}
return BufferSlice(self, start, stop);
- } else {
+ }
+ else
+ {
PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
return NULL;
}
@@ -1052,24 +1181,29 @@
static Py_ssize_t
BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val)
{
- if (PyLong_Check(idx)) {
+ if (PyLong_Check(idx))
+ {
long n = PyLong_AsLong(idx);
return RBAsItem((BufferObject *)(self), n, val, 1,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
NULL);
- } else if (PySlice_Check(idx)) {
+ } else if (PySlice_Check(idx))
+ {
Py_ssize_t start, stop, step, slicelen;
if (PySlice_GetIndicesEx((PyObject *)idx,
(Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
&start, &stop,
- &step, &slicelen) < 0) {
+ &step, &slicelen) < 0)
+ {
return -1;
}
return RBAsSlice((BufferObject *)(self), start, stop, val, 1,
(PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count,
NULL);
- } else {
+ }
+ else
+ {
PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
return -1;
}
@@ -1142,20 +1276,25 @@
static PyObject *
RangeSubscript(PyObject *self, PyObject* idx)
{
- if (PyLong_Check(idx)) {
+ if (PyLong_Check(idx))
+ {
long _idx = PyLong_AsLong(idx);
return RangeItem(self,_idx);
- } else if (PySlice_Check(idx)) {
+ } else if (PySlice_Check(idx))
+ {
Py_ssize_t start, stop, step, slicelen;
if (PySlice_GetIndicesEx((PyObject *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop,
- &step, &slicelen) < 0) {
+ &step, &slicelen) < 0)
+ {
return NULL;
}
return RangeSlice(self, start, stop);
- } else {
+ }
+ else
+ {
PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
return NULL;
}
@@ -1164,20 +1303,25 @@
static Py_ssize_t
RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val)
{
- if (PyLong_Check(idx)) {
+ if (PyLong_Check(idx))
+ {
long n = PyLong_AsLong(idx);
return RangeAsItem(self, n, val);
- } else if (PySlice_Check(idx)) {
+ } else if (PySlice_Check(idx))
+ {
Py_ssize_t start, stop, step, slicelen;
if (PySlice_GetIndicesEx((PyObject *)idx,
((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
&start, &stop,
- &step, &slicelen) < 0) {
+ &step, &slicelen) < 0)
+ {
return -1;
}
return RangeAsSlice(self, start, stop, val);
- } else {
+ }
+ else
+ {
PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
return -1;
}
@@ -1390,6 +1534,147 @@
}
}
+/* Dictionary object - Definitions
+ */
+
+static PyInt DictionaryLength(PyObject *);
+
+static PyMappingMethods DictionaryAsMapping = {
+ /* mp_length */ (lenfunc) DictionaryLength,
+ /* mp_subscript */ (binaryfunc) DictionaryItem,
+ /* mp_ass_subscript */ (objobjargproc) DictionaryAssItem,
+};
+
+static PyTypeObject DictionaryType;
+
+ static void
+DictionaryDestructor(PyObject *self)
+{
+ DictionaryObject *this = (DictionaryObject *)(self);
+
+ pyll_remove(&this->ref, &lastdict);
+ dict_unref(this->dict);
+
+ Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+/* List object - Definitions
+ */
+
+static PyInt ListLength(PyObject *);
+static PyObject *ListItem(PyObject *, Py_ssize_t);
+
+static PySequenceMethods ListAsSeq = {
+ (lenfunc) ListLength, /* sq_length, len(x) */
+ (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */
+ (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, x*n */
+ (ssizeargfunc) ListItem, /* sq_item, x[i] */
+ (void *) 0, /* was_sq_slice, x[i:j] */
+ (ssizeobjargproc) ListAssItem, /* sq_as_item, x[i]=v */
+ (void *) 0, /* was_sq_ass_slice, x[i:j]=v */
+ 0, /* sq_contains */
+ (binaryfunc) ListConcatInPlace,/* sq_inplace_concat */
+ 0, /* sq_inplace_repeat */
+};
+
+static PyObject *ListSubscript(PyObject *, PyObject *);
+static Py_ssize_t ListAsSubscript(PyObject *, PyObject *, PyObject *);
+
+static PyMappingMethods ListAsMapping = {
+ /* mp_length */ (lenfunc) ListLength,
+ /* mp_subscript */ (binaryfunc) ListSubscript,
+ /* mp_ass_subscript */ (objobjargproc) ListAsSubscript,
+};
+
+static PyTypeObject ListType;
+
+ static PyObject *
+ListSubscript(PyObject *self, PyObject* idxObject)
+{
+ if (PyLong_Check(idxObject))
+ {
+ long idx = PyLong_AsLong(idxObject);
+ return ListItem(self, idx);
+ }
+ else if (PySlice_Check(idxObject))
+ {
+ Py_ssize_t start, stop, step, slicelen;
+
+ if (PySlice_GetIndicesEx(idxObject, ListLength(self), &start, &stop,
+ &step, &slicelen) < 0)
+ return NULL;
+ return ListSlice(self, start, stop);
+ }
+ else
+ {
+ PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
+ return NULL;
+ }
+}
+
+ static Py_ssize_t
+ListAsSubscript(PyObject *self, PyObject *idxObject, PyObject *obj)
+{
+ if (PyLong_Check(idxObject))
+ {
+ long idx = PyLong_AsLong(idxObject);
+ return ListAssItem(self, idx, obj);
+ }
+ else if (PySlice_Check(idxObject))
+ {
+ Py_ssize_t start, stop, step, slicelen;
+
+ if (PySlice_GetIndicesEx(idxObject, ListLength(self), &start, &stop,
+ &step, &slicelen) < 0)
+ return -1;
+ return ListAssSlice(self, start, stop, obj);
+ }
+ else
+ {
+ PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
+ return -1;
+ }
+}
+
+ static void
+ListDestructor(PyObject *self)
+{
+ ListObject *this = (ListObject *)(self);
+
+ pyll_remove(&this->ref, &lastlist);
+ list_unref(this->list);
+
+ Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+/* Function object - Definitions
+ */
+
+ static void
+FunctionDestructor(PyObject *self)
+{
+ FunctionObject *this = (FunctionObject *) (self);
+
+ func_unref(this->name);
+ PyMem_Del(this->name);
+
+ Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+ static PyObject *
+FunctionGetattro(PyObject *self, PyObject *nameobj)
+{
+ FunctionObject *this = (FunctionObject *)(self);
+ char *name = "";
+ if (PyUnicode_Check(nameobj))
+ name = _PyUnicode_AsString(nameobj);
+
+ if (strcmp(name, "name") == 0)
+ return PyUnicode_FromString((char *)(this->name));
+
+ return PyObject_GenericGetAttr(self, nameobj);
+}
+
/* External interface
*/
@@ -1449,6 +1734,9 @@
PyType_Ready(&BufListType);
PyType_Ready(&WinListType);
PyType_Ready(&CurrentType);
+ PyType_Ready(&DictionaryType);
+ PyType_Ready(&ListType);
+ PyType_Ready(&FunctionType);
/* Set sys.argv[] to avoid a crash in warn(). */
PySys_SetArgv(1, argv);
@@ -1517,6 +1805,24 @@
return result;
}
+ void
+do_py3eval (char_u *str, typval_T *rettv)
+{
+ DoPy3Command(NULL, (char *) str, rettv);
+ switch(rettv->v_type)
+ {
+ case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
+ case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
+ case VAR_FUNC: func_ref(rettv->vval.v_string); break;
+ }
+}
+
+ void
+set_ref_in_python3 (int copyID)
+{
+ set_ref_in_py(copyID);
+}
+
static void
init_structs(void)
{
@@ -1598,6 +1904,35 @@
CurrentType.tp_flags = Py_TPFLAGS_DEFAULT;
CurrentType.tp_doc = "vim current object";
+ vim_memset(&DictionaryType, 0, sizeof(DictionaryType));
+ DictionaryType.tp_name = "vim.dictionary";
+ DictionaryType.tp_basicsize = sizeof(DictionaryObject);
+ DictionaryType.tp_dealloc = DictionaryDestructor;
+ DictionaryType.tp_as_mapping = &DictionaryAsMapping;
+ DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT;
+ DictionaryType.tp_doc = "dictionary pushing modifications to vim structure";
+ DictionaryType.tp_methods = DictionaryMethods;
+
+ vim_memset(&ListType, 0, sizeof(ListType));
+ ListType.tp_name = "vim.list";
+ ListType.tp_dealloc = ListDestructor;
+ ListType.tp_basicsize = sizeof(ListObject);
+ ListType.tp_as_sequence = &ListAsSeq;
+ ListType.tp_as_mapping = &ListAsMapping;
+ ListType.tp_flags = Py_TPFLAGS_DEFAULT;
+ ListType.tp_doc = "list pushing modifications to vim structure";
+ ListType.tp_methods = ListMethods;
+
+ vim_memset(&FunctionType, 0, sizeof(FunctionType));
+ FunctionType.tp_name = "vim.list";
+ FunctionType.tp_basicsize = sizeof(FunctionObject);
+ FunctionType.tp_getattro = FunctionGetattro;
+ FunctionType.tp_dealloc = FunctionDestructor;
+ FunctionType.tp_call = FunctionCall;
+ FunctionType.tp_flags = Py_TPFLAGS_DEFAULT;
+ FunctionType.tp_doc = "object that calls vim function";
+ FunctionType.tp_methods = FunctionMethods;
+
vim_memset(&vimmodule, 0, sizeof(vimmodule));
vimmodule.m_name = "vim";
vimmodule.m_doc = vim_module_doc;