Mercurial > vim
annotate src/if_python3.c @ 20577:5f0f1f63c8df v8.2.0842
patch 8.2.0842: MS-Windows: channel tests fail
Commit: https://github.com/vim/vim/commit/208534d9ae6e8dec5baff90440b58c63f0b37981
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat May 30 13:07:39 2020 +0200
patch 8.2.0842: MS-Windows: channel tests fail
Problem: MS-Windows: channel tests fail.
Solution: Adjust #ifdefs. (closes https://github.com/vim/vim/issues/6162)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 30 May 2020 13:15:03 +0200 |
parents | 4acb165ed0bc |
children | 10eb6c38938c |
rev | line source |
---|---|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
2329
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 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
25 // uncomment this if used with the debug version of python |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
26 // #define Py_DEBUG |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
27 // Note: most of time you can add -DPy_DEBUG to CFLAGS in place of uncommenting |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
28 // uncomment this if used with the debug version of python, but without its |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
29 // allocator |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
30 // #define Py_DEBUG_NO_PYMALLOC |
2329
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 #include "vim.h" |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
33 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
34 #include <limits.h> |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
35 |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
36 #if defined(MSWIN) && defined(HAVE_FCNTL_H) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
37 # undef HAVE_FCNTL_H |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
38 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
39 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
40 #ifdef _DEBUG |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
41 # undef _DEBUG |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
42 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
43 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
44 #ifdef F_BLANK |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
45 # undef F_BLANK |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
46 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
47 |
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
48 #ifdef HAVE_STRFTIME |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
49 # undef HAVE_STRFTIME |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
50 #endif |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
51 #ifdef HAVE_STRING_H |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
52 # undef HAVE_STRING_H |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
53 #endif |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
54 #ifdef HAVE_PUTENV |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
55 # undef HAVE_PUTENV |
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
56 #endif |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
57 #ifdef HAVE_STDARG_H |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
58 # undef HAVE_STDARG_H // Python's config.h defines it as well. |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
59 #endif |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
60 #ifdef _POSIX_C_SOURCE // defined in feature.h |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
61 # undef _POSIX_C_SOURCE |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
62 #endif |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
63 #ifdef _XOPEN_SOURCE |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
64 # undef _XOPEN_SOURCE // pyconfig.h defines it as well. |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
65 #endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
66 |
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
67 #define PY_SSIZE_T_CLEAN |
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
68 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
69 #include <Python.h> |
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
70 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
71 #undef main // Defined in python.h - aargh |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
72 #undef HAVE_FCNTL_H // Clash with os_win32.h |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
73 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
74 // The "surrogateescape" error handler is new in Python 3.1 |
2955 | 75 #if PY_VERSION_HEX >= 0x030100f0 |
76 # define CODEC_ERROR_HANDLER "surrogateescape" | |
77 #else | |
78 # define CODEC_ERROR_HANDLER NULL | |
79 #endif | |
80 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
81 // Python 3 does not support CObjects, always use Capsules |
3638 | 82 #define PY_USE_CAPSULE |
83 | |
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
|
84 #define PyInt Py_ssize_t |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
85 #ifndef PyString_Check |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
86 # define PyString_Check(obj) PyUnicode_Check(obj) |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
87 #endif |
5164
b3bd43ef012d
updated for version 7.4a.008
Bram Moolenaar <bram@vim.org>
parents:
5112
diff
changeset
|
88 #define PyString_FromString(repr) \ |
b3bd43ef012d
updated for version 7.4a.008
Bram Moolenaar <bram@vim.org>
parents:
5112
diff
changeset
|
89 PyUnicode_Decode(repr, STRLEN(repr), ENC_OPT, NULL) |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
90 #define PyString_FromFormat PyUnicode_FromFormat |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
91 #ifndef PyInt_Check |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
92 # define PyInt_Check(obj) PyLong_Check(obj) |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
93 #endif |
3826 | 94 #define PyInt_FromLong(i) PyLong_FromLong(i) |
95 #define PyInt_AsLong(obj) PyLong_AsLong(obj) | |
4319 | 96 #define Py_ssize_t_fmt "n" |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
97 #define Py_bytes_fmt "y" |
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
|
98 |
5608 | 99 #define PyIntArgFunc ssizeargfunc |
100 #define PyIntObjArgProc ssizeobjargproc | |
101 | |
5768 | 102 /* |
103 * PySlice_GetIndicesEx(): first argument type changed from PySliceObject | |
104 * to PyObject in Python 3.2 or later. | |
105 */ | |
106 #if PY_VERSION_HEX >= 0x030200f0 | |
107 typedef PyObject PySliceObject_T; | |
108 #else | |
109 typedef PySliceObject PySliceObject_T; | |
110 #endif | |
111 | |
2716 | 112 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
113 |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
114 # ifndef MSWIN |
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 # 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
|
116 # 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
|
117 # define HINSTANCE void* |
2641 | 118 # 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
|
119 # 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
|
120 # 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
|
121 # 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
|
122 # 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
|
123 # 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
|
124 # 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
|
125 # else |
2612 | 126 # 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
|
127 # 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
|
128 # 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
|
129 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
130 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
131 * Wrapper defines |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
132 */ |
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
|
133 # undef PyArg_Parse |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
134 # 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
|
135 # undef PyArg_ParseTuple |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
136 # define PyArg_ParseTuple py3_PyArg_ParseTuple |
2894 | 137 # define PyMem_Free py3_PyMem_Free |
3618 | 138 # define PyMem_Malloc py3_PyMem_Malloc |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
139 # define PyDict_SetItemString py3_PyDict_SetItemString |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
140 # define PyErr_BadArgument py3_PyErr_BadArgument |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
141 # define PyErr_Clear py3_PyErr_Clear |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
142 # define PyErr_Format py3_PyErr_Format |
4145 | 143 # define PyErr_PrintEx py3_PyErr_PrintEx |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
144 # define PyErr_NoMemory py3_PyErr_NoMemory |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
145 # define PyErr_Occurred py3_PyErr_Occurred |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
146 # define PyErr_SetNone py3_PyErr_SetNone |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
147 # define PyErr_SetString py3_PyErr_SetString |
4403 | 148 # define PyErr_SetObject py3_PyErr_SetObject |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
149 # define PyErr_ExceptionMatches py3_PyErr_ExceptionMatches |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
150 # define PyEval_InitThreads py3_PyEval_InitThreads |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
151 # define PyEval_RestoreThread py3_PyEval_RestoreThread |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
152 # define PyEval_SaveThread py3_PyEval_SaveThread |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
153 # define PyGILState_Ensure py3_PyGILState_Ensure |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
154 # define PyGILState_Release py3_PyGILState_Release |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
155 # define PyLong_AsLong py3_PyLong_AsLong |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
156 # define PyLong_FromLong py3_PyLong_FromLong |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
157 # define PyList_GetItem py3_PyList_GetItem |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
158 # define PyList_Append py3_PyList_Append |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
159 # define PyList_Insert py3_PyList_Insert |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
160 # define PyList_New py3_PyList_New |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
161 # define PyList_SetItem py3_PyList_SetItem |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
162 # define PyList_Size py3_PyList_Size |
3618 | 163 # define PySequence_Check py3_PySequence_Check |
164 # define PySequence_Size py3_PySequence_Size | |
165 # define PySequence_GetItem py3_PySequence_GetItem | |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
166 # define PySequence_Fast py3_PySequence_Fast |
3618 | 167 # define PyTuple_Size py3_PyTuple_Size |
168 # define PyTuple_GetItem py3_PyTuple_GetItem | |
14262
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
169 # if PY_VERSION_HEX >= 0x030601f0 |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
170 # define PySlice_AdjustIndices py3_PySlice_AdjustIndices |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
171 # define PySlice_Unpack py3_PySlice_Unpack |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
172 # endif |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
173 # undef PySlice_GetIndicesEx |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
174 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
175 # define PyImport_ImportModule py3_PyImport_ImportModule |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
176 # define PyObject_Init py3__PyObject_Init |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
177 # define PyDict_New py3_PyDict_New |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
178 # define PyDict_GetItemString py3_PyDict_GetItemString |
3618 | 179 # define PyDict_Next py3_PyDict_Next |
180 # define PyMapping_Check py3_PyMapping_Check | |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
181 # ifndef PyMapping_Keys |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
182 # define PyMapping_Keys py3_PyMapping_Keys |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
183 # endif |
3618 | 184 # define PyIter_Next py3_PyIter_Next |
185 # define PyObject_GetIter py3_PyObject_GetIter | |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
186 # define PyObject_Repr py3_PyObject_Repr |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
187 # define PyObject_GetItem py3_PyObject_GetItem |
4399 | 188 # define PyObject_IsTrue py3_PyObject_IsTrue |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
189 # define PyModule_GetDict py3_PyModule_GetDict |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
190 #undef PyRun_SimpleString |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
191 # define PyRun_SimpleString py3_PyRun_SimpleString |
3618 | 192 #undef PyRun_String |
193 # define PyRun_String py3_PyRun_String | |
4417 | 194 # define PyObject_GetAttrString py3_PyObject_GetAttrString |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
195 # define PyObject_HasAttrString py3_PyObject_HasAttrString |
4417 | 196 # define PyObject_SetAttrString py3_PyObject_SetAttrString |
197 # define PyObject_CallFunctionObjArgs py3_PyObject_CallFunctionObjArgs | |
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
198 # define _PyObject_CallFunction_SizeT py3__PyObject_CallFunction_SizeT |
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
199 # define PyObject_Call py3_PyObject_Call |
4417 | 200 # define PyEval_GetLocals py3_PyEval_GetLocals |
201 # define PyEval_GetGlobals py3_PyEval_GetGlobals | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
202 # define PySys_SetObject py3_PySys_SetObject |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
203 # define PySys_GetObject py3_PySys_GetObject |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
204 # define PySys_SetArgv py3_PySys_SetArgv |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
205 # define PyType_Ready py3_PyType_Ready |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
206 #undef Py_BuildValue |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
207 # define Py_BuildValue py3_Py_BuildValue |
2641 | 208 # define Py_SetPythonHome py3_Py_SetPythonHome |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
209 # define Py_Initialize py3_Py_Initialize |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
210 # define Py_Finalize py3_Py_Finalize |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
211 # define Py_IsInitialized py3_Py_IsInitialized |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
212 # define _Py_NoneStruct (*py3__Py_NoneStruct) |
3828 | 213 # define _Py_FalseStruct (*py3__Py_FalseStruct) |
214 # define _Py_TrueStruct (*py3__Py_TrueStruct) | |
3618 | 215 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
216 # define PyModule_AddObject py3_PyModule_AddObject |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
217 # define PyImport_AppendInittab py3_PyImport_AppendInittab |
4417 | 218 # define PyImport_AddModule py3_PyImport_AddModule |
3863 | 219 # if PY_VERSION_HEX >= 0x030300f0 |
220 # undef _PyUnicode_AsString | |
3910 | 221 # define _PyUnicode_AsString py3_PyUnicode_AsUTF8 |
3863 | 222 # else |
223 # define _PyUnicode_AsString py3__PyUnicode_AsString | |
224 # endif | |
2894 | 225 # undef PyUnicode_AsEncodedString |
226 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString | |
227 # undef PyBytes_AsString | |
228 # define PyBytes_AsString py3_PyBytes_AsString | |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
229 # ifndef PyBytes_AsStringAndSize |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
230 # define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
231 # endif |
3618 | 232 # undef PyBytes_FromString |
233 # define PyBytes_FromString py3_PyBytes_FromString | |
15454
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
234 # undef PyBytes_FromStringAndSize |
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
235 # define PyBytes_FromStringAndSize py3_PyBytes_FromStringAndSize |
3618 | 236 # define PyFloat_FromDouble py3_PyFloat_FromDouble |
237 # define PyFloat_AsDouble py3_PyFloat_AsDouble | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
238 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr |
3828 | 239 # define PyType_Type (*py3_PyType_Type) |
13952
76a65058766f
patch 8.0.1846: Python interface is incompatible with lldb
Christian Brabandt <cb@256bit.org>
parents:
13674
diff
changeset
|
240 # define PyStdPrinter_Type (*py3_PyStdPrinter_Type) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
241 # define PySlice_Type (*py3_PySlice_Type) |
3618 | 242 # define PyFloat_Type (*py3_PyFloat_Type) |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
243 # define PyNumber_Check (*py3_PyNumber_Check) |
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
244 # define PyNumber_Long (*py3_PyNumber_Long) |
3828 | 245 # define PyBool_Type (*py3_PyBool_Type) |
2894 | 246 # 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
|
247 # 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
|
248 # 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
|
249 # 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
|
250 # define _Py_Dealloc py3__Py_Dealloc |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
251 # define PyModule_Create2TraceRefs py3_PyModule_Create2TraceRefs |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
252 # else |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
253 # define PyModule_Create2 py3_PyModule_Create2 |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
254 # endif |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
255 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
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
|
256 # 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
|
257 # 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
|
258 # 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
|
259 # 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
|
260 # 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
|
261 # endif |
4500 | 262 # define _PyObject_GC_New py3__PyObject_GC_New |
263 # define PyObject_GC_Del py3_PyObject_GC_Del | |
264 # 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
|
265 # define PyType_GenericAlloc py3_PyType_GenericAlloc |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
266 # define PyType_GenericNew py3_PyType_GenericNew |
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
|
267 # undef PyUnicode_FromString |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
268 # define PyUnicode_FromString py3_PyUnicode_FromString |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
269 # ifndef PyUnicode_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
270 # define PyUnicode_FromFormat py3_PyUnicode_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
271 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
272 # define Py_UNICODE_USE_UCS_FUNCTIONS |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
273 # ifdef Py_UNICODE_WIDE |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
274 # define PyUnicodeUCS4_FromFormat py3_PyUnicodeUCS4_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
275 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
276 # define PyUnicodeUCS2_FromFormat py3_PyUnicodeUCS2_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
277 # endif |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
278 # endif |
2894 | 279 # undef PyUnicode_Decode |
280 # define PyUnicode_Decode py3_PyUnicode_Decode | |
3618 | 281 # define PyType_IsSubtype py3_PyType_IsSubtype |
282 # define PyCapsule_New py3_PyCapsule_New | |
283 # define PyCapsule_GetPointer py3_PyCapsule_GetPointer | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
284 |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
285 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
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
|
286 # 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
|
287 # define PyObject_NEW(type, typeobj) \ |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
288 ( (type *) PyObject_Init( \ |
2330 | 289 (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
|
290 # 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
|
291 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
292 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
293 * Pointers for dynamic link |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
294 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
295 static int (*py3_PySys_SetArgv)(int, wchar_t **); |
2641 | 296 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
|
297 static void (*py3_Py_Initialize)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
298 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
|
299 static PyGILState_STATE (*py3_PyGILState_Ensure)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
300 static void (*py3_PyGILState_Release)(PyGILState_STATE); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
301 static int (*py3_PySys_SetObject)(char *, PyObject *); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
302 static PyObject* (*py3_PySys_GetObject)(char *); |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
303 static int (*py3_PyList_Append)(PyObject *, PyObject *); |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
304 static int (*py3_PyList_Insert)(PyObject *, int, PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
305 static Py_ssize_t (*py3_PyList_Size)(PyObject *); |
3618 | 306 static int (*py3_PySequence_Check)(PyObject *); |
307 static Py_ssize_t (*py3_PySequence_Size)(PyObject *); | |
308 static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t); | |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
309 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); |
3618 | 310 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); |
311 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); | |
312 static int (*py3_PyMapping_Check)(PyObject *); | |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
313 static PyObject* (*py3_PyMapping_Keys)(PyObject *); |
14262
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
314 # if PY_VERSION_HEX >= 0x030601f0 |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
315 static int (*py3_PySlice_AdjustIndices)(Py_ssize_t length, |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
316 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t step); |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
317 static int (*py3_PySlice_Unpack)(PyObject *slice, |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
318 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
319 # endif |
5768 | 320 static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length, |
5608 | 321 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, |
322 Py_ssize_t *slicelen); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
323 static PyObject* (*py3_PyErr_NoMemory)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
324 static void (*py3_Py_Finalize)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
325 static void (*py3_PyErr_SetString)(PyObject *, const char *); |
4403 | 326 static void (*py3_PyErr_SetObject)(PyObject *, PyObject *); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
327 static int (*py3_PyErr_ExceptionMatches)(PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
328 static int (*py3_PyRun_SimpleString)(char *); |
3618 | 329 static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *); |
4417 | 330 static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *); |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
331 static int (*py3_PyObject_HasAttrString)(PyObject *, const char *); |
5419 | 332 static int (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *); |
4417 | 333 static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...); |
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
334 static PyObject* (*py3__PyObject_CallFunction_SizeT)(PyObject *, char *, ...); |
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
335 static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *); |
4417 | 336 static PyObject* (*py3_PyEval_GetGlobals)(); |
337 static PyObject* (*py3_PyEval_GetLocals)(); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
338 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
|
339 static PyObject* (*py3_PyImport_ImportModule)(const char *); |
3618 | 340 static PyObject* (*py3_PyImport_AddModule)(const char *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
341 static int (*py3_PyErr_BadArgument)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
342 static PyObject* (*py3_PyErr_Occurred)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
343 static PyObject* (*py3_PyModule_GetDict)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
344 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
|
345 static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); |
3618 | 346 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
|
347 static PyObject* (*py3_PyLong_FromLong)(long); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
348 static PyObject* (*py3_PyDict_New)(void); |
3618 | 349 static PyObject* (*py3_PyIter_Next)(PyObject *); |
350 static PyObject* (*py3_PyObject_GetIter)(PyObject *); | |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
351 static PyObject* (*py3_PyObject_Repr)(PyObject *); |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
352 static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *); |
4399 | 353 static int (*py3_PyObject_IsTrue)(PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
354 static PyObject* (*py3_Py_BuildValue)(char *, ...); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
355 static int (*py3_PyType_Ready)(PyTypeObject *type); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
356 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
|
357 static PyObject* (*py3_PyUnicode_FromString)(const char *u); |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
358 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
359 static PyObject* (*py3_PyUnicode_FromFormat)(const char *u, ...); |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
360 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
361 # ifdef Py_UNICODE_WIDE |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
362 static PyObject* (*py3_PyUnicodeUCS4_FromFormat)(const char *u, ...); |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
363 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
364 static PyObject* (*py3_PyUnicodeUCS2_FromFormat)(const char *u, ...); |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
365 # endif |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
366 # endif |
2894 | 367 static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size, |
368 const char *encoding, const char *errors); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
369 static long (*py3_PyLong_AsLong)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
370 static void (*py3_PyErr_SetNone)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
371 static void (*py3_PyEval_InitThreads)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
372 static void(*py3_PyEval_RestoreThread)(PyThreadState *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
373 static PyThreadState*(*py3_PyEval_SaveThread)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
374 static int (*py3_PyArg_Parse)(PyObject *, char *, ...); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
375 static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...); |
2894 | 376 static int (*py3_PyMem_Free)(void *); |
3618 | 377 static void* (*py3_PyMem_Malloc)(size_t); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
378 static int (*py3_Py_IsInitialized)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
379 static void (*py3_PyErr_Clear)(void); |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
380 static PyObject* (*py3_PyErr_Format)(PyObject *, const char *, ...); |
4145 | 381 static void (*py3_PyErr_PrintEx)(int); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
382 static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *); |
3618 | 383 static iternextfunc py3__PyObject_NextNotImplemented; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
384 static PyObject* py3__Py_NoneStruct; |
3828 | 385 static PyObject* py3__Py_FalseStruct; |
386 static PyObject* py3__Py_TrueStruct; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
387 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
|
388 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); |
3910 | 389 # if PY_VERSION_HEX >= 0x030300f0 |
390 static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode); | |
391 # else | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
392 static char* (*py3__PyUnicode_AsString)(PyObject *unicode); |
3910 | 393 # endif |
2894 | 394 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors); |
395 static char* (*py3_PyBytes_AsString)(PyObject *bytes); | |
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4881
diff
changeset
|
396 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, Py_ssize_t *length); |
3618 | 397 static PyObject* (*py3_PyBytes_FromString)(char *str); |
15454
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
398 static PyObject* (*py3_PyBytes_FromStringAndSize)(char *str, Py_ssize_t length); |
3618 | 399 static PyObject* (*py3_PyFloat_FromDouble)(double num); |
400 static double (*py3_PyFloat_AsDouble)(PyObject *); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
401 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
|
402 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
|
403 static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); |
3828 | 404 static PyTypeObject* py3_PyType_Type; |
13952
76a65058766f
patch 8.0.1846: Python interface is incompatible with lldb
Christian Brabandt <cb@256bit.org>
parents:
13674
diff
changeset
|
405 static PyTypeObject* py3_PyStdPrinter_Type; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
406 static PyTypeObject* py3_PySlice_Type; |
3618 | 407 static PyTypeObject* py3_PyFloat_Type; |
3828 | 408 static PyTypeObject* py3_PyBool_Type; |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
409 static int (*py3_PyNumber_Check)(PyObject *); |
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
410 static PyObject* (*py3_PyNumber_Long)(PyObject *); |
2894 | 411 static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); |
3618 | 412 static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor); |
413 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
|
414 # ifdef Py_DEBUG |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
415 static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
416 static Py_ssize_t* py3__Py_RefTotal; |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
417 static void (*py3__Py_Dealloc)(PyObject *obj); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
418 static PyObject* (*py3_PyModule_Create2TraceRefs)(struct PyModuleDef* module, int module_api_version); |
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
|
419 # else |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
420 static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
421 # endif |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
422 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
423 static void (*py3__PyObject_DebugFree)(void*); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
424 static void* (*py3__PyObject_DebugMalloc)(size_t); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
425 # else |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
426 static void (*py3_PyObject_Free)(void*); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
427 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
|
428 # endif |
4500 | 429 static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *); |
430 static void(*py3_PyObject_GC_Del)(void *); | |
431 static void(*py3_PyObject_GC_UnTrack)(void *); | |
3618 | 432 static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
433 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
434 static HINSTANCE hinstPy3 = 0; // Instance of python.dll |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
435 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
436 // Imported exception objects |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
437 static PyObject *p3imp_PyExc_AttributeError; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
438 static PyObject *p3imp_PyExc_IndexError; |
4315 | 439 static PyObject *p3imp_PyExc_KeyError; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
440 static PyObject *p3imp_PyExc_KeyboardInterrupt; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
441 static PyObject *p3imp_PyExc_TypeError; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
442 static PyObject *p3imp_PyExc_ValueError; |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
443 static PyObject *p3imp_PyExc_SystemExit; |
4405 | 444 static PyObject *p3imp_PyExc_RuntimeError; |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
445 static PyObject *p3imp_PyExc_ImportError; |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
446 static PyObject *p3imp_PyExc_OverflowError; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
447 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
448 # define PyExc_AttributeError p3imp_PyExc_AttributeError |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
449 # define PyExc_IndexError p3imp_PyExc_IndexError |
4315 | 450 # define PyExc_KeyError p3imp_PyExc_KeyError |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
451 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
452 # define PyExc_TypeError p3imp_PyExc_TypeError |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
453 # define PyExc_ValueError p3imp_PyExc_ValueError |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
454 # define PyExc_SystemExit p3imp_PyExc_SystemExit |
4405 | 455 # define PyExc_RuntimeError p3imp_PyExc_RuntimeError |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
456 # define PyExc_ImportError p3imp_PyExc_ImportError |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
457 # define PyExc_OverflowError p3imp_PyExc_OverflowError |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
458 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
459 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
460 * Table of name to function pointer of python. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
461 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
462 # define PYTHON_PROC FARPROC |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
463 static struct |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
464 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
465 char *name; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
466 PYTHON_PROC *ptr; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
467 } py3_funcname_table[] = |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
468 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
469 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv}, |
2641 | 470 {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
471 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, |
3806 | 472 {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, |
473 {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue}, | |
2894 | 474 {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, |
3618 | 475 {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
476 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
477 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
478 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
479 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject}, |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
480 {"PySys_GetObject", (PYTHON_PROC*)&py3_PySys_GetObject}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
481 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append}, |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
482 {"PyList_Insert", (PYTHON_PROC*)&py3_PyList_Insert}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
483 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size}, |
3618 | 484 {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check}, |
485 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size}, | |
486 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem}, | |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
487 {"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast}, |
3618 | 488 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size}, |
489 {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem}, | |
14262
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
490 # if PY_VERSION_HEX >= 0x030601f0 |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
491 {"PySlice_AdjustIndices", (PYTHON_PROC*)&py3_PySlice_AdjustIndices}, |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
492 {"PySlice_Unpack", (PYTHON_PROC*)&py3_PySlice_Unpack}, |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
493 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
494 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
495 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
496 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
497 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString}, |
4403 | 498 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject}, |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
499 {"PyErr_ExceptionMatches", (PYTHON_PROC*)&py3_PyErr_ExceptionMatches}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
500 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString}, |
3618 | 501 {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String}, |
4417 | 502 {"PyObject_GetAttrString", (PYTHON_PROC*)&py3_PyObject_GetAttrString}, |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
503 {"PyObject_HasAttrString", (PYTHON_PROC*)&py3_PyObject_HasAttrString}, |
4417 | 504 {"PyObject_SetAttrString", (PYTHON_PROC*)&py3_PyObject_SetAttrString}, |
505 {"PyObject_CallFunctionObjArgs", (PYTHON_PROC*)&py3_PyObject_CallFunctionObjArgs}, | |
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
506 {"_PyObject_CallFunction_SizeT", (PYTHON_PROC*)&py3__PyObject_CallFunction_SizeT}, |
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
507 {"PyObject_Call", (PYTHON_PROC*)&py3_PyObject_Call}, |
4417 | 508 {"PyEval_GetGlobals", (PYTHON_PROC*)&py3_PyEval_GetGlobals}, |
509 {"PyEval_GetLocals", (PYTHON_PROC*)&py3_PyEval_GetLocals}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
510 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
511 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule}, |
3618 | 512 {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
513 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
514 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
515 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
516 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
517 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, |
3618 | 518 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, |
519 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, | |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
520 {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, |
3618 | 521 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, |
522 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, | |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
523 {"PyObject_Repr", (PYTHON_PROC*)&py3_PyObject_Repr}, |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
524 {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem}, |
4399 | 525 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
526 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
527 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
528 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
529 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
530 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
531 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
532 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
533 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
534 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, |
4881
7b8991e084f9
updated for version 7.3.1186
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
535 {"_PyArg_Parse_SizeT", (PYTHON_PROC*)&py3_PyArg_Parse}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
536 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, |
3618 | 537 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
538 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, |
3828 | 539 {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct}, |
540 {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
541 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear}, |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
542 {"PyErr_Format", (PYTHON_PROC*)&py3_PyErr_Format}, |
4145 | 543 {"PyErr_PrintEx", (PYTHON_PROC*)&py3_PyErr_PrintEx}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
544 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
545 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
546 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, |
3910 | 547 # if PY_VERSION_HEX >= 0x030300f0 |
548 {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8}, | |
549 # else | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
550 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, |
3910 | 551 # endif |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
552 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
553 {"PyUnicode_FromFormat", (PYTHON_PROC*)&py3_PyUnicode_FromFormat}, |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
554 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
555 # ifdef Py_UNICODE_WIDE |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
556 {"PyUnicodeUCS4_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS4_FromFormat}, |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
557 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
558 {"PyUnicodeUCS2_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS2_FromFormat}, |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
559 # endif |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
560 # endif |
2894 | 561 {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString}, |
3798 | 562 {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize}, |
3618 | 563 {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString}, |
15454
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
564 {"PyBytes_FromStringAndSize", (PYTHON_PROC*)&py3_PyBytes_FromStringAndSize}, |
3618 | 565 {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble}, |
566 {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
567 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
568 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
569 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, |
3828 | 570 {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type}, |
13952
76a65058766f
patch 8.0.1846: Python interface is incompatible with lldb
Christian Brabandt <cb@256bit.org>
parents:
13674
diff
changeset
|
571 {"PyStdPrinter_Type", (PYTHON_PROC*)&py3_PyStdPrinter_Type}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
572 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, |
3618 | 573 {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, |
3828 | 574 {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
575 {"PyNumber_Check", (PYTHON_PROC*)&py3_PyNumber_Check}, |
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
576 {"PyNumber_Long", (PYTHON_PROC*)&py3_PyNumber_Long}, |
2894 | 577 {"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
|
578 # ifdef Py_DEBUG |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
579 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
580 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
581 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
582 {"PyModule_Create2TraceRefs", (PYTHON_PROC*)&py3_PyModule_Create2TraceRefs}, |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
583 # else |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
584 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
585 # endif |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
586 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
587 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
588 {"_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
|
589 # else |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
590 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
591 {"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
|
592 # endif |
4500 | 593 {"_PyObject_GC_New", (PYTHON_PROC*)&py3__PyObject_GC_New}, |
594 {"PyObject_GC_Del", (PYTHON_PROC*)&py3_PyObject_GC_Del}, | |
595 {"PyObject_GC_UnTrack", (PYTHON_PROC*)&py3_PyObject_GC_UnTrack}, | |
3618 | 596 {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype}, |
597 {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New}, | |
598 {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
599 {"", NULL}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
600 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
601 |
18414
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
602 # if PY_VERSION_HEX >= 0x030800f0 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
603 static inline void |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
604 py3__Py_DECREF(const char *filename UNUSED, int lineno UNUSED, PyObject *op) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
605 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
606 if (--op->ob_refcnt != 0) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
607 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
608 # ifdef Py_REF_DEBUG |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
609 if (op->ob_refcnt < 0) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
610 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
611 _Py_NegativeRefcount(filename, lineno, op); |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
612 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
613 # endif |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
614 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
615 else |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
616 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
617 _Py_Dealloc(op); |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
618 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
619 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
620 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
621 # undef Py_DECREF |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
622 # define Py_DECREF(op) py3__Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op)) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
623 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
624 static inline void |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
625 py3__Py_XDECREF(PyObject *op) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
626 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
627 if (op != NULL) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
628 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
629 Py_DECREF(op); |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
630 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
631 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
632 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
633 # undef Py_XDECREF |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
634 # define Py_XDECREF(op) py3__Py_XDECREF(_PyObject_CAST(op)) |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
635 # endif |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
636 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
637 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
638 * Load library and get all pointers. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
639 * Parameter 'libname' provides name of DLL. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
640 * Return OK or FAIL. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
641 */ |
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
|
642 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
|
643 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
|
644 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
645 int i; |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
646 PYTHON_PROC *ucs_from_string = (PYTHON_PROC *)&py3_PyUnicode_FromString; |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
647 PYTHON_PROC *ucs_decode = (PYTHON_PROC *)&py3_PyUnicode_Decode; |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
648 PYTHON_PROC *ucs_as_encoded_string = |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
649 (PYTHON_PROC *)&py3_PyUnicode_AsEncodedString; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
650 |
2641 | 651 # if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON) |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
652 // Can't have Python and Python3 loaded at the same time. |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
653 // It cause a crash, because RTLD_GLOBAL is needed for |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
654 // 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
|
655 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
|
656 { |
3032 | 657 if (verbose) |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
658 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
|
659 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
|
660 } |
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
|
661 # 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
|
662 |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
663 if (hinstPy3 != 0) |
2330 | 664 return OK; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
665 hinstPy3 = load_dll(libname); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
666 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
667 if (!hinstPy3) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
668 { |
2330 | 669 if (verbose) |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
670 semsg(_(e_loadlib), libname); |
2330 | 671 return FAIL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
672 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
673 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
674 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
|
675 { |
2330 | 676 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3, |
677 py3_funcname_table[i].name)) == NULL) | |
678 { | |
679 close_dll(hinstPy3); | |
680 hinstPy3 = 0; | |
681 if (verbose) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
682 semsg(_(e_loadfunc), py3_funcname_table[i].name); |
2330 | 683 return FAIL; |
684 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
685 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
686 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
687 // Load unicode functions separately as only the ucs2 or the ucs4 functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
688 // will be present in the library. |
3910 | 689 # if PY_VERSION_HEX >= 0x030300f0 |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
690 *ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicode_FromString"); |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
691 *ucs_decode = symbol_from_dll(hinstPy3, "PyUnicode_Decode"); |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
692 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
3863 | 693 "PyUnicode_AsEncodedString"); |
3910 | 694 # else |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
695 *ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString"); |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
696 *ucs_decode = symbol_from_dll(hinstPy3, |
2894 | 697 "PyUnicodeUCS2_Decode"); |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
698 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
2894 | 699 "PyUnicodeUCS2_AsEncodedString"); |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
700 if (*ucs_from_string == NULL || *ucs_decode == NULL |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
701 || *ucs_as_encoded_string == NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
702 { |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
703 *ucs_from_string = symbol_from_dll(hinstPy3, |
2330 | 704 "PyUnicodeUCS4_FromString"); |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
705 *ucs_decode = symbol_from_dll(hinstPy3, |
2894 | 706 "PyUnicodeUCS4_Decode"); |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
707 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
2894 | 708 "PyUnicodeUCS4_AsEncodedString"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
709 } |
3910 | 710 # endif |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
711 if (*ucs_from_string == NULL || *ucs_decode == NULL |
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
712 || *ucs_as_encoded_string == NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
713 { |
2330 | 714 close_dll(hinstPy3); |
715 hinstPy3 = 0; | |
716 if (verbose) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
717 semsg(_(e_loadfunc), "PyUnicode_UCSX_*"); |
2330 | 718 return FAIL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
719 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
720 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
721 return OK; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
722 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
723 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
724 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
725 * 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
|
726 * TRUE, else FALSE. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
727 */ |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
728 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
|
729 python3_enabled(int verbose) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
730 { |
7528
53163e4d9e4f
commit https://github.com/vim/vim/commit/25e4fcde767084d1a79e0926bc301c92987c0cce
Christian Brabandt <cb@256bit.org>
parents:
7416
diff
changeset
|
731 return py3_runtime_link_init((char *)p_py3dll, verbose) == OK; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
732 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
733 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
734 /* |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
735 * Load the standard Python exceptions - don't import the symbols from the |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
736 * 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
|
737 */ |
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
|
738 static void |
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
739 get_py3_exceptions(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
740 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
741 PyObject *exmod = PyImport_ImportModule("builtins"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
742 PyObject *exdict = PyModule_GetDict(exmod); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
743 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
744 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); |
4315 | 745 p3imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
746 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
747 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
748 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
749 p3imp_PyExc_SystemExit = PyDict_GetItemString(exdict, "SystemExit"); |
4405 | 750 p3imp_PyExc_RuntimeError = PyDict_GetItemString(exdict, "RuntimeError"); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
751 p3imp_PyExc_ImportError = PyDict_GetItemString(exdict, "ImportError"); |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
752 p3imp_PyExc_OverflowError = PyDict_GetItemString(exdict, "OverflowError"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
753 Py_XINCREF(p3imp_PyExc_AttributeError); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
754 Py_XINCREF(p3imp_PyExc_IndexError); |
4315 | 755 Py_XINCREF(p3imp_PyExc_KeyError); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
756 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
757 Py_XINCREF(p3imp_PyExc_TypeError); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
758 Py_XINCREF(p3imp_PyExc_ValueError); |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
759 Py_XINCREF(p3imp_PyExc_SystemExit); |
4405 | 760 Py_XINCREF(p3imp_PyExc_RuntimeError); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
761 Py_XINCREF(p3imp_PyExc_ImportError); |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
762 Py_XINCREF(p3imp_PyExc_OverflowError); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
763 Py_XDECREF(exmod); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
764 } |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
765 #endif // DYNAMIC_PYTHON3 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
766 |
3618 | 767 static int py3initialised = 0; |
768 #define PYINITIALISED py3initialised | |
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
769 static int python_end_called = FALSE; |
3618 | 770 |
4500 | 771 #define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self) |
3618 | 772 |
4377 | 773 #define WIN_PYTHON_REF(win) win->w_python3_ref |
774 #define BUF_PYTHON_REF(buf) buf->b_python3_ref | |
4401 | 775 #define TAB_PYTHON_REF(tab) tab->tp_python3_ref |
4377 | 776 |
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
|
777 static void |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
778 call_PyObject_Free(void *p) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
779 { |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
780 #if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
781 _PyObject_DebugFree(p); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
782 #else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
783 PyObject_Free(p); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
784 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
785 } |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
786 |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
787 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
|
788 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
|
789 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
790 return PyType_GenericNew(type,args,kwds); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
791 } |
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
|
792 |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
793 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
|
794 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
|
795 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
796 return PyType_GenericAlloc(type,nitems); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
797 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
798 |
4319 | 799 static PyObject *OutputGetattro(PyObject *, PyObject *); |
800 static int OutputSetattro(PyObject *, PyObject *, PyObject *); | |
801 static PyObject *BufferGetattro(PyObject *, PyObject *); | |
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
802 static int BufferSetattro(PyObject *, PyObject *, PyObject *); |
4401 | 803 static PyObject *TabPageGetattro(PyObject *, PyObject *); |
4319 | 804 static PyObject *WindowGetattro(PyObject *, PyObject *); |
805 static int WindowSetattro(PyObject *, PyObject *, PyObject *); | |
806 static PyObject *RangeGetattro(PyObject *, PyObject *); | |
807 static PyObject *CurrentGetattro(PyObject *, PyObject *); | |
808 static int CurrentSetattro(PyObject *, PyObject *, PyObject *); | |
809 static PyObject *DictionaryGetattro(PyObject *, PyObject *); | |
810 static int DictionarySetattro(PyObject *, PyObject *, PyObject *); | |
811 static PyObject *ListGetattro(PyObject *, PyObject *); | |
812 static int ListSetattro(PyObject *, PyObject *, PyObject *); | |
813 static PyObject *FunctionGetattro(PyObject *, PyObject *); | |
814 | |
815 static struct PyModuleDef vimmodule; | |
816 | |
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
817 #define PY_CAN_RECURSE |
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
818 |
4319 | 819 /* |
820 * Include the code shared with if_python.c | |
821 */ | |
822 #include "if_py_both.h" | |
823 | |
16030
6694659c6ad6
patch 8.1.1020: compiler warning for Python3 interface
Bram Moolenaar <Bram@vim.org>
parents:
15888
diff
changeset
|
824 // NOTE: Must always be used at the start of a block, since it declares "name". |
4319 | 825 #define GET_ATTR_STRING(name, nameobj) \ |
826 char *name = ""; \ | |
827 if (PyUnicode_Check(nameobj)) \ | |
16030
6694659c6ad6
patch 8.1.1020: compiler warning for Python3 interface
Bram Moolenaar <Bram@vim.org>
parents:
15888
diff
changeset
|
828 name = (char *)_PyUnicode_AsString(nameobj) |
4319 | 829 |
830 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0) | |
831 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
832 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
833 // Internal function prototypes. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
834 |
3951 | 835 static PyObject *Py3Init_vim(void); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
836 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
837 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
838 // 1. Python interpreter main program. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
839 |
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
|
840 void |
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
841 python3_end(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
842 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
843 static int recurse = 0; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
844 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
845 // If a crash occurs while doing this, don't try again. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
846 if (recurse != 0) |
2330 | 847 return; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
848 |
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
849 python_end_called = TRUE; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
850 ++recurse; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
851 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
852 #ifdef DYNAMIC_PYTHON3 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
853 if (hinstPy3) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
854 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
855 if (Py_IsInitialized()) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
856 { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
857 // acquire lock before finalizing |
4415 | 858 PyGILState_Ensure(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
859 |
2330 | 860 Py_Finalize(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
861 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
862 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
863 --recurse; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
864 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
865 |
7158
43ac8dc380c7
commit https://github.com/vim/vim/commit/094454fa708d3297db744f095cd2b7b155a8b6ad
Christian Brabandt <cb@256bit.org>
parents:
6569
diff
changeset
|
866 #if (defined(DYNAMIC_PYTHON3) && defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON) && defined(UNIX)) || defined(PROTO) |
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
867 int |
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
868 python3_loaded(void) |
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
869 { |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
870 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
|
871 } |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
872 #endif |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
873 |
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
874 static wchar_t *py_home_buf = NULL; |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
875 |
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
|
876 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
|
877 Python3_Init(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
878 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
879 if (!py3initialised) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
880 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
881 #ifdef DYNAMIC_PYTHON3 |
2330 | 882 if (!python3_enabled(TRUE)) |
883 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
884 emsg(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); |
2330 | 885 goto fail; |
886 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
887 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
888 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
889 init_structs(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
890 |
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
891 if (*p_py3home != NUL) |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
892 { |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
893 size_t len = mbstowcs(NULL, (char *)p_py3home, 0) + 1; |
2641 | 894 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
895 // The string must not change later, make a copy in static memory. |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
896 py_home_buf = ALLOC_MULT(wchar_t, len); |
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
897 if (py_home_buf != NULL && mbstowcs( |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
898 py_home_buf, (char *)p_py3home, len) != (size_t)-1) |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
899 Py_SetPythonHome(py_home_buf); |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
900 } |
2641 | 901 #ifdef PYTHON3_HOME |
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
902 else if (mch_getenv((char_u *)"PYTHONHOME") == NULL) |
7416
cd69647bb839
commit https://github.com/vim/vim/commit/1000565c3a2439c9a7c9759284814dbf3b8bc20d
Christian Brabandt <cb@256bit.org>
parents:
7196
diff
changeset
|
903 Py_SetPythonHome(PYTHON3_HOME); |
2641 | 904 #endif |
905 | |
3863 | 906 PyImport_AppendInittab("vim", Py3Init_vim); |
907 | |
2330 | 908 Py_Initialize(); |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
909 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
910 // Initialise threads, and below save the state using |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
911 // PyEval_SaveThread. Without the call to PyEval_SaveThread, thread |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
912 // specific state (such as the system trace hook), will be lost |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
913 // between invocations of Python code. |
2877 | 914 PyEval_InitThreads(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
915 #ifdef DYNAMIC_PYTHON3 |
2330 | 916 get_py3_exceptions(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
917 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
918 |
4494 | 919 if (PythonIO_Init_io()) |
2330 | 920 goto fail; |
921 | |
3618 | 922 globals = PyModule_GetDict(PyImport_AddModule("__main__")); |
923 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
924 // Remove the element from sys.path that was added because of our |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
925 // argv[0] value in Py3Init_vim(). Previously we used an empty |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
926 // string, but depending on the OS we then get an empty entry or |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
927 // the current directory in sys.path. |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
928 // Only after vim has been imported, the element does exist in |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
929 // sys.path. |
2894 | 930 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
|
931 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
932 // lock is created and acquired in PyEval_InitThreads() and thread |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
933 // state is created in Py_Initialize() |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
934 // there _PyGILState_NoteThreadState() also sets gilcounter to 1 |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
935 // (python must have threads enabled!) |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
936 // so the following does both: unlock GIL and save thread state in TLS |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
937 // without deleting thread state |
4109 | 938 PyEval_SaveThread(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
939 |
2330 | 940 py3initialised = 1; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
941 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
942 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
943 return 0; |
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 fail: |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
946 // We call PythonIO_Flush() here to print any Python errors. |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
947 // This is OK, as it is possible to call this function even |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
948 // if PythonIO_Init_io() has not completed successfully (it will |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
949 // not do anything in this case). |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
950 PythonIO_Flush(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
951 return -1; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
952 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
953 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
954 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
955 * External interface |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
956 */ |
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
|
957 static void |
4486 | 958 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
|
959 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
960 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
2330 | 961 char *saved_locale; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
962 #endif |
2894 | 963 PyObject *cmdstr; |
964 PyObject *cmdbytes; | |
4415 | 965 PyGILState_STATE pygilstate; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
966 |
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
967 if (python_end_called) |
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
968 goto theend; |
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
969 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
970 if (Python3_Init()) |
2330 | 971 goto theend; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
972 |
4486 | 973 init_range(arg); |
974 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
975 Python_Release_Vim(); // leave Vim |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
976 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
977 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
978 // Python only works properly when the LC_NUMERIC locale is "C". |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
979 saved_locale = setlocale(LC_NUMERIC, NULL); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
980 if (saved_locale == NULL || STRCMP(saved_locale, "C") == 0) |
2330 | 981 saved_locale = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
982 else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
983 { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
984 // Need to make a copy, value may change when setting new locale. |
2330 | 985 saved_locale = (char *)vim_strsave((char_u *)saved_locale); |
986 (void)setlocale(LC_NUMERIC, "C"); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
987 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
988 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
989 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
990 pygilstate = PyGILState_Ensure(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
991 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
992 // PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
993 // SyntaxError (unicode error). |
2955 | 994 cmdstr = PyUnicode_Decode(cmd, strlen(cmd), |
995 (char *)ENC_OPT, CODEC_ERROR_HANDLER); | |
996 cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER); | |
2894 | 997 Py_XDECREF(cmdstr); |
3618 | 998 |
4486 | 999 run(PyBytes_AsString(cmdbytes), arg, &pygilstate); |
2894 | 1000 Py_XDECREF(cmdbytes); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1001 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1002 PyGILState_Release(pygilstate); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1003 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1004 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1005 if (saved_locale != NULL) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1006 { |
2330 | 1007 (void)setlocale(LC_NUMERIC, saved_locale); |
1008 vim_free(saved_locale); | |
2329
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 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1011 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1012 Python_Lock_Vim(); // enter Vim |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1013 PythonIO_Flush(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1014 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1015 theend: |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1016 return; // keeps lint happy |
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 /* |
2350
06feaf4fe36a
Rename some "python3" symbols to "py3", as the command name.
Bram Moolenaar <bram@vim.org>
parents:
2342
diff
changeset
|
1020 * ":py3" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1021 */ |
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
|
1022 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
|
1023 ex_py3(exarg_T *eap) |
2329
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 char_u *script; |
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 script = script_get(eap, eap->arg); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1028 if (!eap->skip) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1029 { |
15888
a83c4b1f8ea2
patch 8.1.0950: using :python sets 'pyxversion' even when not executed
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
1030 if (p_pyx == 0) |
a83c4b1f8ea2
patch 8.1.0950: using :python sets 'pyxversion' even when not executed
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
1031 p_pyx = 3; |
a83c4b1f8ea2
patch 8.1.0950: using :python sets 'pyxversion' even when not executed
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
1032 |
4486 | 1033 DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script, |
1034 (rangeinitializer) init_range_cmd, | |
1035 (runner) run_cmd, | |
1036 (void *) eap); | |
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 vim_free(script); |
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 #define BUFFER_SIZE 2048 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1042 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1043 /* |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
1044 * ":py3file" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1045 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1046 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1047 ex_py3file(exarg_T *eap) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1048 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1049 static char buffer[BUFFER_SIZE]; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1050 const char *file; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1051 char *p; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1052 int i; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1053 |
10722
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1054 if (p_pyx == 0) |
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1055 p_pyx = 3; |
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1056 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1057 // Have to do it like this. PyRun_SimpleFile requires you to pass a |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1058 // stdio file pointer, but Vim and the Python DLL are compiled with |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1059 // different options under Windows, meaning that stdio pointers aren't |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1060 // compatible between the two. Yuk. |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1061 // |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1062 // construct: exec(compile(open('a_filename', 'rb').read(), 'a_filename', 'exec')) |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1063 // |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1064 // Using bytes so that Python can detect the source encoding as it normally |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1065 // does. The doc does not say "compile" accept bytes, though. |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1066 // |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1067 // We need to escape any backslashes or single quotes in the file name, so that |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1068 // Python won't mangle the file name. |
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 strcpy(buffer, "exec(compile(open('"); |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1071 p = buffer + 19; // size of "exec(compile(open('" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1072 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1073 for (i=0; i<2; ++i) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1074 { |
2330 | 1075 file = (char *)eap->arg; |
1076 while (*file && p < buffer + (BUFFER_SIZE - 3)) | |
1077 { | |
1078 if (*file == '\\' || *file == '\'') | |
1079 *p++ = '\\'; | |
1080 *p++ = *file++; | |
1081 } | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1082 // If we didn't finish the file name, we hit a buffer overflow |
2330 | 1083 if (*file != '\0') |
1084 return; | |
1085 if (i==0) | |
1086 { | |
2894 | 1087 strcpy(p,"','rb').read(),'"); |
1088 p += 16; | |
2330 | 1089 } |
1090 else | |
1091 { | |
1092 strcpy(p,"','exec'))"); | |
1093 p += 10; | |
1094 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1095 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1096 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1097 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1098 // Execute the file |
4486 | 1099 DoPyCommand(buffer, |
1100 (rangeinitializer) init_range_cmd, | |
1101 (runner) run_cmd, | |
1102 (void *) eap); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1103 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1104 |
4421 | 1105 void |
1106 ex_py3do(exarg_T *eap) | |
4417 | 1107 { |
10722
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1108 if (p_pyx == 0) |
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1109 p_pyx = 3; |
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1110 |
4486 | 1111 DoPyCommand((char *)eap->arg, |
1112 (rangeinitializer)init_range_cmd, | |
1113 (runner)run_do, | |
1114 (void *)eap); | |
4417 | 1115 } |
1116 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1117 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1118 // 2. Python output stream: writes output via [e]msg(). |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1119 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1120 // Implementation functions |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1121 |
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
|
1122 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
|
1123 OutputGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1124 { |
3826 | 1125 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1126 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1127 if (strcmp(name, "softspace") == 0) |
2330 | 1128 return PyLong_FromLong(((OutputObject *)(self))->softspace); |
8967
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1129 else if (strcmp(name, "errors") == 0) |
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1130 return PyString_FromString("strict"); |
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1131 else if (strcmp(name, "encoding") == 0) |
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1132 return PyString_FromString(ENC_OPT); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1133 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1134 return PyObject_GenericGetAttr(self, nameobj); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1135 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1136 |
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
|
1137 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
|
1138 OutputSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1139 { |
3826 | 1140 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1141 |
4488 | 1142 return OutputSetattr((OutputObject *)(self), name, val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1143 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1144 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1145 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1146 // 3. Implementation of the Vim module for Python |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1147 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1148 // Window type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1149 // -------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1150 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1151 #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
|
1152 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1153 // Buffer type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1154 // -------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1155 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1156 #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
|
1157 |
3070 | 1158 static PyObject* BufferSubscript(PyObject *self, PyObject *idx); |
1159 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
|
1160 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1161 // Line range type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1162 // -------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1163 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1164 #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
|
1165 |
3070 | 1166 static PyObject* RangeSubscript(PyObject *self, PyObject *idx); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1167 static Py_ssize_t RangeAsItem(PyObject *, Py_ssize_t, PyObject *); |
3070 | 1168 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
|
1169 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1170 // Current objects type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1171 // ----------------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1172 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1173 static PySequenceMethods BufferAsSeq = { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1174 (lenfunc) BufferLength, // sq_length, len(x) |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1175 (binaryfunc) 0, // sq_concat, x+y |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1176 (ssizeargfunc) 0, // sq_repeat, x*n |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1177 (ssizeargfunc) BufferItem, // sq_item, x[i] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1178 0, // was_sq_slice, x[i:j] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1179 0, // sq_ass_item, x[i]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1180 0, // sq_ass_slice, x[i:j]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1181 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1182 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1183 0, // sq_inplace_repeat |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1184 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1185 |
4319 | 1186 static PyMappingMethods BufferAsMapping = { |
2330 | 1187 /* mp_length */ (lenfunc)BufferLength, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1188 /* mp_subscript */ (binaryfunc)BufferSubscript, |
2894 | 1189 /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1190 }; |
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 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1193 // Buffer object |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1194 |
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
|
1195 static PyObject * |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1196 BufferGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1197 { |
4319 | 1198 PyObject *r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1199 |
3826 | 1200 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1201 |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1202 if ((r = BufferAttrValid((BufferObject *)(self), name))) |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1203 return r; |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1204 |
4319 | 1205 if (CheckBuffer((BufferObject *)(self))) |
2330 | 1206 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1207 |
4319 | 1208 r = BufferAttr((BufferObject *)(self), name); |
1209 if (r || PyErr_Occurred()) | |
1210 return r; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1211 else |
2330 | 1212 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1213 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1214 |
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1215 static int |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1216 BufferSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1217 { |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1218 GET_ATTR_STRING(name, nameobj); |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1219 |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1220 return BufferSetattr((BufferObject *)(self), name, val); |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1221 } |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1222 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1223 ////////////////// |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1224 |
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
|
1225 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
|
1226 BufferSubscript(PyObject *self, PyObject* idx) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1227 { |
3618 | 1228 if (PyLong_Check(idx)) |
1229 { | |
2330 | 1230 long _idx = PyLong_AsLong(idx); |
4488 | 1231 return BufferItem((BufferObject *)(self), _idx); |
3618 | 1232 } else if (PySlice_Check(idx)) |
1233 { | |
2330 | 1234 Py_ssize_t start, stop, step, slicelen; |
1235 | |
4387 | 1236 if (CheckBuffer((BufferObject *) self)) |
1237 return NULL; | |
1238 | |
5768 | 1239 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
4389 | 1240 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
2330 | 1241 &start, &stop, |
3618 | 1242 &step, &slicelen) < 0) |
2330 | 1243 return NULL; |
4488 | 1244 return BufferSlice((BufferObject *)(self), start, stop); |
3618 | 1245 } |
1246 else | |
1247 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1248 RAISE_INVALID_INDEX_TYPE(idx); |
2330 | 1249 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1250 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1251 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1252 |
2894 | 1253 static Py_ssize_t |
1254 BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val) | |
1255 { | |
3618 | 1256 if (PyLong_Check(idx)) |
1257 { | |
2894 | 1258 long n = PyLong_AsLong(idx); |
1259 return RBAsItem((BufferObject *)(self), n, val, 1, | |
1260 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
1261 NULL); | |
3618 | 1262 } else if (PySlice_Check(idx)) |
1263 { | |
2894 | 1264 Py_ssize_t start, stop, step, slicelen; |
1265 | |
4387 | 1266 if (CheckBuffer((BufferObject *) self)) |
1267 return -1; | |
1268 | |
5768 | 1269 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
4389 | 1270 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
2894 | 1271 &start, &stop, |
3618 | 1272 &step, &slicelen) < 0) |
2894 | 1273 return -1; |
1274 return RBAsSlice((BufferObject *)(self), start, stop, val, 1, | |
1275 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
1276 NULL); | |
3618 | 1277 } |
1278 else | |
1279 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1280 RAISE_INVALID_INDEX_TYPE(idx); |
2894 | 1281 return -1; |
1282 } | |
1283 } | |
1284 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1285 static PySequenceMethods RangeAsSeq = { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1286 (lenfunc) RangeLength, // sq_length, len(x) |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1287 (binaryfunc) 0, // RangeConcat, sq_concat, x+y |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1288 (ssizeargfunc) 0, // RangeRepeat, sq_repeat, x*n |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1289 (ssizeargfunc) RangeItem, // sq_item, x[i] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1290 0, // was_sq_slice, x[i:j] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1291 (ssizeobjargproc) RangeAsItem, // sq_as_item, x[i]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1292 0, // sq_ass_slice, x[i:j]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1293 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1294 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1295 0, // sq_inplace_repeat |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1296 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1297 |
4319 | 1298 static PyMappingMethods RangeAsMapping = { |
2330 | 1299 /* mp_length */ (lenfunc)RangeLength, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1300 /* mp_subscript */ (binaryfunc)RangeSubscript, |
3070 | 1301 /* mp_ass_subscript */ (objobjargproc)RangeAsSubscript, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1302 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1303 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1304 // Line range object - Implementation |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1305 |
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
|
1306 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
|
1307 RangeGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1308 { |
3826 | 1309 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1310 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1311 if (strcmp(name, "start") == 0) |
2330 | 1312 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
|
1313 else if (strcmp(name, "end") == 0) |
2330 | 1314 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
|
1315 else |
2330 | 1316 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1317 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1318 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1319 //////////////// |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1320 |
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
|
1321 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
|
1322 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
|
1323 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1324 return RBAsItem(((RangeObject *)(self))->buf, n, val, |
2330 | 1325 ((RangeObject *)(self))->start, |
1326 ((RangeObject *)(self))->end, | |
1327 &((RangeObject *)(self))->end); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1328 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1329 |
3070 | 1330 static Py_ssize_t |
1331 RangeAsSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi, PyObject *val) | |
1332 { | |
1333 return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val, | |
1334 ((RangeObject *)(self))->start, | |
1335 ((RangeObject *)(self))->end, | |
1336 &((RangeObject *)(self))->end); | |
1337 } | |
1338 | |
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
|
1339 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
|
1340 RangeSubscript(PyObject *self, PyObject* idx) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1341 { |
3618 | 1342 if (PyLong_Check(idx)) |
1343 { | |
2330 | 1344 long _idx = PyLong_AsLong(idx); |
4488 | 1345 return RangeItem((RangeObject *)(self), _idx); |
3618 | 1346 } else if (PySlice_Check(idx)) |
1347 { | |
2330 | 1348 Py_ssize_t start, stop, step, slicelen; |
1349 | |
5768 | 1350 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
2330 | 1351 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
1352 &start, &stop, | |
3618 | 1353 &step, &slicelen) < 0) |
2330 | 1354 return NULL; |
4488 | 1355 return RangeSlice((RangeObject *)(self), start, stop); |
3618 | 1356 } |
1357 else | |
1358 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1359 RAISE_INVALID_INDEX_TYPE(idx); |
2330 | 1360 return NULL; |
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 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1363 |
3070 | 1364 static Py_ssize_t |
1365 RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val) | |
1366 { | |
3618 | 1367 if (PyLong_Check(idx)) |
1368 { | |
3070 | 1369 long n = PyLong_AsLong(idx); |
1370 return RangeAsItem(self, n, val); | |
16162
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
16032
diff
changeset
|
1371 } |
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
16032
diff
changeset
|
1372 else if (PySlice_Check(idx)) |
3618 | 1373 { |
3070 | 1374 Py_ssize_t start, stop, step, slicelen; |
1375 | |
5768 | 1376 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
3070 | 1377 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
1378 &start, &stop, | |
3618 | 1379 &step, &slicelen) < 0) |
3070 | 1380 return -1; |
1381 return RangeAsSlice(self, start, stop, val); | |
3618 | 1382 } |
1383 else | |
1384 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1385 RAISE_INVALID_INDEX_TYPE(idx); |
3070 | 1386 return -1; |
1387 } | |
1388 } | |
1389 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1390 // TabPage object - Implementation |
4401 | 1391 |
1392 static PyObject * | |
1393 TabPageGetattro(PyObject *self, PyObject *nameobj) | |
1394 { | |
1395 PyObject *r; | |
1396 | |
1397 GET_ATTR_STRING(name, nameobj); | |
1398 | |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1399 if ((r = TabPageAttrValid((TabPageObject *)(self), name))) |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1400 return r; |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1401 |
4401 | 1402 if (CheckTabPage((TabPageObject *)(self))) |
1403 return NULL; | |
1404 | |
1405 r = TabPageAttr((TabPageObject *)(self), name); | |
1406 if (r || PyErr_Occurred()) | |
1407 return r; | |
1408 else | |
1409 return PyObject_GenericGetAttr(self, nameobj); | |
1410 } | |
1411 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1412 // Window object - Implementation |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1413 |
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
|
1414 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
|
1415 WindowGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1416 { |
4319 | 1417 PyObject *r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1418 |
3826 | 1419 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1420 |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1421 if ((r = WindowAttrValid((WindowObject *)(self), name))) |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1422 return r; |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1423 |
4319 | 1424 if (CheckWindow((WindowObject *)(self))) |
2330 | 1425 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1426 |
4319 | 1427 r = WindowAttr((WindowObject *)(self), name); |
1428 if (r || PyErr_Occurred()) | |
1429 return r; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1430 else |
2330 | 1431 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1432 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1433 |
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
|
1434 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
|
1435 WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1436 { |
3826 | 1437 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1438 |
4488 | 1439 return WindowSetattr((WindowObject *)(self), name, val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1440 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1441 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1442 // Tab page list object - Definitions |
4401 | 1443 |
1444 static PySequenceMethods TabListAsSeq = { | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1445 (lenfunc) TabListLength, // sq_length, len(x) |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1446 (binaryfunc) 0, // sq_concat, x+y |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1447 (ssizeargfunc) 0, // sq_repeat, x*n |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1448 (ssizeargfunc) TabListItem, // sq_item, x[i] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1449 0, // sq_slice, x[i:j] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1450 (ssizeobjargproc)0, // sq_as_item, x[i]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1451 0, // sq_ass_slice, x[i:j]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1452 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1453 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1454 0, // sq_inplace_repeat |
4401 | 1455 }; |
1456 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1457 // Window list object - Definitions |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1458 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1459 static PySequenceMethods WinListAsSeq = { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1460 (lenfunc) WinListLength, // sq_length, len(x) |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1461 (binaryfunc) 0, // sq_concat, x+y |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1462 (ssizeargfunc) 0, // sq_repeat, x*n |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1463 (ssizeargfunc) WinListItem, // sq_item, x[i] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1464 0, // sq_slice, x[i:j] |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1465 (ssizeobjargproc)0, // sq_as_item, x[i]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1466 0, // sq_ass_slice, x[i:j]=v |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1467 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1468 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1469 0, // sq_inplace_repeat |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1470 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1471 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1472 /* |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1473 * Current items object - Implementation |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1474 */ |
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
|
1475 static PyObject * |
4319 | 1476 CurrentGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1477 { |
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1478 PyObject *r; |
3826 | 1479 GET_ATTR_STRING(name, nameobj); |
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1480 if (!(r = CurrentGetattr(self, name))) |
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1481 return PyObject_GenericGetAttr(self, nameobj); |
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1482 return r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1483 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1484 |
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
|
1485 static int |
4319 | 1486 CurrentSetattro(PyObject *self, PyObject *nameobj, PyObject *value) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1487 { |
4319 | 1488 GET_ATTR_STRING(name, nameobj); |
1489 return CurrentSetattr(self, name, value); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1490 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1491 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1492 // Dictionary object - Definitions |
3618 | 1493 |
3828 | 1494 static PyObject * |
1495 DictionaryGetattro(PyObject *self, PyObject *nameobj) | |
1496 { | |
1497 DictionaryObject *this = ((DictionaryObject *) (self)); | |
1498 | |
1499 GET_ATTR_STRING(name, nameobj); | |
1500 | |
1501 if (strcmp(name, "locked") == 0) | |
1502 return PyLong_FromLong(this->dict->dv_lock); | |
1503 else if (strcmp(name, "scope") == 0) | |
1504 return PyLong_FromLong(this->dict->dv_scope); | |
1505 | |
1506 return PyObject_GenericGetAttr(self, nameobj); | |
1507 } | |
1508 | |
1509 static int | |
1510 DictionarySetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
1511 { | |
1512 GET_ATTR_STRING(name, nameobj); | |
4488 | 1513 return DictionarySetattr((DictionaryObject *)(self), name, val); |
3618 | 1514 } |
1515 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1516 // List object - Definitions |
3618 | 1517 |
3828 | 1518 static PyObject * |
1519 ListGetattro(PyObject *self, PyObject *nameobj) | |
1520 { | |
1521 GET_ATTR_STRING(name, nameobj); | |
1522 | |
1523 if (strcmp(name, "locked") == 0) | |
1524 return PyLong_FromLong(((ListObject *) (self))->list->lv_lock); | |
1525 | |
1526 return PyObject_GenericGetAttr(self, nameobj); | |
1527 } | |
1528 | |
1529 static int | |
1530 ListSetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
1531 { | |
1532 GET_ATTR_STRING(name, nameobj); | |
4488 | 1533 return ListSetattr((ListObject *)(self), name, val); |
3618 | 1534 } |
1535 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1536 // Function object - Definitions |
3618 | 1537 |
1538 static PyObject * | |
1539 FunctionGetattro(PyObject *self, PyObject *nameobj) | |
1540 { | |
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1541 PyObject *r; |
3618 | 1542 FunctionObject *this = (FunctionObject *)(self); |
3826 | 1543 |
1544 GET_ATTR_STRING(name, nameobj); | |
3618 | 1545 |
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1546 r = FunctionAttr(this, name); |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1547 if (r || PyErr_Occurred()) |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1548 return r; |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1549 else |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1550 return PyObject_GenericGetAttr(self, nameobj); |
3618 | 1551 } |
1552 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1553 // External interface |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1554 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1555 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1556 python3_buffer_free(buf_T *buf) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1557 { |
4377 | 1558 if (BUF_PYTHON_REF(buf) != NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1559 { |
4377 | 1560 BufferObject *bp = BUF_PYTHON_REF(buf); |
2330 | 1561 bp->buf = INVALID_BUFFER_VALUE; |
4377 | 1562 BUF_PYTHON_REF(buf) = NULL; |
2329
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 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1566 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1567 python3_window_free(win_T *win) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1568 { |
4377 | 1569 if (WIN_PYTHON_REF(win) != NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1570 { |
4377 | 1571 WindowObject *wp = WIN_PYTHON_REF(win); |
2330 | 1572 wp->win = INVALID_WINDOW_VALUE; |
4377 | 1573 WIN_PYTHON_REF(win) = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1574 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1575 } |
4401 | 1576 |
1577 void | |
1578 python3_tabpage_free(tabpage_T *tab) | |
1579 { | |
1580 if (TAB_PYTHON_REF(tab) != NULL) | |
1581 { | |
1582 TabPageObject *tp = TAB_PYTHON_REF(tab); | |
1583 tp->tab = INVALID_TABPAGE_VALUE; | |
1584 TAB_PYTHON_REF(tab) = NULL; | |
1585 } | |
1586 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1587 |
3951 | 1588 static PyObject * |
1589 Py3Init_vim(void) | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1590 { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1591 // The special value is removed from sys.path in Python3_Init(). |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1592 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
|
1593 |
4494 | 1594 if (init_types()) |
1595 return NULL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1596 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1597 // Set sys.argv[] to avoid a crash in warn(). |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1598 PySys_SetArgv(1, argv); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1599 |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1600 if ((vim_module = PyModule_Create(&vimmodule)) == NULL) |
2894 | 1601 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1602 |
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1603 if (populate_module(vim_module)) |
2330 | 1604 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1605 |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1606 if (init_sys_path()) |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1607 return NULL; |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1608 |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1609 return vim_module; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1610 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1611 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1612 ////////////////////////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1613 // 4. Utility functions for handling the interface between Vim and Python. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1614 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1615 /* |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1616 * Convert a Vim line into a Python string. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1617 * All internal newlines are replaced by null characters. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1618 * |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1619 * 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
|
1620 */ |
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
|
1621 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
|
1622 LineToString(const char *str) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1623 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1624 PyObject *result; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1625 Py_ssize_t len = strlen(str); |
19524
4a6a412e4565
patch 8.2.0319: file missing in distribution, comments outdated
Bram Moolenaar <Bram@vim.org>
parents:
18798
diff
changeset
|
1626 char *tmp, *p; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1627 |
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16764
diff
changeset
|
1628 tmp = alloc(len + 1); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1629 p = tmp; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1630 if (p == NULL) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1631 { |
2330 | 1632 PyErr_NoMemory(); |
1633 return NULL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1634 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1635 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1636 while (*str) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1637 { |
2330 | 1638 if (*str == '\n') |
1639 *p = '\0'; | |
1640 else | |
1641 *p = *str; | |
1642 | |
1643 ++p; | |
1644 ++str; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1645 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1646 *p = '\0'; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1647 |
2955 | 1648 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
|
1649 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1650 vim_free(tmp); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1651 return result; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1652 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1653 |
3618 | 1654 void |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1655 do_py3eval(char_u *str, typval_T *rettv) |
3618 | 1656 { |
4486 | 1657 DoPyCommand((char *) str, |
1658 (rangeinitializer) init_range_eval, | |
1659 (runner) run_eval, | |
1660 (void *) rettv); | |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1661 if (rettv->v_type == VAR_UNKNOWN) |
3618 | 1662 { |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1663 rettv->v_type = VAR_NUMBER; |
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1664 rettv->vval.v_number = 0; |
3618 | 1665 } |
1666 } | |
1667 | |
6565 | 1668 int |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1669 set_ref_in_python3(int copyID) |
3618 | 1670 { |
6569 | 1671 return set_ref_in_py(copyID); |
3618 | 1672 } |