vim: src/if_python3.c annotate

annotate src/if_python3.c @ 3806:5e909c379a1e v7.3.661

updated for version 7.3.661 Problem: SEGV in Python code. Solution: Initialize len to zero. Use the right function depending on version. (Maxim Philippov)

author	Bram Moolenaar <bram@vim.org>
date	Wed, 12 Sep 2012 20:21:43 +0200
parents	15cdcb8ddcfb
children	530f5a903031

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
2716 0b4a515b1254 updated for version 7.3.132 Bram Moolenaar <bram@vim.org> parents: 2641 diff changeset	25 /* uncomment this if used with the debug version of python */
0b4a515b1254 updated for version 7.3.132 Bram Moolenaar <bram@vim.org> parents: 2641 diff changeset	26 /* #define Py_DEBUG */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	27
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	28 #include "vim.h"
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	29
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	30 #include <limits.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	31
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	32 /* Python.h defines _POSIX_THREADS itself (if needed) */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	33 #ifdef _POSIX_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	34 # undef _POSIX_THREADS
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	35 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	36
2404 eb4718cb2a76 Include old Python changes in Python 3 interface. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	37 #if defined(_WIN32) && defined(HAVE_FCNTL_H)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	38 # undef HAVE_FCNTL_H
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	39 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	40
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	41 #ifdef _DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	42 # undef _DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	43 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	44
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	45 #ifdef F_BLANK
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	46 # undef F_BLANK
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	47 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	48
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	49 #ifdef HAVE_STDARG_H
99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	50 # 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	51 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	52 #ifdef _POSIX_C_SOURCE /* defined in feature.h */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	53 # undef _POSIX_C_SOURCE
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	54 #endif
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	55 #ifdef _XOPEN_SOURCE
99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	56 # 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	57 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	58
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	59 #include <Python.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	60 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	61 # include "macglue.h"
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	62 # include <CodeFragments.h>
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	63 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	64 #undef main /* Defined in python.h - aargh */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	65 #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	66
3806 5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	67 #if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	68 # define PY_SSIZE_T_CLEAN
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	69 #endif
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	70
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	71 static void init_structs(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	72
2955 f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	73 /* The "surrogateescape" error handler is new in Python 3.1 */
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	74 #if PY_VERSION_HEX >= 0x030100f0
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	75 # define CODEC_ERROR_HANDLER "surrogateescape"
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	76 #else
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	77 # define CODEC_ERROR_HANDLER NULL
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	78 #endif
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	79
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	80 /* Python 3 does not support CObjects, always use Capsules */
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	81 #define PY_USE_CAPSULE
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	82
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	83 #define PyInt Py_ssize_t
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	84 #define PyString_Check(obj) PyUnicode_Check(obj)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	85 #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	86 #define PyString_FreeBytes(obj) Py_XDECREF(bytes)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	87 #define PyString_AsString(obj) PyBytes_AsString(obj)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	88 #define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	89 #define PyString_FromString(repr) PyUnicode_FromString(repr)
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3798 diff changeset	90 #define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len)
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	91
2716 0b4a515b1254 updated for version 7.3.132 Bram Moolenaar <bram@vim.org> parents: 2641 diff changeset	92 #if defined(DYNAMIC_PYTHON3) \|\| defined(PROTO)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	93
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	94 # ifndef WIN3264
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	95 # include <dlfcn.h>
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	96 # define FARPROC void*
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	97 # define HINSTANCE void*
2641 b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	98 # if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	99 # define load_dll(n) dlopen((n), RTLD_LAZY)
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	100 # else
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	101 # define load_dll(n) dlopen((n), RTLD_LAZY\|RTLD_GLOBAL)
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	102 # endif
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	103 # define close_dll dlclose
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	104 # define symbol_from_dll dlsym
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	105 # else
2612 fa5dee44df3f updated for version 7.3.034 Bram Moolenaar <bram@vim.org> parents: 2554 diff changeset	106 # define load_dll vimLoadLib
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	107 # define close_dll FreeLibrary
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	108 # define symbol_from_dll GetProcAddress
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	109 # endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	110 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	111 * Wrapper defines
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	112 */
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	113 # undef PyArg_Parse
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	114 # define PyArg_Parse py3_PyArg_Parse
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	115 # undef PyArg_ParseTuple
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	116 # define PyArg_ParseTuple py3_PyArg_ParseTuple
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	117 # define PyMem_Free py3_PyMem_Free
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	118 # define PyMem_Malloc py3_PyMem_Malloc
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	119 # define PyDict_SetItemString py3_PyDict_SetItemString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	120 # define PyErr_BadArgument py3_PyErr_BadArgument
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	121 # define PyErr_Clear py3_PyErr_Clear
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	122 # define PyErr_NoMemory py3_PyErr_NoMemory
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	123 # define PyErr_Occurred py3_PyErr_Occurred
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	124 # define PyErr_SetNone py3_PyErr_SetNone
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	125 # define PyErr_SetString py3_PyErr_SetString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	126 # define PyEval_InitThreads py3_PyEval_InitThreads
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	127 # define PyEval_RestoreThread py3_PyEval_RestoreThread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	128 # define PyEval_SaveThread py3_PyEval_SaveThread
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	129 # define PyGILState_Ensure py3_PyGILState_Ensure
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	130 # define PyGILState_Release py3_PyGILState_Release
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	131 # define PyLong_AsLong py3_PyLong_AsLong
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	132 # define PyLong_FromLong py3_PyLong_FromLong
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	133 # define PyList_GetItem py3_PyList_GetItem
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	134 # define PyList_Append py3_PyList_Append
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	135 # define PyList_New py3_PyList_New
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	136 # define PyList_SetItem py3_PyList_SetItem
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	137 # define PyList_Size py3_PyList_Size
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	138 # define PySequence_Check py3_PySequence_Check
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	139 # define PySequence_Size py3_PySequence_Size
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	140 # define PySequence_GetItem py3_PySequence_GetItem
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	141 # define PyTuple_Size py3_PyTuple_Size
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	142 # define PyTuple_GetItem py3_PyTuple_GetItem
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	143 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	144 # define PyImport_ImportModule py3_PyImport_ImportModule
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	145 # define PyImport_AddModule py3_PyImport_AddModule
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	146 # define PyObject_Init py3__PyObject_Init
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	147 # define PyDict_New py3_PyDict_New
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	148 # define PyDict_GetItemString py3_PyDict_GetItemString
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	149 # define PyDict_Next py3_PyDict_Next
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	150 # define PyMapping_Check py3_PyMapping_Check
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	151 # define PyMapping_Items py3_PyMapping_Items
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	152 # define PyIter_Next py3_PyIter_Next
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	153 # define PyObject_GetIter py3_PyObject_GetIter
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	154 # define PyModule_GetDict py3_PyModule_GetDict
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	155 #undef PyRun_SimpleString
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	156 # define PyRun_SimpleString py3_PyRun_SimpleString
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	157 #undef PyRun_String
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	158 # define PyRun_String py3_PyRun_String
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	159 # define PySys_SetObject py3_PySys_SetObject
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	160 # define PySys_SetArgv py3_PySys_SetArgv
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	161 # define PyType_Type (*py3_PyType_Type)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	162 # define PyType_Ready py3_PyType_Ready
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	163 #undef Py_BuildValue
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	164 # define Py_BuildValue py3_Py_BuildValue
2641 b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	165 # define Py_SetPythonHome py3_Py_SetPythonHome
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	166 # define Py_Initialize py3_Py_Initialize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	167 # define Py_Finalize py3_Py_Finalize
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	168 # define Py_IsInitialized py3_Py_IsInitialized
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	169 # define _Py_NoneStruct (*py3__Py_NoneStruct)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	170 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	171 # define PyModule_AddObject py3_PyModule_AddObject
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	172 # define PyImport_AppendInittab py3_PyImport_AppendInittab
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	173 # define _PyUnicode_AsString py3__PyUnicode_AsString
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	174 # undef PyUnicode_AsEncodedString
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	175 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	176 # undef PyBytes_AsString
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	177 # define PyBytes_AsString py3_PyBytes_AsString
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	178 # define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	179 # undef PyBytes_FromString
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	180 # define PyBytes_FromString py3_PyBytes_FromString
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	181 # define PyFloat_FromDouble py3_PyFloat_FromDouble
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	182 # define PyFloat_AsDouble py3_PyFloat_AsDouble
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	183 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	184 # define PySlice_Type (*py3_PySlice_Type)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	185 # define PyFloat_Type (*py3_PyFloat_Type)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	186 # define PyErr_NewException py3_PyErr_NewException
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	187 # ifdef Py_DEBUG
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	188 # define _Py_NegativeRefcount py3__Py_NegativeRefcount
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	189 # define _Py_RefTotal (*py3__Py_RefTotal)
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	190 # define _Py_Dealloc py3__Py_Dealloc
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	191 # define _PyObject_DebugMalloc py3__PyObject_DebugMalloc
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	192 # define _PyObject_DebugFree py3__PyObject_DebugFree
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	193 # else
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	194 # define PyObject_Malloc py3_PyObject_Malloc
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	195 # define PyObject_Free py3_PyObject_Free
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	196 # endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	197 # define PyType_GenericAlloc py3_PyType_GenericAlloc
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	198 # define PyType_GenericNew py3_PyType_GenericNew
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	199 # define PyModule_Create2 py3_PyModule_Create2
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	200 # undef PyUnicode_FromString
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	201 # define PyUnicode_FromString py3_PyUnicode_FromString
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	202 # undef PyUnicode_Decode
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	203 # define PyUnicode_Decode py3_PyUnicode_Decode
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	204 # define PyType_IsSubtype py3_PyType_IsSubtype
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	205 # define PyCapsule_New py3_PyCapsule_New
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	206 # define PyCapsule_GetPointer py3_PyCapsule_GetPointer
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	207
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	208 # ifdef Py_DEBUG
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	209 # undef PyObject_NEW
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	210 # define PyObject_NEW(type, typeobj) \
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	211 ( (type *) PyObject_Init( \
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	212 (PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) )
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	213 # endif
8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	214
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	215 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	216 * Pointers for dynamic link
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	217 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	218 static int (py3_PySys_SetArgv)(int, wchar_t *);
2641 b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	219 static void (py3_Py_SetPythonHome)(wchar_t home);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	220 static void (*py3_Py_Initialize)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	221 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	222 static PyGILState_STATE (*py3_PyGILState_Ensure)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	223 static void (*py3_PyGILState_Release)(PyGILState_STATE);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	224 static int (py3_PySys_SetObject)(char , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	225 static PyObject* (py3_PyList_Append)(PyObject , PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	226 static Py_ssize_t (py3_PyList_Size)(PyObject );
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	227 static int (py3_PySequence_Check)(PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	228 static Py_ssize_t (py3_PySequence_Size)(PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	229 static PyObject* (py3_PySequence_GetItem)(PyObject , Py_ssize_t);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	230 static Py_ssize_t (py3_PyTuple_Size)(PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	231 static PyObject* (py3_PyTuple_GetItem)(PyObject , Py_ssize_t);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	232 static int (py3_PyMapping_Check)(PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	233 static PyObject* (py3_PyMapping_Items)(PyObject );
3083 dc60200a16b2 updated for version 7.3.313 Bram Moolenaar <bram@vim.org> parents: 3074 diff changeset	234 static int (py3_PySlice_GetIndicesEx)(PyObject r, Py_ssize_t length,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	235 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	236 static PyObject* (*py3_PyErr_NoMemory)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	237 static void (*py3_Py_Finalize)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	238 static void (py3_PyErr_SetString)(PyObject , const char *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	239 static int (py3_PyRun_SimpleString)(char );
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	240 static PyObject* (py3_PyRun_String)(char , int, PyObject , PyObject );
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	241 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	242 static PyObject* (py3_PyImport_ImportModule)(const char );
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	243 static PyObject* (py3_PyImport_AddModule)(const char );
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	244 static int (*py3_PyErr_BadArgument)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	245 static PyTypeObject* py3_PyType_Type;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	246 static PyObject* (*py3_PyErr_Occurred)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	247 static PyObject* (py3_PyModule_GetDict)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	248 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	249 static PyObject* (py3_PyDict_GetItemString)(PyObject , const char *);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	250 static int (py3_PyDict_Next)(PyObject , Py_ssize_t , PyObject , PyObject *);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	251 static PyObject* (*py3_PyLong_FromLong)(long);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	252 static PyObject* (*py3_PyDict_New)(void);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	253 static PyObject* (py3_PyIter_Next)(PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	254 static PyObject* (py3_PyObject_GetIter)(PyObject );
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	255 static PyObject* (py3_Py_BuildValue)(char , ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	256 static int (py3_PyType_Ready)(PyTypeObject type);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	257 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	258 static PyObject* (py3_PyUnicode_FromString)(const char u);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	259 static PyObject* (py3_PyUnicode_Decode)(const char u, Py_ssize_t size,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	260 const char encoding, const char errors);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	261 static long (py3_PyLong_AsLong)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	262 static void (py3_PyErr_SetNone)(PyObject );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	263 static void (*py3_PyEval_InitThreads)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	264 static void(py3_PyEval_RestoreThread)(PyThreadState );
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	265 static PyThreadState(py3_PyEval_SaveThread)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	266 static int (py3_PyArg_Parse)(PyObject , char *, ...);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	267 static int (py3_PyArg_ParseTuple)(PyObject , char *, ...);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	268 static int (py3_PyMem_Free)(void );
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	269 static void* (*py3_PyMem_Malloc)(size_t);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	270 static int (*py3_Py_IsInitialized)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	271 static void (*py3_PyErr_Clear)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	272 static PyObject(py3__PyObject_Init)(PyObject , PyTypeObject );
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	273 static iternextfunc py3__PyObject_NextNotImplemented;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	274 static PyObject* py3__Py_NoneStruct;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	275 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	276 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	277 static char* (py3__PyUnicode_AsString)(PyObject unicode);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	278 static PyObject* (py3_PyUnicode_AsEncodedString)(PyObject unicode, const char* encoding, const char* errors);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	279 static char* (py3_PyBytes_AsString)(PyObject bytes);
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	280 static int (py3_PyBytes_AsStringAndSize)(PyObject bytes, char *buffer, int length);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	281 static PyObject* (py3_PyBytes_FromString)(char str);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	282 static PyObject* (*py3_PyFloat_FromDouble)(double num);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	283 static double (py3_PyFloat_AsDouble)(PyObject );
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	284 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	285 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	286 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	287 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	288 static PyTypeObject* py3_PySlice_Type;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	289 static PyTypeObject* py3_PyFloat_Type;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	290 static PyObject* (py3_PyErr_NewException)(char name, PyObject base, PyObject dict);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	291 static PyObject* (py3_PyCapsule_New)(void , char *, PyCapsule_Destructor);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	292 static void* (py3_PyCapsule_GetPointer)(PyObject , char *);
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	293 # ifdef Py_DEBUG
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	294 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	295 static Py_ssize_t* py3__Py_RefTotal;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	296 static void (py3__Py_Dealloc)(PyObject obj);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	297 static void (py3__PyObject_DebugFree)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	298 static void* (*py3__PyObject_DebugMalloc)(size_t);
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	299 # else
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	300 static void (py3_PyObject_Free)(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	301 static void* (*py3_PyObject_Malloc)(size_t);
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	302 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	303 static int (py3_PyType_IsSubtype)(PyTypeObject , PyTypeObject *);
2329 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 static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */
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 /* Imported exception objects */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	308 static PyObject *p3imp_PyExc_AttributeError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	309 static PyObject *p3imp_PyExc_IndexError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	310 static PyObject *p3imp_PyExc_KeyboardInterrupt;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	311 static PyObject *p3imp_PyExc_TypeError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	312 static PyObject *p3imp_PyExc_ValueError;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	313
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	314 # define PyExc_AttributeError p3imp_PyExc_AttributeError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	315 # define PyExc_IndexError p3imp_PyExc_IndexError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	316 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	317 # define PyExc_TypeError p3imp_PyExc_TypeError
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	318 # define PyExc_ValueError p3imp_PyExc_ValueError
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 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	321 * Table of name to function pointer of python.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	322 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	323 # define PYTHON_PROC FARPROC
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	324 static struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	325 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	326 char *name;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	327 PYTHON_PROC *ptr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	328 } py3_funcname_table[] =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	329 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	330 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
2641 b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	331 {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	332 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
3806 5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	333 #ifndef PY_SSIZE_T_CLEAN
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	334 {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
3806 5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	335 {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	336 #else
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	337 {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	338 {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue},
5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	339 #endif
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	340 {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	341 {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	342 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	343 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	344 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	345 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	346 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	347 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	348 {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	349 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	350 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	351 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	352 {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	353 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	354 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	355 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	356 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	357 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	358 {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	359 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	360 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	361 {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	362 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	363 {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	364 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	365 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	366 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	367 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	368 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	369 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	370 {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	371 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	372 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	373 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	374 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	375 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	376 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	377 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	378 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	379 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	380 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	381 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	382 {"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	383 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	384 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	385 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	386 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	387 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	388 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	389 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	390 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	391 {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	392 {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	393 {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	394 {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	395 {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	396 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	397 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	398 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	399 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	400 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	401 {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type},
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	402 {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException},
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	403 # ifdef Py_DEBUG
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	404 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	405 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	406 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	407 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	408 {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc},
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	409 # else
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	410 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	411 {"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free},
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	412 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	413 {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	414 {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	415 {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer},
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	416 {"", NULL},
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	417 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	418
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	419 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	420 * Free python.dll
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	421 */
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	422 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	423 end_dynamic_python3(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	424 {
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	425 if (hinstPy3 != 0)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	426 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	427 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	428 hinstPy3 = 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	429 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	430 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	431
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	432 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	433 * Load library and get all pointers.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	434 * Parameter 'libname' provides name of DLL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	435 * Return OK or FAIL.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	436 */
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	437 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	438 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	439 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	440 int i;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	441 void ucs_from_string, ucs_decode, *ucs_as_encoded_string;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	442
2641 b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	443 # if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON)
2554 7abef60aca22 Add a configure check for RTLD_GLOBAL. (James Vega, Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: 2528 diff changeset	444 /* Can't have Python and Python3 loaded at the same time.
7abef60aca22 Add a configure check for RTLD_GLOBAL. (James Vega, Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: 2528 diff changeset	445 * It cause a crash, because RTLD_GLOBAL is needed for
7abef60aca22 Add a configure check for RTLD_GLOBAL. (James Vega, Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: 2528 diff changeset	446 * standard C extension libraries of one or both python versions. */
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	447 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	448 {
3032 e4f3fa1a474e updated for version 7.3.288 Bram Moolenaar <bram@vim.org> parents: 2955 diff changeset	449 if (verbose)
e4f3fa1a474e updated for version 7.3.288 Bram Moolenaar <bram@vim.org> parents: 2955 diff changeset	450 EMSG(_("E837: This Vim cannot execute :py3 after using :python"));
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	451 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	452 }
2528 8bc2e8390c11 When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	453 # endif
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	454
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	455 if (hinstPy3 != 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	456 return OK;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	457 hinstPy3 = load_dll(libname);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	458
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	459 if (!hinstPy3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	460 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	461 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	462 EMSG2(_(e_loadlib), libname);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	463 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	464 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	465
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	466 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	467 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	468 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	469 py3_funcname_table[i].name)) == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	470 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	471 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	472 hinstPy3 = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	473 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	474 EMSG2(_(e_loadfunc), py3_funcname_table[i].name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	475 return FAIL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	476 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	477 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	478
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	479 /* 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	480 * will be present in the library. */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	481 ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString");
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	482 ucs_decode = symbol_from_dll(hinstPy3,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	483 "PyUnicodeUCS2_Decode");
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	484 ucs_as_encoded_string = symbol_from_dll(hinstPy3,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	485 "PyUnicodeUCS2_AsEncodedString");
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	486 if (!ucs_from_string \|\| !ucs_decode \|\| !ucs_as_encoded_string)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	487 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	488 ucs_from_string = symbol_from_dll(hinstPy3,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	489 "PyUnicodeUCS4_FromString");
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	490 ucs_decode = symbol_from_dll(hinstPy3,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	491 "PyUnicodeUCS4_Decode");
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	492 ucs_as_encoded_string = symbol_from_dll(hinstPy3,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	493 "PyUnicodeUCS4_AsEncodedString");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	494 }
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	495 if (ucs_from_string && ucs_decode && ucs_as_encoded_string)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	496 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	497 py3_PyUnicode_FromString = ucs_from_string;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	498 py3_PyUnicode_Decode = ucs_decode;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	499 py3_PyUnicode_AsEncodedString = ucs_as_encoded_string;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	500 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	501 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	502 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	503 close_dll(hinstPy3);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	504 hinstPy3 = 0;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	505 if (verbose)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	506 EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	507 return FAIL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	508 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	509
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	510 return OK;
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 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	514 * 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	515 * TRUE, else FALSE.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	516 */
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	517 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	518 python3_enabled(int verbose)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	519 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	520 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	521 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	522
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	523 /* 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	524 * 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	525 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	526 static void get_py3_exceptions __ARGS((void));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: 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 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	529 get_py3_exceptions()
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 PyObject *exmod = PyImport_ImportModule("builtins");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	532 PyObject *exdict = PyModule_GetDict(exmod);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	533 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	534 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	535 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	536 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	537 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	538 Py_XINCREF(p3imp_PyExc_AttributeError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	539 Py_XINCREF(p3imp_PyExc_IndexError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	540 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	541 Py_XINCREF(p3imp_PyExc_TypeError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	542 Py_XINCREF(p3imp_PyExc_ValueError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	543 Py_XDECREF(exmod);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	544 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	545 #endif /* DYNAMIC_PYTHON3 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	546
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	547 static PyObject BufferNew (buf_T );
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	548 static PyObject WindowNew(win_T );
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	549 static PyObject LineToString(const char );
3310 60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	550 static PyObject BufferDir(PyObject , PyObject *);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	551
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	552 static PyTypeObject RangeType;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	553
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	554 static int py3initialised = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	555
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	556 #define PYINITIALISED py3initialised
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	557
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	558 #define DICTKEY_DECL PyObject *bytes = NULL;
3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	559
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	560 #define DICTKEY_GET(err) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	561 if (PyBytes_Check(keyObject)) \
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	562 { \
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3798 diff changeset	563 if (PyString_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	564 return err; \
3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	565 } \
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	566 else if (PyUnicode_Check(keyObject)) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	567 { \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	568 bytes = PyString_AsBytes(keyObject); \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	569 if (bytes == NULL) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	570 return err; \
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3798 diff changeset	571 if (PyString_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	572 return err; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	573 } \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	574 else \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	575 { \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	576 PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	577 return err; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	578 }
3798 3958b0e672d6 updated for version 7.3.657 Bram Moolenaar <bram@vim.org> parents: 3796 diff changeset	579
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	580 #define DICTKEY_UNREF \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	581 if (bytes != NULL) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	582 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	583
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	584 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	585 * 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	586 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	587 #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	588
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	589 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	590
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	591 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	592 call_PyObject_Free(void *p)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	593 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	594 #ifdef Py_DEBUG
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	595 _PyObject_DebugFree(p);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	596 #else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	597 PyObject_Free(p);
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 }
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	600
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	601 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	602 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	603 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	604 return PyType_GenericNew(type,args,kwds);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	605 }
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	606
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	607 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	608 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	609 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	610 return PyType_GenericAlloc(type,nitems);
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	613 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	614 * Internal function prototypes.
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	617 static Py_ssize_t RangeStart;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	618 static Py_ssize_t RangeEnd;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	619
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	620 static PyObject *globals;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	621
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	622 static int PythonIO_Init(void);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	623 static void PythonIO_Fini(void);
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	624 PyMODINIT_FUNC Py3Init_vim(void);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	625
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	626 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	627 * 1. Python interpreter main program.
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	630 static PyGILState_STATE pygilstate = PyGILState_UNLOCKED;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	631
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	632 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	633 python3_end()
2329 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 static int recurse = 0;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	636
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	637 /* If 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	638 if (recurse != 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	639 return;
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 ++recurse;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	642
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	643 #ifdef DYNAMIC_PYTHON3
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	644 if (hinstPy3)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	645 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	646 if (Py_IsInitialized())
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	647 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	648 // acquire lock before finalizing
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	649 pygilstate = PyGILState_Ensure();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	650
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	651 PythonIO_Fini();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	652 Py_Finalize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	653 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	654
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	655 #ifdef DYNAMIC_PYTHON3
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	656 end_dynamic_python3();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	657 #endif
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 --recurse;
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
2384 aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	662 #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	663 int
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	664 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	665 {
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	666 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	667 }
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	668 #endif
aeea25941392 Temporary solution for crashing when using both :py and :py3: disallow both in Bram Moolenaar <bram@vim.org> parents: 2374 diff changeset	669
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	670 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	671 Python3_Init(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	672 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	673 if (!py3initialised)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	674 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	675 #ifdef DYNAMIC_PYTHON3
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	676 if (!python3_enabled(TRUE))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	677 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	678 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	679 goto fail;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	680 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	681 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	682
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	683 init_structs();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	684
2641 b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	685
b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	686 #ifdef PYTHON3_HOME
b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	687 Py_SetPythonHome(PYTHON3_HOME);
b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	688 #endif
b803b2776880 updated for version 7.3.062 Bram Moolenaar <bram@vim.org> parents: 2612 diff changeset	689
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	690 #if !defined(MACOS) \|\| defined(MACOS_X_UNIX)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	691 Py_Initialize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	692 #else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	693 PyMac_Initialize();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	694 #endif
2877 6bbdb9c7a425 updated for version 7.3.212 Bram Moolenaar <bram@vim.org> parents: 2716 diff changeset	695 /* initialise threads, must be after Py_Initialize() */
6bbdb9c7a425 updated for version 7.3.212 Bram Moolenaar <bram@vim.org> parents: 2716 diff changeset	696 PyEval_InitThreads();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	697
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	698 #ifdef DYNAMIC_PYTHON3
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	699 get_py3_exceptions();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	700 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	701
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	702 if (PythonIO_Init())
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	703 goto fail;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	704
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	705 PyImport_AppendInittab("vim", Py3Init_vim);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	706
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	707 globals = PyModule_GetDict(PyImport_AddModule("__main__"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	708
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	709 /* Remove the element from sys.path that was added because of our
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	710 * argv[0] value in Py3Init_vim(). Previously we used an empty
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	711 * string, but dependinding on the OS we then get an empty entry or
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	712 * the current directory in sys.path.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	713 * Only after vim has been imported, the element does exist in
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	714 * sys.path.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	715 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	716 PyRun_SimpleString("import vim; import sys; sys.path = list(filter(lambda x: not x.endswith('must>not&exist'), sys.path))");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	717
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	718 // 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	719 // state is created in Py_Initialize()
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	720 // there _PyGILState_NoteThreadState() also sets gilcounter to 1
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	721 // (python must have threads enabled!)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	722 // 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	723 // without deleting thread state
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	724 PyGILState_Release(pygilstate);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	725
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	726 py3initialised = 1;
2329 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 return 0;
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 fail:
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	732 /* 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	733 * 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	734 * 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	735 * not do anything in this case).
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	736 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	737 PythonIO_Flush();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	738 return -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	739 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	740
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	741 /*
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	742 * External interface
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	743 */
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	744 static void
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	745 DoPy3Command(exarg_T eap, const char cmd, typval_T *rettv)
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 defined(MACOS) && !defined(MACOS_X_UNIX)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	748 GrafPtr oldPort;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	749 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	750 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	751 char *saved_locale;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	752 #endif
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	753 PyObject *cmdstr;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	754 PyObject *cmdbytes;
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 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	757 GetPort(&oldPort);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	758 /* Check if the Python library is available */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	759 if ((Ptr)PyMac_Initialize == (Ptr)kUnresolvedCFragSymbolAddress)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	760 goto theend;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	761 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	762 if (Python3_Init())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	763 goto theend;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	764
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	765 if (rettv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	766 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	767 RangeStart = eap->line1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	768 RangeEnd = eap->line2;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	769 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	770 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	771 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	772 RangeStart = (PyInt) curwin->w_cursor.lnum;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	773 RangeEnd = RangeStart;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	774 }
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	775 Python_Release_Vim(); /* leave vim */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	776
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	777 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	778 /* 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	779 saved_locale = setlocale(LC_NUMERIC, NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	780 if (saved_locale == NULL \|\| STRCMP(saved_locale, "C") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	781 saved_locale = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	782 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	783 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	784 /* Need to make a copy, value may change when setting new locale. */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	785 saved_locale = (char )vim_strsave((char_u )saved_locale);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	786 (void)setlocale(LC_NUMERIC, "C");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	787 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	788 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	789
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	790 pygilstate = PyGILState_Ensure();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	791
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	792 /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	793 * SyntaxError (unicode error). */
2955 f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	794 cmdstr = PyUnicode_Decode(cmd, strlen(cmd),
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	795 (char *)ENC_OPT, CODEC_ERROR_HANDLER);
f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	796 cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	797 Py_XDECREF(cmdstr);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	798 if (rettv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	799 PyRun_SimpleString(PyBytes_AsString(cmdbytes));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	800 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	801 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	802 PyObject *r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	803
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	804 r = PyRun_String(PyBytes_AsString(cmdbytes), Py_eval_input,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	805 globals, globals);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	806 if (r == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	807 EMSG(_("E860: Eval did not return a valid python 3 object"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	808 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	809 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	810 if (ConvertFromPyObject(r, rettv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	811 EMSG(_("E861: Failed to convert returned python 3 object to vim value"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	812 Py_DECREF(r);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	813 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	814 PyErr_Clear();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	815 }
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	816 Py_XDECREF(cmdbytes);
2329 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 PyGILState_Release(pygilstate);
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 #if defined(HAVE_LOCALE_H) \|\| defined(X_LOCALE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	821 if (saved_locale != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	822 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	823 (void)setlocale(LC_NUMERIC, saved_locale);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	824 vim_free(saved_locale);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	825 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	826 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	827
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	828 Python_Lock_Vim(); /* enter vim */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	829 PythonIO_Flush();
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	830 #if defined(MACOS) && !defined(MACOS_X_UNIX)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	831 SetPort(oldPort);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	832 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	833
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	834 theend:
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	835 return; /* keeps lint happy */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	836 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	837
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	838 /*
2350 06feaf4fe36a Rename some "python3" symbols to "py3", as the command name. Bram Moolenaar <bram@vim.org> parents: 2342 diff changeset	839 * ":py3"
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	840 */
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	841 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	842 ex_py3(exarg_T *eap)
2329 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 char_u *script;
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 script = script_get(eap, eap->arg);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	847 if (!eap->skip)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	848 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	849 if (script == NULL)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	850 DoPy3Command(eap, (char *)eap->arg, NULL);
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	851 else
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	852 DoPy3Command(eap, (char *)script, NULL);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	853 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	854 vim_free(script);
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	857 #define BUFFER_SIZE 2048
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	858
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	859 /*
2340 99c1eba60b2d Make automatic prototype generation work with more interfaces. Bram Moolenaar <bram@vim.org> parents: 2330 diff changeset	860 * ":py3file"
2329 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 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	863 ex_py3file(exarg_T *eap)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	864 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	865 static char buffer[BUFFER_SIZE];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	866 const char *file;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	867 char *p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	868 int i;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	869
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	870 /* 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	871 * 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	872 * 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	873 * compatible between the two. Yuk.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	874 *
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	875 * construct: exec(compile(open('a_filename', 'rb').read(), 'a_filename', 'exec'))
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	876 *
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	877 * Using bytes so that Python can detect the source encoding as it normally
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	878 * does. The doc does not say "compile" accept bytes, though.
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	879 *
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	880 * 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	881 * Python won't mangle the file name.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	882 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	883
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	884 strcpy(buffer, "exec(compile(open('");
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	885 p = buffer + 19; /* size of "exec(compile(open('" */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	886
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	887 for (i=0; i<2; ++i)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	888 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	889 file = (char *)eap->arg;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	890 while (*file && p < buffer + (BUFFER_SIZE - 3))
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	891 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	892 if (file == '\\' \|\| file == '\'')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	893 *p++ = '\\';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	894 p++ = file++;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	895 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	896 /* 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	897 if (*file != '\0')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	898 return;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	899 if (i==0)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	900 {
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	901 strcpy(p,"','rb').read(),'");
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	902 p += 16;
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	903 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	904 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	905 {
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	906 strcpy(p,"','exec'))");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	907 p += 10;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	908 }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	909 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	910
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 /* Execute the file */
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	913 DoPy3Command(eap, buffer, NULL);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	914 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	915
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	916 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	917 * 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	918 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	919
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	920 /* Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	921 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	922
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	923 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	924 OutputGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	925 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	926 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	927 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	928 name = _PyUnicode_AsString(nameobj);
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 if (strcmp(name, "softspace") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	931 return PyLong_FromLong(((OutputObject *)(self))->softspace);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	932
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	933 return PyObject_GenericGetAttr(self, nameobj);
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
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	936 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	937 OutputSetattro(PyObject self, PyObject nameobj, PyObject *val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	938 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	939 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	940 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	941 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	942
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	943 if (val == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	944 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	945 PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	946 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	947 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	948
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	949 if (strcmp(name, "softspace") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	950 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	951 if (!PyLong_Check(val))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	952 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	953 PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	954 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	955 }
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	956
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	957 ((OutputObject *)(self))->softspace = PyLong_AsLong(val);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	958 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	959 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	960
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	961 PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	962 return -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	963 }
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 /***************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	966
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	967 static 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	968 PythonIO_Init(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	969 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	970 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	971 return PythonIO_Init_io();
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	972 }
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	973
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	974 static 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	975 PythonIO_Fini(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	976 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	977 PySys_SetObject("stdout", NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	978 PySys_SetObject("stderr", NULL);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	979 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	980
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	981 /******************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	982 * 3. Implementation of the Vim module for Python
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	983 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	984
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	985 /* Window type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	986 * --------------------------------------
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 #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	990
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	991 /* Buffer type - Implementation functions
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 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	994
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	995 #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	996
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	997 static Py_ssize_t BufferLength(PyObject *);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	998 static PyObject BufferItem(PyObject , Py_ssize_t);
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	999 static PyObject* BufferSubscript(PyObject self, PyObject idx);
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1000 static Py_ssize_t BufferAsSubscript(PyObject self, PyObject idx, PyObject *val);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1001
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1002
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1003 /* Line range type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1004 * --------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1005 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1006
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1007 #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	1008
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1009 static PyObject* RangeSubscript(PyObject self, PyObject idx);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1010 static Py_ssize_t RangeAsItem(PyObject , Py_ssize_t, PyObject );
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1011 static Py_ssize_t RangeAsSubscript(PyObject self, PyObject idx, PyObject *val);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1012
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1013 /* Current objects type - Implementation functions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1014 * -----------------------------------------------
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1015 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1016
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1017 static PySequenceMethods BufferAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1018 (lenfunc) BufferLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1019 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1020 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1021 (ssizeargfunc) BufferItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1022 0, /* was_sq_slice, x[i:j] */
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1023 0, /* sq_ass_item, x[i]=v */
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1024 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	1025 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1026 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1027 0, /* sq_inplace_repeat */
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1030 PyMappingMethods BufferAsMapping = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1031 /* mp_length */ (lenfunc)BufferLength,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1032 /* mp_subscript */ (binaryfunc)BufferSubscript,
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1033 /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1034 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1035
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1036
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1037 /* Buffer object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1038 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1039
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1040 static PyTypeObject BufferType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: 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 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	1043 BufferNew(buf_T *buf)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1044 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1045 /* 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	1046 * 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	1047 * 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	1048 * 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	1049 * 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	1050 * 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	1051 * the buffer is stored in "b_python3_ref".
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1052 * 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	1053 * 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	1054 * 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	1055 * 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	1056 * 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	1057 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1058
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1059 BufferObject *self;
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 if (buf->b_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1062 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1063 self = buf->b_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1064 Py_INCREF(self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1065 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1066 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1067 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1068 self = PyObject_NEW(BufferObject, &BufferType);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1069 buf->b_python3_ref = self;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1070 if (self == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1071 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1072 self->buf = buf;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1073 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1074
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1075 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1076 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1077
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	1078 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	1079 BufferDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1080 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1081 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1082
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1083 if (this->buf && this->buf != INVALID_BUFFER_VALUE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1084 this->buf->b_python3_ref = NULL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1085
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1086 Py_TYPE(self)->tp_free((PyObject*)self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1087 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1088
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	1089 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	1090 BufferGetattro(PyObject self, PyObjectnameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1091 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1092 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1093
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1094 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1095 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1096 name = _PyUnicode_AsString(nameobj);
2329 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 if (CheckBuffer(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1099 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1100
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1101 if (strcmp(name, "name") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1102 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	1103 else if (strcmp(name, "number") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1104 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	1105 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1106 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1107 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1108
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	1109 static PyObject *
3310 60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1110 BufferDir(PyObject self UNUSED, PyObject args UNUSED)
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1111 {
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1112 return Py_BuildValue("[sssss]", "name", "number",
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1113 "append", "mark", "range");
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1114 }
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1115
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3083 diff changeset	1116 static PyObject *
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: 2384 diff changeset	1117 BufferRepr(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1118 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1119 static char repr[100];
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1120 BufferObject this = (BufferObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1121
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1122 if (this->buf == INVALID_BUFFER_VALUE)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1123 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1124 vim_snprintf(repr, 100, _("<buffer object (deleted) at %p>"), (self));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1125 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1126 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1127 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1128 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1129 char name = (char )this->buf->b_fname;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1130 Py_ssize_t len;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1131
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1132 if (name == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1133 name = "";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1134 len = strlen(name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1135
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1136 if (len > 35)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1137 name = name + (35 - len);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1138
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1139 vim_snprintf(repr, 100, "<buffer %s%s>", len > 35 ? "..." : "", name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1140
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1141 return PyUnicode_FromString(repr);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1142 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1143 }
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 /******************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1146
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	1147 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	1148 BufferLength(PyObject *self)
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 if (CheckBuffer((BufferObject *)(self)))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1151 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1152
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1153 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	1154 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1155
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	1156 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	1157 BufferItem(PyObject *self, Py_ssize_t n)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1158 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1159 return RBItem((BufferObject *)(self), n, 1,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1160 (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	1161 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1162
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	1163 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	1164 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	1165 {
76f0c4918f5c Move some 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 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	1167 (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	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
76f0c4918f5c Move some 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 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	1171 BufferSubscript(PyObject self, PyObject idx)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1172 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1173 if (PyLong_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1174 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1175 long _idx = PyLong_AsLong(idx);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1176 return BufferItem(self,_idx);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1177 } else if (PySlice_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1178 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1179 Py_ssize_t start, stop, step, slicelen;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1180
3074 6eae1b42c668 updated for version 7.3.309 Bram Moolenaar <bram@vim.org> parents: 3070 diff changeset	1181 if (PySlice_GetIndicesEx((PyObject *)idx,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1182 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1183 &start, &stop,
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1184 &step, &slicelen) < 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1185 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1186 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1187 }
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1188 return BufferSlice(self, start, stop);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1189 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1190 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1191 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1192 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1193 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1194 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1195 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1196
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1197 static Py_ssize_t
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1198 BufferAsSubscript(PyObject self, PyObject idx, PyObject* val)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1199 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1200 if (PyLong_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1201 {
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1202 long n = PyLong_AsLong(idx);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1203 return RBAsItem((BufferObject *)(self), n, val, 1,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1204 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1205 NULL);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1206 } else if (PySlice_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1207 {
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1208 Py_ssize_t start, stop, step, slicelen;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1209
3074 6eae1b42c668 updated for version 7.3.309 Bram Moolenaar <bram@vim.org> parents: 3070 diff changeset	1210 if (PySlice_GetIndicesEx((PyObject *)idx,
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1211 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count+1,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1212 &start, &stop,
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1213 &step, &slicelen) < 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1214 {
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1215 return -1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1216 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1217 return RBAsSlice((BufferObject *)(self), start, stop, val, 1,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1218 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1219 NULL);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1220 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1221 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1222 {
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1223 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1224 return -1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1225 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1226 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1227
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1228 static PySequenceMethods RangeAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1229 (lenfunc) RangeLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1230 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1231 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1232 (ssizeargfunc) RangeItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1233 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1234 (ssizeobjargproc) RangeAsItem, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1235 0, /* sq_ass_slice, x[i:j]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1236 0, /* sq_contains */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1237 0, /* sq_inplace_concat */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1238 0, /* sq_inplace_repeat */
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1239 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1240
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1241 PyMappingMethods RangeAsMapping = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1242 /* mp_length */ (lenfunc)RangeLength,
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1243 /* mp_subscript */ (binaryfunc)RangeSubscript,
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1244 /* mp_ass_subscript */ (objobjargproc)RangeAsSubscript,
2329 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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1247 /* Line range object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1248 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1249
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	1250 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	1251 RangeDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1252 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1253 Py_DECREF(((RangeObject *)(self))->buf);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1254 Py_TYPE(self)->tp_free((PyObject*)self);
2329 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
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	1257 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	1258 RangeGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1259 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1260 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1261 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1262 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1263
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1264 if (strcmp(name, "start") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1265 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	1266 else if (strcmp(name, "end") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1267 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	1268 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1269 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1270 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1271
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1272 /****************/
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1273
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	1274 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	1275 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	1276 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1277 return RBAsItem(((RangeObject *)(self))->buf, n, val,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1278 ((RangeObject *)(self))->start,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1279 ((RangeObject *)(self))->end,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1280 &((RangeObject *)(self))->end);
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
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1283 static Py_ssize_t
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1284 RangeAsSlice(PyObject self, Py_ssize_t lo, Py_ssize_t hi, PyObject val)
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1285 {
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1286 return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val,
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1287 ((RangeObject *)(self))->start,
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1288 ((RangeObject *)(self))->end,
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1289 &((RangeObject *)(self))->end);
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1290 }
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1291
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	1292 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	1293 RangeSubscript(PyObject self, PyObject idx)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1294 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1295 if (PyLong_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1296 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1297 long _idx = PyLong_AsLong(idx);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1298 return RangeItem(self,_idx);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1299 } else if (PySlice_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1300 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1301 Py_ssize_t start, stop, step, slicelen;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1302
3074 6eae1b42c668 updated for version 7.3.309 Bram Moolenaar <bram@vim.org> parents: 3070 diff changeset	1303 if (PySlice_GetIndicesEx((PyObject *)idx,
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1304 ((RangeObject )(self))->end-((RangeObject )(self))->start+1,
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1305 &start, &stop,
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1306 &step, &slicelen) < 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1307 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1308 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1309 }
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1310 return RangeSlice(self, start, stop);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1311 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1312 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1313 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1314 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1315 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1316 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1317 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1318
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1319 static Py_ssize_t
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1320 RangeAsSubscript(PyObject self, PyObject idx, PyObject *val)
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1321 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1322 if (PyLong_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1323 {
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1324 long n = PyLong_AsLong(idx);
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1325 return RangeAsItem(self, n, val);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1326 } else if (PySlice_Check(idx))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1327 {
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1328 Py_ssize_t start, stop, step, slicelen;
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1329
3074 6eae1b42c668 updated for version 7.3.309 Bram Moolenaar <bram@vim.org> parents: 3070 diff changeset	1330 if (PySlice_GetIndicesEx((PyObject *)idx,
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1331 ((RangeObject )(self))->end-((RangeObject )(self))->start+1,
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1332 &start, &stop,
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1333 &step, &slicelen) < 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1334 {
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1335 return -1;
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1336 }
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1337 return RangeAsSlice(self, start, stop, val);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1338 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1339 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1340 {
3070 880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1341 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1342 return -1;
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1343 }
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1344 }
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1345
880b7dd69331 updated for version 7.3.307 Bram Moolenaar <bram@vim.org> parents: 3032 diff changeset	1346
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1347 /* Buffer list object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1348 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1349
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1350 typedef struct
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 PyObject_HEAD
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1353 } BufListObject;
2329 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 static PySequenceMethods BufListAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1356 (lenfunc) BufListLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1357 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1358 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1359 (ssizeargfunc) BufListItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1360 0, /* was_sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1361 (ssizeobjargproc) 0, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1362 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	1363 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1364 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1365 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1366 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1367
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1368 static PyTypeObject BufListType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1369
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1370 /* Window object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1371 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1372
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1373 static struct PyMethodDef WindowMethods[] = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1374 /* name, function, calling, documentation */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1375 { NULL, NULL, 0, NULL }
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1376 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1377
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1378 static PyTypeObject WindowType;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1379
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1380 /* Window object - Implementation
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
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	1383 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	1384 WindowNew(win_T *win)
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 /* 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	1387 * 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	1388 * 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	1389 * 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	1390 * 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	1391 * 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	1392 * the window is stored in "w_python3_ref".
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1393 * 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	1394 * 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	1395 * 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	1396 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1397
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1398 WindowObject *self;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1399
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1400 if (win->w_python3_ref)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1401 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1402 self = win->w_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1403 Py_INCREF(self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1404 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1405 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1406 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1407 self = PyObject_NEW(WindowObject, &WindowType);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1408 if (self == NULL)
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1409 return NULL;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1410 self->win = win;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1411 win->w_python3_ref = self;
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1414 return (PyObject *)(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1415 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1416
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	1417 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	1418 WindowDestructor(PyObject *self)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1419 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1420 WindowObject this = (WindowObject )(self);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1421
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1422 if (this->win && this->win != INVALID_WINDOW_VALUE)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1423 this->win->w_python3_ref = NULL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1424
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1425 Py_TYPE(self)->tp_free((PyObject*)self);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1426 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1427
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	1428 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	1429 WindowGetattro(PyObject self, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1430 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1431 WindowObject this = (WindowObject )(self);
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 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1434 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1435 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1436
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 (CheckWindow(this))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1439 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1440
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1441 if (strcmp(name, "buffer") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1442 return (PyObject *)BufferNew(this->win->w_buffer);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1443 else if (strcmp(name, "cursor") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1444 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1445 pos_T *pos = &this->win->w_cursor;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1446
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1447 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	1448 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1449 else if (strcmp(name, "height") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1450 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	1451 #ifdef FEAT_VERTSPLIT
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1452 else if (strcmp(name, "width") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1453 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	1454 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1455 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1456 return Py_BuildValue("[sss]", "buffer", "cursor", "height");
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1457 else
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1458 return PyObject_GenericGetAttr(self, nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1459 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1460
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	1461 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	1462 WindowSetattro(PyObject self, PyObject nameobj, PyObject *val)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1463 {
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1464 char *name = "";
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1465
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1466 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1467 name = _PyUnicode_AsString(nameobj);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1468
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1469 return WindowSetattr(self, name, val);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1470 }
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 /* Window list object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1473 */
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 typedef struct
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1476 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1477 PyObject_HEAD
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1478 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1479 WinListObject;
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 static PySequenceMethods WinListAsSeq = {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1482 (lenfunc) WinListLength, /* sq_length, len(x) */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1483 (binaryfunc) 0, /* sq_concat, x+y */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1484 (ssizeargfunc) 0, /* sq_repeat, xn /
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1485 (ssizeargfunc) WinListItem, /* sq_item, x[i] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1486 0, /* sq_slice, x[i:j] */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1487 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1488 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	1489 0, /* sq_contains */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1490 0, /* sq_inplace_concat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1491 0, /* sq_inplace_repeat */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1492 };
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 static PyTypeObject WinListType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1495
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1496 /* Current items object - Definitions
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1497 */
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1498
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1499 typedef struct
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 PyObject_HEAD
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2404 diff changeset	1502 } CurrentObject;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1503
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1504 static PyTypeObject CurrentType;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1505
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1506 /* Current items object - Implementation
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1507 */
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	1508 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	1509 CurrentGetattro(PyObject self UNUSED, PyObject nameobj)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1510 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1511 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1512 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1513 name = _PyUnicode_AsString(nameobj);
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 if (strcmp(name, "buffer") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1516 return (PyObject *)BufferNew(curbuf);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1517 else if (strcmp(name, "window") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1518 return (PyObject *)WindowNew(curwin);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1519 else if (strcmp(name, "line") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1520 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	1521 else if (strcmp(name, "range") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1522 return RangeNew(curbuf, RangeStart, RangeEnd);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1523 else if (strcmp(name,"__members__") == 0)
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1524 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	1525 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1526 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1527 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1528 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1529 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1530 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1531
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	1532 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	1533 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	1534 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1535 char *name = "";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1536 if (PyUnicode_Check(nameobj))
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1537 name = _PyUnicode_AsString(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 if (strcmp(name, "line") == 0)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1540 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1541 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	1542 return -1;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1543
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1544 return 0;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1545 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1546 else
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1547 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1548 PyErr_SetString(PyExc_AttributeError, name);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1549 return -1;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1550 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1551 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1552
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1553 /* Dictionary object - Definitions
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1554 */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1555
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1556 static PyInt DictionaryLength(PyObject *);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1557
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1558 static PyMappingMethods DictionaryAsMapping = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1559 /* mp_length */ (lenfunc) DictionaryLength,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1560 /* mp_subscript */ (binaryfunc) DictionaryItem,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1561 /* mp_ass_subscript */ (objobjargproc) DictionaryAssItem,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1562 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1563
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1564 static PyTypeObject DictionaryType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1565
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1566 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1567 DictionaryDestructor(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1568 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1569 DictionaryObject this = (DictionaryObject )(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1570
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1571 pyll_remove(&this->ref, &lastdict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1572 dict_unref(this->dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1573
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1574 Py_TYPE(self)->tp_free((PyObject*)self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1575 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1576
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1577 /* List object - Definitions
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1578 */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1579
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1580 static PyInt ListLength(PyObject *);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1581 static PyObject ListItem(PyObject , Py_ssize_t);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1582
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1583 static PySequenceMethods ListAsSeq = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1584 (lenfunc) ListLength, /* sq_length, len(x) */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1585 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1586 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, xn /
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1587 (ssizeargfunc) ListItem, /* sq_item, x[i] */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1588 (void ) 0, / was_sq_slice, x[i:j] */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1589 (ssizeobjargproc) ListAssItem, /* sq_as_item, x[i]=v */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1590 (void ) 0, / was_sq_ass_slice, x[i:j]=v */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1591 0, /* sq_contains */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1592 (binaryfunc) ListConcatInPlace,/* sq_inplace_concat */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1593 0, /* sq_inplace_repeat */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1594 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1595
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1596 static PyObject ListSubscript(PyObject , PyObject *);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1597 static Py_ssize_t ListAsSubscript(PyObject , PyObject , PyObject *);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1598
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1599 static PyMappingMethods ListAsMapping = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1600 /* mp_length */ (lenfunc) ListLength,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1601 /* mp_subscript */ (binaryfunc) ListSubscript,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1602 /* mp_ass_subscript */ (objobjargproc) ListAsSubscript,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1603 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1604
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1605 static PyTypeObject ListType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1606
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1607 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1608 ListSubscript(PyObject self, PyObject idxObject)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1609 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1610 if (PyLong_Check(idxObject))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1611 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1612 long idx = PyLong_AsLong(idxObject);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1613 return ListItem(self, idx);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1614 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1615 else if (PySlice_Check(idxObject))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1616 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1617 Py_ssize_t start, stop, step, slicelen;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1618
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1619 if (PySlice_GetIndicesEx(idxObject, ListLength(self), &start, &stop,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1620 &step, &slicelen) < 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1621 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1622 return ListSlice(self, start, stop);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1623 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1624 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1625 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1626 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1627 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1628 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1629 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1630
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1631 static Py_ssize_t
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1632 ListAsSubscript(PyObject self, PyObject idxObject, PyObject *obj)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1633 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1634 if (PyLong_Check(idxObject))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1635 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1636 long idx = PyLong_AsLong(idxObject);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1637 return ListAssItem(self, idx, obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1638 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1639 else if (PySlice_Check(idxObject))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1640 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1641 Py_ssize_t start, stop, step, slicelen;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1642
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1643 if (PySlice_GetIndicesEx(idxObject, ListLength(self), &start, &stop,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1644 &step, &slicelen) < 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1645 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1646 return ListAssSlice(self, start, stop, obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1647 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1648 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1649 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1650 PyErr_SetString(PyExc_IndexError, "Index must be int or slice");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1651 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1652 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1653 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1654
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1655 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1656 ListDestructor(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1657 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1658 ListObject this = (ListObject )(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1659
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1660 pyll_remove(&this->ref, &lastlist);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1661 list_unref(this->list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1662
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1663 Py_TYPE(self)->tp_free((PyObject*)self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1664 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1665
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1666 /* Function object - Definitions
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1667 */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1668
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1669 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1670 FunctionDestructor(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1671 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1672 FunctionObject this = (FunctionObject ) (self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1673
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1674 func_unref(this->name);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1675 PyMem_Del(this->name);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1676
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1677 Py_TYPE(self)->tp_free((PyObject*)self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1678 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1679
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1680 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1681 FunctionGetattro(PyObject self, PyObject nameobj)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1682 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1683 FunctionObject this = (FunctionObject )(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1684 char *name = "";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1685 if (PyUnicode_Check(nameobj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1686 name = _PyUnicode_AsString(nameobj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1687
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1688 if (strcmp(name, "name") == 0)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1689 return PyUnicode_FromString((char *)(this->name));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1690
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1691 return PyObject_GenericGetAttr(self, nameobj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1692 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1693
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1694 /* External interface
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
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1697 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1698 python3_buffer_free(buf_T *buf)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1699 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1700 if (buf->b_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1701 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1702 BufferObject *bp = buf->b_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1703 bp->buf = INVALID_BUFFER_VALUE;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1704 buf->b_python3_ref = NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1705 }
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 #if defined(FEAT_WINDOWS) \|\| defined(PROTO)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1709 void
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1710 python3_window_free(win_T *win)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1711 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1712 if (win->w_python3_ref != NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1713 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1714 WindowObject *wp = win->w_python3_ref;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1715 wp->win = INVALID_WINDOW_VALUE;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1716 win->w_python3_ref = NULL;
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 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1719 #endif
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1720
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1721 static BufListObject TheBufferList =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1722 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1723 PyObject_HEAD_INIT(&BufListType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1724 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1725
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1726 static WinListObject TheWindowList =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1727 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1728 PyObject_HEAD_INIT(&WinListType)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1729 };
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1730
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1731 static CurrentObject TheCurrent =
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1732 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1733 PyObject_HEAD_INIT(&CurrentType)
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 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	1737
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1738 static struct PyModuleDef vimmodule;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1739
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	1740 #ifndef PROTO
f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	1741 PyMODINIT_FUNC Py3Init_vim(void)
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 PyObject *mod;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1744 /* 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	1745 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	1746
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1747 PyType_Ready(&BufferType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1748 PyType_Ready(&RangeType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1749 PyType_Ready(&WindowType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1750 PyType_Ready(&BufListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1751 PyType_Ready(&WinListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1752 PyType_Ready(&CurrentType);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1753 PyType_Ready(&DictionaryType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1754 PyType_Ready(&ListType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1755 PyType_Ready(&FunctionType);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1756
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1757 /* 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	1758 PySys_SetArgv(1, argv);
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 mod = PyModule_Create(&vimmodule);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1761 if (mod == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1762 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1763
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1764 VimError = PyErr_NewException("vim.error", NULL, NULL);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2877 diff changeset	1765 Py_INCREF(VimError);
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 PyModule_AddObject(mod, "error", VimError);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1768 Py_INCREF((PyObject )(void )&TheBufferList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1769 PyModule_AddObject(mod, "buffers", (PyObject )(void )&TheBufferList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1770 Py_INCREF((PyObject )(void )&TheCurrent);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1771 PyModule_AddObject(mod, "current", (PyObject )(void )&TheCurrent);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1772 Py_INCREF((PyObject )(void )&TheWindowList);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1773 PyModule_AddObject(mod, "windows", (PyObject )(void )&TheWindowList);
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 if (PyErr_Occurred())
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1776 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1777
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1778 return mod;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1779 }
2342 f6540762173d Fixes and improvements for MS-Windows build. Bram Moolenaar <bram@vim.org> parents: 2340 diff changeset	1780 #endif
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1781
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1782 /*************************************************************************
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1783 * 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	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 /* Convert a Vim line into a Python string.
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1787 * All internal newlines are replaced by null characters.
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 * 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	1790 */
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	1791 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	1792 LineToString(const char *str)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1793 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1794 PyObject *result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1795 Py_ssize_t len = strlen(str);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1796 char tmp,p;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1797
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1798 tmp = (char *)alloc((unsigned)(len+1));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1799 p = tmp;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1800 if (p == NULL)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1801 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1802 PyErr_NoMemory();
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1803 return NULL;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1804 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1805
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1806 while (*str)
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1807 {
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1808 if (*str == '\n')
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1809 *p = '\0';
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1810 else
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1811 p = str;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1812
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1813 ++p;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1814 ++str;
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1815 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1816 *p = '\0';
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1817
2955 f909f4f0f38c updated for version 7.3.250 Bram Moolenaar <bram@vim.org> parents: 2927 diff changeset	1818 result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, CODEC_ERROR_HANDLER);
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1819
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1820 vim_free(tmp);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1821 return result;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1822 }
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1823
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1824 void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1825 do_py3eval (char_u str, typval_T rettv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1826 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1827 DoPy3Command(NULL, (char *) str, rettv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1828 switch(rettv->v_type)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1829 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1830 case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1831 case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1832 case VAR_FUNC: func_ref(rettv->vval.v_string); break;
3796 a2f61b2b8e77 updated for version 7.3.656 Bram Moolenaar <bram@vim.org> parents: 3638 diff changeset	1833 case VAR_UNKNOWN:
a2f61b2b8e77 updated for version 7.3.656 Bram Moolenaar <bram@vim.org> parents: 3638 diff changeset	1834 rettv->v_type = VAR_NUMBER;
a2f61b2b8e77 updated for version 7.3.656 Bram Moolenaar <bram@vim.org> parents: 3638 diff changeset	1835 rettv->vval.v_number = 0;
a2f61b2b8e77 updated for version 7.3.656 Bram Moolenaar <bram@vim.org> parents: 3638 diff changeset	1836 break;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1837 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1838 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1839
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1840 void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1841 set_ref_in_python3 (int copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1842 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1843 set_ref_in_py(copyID);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1844 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1845
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	1846 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	1847 init_structs(void)
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1848 {
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1849 vim_memset(&OutputType, 0, sizeof(OutputType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1850 OutputType.tp_name = "vim.message";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1851 OutputType.tp_basicsize = sizeof(OutputObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1852 OutputType.tp_getattro = OutputGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1853 OutputType.tp_setattro = OutputSetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1854 OutputType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1855 OutputType.tp_doc = "vim message object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1856 OutputType.tp_methods = OutputMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1857 OutputType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1858 OutputType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1859 OutputType.tp_free = call_PyObject_Free;
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 vim_memset(&BufferType, 0, sizeof(BufferType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1862 BufferType.tp_name = "vim.buffer";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1863 BufferType.tp_basicsize = sizeof(BufferType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1864 BufferType.tp_dealloc = BufferDestructor;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1865 BufferType.tp_repr = BufferRepr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1866 BufferType.tp_as_sequence = &BufferAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1867 BufferType.tp_as_mapping = &BufferAsMapping;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1868 BufferType.tp_getattro = BufferGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1869 BufferType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1870 BufferType.tp_doc = "vim buffer object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1871 BufferType.tp_methods = BufferMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1872 BufferType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1873 BufferType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1874 BufferType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1875
2330 ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1876 vim_memset(&WindowType, 0, sizeof(WindowType));
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1877 WindowType.tp_name = "vim.window";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1878 WindowType.tp_basicsize = sizeof(WindowObject);
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1879 WindowType.tp_dealloc = WindowDestructor;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1880 WindowType.tp_repr = WindowRepr;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1881 WindowType.tp_getattro = WindowGetattro;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1882 WindowType.tp_setattro = WindowSetattro;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1883 WindowType.tp_flags = Py_TPFLAGS_DEFAULT;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1884 WindowType.tp_doc = "vim Window object";
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1885 WindowType.tp_methods = WindowMethods;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1886 WindowType.tp_alloc = call_PyType_GenericAlloc;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1887 WindowType.tp_new = call_PyType_GenericNew;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1888 WindowType.tp_free = call_PyObject_Free;
ea4bf6df1a8a Whitespace cleanup. Bram Moolenaar <bram@vim.org> parents: 2329 diff changeset	1889
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1890 vim_memset(&BufListType, 0, sizeof(BufListType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1891 BufListType.tp_name = "vim.bufferlist";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1892 BufListType.tp_basicsize = sizeof(BufListObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1893 BufListType.tp_as_sequence = &BufListAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1894 BufListType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1895 BufferType.tp_doc = "vim buffer list";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1896
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1897 vim_memset(&WinListType, 0, sizeof(WinListType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1898 WinListType.tp_name = "vim.windowlist";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1899 WinListType.tp_basicsize = sizeof(WinListType);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1900 WinListType.tp_as_sequence = &WinListAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1901 WinListType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1902 WinListType.tp_doc = "vim window list";
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 vim_memset(&RangeType, 0, sizeof(RangeType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1905 RangeType.tp_name = "vim.range";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1906 RangeType.tp_basicsize = sizeof(RangeObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1907 RangeType.tp_dealloc = RangeDestructor;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1908 RangeType.tp_repr = RangeRepr;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1909 RangeType.tp_as_sequence = &RangeAsSeq;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1910 RangeType.tp_as_mapping = &RangeAsMapping;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1911 RangeType.tp_getattro = RangeGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1912 RangeType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1913 RangeType.tp_doc = "vim Range object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1914 RangeType.tp_methods = RangeMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1915 RangeType.tp_alloc = call_PyType_GenericAlloc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1916 RangeType.tp_new = call_PyType_GenericNew;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1917 RangeType.tp_free = call_PyObject_Free;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1918
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1919 vim_memset(&CurrentType, 0, sizeof(CurrentType));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1920 CurrentType.tp_name = "vim.currentdata";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1921 CurrentType.tp_basicsize = sizeof(CurrentObject);
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1922 CurrentType.tp_getattro = CurrentGetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1923 CurrentType.tp_setattro = CurrentSetattro;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1924 CurrentType.tp_flags = Py_TPFLAGS_DEFAULT;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1925 CurrentType.tp_doc = "vim current object";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1926
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1927 vim_memset(&DictionaryType, 0, sizeof(DictionaryType));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1928 DictionaryType.tp_name = "vim.dictionary";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1929 DictionaryType.tp_basicsize = sizeof(DictionaryObject);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1930 DictionaryType.tp_dealloc = DictionaryDestructor;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1931 DictionaryType.tp_as_mapping = &DictionaryAsMapping;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1932 DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1933 DictionaryType.tp_doc = "dictionary pushing modifications to vim structure";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1934 DictionaryType.tp_methods = DictionaryMethods;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1935
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1936 vim_memset(&ListType, 0, sizeof(ListType));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1937 ListType.tp_name = "vim.list";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1938 ListType.tp_dealloc = ListDestructor;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1939 ListType.tp_basicsize = sizeof(ListObject);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1940 ListType.tp_as_sequence = &ListAsSeq;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1941 ListType.tp_as_mapping = &ListAsMapping;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1942 ListType.tp_flags = Py_TPFLAGS_DEFAULT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1943 ListType.tp_doc = "list pushing modifications to vim structure";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1944 ListType.tp_methods = ListMethods;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1945
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1946 vim_memset(&FunctionType, 0, sizeof(FunctionType));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1947 FunctionType.tp_name = "vim.list";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1948 FunctionType.tp_basicsize = sizeof(FunctionObject);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1949 FunctionType.tp_getattro = FunctionGetattro;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1950 FunctionType.tp_dealloc = FunctionDestructor;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1951 FunctionType.tp_call = FunctionCall;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1952 FunctionType.tp_flags = Py_TPFLAGS_DEFAULT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1953 FunctionType.tp_doc = "object that calls vim function";
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1954 FunctionType.tp_methods = FunctionMethods;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3310 diff changeset	1955
2329 ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1956 vim_memset(&vimmodule, 0, sizeof(vimmodule));
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1957 vimmodule.m_name = "vim";
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1958 vimmodule.m_doc = vim_module_doc;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1959 vimmodule.m_size = -1;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1960 vimmodule.m_methods = VimMethods;
ad2889f48843 Added support for Python 3. (Roland Puntaier) Bram Moolenaar <bram@vim.org> parents: diff changeset	1961 }

Mercurial > vim

annotate src/if_python3.c @ 3806:5e909c379a1e v7.3.661