Mercurial > vim
annotate src/if_python3.c @ 4500:47e6dec5ce3c v7.3.998
updated for version 7.3.998
Problem: Python: garbage collection issues.
Solution: Fix the GC issues: Use proper DESTRUCTOR_FINISH: avoids negative
refcounts, use PyObject_GC_* for objects with tp_traverse and
tp_clear, add RangeTraverse and RangeClear, use Py_XDECREF in some
places. (ZyX)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Tue, 21 May 2013 20:51:59 +0200 |
parents | 6d517f6e5f0b |
children | ce94a870b59b |
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 | 25 /* uncomment this if used with the debug version of python */ |
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 | 67 #if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 |
68 # define PY_SSIZE_T_CLEAN | |
69 #endif | |
70 | |
2955 | 71 /* The "surrogateescape" error handler is new in Python 3.1 */ |
72 #if PY_VERSION_HEX >= 0x030100f0 | |
73 # define CODEC_ERROR_HANDLER "surrogateescape" | |
74 #else | |
75 # define CODEC_ERROR_HANDLER NULL | |
76 #endif | |
77 | |
3638 | 78 /* Python 3 does not support CObjects, always use Capsules */ |
79 #define PY_USE_CAPSULE | |
80 | |
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
|
81 #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
|
82 #define PyString_Check(obj) PyUnicode_Check(obj) |
3618 | 83 #define PyString_AsBytes(obj) PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, CODEC_ERROR_HANDLER) |
2894 | 84 #define PyString_FreeBytes(obj) Py_XDECREF(bytes) |
85 #define PyString_AsString(obj) PyBytes_AsString(obj) | |
86 #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
|
87 #define PyString_FromString(repr) PyUnicode_FromString(repr) |
3800 | 88 #define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len) |
3826 | 89 #define PyInt_Check(obj) PyLong_Check(obj) |
90 #define PyInt_FromLong(i) PyLong_FromLong(i) | |
91 #define PyInt_AsLong(obj) PyLong_AsLong(obj) | |
4319 | 92 #define Py_ssize_t_fmt "n" |
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
|
93 |
2716 | 94 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
95 |
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
|
96 # 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
|
97 # 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
|
98 # 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
|
99 # define HINSTANCE void* |
2641 | 100 # 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
|
101 # 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
|
102 # 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
|
103 # 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
|
104 # 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
|
105 # 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
|
106 # 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
|
107 # else |
2612 | 108 # 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
|
109 # 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
|
110 # 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
|
111 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
112 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
113 * Wrapper defines |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
114 */ |
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_Parse |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
116 # 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
|
117 # undef PyArg_ParseTuple |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
118 # define PyArg_ParseTuple py3_PyArg_ParseTuple |
2894 | 119 # define PyMem_Free py3_PyMem_Free |
3618 | 120 # define PyMem_Malloc py3_PyMem_Malloc |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
121 # define PyDict_SetItemString py3_PyDict_SetItemString |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
122 # define PyErr_BadArgument py3_PyErr_BadArgument |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
123 # define PyErr_Clear py3_PyErr_Clear |
4145 | 124 # define PyErr_PrintEx py3_PyErr_PrintEx |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
125 # define PyErr_NoMemory py3_PyErr_NoMemory |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
126 # define PyErr_Occurred py3_PyErr_Occurred |
4417 | 127 # define PyErr_PrintEx py3_PyErr_PrintEx |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
128 # define PyErr_SetNone py3_PyErr_SetNone |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
129 # define PyErr_SetString py3_PyErr_SetString |
4403 | 130 # define PyErr_SetObject py3_PyErr_SetObject |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
131 # define PyEval_InitThreads py3_PyEval_InitThreads |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
132 # define PyEval_RestoreThread py3_PyEval_RestoreThread |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
133 # define PyEval_SaveThread py3_PyEval_SaveThread |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
134 # define PyGILState_Ensure py3_PyGILState_Ensure |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
135 # define PyGILState_Release py3_PyGILState_Release |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
136 # define PyLong_AsLong py3_PyLong_AsLong |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
137 # define PyLong_FromLong py3_PyLong_FromLong |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
138 # define PyList_GetItem py3_PyList_GetItem |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
139 # define PyList_Append py3_PyList_Append |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
140 # define PyList_New py3_PyList_New |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
141 # define PyList_SetItem py3_PyList_SetItem |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
142 # define PyList_Size py3_PyList_Size |
3618 | 143 # define PySequence_Check py3_PySequence_Check |
144 # define PySequence_Size py3_PySequence_Size | |
145 # define PySequence_GetItem py3_PySequence_GetItem | |
146 # define PyTuple_Size py3_PyTuple_Size | |
147 # define PyTuple_GetItem py3_PyTuple_GetItem | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
148 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
149 # define PyImport_ImportModule py3_PyImport_ImportModule |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
150 # define PyObject_Init py3__PyObject_Init |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
151 # define PyDict_New py3_PyDict_New |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
152 # define PyDict_GetItemString py3_PyDict_GetItemString |
3618 | 153 # define PyDict_Next py3_PyDict_Next |
154 # define PyMapping_Check py3_PyMapping_Check | |
155 # define PyMapping_Items py3_PyMapping_Items | |
156 # define PyIter_Next py3_PyIter_Next | |
157 # define PyObject_GetIter py3_PyObject_GetIter | |
4399 | 158 # define PyObject_IsTrue py3_PyObject_IsTrue |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
159 # define PyModule_GetDict py3_PyModule_GetDict |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
160 #undef PyRun_SimpleString |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
161 # define PyRun_SimpleString py3_PyRun_SimpleString |
3618 | 162 #undef PyRun_String |
163 # define PyRun_String py3_PyRun_String | |
4417 | 164 # define PyObject_GetAttrString py3_PyObject_GetAttrString |
165 # define PyObject_SetAttrString py3_PyObject_SetAttrString | |
166 # define PyObject_CallFunctionObjArgs py3_PyObject_CallFunctionObjArgs | |
167 # define PyEval_GetLocals py3_PyEval_GetLocals | |
168 # define PyEval_GetGlobals py3_PyEval_GetGlobals | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
169 # define PySys_SetObject py3_PySys_SetObject |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
170 # define PySys_SetArgv py3_PySys_SetArgv |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
171 # define PyType_Ready py3_PyType_Ready |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
172 #undef Py_BuildValue |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
173 # define Py_BuildValue py3_Py_BuildValue |
2641 | 174 # define Py_SetPythonHome py3_Py_SetPythonHome |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
175 # define Py_Initialize py3_Py_Initialize |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
176 # define Py_Finalize py3_Py_Finalize |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
177 # define Py_IsInitialized py3_Py_IsInitialized |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
178 # define _Py_NoneStruct (*py3__Py_NoneStruct) |
3828 | 179 # define _Py_FalseStruct (*py3__Py_FalseStruct) |
180 # define _Py_TrueStruct (*py3__Py_TrueStruct) | |
3618 | 181 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
182 # define PyModule_AddObject py3_PyModule_AddObject |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
183 # define PyImport_AppendInittab py3_PyImport_AppendInittab |
4417 | 184 # define PyImport_AddModule py3_PyImport_AddModule |
3863 | 185 # if PY_VERSION_HEX >= 0x030300f0 |
186 # undef _PyUnicode_AsString | |
3910 | 187 # define _PyUnicode_AsString py3_PyUnicode_AsUTF8 |
3863 | 188 # else |
189 # define _PyUnicode_AsString py3__PyUnicode_AsString | |
190 # endif | |
2894 | 191 # undef PyUnicode_AsEncodedString |
192 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString | |
193 # undef PyBytes_AsString | |
194 # define PyBytes_AsString py3_PyBytes_AsString | |
3798 | 195 # define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize |
3618 | 196 # undef PyBytes_FromString |
197 # define PyBytes_FromString py3_PyBytes_FromString | |
198 # define PyFloat_FromDouble py3_PyFloat_FromDouble | |
199 # define PyFloat_AsDouble py3_PyFloat_AsDouble | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
200 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr |
3828 | 201 # define PyType_Type (*py3_PyType_Type) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
202 # define PySlice_Type (*py3_PySlice_Type) |
3618 | 203 # define PyFloat_Type (*py3_PyFloat_Type) |
3828 | 204 # define PyBool_Type (*py3_PyBool_Type) |
2894 | 205 # 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
|
206 # 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
|
207 # 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
|
208 # 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
|
209 # 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
|
210 # 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
|
211 # 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
|
212 # 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
|
213 # 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
|
214 # 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
|
215 # endif |
4500 | 216 # define _PyObject_GC_New py3__PyObject_GC_New |
217 # define PyObject_GC_Del py3_PyObject_GC_Del | |
218 # define PyObject_GC_UnTrack py3_PyObject_GC_UnTrack | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
219 # define PyType_GenericAlloc py3_PyType_GenericAlloc |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
220 # define PyType_GenericNew py3_PyType_GenericNew |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
221 # 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
|
222 # undef PyUnicode_FromString |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
223 # define PyUnicode_FromString py3_PyUnicode_FromString |
2894 | 224 # undef PyUnicode_Decode |
225 # define PyUnicode_Decode py3_PyUnicode_Decode | |
3618 | 226 # define PyType_IsSubtype py3_PyType_IsSubtype |
227 # define PyCapsule_New py3_PyCapsule_New | |
228 # define PyCapsule_GetPointer py3_PyCapsule_GetPointer | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
229 |
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
|
230 # 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
|
231 # 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
|
232 # define PyObject_NEW(type, typeobj) \ |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
233 ( (type *) PyObject_Init( \ |
2330 | 234 (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
|
235 # 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
|
236 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
237 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
238 * Pointers for dynamic link |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
239 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
240 static int (*py3_PySys_SetArgv)(int, wchar_t **); |
2641 | 241 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
|
242 static void (*py3_Py_Initialize)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
243 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
|
244 static PyGILState_STATE (*py3_PyGILState_Ensure)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
245 static void (*py3_PyGILState_Release)(PyGILState_STATE); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
246 static int (*py3_PySys_SetObject)(char *, PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
247 static PyObject* (*py3_PyList_Append)(PyObject *, PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
248 static Py_ssize_t (*py3_PyList_Size)(PyObject *); |
3618 | 249 static int (*py3_PySequence_Check)(PyObject *); |
250 static Py_ssize_t (*py3_PySequence_Size)(PyObject *); | |
251 static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t); | |
252 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); | |
253 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); | |
254 static int (*py3_PyMapping_Check)(PyObject *); | |
255 static PyObject* (*py3_PyMapping_Items)(PyObject *); | |
3083 | 256 static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length, |
2330 | 257 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
|
258 static PyObject* (*py3_PyErr_NoMemory)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
259 static void (*py3_Py_Finalize)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
260 static void (*py3_PyErr_SetString)(PyObject *, const char *); |
4403 | 261 static void (*py3_PyErr_SetObject)(PyObject *, PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
262 static int (*py3_PyRun_SimpleString)(char *); |
3618 | 263 static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *); |
4417 | 264 static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *); |
265 static PyObject* (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *); | |
266 static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...); | |
267 static PyObject* (*py3_PyEval_GetGlobals)(); | |
268 static PyObject* (*py3_PyEval_GetLocals)(); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
269 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
|
270 static PyObject* (*py3_PyImport_ImportModule)(const char *); |
3618 | 271 static PyObject* (*py3_PyImport_AddModule)(const char *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
272 static int (*py3_PyErr_BadArgument)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
273 static PyObject* (*py3_PyErr_Occurred)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
274 static PyObject* (*py3_PyModule_GetDict)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
275 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
|
276 static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); |
3618 | 277 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
|
278 static PyObject* (*py3_PyLong_FromLong)(long); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
279 static PyObject* (*py3_PyDict_New)(void); |
3618 | 280 static PyObject* (*py3_PyIter_Next)(PyObject *); |
281 static PyObject* (*py3_PyObject_GetIter)(PyObject *); | |
4399 | 282 static int (*py3_PyObject_IsTrue)(PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
283 static PyObject* (*py3_Py_BuildValue)(char *, ...); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
284 static int (*py3_PyType_Ready)(PyTypeObject *type); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
285 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
|
286 static PyObject* (*py3_PyUnicode_FromString)(const char *u); |
2894 | 287 static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size, |
288 const char *encoding, const char *errors); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
289 static long (*py3_PyLong_AsLong)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
290 static void (*py3_PyErr_SetNone)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
291 static void (*py3_PyEval_InitThreads)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
292 static void(*py3_PyEval_RestoreThread)(PyThreadState *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
293 static PyThreadState*(*py3_PyEval_SaveThread)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
294 static int (*py3_PyArg_Parse)(PyObject *, char *, ...); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
295 static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...); |
2894 | 296 static int (*py3_PyMem_Free)(void *); |
3618 | 297 static void* (*py3_PyMem_Malloc)(size_t); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
298 static int (*py3_Py_IsInitialized)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
299 static void (*py3_PyErr_Clear)(void); |
4145 | 300 static void (*py3_PyErr_PrintEx)(int); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
301 static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *); |
3618 | 302 static iternextfunc py3__PyObject_NextNotImplemented; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
303 static PyObject* py3__Py_NoneStruct; |
3828 | 304 static PyObject* py3__Py_FalseStruct; |
305 static PyObject* py3__Py_TrueStruct; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
306 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
|
307 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); |
3910 | 308 # if PY_VERSION_HEX >= 0x030300f0 |
309 static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode); | |
310 # else | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
311 static char* (*py3__PyUnicode_AsString)(PyObject *unicode); |
3910 | 312 # endif |
2894 | 313 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors); |
314 static char* (*py3_PyBytes_AsString)(PyObject *bytes); | |
3798 | 315 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, int *length); |
3618 | 316 static PyObject* (*py3_PyBytes_FromString)(char *str); |
317 static PyObject* (*py3_PyFloat_FromDouble)(double num); | |
318 static double (*py3_PyFloat_AsDouble)(PyObject *); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
319 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
|
320 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
|
321 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
|
322 static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); |
3828 | 323 static PyTypeObject* py3_PyType_Type; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
324 static PyTypeObject* py3_PySlice_Type; |
3618 | 325 static PyTypeObject* py3_PyFloat_Type; |
3828 | 326 static PyTypeObject* py3_PyBool_Type; |
2894 | 327 static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); |
3618 | 328 static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor); |
329 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
|
330 # ifdef Py_DEBUG |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
331 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
|
332 static Py_ssize_t* py3__Py_RefTotal; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
333 static void (*py3__Py_Dealloc)(PyObject *obj); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
334 static void (*py3__PyObject_DebugFree)(void*); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
335 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
|
336 # else |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
337 static void (*py3_PyObject_Free)(void*); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
338 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
|
339 # endif |
4500 | 340 static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *); |
341 static void(*py3_PyObject_GC_Del)(void *); | |
342 static void(*py3_PyObject_GC_UnTrack)(void *); | |
3618 | 343 static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
344 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
345 static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
346 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
347 /* Imported exception objects */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
348 static PyObject *p3imp_PyExc_AttributeError; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
349 static PyObject *p3imp_PyExc_IndexError; |
4315 | 350 static PyObject *p3imp_PyExc_KeyError; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
351 static PyObject *p3imp_PyExc_KeyboardInterrupt; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
352 static PyObject *p3imp_PyExc_TypeError; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
353 static PyObject *p3imp_PyExc_ValueError; |
4405 | 354 static PyObject *p3imp_PyExc_RuntimeError; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
355 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
356 # define PyExc_AttributeError p3imp_PyExc_AttributeError |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
357 # define PyExc_IndexError p3imp_PyExc_IndexError |
4315 | 358 # define PyExc_KeyError p3imp_PyExc_KeyError |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
359 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
360 # define PyExc_TypeError p3imp_PyExc_TypeError |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
361 # define PyExc_ValueError p3imp_PyExc_ValueError |
4405 | 362 # define PyExc_RuntimeError p3imp_PyExc_RuntimeError |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
363 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
364 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
365 * Table of name to function pointer of python. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
366 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
367 # define PYTHON_PROC FARPROC |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
368 static struct |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
369 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
370 char *name; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
371 PYTHON_PROC *ptr; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
372 } py3_funcname_table[] = |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
373 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
374 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv}, |
2641 | 375 {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
376 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, |
3910 | 377 # ifndef PY_SSIZE_T_CLEAN |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
378 {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, |
3806 | 379 {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue}, |
3910 | 380 # else |
3806 | 381 {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, |
382 {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue}, | |
3910 | 383 # endif |
2894 | 384 {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, |
3618 | 385 {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
386 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
387 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
388 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
389 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
390 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
391 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size}, |
3618 | 392 {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check}, |
393 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size}, | |
394 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem}, | |
395 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size}, | |
396 {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
397 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
398 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
399 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
400 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString}, |
4403 | 401 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
402 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString}, |
3618 | 403 {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String}, |
4417 | 404 {"PyObject_GetAttrString", (PYTHON_PROC*)&py3_PyObject_GetAttrString}, |
405 {"PyObject_SetAttrString", (PYTHON_PROC*)&py3_PyObject_SetAttrString}, | |
406 {"PyObject_CallFunctionObjArgs", (PYTHON_PROC*)&py3_PyObject_CallFunctionObjArgs}, | |
407 {"PyEval_GetGlobals", (PYTHON_PROC*)&py3_PyEval_GetGlobals}, | |
408 {"PyEval_GetLocals", (PYTHON_PROC*)&py3_PyEval_GetLocals}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
409 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
410 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule}, |
3618 | 411 {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
412 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
413 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
414 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
415 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
416 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, |
3618 | 417 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, |
418 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, | |
419 {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items}, | |
420 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, | |
421 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, | |
4399 | 422 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
423 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
424 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
425 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
426 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
427 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
428 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
429 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
430 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
431 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
432 {"PyArg_Parse", (PYTHON_PROC*)&py3_PyArg_Parse}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
433 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, |
3618 | 434 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
435 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, |
3828 | 436 {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct}, |
437 {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
438 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear}, |
4145 | 439 {"PyErr_PrintEx", (PYTHON_PROC*)&py3_PyErr_PrintEx}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
440 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
441 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
442 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, |
3910 | 443 # if PY_VERSION_HEX >= 0x030300f0 |
444 {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8}, | |
445 # else | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
446 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, |
3910 | 447 # endif |
2894 | 448 {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString}, |
3798 | 449 {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize}, |
3618 | 450 {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString}, |
451 {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble}, | |
452 {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
453 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
454 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
455 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
456 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, |
3828 | 457 {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
458 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, |
3618 | 459 {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, |
3828 | 460 {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, |
2894 | 461 {"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
|
462 # ifdef Py_DEBUG |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
463 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
464 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
465 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
466 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
467 {"_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
|
468 # else |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
469 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
470 {"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
|
471 # endif |
4500 | 472 {"_PyObject_GC_New", (PYTHON_PROC*)&py3__PyObject_GC_New}, |
473 {"PyObject_GC_Del", (PYTHON_PROC*)&py3_PyObject_GC_Del}, | |
474 {"PyObject_GC_UnTrack", (PYTHON_PROC*)&py3_PyObject_GC_UnTrack}, | |
3618 | 475 {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype}, |
476 {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New}, | |
477 {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
478 {"", NULL}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
479 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
480 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
481 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
482 * Free python.dll |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
483 */ |
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
|
484 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
|
485 end_dynamic_python3(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
486 { |
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
487 if (hinstPy3 != 0) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
488 { |
2330 | 489 close_dll(hinstPy3); |
490 hinstPy3 = 0; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
491 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
492 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
493 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
494 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
495 * Load library and get all pointers. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
496 * Parameter 'libname' provides name of DLL. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
497 * Return OK or FAIL. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
498 */ |
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
|
499 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
|
500 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
|
501 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
502 int i; |
2894 | 503 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
|
504 |
2641 | 505 # 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
|
506 /* 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
|
507 * 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
|
508 * 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
|
509 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
|
510 { |
3032 | 511 if (verbose) |
512 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
|
513 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
|
514 } |
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
|
515 # 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
|
516 |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
517 if (hinstPy3 != 0) |
2330 | 518 return OK; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
519 hinstPy3 = load_dll(libname); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
520 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
521 if (!hinstPy3) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
522 { |
2330 | 523 if (verbose) |
524 EMSG2(_(e_loadlib), libname); | |
525 return FAIL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
526 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
527 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
528 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
|
529 { |
2330 | 530 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3, |
531 py3_funcname_table[i].name)) == NULL) | |
532 { | |
533 close_dll(hinstPy3); | |
534 hinstPy3 = 0; | |
535 if (verbose) | |
536 EMSG2(_(e_loadfunc), py3_funcname_table[i].name); | |
537 return FAIL; | |
538 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
539 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
540 |
2342
f6540762173d
Fixes and improvements for MS-Windows build.
Bram Moolenaar <bram@vim.org>
parents:
2340
diff
changeset
|
541 /* 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
|
542 * will be present in the library. */ |
3910 | 543 # if PY_VERSION_HEX >= 0x030300f0 |
3863 | 544 ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicode_FromString"); |
545 ucs_decode = symbol_from_dll(hinstPy3, "PyUnicode_Decode"); | |
546 ucs_as_encoded_string = symbol_from_dll(hinstPy3, | |
547 "PyUnicode_AsEncodedString"); | |
3910 | 548 # else |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
549 ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString"); |
2894 | 550 ucs_decode = symbol_from_dll(hinstPy3, |
551 "PyUnicodeUCS2_Decode"); | |
552 ucs_as_encoded_string = symbol_from_dll(hinstPy3, | |
553 "PyUnicodeUCS2_AsEncodedString"); | |
554 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
|
555 { |
2330 | 556 ucs_from_string = symbol_from_dll(hinstPy3, |
557 "PyUnicodeUCS4_FromString"); | |
2894 | 558 ucs_decode = symbol_from_dll(hinstPy3, |
559 "PyUnicodeUCS4_Decode"); | |
560 ucs_as_encoded_string = symbol_from_dll(hinstPy3, | |
561 "PyUnicodeUCS4_AsEncodedString"); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
562 } |
3910 | 563 # endif |
2894 | 564 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
|
565 { |
2330 | 566 py3_PyUnicode_FromString = ucs_from_string; |
2894 | 567 py3_PyUnicode_Decode = ucs_decode; |
568 py3_PyUnicode_AsEncodedString = ucs_as_encoded_string; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
569 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
570 else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
571 { |
2330 | 572 close_dll(hinstPy3); |
573 hinstPy3 = 0; | |
574 if (verbose) | |
575 EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*"); | |
576 return FAIL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
577 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
578 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
579 return OK; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
580 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
581 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
582 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
583 * 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
|
584 * TRUE, else FALSE. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
585 */ |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
586 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
|
587 python3_enabled(int verbose) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
588 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
589 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
|
590 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
591 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
592 /* 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
|
593 * 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
|
594 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
595 static void get_py3_exceptions __ARGS((void)); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
596 |
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
|
597 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
|
598 get_py3_exceptions() |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
599 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
600 PyObject *exmod = PyImport_ImportModule("builtins"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
601 PyObject *exdict = PyModule_GetDict(exmod); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
602 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
603 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); |
4315 | 604 p3imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
605 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
606 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
607 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); |
4405 | 608 p3imp_PyExc_RuntimeError = PyDict_GetItemString(exdict, "RuntimeError"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
609 Py_XINCREF(p3imp_PyExc_AttributeError); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
610 Py_XINCREF(p3imp_PyExc_IndexError); |
4315 | 611 Py_XINCREF(p3imp_PyExc_KeyError); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
612 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
613 Py_XINCREF(p3imp_PyExc_TypeError); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
614 Py_XINCREF(p3imp_PyExc_ValueError); |
4405 | 615 Py_XINCREF(p3imp_PyExc_RuntimeError); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
616 Py_XDECREF(exmod); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
617 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
618 #endif /* DYNAMIC_PYTHON3 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
619 |
3618 | 620 static int py3initialised = 0; |
621 | |
622 #define PYINITIALISED py3initialised | |
623 | |
3798 | 624 #define DICTKEY_DECL PyObject *bytes = NULL; |
625 | |
3618 | 626 #define DICTKEY_GET(err) \ |
627 if (PyBytes_Check(keyObject)) \ | |
3798 | 628 { \ |
3800 | 629 if (PyString_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \ |
3798 | 630 return err; \ |
631 } \ | |
3618 | 632 else if (PyUnicode_Check(keyObject)) \ |
633 { \ | |
634 bytes = PyString_AsBytes(keyObject); \ | |
635 if (bytes == NULL) \ | |
636 return err; \ | |
3800 | 637 if (PyString_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \ |
3618 | 638 return err; \ |
639 } \ | |
640 else \ | |
641 { \ | |
642 PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \ | |
643 return err; \ | |
644 } | |
3798 | 645 |
3618 | 646 #define DICTKEY_UNREF \ |
647 if (bytes != NULL) \ | |
648 Py_XDECREF(bytes); | |
649 | |
4500 | 650 #define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self) |
3618 | 651 |
4377 | 652 #define WIN_PYTHON_REF(win) win->w_python3_ref |
653 #define BUF_PYTHON_REF(buf) buf->b_python3_ref | |
4401 | 654 #define TAB_PYTHON_REF(tab) tab->tp_python3_ref |
4377 | 655 |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
656 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
|
657 call_PyObject_Free(void *p) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
658 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
659 #ifdef Py_DEBUG |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
660 _PyObject_DebugFree(p); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
661 #else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
662 PyObject_Free(p); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
663 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
664 } |
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
|
665 |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
666 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
|
667 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
|
668 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
669 return PyType_GenericNew(type,args,kwds); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
670 } |
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
|
671 |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
672 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
|
673 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
|
674 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
675 return PyType_GenericAlloc(type,nitems); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
676 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
677 |
4492 | 678 static PyObject *BufferDir(PyObject *); |
4319 | 679 static PyObject *OutputGetattro(PyObject *, PyObject *); |
680 static int OutputSetattro(PyObject *, PyObject *, PyObject *); | |
681 static PyObject *BufferGetattro(PyObject *, PyObject *); | |
4401 | 682 static PyObject *TabPageGetattro(PyObject *, PyObject *); |
4319 | 683 static PyObject *WindowGetattro(PyObject *, PyObject *); |
684 static int WindowSetattro(PyObject *, PyObject *, PyObject *); | |
685 static PyObject *RangeGetattro(PyObject *, PyObject *); | |
686 static PyObject *CurrentGetattro(PyObject *, PyObject *); | |
687 static int CurrentSetattro(PyObject *, PyObject *, PyObject *); | |
688 static PyObject *DictionaryGetattro(PyObject *, PyObject *); | |
689 static int DictionarySetattro(PyObject *, PyObject *, PyObject *); | |
690 static PyObject *ListGetattro(PyObject *, PyObject *); | |
691 static int ListSetattro(PyObject *, PyObject *, PyObject *); | |
692 static PyObject *FunctionGetattro(PyObject *, PyObject *); | |
693 | |
694 static struct PyModuleDef vimmodule; | |
695 | |
696 /* | |
697 * Include the code shared with if_python.c | |
698 */ | |
699 #include "if_py_both.h" | |
700 | |
701 #define GET_ATTR_STRING(name, nameobj) \ | |
702 char *name = ""; \ | |
703 if (PyUnicode_Check(nameobj)) \ | |
704 name = _PyUnicode_AsString(nameobj) | |
705 | |
706 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0) | |
707 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
708 /****************************************************** |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
709 * Internal function prototypes. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
710 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
711 |
3951 | 712 static PyObject *Py3Init_vim(void); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
713 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
714 /****************************************************** |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
715 * 1. Python interpreter main program. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
716 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
717 |
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
|
718 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
|
719 python3_end() |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
720 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
721 static int recurse = 0; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
722 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
723 /* 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
|
724 if (recurse != 0) |
2330 | 725 return; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
726 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
727 ++recurse; |
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 #ifdef DYNAMIC_PYTHON3 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
730 if (hinstPy3) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
731 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
732 if (Py_IsInitialized()) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
733 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
734 // acquire lock before finalizing |
4415 | 735 PyGILState_Ensure(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
736 |
2330 | 737 Py_Finalize(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
738 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
739 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
740 #ifdef DYNAMIC_PYTHON3 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
741 end_dynamic_python3(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
742 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
743 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
744 --recurse; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
745 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
746 |
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
747 #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
|
748 int |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
749 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
|
750 { |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
751 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
|
752 } |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
753 #endif |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
754 |
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
|
755 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
|
756 Python3_Init(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
757 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
758 if (!py3initialised) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
759 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
760 #ifdef DYNAMIC_PYTHON3 |
2330 | 761 if (!python3_enabled(TRUE)) |
762 { | |
763 EMSG(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); | |
764 goto fail; | |
765 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
766 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
767 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
768 init_structs(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
769 |
2641 | 770 |
771 #ifdef PYTHON3_HOME | |
772 Py_SetPythonHome(PYTHON3_HOME); | |
773 #endif | |
774 | |
3863 | 775 PyImport_AppendInittab("vim", Py3Init_vim); |
776 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
777 #if !defined(MACOS) || defined(MACOS_X_UNIX) |
2330 | 778 Py_Initialize(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
779 #else |
2330 | 780 PyMac_Initialize(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
781 #endif |
4109 | 782 /* Initialise threads, and below save the state using |
783 * PyEval_SaveThread. Without the call to PyEval_SaveThread, thread | |
784 * specific state (such as the system trace hook), will be lost | |
785 * between invocations of Python code. */ | |
2877 | 786 PyEval_InitThreads(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
787 #ifdef DYNAMIC_PYTHON3 |
2330 | 788 get_py3_exceptions(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
789 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
790 |
4494 | 791 if (PythonIO_Init_io()) |
2330 | 792 goto fail; |
793 | |
3618 | 794 globals = PyModule_GetDict(PyImport_AddModule("__main__")); |
795 | |
2330 | 796 /* Remove the element from sys.path that was added because of our |
797 * argv[0] value in Py3Init_vim(). Previously we used an empty | |
4352 | 798 * string, but depending on the OS we then get an empty entry or |
2894 | 799 * the current directory in sys.path. |
800 * Only after vim has been imported, the element does exist in | |
801 * sys.path. | |
802 */ | |
803 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
|
804 |
4109 | 805 /* lock is created and acquired in PyEval_InitThreads() and thread |
806 * state is created in Py_Initialize() | |
807 * there _PyGILState_NoteThreadState() also sets gilcounter to 1 | |
808 * (python must have threads enabled!) | |
809 * so the following does both: unlock GIL and save thread state in TLS | |
810 * without deleting thread state | |
811 */ | |
812 PyEval_SaveThread(); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
813 |
2330 | 814 py3initialised = 1; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
815 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
816 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
817 return 0; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
818 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
819 fail: |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
820 /* 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
|
821 * This is OK, as it is possible to call this function even |
4494 | 822 * if PythonIO_Init_io() has not completed successfully (it will |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
823 * not do anything in this case). |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
824 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
825 PythonIO_Flush(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
826 return -1; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
827 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
828 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
829 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
830 * External interface |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
831 */ |
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
|
832 static void |
4486 | 833 DoPyCommand(const char *cmd, rangeinitializer init_range, runner run, void *arg) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
834 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
835 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
2330 | 836 GrafPtr oldPort; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
837 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
838 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
2330 | 839 char *saved_locale; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
840 #endif |
2894 | 841 PyObject *cmdstr; |
842 PyObject *cmdbytes; | |
4415 | 843 PyGILState_STATE pygilstate; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
844 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
845 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
846 GetPort(&oldPort); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
847 /* Check if the Python library is available */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
848 if ((Ptr)PyMac_Initialize == (Ptr)kUnresolvedCFragSymbolAddress) |
2330 | 849 goto theend; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
850 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
851 if (Python3_Init()) |
2330 | 852 goto theend; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
853 |
4486 | 854 init_range(arg); |
855 | |
2330 | 856 Python_Release_Vim(); /* leave vim */ |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
857 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
858 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
859 /* 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
|
860 saved_locale = setlocale(LC_NUMERIC, NULL); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
861 if (saved_locale == NULL || STRCMP(saved_locale, "C") == 0) |
2330 | 862 saved_locale = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
863 else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
864 { |
2330 | 865 /* Need to make a copy, value may change when setting new locale. */ |
866 saved_locale = (char *)vim_strsave((char_u *)saved_locale); | |
867 (void)setlocale(LC_NUMERIC, "C"); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
868 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
869 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
870 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
871 pygilstate = PyGILState_Ensure(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
872 |
2894 | 873 /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause |
874 * SyntaxError (unicode error). */ | |
2955 | 875 cmdstr = PyUnicode_Decode(cmd, strlen(cmd), |
876 (char *)ENC_OPT, CODEC_ERROR_HANDLER); | |
877 cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER); | |
2894 | 878 Py_XDECREF(cmdstr); |
3618 | 879 |
4486 | 880 run(PyBytes_AsString(cmdbytes), arg, &pygilstate); |
2894 | 881 Py_XDECREF(cmdbytes); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
882 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
883 PyGILState_Release(pygilstate); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
884 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
885 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
886 if (saved_locale != NULL) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
887 { |
2330 | 888 (void)setlocale(LC_NUMERIC, saved_locale); |
889 vim_free(saved_locale); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
890 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
891 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
892 |
2330 | 893 Python_Lock_Vim(); /* enter vim */ |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
894 PythonIO_Flush(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
895 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
896 SetPort(oldPort); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
897 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
898 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
899 theend: |
2330 | 900 return; /* keeps lint happy */ |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
901 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
902 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
903 /* |
2350
06feaf4fe36a
Rename some "python3" symbols to "py3", as the command name.
Bram Moolenaar <bram@vim.org>
parents:
2342
diff
changeset
|
904 * ":py3" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
905 */ |
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
|
906 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
|
907 ex_py3(exarg_T *eap) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
908 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
909 char_u *script; |
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 script = script_get(eap, eap->arg); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
912 if (!eap->skip) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
913 { |
4486 | 914 DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script, |
915 (rangeinitializer) init_range_cmd, | |
916 (runner) run_cmd, | |
917 (void *) eap); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
918 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
919 vim_free(script); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
920 } |
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 #define BUFFER_SIZE 2048 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
923 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
924 /* |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
925 * ":py3file" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
926 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
927 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
928 ex_py3file(exarg_T *eap) |
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 static char buffer[BUFFER_SIZE]; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
931 const char *file; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
932 char *p; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
933 int i; |
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 /* 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
|
936 * 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
|
937 * 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
|
938 * compatible between the two. Yuk. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
939 * |
2894 | 940 * construct: exec(compile(open('a_filename', 'rb').read(), 'a_filename', 'exec')) |
941 * | |
942 * Using bytes so that Python can detect the source encoding as it normally | |
943 * 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
|
944 * |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
945 * 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
|
946 * Python won't mangle the file name. |
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 strcpy(buffer, "exec(compile(open('"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
950 p = buffer + 19; /* size of "exec(compile(open('" */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
951 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
952 for (i=0; i<2; ++i) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
953 { |
2330 | 954 file = (char *)eap->arg; |
955 while (*file && p < buffer + (BUFFER_SIZE - 3)) | |
956 { | |
957 if (*file == '\\' || *file == '\'') | |
958 *p++ = '\\'; | |
959 *p++ = *file++; | |
960 } | |
961 /* If we didn't finish the file name, we hit a buffer overflow */ | |
962 if (*file != '\0') | |
963 return; | |
964 if (i==0) | |
965 { | |
2894 | 966 strcpy(p,"','rb').read(),'"); |
967 p += 16; | |
2330 | 968 } |
969 else | |
970 { | |
971 strcpy(p,"','exec'))"); | |
972 p += 10; | |
973 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
974 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
975 |
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 /* Execute the file */ |
4486 | 978 DoPyCommand(buffer, |
979 (rangeinitializer) init_range_cmd, | |
980 (runner) run_cmd, | |
981 (void *) eap); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
982 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
983 |
4421 | 984 void |
985 ex_py3do(exarg_T *eap) | |
4417 | 986 { |
4486 | 987 DoPyCommand((char *)eap->arg, |
988 (rangeinitializer)init_range_cmd, | |
989 (runner)run_do, | |
990 (void *)eap); | |
4417 | 991 } |
992 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
993 /****************************************************** |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
994 * 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
|
995 */ |
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 /* Implementation functions |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
998 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
999 |
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
|
1000 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
|
1001 OutputGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1002 { |
3826 | 1003 GET_ATTR_STRING(name, nameobj); |
2329
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 if (strcmp(name, "softspace") == 0) |
2330 | 1006 return PyLong_FromLong(((OutputObject *)(self))->softspace); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1007 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1008 return PyObject_GenericGetAttr(self, nameobj); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1009 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1010 |
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
|
1011 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
|
1012 OutputSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1013 { |
3826 | 1014 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1015 |
4488 | 1016 return OutputSetattr((OutputObject *)(self), name, val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1017 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1018 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1019 /****************************************************** |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1020 * 3. Implementation of the Vim module for Python |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1021 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1022 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1023 /* Window type - Implementation functions |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1024 * -------------------------------------- |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1025 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1026 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1027 #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
|
1028 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1029 /* Buffer type - Implementation functions |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1030 * -------------------------------------- |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1031 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1032 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1033 #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
|
1034 |
3070 | 1035 static PyObject* BufferSubscript(PyObject *self, PyObject *idx); |
1036 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
|
1037 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1038 /* Line range type - Implementation functions |
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 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1041 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1042 #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
|
1043 |
3070 | 1044 static PyObject* RangeSubscript(PyObject *self, PyObject *idx); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1045 static Py_ssize_t RangeAsItem(PyObject *, Py_ssize_t, PyObject *); |
3070 | 1046 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
|
1047 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1048 /* Current objects type - Implementation functions |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1049 * ----------------------------------------------- |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1050 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1051 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1052 static PySequenceMethods BufferAsSeq = { |
2330 | 1053 (lenfunc) BufferLength, /* sq_length, len(x) */ |
1054 (binaryfunc) 0, /* sq_concat, x+y */ | |
1055 (ssizeargfunc) 0, /* sq_repeat, x*n */ | |
1056 (ssizeargfunc) BufferItem, /* sq_item, x[i] */ | |
1057 0, /* was_sq_slice, x[i:j] */ | |
2894 | 1058 0, /* sq_ass_item, x[i]=v */ |
2330 | 1059 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
|
1060 0, /* sq_contains */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1061 0, /* sq_inplace_concat */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1062 0, /* sq_inplace_repeat */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1063 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1064 |
4319 | 1065 static PyMappingMethods BufferAsMapping = { |
2330 | 1066 /* mp_length */ (lenfunc)BufferLength, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1067 /* mp_subscript */ (binaryfunc)BufferSubscript, |
2894 | 1068 /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1069 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1070 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1071 |
4377 | 1072 /* Buffer object |
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 |
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
|
1075 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
|
1076 BufferGetattro(PyObject *self, PyObject*nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1077 { |
4319 | 1078 PyObject *r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1079 |
3826 | 1080 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1081 |
4319 | 1082 if (CheckBuffer((BufferObject *)(self))) |
2330 | 1083 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1084 |
4319 | 1085 r = BufferAttr((BufferObject *)(self), name); |
1086 if (r || PyErr_Occurred()) | |
1087 return r; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1088 else |
2330 | 1089 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1090 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1091 |
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
|
1092 static PyObject * |
4492 | 1093 BufferDir(PyObject *self UNUSED) |
3310 | 1094 { |
1095 return Py_BuildValue("[sssss]", "name", "number", | |
1096 "append", "mark", "range"); | |
1097 } | |
1098 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1099 /******************/ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1100 |
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
|
1101 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
|
1102 BufferSubscript(PyObject *self, PyObject* idx) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1103 { |
3618 | 1104 if (PyLong_Check(idx)) |
1105 { | |
2330 | 1106 long _idx = PyLong_AsLong(idx); |
4488 | 1107 return BufferItem((BufferObject *)(self), _idx); |
3618 | 1108 } else if (PySlice_Check(idx)) |
1109 { | |
2330 | 1110 Py_ssize_t start, stop, step, slicelen; |
1111 | |
4387 | 1112 if (CheckBuffer((BufferObject *) self)) |
1113 return NULL; | |
1114 | |
3074 | 1115 if (PySlice_GetIndicesEx((PyObject *)idx, |
4389 | 1116 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
2330 | 1117 &start, &stop, |
3618 | 1118 &step, &slicelen) < 0) |
1119 { | |
2330 | 1120 return NULL; |
1121 } | |
4488 | 1122 return BufferSlice((BufferObject *)(self), start, stop); |
3618 | 1123 } |
1124 else | |
1125 { | |
4405 | 1126 PyErr_SetString(PyExc_TypeError, _("index must be int or slice")); |
2330 | 1127 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1128 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1129 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1130 |
2894 | 1131 static Py_ssize_t |
1132 BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val) | |
1133 { | |
3618 | 1134 if (PyLong_Check(idx)) |
1135 { | |
2894 | 1136 long n = PyLong_AsLong(idx); |
1137 return RBAsItem((BufferObject *)(self), n, val, 1, | |
1138 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
1139 NULL); | |
3618 | 1140 } else if (PySlice_Check(idx)) |
1141 { | |
2894 | 1142 Py_ssize_t start, stop, step, slicelen; |
1143 | |
4387 | 1144 if (CheckBuffer((BufferObject *) self)) |
1145 return -1; | |
1146 | |
3074 | 1147 if (PySlice_GetIndicesEx((PyObject *)idx, |
4389 | 1148 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
2894 | 1149 &start, &stop, |
3618 | 1150 &step, &slicelen) < 0) |
1151 { | |
2894 | 1152 return -1; |
1153 } | |
1154 return RBAsSlice((BufferObject *)(self), start, stop, val, 1, | |
1155 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
1156 NULL); | |
3618 | 1157 } |
1158 else | |
1159 { | |
4405 | 1160 PyErr_SetString(PyExc_TypeError, _("index must be int or slice")); |
2894 | 1161 return -1; |
1162 } | |
1163 } | |
1164 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1165 static PySequenceMethods RangeAsSeq = { |
2330 | 1166 (lenfunc) RangeLength, /* sq_length, len(x) */ |
1167 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */ | |
1168 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, x*n */ | |
1169 (ssizeargfunc) RangeItem, /* sq_item, x[i] */ | |
1170 0, /* was_sq_slice, x[i:j] */ | |
1171 (ssizeobjargproc) RangeAsItem, /* sq_as_item, x[i]=v */ | |
1172 0, /* sq_ass_slice, x[i:j]=v */ | |
1173 0, /* sq_contains */ | |
1174 0, /* sq_inplace_concat */ | |
1175 0, /* sq_inplace_repeat */ | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1176 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1177 |
4319 | 1178 static PyMappingMethods RangeAsMapping = { |
2330 | 1179 /* mp_length */ (lenfunc)RangeLength, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1180 /* mp_subscript */ (binaryfunc)RangeSubscript, |
3070 | 1181 /* mp_ass_subscript */ (objobjargproc)RangeAsSubscript, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1182 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1183 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1184 /* Line range object - Implementation |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1185 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1186 |
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
|
1187 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
|
1188 RangeGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1189 { |
3826 | 1190 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1191 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1192 if (strcmp(name, "start") == 0) |
2330 | 1193 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
|
1194 else if (strcmp(name, "end") == 0) |
2330 | 1195 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
|
1196 else |
2330 | 1197 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1198 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1199 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1200 /****************/ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1201 |
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
|
1202 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
|
1203 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
|
1204 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1205 return RBAsItem(((RangeObject *)(self))->buf, n, val, |
2330 | 1206 ((RangeObject *)(self))->start, |
1207 ((RangeObject *)(self))->end, | |
1208 &((RangeObject *)(self))->end); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1209 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1210 |
3070 | 1211 static Py_ssize_t |
1212 RangeAsSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi, PyObject *val) | |
1213 { | |
1214 return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val, | |
1215 ((RangeObject *)(self))->start, | |
1216 ((RangeObject *)(self))->end, | |
1217 &((RangeObject *)(self))->end); | |
1218 } | |
1219 | |
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
|
1220 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
|
1221 RangeSubscript(PyObject *self, PyObject* idx) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1222 { |
3618 | 1223 if (PyLong_Check(idx)) |
1224 { | |
2330 | 1225 long _idx = PyLong_AsLong(idx); |
4488 | 1226 return RangeItem((RangeObject *)(self), _idx); |
3618 | 1227 } else if (PySlice_Check(idx)) |
1228 { | |
2330 | 1229 Py_ssize_t start, stop, step, slicelen; |
1230 | |
3074 | 1231 if (PySlice_GetIndicesEx((PyObject *)idx, |
2330 | 1232 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
1233 &start, &stop, | |
3618 | 1234 &step, &slicelen) < 0) |
1235 { | |
2330 | 1236 return NULL; |
1237 } | |
4488 | 1238 return RangeSlice((RangeObject *)(self), start, stop); |
3618 | 1239 } |
1240 else | |
1241 { | |
4405 | 1242 PyErr_SetString(PyExc_TypeError, _("index must be int or slice")); |
2330 | 1243 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1244 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1245 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1246 |
3070 | 1247 static Py_ssize_t |
1248 RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val) | |
1249 { | |
3618 | 1250 if (PyLong_Check(idx)) |
1251 { | |
3070 | 1252 long n = PyLong_AsLong(idx); |
1253 return RangeAsItem(self, n, val); | |
3618 | 1254 } else if (PySlice_Check(idx)) |
1255 { | |
3070 | 1256 Py_ssize_t start, stop, step, slicelen; |
1257 | |
3074 | 1258 if (PySlice_GetIndicesEx((PyObject *)idx, |
3070 | 1259 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
1260 &start, &stop, | |
3618 | 1261 &step, &slicelen) < 0) |
1262 { | |
3070 | 1263 return -1; |
1264 } | |
1265 return RangeAsSlice(self, start, stop, val); | |
3618 | 1266 } |
1267 else | |
1268 { | |
4405 | 1269 PyErr_SetString(PyExc_TypeError, _("index must be int or slice")); |
3070 | 1270 return -1; |
1271 } | |
1272 } | |
1273 | |
4401 | 1274 /* TabPage object - Implementation |
1275 */ | |
1276 | |
1277 static PyObject * | |
1278 TabPageGetattro(PyObject *self, PyObject *nameobj) | |
1279 { | |
1280 PyObject *r; | |
1281 | |
1282 GET_ATTR_STRING(name, nameobj); | |
1283 | |
1284 if (CheckTabPage((TabPageObject *)(self))) | |
1285 return NULL; | |
1286 | |
1287 r = TabPageAttr((TabPageObject *)(self), name); | |
1288 if (r || PyErr_Occurred()) | |
1289 return r; | |
1290 else | |
1291 return PyObject_GenericGetAttr(self, nameobj); | |
1292 } | |
1293 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1294 /* Window object - Implementation |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1295 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1296 |
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
|
1297 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
|
1298 WindowGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1299 { |
4319 | 1300 PyObject *r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1301 |
3826 | 1302 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1303 |
4319 | 1304 if (CheckWindow((WindowObject *)(self))) |
2330 | 1305 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1306 |
4319 | 1307 r = WindowAttr((WindowObject *)(self), name); |
1308 if (r || PyErr_Occurred()) | |
1309 return r; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1310 else |
2330 | 1311 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1312 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1313 |
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
|
1314 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
|
1315 WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1316 { |
3826 | 1317 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1318 |
4488 | 1319 return WindowSetattr((WindowObject *)(self), name, val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1320 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1321 |
4401 | 1322 /* Tab page list object - Definitions |
1323 */ | |
1324 | |
1325 static PySequenceMethods TabListAsSeq = { | |
1326 (lenfunc) TabListLength, /* sq_length, len(x) */ | |
1327 (binaryfunc) 0, /* sq_concat, x+y */ | |
1328 (ssizeargfunc) 0, /* sq_repeat, x*n */ | |
1329 (ssizeargfunc) TabListItem, /* sq_item, x[i] */ | |
1330 0, /* sq_slice, x[i:j] */ | |
1331 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */ | |
1332 0, /* sq_ass_slice, x[i:j]=v */ | |
1333 0, /* sq_contains */ | |
1334 0, /* sq_inplace_concat */ | |
1335 0, /* sq_inplace_repeat */ | |
1336 }; | |
1337 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1338 /* Window list object - Definitions |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1339 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1340 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1341 static PySequenceMethods WinListAsSeq = { |
2330 | 1342 (lenfunc) WinListLength, /* sq_length, len(x) */ |
1343 (binaryfunc) 0, /* sq_concat, x+y */ | |
1344 (ssizeargfunc) 0, /* sq_repeat, x*n */ | |
1345 (ssizeargfunc) WinListItem, /* sq_item, x[i] */ | |
1346 0, /* sq_slice, x[i:j] */ | |
1347 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */ | |
1348 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
|
1349 0, /* sq_contains */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1350 0, /* sq_inplace_concat */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1351 0, /* sq_inplace_repeat */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1352 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1353 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1354 /* Current items object - Implementation |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1355 */ |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1356 static PyObject * |
4319 | 1357 CurrentGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1358 { |
3826 | 1359 GET_ATTR_STRING(name, nameobj); |
4319 | 1360 return CurrentGetattr(self, name); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1361 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1362 |
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
|
1363 static int |
4319 | 1364 CurrentSetattro(PyObject *self, PyObject *nameobj, PyObject *value) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1365 { |
4319 | 1366 GET_ATTR_STRING(name, nameobj); |
1367 return CurrentSetattr(self, name, value); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1368 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1369 |
3618 | 1370 /* Dictionary object - Definitions |
1371 */ | |
1372 | |
3828 | 1373 static PyObject * |
1374 DictionaryGetattro(PyObject *self, PyObject *nameobj) | |
1375 { | |
1376 DictionaryObject *this = ((DictionaryObject *) (self)); | |
1377 | |
1378 GET_ATTR_STRING(name, nameobj); | |
1379 | |
1380 if (strcmp(name, "locked") == 0) | |
1381 return PyLong_FromLong(this->dict->dv_lock); | |
1382 else if (strcmp(name, "scope") == 0) | |
1383 return PyLong_FromLong(this->dict->dv_scope); | |
1384 | |
1385 return PyObject_GenericGetAttr(self, nameobj); | |
1386 } | |
1387 | |
1388 static int | |
1389 DictionarySetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
1390 { | |
1391 GET_ATTR_STRING(name, nameobj); | |
4488 | 1392 return DictionarySetattr((DictionaryObject *)(self), name, val); |
3618 | 1393 } |
1394 | |
1395 /* List object - Definitions | |
1396 */ | |
1397 | |
1398 static PySequenceMethods ListAsSeq = { | |
1399 (lenfunc) ListLength, /* sq_length, len(x) */ | |
1400 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */ | |
1401 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, x*n */ | |
1402 (ssizeargfunc) ListItem, /* sq_item, x[i] */ | |
1403 (void *) 0, /* was_sq_slice, x[i:j] */ | |
1404 (ssizeobjargproc) ListAssItem, /* sq_as_item, x[i]=v */ | |
1405 (void *) 0, /* was_sq_ass_slice, x[i:j]=v */ | |
1406 0, /* sq_contains */ | |
1407 (binaryfunc) ListConcatInPlace,/* sq_inplace_concat */ | |
1408 0, /* sq_inplace_repeat */ | |
1409 }; | |
1410 | |
1411 static PyObject *ListSubscript(PyObject *, PyObject *); | |
1412 static Py_ssize_t ListAsSubscript(PyObject *, PyObject *, PyObject *); | |
1413 | |
1414 static PyMappingMethods ListAsMapping = { | |
1415 /* mp_length */ (lenfunc) ListLength, | |
1416 /* mp_subscript */ (binaryfunc) ListSubscript, | |
1417 /* mp_ass_subscript */ (objobjargproc) ListAsSubscript, | |
1418 }; | |
1419 | |
1420 static PyObject * | |
4488 | 1421 ListSubscript(PyObject *self, PyObject* idx) |
3618 | 1422 { |
4488 | 1423 if (PyLong_Check(idx)) |
3618 | 1424 { |
4488 | 1425 long _idx = PyLong_AsLong(idx); |
1426 return ListItem((ListObject *)(self), _idx); | |
3618 | 1427 } |
4488 | 1428 else if (PySlice_Check(idx)) |
3618 | 1429 { |
1430 Py_ssize_t start, stop, step, slicelen; | |
1431 | |
4488 | 1432 if (PySlice_GetIndicesEx(idx, ListLength((ListObject *)(self)), |
1433 &start, &stop, &step, &slicelen) < 0) | |
3618 | 1434 return NULL; |
4488 | 1435 return ListSlice((ListObject *)(self), start, stop); |
3618 | 1436 } |
1437 else | |
1438 { | |
4405 | 1439 PyErr_SetString(PyExc_TypeError, _("index must be int or slice")); |
3618 | 1440 return NULL; |
1441 } | |
1442 } | |
1443 | |
1444 static Py_ssize_t | |
4488 | 1445 ListAsSubscript(PyObject *self, PyObject *idx, PyObject *obj) |
3618 | 1446 { |
4488 | 1447 if (PyLong_Check(idx)) |
3618 | 1448 { |
4488 | 1449 long _idx = PyLong_AsLong(idx); |
1450 return ListAssItem((ListObject *)(self), _idx, obj); | |
3618 | 1451 } |
4488 | 1452 else if (PySlice_Check(idx)) |
3618 | 1453 { |
1454 Py_ssize_t start, stop, step, slicelen; | |
1455 | |
4488 | 1456 if (PySlice_GetIndicesEx(idx, ListLength((ListObject *)(self)), |
1457 &start, &stop, &step, &slicelen) < 0) | |
3618 | 1458 return -1; |
4488 | 1459 return ListAssSlice((ListObject *)(self), start, stop, obj); |
3618 | 1460 } |
1461 else | |
1462 { | |
4405 | 1463 PyErr_SetString(PyExc_TypeError, _("index must be int or slice")); |
3618 | 1464 return -1; |
1465 } | |
1466 } | |
1467 | |
3828 | 1468 static PyObject * |
1469 ListGetattro(PyObject *self, PyObject *nameobj) | |
1470 { | |
1471 GET_ATTR_STRING(name, nameobj); | |
1472 | |
1473 if (strcmp(name, "locked") == 0) | |
1474 return PyLong_FromLong(((ListObject *) (self))->list->lv_lock); | |
1475 | |
1476 return PyObject_GenericGetAttr(self, nameobj); | |
1477 } | |
1478 | |
1479 static int | |
1480 ListSetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
1481 { | |
1482 GET_ATTR_STRING(name, nameobj); | |
4488 | 1483 return ListSetattr((ListObject *)(self), name, val); |
3618 | 1484 } |
1485 | |
1486 /* Function object - Definitions | |
1487 */ | |
1488 | |
1489 static PyObject * | |
1490 FunctionGetattro(PyObject *self, PyObject *nameobj) | |
1491 { | |
1492 FunctionObject *this = (FunctionObject *)(self); | |
3826 | 1493 |
1494 GET_ATTR_STRING(name, nameobj); | |
3618 | 1495 |
1496 if (strcmp(name, "name") == 0) | |
1497 return PyUnicode_FromString((char *)(this->name)); | |
1498 | |
1499 return PyObject_GenericGetAttr(self, nameobj); | |
1500 } | |
1501 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1502 /* External interface |
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 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1505 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1506 python3_buffer_free(buf_T *buf) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1507 { |
4377 | 1508 if (BUF_PYTHON_REF(buf) != NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1509 { |
4377 | 1510 BufferObject *bp = BUF_PYTHON_REF(buf); |
2330 | 1511 bp->buf = INVALID_BUFFER_VALUE; |
4377 | 1512 BUF_PYTHON_REF(buf) = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1513 } |
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 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1516 #if defined(FEAT_WINDOWS) || defined(PROTO) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1517 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1518 python3_window_free(win_T *win) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1519 { |
4377 | 1520 if (WIN_PYTHON_REF(win) != NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1521 { |
4377 | 1522 WindowObject *wp = WIN_PYTHON_REF(win); |
2330 | 1523 wp->win = INVALID_WINDOW_VALUE; |
4377 | 1524 WIN_PYTHON_REF(win) = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1525 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1526 } |
4401 | 1527 |
1528 void | |
1529 python3_tabpage_free(tabpage_T *tab) | |
1530 { | |
1531 if (TAB_PYTHON_REF(tab) != NULL) | |
1532 { | |
1533 TabPageObject *tp = TAB_PYTHON_REF(tab); | |
1534 tp->tab = INVALID_TABPAGE_VALUE; | |
1535 TAB_PYTHON_REF(tab) = NULL; | |
1536 } | |
1537 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1538 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1539 |
3951 | 1540 static PyObject * |
1541 Py3Init_vim(void) | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1542 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1543 PyObject *mod; |
4494 | 1544 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1545 /* 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
|
1546 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
|
1547 |
4494 | 1548 if (init_types()) |
1549 return NULL; | |
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 /* 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
|
1552 PySys_SetArgv(1, argv); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1553 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1554 mod = PyModule_Create(&vimmodule); |
2894 | 1555 if (mod == NULL) |
1556 return NULL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1557 |
4494 | 1558 if (populate_module(mod, PyModule_AddObject)) |
2330 | 1559 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1560 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1561 return mod; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1562 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1563 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1564 /************************************************************************* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1565 * 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
|
1566 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1567 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1568 /* Convert a Vim line into a Python string. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1569 * All internal newlines are replaced by null characters. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1570 * |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1571 * 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
|
1572 */ |
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
|
1573 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
|
1574 LineToString(const char *str) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1575 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1576 PyObject *result; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1577 Py_ssize_t len = strlen(str); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1578 char *tmp,*p; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1579 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1580 tmp = (char *)alloc((unsigned)(len+1)); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1581 p = tmp; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1582 if (p == NULL) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1583 { |
2330 | 1584 PyErr_NoMemory(); |
1585 return NULL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1586 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1587 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1588 while (*str) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1589 { |
2330 | 1590 if (*str == '\n') |
1591 *p = '\0'; | |
1592 else | |
1593 *p = *str; | |
1594 | |
1595 ++p; | |
1596 ++str; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1597 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1598 *p = '\0'; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1599 |
2955 | 1600 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
|
1601 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1602 vim_free(tmp); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1603 return result; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1604 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1605 |
3618 | 1606 void |
1607 do_py3eval (char_u *str, typval_T *rettv) | |
1608 { | |
4486 | 1609 DoPyCommand((char *) str, |
1610 (rangeinitializer) init_range_eval, | |
1611 (runner) run_eval, | |
1612 (void *) rettv); | |
3618 | 1613 switch(rettv->v_type) |
1614 { | |
1615 case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break; | |
1616 case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break; | |
1617 case VAR_FUNC: func_ref(rettv->vval.v_string); break; | |
3796 | 1618 case VAR_UNKNOWN: |
1619 rettv->v_type = VAR_NUMBER; | |
1620 rettv->vval.v_number = 0; | |
1621 break; | |
3618 | 1622 } |
1623 } | |
1624 | |
1625 void | |
1626 set_ref_in_python3 (int copyID) | |
1627 { | |
1628 set_ref_in_py(copyID); | |
1629 } |