vim: src/if_python3.c annotate

annotate src/if_python3.c @ 2539:4b51e4be14ab vim73

Updated translations. Added Portuguese tutor.

author	Bram Moolenaar <bram@vim.org>
date	Wed, 11 Aug 2010 23:11:47 +0200
parents	8bc2e8390c11
children	7abef60aca22

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

Mercurial > vim

annotate src/if_python3.c @ 2539:4b51e4be14ab vim73