vim: src/if_python3.c annotate

annotate src/if_python3.c @ 2399:76f0c4918f5c vim73

Move some common code from if_python.c and if_python3.c to if_py_both.h.

author	Bram Moolenaar <bram@vim.org>
date	Sat, 24 Jul 2010 23:51:45 +0200
parents	aeea25941392
children	eb4718cb2a76

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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	37 #if defined(_WIN32) && defined (HAVE_FCNTL_H)
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
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	72
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	73 #if defined(DYNAMIC_PYTHON3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	74
2374 f414e5a4b40e Fix: "import termios" doesn't work with dynamically loaded Python. (James Bram Moolenaar <bram@vim.org> parents: 2350 diff changeset	75 #ifndef WIN3264
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	76 #include <dlfcn.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	77 #define FARPROC void*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	78 #define HINSTANCE void*
2374 f414e5a4b40e Fix: "import termios" doesn't work with dynamically loaded Python. (James Bram Moolenaar <bram@vim.org> parents: 2350 diff changeset	79 #define load_dll(n) dlopen((n), RTLD_LAZY\|RTLD_GLOBAL)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	80 #define close_dll dlclose
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	81 #define symbol_from_dll dlsym
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	82 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	83 #define load_dll LoadLibrary
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	84 #define close_dll FreeLibrary
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	85 #define symbol_from_dll GetProcAddress
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	86 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	87 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	88 * Wrapper defines
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	89 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	90 #undef PyArg_Parse
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	91 # define PyArg_Parse py3_PyArg_Parse
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	92 #undef PyArg_ParseTuple
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	93 # define PyArg_ParseTuple py3_PyArg_ParseTuple
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	94 # define PyDict_SetItemString py3_PyDict_SetItemString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	95 # define PyErr_BadArgument py3_PyErr_BadArgument
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	96 # define PyErr_Clear py3_PyErr_Clear
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	97 # define PyErr_NoMemory py3_PyErr_NoMemory
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	98 # define PyErr_Occurred py3_PyErr_Occurred
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	99 # define PyErr_SetNone py3_PyErr_SetNone
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	100 # define PyErr_SetString py3_PyErr_SetString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	101 # define PyEval_InitThreads py3_PyEval_InitThreads
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	102 # define PyEval_RestoreThread py3_PyEval_RestoreThread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	103 # define PyEval_SaveThread py3_PyEval_SaveThread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	104 # define PyGILState_Ensure py3_PyGILState_Ensure
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	105 # define PyGILState_Release py3_PyGILState_Release
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	106 # define PyLong_AsLong py3_PyLong_AsLong
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	107 # define PyLong_FromLong py3_PyLong_FromLong
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	108 # define PyList_GetItem py3_PyList_GetItem
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	109 # define PyList_Append py3_PyList_Append
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	110 # define PyList_New py3_PyList_New
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	111 # define PyList_SetItem py3_PyList_SetItem
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	112 # define PyList_Size py3_PyList_Size
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	113 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	114 # define PyImport_ImportModule py3_PyImport_ImportModule
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	115 # define PyObject_Init py3__PyObject_Init
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	116 # define PyDict_New py3_PyDict_New
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	117 # define PyDict_GetItemString py3_PyDict_GetItemString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	118 # define PyModule_GetDict py3_PyModule_GetDict
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	119 #undef PyRun_SimpleString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	120 # define PyRun_SimpleString py3_PyRun_SimpleString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	121 # define PySys_SetObject py3_PySys_SetObject
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	122 # define PySys_SetArgv py3_PySys_SetArgv
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	123 # define PyType_Type (*py3_PyType_Type)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	124 # define PyType_Ready py3_PyType_Ready
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	125 #undef Py_BuildValue
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	126 # define Py_BuildValue py3_Py_BuildValue
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	127 # define Py_Initialize py3_Py_Initialize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	128 # define Py_Finalize py3_Py_Finalize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	129 # define Py_IsInitialized py3_Py_IsInitialized
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	130 # define _Py_NoneStruct (*py3__Py_NoneStruct)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	131 # define PyModule_AddObject py3_PyModule_AddObject
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	132 # define PyImport_AppendInittab py3_PyImport_AppendInittab
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	133 # define _PyUnicode_AsString py3__PyUnicode_AsString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	134 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	135 # define PySlice_Type (*py3_PySlice_Type)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	136 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	137 # define _Py_NegativeRefcount py3__Py_NegativeRefcount
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	138 # define _Py_RefTotal (*py3__Py_RefTotal)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	139 # define _Py_Dealloc py3__Py_Dealloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	140 # define _PyObject_DebugMalloc py3__PyObject_DebugMalloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	141 # define _PyObject_DebugFree py3__PyObject_DebugFree
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	142 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	143 # define PyObject_Malloc py3_PyObject_Malloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	144 # define PyObject_Free py3_PyObject_Free
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	145 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	146 # define PyType_GenericAlloc py3_PyType_GenericAlloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	147 # define PyType_GenericNew py3_PyType_GenericNew
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	148 # define PyModule_Create2 py3_PyModule_Create2
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	149 #undef PyUnicode_FromString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	150 # define PyUnicode_FromString py3_PyUnicode_FromString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	151 #undef PyUnicode_FromStringAndSize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	152 # define PyUnicode_FromStringAndSize py3_PyUnicode_FromStringAndSize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	153
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	154 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	155 #undef PyObject_NEW
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	156 #define PyObject_NEW(type, typeobj) \
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	157 ( (type *) PyObject_Init( \
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	158 (PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) )
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	159 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	160 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	161 * Pointers for dynamic link
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	162 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	163 static int (py3_PySys_SetArgv)(int, wchar_t *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	164 static void (*py3_Py_Initialize)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	165 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	166 static PyGILState_STATE (*py3_PyGILState_Ensure)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	167 static void (*py3_PyGILState_Release)(PyGILState_STATE);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	168 static int (py3_PySys_SetObject)(char , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	169 static PyObject* (py3_PyList_Append)(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	170 static Py_ssize_t (py3_PyList_Size)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	171 static int (py3_PySlice_GetIndicesEx)(PySliceObject r, Py_ssize_t length,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	172 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	173 static PyObject* (*py3_PyErr_NoMemory)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	174 static void (*py3_Py_Finalize)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	175 static void (py3_PyErr_SetString)(PyObject , const char *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	176 static int (py3_PyRun_SimpleString)(char );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	177 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	178 static PyObject* (py3_PyImport_ImportModule)(const char );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	179 static int (*py3_PyErr_BadArgument)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	180 static PyTypeObject* py3_PyType_Type;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	181 static PyObject* (*py3_PyErr_Occurred)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	182 static PyObject* (py3_PyModule_GetDict)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	183 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	184 static PyObject* (py3_PyDict_GetItemString)(PyObject , const char *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	185 static PyObject* (*py3_PyLong_FromLong)(long);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	186 static PyObject* (*py3_PyDict_New)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	187 static PyObject* (py3_Py_BuildValue)(char , ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	188 static int (py3_PyType_Ready)(PyTypeObject type);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	189 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	190 static PyObject* (py3_PyUnicode_FromString)(const char u);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	191 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	192 static long (py3_PyLong_AsLong)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	193 static void (py3_PyErr_SetNone)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	194 static void (*py3_PyEval_InitThreads)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	195 static void(py3_PyEval_RestoreThread)(PyThreadState );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	196 static PyThreadState(py3_PyEval_SaveThread)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	197 static int (py3_PyArg_Parse)(PyObject , char *, ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	198 static int (py3_PyArg_ParseTuple)(PyObject , char *, ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	199 static int (*py3_Py_IsInitialized)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	200 static void (*py3_PyErr_Clear)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	201 static PyObject(py3__PyObject_Init)(PyObject , PyTypeObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	202 static PyObject* py3__Py_NoneStruct;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	203 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	204 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	205 static char* (py3__PyUnicode_AsString)(PyObject unicode);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	206 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	207 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	208 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	209 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	210 static PyTypeObject* py3_PySlice_Type;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	211 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	212 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	213 static Py_ssize_t* py3__Py_RefTotal;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	214 static void (py3__Py_Dealloc)(PyObject obj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	215 static void (py3__PyObject_DebugFree)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	216 static void* (*py3__PyObject_DebugMalloc)(size_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	217 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	218 static void (py3_PyObject_Free)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	219 static void* (*py3_PyObject_Malloc)(size_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	220 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	221
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	222 static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	223
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	224 /* Imported exception objects */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	225 static PyObject *p3imp_PyExc_AttributeError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	226 static PyObject *p3imp_PyExc_IndexError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	227 static PyObject *p3imp_PyExc_KeyboardInterrupt;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	228 static PyObject *p3imp_PyExc_TypeError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	229 static PyObject *p3imp_PyExc_ValueError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	230
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	231 # define PyExc_AttributeError p3imp_PyExc_AttributeError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	232 # define PyExc_IndexError p3imp_PyExc_IndexError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	233 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	234 # define PyExc_TypeError p3imp_PyExc_TypeError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	235 # define PyExc_ValueError p3imp_PyExc_ValueError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	236
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	237 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	238 * Table of name to function pointer of python.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	239 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	240 # define PYTHON_PROC FARPROC
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	241 static struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	242 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	243 char *name;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	244 PYTHON_PROC *ptr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	245 } py3_funcname_table[] =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	246 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	247 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	248 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	249 {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	250 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	251 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	252 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	253 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	254 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	255 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	256 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	257 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	258 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	259 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	260 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	261 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	262 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	263 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	264 {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	265 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	266 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	267 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	268 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	269 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	270 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	271 {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	272 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	273 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	274 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	275 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	276 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	277 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	278 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	279 {"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	280 {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	281 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	282 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	283 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	284 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	285 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	286 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	287 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	288 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	289 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	290 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	291 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	292 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	293 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	294 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	295 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	296 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	297 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	298 {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	299 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	300 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	301 {"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	302 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	303 {"", NULL},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	304 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	305
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	306 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	307 * Free python.dll
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	308 */
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	309 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	310 end_dynamic_python3(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	311 {
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	312 if (hinstPy3 != 0)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	313 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	314 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	315 hinstPy3 = 0;
2329 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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	319 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	320 * Load library and get all pointers.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	321 * Parameter 'libname' provides name of DLL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	322 * Return OK or FAIL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	323 */
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	324 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	325 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	326 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	327 int i;
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	328 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	329
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	330 #if defined(UNIX) && defined(FEAT_PYTHON)
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	331 /* 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	332 * crash. */
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	333 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	334 {
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	335 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	336 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	337 }
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	338 #endif
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	339
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	340 if (hinstPy3 != 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	341 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	342 hinstPy3 = load_dll(libname);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	343
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	344 if (!hinstPy3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	345 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	346 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	347 EMSG2(_(e_loadlib), libname);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	348 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	349 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	350
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	351 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	352 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	353 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	354 py3_funcname_table[i].name)) == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	355 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	356 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	357 hinstPy3 = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	358 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	359 EMSG2(_(e_loadfunc), py3_funcname_table[i].name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	360 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	361 }
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
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	364 /* 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	365 * will be present in the library. */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	366 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	367 ucs_from_string_and_size = symbol_from_dll(hinstPy3,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	368 "PyUnicodeUCS2_FromStringAndSize");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	369 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	370 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	371 ucs_from_string = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	372 "PyUnicodeUCS4_FromString");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	373 ucs_from_string_and_size = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	374 "PyUnicodeUCS4_FromStringAndSize");
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 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	377 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	378 py3_PyUnicode_FromString = ucs_from_string;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	379 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	380 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	381 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	382 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	383 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	384 hinstPy3 = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	385 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	386 EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	387 return FAIL;
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	390 return OK;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	391 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	392
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	393 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	394 * 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	395 * TRUE, else FALSE.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	396 */
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	397 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	398 python3_enabled(int verbose)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	399 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	400 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	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 /* 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	404 * 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	405 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	406 static void get_py3_exceptions __ARGS((void));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	407
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	408 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	409 get_py3_exceptions()
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	410 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	411 PyObject *exmod = PyImport_ImportModule("builtins");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	412 PyObject *exdict = PyModule_GetDict(exmod);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	413 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	414 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	415 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	416 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	417 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	418 Py_XINCREF(p3imp_PyExc_AttributeError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	419 Py_XINCREF(p3imp_PyExc_IndexError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	420 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	421 Py_XINCREF(p3imp_PyExc_TypeError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	422 Py_XINCREF(p3imp_PyExc_ValueError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	423 Py_XDECREF(exmod);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	424 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	425 #endif /* DYNAMIC_PYTHON3 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	426
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	427 /*
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	428 * 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	429 */
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	430 #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	431
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	432 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	433 call_PyObject_Free(void *p)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	434 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	435 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	436 _PyObject_DebugFree(p);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	437 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	438 PyObject_Free(p);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	439 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	440 }
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	441
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	442 static 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	443 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	444 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	445 return PyType_GenericNew(type,args,kwds);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	446 }
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	447
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 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	449 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	450 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	451 return PyType_GenericAlloc(type,nitems);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	452 }
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 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	455 * Internal function prototypes.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	456 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	457
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	458 static void DoPy3Command(exarg_T , const char );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	459 static Py_ssize_t RangeStart;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	460 static Py_ssize_t RangeEnd;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	461
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	462 static void PythonIO_Flush(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	463 static int PythonIO_Init(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	464 static void PythonIO_Fini(void);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	465 PyMODINIT_FUNC Py3Init_vim(void);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	466
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	467 /* Utility functions for the vim/python interface
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	468 * ----------------------------------------------
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 static PyObject GetBufferLine(buf_T , Py_ssize_t);
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 static int SetBufferLine(buf_T , Py_ssize_t, PyObject , Py_ssize_t*);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	473 static int InsertBufferLines(buf_T , Py_ssize_t, PyObject , Py_ssize_t*);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	474 static PyObject GetBufferLineList(buf_T buf, Py_ssize_t lo, Py_ssize_t hi);
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 static PyObject LineToString(const char );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	477 static char StringToLine(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	478
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	479 #define PyErr_SetVim(str) PyErr_SetString(VimError, str)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	480
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	481 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	482 * 1. Python interpreter main program.
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 static int py3initialised = 0;
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 PyGILState_STATE pygilstate = PyGILState_UNLOCKED;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	489
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	490 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	491 python3_end()
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	492 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	493 static int recurse = 0;
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 /* 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	496 if (recurse != 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	497 return;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	498
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	499 ++recurse;
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 #ifdef DYNAMIC_PYTHON3
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	502 if (hinstPy3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	503 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	504 if (Py_IsInitialized())
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	505 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	506 // acquire lock before finalizing
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	507 pygilstate = PyGILState_Ensure();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	508
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	509 PythonIO_Fini();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	510 Py_Finalize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	511 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	512
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	513 #ifdef DYNAMIC_PYTHON3
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	514 end_dynamic_python3();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	515 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	516
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	517 --recurse;
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
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	520 #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	521 int
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	522 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	523 {
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	524 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	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 #endif
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	527
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	528 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	529 Python3_Init(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	530 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	531 if (!py3initialised)
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 #ifdef DYNAMIC_PYTHON3
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	534 if (!python3_enabled(TRUE))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	535 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	536 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	537 goto fail;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	538 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	539 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	540
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	541 init_structs();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	542
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	543 /* initialise threads */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	544 PyEval_InitThreads();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	545
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	546 #if !defined(MACOS) \|\| defined(MACOS_X_UNIX)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	547 Py_Initialize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	548 #else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	549 PyMac_Initialize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	550 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	551
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	552 #ifdef DYNAMIC_PYTHON3
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	553 get_py3_exceptions();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	554 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	555
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	556 if (PythonIO_Init())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	557 goto fail;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	558
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	559 PyImport_AppendInittab("vim", Py3Init_vim);
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 /* Remove the element from sys.path that was added because of our
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	562 * argv[0] value in Py3Init_vim(). Previously we used an empty
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	563 * 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	564 * the current directory in sys.path. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	565 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	566
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	567 // 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	568 // state is created in Py_Initialize()
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	569 // there _PyGILState_NoteThreadState() also sets gilcounter to 1
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	570 // (python must have threads enabled!)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	571 // 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	572 // without deleting thread state
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	573 PyGILState_Release(pygilstate);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	574
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	575 py3initialised = 1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	576 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	577
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	578 return 0;
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 fail:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	581 /* 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	582 * 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	583 * 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	584 * not do anything in this case).
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	585 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	586 PythonIO_Flush();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	587 return -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	588 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	589
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 * External interface
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	592 */
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	593 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	594 DoPy3Command(exarg_T eap, const char cmd)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	595 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	596 #if defined(MACOS) && !defined(MACOS_X_UNIX)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	597 GrafPtr oldPort;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	598 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	599 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	600 char *saved_locale;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	601 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	602
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	603 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	604 GetPort(&oldPort);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	605 /* Check if the Python library is available */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	606 if ((Ptr)PyMac_Initialize == (Ptr)kUnresolvedCFragSymbolAddress)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	607 goto theend;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	608 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	609 if (Python3_Init())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	610 goto theend;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	611
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	612 RangeStart = eap->line1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	613 RangeEnd = eap->line2;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	614 Python_Release_Vim(); /* leave vim */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	615
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	616 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	617 /* 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	618 saved_locale = setlocale(LC_NUMERIC, NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	619 if (saved_locale == NULL \|\| STRCMP(saved_locale, "C") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	620 saved_locale = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	621 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	622 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	623 /* Need to make a copy, value may change when setting new locale. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	624 saved_locale = (char )vim_strsave((char_u )saved_locale);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	625 (void)setlocale(LC_NUMERIC, "C");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	626 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	627 #endif
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 pygilstate = PyGILState_Ensure();
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 PyRun_SimpleString((char *)(cmd));
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 PyGILState_Release(pygilstate);
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 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	636 if (saved_locale != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	637 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	638 (void)setlocale(LC_NUMERIC, saved_locale);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	639 vim_free(saved_locale);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	640 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	641 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	642
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	643 Python_Lock_Vim(); /* enter vim */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	644 PythonIO_Flush();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	645 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	646 SetPort(oldPort);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	647 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	648
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	649 theend:
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	650 return; /* keeps lint happy */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	651 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	652
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	653 /*
2350 06feaf4fe36a Rename some "python3" symbols to "py3", as the command name. Bram Moolenaar <bram@vim.org> parents: 2342 diff changeset	654 * ":py3"
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	655 */
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	656 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	657 ex_py3(exarg_T *eap)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	658 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	659 char_u *script;
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 script = script_get(eap, eap->arg);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	662 if (!eap->skip)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	663 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	664 if (script == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	665 DoPy3Command(eap, (char *)eap->arg);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	666 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	667 DoPy3Command(eap, (char *)script);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	668 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	669 vim_free(script);
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	672 #define BUFFER_SIZE 2048
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 /*
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	675 * ":py3file"
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	676 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	677 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	678 ex_py3file(exarg_T *eap)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	679 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	680 static char buffer[BUFFER_SIZE];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	681 const char *file;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	682 char *p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	683 int i;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	684
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	685 /* 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	686 * 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	687 * 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	688 * compatible between the two. Yuk.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	689 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	690 * 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	691 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	692 * 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	693 * Python won't mangle the file name.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	694 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	695
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	696 strcpy(buffer, "exec(compile(open('");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	697 p = buffer + 19; /* size of "exec(compile(open('" */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	698
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	699 for (i=0; i<2; ++i)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	700 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	701 file = (char *)eap->arg;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	702 while (*file && p < buffer + (BUFFER_SIZE - 3))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	703 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	704 if (file == '\\' \|\| file == '\'')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	705 *p++ = '\\';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	706 p++ = file++;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	707 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	708 /* 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	709 if (*file != '\0')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	710 return;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	711 if (i==0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	712 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	713 strcpy(p,"').read(),'");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	714 p += 11;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	715 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	716 else
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 strcpy(p,"','exec'))");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	719 p += 10;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	720 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	721 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	722
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 /* Execute the file */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	725 DoPy3Command(eap, buffer);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	726 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	727
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 * 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	730 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	731
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	732 /* Implementation functions
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	735 static PyObject OutputGetattro(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	736 static int OutputSetattro(PyObject , PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	737
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	738 /*************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	739
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	740 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	741 OutputGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	742 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	743 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	744 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	745 name = _PyUnicode_AsString(nameobj);
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 if (strcmp(name, "softspace") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	748 return PyLong_FromLong(((OutputObject *)(self))->softspace);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	749
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	750 return PyObject_GenericGetAttr(self, nameobj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	751 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	752
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	753 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	754 OutputSetattro(PyObject self, PyObject nameobj, PyObject *val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	755 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	756 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	757 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	758 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	759
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	760 if (val == NULL) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	761 PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	762 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	763 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	764
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	765 if (strcmp(name, "softspace") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	766 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	767 if (!PyLong_Check(val)) {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	768 PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	769 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	770 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	771
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	772 ((OutputObject *)(self))->softspace = PyLong_AsLong(val);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	773 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	774 }
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 PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	777 return -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	778 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	779
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	780 /***************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	781
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	782 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	783 PythonIO_Init(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	784 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	785 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	786 return PythonIO_Init_io();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	787 }
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	788
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	789 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	790 PythonIO_Fini(void)
2329 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 PySys_SetObject("stdout", NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	793 PySys_SetObject("stderr", NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	794 }
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 * 3. Implementation of the Vim module for Python
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 /* Vim module - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	801 * -------------------------------------
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	804 static PyObject VimCommand(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	805 static PyObject VimEval(PyObject , PyObject *);
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 /* Window type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	808 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	809 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	810
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	811 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	812 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	813 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	814 win_T *win;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	815 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	816 WindowObject;
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 #define INVALID_WINDOW_VALUE ((win_T *)(-1))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	819
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	820 #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	821
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	822 static PyObject WindowNew(win_T );
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 static void WindowDestructor(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	825 static PyObject WindowGetattro(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	826 static int WindowSetattro(PyObject , PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	827 static PyObject WindowRepr(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	828
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	829 /* Buffer type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	830 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	831 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	832
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	833 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	834 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	835 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	836 buf_T *buf;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	837 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	838 BufferObject;
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 #define INVALID_BUFFER_VALUE ((buf_T *)(-1))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	841
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	842 #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	843
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	844 static PyObject BufferNew (buf_T );
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 static void BufferDestructor(PyObject *);
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 static PyObject BufferGetattro(PyObject , PyObject*);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	849 static PyObject BufferRepr(PyObject );
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 Py_ssize_t BufferLength(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	852 static PyObject BufferItem(PyObject , Py_ssize_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	853 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	854 static PyObject* BufferSubscript(PyObject self, PyObject idx);
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 static PyObject BufferAppend(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	857 static PyObject BufferMark(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	858 static PyObject BufferRange(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	859
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	860 /* Line range type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	861 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	862 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	863
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	864 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	865 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	866 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	867 BufferObject *buf;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	868 Py_ssize_t start;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	869 Py_ssize_t end;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	870 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	871 RangeObject;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	872
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	873 #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	874
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	875 static PyObject RangeNew(buf_T , Py_ssize_t, Py_ssize_t);
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 static void RangeDestructor(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	878 static PyObject RangeGetattro(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	879 static PyObject RangeRepr(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	880 static PyObject* RangeSubscript(PyObject self, PyObject idx);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	881
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	882 static Py_ssize_t RangeLength(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	883 static PyObject RangeItem(PyObject , Py_ssize_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	884 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	885
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	886 static PyObject RangeAppend(PyObject , PyObject *);
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 /* Window list type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	889 * -------------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	890 */
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 static Py_ssize_t WinListLength(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	893 static PyObject WinListItem(PyObject , Py_ssize_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	894
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	895 /* Buffer list type - Implementation functions
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 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	898
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	899 static Py_ssize_t BufListLength(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	900 static PyObject BufListItem(PyObject , Py_ssize_t);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	901
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	902 /* Current objects type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	903 * -----------------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	904 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	905
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	906 static PyObject CurrentGetattro(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	907 static int CurrentSetattro(PyObject , PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	908
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	909 /* Vim module - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	910 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	911
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	912 static struct PyMethodDef VimMethods[] = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	913 /* name, function, calling, documentation */
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	914 {"command", VimCommand, 1, "Execute a Vim ex-mode command" },
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	915 {"eval", VimEval, 1, "Evaluate an expression using Vim evaluator" },
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	916 { NULL, NULL, 0, NULL }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	917 };
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 /* Vim module - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	920 */
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	921 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	922 VimCommand(PyObject self UNUSED, PyObject args)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	923 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	924 char *cmd;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	925 PyObject *result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	926
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	927 if (!PyArg_ParseTuple(args, "s", &cmd))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	928 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	929
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	930 PyErr_Clear();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	931
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	932 Py_BEGIN_ALLOW_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	933 Python_Lock_Vim();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	934
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	935 do_cmdline_cmd((char_u *)cmd);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	936 update_screen(VALID);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	937
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	938 Python_Release_Vim();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	939 Py_END_ALLOW_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	940
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	941 if (VimErrorCheck())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	942 result = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	943 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	944 result = Py_None;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	945
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	946 Py_XINCREF(result);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	947 return result;
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 #ifdef FEAT_EVAL
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	951 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	952 * Function to translate a typval_T into a PyObject; this will recursively
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	953 * translate lists/dictionaries into their Python equivalents.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	954 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	955 * The depth parameter is to avoid infinite recursion, set it to 1 when
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	956 * you call VimToPython.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	957 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	958 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	959 VimToPython(typval_T our_tv, int depth, PyObject lookupDict)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	960 {
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	961 PyObject *result;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	962 PyObject *newObj;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	963 char ptrBuf[NUMBUFLEN];
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	964
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	965 /* Avoid infinite recursion */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	966 if (depth > 100)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	967 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	968 Py_INCREF(Py_None);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	969 result = Py_None;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	970 return result;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	971 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	972
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	973 /* Check if we run into a recursive loop. The item must be in lookupDict
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	974 * then and we can use it again. */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	975 if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	976 \|\| (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	977 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	978 sprintf(ptrBuf, PRINTF_DECIMAL_LONG_U,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	979 our_tv->v_type == VAR_LIST ? (long_u)our_tv->vval.v_list
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	980 : (long_u)our_tv->vval.v_dict);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	981 result = PyDict_GetItemString(lookupDict, ptrBuf);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	982 if (result != NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	983 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	984 Py_INCREF(result);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	985 return result;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	986 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	987 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	988
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	989 if (our_tv->v_type == VAR_STRING)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	990 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	991 result = Py_BuildValue("s", our_tv->vval.v_string);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	992 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	993 else if (our_tv->v_type == VAR_NUMBER)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	994 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	995 char buf[NUMBUFLEN];
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	996
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	997 /* For backwards compatibility numbers are stored as strings. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	998 sprintf(buf, "%ld", (long)our_tv->vval.v_number);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	999 result = Py_BuildValue("s", buf);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1000 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1001 # ifdef FEAT_FLOAT
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1002 else if (our_tv->v_type == VAR_FLOAT)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1003 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1004 char buf[NUMBUFLEN];
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1005
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1006 sprintf(buf, "%f", our_tv->vval.v_float);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1007 result = Py_BuildValue("s", buf);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1008 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1009 # endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1010 else if (our_tv->v_type == VAR_LIST)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1011 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1012 list_T *list = our_tv->vval.v_list;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1013 listitem_T *curr;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1014
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1015 result = PyList_New(0);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1016
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1017 if (list != NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1018 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1019 PyDict_SetItemString(lookupDict, ptrBuf, result);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1020
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1021 for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1022 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1023 newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1024 PyList_Append(result, newObj);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1025 Py_DECREF(newObj);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1026 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1027 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1028 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1029 else if (our_tv->v_type == VAR_DICT)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1030 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1031 result = PyDict_New();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1032
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1033 if (our_tv->vval.v_dict != NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1034 {
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	1035 hashtab_T *ht = &our_tv->vval.v_dict->dv_hashtab;
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	1036 long_u todo = ht->ht_used;
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	1037 hashitem_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	1038 dictitem_T *di;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1039
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1040 PyDict_SetItemString(lookupDict, ptrBuf, result);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1041
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	1042 for (hi = ht->ht_array; todo > 0; ++hi)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1043 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1044 if (!HASHITEM_EMPTY(hi))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1045 {
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	1046 --todo;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1047
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1048 di = dict_lookup(hi);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1049 newObj = VimToPython(&di->di_tv, depth + 1, lookupDict);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1050 PyDict_SetItemString(result, (char *)hi->hi_key, newObj);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1051 Py_DECREF(newObj);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1052 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1053 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1054 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1055 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1056 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1057 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1058 Py_INCREF(Py_None);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1059 result = Py_None;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1060 }
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 return result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1063 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1064 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1065
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	1066 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	1067 VimEval(PyObject self UNUSED, PyObject args)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1068 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1069 #ifdef FEAT_EVAL
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1070 char *expr;
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	1071 typval_T *our_tv;
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	1072 PyObject *result;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1073 PyObject *lookup_dict;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1074
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1075 if (!PyArg_ParseTuple(args, "s", &expr))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1076 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1077
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1078 Py_BEGIN_ALLOW_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1079 Python_Lock_Vim();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1080 our_tv = eval_expr((char_u *)expr, NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1081
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1082 Python_Release_Vim();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1083 Py_END_ALLOW_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1084
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1085 if (our_tv == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1086 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1087 PyErr_SetVim(_("invalid expression"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1088 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1089 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1090
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1091 /* Convert the Vim type into a Python type. Create a dictionary that's
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1092 * used to check for recursive loops. */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1093 lookup_dict = PyDict_New();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1094 result = VimToPython(our_tv, 1, lookup_dict);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1095 Py_DECREF(lookup_dict);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1096
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1097
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1098 Py_BEGIN_ALLOW_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1099 Python_Lock_Vim();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1100 free_tv(our_tv);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1101 Python_Release_Vim();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1102 Py_END_ALLOW_THREADS
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 return result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1105 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1106 PyErr_SetVim(_("expressions disabled at compile time"));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1107 return NULL;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1108 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1109 }
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 /* Common routines for buffers and line ranges
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1112 * -------------------------------------------
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
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	1115 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	1116 CheckBuffer(BufferObject *this)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1117 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1118 if (this->buf == INVALID_BUFFER_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1119 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1120 PyErr_SetVim(_("attempt to refer to deleted buffer"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1121 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1122 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1123
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1124 return 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1125 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1126
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	1127 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	1128 RBItem(BufferObject *self, Py_ssize_t n, Py_ssize_t start, Py_ssize_t end)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1129 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1130 if (CheckBuffer(self))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1131 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1132
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1133 if (n < 0 \|\| n > end - start)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1134 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1135 PyErr_SetString(PyExc_IndexError, _("line number out of range"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1136 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1137 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1138
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1139 return GetBufferLine(self->buf, n+start);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1140 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1141
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1142 static 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	1143 RBSlice(BufferObject *self, Py_ssize_t lo, Py_ssize_t hi, Py_ssize_t start, Py_ssize_t end)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1144 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1145 Py_ssize_t size;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1146
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1147 if (CheckBuffer(self))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1148 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1149
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1150 size = end - start + 1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1151
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1152 if (lo < 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1153 lo = 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1154 else if (lo > size)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1155 lo = size;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1156 if (hi < 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1157 hi = 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1158 if (hi < lo)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1159 hi = lo;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1160 else if (hi > size)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1161 hi = size;
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 return GetBufferLineList(self->buf, lo+start, hi+start);
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
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	1166 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	1167 RBAsItem(BufferObject self, Py_ssize_t n, PyObject val, Py_ssize_t start, Py_ssize_t end, Py_ssize_t *new_end)
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	1168 {
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	1169 Py_ssize_t len_change;
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	1170
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	1171 if (CheckBuffer(self))
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	1172 return -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	1173
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	1174 if (n < 0 \|\| n > end - start)
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	1175 {
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	1176 PyErr_SetString(PyExc_IndexError, _("line number out of range"));
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	1177 return -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	1178 }
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	1179
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	1180 if (SetBufferLine(self->buf, n+start, val, &len_change) == FAIL)
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	1181 return -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	1182
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	1183 if (new_end)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1184 *new_end = end + len_change;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1185
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	1186 return 0;
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	1187 }
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	1188
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	1189 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	1190 RBAppend(BufferObject self, PyObject args, Py_ssize_t start, Py_ssize_t end, Py_ssize_t *new_end)
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 PyObject *lines;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1193 Py_ssize_t len_change;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1194 Py_ssize_t max;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1195 Py_ssize_t n;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1196
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1197 if (CheckBuffer(self))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1198 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1199
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1200 max = n = end - start + 1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1201
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1202 if (!PyArg_ParseTuple(args, "O\|n" , &lines, &n))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1203 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1204
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1205 if (n < 0 \|\| n > max)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1206 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1207 PyErr_SetString(PyExc_ValueError, _("line number out of range"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1208 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1209 }
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 if (InsertBufferLines(self->buf, n + start - 1, lines, &len_change) == FAIL)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1212 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1213
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1214 if (new_end)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1215 *new_end = end + len_change;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1216
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1217 Py_INCREF(Py_None);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1218 return Py_None;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1219 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1220
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1221
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	1222 /* Buffer object - Definitions
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	1223 */
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	1224
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1225 static struct PyMethodDef BufferMethods[] = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1226 /* name, function, calling, documentation */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1227 {"append", BufferAppend, 1, "Append data to Vim buffer" },
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1228 {"mark", BufferMark, 1, "Return (row,col) representing position of named mark" },
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1229 {"range", BufferRange, 1, "Return a range object which represents the part of the given buffer between line numbers s and e" },
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1230 { NULL, NULL, 0, NULL }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1231 };
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 static PySequenceMethods BufferAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1234 (lenfunc) BufferLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1235 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1236 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1237 (ssizeargfunc) BufferItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1238 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1239 (ssizeobjargproc) BufferAsItem, /* sq_ass_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1240 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	1241 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1242 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1243 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1244 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1245
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1246 PyMappingMethods BufferAsMapping = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1247 /* mp_length */ (lenfunc)BufferLength,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1248 /* mp_subscript */ (binaryfunc)BufferSubscript,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1249 /* mp_ass_subscript */ (objobjargproc)0,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1250 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1251
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1252
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1253 /* Buffer object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1254 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1255
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1256 static PyTypeObject BufferType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1257
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	1258 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	1259 BufferNew(buf_T *buf)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1260 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1261 /* 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	1262 * 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	1263 * 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	1264 * 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	1265 * 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	1266 * 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	1267 * the buffer is stored in "b_python3_ref".
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1268 * 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	1269 * 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	1270 * 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	1271 * 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	1272 * 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	1273 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1274
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1275 BufferObject *self;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1276
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1277 if (buf->b_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1278 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1279 self = buf->b_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1280 Py_INCREF(self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1281 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1282 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1283 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1284 self = PyObject_NEW(BufferObject, &BufferType);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1285 buf->b_python3_ref = self;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1286 if (self == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1287 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1288 self->buf = buf;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1289 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1290
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1291 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1292 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1293
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	1294 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	1295 BufferDestructor(PyObject *self)
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 BufferObject this = (BufferObject )(self);
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 (this->buf && this->buf != INVALID_BUFFER_VALUE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1300 this->buf->b_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1301 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1302
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	1303 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	1304 BufferGetattro(PyObject self, PyObjectnameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1305 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1306 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1307
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1308 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1309 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1310 name = _PyUnicode_AsString(nameobj);
2329 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 if (CheckBuffer(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1313 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1314
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1315 if (strcmp(name, "name") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1316 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	1317 else if (strcmp(name, "number") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1318 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	1319 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1320 return Py_BuildValue("[ss]", "name", "number");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1321 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1322 return PyObject_GenericGetAttr(self, nameobj);
2329 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
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	1325 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	1326 BufferRepr(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1327 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1328 static char repr[100];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1329 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1330
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1331 if (this->buf == INVALID_BUFFER_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1332 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1333 vim_snprintf(repr, 100, _("<buffer object (deleted) at %p>"), (self));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1334 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1335 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1336 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1337 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1338 char name = (char )this->buf->b_fname;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1339 Py_ssize_t len;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1340
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1341 if (name == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1342 name = "";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1343 len = strlen(name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1344
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1345 if (len > 35)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1346 name = name + (35 - len);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1347
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1348 vim_snprintf(repr, 100, "<buffer %s%s>", len > 35 ? "..." : "", name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1349
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1350 return PyUnicode_FromString(repr);
2329 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 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1353
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1354 /******************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1355
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	1356 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	1357 BufferLength(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1358 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1359 if (CheckBuffer((BufferObject *)(self)))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1360 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1361
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1362 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	1363 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1364
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	1365 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	1366 BufferItem(PyObject *self, Py_ssize_t n)
2329 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 return RBItem((BufferObject *)(self), n, 1,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1369 (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	1370 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1371
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	1372 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	1373 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	1374 {
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	1375 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	1376 (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	1377 }
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	1378
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	1379 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	1380 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	1381 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1382 return RBAsItem((BufferObject *)(self), n, val, 1,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1383 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1384 NULL);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1385 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1386
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	1387
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	1388 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	1389 BufferSubscript(PyObject self, PyObject idx)
2329 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 if (PyLong_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1392 long _idx = PyLong_AsLong(idx);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1393 return BufferItem(self,_idx);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1394 } else if (PySlice_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1395 Py_ssize_t start, stop, step, slicelen;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1396
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1397 if (PySlice_GetIndicesEx((PySliceObject *)idx,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1398 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1399 &start, &stop,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1400 &step, &slicelen) < 0) {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1401 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1402 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1403 return BufferSlice(self,start,stop+1);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1404 } else {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1405 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1406 return NULL;
2329 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 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1409
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	1410 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	1411 BufferAppend(PyObject self, PyObject args)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1412 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1413 return RBAppend((BufferObject *)(self), args, 1,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1414 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1415 NULL);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1416 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1417
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	1418 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	1419 BufferMark(PyObject self, PyObject args)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1420 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1421 pos_T *posp;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1422 char *pmark;//test
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1423 char mark;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1424 buf_T *curbuf_save;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1425
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1426 if (CheckBuffer((BufferObject *)(self)))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1427 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1428
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1429 if (!PyArg_ParseTuple(args, "s", &pmark))//test: "c"->"s"
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1430 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1431 mark = *pmark;//test
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1432
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1433 curbuf_save = curbuf;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1434 curbuf = ((BufferObject *)(self))->buf;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1435 posp = getmark(mark, FALSE);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1436 curbuf = curbuf_save;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1437
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1438 if (posp == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1439 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1440 PyErr_SetVim(_("invalid mark name"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1441 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1442 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1443
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1444 /* Ckeck for keyboard interrupt */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1445 if (VimErrorCheck())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1446 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1447
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1448 if (posp->lnum <= 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1449 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1450 /* Or raise an error? */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1451 Py_INCREF(Py_None);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1452 return Py_None;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1453 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1454
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1455 return Py_BuildValue("(ll)", (long)(posp->lnum), (long)(posp->col));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1456 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1457
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	1458 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	1459 BufferRange(PyObject self, PyObject args)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1460 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1461 Py_ssize_t start;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1462 Py_ssize_t end;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1463
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1464 if (CheckBuffer((BufferObject *)(self)))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1465 return NULL;
2329 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 if (!PyArg_ParseTuple(args, "nn", &start, &end))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1468 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1469
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1470 return RangeNew(((BufferObject *)(self))->buf, start, end);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1471 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1472
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1473 /* Line range object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1474 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1475
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1476 static struct PyMethodDef RangeMethods[] = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1477 /* name, function, calling, documentation */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1478 {"append", RangeAppend, 1, "Append data to the Vim range" },
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1479 { NULL, NULL, 0, NULL }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1480 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1481
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1482 static PySequenceMethods RangeAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1483 (lenfunc) RangeLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1484 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1485 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1486 (ssizeargfunc) RangeItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1487 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1488 (ssizeobjargproc) RangeAsItem, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1489 0, /* sq_ass_slice, x[i:j]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1490 0, /* sq_contains */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1491 0, /* sq_inplace_concat */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1492 0, /* sq_inplace_repeat */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1493 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1494
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1495 PyMappingMethods RangeAsMapping = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1496 /* mp_length */ (lenfunc)RangeLength,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1497 /* mp_subscript */ (binaryfunc)RangeSubscript,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1498 /* mp_ass_subscript */ (objobjargproc)0,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1499 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1500
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1501 static PyTypeObject RangeType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1502
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1503 /* Line range object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1504 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1505
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	1506 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	1507 RangeNew(buf_T *buf, Py_ssize_t start, Py_ssize_t end)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1508 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1509 BufferObject *bufr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1510 RangeObject *self;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1511 self = PyObject_NEW(RangeObject, &RangeType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1512 if (self == NULL)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1513 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1514
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1515 bufr = (BufferObject *)BufferNew(buf);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1516 if (bufr == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1517 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1518 Py_DECREF(self);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1519 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1520 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1521 Py_INCREF(bufr);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1522
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1523 self->buf = bufr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1524 self->start = start;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1525 self->end = end;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1526
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1527 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1528 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1529
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	1530 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	1531 RangeDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1532 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1533 Py_DECREF(((RangeObject *)(self))->buf);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1534 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1535
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	1536 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	1537 RangeGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1538 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1539 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1540 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1541 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1542
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1543 if (strcmp(name, "start") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1544 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	1545 else if (strcmp(name, "end") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1546 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	1547 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1548 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1549 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1550
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	1551 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	1552 RangeRepr(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1553 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1554 static char repr[100];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1555 RangeObject this = (RangeObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1556
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1557 if (this->buf->buf == INVALID_BUFFER_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1558 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1559 vim_snprintf(repr, 100, "<range object (for deleted buffer) at %p>",
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1560 (self));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1561 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1562 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1563 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1564 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1565 char name = (char )this->buf->buf->b_fname;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1566 int len;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1567
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1568 if (name == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1569 name = "";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1570 len = (int)strlen(name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1571
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1572 if (len > 45)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1573 name = name + (45 - len);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1574
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1575 vim_snprintf(repr, 100, "<range %s%s (%d:%d)>",
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1576 len > 45 ? "..." : "", name,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1577 this->start, this->end);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1578
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1579 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1580 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1581 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1582
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1583 /****************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1584
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	1585 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	1586 RangeLength(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1587 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1588 /* HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION? */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1589 if (CheckBuffer(((RangeObject *)(self))->buf))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1590 return -1; /* ??? */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1591
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1592 return (((RangeObject )(self))->end - ((RangeObject )(self))->start + 1);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1593 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1594
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	1595 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	1596 RangeItem(PyObject *self, Py_ssize_t n)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1597 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1598 return RBItem(((RangeObject *)(self))->buf, n,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1599 ((RangeObject *)(self))->start,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1600 ((RangeObject *)(self))->end);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1601 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1602
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	1603 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	1604 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	1605 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1606 return RBAsItem(((RangeObject *)(self))->buf, n, val,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1607 ((RangeObject *)(self))->start,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1608 ((RangeObject *)(self))->end,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1609 &((RangeObject *)(self))->end);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1610 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1611
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	1612 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	1613 RangeSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1614 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1615 return RBSlice(((RangeObject *)(self))->buf, lo, hi,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1616 ((RangeObject *)(self))->start,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1617 ((RangeObject *)(self))->end);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1618 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1619
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	1620 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	1621 RangeSubscript(PyObject self, PyObject idx)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1622 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1623 if (PyLong_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1624 long _idx = PyLong_AsLong(idx);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1625 return RangeItem(self,_idx);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1626 } else if (PySlice_Check(idx)) {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1627 Py_ssize_t start, stop, step, slicelen;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1628
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1629 if (PySlice_GetIndicesEx((PySliceObject *)idx,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1630 ((RangeObject )(self))->end-((RangeObject )(self))->start+1,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1631 &start, &stop,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1632 &step, &slicelen) < 0) {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1633 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1634 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1635 return RangeSlice(self,start,stop+1);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1636 } else {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1637 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1638 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1639 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1640 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1641
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	1642 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	1643 RangeAppend(PyObject self, PyObject args)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1644 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1645 return RBAppend(((RangeObject *)(self))->buf, args,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1646 ((RangeObject *)(self))->start,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1647 ((RangeObject *)(self))->end,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1648 &((RangeObject *)(self))->end);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1649 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1650
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1651 /* Buffer list object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1652 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1653
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1654 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1655 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1656 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1657 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1658 BufListObject;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1659
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1660 static PySequenceMethods BufListAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1661 (lenfunc) BufListLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1662 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1663 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1664 (ssizeargfunc) BufListItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1665 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1666 (ssizeobjargproc) 0, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1667 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	1668 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1669 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1670 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1671 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1672
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1673 static PyTypeObject BufListType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1674
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1675 /* Buffer list object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1676 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1677
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	1678 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	1679 BufListLength(PyObject *self UNUSED)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1680 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1681 buf_T *b = firstbuf;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1682 Py_ssize_t n = 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1683
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1684 while (b)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1685 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1686 ++n;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1687 b = b->b_next;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1688 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1689
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1690 return n;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1691 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1692
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	1693 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	1694 BufListItem(PyObject *self UNUSED, Py_ssize_t n)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1695 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1696 buf_T *b;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1697
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1698 for (b = firstbuf; b; b = b->b_next, --n)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1699 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1700 if (n == 0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1701 return BufferNew(b);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1702 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1703
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1704 PyErr_SetString(PyExc_IndexError, _("no such buffer"));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1705 return NULL;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1706 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1707
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1708 /* Window object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1709 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1710
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1711 static struct PyMethodDef WindowMethods[] = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1712 /* name, function, calling, documentation */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1713 { NULL, NULL, 0, NULL }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1714 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1715
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1716 static PyTypeObject WindowType;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1717
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1718 /* Window object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1719 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1720
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	1721 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	1722 WindowNew(win_T *win)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1723 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1724 /* 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	1725 * 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	1726 * 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	1727 * 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	1728 * 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	1729 * 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	1730 * the window is stored in "w_python3_ref".
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1731 * 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	1732 * 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	1733 * 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	1734 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1735
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1736 WindowObject *self;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1737
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1738 if (win->w_python3_ref)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1739 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1740 self = win->w_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1741 Py_INCREF(self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1742 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1743 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1744 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1745 self = PyObject_NEW(WindowObject, &WindowType);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1746 if (self == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1747 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1748 self->win = win;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1749 win->w_python3_ref = self;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1750 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1751
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1752 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1753 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1754
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	1755 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	1756 WindowDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1757 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1758 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1759
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1760 if (this->win && this->win != INVALID_WINDOW_VALUE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1761 this->win->w_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1762 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1763
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	1764 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	1765 CheckWindow(WindowObject *this)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1766 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1767 if (this->win == INVALID_WINDOW_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1768 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1769 PyErr_SetVim(_("attempt to refer to deleted window"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1770 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1771 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1772
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1773 return 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1774 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1775
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	1776 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	1777 WindowGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1778 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1779 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1780
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1781 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1782 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1783 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1784
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1785
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1786 if (CheckWindow(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1787 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1788
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1789 if (strcmp(name, "buffer") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1790 return (PyObject *)BufferNew(this->win->w_buffer);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1791 else if (strcmp(name, "cursor") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1792 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1793 pos_T *pos = &this->win->w_cursor;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1794
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1795 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	1796 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1797 else if (strcmp(name, "height") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1798 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	1799 #ifdef FEAT_VERTSPLIT
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1800 else if (strcmp(name, "width") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1801 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	1802 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1803 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1804 return Py_BuildValue("[sss]", "buffer", "cursor", "height");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1805 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1806 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1807 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1808
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	1809 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	1810 WindowSetattro(PyObject self, PyObject nameobj, PyObject *val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1811 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1812 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1813
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1814 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1815 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1816 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1817
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1818
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1819 if (CheckWindow(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1820 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1821
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1822 if (strcmp(name, "buffer") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1823 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1824 PyErr_SetString(PyExc_TypeError, _("readonly attribute"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1825 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1826 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1827 else if (strcmp(name, "cursor") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1828 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1829 long lnum;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1830 long col;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1831
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1832 if (!PyArg_Parse(val, "(ll)", &lnum, &col))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1833 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1834
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1835 if (lnum <= 0 \|\| lnum > this->win->w_buffer->b_ml.ml_line_count)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1836 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1837 PyErr_SetVim(_("cursor position outside buffer"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1838 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1839 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1840
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1841 /* Check for keyboard interrupts */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1842 if (VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1843 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1844
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1845 /* NO CHECK ON COLUMN - SEEMS NOT TO MATTER */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1846
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1847 this->win->w_cursor.lnum = lnum;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1848 this->win->w_cursor.col = col;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1849 update_screen(VALID);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1850
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1851 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1852 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1853 else if (strcmp(name, "height") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1854 {
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	1855 int height;
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	1856 win_T *savewin;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1857
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1858 if (!PyArg_Parse(val, "i", &height))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1859 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1860
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1861 #ifdef FEAT_GUI
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1862 need_mouse_correct = TRUE;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1863 #endif
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1864 savewin = curwin;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1865 curwin = this->win;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1866 win_setheight(height);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1867 curwin = savewin;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1868
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1869 /* Check for keyboard interrupts */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1870 if (VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1871 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1872
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1873 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1874 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1875 #ifdef FEAT_VERTSPLIT
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1876 else if (strcmp(name, "width") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1877 {
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	1878 int width;
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	1879 win_T *savewin;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1880
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1881 if (!PyArg_Parse(val, "i", &width))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1882 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1883
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1884 #ifdef FEAT_GUI
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1885 need_mouse_correct = TRUE;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1886 #endif
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1887 savewin = curwin;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1888 curwin = this->win;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1889 win_setwidth(width);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1890 curwin = savewin;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1891
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1892 /* Check for keyboard interrupts */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1893 if (VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1894 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1895
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1896 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1897 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1898 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1899 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1900 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1901 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1902 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1903 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1904 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1905
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	1906 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	1907 WindowRepr(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1908 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1909 static char repr[100];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1910 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1911
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1912 if (this->win == INVALID_WINDOW_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1913 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1914 vim_snprintf(repr, 100, _("<window object (deleted) at %p>"), (self));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1915 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1916 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1917 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1918 {
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	1919 int i = 0;
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	1920 win_T *w;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1921
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1922 for (w = firstwin; w != NULL && w != this->win; w = W_NEXT(w))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1923 ++i;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1924
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1925 if (w == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1926 vim_snprintf(repr, 100, _("<window object (unknown) at %p>"),
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1927 (self));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1928 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1929 vim_snprintf(repr, 100, _("<window %d>"), i);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1930
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1931 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1932 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1933 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1934
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1935 /* Window list object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1936 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1937
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1938 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1939 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1940 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1941 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1942 WinListObject;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1943
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1944 static PySequenceMethods WinListAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1945 (lenfunc) WinListLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1946 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1947 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1948 (ssizeargfunc) WinListItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1949 0, /* sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1950 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1951 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	1952 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1953 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1954 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1955 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1956
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1957 static PyTypeObject WinListType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1958
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1959 /* Window list object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1960 */
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	1961 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	1962 WinListLength(PyObject *self UNUSED)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1963 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1964 win_T *w = firstwin;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1965 Py_ssize_t n = 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1966
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1967 while (w != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1968 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1969 ++n;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1970 w = W_NEXT(w);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1971 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1972
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1973 return n;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1974 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1975
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	1976 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	1977 WinListItem(PyObject *self UNUSED, Py_ssize_t n)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1978 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1979 win_T *w;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1980
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1981 for (w = firstwin; w != NULL; w = W_NEXT(w), --n)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1982 if (n == 0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1983 return WindowNew(w);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1984
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1985 PyErr_SetString(PyExc_IndexError, _("no such window"));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1986 return NULL;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1987 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1988
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1989 /* Current items object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1990 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1991
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1992 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1993 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1994 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1995 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1996 CurrentObject;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1997
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1998 static PyTypeObject CurrentType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1999
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2000 /* Current items object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2001 */
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	2002 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	2003 CurrentGetattro(PyObject self UNUSED, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2004 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2005 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2006 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2007 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2008
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2009 if (strcmp(name, "buffer") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2010 return (PyObject *)BufferNew(curbuf);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2011 else if (strcmp(name, "window") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2012 return (PyObject *)WindowNew(curwin);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2013 else if (strcmp(name, "line") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2014 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	2015 else if (strcmp(name, "range") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2016 return RangeNew(curbuf, RangeStart, RangeEnd);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2017 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2018 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	2019 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2020 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2021 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2022 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2023 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2024 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2025
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	2026 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	2027 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	2028 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2029 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2030 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2031 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2032
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2033 if (strcmp(name, "line") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2034 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2035 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	2036 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2037
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2038 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2039 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2040 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2041 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2042 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2043 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2044 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2045 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2046
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2047 /* External interface
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2048 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2049
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2050 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2051 python3_buffer_free(buf_T *buf)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2052 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2053 if (buf->b_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2054 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2055 BufferObject *bp = buf->b_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2056 bp->buf = INVALID_BUFFER_VALUE;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2057 buf->b_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2058 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2059 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2060
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2061 #if defined(FEAT_WINDOWS) \|\| defined(PROTO)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2062 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2063 python3_window_free(win_T *win)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2064 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2065 if (win->w_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2066 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2067 WindowObject *wp = win->w_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2068 wp->win = INVALID_WINDOW_VALUE;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2069 win->w_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2070 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2071 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2072 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2073
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2074 static BufListObject TheBufferList =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2075 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2076 PyObject_HEAD_INIT(&BufListType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2077 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2078
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2079 static WinListObject TheWindowList =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2080 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2081 PyObject_HEAD_INIT(&WinListType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2082 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2083
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2084 static CurrentObject TheCurrent =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2085 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2086 PyObject_HEAD_INIT(&CurrentType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2087 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2088
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2089 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	2090
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2091 static struct PyModuleDef vimmodule;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2092
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	2093 #ifndef PROTO
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	2094 PyMODINIT_FUNC Py3Init_vim(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2095 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2096 PyObject *mod;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2097 /* 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	2098 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	2099
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2100 PyType_Ready(&BufferType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2101 PyType_Ready(&RangeType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2102 PyType_Ready(&WindowType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2103 PyType_Ready(&BufListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2104 PyType_Ready(&WinListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2105 PyType_Ready(&CurrentType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2106
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2107 /* 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	2108 PySys_SetArgv(1, argv);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2109
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2110 mod = PyModule_Create(&vimmodule);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2111
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2112 VimError = Py_BuildValue("s", "vim.error");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2113
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2114 PyModule_AddObject(mod, "error", VimError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2115 Py_INCREF((PyObject )(void )&TheBufferList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2116 PyModule_AddObject(mod, "buffers", (PyObject )(void )&TheBufferList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2117 Py_INCREF((PyObject )(void )&TheCurrent);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2118 PyModule_AddObject(mod, "current", (PyObject )(void )&TheCurrent);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2119 Py_INCREF((PyObject )(void )&TheWindowList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2120 PyModule_AddObject(mod, "windows", (PyObject )(void )&TheWindowList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2121
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2122 if (PyErr_Occurred())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2123 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2124
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2125 return mod;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2126 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	2127 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2128
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2129 /*************************************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2130 * 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	2131 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2132
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	2133 /* Get a line from the specified buffer. The line number is
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	2134 * in Vim format (1-based). The line is returned as a Python
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	2135 * string object.
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	2136 */
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	2137 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	2138 GetBufferLine(buf_T *buf, Py_ssize_t n)
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	2139 {
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	2140 return LineToString((char *)ml_get_buf(buf, (linenr_T)n, FALSE));
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	2141 }
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	2142
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2143
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2144 /* Get a list of lines from the specified buffer. The line numbers
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2145 * are in Vim format (1-based). The range is from lo up to, but not
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2146 * including, hi. The list is returned as a Python list of string objects.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2147 */
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	2148 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	2149 GetBufferLineList(buf_T *buf, Py_ssize_t lo, Py_ssize_t hi)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2150 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2151 Py_ssize_t i;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2152 Py_ssize_t n = hi - lo;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2153 PyObject *list = PyList_New(n);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2154
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2155 if (list == NULL)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2156 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2157
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2158 for (i = 0; i < n; ++i)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2159 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2160 PyObject str = LineToString((char )ml_get_buf(buf, (linenr_T)(lo+i), FALSE));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2161
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2162 /* Error check - was the Python string creation OK? */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2163 if (str == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2164 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2165 Py_DECREF(list);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2166 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2167 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2168
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2169 /* Set the list item */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2170 if (PyList_SetItem(list, i, str))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2171 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2172 Py_DECREF(str);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2173 Py_DECREF(list);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2174 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2175 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2176 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2177
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2178 /* The ownership of the Python list is passed to the caller (ie,
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2179 * the caller should Py_DECREF() the object when it is finished
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2180 * with it).
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2181 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2182
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2183 return list;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2184 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2185
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2186 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2187 * Check if deleting lines made the cursor position invalid.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2188 * Changed the lines from "lo" to "hi" and added "extra" lines (negative if
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2189 * deleted).
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2190 */
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	2191 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	2192 py_fix_cursor(linenr_T lo, linenr_T hi, linenr_T extra)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2193 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2194 if (curwin->w_cursor.lnum >= lo)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2195 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2196 /* Adjust the cursor position if it's in/after the changed
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2197 * lines. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2198 if (curwin->w_cursor.lnum >= hi)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2199 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2200 curwin->w_cursor.lnum += extra;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2201 check_cursor_col();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2202 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2203 else if (extra < 0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2204 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2205 curwin->w_cursor.lnum = lo;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2206 check_cursor();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2207 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2208 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2209 check_cursor_col();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2210 changed_cline_bef_curs();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2211 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2212 invalidate_botline();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2213 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2214
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2215 /* Replace a line in the specified buffer. The line number is
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2216 * in Vim format (1-based). The replacement line is given as
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2217 * a Python string object. The object is checked for validity
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2218 * and correct format. Errors are returned as a value of FAIL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2219 * The return value is OK on success.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2220 * If OK is returned and len_change is not NULL, *len_change
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2221 * is set to the change in the buffer length.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2222 */
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	2223 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	2224 SetBufferLine(buf_T buf, Py_ssize_t n, PyObject line, Py_ssize_t *len_change)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2225 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2226 /* First of all, we check the thpe of the supplied Python object.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2227 * There are three cases:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2228 * 1. NULL, or None - this is a deletion.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2229 * 2. A string - this is a replacement.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2230 * 3. Anything else - this is an error.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2231 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2232 if (line == Py_None \|\| line == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2233 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2234 buf_T *savebuf = curbuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2235
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2236 PyErr_Clear();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2237 curbuf = buf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2238
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2239 if (u_savedel((linenr_T)n, 1L) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2240 PyErr_SetVim(_("cannot save undo information"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2241 else if (ml_delete((linenr_T)n, FALSE) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2242 PyErr_SetVim(_("cannot delete line"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2243 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2244 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2245 deleted_lines_mark((linenr_T)n, 1L);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2246 if (buf == curwin->w_buffer)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2247 py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2248 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2249
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2250 curbuf = savebuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2251
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2252 if (PyErr_Occurred() \|\| VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2253 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2254
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2255 if (len_change)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2256 *len_change = -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2257
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2258 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2259 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2260 else if (PyUnicode_Check(line))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2261 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2262 char *save = StringToLine(line);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2263 buf_T *savebuf = curbuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2264
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2265 if (save == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2266 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2267
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2268 /* We do not need to free "save" if ml_replace() consumes it. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2269 PyErr_Clear();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2270 curbuf = buf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2271
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2272 if (u_savesub((linenr_T)n) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2273 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2274 PyErr_SetVim(_("cannot save undo information"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2275 vim_free(save);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2276 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2277 else if (ml_replace((linenr_T)n, (char_u *)save, FALSE) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2278 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2279 PyErr_SetVim(_("cannot replace line"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2280 vim_free(save);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2281 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2282 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2283 changed_bytes((linenr_T)n, 0);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2284
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2285 curbuf = savebuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2286
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2287 /* Check that the cursor is not beyond the end of the line now. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2288 if (buf == curwin->w_buffer)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2289 check_cursor_col();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2290
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2291 if (PyErr_Occurred() \|\| VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2292 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2293
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2294 if (len_change)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2295 *len_change = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2296
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2297 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2298 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2299 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2300 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2301 PyErr_BadArgument();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2302 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2303 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2304 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2305
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2306 /* Insert a number of lines into the specified buffer after the specifed line.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2307 * The line number is in Vim format (1-based). The lines to be inserted are
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2308 * given as a Python list of string objects or as a single string. The lines
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2309 * to be added are checked for validity and correct format. Errors are
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2310 * returned as a value of FAIL. The return value is OK on success.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2311 * If OK is returned and len_change is not NULL, *len_change
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2312 * is set to the change in the buffer length.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2313 */
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	2314 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	2315 InsertBufferLines(buf_T buf, Py_ssize_t n, PyObject lines, Py_ssize_t *len_change)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2316 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2317 /* First of all, we check the type of the supplied Python object.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2318 * It must be a string or a list, or the call is in error.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2319 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2320 if (PyUnicode_Check(lines))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2321 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2322 char *str = StringToLine(lines);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2323 buf_T *savebuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2324
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2325 if (str == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2326 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2327
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2328 savebuf = curbuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2329
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2330 PyErr_Clear();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2331 curbuf = buf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2332
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2333 if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2334 PyErr_SetVim(_("cannot save undo information"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2335 else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2336 PyErr_SetVim(_("cannot insert line"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2337 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2338 appended_lines_mark((linenr_T)n, 1L);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2339
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2340 vim_free(str);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2341 curbuf = savebuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2342 update_screen(VALID);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2343
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2344 if (PyErr_Occurred() \|\| VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2345 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2346
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2347 if (len_change)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2348 *len_change = 1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2349
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2350 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2351 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2352 else if (PyList_Check(lines))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2353 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2354 Py_ssize_t i;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2355 Py_ssize_t size = PyList_Size(lines);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2356 char **array;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2357 buf_T *savebuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2358
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2359 array = (char *)alloc((unsigned)(size sizeof(char *)));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2360 if (array == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2361 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2362 PyErr_NoMemory();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2363 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2364 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2365
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2366 for (i = 0; i < size; ++i)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2367 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2368 PyObject *line = PyList_GetItem(lines, i);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2369 array[i] = StringToLine(line);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2370
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2371 if (array[i] == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2372 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2373 while (i)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2374 vim_free(array[--i]);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2375 vim_free(array);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2376 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2377 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2378 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2379
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2380 savebuf = curbuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2381
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2382 PyErr_Clear();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2383 curbuf = buf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2384
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2385 if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2386 PyErr_SetVim(_("cannot save undo information"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2387 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2388 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2389 for (i = 0; i < size; ++i)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2390 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2391 if (ml_append((linenr_T)(n + i),
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2392 (char_u *)array[i], 0, FALSE) == FAIL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2393 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2394 PyErr_SetVim(_("cannot insert line"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2395
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2396 /* Free the rest of the lines */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2397 while (i < size)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2398 vim_free(array[i++]);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2399
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2400 break;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2401 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2402 vim_free(array[i]);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2403 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2404 if (i > 0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2405 appended_lines_mark((linenr_T)n, (long)i);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2406 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2407
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2408 /* Free the array of lines. All of its contents have now
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2409 * been freed.
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2410 */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2411 vim_free(array);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2412
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2413 curbuf = savebuf;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2414 update_screen(VALID);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2415
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2416 if (PyErr_Occurred() \|\| VimErrorCheck())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2417 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2418
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2419 if (len_change)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2420 *len_change = size;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2421
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2422 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2423 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2424 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2425 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2426 PyErr_BadArgument();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2427 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2428 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2429 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2430
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2431 /* Convert a Vim line into a Python string.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2432 * All internal newlines are replaced by null characters.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2433 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2434 * 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	2435 */
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	2436 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	2437 LineToString(const char *str)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2438 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2439 PyObject *result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2440 Py_ssize_t len = strlen(str);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2441 char tmp,p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2442
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2443 tmp = (char *)alloc((unsigned)(len+1));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2444 p = tmp;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2445 if (p == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2446 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2447 PyErr_NoMemory();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2448 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2449 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2450
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2451 while (*str)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2452 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2453 if (*str == '\n')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2454 *p = '\0';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2455 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2456 p = str;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2457
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2458 ++p;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2459 ++str;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2460 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2461 *p = '\0';
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2462
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2463 result = PyUnicode_FromStringAndSize(tmp, len);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2464
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2465 vim_free(tmp);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2466 return result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2467 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2468
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2469 /* Convert a Python string into a Vim line.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2470 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2471 * The result is in allocated memory. All internal nulls are replaced by
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2472 * newline characters. It is an error for the string to contain newline
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2473 * characters.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2474 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2475 * 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	2476 */
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	2477 static char *
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	2478 StringToLine(PyObject *obj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2479 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2480 const char *str;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2481 char *save;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2482 Py_ssize_t len;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2483 Py_ssize_t i;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2484 char *p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2485
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2486 if (obj == NULL \|\| !PyUnicode_Check(obj))
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2487 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2488 PyErr_BadArgument();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2489 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2490 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2491
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2492 str = _PyUnicode_AsString(obj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2493 len = PyUnicode_GET_SIZE(obj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2494
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2495 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2496 * Error checking: String must not contain newlines, as we
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2497 * are replacing a single line, and we must replace it with
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2498 * a single line.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2499 * A trailing newline is removed, so that append(f.readlines()) works.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2500 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2501 p = memchr(str, '\n', len);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2502 if (p != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2503 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2504 if (p == str + len - 1)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2505 --len;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2506 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2507 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2508 PyErr_SetVim(_("string cannot contain newlines"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2509 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2510 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2511 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2512
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2513 /* Create a copy of the string, with internal nulls replaced by
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2514 * newline characters, as is the vim convention.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2515 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2516 save = (char *)alloc((unsigned)(len+1));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2517 if (save == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2518 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2519 PyErr_NoMemory();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2520 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2521 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2522
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2523 for (i = 0; i < len; ++i)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2524 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2525 if (str[i] == '\0')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2526 save[i] = '\n';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2527 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2528 save[i] = str[i];
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2529 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2530
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2531 save[i] = '\0';
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2532
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2533 return save;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2534 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2535
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	2536 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	2537 init_structs(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2538 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2539 vim_memset(&OutputType, 0, sizeof(OutputType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2540 OutputType.tp_name = "vim.message";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2541 OutputType.tp_basicsize = sizeof(OutputObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2542 OutputType.tp_getattro = OutputGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2543 OutputType.tp_setattro = OutputSetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2544 OutputType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2545 OutputType.tp_doc = "vim message object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2546 OutputType.tp_methods = OutputMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2547 OutputType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2548 OutputType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2549 OutputType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2550
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2551 vim_memset(&BufferType, 0, sizeof(BufferType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2552 BufferType.tp_name = "vim.buffer";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2553 BufferType.tp_basicsize = sizeof(BufferType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2554 BufferType.tp_dealloc = BufferDestructor;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2555 BufferType.tp_repr = BufferRepr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2556 BufferType.tp_as_sequence = &BufferAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2557 BufferType.tp_as_mapping = &BufferAsMapping;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2558 BufferType.tp_getattro = BufferGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2559 BufferType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2560 BufferType.tp_doc = "vim buffer object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2561 BufferType.tp_methods = BufferMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2562 BufferType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2563 BufferType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2564 BufferType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2565
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2566 vim_memset(&WindowType, 0, sizeof(WindowType));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2567 WindowType.tp_name = "vim.window";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2568 WindowType.tp_basicsize = sizeof(WindowObject);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2569 WindowType.tp_dealloc = WindowDestructor;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2570 WindowType.tp_repr = WindowRepr;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2571 WindowType.tp_getattro = WindowGetattro;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2572 WindowType.tp_setattro = WindowSetattro;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2573 WindowType.tp_flags = Py_TPFLAGS_DEFAULT;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2574 WindowType.tp_doc = "vim Window object";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2575 WindowType.tp_methods = WindowMethods;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2576 WindowType.tp_alloc = call_PyType_GenericAlloc;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2577 WindowType.tp_new = call_PyType_GenericNew;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2578 WindowType.tp_free = call_PyObject_Free;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	2579
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2580 vim_memset(&BufListType, 0, sizeof(BufListType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2581 BufListType.tp_name = "vim.bufferlist";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2582 BufListType.tp_basicsize = sizeof(BufListObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2583 BufListType.tp_as_sequence = &BufListAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2584 BufListType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2585 BufferType.tp_doc = "vim buffer list";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2586
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2587 vim_memset(&WinListType, 0, sizeof(WinListType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2588 WinListType.tp_name = "vim.windowlist";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2589 WinListType.tp_basicsize = sizeof(WinListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2590 WinListType.tp_as_sequence = &WinListAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2591 WinListType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2592 WinListType.tp_doc = "vim window list";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2593
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2594 vim_memset(&RangeType, 0, sizeof(RangeType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2595 RangeType.tp_name = "vim.range";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2596 RangeType.tp_basicsize = sizeof(RangeObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2597 RangeType.tp_dealloc = RangeDestructor;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2598 RangeType.tp_repr = RangeRepr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2599 RangeType.tp_as_sequence = &RangeAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2600 RangeType.tp_as_mapping = &RangeAsMapping;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2601 RangeType.tp_getattro = RangeGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2602 RangeType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2603 RangeType.tp_doc = "vim Range object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2604 RangeType.tp_methods = RangeMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2605 RangeType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2606 RangeType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2607 RangeType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2608
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2609 vim_memset(&CurrentType, 0, sizeof(CurrentType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2610 CurrentType.tp_name = "vim.currentdata";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2611 CurrentType.tp_basicsize = sizeof(CurrentObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2612 CurrentType.tp_getattro = CurrentGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2613 CurrentType.tp_setattro = CurrentSetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2614 CurrentType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2615 CurrentType.tp_doc = "vim current object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2616
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2617 vim_memset(&vimmodule, 0, sizeof(vimmodule));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2618 vimmodule.m_name = "vim";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2619 vimmodule.m_doc = vim_module_doc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2620 vimmodule.m_size = -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2621 vimmodule.m_methods = VimMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	2622 }

Mercurial > vim

annotate src/if_python3.c @ 2399:76f0c4918f5c vim73