Mercurial > vim
annotate src/if_python3.c @ 26083:a677aa897843 v8.2.3575
patch 8.2.3575: overflow check still fails when sizeof(int) == sizeof(long)
Commit: https://github.com/vim/vim/commit/e551ccfb9311eea5252d1c3106ff7a53c762d994
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 2 23:11:00 2021 +0000
patch 8.2.3575: overflow check still fails when sizeof(int) == sizeof(long)
Problem: Overflow check still fails when sizeof(int) == sizeof(long).
Solution: Use a float to check the result.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 03 Nov 2021 00:15:04 +0100 |
parents | c4298ed56ffa |
children | fc859aea8cec |
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 | |
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
84 #define ERRORS_DECODE_ARG CODEC_ERROR_HANDLER |
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
85 #define ERRORS_ENCODE_ARG ERRORS_DECODE_ARG |
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
86 |
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
|
87 #define PyInt Py_ssize_t |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
88 #ifndef PyString_Check |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
89 # define PyString_Check(obj) PyUnicode_Check(obj) |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
90 #endif |
5164
b3bd43ef012d
updated for version 7.4a.008
Bram Moolenaar <bram@vim.org>
parents:
5112
diff
changeset
|
91 #define PyString_FromString(repr) \ |
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
92 PyUnicode_Decode(repr, STRLEN(repr), ENC_OPT, ERRORS_DECODE_ARG) |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
93 #define PyString_FromFormat PyUnicode_FromFormat |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
94 #ifndef PyInt_Check |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
95 # define PyInt_Check(obj) PyLong_Check(obj) |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
96 #endif |
3826 | 97 #define PyInt_FromLong(i) PyLong_FromLong(i) |
98 #define PyInt_AsLong(obj) PyLong_AsLong(obj) | |
4319 | 99 #define Py_ssize_t_fmt "n" |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
100 #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
|
101 |
5608 | 102 #define PyIntArgFunc ssizeargfunc |
103 #define PyIntObjArgProc ssizeobjargproc | |
104 | |
5768 | 105 /* |
106 * PySlice_GetIndicesEx(): first argument type changed from PySliceObject | |
107 * to PyObject in Python 3.2 or later. | |
108 */ | |
109 #if PY_VERSION_HEX >= 0x030200f0 | |
110 typedef PyObject PySliceObject_T; | |
111 #else | |
112 typedef PySliceObject PySliceObject_T; | |
113 #endif | |
114 | |
2716 | 115 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
116 |
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
117 # 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
|
118 # 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
|
119 # 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
|
120 # define HINSTANCE void* |
2641 | 121 # 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
|
122 # 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
|
123 # 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
|
124 # 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
|
125 # 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
|
126 # 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
|
127 # define symbol_from_dll dlsym |
25342
c4298ed56ffa
patch 8.2.3208: dynamic library load error does not mention why it failed
Bram Moolenaar <Bram@vim.org>
parents:
24916
diff
changeset
|
128 # define load_dll_error dlerror |
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
|
129 # else |
2612 | 130 # 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
|
131 # 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
|
132 # define symbol_from_dll GetProcAddress |
25342
c4298ed56ffa
patch 8.2.3208: dynamic library load error does not mention why it failed
Bram Moolenaar <Bram@vim.org>
parents:
24916
diff
changeset
|
133 # define load_dll_error GetWin32Error |
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
|
134 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
135 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
136 * Wrapper defines |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
137 */ |
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
|
138 # undef PyArg_Parse |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
139 # 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
|
140 # undef PyArg_ParseTuple |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
141 # define PyArg_ParseTuple py3_PyArg_ParseTuple |
2894 | 142 # define PyMem_Free py3_PyMem_Free |
3618 | 143 # define PyMem_Malloc py3_PyMem_Malloc |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
144 # define PyDict_SetItemString py3_PyDict_SetItemString |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
145 # define PyErr_BadArgument py3_PyErr_BadArgument |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
146 # define PyErr_Clear py3_PyErr_Clear |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
147 # define PyErr_Format py3_PyErr_Format |
4145 | 148 # define PyErr_PrintEx py3_PyErr_PrintEx |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
149 # define PyErr_NoMemory py3_PyErr_NoMemory |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
150 # define PyErr_Occurred py3_PyErr_Occurred |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
151 # define PyErr_SetNone py3_PyErr_SetNone |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
152 # define PyErr_SetString py3_PyErr_SetString |
4403 | 153 # define PyErr_SetObject py3_PyErr_SetObject |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
154 # define PyErr_ExceptionMatches py3_PyErr_ExceptionMatches |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
155 # define PyEval_InitThreads py3_PyEval_InitThreads |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
156 # define PyEval_RestoreThread py3_PyEval_RestoreThread |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
157 # define PyEval_SaveThread py3_PyEval_SaveThread |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
158 # define PyGILState_Ensure py3_PyGILState_Ensure |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
159 # define PyGILState_Release py3_PyGILState_Release |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
160 # define PyLong_AsLong py3_PyLong_AsLong |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
161 # define PyLong_FromLong py3_PyLong_FromLong |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
162 # define PyList_GetItem py3_PyList_GetItem |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
163 # define PyList_Append py3_PyList_Append |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
164 # define PyList_Insert py3_PyList_Insert |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
165 # define PyList_New py3_PyList_New |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
166 # define PyList_SetItem py3_PyList_SetItem |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
167 # define PyList_Size py3_PyList_Size |
3618 | 168 # define PySequence_Check py3_PySequence_Check |
169 # define PySequence_Size py3_PySequence_Size | |
170 # define PySequence_GetItem py3_PySequence_GetItem | |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
171 # define PySequence_Fast py3_PySequence_Fast |
3618 | 172 # define PyTuple_Size py3_PyTuple_Size |
173 # 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
|
174 # 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
|
175 # 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
|
176 # 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
|
177 # endif |
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
178 # undef PySlice_GetIndicesEx |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
179 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
180 # define PyImport_ImportModule py3_PyImport_ImportModule |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
181 # define PyObject_Init py3__PyObject_Init |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
182 # define PyDict_New py3_PyDict_New |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
183 # define PyDict_GetItemString py3_PyDict_GetItemString |
3618 | 184 # define PyDict_Next py3_PyDict_Next |
185 # define PyMapping_Check py3_PyMapping_Check | |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
186 # ifndef PyMapping_Keys |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
187 # define PyMapping_Keys py3_PyMapping_Keys |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
188 # endif |
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
189 # if PY_VERSION_HEX >= 0x030a00b2 |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
190 # define PyIter_Check py3_PyIter_Check |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
191 # endif |
3618 | 192 # define PyIter_Next py3_PyIter_Next |
193 # define PyObject_GetIter py3_PyObject_GetIter | |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
194 # define PyObject_Repr py3_PyObject_Repr |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
195 # define PyObject_GetItem py3_PyObject_GetItem |
4399 | 196 # define PyObject_IsTrue py3_PyObject_IsTrue |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
197 # define PyModule_GetDict py3_PyModule_GetDict |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
198 #undef PyRun_SimpleString |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
199 # define PyRun_SimpleString py3_PyRun_SimpleString |
3618 | 200 #undef PyRun_String |
201 # define PyRun_String py3_PyRun_String | |
4417 | 202 # define PyObject_GetAttrString py3_PyObject_GetAttrString |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
203 # define PyObject_HasAttrString py3_PyObject_HasAttrString |
4417 | 204 # define PyObject_SetAttrString py3_PyObject_SetAttrString |
205 # define PyObject_CallFunctionObjArgs py3_PyObject_CallFunctionObjArgs | |
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
206 # 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
|
207 # define PyObject_Call py3_PyObject_Call |
4417 | 208 # define PyEval_GetLocals py3_PyEval_GetLocals |
209 # define PyEval_GetGlobals py3_PyEval_GetGlobals | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
210 # define PySys_SetObject py3_PySys_SetObject |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
211 # define PySys_GetObject py3_PySys_GetObject |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
212 # define PySys_SetArgv py3_PySys_SetArgv |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
213 # define PyType_Ready py3_PyType_Ready |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
214 # if PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
215 # define PyType_GetFlags py3_PyType_GetFlags |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
216 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
217 #undef Py_BuildValue |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
218 # define Py_BuildValue py3_Py_BuildValue |
2641 | 219 # define Py_SetPythonHome py3_Py_SetPythonHome |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
220 # define Py_Initialize py3_Py_Initialize |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
221 # define Py_Finalize py3_Py_Finalize |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
222 # define Py_IsInitialized py3_Py_IsInitialized |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
223 # define _Py_NoneStruct (*py3__Py_NoneStruct) |
3828 | 224 # define _Py_FalseStruct (*py3__Py_FalseStruct) |
225 # define _Py_TrueStruct (*py3__Py_TrueStruct) | |
3618 | 226 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
227 # define PyModule_AddObject py3_PyModule_AddObject |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
228 # define PyImport_AppendInittab py3_PyImport_AppendInittab |
4417 | 229 # define PyImport_AddModule py3_PyImport_AddModule |
3863 | 230 # if PY_VERSION_HEX >= 0x030300f0 |
231 # undef _PyUnicode_AsString | |
3910 | 232 # define _PyUnicode_AsString py3_PyUnicode_AsUTF8 |
3863 | 233 # else |
234 # define _PyUnicode_AsString py3__PyUnicode_AsString | |
235 # endif | |
2894 | 236 # undef PyUnicode_AsEncodedString |
237 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString | |
238 # undef PyBytes_AsString | |
239 # define PyBytes_AsString py3_PyBytes_AsString | |
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
240 # ifndef PyBytes_AsStringAndSize |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
241 # define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize |
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
242 # endif |
3618 | 243 # undef PyBytes_FromString |
244 # 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
|
245 # undef PyBytes_FromStringAndSize |
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
246 # define PyBytes_FromStringAndSize py3_PyBytes_FromStringAndSize |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
247 # if defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
248 # define _Py_Dealloc py3__Py_Dealloc |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
249 # endif |
3618 | 250 # define PyFloat_FromDouble py3_PyFloat_FromDouble |
251 # define PyFloat_AsDouble py3_PyFloat_AsDouble | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
252 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr |
3828 | 253 # 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
|
254 # define PyStdPrinter_Type (*py3_PyStdPrinter_Type) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
255 # define PySlice_Type (*py3_PySlice_Type) |
3618 | 256 # define PyFloat_Type (*py3_PyFloat_Type) |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
257 # define PyNumber_Check (*py3_PyNumber_Check) |
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
258 # define PyNumber_Long (*py3_PyNumber_Long) |
3828 | 259 # define PyBool_Type (*py3_PyBool_Type) |
2894 | 260 # 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
|
261 # 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
|
262 # 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
|
263 # define _Py_RefTotal (*py3__Py_RefTotal) |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
264 # define PyModule_Create2TraceRefs py3_PyModule_Create2TraceRefs |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
265 # else |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
266 # define PyModule_Create2 py3_PyModule_Create2 |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
267 # endif |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
268 # 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
|
269 # 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
|
270 # 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
|
271 # 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
|
272 # 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
|
273 # 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
|
274 # endif |
4500 | 275 # define _PyObject_GC_New py3__PyObject_GC_New |
276 # define PyObject_GC_Del py3_PyObject_GC_Del | |
277 # 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
|
278 # define PyType_GenericAlloc py3_PyType_GenericAlloc |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
279 # 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
|
280 # undef PyUnicode_FromString |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
281 # define PyUnicode_FromString py3_PyUnicode_FromString |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
282 # ifndef PyUnicode_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
283 # define PyUnicode_FromFormat py3_PyUnicode_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
284 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
285 # define Py_UNICODE_USE_UCS_FUNCTIONS |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
286 # ifdef Py_UNICODE_WIDE |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
287 # define PyUnicodeUCS4_FromFormat py3_PyUnicodeUCS4_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
288 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
289 # define PyUnicodeUCS2_FromFormat py3_PyUnicodeUCS2_FromFormat |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
290 # endif |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
291 # endif |
2894 | 292 # undef PyUnicode_Decode |
293 # define PyUnicode_Decode py3_PyUnicode_Decode | |
3618 | 294 # define PyType_IsSubtype py3_PyType_IsSubtype |
295 # define PyCapsule_New py3_PyCapsule_New | |
296 # define PyCapsule_GetPointer py3_PyCapsule_GetPointer | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
297 |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
298 # 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
|
299 # 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
|
300 # define PyObject_NEW(type, typeobj) \ |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
301 ( (type *) PyObject_Init( \ |
2330 | 302 (PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) ) |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
303 # elif PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
304 # undef PyObject_NEW |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
305 # define PyObject_NEW(type, typeobj) \ |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
306 ((type *)py3__PyObject_New(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
|
307 # 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
|
308 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
309 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
310 * Pointers for dynamic link |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
311 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
312 static int (*py3_PySys_SetArgv)(int, wchar_t **); |
2641 | 313 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
|
314 static void (*py3_Py_Initialize)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
315 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
|
316 static PyGILState_STATE (*py3_PyGILState_Ensure)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
317 static void (*py3_PyGILState_Release)(PyGILState_STATE); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
318 static int (*py3_PySys_SetObject)(char *, PyObject *); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
319 static PyObject* (*py3_PySys_GetObject)(char *); |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
320 static int (*py3_PyList_Append)(PyObject *, PyObject *); |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
321 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
|
322 static Py_ssize_t (*py3_PyList_Size)(PyObject *); |
3618 | 323 static int (*py3_PySequence_Check)(PyObject *); |
324 static Py_ssize_t (*py3_PySequence_Size)(PyObject *); | |
325 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
|
326 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); |
3618 | 327 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); |
328 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); | |
329 static int (*py3_PyMapping_Check)(PyObject *); | |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
330 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
|
331 # 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
|
332 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
|
333 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
|
334 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
|
335 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
|
336 # endif |
5768 | 337 static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length, |
5608 | 338 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, |
339 Py_ssize_t *slicelen); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
340 static PyObject* (*py3_PyErr_NoMemory)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
341 static void (*py3_Py_Finalize)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
342 static void (*py3_PyErr_SetString)(PyObject *, const char *); |
4403 | 343 static void (*py3_PyErr_SetObject)(PyObject *, PyObject *); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
344 static int (*py3_PyErr_ExceptionMatches)(PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
345 static int (*py3_PyRun_SimpleString)(char *); |
3618 | 346 static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *); |
4417 | 347 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
|
348 static int (*py3_PyObject_HasAttrString)(PyObject *, const char *); |
5419 | 349 static int (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *); |
4417 | 350 static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...); |
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
351 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
|
352 static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *); |
4417 | 353 static PyObject* (*py3_PyEval_GetGlobals)(); |
354 static PyObject* (*py3_PyEval_GetLocals)(); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
355 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
|
356 static PyObject* (*py3_PyImport_ImportModule)(const char *); |
3618 | 357 static PyObject* (*py3_PyImport_AddModule)(const char *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
358 static int (*py3_PyErr_BadArgument)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
359 static PyObject* (*py3_PyErr_Occurred)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
360 static PyObject* (*py3_PyModule_GetDict)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
361 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
|
362 static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); |
3618 | 363 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
|
364 static PyObject* (*py3_PyLong_FromLong)(long); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
365 static PyObject* (*py3_PyDict_New)(void); |
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
366 # if PY_VERSION_HEX >= 0x030a00b2 |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
367 static int (*py3_PyIter_Check)(PyObject *o); |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
368 # endif |
3618 | 369 static PyObject* (*py3_PyIter_Next)(PyObject *); |
370 static PyObject* (*py3_PyObject_GetIter)(PyObject *); | |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
371 static PyObject* (*py3_PyObject_Repr)(PyObject *); |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
372 static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *); |
4399 | 373 static int (*py3_PyObject_IsTrue)(PyObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
374 static PyObject* (*py3_Py_BuildValue)(char *, ...); |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
375 # if PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
376 static int (*py3_PyType_GetFlags)(PyTypeObject *o); |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
377 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
378 static int (*py3_PyType_Ready)(PyTypeObject *type); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
379 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
|
380 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
|
381 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
382 static PyObject* (*py3_PyUnicode_FromFormat)(const char *u, ...); |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
383 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
384 # ifdef Py_UNICODE_WIDE |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
385 static PyObject* (*py3_PyUnicodeUCS4_FromFormat)(const char *u, ...); |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
386 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
387 static PyObject* (*py3_PyUnicodeUCS2_FromFormat)(const char *u, ...); |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
388 # endif |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
389 # endif |
2894 | 390 static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size, |
391 const char *encoding, const char *errors); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
392 static long (*py3_PyLong_AsLong)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
393 static void (*py3_PyErr_SetNone)(PyObject *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
394 static void (*py3_PyEval_InitThreads)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
395 static void(*py3_PyEval_RestoreThread)(PyThreadState *); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
396 static PyThreadState*(*py3_PyEval_SaveThread)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
397 static int (*py3_PyArg_Parse)(PyObject *, char *, ...); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
398 static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...); |
2894 | 399 static int (*py3_PyMem_Free)(void *); |
3618 | 400 static void* (*py3_PyMem_Malloc)(size_t); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
401 static int (*py3_Py_IsInitialized)(void); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
402 static void (*py3_PyErr_Clear)(void); |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
403 static PyObject* (*py3_PyErr_Format)(PyObject *, const char *, ...); |
4145 | 404 static void (*py3_PyErr_PrintEx)(int); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
405 static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *); |
3618 | 406 static iternextfunc py3__PyObject_NextNotImplemented; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
407 static PyObject* py3__Py_NoneStruct; |
3828 | 408 static PyObject* py3__Py_FalseStruct; |
409 static PyObject* py3__Py_TrueStruct; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
410 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
|
411 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); |
3910 | 412 # if PY_VERSION_HEX >= 0x030300f0 |
413 static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode); | |
414 # else | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
415 static char* (*py3__PyUnicode_AsString)(PyObject *unicode); |
3910 | 416 # endif |
2894 | 417 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors); |
418 static char* (*py3_PyBytes_AsString)(PyObject *bytes); | |
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4881
diff
changeset
|
419 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, Py_ssize_t *length); |
3618 | 420 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
|
421 static PyObject* (*py3_PyBytes_FromStringAndSize)(char *str, Py_ssize_t length); |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
422 # if defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
423 static void (*py3__Py_Dealloc)(PyObject *obj); |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
424 # endif |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
425 # if PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
426 static PyObject* (*py3__PyObject_New)(PyTypeObject *); |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
427 # endif |
3618 | 428 static PyObject* (*py3_PyFloat_FromDouble)(double num); |
429 static double (*py3_PyFloat_AsDouble)(PyObject *); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
430 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
|
431 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
|
432 static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); |
3828 | 433 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
|
434 static PyTypeObject* py3_PyStdPrinter_Type; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
435 static PyTypeObject* py3_PySlice_Type; |
3618 | 436 static PyTypeObject* py3_PyFloat_Type; |
3828 | 437 static PyTypeObject* py3_PyBool_Type; |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
438 static int (*py3_PyNumber_Check)(PyObject *); |
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
439 static PyObject* (*py3_PyNumber_Long)(PyObject *); |
2894 | 440 static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); |
3618 | 441 static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor); |
442 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
|
443 # ifdef Py_DEBUG |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
444 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
|
445 static Py_ssize_t* py3__Py_RefTotal; |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
446 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
|
447 # else |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
448 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
|
449 # endif |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
450 # 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
|
451 static void (*py3__PyObject_DebugFree)(void*); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
452 static void* (*py3__PyObject_DebugMalloc)(size_t); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
453 # else |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
454 static void (*py3_PyObject_Free)(void*); |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
455 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
|
456 # endif |
4500 | 457 static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *); |
458 static void(*py3_PyObject_GC_Del)(void *); | |
459 static void(*py3_PyObject_GC_UnTrack)(void *); | |
3618 | 460 static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
461 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
462 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
|
463 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
464 // Imported exception objects |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
465 static PyObject *p3imp_PyExc_AttributeError; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
466 static PyObject *p3imp_PyExc_IndexError; |
4315 | 467 static PyObject *p3imp_PyExc_KeyError; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
468 static PyObject *p3imp_PyExc_KeyboardInterrupt; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
469 static PyObject *p3imp_PyExc_TypeError; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
470 static PyObject *p3imp_PyExc_ValueError; |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
471 static PyObject *p3imp_PyExc_SystemExit; |
4405 | 472 static PyObject *p3imp_PyExc_RuntimeError; |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
473 static PyObject *p3imp_PyExc_ImportError; |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
474 static PyObject *p3imp_PyExc_OverflowError; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
475 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
476 # define PyExc_AttributeError p3imp_PyExc_AttributeError |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
477 # define PyExc_IndexError p3imp_PyExc_IndexError |
4315 | 478 # define PyExc_KeyError p3imp_PyExc_KeyError |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
479 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
480 # define PyExc_TypeError p3imp_PyExc_TypeError |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
481 # define PyExc_ValueError p3imp_PyExc_ValueError |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
482 # define PyExc_SystemExit p3imp_PyExc_SystemExit |
4405 | 483 # define PyExc_RuntimeError p3imp_PyExc_RuntimeError |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
484 # define PyExc_ImportError p3imp_PyExc_ImportError |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
485 # define PyExc_OverflowError p3imp_PyExc_OverflowError |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
486 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
487 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
488 * Table of name to function pointer of python. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
489 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
490 # define PYTHON_PROC FARPROC |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
491 static struct |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
492 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
493 char *name; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
494 PYTHON_PROC *ptr; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
495 } py3_funcname_table[] = |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
496 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
497 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv}, |
2641 | 498 {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
499 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, |
3806 | 500 {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, |
501 {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue}, | |
2894 | 502 {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, |
3618 | 503 {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
504 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
505 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
506 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
507 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject}, |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
508 {"PySys_GetObject", (PYTHON_PROC*)&py3_PySys_GetObject}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
509 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append}, |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
510 {"PyList_Insert", (PYTHON_PROC*)&py3_PyList_Insert}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
511 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size}, |
3618 | 512 {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check}, |
513 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size}, | |
514 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem}, | |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
515 {"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast}, |
3618 | 516 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size}, |
517 {"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
|
518 # 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
|
519 {"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
|
520 {"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
|
521 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
522 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
523 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
524 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
525 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString}, |
4403 | 526 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject}, |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
527 {"PyErr_ExceptionMatches", (PYTHON_PROC*)&py3_PyErr_ExceptionMatches}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
528 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString}, |
3618 | 529 {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String}, |
4417 | 530 {"PyObject_GetAttrString", (PYTHON_PROC*)&py3_PyObject_GetAttrString}, |
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
531 {"PyObject_HasAttrString", (PYTHON_PROC*)&py3_PyObject_HasAttrString}, |
4417 | 532 {"PyObject_SetAttrString", (PYTHON_PROC*)&py3_PyObject_SetAttrString}, |
533 {"PyObject_CallFunctionObjArgs", (PYTHON_PROC*)&py3_PyObject_CallFunctionObjArgs}, | |
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
534 {"_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
|
535 {"PyObject_Call", (PYTHON_PROC*)&py3_PyObject_Call}, |
4417 | 536 {"PyEval_GetGlobals", (PYTHON_PROC*)&py3_PyEval_GetGlobals}, |
537 {"PyEval_GetLocals", (PYTHON_PROC*)&py3_PyEval_GetLocals}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
538 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
539 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule}, |
3618 | 540 {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
541 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
542 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
543 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
544 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
545 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, |
3618 | 546 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, |
547 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, | |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
548 {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, |
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
549 # if PY_VERSION_HEX >= 0x030a00b2 |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
550 {"PyIter_Check", (PYTHON_PROC*)&py3_PyIter_Check}, |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
551 # endif |
3618 | 552 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, |
553 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, | |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
554 {"PyObject_Repr", (PYTHON_PROC*)&py3_PyObject_Repr}, |
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
555 {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem}, |
4399 | 556 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
557 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
558 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
559 # if PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
560 {"PyType_GetFlags", (PYTHON_PROC*)&py3_PyType_GetFlags}, |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
561 # endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
562 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
563 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
564 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
565 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
566 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
567 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
568 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, |
4881
7b8991e084f9
updated for version 7.3.1186
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
569 {"_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
|
570 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, |
3618 | 571 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
572 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, |
3828 | 573 {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct}, |
574 {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
575 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear}, |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
576 {"PyErr_Format", (PYTHON_PROC*)&py3_PyErr_Format}, |
4145 | 577 {"PyErr_PrintEx", (PYTHON_PROC*)&py3_PyErr_PrintEx}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
578 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
579 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
580 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, |
3910 | 581 # if PY_VERSION_HEX >= 0x030300f0 |
582 {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8}, | |
583 # else | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
584 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, |
3910 | 585 # endif |
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
586 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
587 {"PyUnicode_FromFormat", (PYTHON_PROC*)&py3_PyUnicode_FromFormat}, |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
588 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
589 # ifdef Py_UNICODE_WIDE |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
590 {"PyUnicodeUCS4_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS4_FromFormat}, |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
591 # else |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
592 {"PyUnicodeUCS2_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS2_FromFormat}, |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
593 # endif |
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
594 # endif |
2894 | 595 {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString}, |
3798 | 596 {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize}, |
3618 | 597 {"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
|
598 {"PyBytes_FromStringAndSize", (PYTHON_PROC*)&py3_PyBytes_FromStringAndSize}, |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
599 # if defined(Py_DEBUG) || PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
600 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
601 # endif |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
602 # if PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
603 {"_PyObject_New", (PYTHON_PROC*)&py3__PyObject_New}, |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
604 # endif |
3618 | 605 {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble}, |
606 {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
607 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
608 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
609 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, |
3828 | 610 {"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
|
611 {"PyStdPrinter_Type", (PYTHON_PROC*)&py3_PyStdPrinter_Type}, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
612 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, |
3618 | 613 {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, |
3828 | 614 {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
615 {"PyNumber_Check", (PYTHON_PROC*)&py3_PyNumber_Check}, |
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
616 {"PyNumber_Long", (PYTHON_PROC*)&py3_PyNumber_Long}, |
2894 | 617 {"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
|
618 # ifdef Py_DEBUG |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
619 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
620 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
621 {"PyModule_Create2TraceRefs", (PYTHON_PROC*)&py3_PyModule_Create2TraceRefs}, |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
622 # else |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
623 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
624 # endif |
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
625 # 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
|
626 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
627 {"_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
|
628 # else |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
629 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
630 {"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
|
631 # endif |
4500 | 632 {"_PyObject_GC_New", (PYTHON_PROC*)&py3__PyObject_GC_New}, |
633 {"PyObject_GC_Del", (PYTHON_PROC*)&py3_PyObject_GC_Del}, | |
634 {"PyObject_GC_UnTrack", (PYTHON_PROC*)&py3_PyObject_GC_UnTrack}, | |
3618 | 635 {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype}, |
636 {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New}, | |
637 {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer}, | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
638 {"", NULL}, |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
639 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
640 |
18414
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
641 # 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
|
642 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
|
643 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
|
644 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
645 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
|
646 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
647 # 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
|
648 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
|
649 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
650 _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
|
651 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
652 # endif |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
653 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
654 else |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
655 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
656 _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
|
657 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
658 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
659 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
660 # 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
|
661 # 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
|
662 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
663 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
|
664 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
|
665 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
666 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
|
667 { |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
668 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
|
669 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
670 } |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
671 |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
672 # 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
|
673 # 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
|
674 # endif |
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
675 |
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
676 # if PY_VERSION_HEX >= 0x030900b0 |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
677 static inline int |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
678 py3_PyType_HasFeature(PyTypeObject *type, unsigned long feature) |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
679 { |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
680 return ((PyType_GetFlags(type) & feature) != 0); |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
681 } |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
682 # define PyType_HasFeature(t,f) py3_PyType_HasFeature(t,f) |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
683 # endif |
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
684 |
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
685 # if PY_VERSION_HEX >= 0x030a00b2 |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
686 static inline int |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
687 py3__PyObject_TypeCheck(PyObject *ob, PyTypeObject *type) |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
688 { |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
689 return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type); |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
690 } |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
691 # define _PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
692 # endif |
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
693 |
23336
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
694 # ifdef MSWIN |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
695 /* |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
696 * Look up the library "libname" using the InstallPath registry key. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
697 * Return NULL when failed. Return an allocated string when successful. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
698 */ |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
699 static char * |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
700 py3_get_system_libname(const char *libname) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
701 { |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
702 const char *cp = libname; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
703 char subkey[128]; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
704 HKEY hKey; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
705 char installpath[MAXPATHL]; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
706 LONG len = sizeof(installpath); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
707 LSTATUS rc; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
708 size_t sysliblen; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
709 char *syslibname; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
710 |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
711 while (*cp != '\0') |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
712 { |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
713 if (*cp == ':' || *cp == '\\' || *cp == '/') |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
714 { |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
715 // Bail out if "libname" contains path separator, assume it is |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
716 // an absolute path. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
717 return NULL; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
718 } |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
719 ++cp; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
720 } |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
721 vim_snprintf(subkey, sizeof(subkey), |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
722 # ifdef _WIN64 |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
723 "Software\\Python\\PythonCore\\%d.%d\\InstallPath", |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
724 # else |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
725 "Software\\Python\\PythonCore\\%d.%d-32\\InstallPath", |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
726 # endif |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
727 PY_MAJOR_VERSION, PY_MINOR_VERSION); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
728 if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey, 0, KEY_QUERY_VALUE, &hKey) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
729 != ERROR_SUCCESS) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
730 return NULL; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
731 rc = RegQueryValueA(hKey, NULL, installpath, &len); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
732 RegCloseKey(hKey); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
733 if (ERROR_SUCCESS != rc) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
734 return NULL; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
735 cp = installpath + len; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
736 // Just in case registry value contains null terminators. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
737 while (cp > installpath && *(cp-1) == '\0') |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
738 --cp; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
739 // Remove trailing path separators. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
740 while (cp > installpath && (*(cp-1) == '\\' || *(cp-1) == '/')) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
741 --cp; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
742 // Ignore if InstallPath is effectively empty. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
743 if (cp <= installpath) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
744 return NULL; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
745 sysliblen = (cp - installpath) + 1 + STRLEN(libname) + 1; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
746 syslibname = alloc(sysliblen); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
747 vim_snprintf(syslibname, sysliblen, "%.*s\\%s", |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
748 (int)(cp - installpath), installpath, libname); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
749 return syslibname; |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
750 } |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
751 # endif |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
752 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
753 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
754 * Load library and get all pointers. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
755 * Parameter 'libname' provides name of DLL. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
756 * Return OK or FAIL. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
757 */ |
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
|
758 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
|
759 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
|
760 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
761 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
|
762 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
|
763 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
|
764 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
|
765 (PYTHON_PROC *)&py3_PyUnicode_AsEncodedString; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
766 |
2641 | 767 # 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
|
768 // 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
|
769 // 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
|
770 // 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
|
771 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
|
772 { |
3032 | 773 if (verbose) |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
774 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
|
775 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
|
776 } |
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
|
777 # 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
|
778 |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
779 if (hinstPy3 != 0) |
2330 | 780 return OK; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
781 hinstPy3 = load_dll(libname); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
782 |
23336
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
783 # ifdef MSWIN |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
784 if (!hinstPy3) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
785 { |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
786 // Attempt to use the path from InstallPath as stored in the registry. |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
787 char *syslibname = py3_get_system_libname(libname); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
788 |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
789 if (syslibname != NULL) |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
790 { |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
791 hinstPy3 = load_dll(syslibname); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
792 vim_free(syslibname); |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
793 } |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
794 } |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
795 # endif |
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
796 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
797 if (!hinstPy3) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
798 { |
2330 | 799 if (verbose) |
25342
c4298ed56ffa
patch 8.2.3208: dynamic library load error does not mention why it failed
Bram Moolenaar <Bram@vim.org>
parents:
24916
diff
changeset
|
800 semsg(_(e_loadlib), libname, load_dll_error()); |
2330 | 801 return FAIL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
802 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
803 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
804 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
|
805 { |
2330 | 806 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3, |
807 py3_funcname_table[i].name)) == NULL) | |
808 { | |
809 close_dll(hinstPy3); | |
810 hinstPy3 = 0; | |
811 if (verbose) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
812 semsg(_(e_loadfunc), py3_funcname_table[i].name); |
2330 | 813 return FAIL; |
814 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
815 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
816 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
817 // 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
|
818 // will be present in the library. |
3910 | 819 # 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
|
820 *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
|
821 *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
|
822 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
3863 | 823 "PyUnicode_AsEncodedString"); |
3910 | 824 # else |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
825 *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
|
826 *ucs_decode = symbol_from_dll(hinstPy3, |
2894 | 827 "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
|
828 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
2894 | 829 "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
|
830 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
|
831 || *ucs_as_encoded_string == NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
832 { |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
833 *ucs_from_string = symbol_from_dll(hinstPy3, |
2330 | 834 "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
|
835 *ucs_decode = symbol_from_dll(hinstPy3, |
2894 | 836 "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
|
837 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
2894 | 838 "PyUnicodeUCS4_AsEncodedString"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
839 } |
3910 | 840 # endif |
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
841 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
|
842 || *ucs_as_encoded_string == NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
843 { |
2330 | 844 close_dll(hinstPy3); |
845 hinstPy3 = 0; | |
846 if (verbose) | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
847 semsg(_(e_loadfunc), "PyUnicode_UCSX_*"); |
2330 | 848 return FAIL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
849 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
850 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
851 return OK; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
852 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
853 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
854 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
855 * 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
|
856 * TRUE, else FALSE. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
857 */ |
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
|
858 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
|
859 python3_enabled(int verbose) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
860 { |
7528
53163e4d9e4f
commit https://github.com/vim/vim/commit/25e4fcde767084d1a79e0926bc301c92987c0cce
Christian Brabandt <cb@256bit.org>
parents:
7416
diff
changeset
|
861 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
|
862 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
863 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
864 /* |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
865 * 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
|
866 * 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
|
867 */ |
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
|
868 static void |
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
869 get_py3_exceptions(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
870 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
871 PyObject *exmod = PyImport_ImportModule("builtins"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
872 PyObject *exdict = PyModule_GetDict(exmod); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
873 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
874 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); |
4315 | 875 p3imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
876 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
877 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
878 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
879 p3imp_PyExc_SystemExit = PyDict_GetItemString(exdict, "SystemExit"); |
4405 | 880 p3imp_PyExc_RuntimeError = PyDict_GetItemString(exdict, "RuntimeError"); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
881 p3imp_PyExc_ImportError = PyDict_GetItemString(exdict, "ImportError"); |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
882 p3imp_PyExc_OverflowError = PyDict_GetItemString(exdict, "OverflowError"); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
883 Py_XINCREF(p3imp_PyExc_AttributeError); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
884 Py_XINCREF(p3imp_PyExc_IndexError); |
4315 | 885 Py_XINCREF(p3imp_PyExc_KeyError); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
886 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
887 Py_XINCREF(p3imp_PyExc_TypeError); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
888 Py_XINCREF(p3imp_PyExc_ValueError); |
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
889 Py_XINCREF(p3imp_PyExc_SystemExit); |
4405 | 890 Py_XINCREF(p3imp_PyExc_RuntimeError); |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
891 Py_XINCREF(p3imp_PyExc_ImportError); |
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
892 Py_XINCREF(p3imp_PyExc_OverflowError); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
893 Py_XDECREF(exmod); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
894 } |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
895 #endif // DYNAMIC_PYTHON3 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
896 |
3618 | 897 static int py3initialised = 0; |
898 #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
|
899 static int python_end_called = FALSE; |
3618 | 900 |
4500 | 901 #define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self) |
3618 | 902 |
4377 | 903 #define WIN_PYTHON_REF(win) win->w_python3_ref |
904 #define BUF_PYTHON_REF(buf) buf->b_python3_ref | |
4401 | 905 #define TAB_PYTHON_REF(tab) tab->tp_python3_ref |
4377 | 906 |
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
|
907 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
|
908 call_PyObject_Free(void *p) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
909 { |
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
910 #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
|
911 _PyObject_DebugFree(p); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
912 #else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
913 PyObject_Free(p); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
914 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
915 } |
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
|
916 |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
917 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
|
918 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
|
919 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
920 return PyType_GenericNew(type,args,kwds); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
921 } |
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
|
922 |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
923 static PyObject * |
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
924 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
|
925 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
926 return PyType_GenericAlloc(type,nitems); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
927 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
928 |
4319 | 929 static PyObject *OutputGetattro(PyObject *, PyObject *); |
930 static int OutputSetattro(PyObject *, PyObject *, PyObject *); | |
931 static PyObject *BufferGetattro(PyObject *, PyObject *); | |
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
932 static int BufferSetattro(PyObject *, PyObject *, PyObject *); |
4401 | 933 static PyObject *TabPageGetattro(PyObject *, PyObject *); |
4319 | 934 static PyObject *WindowGetattro(PyObject *, PyObject *); |
935 static int WindowSetattro(PyObject *, PyObject *, PyObject *); | |
936 static PyObject *RangeGetattro(PyObject *, PyObject *); | |
937 static PyObject *CurrentGetattro(PyObject *, PyObject *); | |
938 static int CurrentSetattro(PyObject *, PyObject *, PyObject *); | |
939 static PyObject *DictionaryGetattro(PyObject *, PyObject *); | |
940 static int DictionarySetattro(PyObject *, PyObject *, PyObject *); | |
941 static PyObject *ListGetattro(PyObject *, PyObject *); | |
942 static int ListSetattro(PyObject *, PyObject *, PyObject *); | |
943 static PyObject *FunctionGetattro(PyObject *, PyObject *); | |
944 | |
945 static struct PyModuleDef vimmodule; | |
946 | |
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
947 #define PY_CAN_RECURSE |
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
948 |
4319 | 949 /* |
950 * Include the code shared with if_python.c | |
951 */ | |
952 #include "if_py_both.h" | |
953 | |
16030
6694659c6ad6
patch 8.1.1020: compiler warning for Python3 interface
Bram Moolenaar <Bram@vim.org>
parents:
15888
diff
changeset
|
954 // NOTE: Must always be used at the start of a block, since it declares "name". |
4319 | 955 #define GET_ATTR_STRING(name, nameobj) \ |
956 char *name = ""; \ | |
957 if (PyUnicode_Check(nameobj)) \ | |
16030
6694659c6ad6
patch 8.1.1020: compiler warning for Python3 interface
Bram Moolenaar <Bram@vim.org>
parents:
15888
diff
changeset
|
958 name = (char *)_PyUnicode_AsString(nameobj) |
4319 | 959 |
960 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0) | |
961 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
962 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
963 // Internal function prototypes. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
964 |
3951 | 965 static PyObject *Py3Init_vim(void); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
966 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
967 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
968 // 1. Python interpreter main program. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
969 |
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
|
970 void |
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
971 python3_end(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
972 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
973 static int recurse = 0; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
974 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
975 // 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
|
976 if (recurse != 0) |
2330 | 977 return; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
978 |
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
979 python_end_called = TRUE; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
980 ++recurse; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
981 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
982 #ifdef DYNAMIC_PYTHON3 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
983 if (hinstPy3) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
984 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
985 if (Py_IsInitialized()) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
986 { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
987 // acquire lock before finalizing |
4415 | 988 PyGILState_Ensure(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
989 |
2330 | 990 Py_Finalize(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
991 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
992 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
993 --recurse; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
994 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
995 |
7158
43ac8dc380c7
commit https://github.com/vim/vim/commit/094454fa708d3297db744f095cd2b7b155a8b6ad
Christian Brabandt <cb@256bit.org>
parents:
6569
diff
changeset
|
996 #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
|
997 int |
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
998 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
|
999 { |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
1000 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
|
1001 } |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
1002 #endif |
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
1003 |
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
1004 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
|
1005 |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1006 #if defined(MSWIN) && (PY_VERSION_HEX >= 0x030500f0) |
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1007 /* |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1008 * Return TRUE if stdin is readable from Python 3. |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1009 */ |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1010 static BOOL |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1011 is_stdin_readable(void) |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1012 { |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1013 DWORD mode, eventnum; |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1014 struct _stat st; |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1015 int fd = fileno(stdin); |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1016 HANDLE hstdin = (HANDLE)_get_osfhandle(fd); |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1017 |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1018 // Check if stdin is connected to the console. |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1019 if (GetConsoleMode(hstdin, &mode)) |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1020 // Check if it is opened as input. |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1021 return GetNumberOfConsoleInputEvents(hstdin, &eventnum); |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1022 |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1023 return _fstat(fd, &st) == 0; |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1024 } |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1025 |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1026 // Python 3.5 or later will abort inside Py_Initialize() when stdin has |
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1027 // been closed (i.e. executed by "vim -"). Reconnect stdin to CONIN$. |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1028 // Note that the python DLL is linked to its own stdio DLL which can be |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1029 // differ from Vim's stdio. |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1030 static void |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1031 reset_stdin(void) |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1032 { |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1033 FILE *(*py__acrt_iob_func)(unsigned) = NULL; |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1034 FILE *(*pyfreopen)(const char *, const char *, FILE *) = NULL; |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1035 HINSTANCE hinst; |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1036 |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1037 # ifdef DYNAMIC_PYTHON3 |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1038 hinst = hinstPy3; |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1039 # else |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1040 hinst = GetModuleHandle(PYTHON3_DLL); |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1041 # endif |
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1042 if (hinst == NULL || is_stdin_readable()) |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1043 return; |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1044 |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1045 // Get "freopen" and "stdin" which are used in the python DLL. |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1046 // "stdin" is defined as "__acrt_iob_func(0)" in VC++ 2015 or later. |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1047 py__acrt_iob_func = get_dll_import_func(hinst, "__acrt_iob_func"); |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1048 if (py__acrt_iob_func) |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1049 { |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1050 HINSTANCE hpystdiodll = find_imported_module_by_funcname(hinst, |
22516
c174ec901f7e
patch 8.2.1806: MS-Windows with Python: Vim freezes after import command
Bram Moolenaar <Bram@vim.org>
parents:
22484
diff
changeset
|
1051 "__acrt_iob_func"); |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1052 if (hpystdiodll) |
22516
c174ec901f7e
patch 8.2.1806: MS-Windows with Python: Vim freezes after import command
Bram Moolenaar <Bram@vim.org>
parents:
22484
diff
changeset
|
1053 pyfreopen = (void *)GetProcAddress(hpystdiodll, "freopen"); |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1054 } |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1055 |
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1056 // Reconnect stdin to CONIN$. |
22516
c174ec901f7e
patch 8.2.1806: MS-Windows with Python: Vim freezes after import command
Bram Moolenaar <Bram@vim.org>
parents:
22484
diff
changeset
|
1057 if (pyfreopen != NULL) |
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1058 pyfreopen("CONIN$", "r", py__acrt_iob_func(0)); |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1059 else |
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1060 freopen("CONIN$", "r", stdin); |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1061 } |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1062 #else |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1063 # define reset_stdin() |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1064 #endif |
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1065 |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1066 static 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
|
1067 Python3_Init(void) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1068 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1069 if (!py3initialised) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1070 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1071 #ifdef DYNAMIC_PYTHON3 |
2330 | 1072 if (!python3_enabled(TRUE)) |
1073 { | |
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
1074 emsg(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); |
2330 | 1075 goto fail; |
1076 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1077 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1078 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1079 init_structs(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1080 |
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
1081 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
|
1082 { |
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
1083 size_t len = mbstowcs(NULL, (char *)p_py3home, 0) + 1; |
2641 | 1084 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1085 // 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
|
1086 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
|
1087 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
|
1088 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
|
1089 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
|
1090 } |
2641 | 1091 #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
|
1092 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
|
1093 Py_SetPythonHome(PYTHON3_HOME); |
2641 | 1094 #endif |
1095 | |
3863 | 1096 PyImport_AppendInittab("vim", Py3Init_vim); |
1097 | |
21662
21304d9c47e9
patch 8.2.1381: MS-Windows: crash with Python 3.5 when stdin is redirected
Bram Moolenaar <Bram@vim.org>
parents:
21349
diff
changeset
|
1098 reset_stdin(); |
2330 | 1099 Py_Initialize(); |
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1100 |
22572
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1101 #if PY_VERSION_HEX < 0x03090000 |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1102 // Initialise threads. This is deprecated since Python 3.9. |
2877 | 1103 PyEval_InitThreads(); |
22572
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1104 #endif |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1105 #ifdef DYNAMIC_PYTHON3 |
2330 | 1106 get_py3_exceptions(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1107 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1108 |
4494 | 1109 if (PythonIO_Init_io()) |
2330 | 1110 goto fail; |
1111 | |
3618 | 1112 globals = PyModule_GetDict(PyImport_AddModule("__main__")); |
1113 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1114 // 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
|
1115 // 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
|
1116 // 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
|
1117 // 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
|
1118 // 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
|
1119 // sys.path. |
2894 | 1120 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
|
1121 |
22572
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1122 // Without the call to PyEval_SaveThread, thread specific state (such |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1123 // as the system trace hook), will be lost between invocations of |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1124 // Python code. |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1125 // GIL may have been created and acquired in PyEval_InitThreads() and |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1126 // thread state is created in Py_Initialize(); there |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1127 // _PyGILState_NoteThreadState() also sets gilcounter to 1 (python must |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1128 // have threads enabled!), so the following does both: unlock GIL and |
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1129 // save thread state in TLS without deleting thread state |
4109 | 1130 PyEval_SaveThread(); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1131 |
2330 | 1132 py3initialised = 1; |
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 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1135 return 0; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1136 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1137 fail: |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1138 // 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
|
1139 // 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
|
1140 // 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
|
1141 // not do anything in this case). |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1142 PythonIO_Flush(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1143 return -1; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1144 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1145 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1146 /* |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1147 * External interface |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1148 */ |
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
|
1149 static void |
4486 | 1150 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
|
1151 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1152 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
2330 | 1153 char *saved_locale; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1154 #endif |
2894 | 1155 PyObject *cmdstr; |
1156 PyObject *cmdbytes; | |
4415 | 1157 PyGILState_STATE pygilstate; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1158 |
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
1159 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
|
1160 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
|
1161 |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1162 if (Python3_Init()) |
2330 | 1163 goto theend; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1164 |
4486 | 1165 init_range(arg); |
1166 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1167 Python_Release_Vim(); // leave Vim |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1168 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1169 #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
|
1170 // 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
|
1171 saved_locale = setlocale(LC_NUMERIC, NULL); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1172 if (saved_locale == NULL || STRCMP(saved_locale, "C") == 0) |
2330 | 1173 saved_locale = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1174 else |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1175 { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1176 // Need to make a copy, value may change when setting new locale. |
2330 | 1177 saved_locale = (char *)vim_strsave((char_u *)saved_locale); |
1178 (void)setlocale(LC_NUMERIC, "C"); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1179 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1180 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1181 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1182 pygilstate = PyGILState_Ensure(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1183 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1184 // 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
|
1185 // SyntaxError (unicode error). |
2955 | 1186 cmdstr = PyUnicode_Decode(cmd, strlen(cmd), |
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
1187 (char *)ENC_OPT, ERRORS_DECODE_ARG); |
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
1188 cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", ERRORS_ENCODE_ARG); |
2894 | 1189 Py_XDECREF(cmdstr); |
3618 | 1190 |
4486 | 1191 run(PyBytes_AsString(cmdbytes), arg, &pygilstate); |
2894 | 1192 Py_XDECREF(cmdbytes); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1193 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1194 PyGILState_Release(pygilstate); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1195 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1196 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1197 if (saved_locale != NULL) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1198 { |
2330 | 1199 (void)setlocale(LC_NUMERIC, saved_locale); |
1200 vim_free(saved_locale); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1201 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1202 #endif |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1203 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1204 Python_Lock_Vim(); // enter Vim |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1205 PythonIO_Flush(); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1206 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1207 theend: |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1208 return; // keeps lint happy |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1209 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1210 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1211 /* |
2350
06feaf4fe36a
Rename some "python3" symbols to "py3", as the command name.
Bram Moolenaar <bram@vim.org>
parents:
2342
diff
changeset
|
1212 * ":py3" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1213 */ |
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
|
1214 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
|
1215 ex_py3(exarg_T *eap) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1216 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1217 char_u *script; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1218 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1219 script = script_get(eap, eap->arg); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1220 if (!eap->skip) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1221 { |
15888
a83c4b1f8ea2
patch 8.1.0950: using :python sets 'pyxversion' even when not executed
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
1222 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
|
1223 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
|
1224 |
4486 | 1225 DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script, |
1226 (rangeinitializer) init_range_cmd, | |
1227 (runner) run_cmd, | |
1228 (void *) eap); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1229 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1230 vim_free(script); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1231 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1232 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1233 #define BUFFER_SIZE 2048 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1234 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1235 /* |
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
1236 * ":py3file" |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1237 */ |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1238 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1239 ex_py3file(exarg_T *eap) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1240 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1241 static char buffer[BUFFER_SIZE]; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1242 const char *file; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1243 char *p; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1244 int i; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1245 |
10722
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1246 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
|
1247 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
|
1248 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1249 // 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
|
1250 // 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
|
1251 // 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
|
1252 // compatible between the two. Yuk. |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1253 // |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1254 // 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
|
1255 // |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1256 // 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
|
1257 // 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
|
1258 // |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1259 // 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
|
1260 // Python won't mangle the file name. |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1261 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1262 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
|
1263 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
|
1264 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1265 for (i=0; i<2; ++i) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1266 { |
2330 | 1267 file = (char *)eap->arg; |
1268 while (*file && p < buffer + (BUFFER_SIZE - 3)) | |
1269 { | |
1270 if (*file == '\\' || *file == '\'') | |
1271 *p++ = '\\'; | |
1272 *p++ = *file++; | |
1273 } | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1274 // If we didn't finish the file name, we hit a buffer overflow |
2330 | 1275 if (*file != '\0') |
1276 return; | |
1277 if (i==0) | |
1278 { | |
2894 | 1279 strcpy(p,"','rb').read(),'"); |
1280 p += 16; | |
2330 | 1281 } |
1282 else | |
1283 { | |
1284 strcpy(p,"','exec'))"); | |
1285 p += 10; | |
1286 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1287 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1288 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1289 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1290 // Execute the file |
4486 | 1291 DoPyCommand(buffer, |
1292 (rangeinitializer) init_range_cmd, | |
1293 (runner) run_cmd, | |
1294 (void *) eap); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1295 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1296 |
4421 | 1297 void |
1298 ex_py3do(exarg_T *eap) | |
4417 | 1299 { |
10722
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1300 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
|
1301 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
|
1302 |
4486 | 1303 DoPyCommand((char *)eap->arg, |
1304 (rangeinitializer)init_range_cmd, | |
1305 (runner)run_do, | |
1306 (void *)eap); | |
4417 | 1307 } |
1308 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1309 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1310 // 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
|
1311 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1312 // Implementation functions |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1313 |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1314 static 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
|
1315 OutputGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1316 { |
3826 | 1317 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1318 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1319 if (strcmp(name, "softspace") == 0) |
2330 | 1320 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
|
1321 else if (strcmp(name, "errors") == 0) |
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1322 return PyString_FromString("strict"); |
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1323 else if (strcmp(name, "encoding") == 0) |
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1324 return PyString_FromString(ENC_OPT); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1325 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1326 return PyObject_GenericGetAttr(self, nameobj); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1327 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1328 |
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
|
1329 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
|
1330 OutputSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1331 { |
3826 | 1332 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1333 |
4488 | 1334 return OutputSetattr((OutputObject *)(self), name, val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1335 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1336 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1337 /////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1338 // 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
|
1339 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1340 // Window type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1341 // -------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1342 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1343 #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
|
1344 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1345 // Buffer type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1346 // -------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1347 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1348 #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
|
1349 |
3070 | 1350 static PyObject* BufferSubscript(PyObject *self, PyObject *idx); |
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1351 static int BufferAsSubscript(PyObject *self, PyObject *idx, PyObject *val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1352 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1353 // Line range type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1354 // -------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1355 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1356 #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
|
1357 |
3070 | 1358 static PyObject* RangeSubscript(PyObject *self, PyObject *idx); |
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1359 static int RangeAsItem(PyObject *, Py_ssize_t, PyObject *); |
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1360 static int RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1361 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1362 // Current objects type - Implementation functions |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1363 // ----------------------------------------------- |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1364 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1365 static PySequenceMethods BufferAsSeq = { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1366 (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
|
1367 (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
|
1368 (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
|
1369 (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
|
1370 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
|
1371 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
|
1372 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
|
1373 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1374 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1375 0, // sq_inplace_repeat |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1376 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1377 |
4319 | 1378 static PyMappingMethods BufferAsMapping = { |
2330 | 1379 /* mp_length */ (lenfunc)BufferLength, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1380 /* mp_subscript */ (binaryfunc)BufferSubscript, |
2894 | 1381 /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1382 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1383 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1384 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1385 // Buffer object |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1386 |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1387 static PyObject * |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1388 BufferGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1389 { |
4319 | 1390 PyObject *r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1391 |
3826 | 1392 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1393 |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1394 if ((r = BufferAttrValid((BufferObject *)(self), name))) |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1395 return r; |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1396 |
4319 | 1397 if (CheckBuffer((BufferObject *)(self))) |
2330 | 1398 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1399 |
4319 | 1400 r = BufferAttr((BufferObject *)(self), name); |
1401 if (r || PyErr_Occurred()) | |
1402 return r; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1403 else |
2330 | 1404 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1405 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1406 |
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1407 static int |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1408 BufferSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1409 { |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1410 GET_ATTR_STRING(name, nameobj); |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1411 |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1412 return BufferSetattr((BufferObject *)(self), name, val); |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1413 } |
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1414 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1415 ////////////////// |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1416 |
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1417 static 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
|
1418 BufferSubscript(PyObject *self, PyObject* idx) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1419 { |
3618 | 1420 if (PyLong_Check(idx)) |
1421 { | |
2330 | 1422 long _idx = PyLong_AsLong(idx); |
4488 | 1423 return BufferItem((BufferObject *)(self), _idx); |
3618 | 1424 } else if (PySlice_Check(idx)) |
1425 { | |
2330 | 1426 Py_ssize_t start, stop, step, slicelen; |
1427 | |
4387 | 1428 if (CheckBuffer((BufferObject *) self)) |
1429 return NULL; | |
1430 | |
5768 | 1431 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
4389 | 1432 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
2330 | 1433 &start, &stop, |
3618 | 1434 &step, &slicelen) < 0) |
2330 | 1435 return NULL; |
4488 | 1436 return BufferSlice((BufferObject *)(self), start, stop); |
3618 | 1437 } |
1438 else | |
1439 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1440 RAISE_INVALID_INDEX_TYPE(idx); |
2330 | 1441 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1442 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1443 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1444 |
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1445 static int |
2894 | 1446 BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val) |
1447 { | |
3618 | 1448 if (PyLong_Check(idx)) |
1449 { | |
2894 | 1450 long n = PyLong_AsLong(idx); |
21190
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1451 |
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1452 if (CheckBuffer((BufferObject *) self)) |
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1453 return -1; |
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1454 |
2894 | 1455 return RBAsItem((BufferObject *)(self), n, val, 1, |
1456 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
1457 NULL); | |
3618 | 1458 } else if (PySlice_Check(idx)) |
1459 { | |
2894 | 1460 Py_ssize_t start, stop, step, slicelen; |
1461 | |
4387 | 1462 if (CheckBuffer((BufferObject *) self)) |
1463 return -1; | |
1464 | |
5768 | 1465 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
4389 | 1466 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
2894 | 1467 &start, &stop, |
3618 | 1468 &step, &slicelen) < 0) |
2894 | 1469 return -1; |
1470 return RBAsSlice((BufferObject *)(self), start, stop, val, 1, | |
1471 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
1472 NULL); | |
3618 | 1473 } |
1474 else | |
1475 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1476 RAISE_INVALID_INDEX_TYPE(idx); |
2894 | 1477 return -1; |
1478 } | |
1479 } | |
1480 | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1481 static PySequenceMethods RangeAsSeq = { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1482 (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
|
1483 (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
|
1484 (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
|
1485 (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
|
1486 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
|
1487 (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
|
1488 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
|
1489 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1490 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1491 0, // sq_inplace_repeat |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1492 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1493 |
4319 | 1494 static PyMappingMethods RangeAsMapping = { |
2330 | 1495 /* mp_length */ (lenfunc)RangeLength, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1496 /* mp_subscript */ (binaryfunc)RangeSubscript, |
3070 | 1497 /* mp_ass_subscript */ (objobjargproc)RangeAsSubscript, |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1498 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1499 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1500 // Line range object - Implementation |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1501 |
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
|
1502 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
|
1503 RangeGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1504 { |
3826 | 1505 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1506 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1507 if (strcmp(name, "start") == 0) |
2330 | 1508 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
|
1509 else if (strcmp(name, "end") == 0) |
2330 | 1510 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
|
1511 else |
2330 | 1512 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1513 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1514 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1515 //////////////// |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1516 |
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1517 static int |
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
|
1518 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
|
1519 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1520 return RBAsItem(((RangeObject *)(self))->buf, n, val, |
2330 | 1521 ((RangeObject *)(self))->start, |
1522 ((RangeObject *)(self))->end, | |
1523 &((RangeObject *)(self))->end); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1524 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1525 |
3070 | 1526 static Py_ssize_t |
1527 RangeAsSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi, PyObject *val) | |
1528 { | |
1529 return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val, | |
1530 ((RangeObject *)(self))->start, | |
1531 ((RangeObject *)(self))->end, | |
1532 &((RangeObject *)(self))->end); | |
1533 } | |
1534 | |
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
|
1535 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
|
1536 RangeSubscript(PyObject *self, PyObject* idx) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1537 { |
3618 | 1538 if (PyLong_Check(idx)) |
1539 { | |
2330 | 1540 long _idx = PyLong_AsLong(idx); |
4488 | 1541 return RangeItem((RangeObject *)(self), _idx); |
3618 | 1542 } else if (PySlice_Check(idx)) |
1543 { | |
2330 | 1544 Py_ssize_t start, stop, step, slicelen; |
1545 | |
5768 | 1546 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
2330 | 1547 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
1548 &start, &stop, | |
3618 | 1549 &step, &slicelen) < 0) |
2330 | 1550 return NULL; |
4488 | 1551 return RangeSlice((RangeObject *)(self), start, stop); |
3618 | 1552 } |
1553 else | |
1554 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1555 RAISE_INVALID_INDEX_TYPE(idx); |
2330 | 1556 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1557 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1558 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1559 |
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1560 static int |
3070 | 1561 RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val) |
1562 { | |
3618 | 1563 if (PyLong_Check(idx)) |
1564 { | |
3070 | 1565 long n = PyLong_AsLong(idx); |
1566 return RangeAsItem(self, n, val); | |
16162
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
16032
diff
changeset
|
1567 } |
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
16032
diff
changeset
|
1568 else if (PySlice_Check(idx)) |
3618 | 1569 { |
3070 | 1570 Py_ssize_t start, stop, step, slicelen; |
1571 | |
5768 | 1572 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
3070 | 1573 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
1574 &start, &stop, | |
3618 | 1575 &step, &slicelen) < 0) |
3070 | 1576 return -1; |
1577 return RangeAsSlice(self, start, stop, val); | |
3618 | 1578 } |
1579 else | |
1580 { | |
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1581 RAISE_INVALID_INDEX_TYPE(idx); |
3070 | 1582 return -1; |
1583 } | |
1584 } | |
1585 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1586 // TabPage object - Implementation |
4401 | 1587 |
1588 static PyObject * | |
1589 TabPageGetattro(PyObject *self, PyObject *nameobj) | |
1590 { | |
1591 PyObject *r; | |
1592 | |
1593 GET_ATTR_STRING(name, nameobj); | |
1594 | |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1595 if ((r = TabPageAttrValid((TabPageObject *)(self), name))) |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1596 return r; |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1597 |
4401 | 1598 if (CheckTabPage((TabPageObject *)(self))) |
1599 return NULL; | |
1600 | |
1601 r = TabPageAttr((TabPageObject *)(self), name); | |
1602 if (r || PyErr_Occurred()) | |
1603 return r; | |
1604 else | |
1605 return PyObject_GenericGetAttr(self, nameobj); | |
1606 } | |
1607 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1608 // Window object - Implementation |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1609 |
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
|
1610 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
|
1611 WindowGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1612 { |
4319 | 1613 PyObject *r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1614 |
3826 | 1615 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1616 |
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1617 if ((r = WindowAttrValid((WindowObject *)(self), name))) |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1618 return r; |
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1619 |
4319 | 1620 if (CheckWindow((WindowObject *)(self))) |
2330 | 1621 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1622 |
4319 | 1623 r = WindowAttr((WindowObject *)(self), name); |
1624 if (r || PyErr_Occurred()) | |
1625 return r; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1626 else |
2330 | 1627 return PyObject_GenericGetAttr(self, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1628 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1629 |
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
|
1630 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
|
1631 WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1632 { |
3826 | 1633 GET_ATTR_STRING(name, nameobj); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1634 |
4488 | 1635 return WindowSetattr((WindowObject *)(self), name, val); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1636 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1637 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1638 // Tab page list object - Definitions |
4401 | 1639 |
1640 static PySequenceMethods TabListAsSeq = { | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1641 (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
|
1642 (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
|
1643 (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
|
1644 (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
|
1645 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
|
1646 (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
|
1647 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
|
1648 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1649 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1650 0, // sq_inplace_repeat |
4401 | 1651 }; |
1652 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1653 // Window list object - Definitions |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1654 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1655 static PySequenceMethods WinListAsSeq = { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1656 (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
|
1657 (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
|
1658 (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
|
1659 (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
|
1660 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
|
1661 (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
|
1662 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
|
1663 0, // sq_contains |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1664 0, // sq_inplace_concat |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1665 0, // sq_inplace_repeat |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1666 }; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1667 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1668 /* |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1669 * Current items object - Implementation |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1670 */ |
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
|
1671 static PyObject * |
4319 | 1672 CurrentGetattro(PyObject *self, PyObject *nameobj) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1673 { |
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1674 PyObject *r; |
3826 | 1675 GET_ATTR_STRING(name, nameobj); |
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1676 if (!(r = CurrentGetattr(self, name))) |
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1677 return PyObject_GenericGetAttr(self, nameobj); |
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1678 return r; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1679 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1680 |
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
|
1681 static int |
4319 | 1682 CurrentSetattro(PyObject *self, PyObject *nameobj, PyObject *value) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1683 { |
4319 | 1684 GET_ATTR_STRING(name, nameobj); |
1685 return CurrentSetattr(self, name, value); | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1686 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1687 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1688 // Dictionary object - Definitions |
3618 | 1689 |
3828 | 1690 static PyObject * |
1691 DictionaryGetattro(PyObject *self, PyObject *nameobj) | |
1692 { | |
1693 DictionaryObject *this = ((DictionaryObject *) (self)); | |
1694 | |
1695 GET_ATTR_STRING(name, nameobj); | |
1696 | |
1697 if (strcmp(name, "locked") == 0) | |
1698 return PyLong_FromLong(this->dict->dv_lock); | |
1699 else if (strcmp(name, "scope") == 0) | |
1700 return PyLong_FromLong(this->dict->dv_scope); | |
1701 | |
1702 return PyObject_GenericGetAttr(self, nameobj); | |
1703 } | |
1704 | |
1705 static int | |
1706 DictionarySetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
1707 { | |
1708 GET_ATTR_STRING(name, nameobj); | |
4488 | 1709 return DictionarySetattr((DictionaryObject *)(self), name, val); |
3618 | 1710 } |
1711 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1712 // List object - Definitions |
3618 | 1713 |
3828 | 1714 static PyObject * |
1715 ListGetattro(PyObject *self, PyObject *nameobj) | |
1716 { | |
1717 GET_ATTR_STRING(name, nameobj); | |
1718 | |
1719 if (strcmp(name, "locked") == 0) | |
1720 return PyLong_FromLong(((ListObject *) (self))->list->lv_lock); | |
1721 | |
1722 return PyObject_GenericGetAttr(self, nameobj); | |
1723 } | |
1724 | |
1725 static int | |
1726 ListSetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
1727 { | |
1728 GET_ATTR_STRING(name, nameobj); | |
4488 | 1729 return ListSetattr((ListObject *)(self), name, val); |
3618 | 1730 } |
1731 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1732 // Function object - Definitions |
3618 | 1733 |
1734 static PyObject * | |
1735 FunctionGetattro(PyObject *self, PyObject *nameobj) | |
1736 { | |
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1737 PyObject *r; |
3618 | 1738 FunctionObject *this = (FunctionObject *)(self); |
3826 | 1739 |
1740 GET_ATTR_STRING(name, nameobj); | |
3618 | 1741 |
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1742 r = FunctionAttr(this, name); |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1743 if (r || PyErr_Occurred()) |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1744 return r; |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1745 else |
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1746 return PyObject_GenericGetAttr(self, nameobj); |
3618 | 1747 } |
1748 | |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1749 // External interface |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1750 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1751 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1752 python3_buffer_free(buf_T *buf) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1753 { |
4377 | 1754 if (BUF_PYTHON_REF(buf) != NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1755 { |
4377 | 1756 BufferObject *bp = BUF_PYTHON_REF(buf); |
2330 | 1757 bp->buf = INVALID_BUFFER_VALUE; |
4377 | 1758 BUF_PYTHON_REF(buf) = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1759 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1760 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1761 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1762 void |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1763 python3_window_free(win_T *win) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1764 { |
4377 | 1765 if (WIN_PYTHON_REF(win) != NULL) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1766 { |
4377 | 1767 WindowObject *wp = WIN_PYTHON_REF(win); |
2330 | 1768 wp->win = INVALID_WINDOW_VALUE; |
4377 | 1769 WIN_PYTHON_REF(win) = NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1770 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1771 } |
4401 | 1772 |
1773 void | |
1774 python3_tabpage_free(tabpage_T *tab) | |
1775 { | |
1776 if (TAB_PYTHON_REF(tab) != NULL) | |
1777 { | |
1778 TabPageObject *tp = TAB_PYTHON_REF(tab); | |
1779 tp->tab = INVALID_TABPAGE_VALUE; | |
1780 TAB_PYTHON_REF(tab) = NULL; | |
1781 } | |
1782 } | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1783 |
3951 | 1784 static PyObject * |
1785 Py3Init_vim(void) | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1786 { |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1787 // 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
|
1788 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
|
1789 |
4494 | 1790 if (init_types()) |
1791 return NULL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1792 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1793 // 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
|
1794 PySys_SetArgv(1, argv); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1795 |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1796 if ((vim_module = PyModule_Create(&vimmodule)) == NULL) |
2894 | 1797 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1798 |
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1799 if (populate_module(vim_module)) |
2330 | 1800 return NULL; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1801 |
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1802 if (init_sys_path()) |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1803 return NULL; |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1804 |
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1805 return vim_module; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1806 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1807 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1808 ////////////////////////////////////////////////////////////////////////// |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1809 // 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
|
1810 |
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1811 /* |
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1812 * 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
|
1813 * All internal newlines are replaced by null characters. |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1814 * |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1815 * 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
|
1816 */ |
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
|
1817 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
|
1818 LineToString(const char *str) |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1819 { |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1820 PyObject *result; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1821 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
|
1822 char *tmp, *p; |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1823 |
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
|
1824 tmp = alloc(len + 1); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1825 p = tmp; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1826 if (p == NULL) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1827 { |
2330 | 1828 PyErr_NoMemory(); |
1829 return NULL; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1830 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1831 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1832 while (*str) |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1833 { |
2330 | 1834 if (*str == '\n') |
1835 *p = '\0'; | |
1836 else | |
1837 *p = *str; | |
1838 | |
1839 ++p; | |
1840 ++str; | |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1841 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1842 *p = '\0'; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1843 |
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
1844 result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, ERRORS_DECODE_ARG); |
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1845 |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1846 vim_free(tmp); |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1847 return result; |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1848 } |
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1849 |
3618 | 1850 void |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1851 do_py3eval(char_u *str, typval_T *rettv) |
3618 | 1852 { |
4486 | 1853 DoPyCommand((char *) str, |
1854 (rangeinitializer) init_range_eval, | |
1855 (runner) run_eval, | |
1856 (void *) rettv); | |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1857 if (rettv->v_type == VAR_UNKNOWN) |
3618 | 1858 { |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1859 rettv->v_type = VAR_NUMBER; |
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1860 rettv->vval.v_number = 0; |
3618 | 1861 } |
1862 } | |
1863 | |
6565 | 1864 int |
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1865 set_ref_in_python3(int copyID) |
3618 | 1866 { |
6569 | 1867 return set_ref_in_py(copyID); |
3618 | 1868 } |