vim: src/if_python3.c annotate

annotate src/if_python3.c @ 2447:84d353762845 vim73

Move many more common Python items to if_py_both.c.

author	Bram Moolenaar <bram@vim.org>
date	Sat, 31 Jul 2010 19:54:14 +0200
parents	eb4718cb2a76
children	8bc2e8390c11

rev	line source
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1 /* vi:set ts=8 sts=4 sw=4:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	4 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	8 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	9 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	10 * Python extensions by Paul Moore.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	11 * Changes for Unix by David Leonard.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	12 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	13 * This consists of four parts:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	14 * 1. Python interpreter main program
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	15 * 2. Python output stream: writes output via [e]msg().
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	16 * 3. Implementation of the Vim module for Python
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	17 * 4. Utility functions for handling the interface between Vim and Python.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	18 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	19
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	20 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	21 * Roland Puntaier 2009/sept/16:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	22 * Adaptations to support both python3.x and python2.x
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	23 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	24
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	25 // uncomment this if used with the debug version of python
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	26 // #define Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	27
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	28 #include "vim.h"
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	29
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	30 #include <limits.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	31
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	32 /* Python.h defines _POSIX_THREADS itself (if needed) */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	33 #ifdef _POSIX_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	34 # undef _POSIX_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	35 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	36
2404 eb4718cb2a76 Include old Python changes in Python 3 interface. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	37 #if defined(_WIN32) && defined(HAVE_FCNTL_H)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	38 # undef HAVE_FCNTL_H
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	39 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	40
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	41 #ifdef _DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	42 # undef _DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	43 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	44
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	45 #define PY_SSIZE_T_CLEAN
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	46
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	47 #ifdef F_BLANK
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	48 # undef F_BLANK
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	49 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	50
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	51 #ifdef HAVE_STDARG_H
99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	52 # undef HAVE_STDARG_H /* Python's config.h defines it as well. */
99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	53 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	54 #ifdef _POSIX_C_SOURCE /* defined in feature.h */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	55 # undef _POSIX_C_SOURCE
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	56 #endif
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	57 #ifdef _XOPEN_SOURCE
99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	58 # undef _XOPEN_SOURCE /* pyconfig.h defines it as well. */
99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	59 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	60
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	61 #include <Python.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	62 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	63 # include "macglue.h"
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	64 # include <CodeFragments.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	65 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	66 #undef main /* Defined in python.h - aargh */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	67 #undef HAVE_FCNTL_H /* Clash with os_win32.h */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	68
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	69 static void init_structs(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	70
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	71 #define PyInt Py_ssize_t
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	72 #define PyString_Check(obj) PyUnicode_Check(obj)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	73 #define PyString_AsString(obj) _PyUnicode_AsString(obj)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	74 #define PyString_Size(obj) PyUnicode_GET_SIZE(obj)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	75 #define PyString_FromString(repr) PyUnicode_FromString(repr)
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	76
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	77 #if defined(DYNAMIC_PYTHON3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	78
2374 f414e5a4b40e Fix: "import termios" doesn't work with dynamically loaded Python. (James Bram Moolenaar <bram@vim.org> parents: 2350 diff changeset	79 #ifndef WIN3264
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	80 #include <dlfcn.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	81 #define FARPROC void*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	82 #define HINSTANCE void*
2374 f414e5a4b40e Fix: "import termios" doesn't work with dynamically loaded Python. (James Bram Moolenaar <bram@vim.org> parents: 2350 diff changeset	83 #define load_dll(n) dlopen((n), RTLD_LAZY\|RTLD_GLOBAL)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	84 #define close_dll dlclose
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	85 #define symbol_from_dll dlsym
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	86 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	87 #define load_dll LoadLibrary
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	88 #define close_dll FreeLibrary
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	89 #define symbol_from_dll GetProcAddress
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	90 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	91 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	92 * Wrapper defines
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	93 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	94 #undef PyArg_Parse
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	95 # define PyArg_Parse py3_PyArg_Parse
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	96 #undef PyArg_ParseTuple
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	97 # define PyArg_ParseTuple py3_PyArg_ParseTuple
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	98 # define PyDict_SetItemString py3_PyDict_SetItemString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	99 # define PyErr_BadArgument py3_PyErr_BadArgument
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	100 # define PyErr_Clear py3_PyErr_Clear
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	101 # define PyErr_NoMemory py3_PyErr_NoMemory
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	102 # define PyErr_Occurred py3_PyErr_Occurred
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	103 # define PyErr_SetNone py3_PyErr_SetNone
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	104 # define PyErr_SetString py3_PyErr_SetString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	105 # define PyEval_InitThreads py3_PyEval_InitThreads
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	106 # define PyEval_RestoreThread py3_PyEval_RestoreThread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	107 # define PyEval_SaveThread py3_PyEval_SaveThread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	108 # define PyGILState_Ensure py3_PyGILState_Ensure
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	109 # define PyGILState_Release py3_PyGILState_Release
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	110 # define PyLong_AsLong py3_PyLong_AsLong
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	111 # define PyLong_FromLong py3_PyLong_FromLong
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	112 # define PyList_GetItem py3_PyList_GetItem
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	113 # define PyList_Append py3_PyList_Append
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	114 # define PyList_New py3_PyList_New
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	115 # define PyList_SetItem py3_PyList_SetItem
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	116 # define PyList_Size py3_PyList_Size
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	117 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	118 # define PyImport_ImportModule py3_PyImport_ImportModule
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	119 # define PyObject_Init py3__PyObject_Init
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	120 # define PyDict_New py3_PyDict_New
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	121 # define PyDict_GetItemString py3_PyDict_GetItemString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	122 # define PyModule_GetDict py3_PyModule_GetDict
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	123 #undef PyRun_SimpleString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	124 # define PyRun_SimpleString py3_PyRun_SimpleString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	125 # define PySys_SetObject py3_PySys_SetObject
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	126 # define PySys_SetArgv py3_PySys_SetArgv
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	127 # define PyType_Type (*py3_PyType_Type)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	128 # define PyType_Ready py3_PyType_Ready
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	129 #undef Py_BuildValue
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	130 # define Py_BuildValue py3_Py_BuildValue
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	131 # define Py_Initialize py3_Py_Initialize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	132 # define Py_Finalize py3_Py_Finalize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	133 # define Py_IsInitialized py3_Py_IsInitialized
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	134 # define _Py_NoneStruct (*py3__Py_NoneStruct)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	135 # define PyModule_AddObject py3_PyModule_AddObject
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	136 # define PyImport_AppendInittab py3_PyImport_AppendInittab
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	137 # define _PyUnicode_AsString py3__PyUnicode_AsString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	138 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	139 # define PySlice_Type (*py3_PySlice_Type)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	140 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	141 # define _Py_NegativeRefcount py3__Py_NegativeRefcount
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	142 # define _Py_RefTotal (*py3__Py_RefTotal)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	143 # define _Py_Dealloc py3__Py_Dealloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	144 # define _PyObject_DebugMalloc py3__PyObject_DebugMalloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	145 # define _PyObject_DebugFree py3__PyObject_DebugFree
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	146 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	147 # define PyObject_Malloc py3_PyObject_Malloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	148 # define PyObject_Free py3_PyObject_Free
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	149 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	150 # define PyType_GenericAlloc py3_PyType_GenericAlloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	151 # define PyType_GenericNew py3_PyType_GenericNew
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	152 # define PyModule_Create2 py3_PyModule_Create2
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	153 #undef PyUnicode_FromString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	154 # define PyUnicode_FromString py3_PyUnicode_FromString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	155 #undef PyUnicode_FromStringAndSize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	156 # define PyUnicode_FromStringAndSize py3_PyUnicode_FromStringAndSize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	157
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	158 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	159 #undef PyObject_NEW
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	160 #define PyObject_NEW(type, typeobj) \
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	161 ( (type *) PyObject_Init( \
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	162 (PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) )
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	163 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	164 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	165 * Pointers for dynamic link
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	166 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	167 static int (py3_PySys_SetArgv)(int, wchar_t *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	168 static void (*py3_Py_Initialize)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	169 static PyObject* (*py3_PyList_New)(Py_ssize_t size);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	170 static PyGILState_STATE (*py3_PyGILState_Ensure)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	171 static void (*py3_PyGILState_Release)(PyGILState_STATE);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	172 static int (py3_PySys_SetObject)(char , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	173 static PyObject* (py3_PyList_Append)(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	174 static Py_ssize_t (py3_PyList_Size)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	175 static int (py3_PySlice_GetIndicesEx)(PySliceObject r, Py_ssize_t length,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	176 Py_ssize_t start, Py_ssize_t stop, Py_ssize_t step, Py_ssize_t slicelength);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	177 static PyObject* (*py3_PyErr_NoMemory)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	178 static void (*py3_Py_Finalize)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	179 static void (py3_PyErr_SetString)(PyObject , const char *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	180 static int (py3_PyRun_SimpleString)(char );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	181 static PyObject* (py3_PyList_GetItem)(PyObject , Py_ssize_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	182 static PyObject* (py3_PyImport_ImportModule)(const char );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	183 static int (*py3_PyErr_BadArgument)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	184 static PyTypeObject* py3_PyType_Type;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	185 static PyObject* (*py3_PyErr_Occurred)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	186 static PyObject* (py3_PyModule_GetDict)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	187 static int (py3_PyList_SetItem)(PyObject , Py_ssize_t, PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	188 static PyObject* (py3_PyDict_GetItemString)(PyObject , const char *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	189 static PyObject* (*py3_PyLong_FromLong)(long);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	190 static PyObject* (*py3_PyDict_New)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	191 static PyObject* (py3_Py_BuildValue)(char , ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	192 static int (py3_PyType_Ready)(PyTypeObject type);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	193 static int (py3_PyDict_SetItemString)(PyObject dp, char key, PyObject item);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	194 static PyObject* (py3_PyUnicode_FromString)(const char u);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	195 static PyObject* (py3_PyUnicode_FromStringAndSize)(const char u, Py_ssize_t size);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	196 static long (py3_PyLong_AsLong)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	197 static void (py3_PyErr_SetNone)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	198 static void (*py3_PyEval_InitThreads)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	199 static void(py3_PyEval_RestoreThread)(PyThreadState );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	200 static PyThreadState(py3_PyEval_SaveThread)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	201 static int (py3_PyArg_Parse)(PyObject , char *, ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	202 static int (py3_PyArg_ParseTuple)(PyObject , char *, ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	203 static int (*py3_Py_IsInitialized)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	204 static void (*py3_PyErr_Clear)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	205 static PyObject(py3__PyObject_Init)(PyObject , PyTypeObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	206 static PyObject* py3__Py_NoneStruct;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	207 static int (py3_PyModule_AddObject)(PyObject m, const char name, PyObject o);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	208 static int (py3_PyImport_AppendInittab)(const char name, PyObject* (*initfunc)(void));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	209 static char* (py3__PyUnicode_AsString)(PyObject unicode);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	210 static PyObject* (py3_PyObject_GenericGetAttr)(PyObject obj, PyObject *name);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	211 static PyObject* (py3_PyModule_Create2)(struct PyModuleDef module, int module_api_version);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	212 static PyObject* (py3_PyType_GenericAlloc)(PyTypeObject type, Py_ssize_t nitems);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	213 static PyObject* (py3_PyType_GenericNew)(PyTypeObject type, PyObject args, PyObject kwds);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	214 static PyTypeObject* py3_PySlice_Type;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	215 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	216 static void (py3__Py_NegativeRefcount)(const char fname, int lineno, PyObject *op);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	217 static Py_ssize_t* py3__Py_RefTotal;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	218 static void (py3__Py_Dealloc)(PyObject obj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	219 static void (py3__PyObject_DebugFree)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	220 static void* (*py3__PyObject_DebugMalloc)(size_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	221 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	222 static void (py3_PyObject_Free)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	223 static void* (*py3_PyObject_Malloc)(size_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	224 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	225
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	226 static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	227
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	228 /* Imported exception objects */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	229 static PyObject *p3imp_PyExc_AttributeError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	230 static PyObject *p3imp_PyExc_IndexError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	231 static PyObject *p3imp_PyExc_KeyboardInterrupt;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	232 static PyObject *p3imp_PyExc_TypeError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	233 static PyObject *p3imp_PyExc_ValueError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	234
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	235 # define PyExc_AttributeError p3imp_PyExc_AttributeError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	236 # define PyExc_IndexError p3imp_PyExc_IndexError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	237 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	238 # define PyExc_TypeError p3imp_PyExc_TypeError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	239 # define PyExc_ValueError p3imp_PyExc_ValueError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	240
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	241 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	242 * Table of name to function pointer of python.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	243 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	244 # define PYTHON_PROC FARPROC
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	245 static struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	246 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	247 char *name;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	248 PYTHON_PROC *ptr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	249 } py3_funcname_table[] =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	250 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	251 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	252 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	253 {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	254 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	255 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	256 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	257 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	258 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	259 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	260 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	261 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	262 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	263 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	264 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	265 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	266 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	267 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	268 {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	269 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	270 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	271 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	272 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	273 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	274 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	275 {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	276 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	277 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	278 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	279 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	280 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	281 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	282 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	283 {"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	284 {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	285 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	286 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	287 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	288 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	289 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	290 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	291 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	292 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	293 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	294 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	295 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	296 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	297 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	298 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	299 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	300 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	301 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	302 {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	303 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	304 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	305 {"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	306 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	307 {"", NULL},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	308 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	309
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	310 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	311 * Free python.dll
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	312 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	313 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	314 end_dynamic_python3(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	315 {
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	316 if (hinstPy3 != 0)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	317 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	318 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	319 hinstPy3 = 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	320 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	321 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	322
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	323 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	324 * Load library and get all pointers.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	325 * Parameter 'libname' provides name of DLL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	326 * Return OK or FAIL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	327 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	328 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	329 py3_runtime_link_init(char *libname, int verbose)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	330 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	331 int i;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	332 void ucs_from_string, ucs_from_string_and_size;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	333
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	334 #if defined(UNIX) && defined(FEAT_PYTHON)
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	335 /* Can't have Python and Python3 loaded at the same time, it may cause a
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	336 * crash. */
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	337 if (python_loaded())
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	338 {
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	339 EMSG(_("E999: Python: Cannot use :py and :py3 in one session"));
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	340 return FAIL;
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	341 }
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	342 #endif
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	343
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	344 if (hinstPy3 != 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	345 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	346 hinstPy3 = load_dll(libname);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	347
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	348 if (!hinstPy3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	349 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	350 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	351 EMSG2(_(e_loadlib), libname);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	352 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	353 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	354
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	355 for (i = 0; py3_funcname_table[i].ptr; ++i)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	356 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	357 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	358 py3_funcname_table[i].name)) == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	359 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	360 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	361 hinstPy3 = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	362 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	363 EMSG2(_(e_loadfunc), py3_funcname_table[i].name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	364 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	365 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	366 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	367
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	368 /* Load unicode functions separately as only the ucs2 or the ucs4 functions
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	369 * will be present in the library. */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	370 ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	371 ucs_from_string_and_size = symbol_from_dll(hinstPy3,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	372 "PyUnicodeUCS2_FromStringAndSize");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	373 if (!ucs_from_string \|\| !ucs_from_string_and_size)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	374 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	375 ucs_from_string = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	376 "PyUnicodeUCS4_FromString");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	377 ucs_from_string_and_size = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	378 "PyUnicodeUCS4_FromStringAndSize");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	379 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	380 if (ucs_from_string && ucs_from_string_and_size)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	381 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	382 py3_PyUnicode_FromString = ucs_from_string;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	383 py3_PyUnicode_FromStringAndSize = ucs_from_string_and_size;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	384 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	385 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	386 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	387 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	388 hinstPy3 = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	389 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	390 EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	391 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	392 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	393
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	394 return OK;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	395 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	396
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	397 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	398 * If python is enabled (there is installed python on Windows system) return
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	399 * TRUE, else FALSE.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	400 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	401 int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	402 python3_enabled(int verbose)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	403 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	404 return py3_runtime_link_init(DYNAMIC_PYTHON3_DLL, verbose) == OK;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	405 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	406
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	407 /* Load the standard Python exceptions - don't import the symbols from the
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	408 * DLL, as this can cause errors (importing data symbols is not reliable).
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	409 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	410 static void get_py3_exceptions __ARGS((void));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	411
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	412 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	413 get_py3_exceptions()
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	414 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	415 PyObject *exmod = PyImport_ImportModule("builtins");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	416 PyObject *exdict = PyModule_GetDict(exmod);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	417 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	418 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	419 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	420 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	421 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	422 Py_XINCREF(p3imp_PyExc_AttributeError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	423 Py_XINCREF(p3imp_PyExc_IndexError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	424 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	425 Py_XINCREF(p3imp_PyExc_TypeError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	426 Py_XINCREF(p3imp_PyExc_ValueError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	427 Py_XDECREF(exmod);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	428 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	429 #endif /* DYNAMIC_PYTHON3 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	430
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	431 static PyObject BufferNew (buf_T );
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	432 static PyObject WindowNew(win_T );
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	433 static PyObject LineToString(const char );
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	434
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	435 static PyTypeObject RangeType;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	436
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	437 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	438 * Include the code shared with if_python.c
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	439 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	440 #include "if_py_both.h"
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	441
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	442 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	443 call_PyObject_Free(void *p)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	444 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	445 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	446 _PyObject_DebugFree(p);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	447 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	448 PyObject_Free(p);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	449 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	450 }
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	451
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	452 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	453 call_PyType_GenericNew(PyTypeObject type, PyObject args, PyObject *kwds)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	454 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	455 return PyType_GenericNew(type,args,kwds);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	456 }
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	457
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	458 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	459 call_PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	460 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	461 return PyType_GenericAlloc(type,nitems);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	462 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	463
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	464 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	465 * Internal function prototypes.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	466 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	467
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	468 static Py_ssize_t RangeStart;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	469 static Py_ssize_t RangeEnd;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	470
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	471 static int PythonIO_Init(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	472 static void PythonIO_Fini(void);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	473 PyMODINIT_FUNC Py3Init_vim(void);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	474
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	475 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	476 * 1. Python interpreter main program.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	477 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	478
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	479 static int py3initialised = 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	480
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	481 static PyGILState_STATE pygilstate = PyGILState_UNLOCKED;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	482
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	483 void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	484 python3_end()
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	485 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	486 static int recurse = 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	487
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	488 /* If a crash occurs while doing this, don't try again. */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	489 if (recurse != 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	490 return;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	491
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	492 ++recurse;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	493
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	494 #ifdef DYNAMIC_PYTHON3
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	495 if (hinstPy3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	496 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	497 if (Py_IsInitialized())
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	498 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	499 // acquire lock before finalizing
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	500 pygilstate = PyGILState_Ensure();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	501
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	502 PythonIO_Fini();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	503 Py_Finalize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	504 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	505
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	506 #ifdef DYNAMIC_PYTHON3
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	507 end_dynamic_python3();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	508 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	509
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	510 --recurse;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	511 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	512
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	513 #if (defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON)) \|\| defined(PROTO)
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	514 int
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	515 python3_loaded()
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	516 {
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	517 return (hinstPy3 != 0);
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	518 }
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	519 #endif
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	520
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	521 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	522 Python3_Init(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	523 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	524 if (!py3initialised)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	525 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	526 #ifdef DYNAMIC_PYTHON3
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	527 if (!python3_enabled(TRUE))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	528 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	529 EMSG(_("E263: Sorry, this command is disabled, the Python library could not be loaded."));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	530 goto fail;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	531 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	532 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	533
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	534 init_structs();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	535
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	536 /* initialise threads */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	537 PyEval_InitThreads();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	538
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	539 #if !defined(MACOS) \|\| defined(MACOS_X_UNIX)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	540 Py_Initialize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	541 #else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	542 PyMac_Initialize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	543 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	544
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	545 #ifdef DYNAMIC_PYTHON3
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	546 get_py3_exceptions();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	547 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	548
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	549 if (PythonIO_Init())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	550 goto fail;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	551
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	552 PyImport_AppendInittab("vim", Py3Init_vim);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	553
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	554 /* Remove the element from sys.path that was added because of our
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	555 * argv[0] value in Py3Init_vim(). Previously we used an empty
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	556 * string, but dependinding on the OS we then get an empty entry or
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	557 * the current directory in sys.path. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	558 PyRun_SimpleString("import sys; sys.path = list(filter(lambda x: x != '/must>not&exist', sys.path))");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	559
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	560 // lock is created and acquired in PyEval_InitThreads() and thread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	561 // state is created in Py_Initialize()
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	562 // there _PyGILState_NoteThreadState() also sets gilcounter to 1
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	563 // (python must have threads enabled!)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	564 // so the following does both: unlock GIL and save thread state in TLS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	565 // without deleting thread state
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	566 PyGILState_Release(pygilstate);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	567
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	568 py3initialised = 1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	569 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	570
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	571 return 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	572
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	573 fail:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	574 /* We call PythonIO_Flush() here to print any Python errors.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	575 * This is OK, as it is possible to call this function even
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	576 * if PythonIO_Init() has not completed successfully (it will
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	577 * not do anything in this case).
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	578 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	579 PythonIO_Flush();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	580 return -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	581 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	582
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	583 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	584 * External interface
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	585 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	586 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	587 DoPy3Command(exarg_T eap, const char cmd)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	588 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	589 #if defined(MACOS) && !defined(MACOS_X_UNIX)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	590 GrafPtr oldPort;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	591 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	592 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	593 char *saved_locale;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	594 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	595
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	596 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	597 GetPort(&oldPort);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	598 /* Check if the Python library is available */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	599 if ((Ptr)PyMac_Initialize == (Ptr)kUnresolvedCFragSymbolAddress)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	600 goto theend;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	601 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	602 if (Python3_Init())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	603 goto theend;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	604
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	605 RangeStart = eap->line1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	606 RangeEnd = eap->line2;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	607 Python_Release_Vim(); /* leave vim */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	608
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	609 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	610 /* Python only works properly when the LC_NUMERIC locale is "C". */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	611 saved_locale = setlocale(LC_NUMERIC, NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	612 if (saved_locale == NULL \|\| STRCMP(saved_locale, "C") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	613 saved_locale = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	614 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	615 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	616 /* Need to make a copy, value may change when setting new locale. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	617 saved_locale = (char )vim_strsave((char_u )saved_locale);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	618 (void)setlocale(LC_NUMERIC, "C");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	619 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	620 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	621
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	622 pygilstate = PyGILState_Ensure();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	623
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	624 PyRun_SimpleString((char *)(cmd));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	625
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	626 PyGILState_Release(pygilstate);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	627
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	628 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	629 if (saved_locale != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	630 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	631 (void)setlocale(LC_NUMERIC, saved_locale);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	632 vim_free(saved_locale);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	633 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	634 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	635
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	636 Python_Lock_Vim(); /* enter vim */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	637 PythonIO_Flush();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	638 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	639 SetPort(oldPort);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	640 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	641
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	642 theend:
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	643 return; /* keeps lint happy */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	644 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	645
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	646 /*
2350 06feaf4fe36a Rename some "python3" symbols to "py3", as the command name. Bram Moolenaar <bram@vim.org> parents: 2342 diff changeset	647 * ":py3"
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	648 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	649 void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	650 ex_py3(exarg_T *eap)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	651 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	652 char_u *script;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	653
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	654 script = script_get(eap, eap->arg);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	655 if (!eap->skip)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	656 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	657 if (script == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	658 DoPy3Command(eap, (char *)eap->arg);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	659 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	660 DoPy3Command(eap, (char *)script);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	661 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	662 vim_free(script);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	663 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	664
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	665 #define BUFFER_SIZE 2048
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	666
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	667 /*
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	668 * ":py3file"
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	669 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	670 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	671 ex_py3file(exarg_T *eap)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	672 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	673 static char buffer[BUFFER_SIZE];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	674 const char *file;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	675 char *p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	676 int i;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	677
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	678 /* Have to do it like this. PyRun_SimpleFile requires you to pass a
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	679 * stdio file pointer, but Vim and the Python DLL are compiled with
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	680 * different options under Windows, meaning that stdio pointers aren't
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	681 * compatible between the two. Yuk.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	682 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	683 * construct: exec(compile(open('a_filename').read(), 'a_filename', 'exec'))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	684 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	685 * We need to escape any backslashes or single quotes in the file name, so that
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	686 * Python won't mangle the file name.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	687 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	688
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	689 strcpy(buffer, "exec(compile(open('");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	690 p = buffer + 19; /* size of "exec(compile(open('" */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	691
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	692 for (i=0; i<2; ++i)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	693 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	694 file = (char *)eap->arg;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	695 while (*file && p < buffer + (BUFFER_SIZE - 3))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	696 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	697 if (file == '\\' \|\| file == '\'')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	698 *p++ = '\\';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	699 p++ = file++;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	700 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	701 /* If we didn't finish the file name, we hit a buffer overflow */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	702 if (*file != '\0')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	703 return;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	704 if (i==0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	705 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	706 strcpy(p,"').read(),'");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	707 p += 11;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	708 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	709 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	710 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	711 strcpy(p,"','exec'))");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	712 p += 10;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	713 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	714 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	715
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	716
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	717 /* Execute the file */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	718 DoPy3Command(eap, buffer);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	719 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	720
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	721 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	722 * 2. Python output stream: writes output via [e]msg().
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	723 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	724
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	725 /* Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	726 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	727
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	728 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	729 OutputGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	730 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	731 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	732 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	733 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	734
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	735 if (strcmp(name, "softspace") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	736 return PyLong_FromLong(((OutputObject *)(self))->softspace);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	737
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	738 return PyObject_GenericGetAttr(self, nameobj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	739 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	740
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	741 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	742 OutputSetattro(PyObject self, PyObject nameobj, PyObject *val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	743 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	744 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	745 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	746 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	747
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	748 if (val == NULL) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	749 PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	750 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	751 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	752
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	753 if (strcmp(name, "softspace") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	754 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	755 if (!PyLong_Check(val)) {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	756 PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	757 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	758 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	759
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	760 ((OutputObject *)(self))->softspace = PyLong_AsLong(val);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	761 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	762 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	763
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	764 PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	765 return -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	766 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	767
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	768 /***************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	769
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	770 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	771 PythonIO_Init(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	772 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	773 PyType_Ready(&OutputType);
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	774 return PythonIO_Init_io();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	775 }
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	776
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	777 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	778 PythonIO_Fini(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	779 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	780 PySys_SetObject("stdout", NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	781 PySys_SetObject("stderr", NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	782 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	783
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	784 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	785 * 3. Implementation of the Vim module for Python
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	786 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	787
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	788 /* Window type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	789 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	790 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	791
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	792 #define WindowType_Check(obj) ((obj)->ob_base.ob_type == &WindowType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	793
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	794 /* Buffer type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	795 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	796 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	797
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	798 #define BufferType_Check(obj) ((obj)->ob_base.ob_type == &BufferType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	799
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	800 static Py_ssize_t BufferLength(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	801 static PyObject BufferItem(PyObject , Py_ssize_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	802 static Py_ssize_t BufferAsItem(PyObject , Py_ssize_t, PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	803 static PyObject* BufferSubscript(PyObject self, PyObject idx);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	804
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	805
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	806 /* Line range type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	807 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	808 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	809
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	810 #define RangeType_Check(obj) ((obj)->ob_base.ob_type == &RangeType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	811
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	812 static PyObject* RangeSubscript(PyObject self, PyObject idx);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	813 static Py_ssize_t RangeAsItem(PyObject , Py_ssize_t, PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	814
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	815 /* Current objects type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	816 * -----------------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	817 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	818
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	819 static PySequenceMethods BufferAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	820 (lenfunc) BufferLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	821 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	822 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	823 (ssizeargfunc) BufferItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	824 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	825 (ssizeobjargproc) BufferAsItem, /* sq_ass_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	826 0, /* sq_ass_slice, x[i:j]=v */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	827 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	828 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	829 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	830 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	831
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	832 PyMappingMethods BufferAsMapping = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	833 /* mp_length */ (lenfunc)BufferLength,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	834 /* mp_subscript */ (binaryfunc)BufferSubscript,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	835 /* mp_ass_subscript */ (objobjargproc)0,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	836 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	837
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	838
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	839 /* Buffer object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	840 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	841
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	842 static PyTypeObject BufferType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	843
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	844 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	845 BufferNew(buf_T *buf)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	846 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	847 /* We need to handle deletion of buffers underneath us.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	848 * If we add a "b_python3_ref" field to the buf_T structure,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	849 * then we can get at it in buf_freeall() in vim. We then
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	850 * need to create only ONE Python object per buffer - if
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	851 * we try to create a second, just INCREF the existing one
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	852 * and return it. The (single) Python object referring to
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	853 * the buffer is stored in "b_python3_ref".
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	854 * Question: what to do on a buf_freeall(). We'll probably
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	855 * have to either delete the Python object (DECREF it to
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	856 * zero - a bad idea, as it leaves dangling refs!) or
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	857 * set the buf_T * value to an invalid value (-1?), which
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	858 * means we need checks in all access functions... Bah.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	859 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	860
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	861 BufferObject *self;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	862
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	863 if (buf->b_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	864 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	865 self = buf->b_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	866 Py_INCREF(self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	867 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	868 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	869 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	870 self = PyObject_NEW(BufferObject, &BufferType);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	871 buf->b_python3_ref = self;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	872 if (self == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	873 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	874 self->buf = buf;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	875 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	876
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	877 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	878 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	879
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	880 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	881 BufferDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	882 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	883 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	884
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	885 if (this->buf && this->buf != INVALID_BUFFER_VALUE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	886 this->buf->b_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	887 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	888
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	889 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	890 BufferGetattro(PyObject self, PyObjectnameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	891 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	892 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	893
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	894 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	895 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	896 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	897
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	898 if (CheckBuffer(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	899 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	900
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	901 if (strcmp(name, "name") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	902 return Py_BuildValue("s", this->buf->b_ffname);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	903 else if (strcmp(name, "number") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	904 return Py_BuildValue("n", this->buf->b_fnum);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	905 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	906 return Py_BuildValue("[ss]", "name", "number");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	907 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	908 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	909 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	910
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	911 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	912 BufferRepr(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	913 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	914 static char repr[100];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	915 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	916
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	917 if (this->buf == INVALID_BUFFER_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	918 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	919 vim_snprintf(repr, 100, _("<buffer object (deleted) at %p>"), (self));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	920 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	921 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	922 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	923 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	924 char name = (char )this->buf->b_fname;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	925 Py_ssize_t len;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	926
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	927 if (name == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	928 name = "";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	929 len = strlen(name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	930
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	931 if (len > 35)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	932 name = name + (35 - len);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	933
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	934 vim_snprintf(repr, 100, "<buffer %s%s>", len > 35 ? "..." : "", name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	935
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	936 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	937 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	938 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	939
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	940 /******************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	941
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	942 static Py_ssize_t
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	943 BufferLength(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	944 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	945 if (CheckBuffer((BufferObject *)(self)))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	946 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	947
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	948 return (Py_ssize_t)(((BufferObject *)(self))->buf->b_ml.ml_line_count);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	949 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	950
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	951 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	952 BufferItem(PyObject *self, Py_ssize_t n)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	953 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	954 return RBItem((BufferObject *)(self), n, 1,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	955 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	956 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	957
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	958 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	959 BufferSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	960 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	961 return RBSlice((BufferObject *)(self), lo, hi, 1,
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	962 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	963 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	964
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	965 static Py_ssize_t
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	966 BufferAsItem(PyObject self, Py_ssize_t n, PyObject val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	967 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	968 return RBAsItem((BufferObject *)(self), n, val, 1,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	969 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	970 NULL);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	971 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	972
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	973
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	974 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	975 BufferSubscript(PyObject self, PyObject idx)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	976 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	977 if (PyLong_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	978 long _idx = PyLong_AsLong(idx);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	979 return BufferItem(self,_idx);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	980 } else if (PySlice_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	981 Py_ssize_t start, stop, step, slicelen;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	982
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	983 if (PySlice_GetIndicesEx((PySliceObject *)idx,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	984 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	985 &start, &stop,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	986 &step, &slicelen) < 0) {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	987 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	988 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	989 return BufferSlice(self,start,stop+1);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	990 } else {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	991 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	992 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	993 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	994 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	995
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	996 static PySequenceMethods RangeAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	997 (lenfunc) RangeLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	998 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	999 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1000 (ssizeargfunc) RangeItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1001 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1002 (ssizeobjargproc) RangeAsItem, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1003 0, /* sq_ass_slice, x[i:j]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1004 0, /* sq_contains */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1005 0, /* sq_inplace_concat */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1006 0, /* sq_inplace_repeat */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1007 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1008
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1009 PyMappingMethods RangeAsMapping = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1010 /* mp_length */ (lenfunc)RangeLength,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1011 /* mp_subscript */ (binaryfunc)RangeSubscript,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1012 /* mp_ass_subscript */ (objobjargproc)0,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1013 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1014
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1015 /* Line range object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1016 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1017
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1018 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1019 RangeDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1020 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1021 Py_DECREF(((RangeObject *)(self))->buf);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1022 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1023
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1024 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1025 RangeGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1026 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1027 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1028 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1029 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1030
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1031 if (strcmp(name, "start") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1032 return Py_BuildValue("n", ((RangeObject *)(self))->start - 1);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1033 else if (strcmp(name, "end") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1034 return Py_BuildValue("n", ((RangeObject *)(self))->end - 1);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1035 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1036 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1037 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1038
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1039 /****************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1040
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1041 static Py_ssize_t
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1042 RangeAsItem(PyObject self, Py_ssize_t n, PyObject val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1043 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1044 return RBAsItem(((RangeObject *)(self))->buf, n, val,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1045 ((RangeObject *)(self))->start,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1046 ((RangeObject *)(self))->end,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1047 &((RangeObject *)(self))->end);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1048 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1049
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1050 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1051 RangeSubscript(PyObject self, PyObject idx)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1052 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1053 if (PyLong_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1054 long _idx = PyLong_AsLong(idx);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1055 return RangeItem(self,_idx);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1056 } else if (PySlice_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1057 Py_ssize_t start, stop, step, slicelen;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1058
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1059 if (PySlice_GetIndicesEx((PySliceObject *)idx,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1060 ((RangeObject )(self))->end-((RangeObject )(self))->start+1,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1061 &start, &stop,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1062 &step, &slicelen) < 0) {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1063 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1064 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1065 return RangeSlice(self,start,stop+1);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1066 } else {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1067 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1068 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1069 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1070 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1071
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1072 /* Buffer list object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1073 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1074
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1075 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1076 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1077 PyObject_HEAD
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1078 } BufListObject;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1079
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1080 static PySequenceMethods BufListAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1081 (lenfunc) BufListLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1082 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1083 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1084 (ssizeargfunc) BufListItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1085 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1086 (ssizeobjargproc) 0, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1087 0, /* sq_ass_slice, x[i:j]=v */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1088 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1089 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1090 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1091 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1092
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1093 static PyTypeObject BufListType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1094
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1095 /* Window object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1096 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1097
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1098 static struct PyMethodDef WindowMethods[] = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1099 /* name, function, calling, documentation */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1100 { NULL, NULL, 0, NULL }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1101 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1102
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1103 static PyTypeObject WindowType;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1104
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1105 /* Window object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1106 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1107
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1108 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1109 WindowNew(win_T *win)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1110 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1111 /* We need to handle deletion of windows underneath us.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1112 * If we add a "w_python3_ref" field to the win_T structure,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1113 * then we can get at it in win_free() in vim. We then
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1114 * need to create only ONE Python object per window - if
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1115 * we try to create a second, just INCREF the existing one
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1116 * and return it. The (single) Python object referring to
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1117 * the window is stored in "w_python3_ref".
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1118 * On a win_free() we set the Python object's win_T* field
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1119 * to an invalid value. We trap all uses of a window
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1120 * object, and reject them if the win_T* field is invalid.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1121 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1122
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1123 WindowObject *self;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1124
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1125 if (win->w_python3_ref)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1126 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1127 self = win->w_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1128 Py_INCREF(self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1129 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1130 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1131 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1132 self = PyObject_NEW(WindowObject, &WindowType);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1133 if (self == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1134 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1135 self->win = win;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1136 win->w_python3_ref = self;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1137 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1138
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1139 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1140 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1141
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1142 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1143 WindowDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1144 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1145 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1146
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1147 if (this->win && this->win != INVALID_WINDOW_VALUE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1148 this->win->w_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1149 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1150
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1151 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1152 WindowGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1153 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1154 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1155
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1156 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1157 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1158 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1159
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1160
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1161 if (CheckWindow(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1162 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1163
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1164 if (strcmp(name, "buffer") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1165 return (PyObject *)BufferNew(this->win->w_buffer);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1166 else if (strcmp(name, "cursor") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1167 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1168 pos_T *pos = &this->win->w_cursor;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1169
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1170 return Py_BuildValue("(ll)", (long)(pos->lnum), (long)(pos->col));
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1171 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1172 else if (strcmp(name, "height") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1173 return Py_BuildValue("l", (long)(this->win->w_height));
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1174 #ifdef FEAT_VERTSPLIT
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1175 else if (strcmp(name, "width") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1176 return Py_BuildValue("l", (long)(W_WIDTH(this->win)));
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1177 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1178 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1179 return Py_BuildValue("[sss]", "buffer", "cursor", "height");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1180 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1181 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1182 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1183
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1184 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1185 WindowSetattro(PyObject self, PyObject nameobj, PyObject *val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1186 {
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1187 char *name = "";
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1188
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1189 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1190 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1191
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1192 return WindowSetattr(self, name, val);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1193 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1194
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1195 /* Window list object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1196 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1197
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1198 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1199 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1200 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1201 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1202 WinListObject;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1203
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1204 static PySequenceMethods WinListAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1205 (lenfunc) WinListLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1206 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1207 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1208 (ssizeargfunc) WinListItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1209 0, /* sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1210 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1211 0, /* sq_ass_slice, x[i:j]=v */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1212 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1213 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1214 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1215 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1216
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1217 static PyTypeObject WinListType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1218
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1219 /* Current items object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1220 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1221
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1222 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1223 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1224 PyObject_HEAD
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1225 } CurrentObject;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1226
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1227 static PyTypeObject CurrentType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1228
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1229 /* Current items object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1230 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1231 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1232 CurrentGetattro(PyObject self UNUSED, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1233 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1234 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1235 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1236 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1237
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1238 if (strcmp(name, "buffer") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1239 return (PyObject *)BufferNew(curbuf);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1240 else if (strcmp(name, "window") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1241 return (PyObject *)WindowNew(curwin);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1242 else if (strcmp(name, "line") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1243 return GetBufferLine(curbuf, (Py_ssize_t)curwin->w_cursor.lnum);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1244 else if (strcmp(name, "range") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1245 return RangeNew(curbuf, RangeStart, RangeEnd);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1246 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1247 return Py_BuildValue("[ssss]", "buffer", "window", "line", "range");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1248 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1249 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1250 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1251 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1252 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1253 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1254
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1255 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1256 CurrentSetattro(PyObject self UNUSED, PyObject nameobj, PyObject *value)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1257 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1258 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1259 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1260 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1261
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1262 if (strcmp(name, "line") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1263 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1264 if (SetBufferLine(curbuf, (Py_ssize_t)curwin->w_cursor.lnum, value, NULL) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1265 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1266
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1267 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1268 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1269 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1270 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1271 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1272 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1273 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1274 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1275
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1276 /* External interface
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1277 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1278
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1279 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1280 python3_buffer_free(buf_T *buf)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1281 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1282 if (buf->b_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1283 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1284 BufferObject *bp = buf->b_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1285 bp->buf = INVALID_BUFFER_VALUE;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1286 buf->b_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1287 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1288 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1289
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1290 #if defined(FEAT_WINDOWS) \|\| defined(PROTO)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1291 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1292 python3_window_free(win_T *win)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1293 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1294 if (win->w_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1295 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1296 WindowObject *wp = win->w_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1297 wp->win = INVALID_WINDOW_VALUE;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1298 win->w_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1299 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1300 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1301 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1302
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1303 static BufListObject TheBufferList =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1304 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1305 PyObject_HEAD_INIT(&BufListType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1306 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1307
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1308 static WinListObject TheWindowList =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1309 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1310 PyObject_HEAD_INIT(&WinListType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1311 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1312
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1313 static CurrentObject TheCurrent =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1314 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1315 PyObject_HEAD_INIT(&CurrentType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1316 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1317
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1318 PyDoc_STRVAR(vim_module_doc,"vim python interface\n");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1319
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1320 static struct PyModuleDef vimmodule;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1321
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	1322 #ifndef PROTO
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	1323 PyMODINIT_FUNC Py3Init_vim(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1324 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1325 PyObject *mod;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1326 /* The special value is removed from sys.path in Python3_Init(). */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1327 static wchar_t *(argv[2]) = {L"/must>not&exist/foo", NULL};
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1328
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1329 PyType_Ready(&BufferType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1330 PyType_Ready(&RangeType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1331 PyType_Ready(&WindowType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1332 PyType_Ready(&BufListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1333 PyType_Ready(&WinListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1334 PyType_Ready(&CurrentType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1335
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1336 /* Set sys.argv[] to avoid a crash in warn(). */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1337 PySys_SetArgv(1, argv);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1338
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1339 mod = PyModule_Create(&vimmodule);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1340
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1341 VimError = Py_BuildValue("s", "vim.error");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1342
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1343 PyModule_AddObject(mod, "error", VimError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1344 Py_INCREF((PyObject )(void )&TheBufferList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1345 PyModule_AddObject(mod, "buffers", (PyObject )(void )&TheBufferList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1346 Py_INCREF((PyObject )(void )&TheCurrent);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1347 PyModule_AddObject(mod, "current", (PyObject )(void )&TheCurrent);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1348 Py_INCREF((PyObject )(void )&TheWindowList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1349 PyModule_AddObject(mod, "windows", (PyObject )(void )&TheWindowList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1350
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1351 if (PyErr_Occurred())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1352 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1353
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1354 return mod;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1355 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	1356 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1357
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1358 /*************************************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1359 * 4. Utility functions for handling the interface between Vim and Python.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1360 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1361
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1362 /* Convert a Vim line into a Python string.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1363 * All internal newlines are replaced by null characters.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1364 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1365 * On errors, the Python exception data is set, and NULL is returned.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1366 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1367 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1368 LineToString(const char *str)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1369 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1370 PyObject *result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1371 Py_ssize_t len = strlen(str);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1372 char tmp,p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1373
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1374 tmp = (char *)alloc((unsigned)(len+1));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1375 p = tmp;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1376 if (p == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1377 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1378 PyErr_NoMemory();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1379 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1380 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1381
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1382 while (*str)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1383 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1384 if (*str == '\n')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1385 *p = '\0';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1386 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1387 p = str;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1388
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1389 ++p;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1390 ++str;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1391 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1392 *p = '\0';
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1393
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1394 result = PyUnicode_FromStringAndSize(tmp, len);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1395
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1396 vim_free(tmp);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1397 return result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1398 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1399
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1400 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1401 init_structs(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1402 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1403 vim_memset(&OutputType, 0, sizeof(OutputType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1404 OutputType.tp_name = "vim.message";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1405 OutputType.tp_basicsize = sizeof(OutputObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1406 OutputType.tp_getattro = OutputGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1407 OutputType.tp_setattro = OutputSetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1408 OutputType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1409 OutputType.tp_doc = "vim message object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1410 OutputType.tp_methods = OutputMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1411 OutputType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1412 OutputType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1413 OutputType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1414
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1415 vim_memset(&BufferType, 0, sizeof(BufferType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1416 BufferType.tp_name = "vim.buffer";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1417 BufferType.tp_basicsize = sizeof(BufferType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1418 BufferType.tp_dealloc = BufferDestructor;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1419 BufferType.tp_repr = BufferRepr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1420 BufferType.tp_as_sequence = &BufferAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1421 BufferType.tp_as_mapping = &BufferAsMapping;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1422 BufferType.tp_getattro = BufferGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1423 BufferType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1424 BufferType.tp_doc = "vim buffer object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1425 BufferType.tp_methods = BufferMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1426 BufferType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1427 BufferType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1428 BufferType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1429
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1430 vim_memset(&WindowType, 0, sizeof(WindowType));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1431 WindowType.tp_name = "vim.window";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1432 WindowType.tp_basicsize = sizeof(WindowObject);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1433 WindowType.tp_dealloc = WindowDestructor;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1434 WindowType.tp_repr = WindowRepr;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1435 WindowType.tp_getattro = WindowGetattro;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1436 WindowType.tp_setattro = WindowSetattro;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1437 WindowType.tp_flags = Py_TPFLAGS_DEFAULT;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1438 WindowType.tp_doc = "vim Window object";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1439 WindowType.tp_methods = WindowMethods;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1440 WindowType.tp_alloc = call_PyType_GenericAlloc;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1441 WindowType.tp_new = call_PyType_GenericNew;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1442 WindowType.tp_free = call_PyObject_Free;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1443
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1444 vim_memset(&BufListType, 0, sizeof(BufListType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1445 BufListType.tp_name = "vim.bufferlist";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1446 BufListType.tp_basicsize = sizeof(BufListObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1447 BufListType.tp_as_sequence = &BufListAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1448 BufListType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1449 BufferType.tp_doc = "vim buffer list";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1450
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1451 vim_memset(&WinListType, 0, sizeof(WinListType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1452 WinListType.tp_name = "vim.windowlist";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1453 WinListType.tp_basicsize = sizeof(WinListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1454 WinListType.tp_as_sequence = &WinListAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1455 WinListType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1456 WinListType.tp_doc = "vim window list";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1457
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1458 vim_memset(&RangeType, 0, sizeof(RangeType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1459 RangeType.tp_name = "vim.range";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1460 RangeType.tp_basicsize = sizeof(RangeObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1461 RangeType.tp_dealloc = RangeDestructor;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1462 RangeType.tp_repr = RangeRepr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1463 RangeType.tp_as_sequence = &RangeAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1464 RangeType.tp_as_mapping = &RangeAsMapping;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1465 RangeType.tp_getattro = RangeGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1466 RangeType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1467 RangeType.tp_doc = "vim Range object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1468 RangeType.tp_methods = RangeMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1469 RangeType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1470 RangeType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1471 RangeType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1472
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1473 vim_memset(&CurrentType, 0, sizeof(CurrentType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1474 CurrentType.tp_name = "vim.currentdata";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1475 CurrentType.tp_basicsize = sizeof(CurrentObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1476 CurrentType.tp_getattro = CurrentGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1477 CurrentType.tp_setattro = CurrentSetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1478 CurrentType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1479 CurrentType.tp_doc = "vim current object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1480
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1481 vim_memset(&vimmodule, 0, sizeof(vimmodule));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1482 vimmodule.m_name = "vim";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1483 vimmodule.m_doc = vim_module_doc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1484 vimmodule.m_size = -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1485 vimmodule.m_methods = VimMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1486 }

Mercurial > vim

annotate src/if_python3.c @ 2447:84d353762845 vim73