Mercurial > vim
annotate src/if_py_both.h @ 19974:7b71d96d6582
Added tag v8.2.0542 for changeset 9f5758ee0b10d7bfd56d1f2ab4de234f2726c675
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 11 Apr 2020 18:45:04 +0200 |
| parents | 1f42c49c3d29 |
| children | aadd1cae2ff5 |
| rev | line source |
|---|---|
| 3618 | 1 /* vi:set ts=8 sts=4 sw=4 noet: |
|
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:
diff
changeset
|
2 * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
3 * VIM - Vi IMproved by Bram Moolenaar |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
4 * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
5 * Do ":help uganda" in Vim to read copying and usage conditions. |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
6 * Do ":help credits" in Vim to see a list of people who contributed. |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
7 * See README.txt for an overview of the Vim source code. |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
8 */ |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
9 /* |
| 4385 | 10 * Python extensions by Paul Moore, David Leonard, Roland Puntaier, Nikolay |
| 11 * Pavlov. | |
|
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:
diff
changeset
|
12 * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
13 * Common code for if_python.c and if_python3.c. |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
14 */ |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
15 |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
16 static char_u e_py_systemexit[] = "E880: Can't handle SystemExit of %s exception in vim"; |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
17 |
| 3734 | 18 #if PY_VERSION_HEX < 0x02050000 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
19 typedef int Py_ssize_t; // Python 2.4 and earlier don't have this type. |
| 3734 | 20 #endif |
| 21 | |
|
19019
75562beba71c
patch 8.2.0070: crash when using Python 3 with "debug" encoding
Bram Moolenaar <Bram@vim.org>
parents:
19015
diff
changeset
|
22 // Use values that are known to work, others may make Vim crash. |
|
75562beba71c
patch 8.2.0070: crash when using Python 3 with "debug" encoding
Bram Moolenaar <Bram@vim.org>
parents:
19015
diff
changeset
|
23 #define ENC_OPT (enc_utf8 ? "utf-8" : enc_dbcs ? "euc-jp" : (char *)p_enc) |
| 4435 | 24 #define DOPY_FUNC "_vim_pydo" |
| 2919 | 25 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
26 static const char *vim_special_path = "_vim_path_"; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
27 |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
28 #define PyErr_SET_STRING(exc, str) PyErr_SetString(exc, _(str)) |
| 4385 | 29 #define PyErr_SetVim(str) PyErr_SetString(VimError, str) |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
30 #define PyErr_SET_VIM(str) PyErr_SET_STRING(VimError, str) |
| 5608 | 31 #define PyErr_FORMAT(exc, str, arg) PyErr_Format(exc, _(str), arg) |
| 32 #define PyErr_FORMAT2(exc, str, arg1, arg2) PyErr_Format(exc, _(str), arg1,arg2) | |
| 33 #define PyErr_VIM_FORMAT(str, arg) PyErr_FORMAT(VimError, str, arg) | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
34 |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
35 #define Py_TYPE_NAME(obj) (obj->ob_type->tp_name == NULL \ |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
36 ? "(NULL)" \ |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
37 : obj->ob_type->tp_name) |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
38 |
|
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
39 #define RAISE_NO_EMPTY_KEYS PyErr_SET_STRING(PyExc_ValueError, \ |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
40 N_("empty keys are not allowed")) |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
41 #define RAISE_LOCKED_DICTIONARY PyErr_SET_VIM(N_("dictionary is locked")) |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
42 #define RAISE_LOCKED_LIST PyErr_SET_VIM(N_("list is locked")) |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
43 #define RAISE_UNDO_FAIL PyErr_SET_VIM(N_("cannot save undo information")) |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
44 #define RAISE_DELETE_LINE_FAIL PyErr_SET_VIM(N_("cannot delete line")) |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
45 #define RAISE_INSERT_LINE_FAIL PyErr_SET_VIM(N_("cannot insert line")) |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
46 #define RAISE_REPLACE_LINE_FAIL PyErr_SET_VIM(N_("cannot replace line")) |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
47 #define RAISE_KEY_ADD_FAIL(key) \ |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
48 PyErr_VIM_FORMAT(N_("failed to add key '%s' to dictionary"), key) |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
49 #define RAISE_INVALID_INDEX_TYPE(idx) \ |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
50 PyErr_FORMAT(PyExc_TypeError, N_("index must be int or slice, not %s"), \ |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
51 Py_TYPE_NAME(idx)); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
52 |
| 4385 | 53 #define INVALID_BUFFER_VALUE ((buf_T *)(-1)) |
| 54 #define INVALID_WINDOW_VALUE ((win_T *)(-1)) | |
| 4401 | 55 #define INVALID_TABPAGE_VALUE ((tabpage_T *)(-1)) |
| 4385 | 56 |
| 4486 | 57 typedef void (*rangeinitializer)(void *); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
58 typedef void (*runner)(const char *, void * |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
59 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
60 , PyGILState_STATE * |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
61 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
62 ); |
| 4486 | 63 |
| 4385 | 64 static int ConvertFromPyObject(PyObject *, typval_T *); |
| 65 static int _ConvertFromPyObject(PyObject *, typval_T *, PyObject *); | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
66 static int ConvertFromPyMapping(PyObject *, typval_T *); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
67 static int ConvertFromPySequence(PyObject *, typval_T *); |
| 4431 | 68 static PyObject *WindowNew(win_T *, tabpage_T *); |
| 69 static PyObject *BufferNew (buf_T *); | |
| 70 static PyObject *LineToString(const char *); | |
| 4385 | 71 |
| 72 static PyInt RangeStart; | |
| 73 static PyInt RangeEnd; | |
| 74 | |
| 4486 | 75 static PyObject *globals; |
| 76 | |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
77 static PyObject *py_chdir; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
78 static PyObject *py_fchdir; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
79 static PyObject *py_getcwd; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
80 static PyObject *vim_module; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
81 static PyObject *vim_special_path_object; |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
82 |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
83 #if PY_VERSION_HEX >= 0x030700f0 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
84 static PyObject *py_find_spec; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
85 #else |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
86 static PyObject *py_load_module; |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
87 #endif |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
88 static PyObject *py_find_module; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
89 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
90 static PyObject *VimError; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
91 |
|
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:
diff
changeset
|
92 /* |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
93 * obtain a lock on the Vim data structures |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
94 */ |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
95 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:
diff
changeset
|
96 Python_Lock_Vim(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:
diff
changeset
|
97 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
98 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
99 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
100 /* |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
101 * release a lock on the Vim data structures |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
102 */ |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
103 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:
diff
changeset
|
104 Python_Release_Vim(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:
diff
changeset
|
105 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
106 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
107 |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
108 /* |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
109 * The "todecref" argument holds a pointer to PyObject * that must be |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
110 * DECREF'ed after returned char_u * is no longer needed or NULL if all what |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
111 * was needed to generate returned value is object. |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
112 * |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
113 * Use Py_XDECREF to decrement reference count. |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
114 */ |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
115 static char_u * |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
116 StringToChars(PyObject *obj, PyObject **todecref) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
117 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
118 char_u *str; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
119 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
120 if (PyBytes_Check(obj)) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
121 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
122 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
123 if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
124 || str == NULL) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
125 return NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
126 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
127 *todecref = NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
128 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
129 else if (PyUnicode_Check(obj)) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
130 { |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
131 PyObject *bytes; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
132 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
133 if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL))) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
134 return NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
135 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
136 if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
137 || str == NULL) |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
138 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
139 Py_DECREF(bytes); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
140 return NULL; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
141 } |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
142 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
143 *todecref = bytes; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
144 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
145 else |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
146 { |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
147 #if PY_MAJOR_VERSION < 3 |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
148 PyErr_FORMAT(PyExc_TypeError, |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
149 N_("expected str() or unicode() instance, but got %s"), |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
150 Py_TYPE_NAME(obj)); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
151 #else |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
152 PyErr_FORMAT(PyExc_TypeError, |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
153 N_("expected bytes() or str() instance, but got %s"), |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
154 Py_TYPE_NAME(obj)); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
155 #endif |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
156 return NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
157 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
158 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
159 return (char_u *) str; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
160 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
161 |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
162 #define NUMBER_LONG 1 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
163 #define NUMBER_INT 2 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
164 #define NUMBER_NATURAL 4 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
165 #define NUMBER_UNSIGNED 8 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
166 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
167 static int |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
168 NumberToLong(PyObject *obj, long *result, int flags) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
169 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
170 #if PY_MAJOR_VERSION < 3 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
171 if (PyInt_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
172 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
173 *result = PyInt_AsLong(obj); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
174 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
175 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
176 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
177 else |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
178 #endif |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
179 if (PyLong_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
180 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
181 *result = PyLong_AsLong(obj); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
182 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
183 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
184 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
185 else if (PyNumber_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
186 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
187 PyObject *num; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
188 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
189 if (!(num = PyNumber_Long(obj))) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
190 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
191 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
192 *result = PyLong_AsLong(num); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
193 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
194 Py_DECREF(num); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
195 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
196 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
197 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
198 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
199 else |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
200 { |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
201 #if PY_MAJOR_VERSION < 3 |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
202 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
203 N_("expected int(), long() or something supporting " |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
204 "coercing to long(), but got %s"), |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
205 Py_TYPE_NAME(obj)); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
206 #else |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
207 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
208 N_("expected int() or something supporting coercing to int(), " |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
209 "but got %s"), |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
210 Py_TYPE_NAME(obj)); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
211 #endif |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
212 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
213 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
214 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
215 if (flags & NUMBER_INT) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
216 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
217 if (*result > INT_MAX) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
218 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
219 PyErr_SET_STRING(PyExc_OverflowError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
220 N_("value is too large to fit into C int type")); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
221 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
222 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
223 else if (*result < INT_MIN) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
224 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
225 PyErr_SET_STRING(PyExc_OverflowError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
226 N_("value is too small to fit into C int type")); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
227 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
228 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
229 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
230 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
231 if (flags & NUMBER_NATURAL) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
232 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
233 if (*result <= 0) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
234 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
235 PyErr_SET_STRING(PyExc_ValueError, |
| 5695 | 236 N_("number must be greater than zero")); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
237 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
238 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
239 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
240 else if (flags & NUMBER_UNSIGNED) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
241 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
242 if (*result < 0) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
243 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
244 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
245 N_("number must be greater or equal to zero")); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
246 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
247 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
248 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
249 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
250 return 0; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
251 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
252 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
253 static int |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
254 add_string(PyObject *list, char *s) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
255 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
256 PyObject *string; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
257 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
258 if (!(string = PyString_FromString(s))) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
259 return -1; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
260 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
261 if (PyList_Append(list, string)) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
262 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
263 Py_DECREF(string); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
264 return -1; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
265 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
266 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
267 Py_DECREF(string); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
268 return 0; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
269 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
270 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
271 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
272 ObjectDir(PyObject *self, char **attributes) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
273 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
274 PyMethodDef *method; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
275 char **attr; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
276 PyObject *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
277 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
278 if (!(ret = PyList_New(0))) |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
279 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
280 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
281 if (self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
282 for (method = self->ob_type->tp_methods ; method->ml_name != NULL ; ++method) |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
283 if (add_string(ret, (char *)method->ml_name)) |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
284 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
285 Py_DECREF(ret); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
286 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
287 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
288 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
289 for (attr = attributes ; *attr ; ++attr) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
290 if (add_string(ret, *attr)) |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
291 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
292 Py_DECREF(ret); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
293 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
294 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
295 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
296 #if PY_MAJOR_VERSION < 3 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
297 if (add_string(ret, "__members__")) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
298 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
299 Py_DECREF(ret); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
300 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
301 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
302 #endif |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
303 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
304 return ret; |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
305 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
306 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
307 // Output buffer management |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
308 |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
309 // Function to write a line, points to either msg() or emsg(). |
|
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:
diff
changeset
|
310 typedef void (*writefn)(char_u *); |
| 4385 | 311 |
| 312 static PyTypeObject OutputType; | |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
313 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
314 typedef struct |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
315 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
316 PyObject_HEAD |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
317 long softspace; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
318 long error; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
319 } OutputObject; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
320 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
321 static char *OutputAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
322 "softspace", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
323 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
324 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
325 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
326 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
327 OutputDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
328 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
329 return ObjectDir(self, OutputAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
330 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
331 |
| 3826 | 332 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
333 OutputSetattr(OutputObject *self, char *name, PyObject *valObject) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
334 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
335 if (valObject == NULL) |
| 3826 | 336 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
337 PyErr_SET_STRING(PyExc_AttributeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
338 N_("can't delete OutputObject attributes")); |
| 3826 | 339 return -1; |
| 340 } | |
| 341 | |
| 342 if (strcmp(name, "softspace") == 0) | |
| 343 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
344 if (NumberToLong(valObject, &(self->softspace), NUMBER_UNSIGNED)) |
| 3826 | 345 return -1; |
| 346 return 0; | |
| 347 } | |
| 348 | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
349 PyErr_FORMAT(PyExc_AttributeError, N_("invalid attribute: %s"), name); |
| 3826 | 350 return -1; |
| 351 } | |
| 352 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
353 // Buffer IO, we write one whole line at a time. |
| 4385 | 354 static garray_T io_ga = {0, 0, 1, 80, NULL}; |
| 355 static writefn old_fn = NULL; | |
| 356 | |
| 357 static void | |
| 358 PythonIO_Flush(void) | |
| 359 { | |
| 360 if (old_fn != NULL && io_ga.ga_len > 0) | |
| 361 { | |
| 362 ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL; | |
| 363 old_fn((char_u *)io_ga.ga_data); | |
| 364 } | |
| 365 io_ga.ga_len = 0; | |
| 366 } | |
| 367 | |
| 368 static void | |
| 369 writer(writefn fn, char_u *str, PyInt n) | |
| 370 { | |
| 371 char_u *ptr; | |
| 372 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
373 // Flush when switching output function. |
| 4385 | 374 if (fn != old_fn) |
| 375 PythonIO_Flush(); | |
| 376 old_fn = fn; | |
| 377 | |
|
18370
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
378 // Write each NL separated line. Text after the last NL is kept for |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
379 // writing later. |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
380 // For normal messages: Do not output when "got_int" was set. This avoids |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
381 // a loop gone crazy flooding the terminal with messages. Also for when |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
382 // "q" is pressed at the more-prompt. |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
383 while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
384 && (fn == (writefn)emsg || !got_int)) |
| 4385 | 385 { |
| 386 PyInt len = ptr - str; | |
| 387 | |
| 388 if (ga_grow(&io_ga, (int)(len + 1)) == FAIL) | |
| 389 break; | |
| 390 | |
| 391 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len); | |
| 392 ((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL; | |
| 393 fn((char_u *)io_ga.ga_data); | |
| 394 str = ptr + 1; | |
| 395 n -= len + 1; | |
| 396 io_ga.ga_len = 0; | |
| 397 } | |
| 398 | |
|
18370
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
399 // Put the remaining text into io_ga for later printing. |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
400 if (n > 0 && (fn == (writefn)emsg || !got_int) |
|
026034963159
patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output
Bram Moolenaar <Bram@vim.org>
parents:
17922
diff
changeset
|
401 && ga_grow(&io_ga, (int)(n + 1)) == OK) |
| 4385 | 402 { |
| 403 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n); | |
| 404 io_ga.ga_len += (int)n; | |
| 405 } | |
| 406 } | |
| 407 | |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
408 static int |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
409 write_output(OutputObject *self, PyObject *string) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
410 { |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
411 Py_ssize_t len = 0; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
412 char *str = NULL; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
413 int error = self->error; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
414 |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
415 if (!PyArg_Parse(string, "et#", ENC_OPT, &str, &len)) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
416 return -1; |
|
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:
diff
changeset
|
417 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
418 Py_BEGIN_ALLOW_THREADS |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
419 Python_Lock_Vim(); |
|
16688
e791f29affae
patch 8.1.1346: error for Python exception does not show useful info
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
420 if (error) |
|
e791f29affae
patch 8.1.1346: error for Python exception does not show useful info
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
421 emsg_severe = TRUE; |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15472
diff
changeset
|
422 writer((writefn)(error ? emsg : msg), (char_u *)str, len); |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
423 Python_Release_Vim(); |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
424 Py_END_ALLOW_THREADS |
| 2894 | 425 PyMem_Free(str); |
|
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:
diff
changeset
|
426 |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
427 return 0; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
428 } |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
429 |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
430 static PyObject * |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
431 OutputWrite(OutputObject *self, PyObject *string) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
432 { |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
433 if (write_output(self, string)) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
434 return NULL; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
435 |
|
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:
diff
changeset
|
436 Py_INCREF(Py_None); |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
437 return Py_None; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
438 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
439 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
440 static PyObject * |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
441 OutputWritelines(OutputObject *self, PyObject *seq) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
442 { |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
443 PyObject *iterator; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
444 PyObject *item; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
445 |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
446 if (!(iterator = PyObject_GetIter(seq))) |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
447 return NULL; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
448 |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
449 while ((item = PyIter_Next(iterator))) |
| 3618 | 450 { |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
451 if (write_output(self, item)) |
| 3618 | 452 { |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
453 Py_DECREF(iterator); |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
454 Py_DECREF(item); |
|
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:
diff
changeset
|
455 return NULL; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
456 } |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
457 Py_DECREF(item); |
|
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:
diff
changeset
|
458 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
459 |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
460 Py_DECREF(iterator); |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
461 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
462 // Iterator may have finished due to an exception |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
463 if (PyErr_Occurred()) |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
464 return NULL; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
465 |
|
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:
diff
changeset
|
466 Py_INCREF(Py_None); |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
467 return Py_None; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
468 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
469 |
| 2727 | 470 static PyObject * |
|
7191
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
471 AlwaysNone(PyObject *self UNUSED) |
| 2727 | 472 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
473 // do nothing |
| 2727 | 474 Py_INCREF(Py_None); |
| 475 return Py_None; | |
| 476 } | |
| 477 | |
|
7191
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
478 static PyObject * |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
479 AlwaysFalse(PyObject *self UNUSED) |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
480 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
481 // do nothing |
|
7202
de43f10a3850
commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66
Christian Brabandt <cb@256bit.org>
parents:
7191
diff
changeset
|
482 PyObject *ret = Py_False; |
|
de43f10a3850
commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66
Christian Brabandt <cb@256bit.org>
parents:
7191
diff
changeset
|
483 Py_INCREF(ret); |
|
de43f10a3850
commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66
Christian Brabandt <cb@256bit.org>
parents:
7191
diff
changeset
|
484 return ret; |
|
7191
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
485 } |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
486 |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
487 static PyObject * |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
488 AlwaysTrue(PyObject *self UNUSED) |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
489 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
490 // do nothing |
|
7202
de43f10a3850
commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66
Christian Brabandt <cb@256bit.org>
parents:
7191
diff
changeset
|
491 PyObject *ret = Py_True; |
|
de43f10a3850
commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66
Christian Brabandt <cb@256bit.org>
parents:
7191
diff
changeset
|
492 Py_INCREF(ret); |
|
de43f10a3850
commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66
Christian Brabandt <cb@256bit.org>
parents:
7191
diff
changeset
|
493 return ret; |
|
7191
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
494 } |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
495 |
|
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:
diff
changeset
|
496 /***************/ |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
497 |
| 4385 | 498 static struct PyMethodDef OutputMethods[] = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
499 // name, function, calling, doc |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
500 {"write", (PyCFunction)OutputWrite, METH_O, ""}, |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
501 {"writelines", (PyCFunction)OutputWritelines, METH_O, ""}, |
|
7191
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
502 {"flush", (PyCFunction)AlwaysNone, METH_NOARGS, ""}, |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
503 {"close", (PyCFunction)AlwaysNone, METH_NOARGS, ""}, |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
504 {"isatty", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
505 {"readable", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
506 {"seekable", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, |
|
692dac7183de
commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443
Christian Brabandt <cb@256bit.org>
parents:
6598
diff
changeset
|
507 {"writable", (PyCFunction)AlwaysTrue, METH_NOARGS, ""}, |
|
8967
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8921
diff
changeset
|
508 {"closed", (PyCFunction)AlwaysFalse, METH_NOARGS, ""}, |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
509 {"__dir__", (PyCFunction)OutputDir, METH_NOARGS, ""}, |
| 4492 | 510 { NULL, NULL, 0, NULL} |
| 4385 | 511 }; |
|
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:
diff
changeset
|
512 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
513 static OutputObject Output = |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
514 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
515 PyObject_HEAD_INIT(&OutputType) |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
516 0, |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
517 0 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
518 }; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
519 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
520 static OutputObject Error = |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
521 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
522 PyObject_HEAD_INIT(&OutputType) |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
523 0, |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
524 1 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
525 }; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
526 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
527 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:
diff
changeset
|
528 PythonIO_Init_io(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:
diff
changeset
|
529 { |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
530 if (PySys_SetObject("stdout", (PyObject *)(void *)&Output)) |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
531 return -1; |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
532 if (PySys_SetObject("stderr", (PyObject *)(void *)&Error)) |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
533 return -1; |
|
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:
diff
changeset
|
534 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
535 if (PyErr_Occurred()) |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
536 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
537 emsg(_("E264: Python: Error initialising I/O objects")); |
|
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:
diff
changeset
|
538 return -1; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
539 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
540 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
541 return 0; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
542 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
543 |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
544 #if PY_VERSION_HEX < 0x030700f0 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
545 static PyObject *call_load_module(char *name, int len, PyObject *find_module_result); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
546 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
547 typedef struct |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
548 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
549 PyObject_HEAD |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
550 char *fullname; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
551 PyObject *result; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
552 } LoaderObject; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
553 static PyTypeObject LoaderType; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
554 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
555 static void |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
556 LoaderDestructor(LoaderObject *self) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
557 { |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
558 vim_free(self->fullname); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
559 Py_XDECREF(self->result); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
560 DESTRUCTOR_FINISH(self); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
561 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
562 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
563 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
564 LoaderLoadModule(LoaderObject *self, PyObject *args UNUSED) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
565 { |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
566 char *fullname = self->fullname; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
567 PyObject *result = self->result; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
568 PyObject *module; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
569 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
570 if (!fullname) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
571 { |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
572 module = result ? result : Py_None; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
573 Py_INCREF(module); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
574 return module; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
575 } |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
576 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
577 module = call_load_module(fullname, (int)STRLEN(fullname), result); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
578 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
579 self->fullname = NULL; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
580 self->result = module; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
581 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
582 vim_free(fullname); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
583 Py_DECREF(result); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
584 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
585 if (!module) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
586 { |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
587 if (PyErr_Occurred()) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
588 return NULL; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
589 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
590 Py_INCREF(Py_None); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
591 return Py_None; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
592 } |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
593 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
594 Py_INCREF(module); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
595 return module; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
596 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
597 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
598 static struct PyMethodDef LoaderMethods[] = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
599 // name, function, calling, doc |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
600 {"load_module", (PyCFunction)LoaderLoadModule, METH_VARARGS, ""}, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
601 { NULL, NULL, 0, NULL} |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
602 }; |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
603 #endif |
|
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:
diff
changeset
|
604 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
605 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
606 * Check to see whether a Vim error has been reported, or a keyboard |
|
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:
diff
changeset
|
607 * interrupt has been detected. |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
608 */ |
| 4498 | 609 static void |
| 610 VimTryStart(void) | |
| 611 { | |
| 612 ++trylevel; | |
| 613 } | |
| 614 | |
|
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:
diff
changeset
|
615 static int |
| 4498 | 616 VimTryEnd(void) |
| 617 { | |
| 618 --trylevel; | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
619 // Without this it stops processing all subsequent Vim script commands and |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
620 // generates strange error messages if I e.g. try calling Test() in a cycle |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
621 did_emsg = FALSE; |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
622 // Keyboard interrupt should be preferred over anything else |
| 4498 | 623 if (got_int) |
| 624 { | |
| 5629 | 625 if (did_throw) |
| 5469 | 626 discard_current_exception(); |
| 627 got_int = FALSE; | |
| 4498 | 628 PyErr_SetNone(PyExc_KeyboardInterrupt); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
629 return -1; |
| 4498 | 630 } |
| 5517 | 631 else if (msg_list != NULL && *msg_list != NULL) |
| 632 { | |
| 633 int should_free; | |
|
15472
0fcc1315c061
patch 8.1.0744: compiler warnings for signed/unsigned strings
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
634 char *msg; |
| 5517 | 635 |
| 636 msg = get_exception_string(*msg_list, ET_ERROR, NULL, &should_free); | |
| 637 | |
| 638 if (msg == NULL) | |
| 639 { | |
| 640 PyErr_NoMemory(); | |
| 641 return -1; | |
| 642 } | |
| 643 | |
|
15472
0fcc1315c061
patch 8.1.0744: compiler warnings for signed/unsigned strings
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
644 PyErr_SetVim(msg); |
| 5517 | 645 |
| 646 free_global_msglist(); | |
| 647 | |
| 648 if (should_free) | |
| 649 vim_free(msg); | |
| 650 | |
| 651 return -1; | |
| 652 } | |
| 4498 | 653 else if (!did_throw) |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
654 return (PyErr_Occurred() ? -1 : 0); |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
655 // Python exception is preferred over vim one; unlikely to occur though |
| 4498 | 656 else if (PyErr_Occurred()) |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
657 { |
| 5629 | 658 discard_current_exception(); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
659 return -1; |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
660 } |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
661 // Finally transform Vim script exception to python one |
| 4498 | 662 else |
| 663 { | |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
664 PyErr_SetVim((char *)current_exception->value); |
| 4498 | 665 discard_current_exception(); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
666 return -1; |
| 4498 | 667 } |
| 668 } | |
| 669 | |
| 670 static int | |
| 671 VimCheckInterrupt(void) | |
|
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:
diff
changeset
|
672 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
673 if (got_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:
diff
changeset
|
674 { |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
675 PyErr_SetNone(PyExc_KeyboardInterrupt); |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
676 return 1; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
677 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
678 return 0; |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
679 } |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
680 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
681 // Vim module - Implementation |
| 4385 | 682 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
683 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
684 VimCommand(PyObject *self UNUSED, PyObject *string) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
685 { |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
686 char_u *cmd; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
687 PyObject *ret; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
688 PyObject *todecref; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
689 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
690 if (!(cmd = StringToChars(string, &todecref))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
691 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
692 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
693 Py_BEGIN_ALLOW_THREADS |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
694 Python_Lock_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
695 |
| 4498 | 696 VimTryStart(); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
697 do_cmdline_cmd(cmd); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
698 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
699 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
700 Python_Release_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
701 Py_END_ALLOW_THREADS |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
702 |
| 4498 | 703 if (VimTryEnd()) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
704 ret = NULL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
705 else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
706 ret = Py_None; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
707 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
708 Py_XINCREF(ret); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
709 Py_XDECREF(todecref); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
710 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
711 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
712 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
713 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
714 * Function to translate a typval_T into a PyObject; this will recursively |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
715 * translate lists/dictionaries into their Python equivalents. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
716 * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
717 * The depth parameter is to avoid infinite recursion, set it to 1 when |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
718 * you call VimToPython. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
719 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
720 static PyObject * |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
721 VimToPython(typval_T *our_tv, int depth, PyObject *lookup_dict) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
722 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
723 PyObject *ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
724 PyObject *newObj; |
| 3618 | 725 char ptrBuf[sizeof(void *) * 2 + 3]; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
726 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
727 // Avoid infinite recursion |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
728 if (depth > 100) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
729 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
730 Py_INCREF(Py_None); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
731 ret = Py_None; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
732 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
733 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
734 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
735 // Check if we run into a recursive loop. The item must be in lookup_dict |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
736 // then and we can use it again. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
737 if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
738 || (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
739 { |
| 3618 | 740 sprintf(ptrBuf, "%p", |
| 741 our_tv->v_type == VAR_LIST ? (void *)our_tv->vval.v_list | |
| 742 : (void *)our_tv->vval.v_dict); | |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
743 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
744 if ((ret = PyDict_GetItemString(lookup_dict, ptrBuf))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
745 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
746 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
747 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
748 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
749 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
750 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
751 if (our_tv->v_type == VAR_STRING) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
752 ret = PyString_FromString(our_tv->vval.v_string == NULL |
| 3852 | 753 ? "" : (char *)our_tv->vval.v_string); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
754 else if (our_tv->v_type == VAR_NUMBER) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
755 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
756 char buf[NUMBUFLEN]; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
757 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
758 // For backwards compatibility numbers are stored as strings. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
759 sprintf(buf, "%ld", (long)our_tv->vval.v_number); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
760 ret = PyString_FromString((char *)buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
761 } |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
762 #ifdef FEAT_FLOAT |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
763 else if (our_tv->v_type == VAR_FLOAT) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
764 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
765 char buf[NUMBUFLEN]; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
766 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
767 sprintf(buf, "%f", our_tv->vval.v_float); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
768 ret = PyString_FromString((char *)buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
769 } |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
770 #endif |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
771 else if (our_tv->v_type == VAR_LIST) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
772 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
773 list_T *list = our_tv->vval.v_list; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
774 listitem_T *curr; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
775 |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
776 if (list == NULL) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
777 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
778 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
779 if (!(ret = PyList_New(0))) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
780 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
781 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
782 if (PyDict_SetItemString(lookup_dict, ptrBuf, ret)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
783 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
784 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
785 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
786 } |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
787 |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
788 range_list_materialize(list); |
|
19888
435726a03481
patch 8.2.0500: using the same loop in many places
Bram Moolenaar <Bram@vim.org>
parents:
19229
diff
changeset
|
789 FOR_ALL_LIST_ITEMS(list, curr) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
790 { |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
791 if (!(newObj = VimToPython(&curr->li_tv, depth + 1, lookup_dict))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
792 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
793 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
794 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
795 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
796 if (PyList_Append(ret, newObj)) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
797 { |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
798 Py_DECREF(newObj); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
799 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
800 return NULL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
801 } |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
802 Py_DECREF(newObj); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
803 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
804 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
805 else if (our_tv->v_type == VAR_DICT) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
806 { |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
807 |
| 6598 | 808 hashtab_T *ht; |
| 809 long_u todo; | |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
810 hashitem_T *hi; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
811 dictitem_T *di; |
| 6598 | 812 |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
813 if (our_tv->vval.v_dict == NULL) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
814 return NULL; |
| 6598 | 815 ht = &our_tv->vval.v_dict->dv_hashtab; |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
816 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
817 if (!(ret = PyDict_New())) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
818 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
819 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
820 if (PyDict_SetItemString(lookup_dict, ptrBuf, ret)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
821 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
822 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
823 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
824 } |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
825 |
| 6598 | 826 todo = ht->ht_used; |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
827 for (hi = ht->ht_array; todo > 0; ++hi) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
828 { |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
829 if (!HASHITEM_EMPTY(hi)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
830 { |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
831 --todo; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
832 |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
833 di = dict_lookup(hi); |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
834 if (!(newObj = VimToPython(&di->di_tv, depth + 1, lookup_dict))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
835 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
836 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
837 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
838 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
839 if (PyDict_SetItemString(ret, (char *)hi->hi_key, newObj)) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
840 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
841 Py_DECREF(ret); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
842 Py_DECREF(newObj); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
843 return NULL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
844 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
845 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
846 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
847 } |
|
19102
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
848 else if (our_tv->v_type == VAR_BOOL) |
|
7712
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
849 { |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
850 if (our_tv->vval.v_number == VVAL_FALSE) |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
851 { |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
852 ret = Py_False; |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
853 Py_INCREF(ret); |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
854 } |
|
19102
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
855 else |
|
7712
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
856 { |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
857 ret = Py_True; |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
858 Py_INCREF(ret); |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
859 } |
|
19102
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
860 return ret; |
|
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
861 } |
|
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
862 else if (our_tv->v_type == VAR_SPECIAL) |
|
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
863 { |
|
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
864 Py_INCREF(Py_None); |
|
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
865 ret = Py_None; |
|
7712
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
866 return ret; |
|
bce3b5ddb393
commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34
Christian Brabandt <cb@256bit.org>
parents:
7660
diff
changeset
|
867 } |
|
15454
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
868 else if (our_tv->v_type == VAR_BLOB) |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
869 ret = PyBytes_FromStringAndSize( |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
870 (char*) our_tv->vval.v_blob->bv_ga.ga_data, |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
871 (Py_ssize_t) our_tv->vval.v_blob->bv_ga.ga_len); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
872 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
873 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
874 Py_INCREF(Py_None); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
875 ret = Py_None; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
876 } |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
877 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
878 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
879 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
880 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
881 static PyObject * |
| 4500 | 882 VimEval(PyObject *self UNUSED, PyObject *args) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
883 { |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
884 char_u *expr; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
885 typval_T *our_tv; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
886 PyObject *string; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
887 PyObject *todecref; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
888 PyObject *ret; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
889 PyObject *lookup_dict; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
890 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
891 if (!PyArg_ParseTuple(args, "O", &string)) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
892 return NULL; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
893 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
894 if (!(expr = StringToChars(string, &todecref))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
895 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
896 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
897 Py_BEGIN_ALLOW_THREADS |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
898 Python_Lock_Vim(); |
| 4498 | 899 VimTryStart(); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
900 our_tv = eval_expr(expr, NULL); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
901 Python_Release_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
902 Py_END_ALLOW_THREADS |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
903 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
904 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
905 |
| 4498 | 906 if (VimTryEnd()) |
| 907 return NULL; | |
| 908 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
909 if (our_tv == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
910 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
911 PyErr_SET_VIM(N_("invalid expression")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
912 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
913 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
914 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
915 // Convert the Vim type into a Python type. Create a dictionary that's |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
916 // used to check for recursive loops. |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
917 if (!(lookup_dict = PyDict_New())) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
918 ret = NULL; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
919 else |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
920 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
921 ret = VimToPython(our_tv, 1, lookup_dict); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
922 Py_DECREF(lookup_dict); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
923 } |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
924 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
925 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
926 Py_BEGIN_ALLOW_THREADS |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
927 Python_Lock_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
928 free_tv(our_tv); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
929 Python_Release_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
930 Py_END_ALLOW_THREADS |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
931 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
932 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
933 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
934 |
| 3618 | 935 static PyObject *ConvertToPyObject(typval_T *); |
| 936 | |
| 937 static PyObject * | |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
938 VimEvalPy(PyObject *self UNUSED, PyObject *string) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
939 { |
| 3618 | 940 typval_T *our_tv; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
941 PyObject *ret; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
942 char_u *expr; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
943 PyObject *todecref; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
944 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
945 if (!(expr = StringToChars(string, &todecref))) |
| 3618 | 946 return NULL; |
| 947 | |
| 948 Py_BEGIN_ALLOW_THREADS | |
| 949 Python_Lock_Vim(); | |
| 4498 | 950 VimTryStart(); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
951 our_tv = eval_expr(expr, NULL); |
| 3618 | 952 Python_Release_Vim(); |
| 953 Py_END_ALLOW_THREADS | |
| 954 | |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
955 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
956 |
| 4498 | 957 if (VimTryEnd()) |
| 958 return NULL; | |
| 959 | |
| 3618 | 960 if (our_tv == NULL) |
| 961 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
962 PyErr_SET_VIM(N_("invalid expression")); |
| 3618 | 963 return NULL; |
| 964 } | |
| 965 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
966 ret = ConvertToPyObject(our_tv); |
| 3618 | 967 Py_BEGIN_ALLOW_THREADS |
| 968 Python_Lock_Vim(); | |
| 969 free_tv(our_tv); | |
| 970 Python_Release_Vim(); | |
| 971 Py_END_ALLOW_THREADS | |
| 972 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
973 return ret; |
| 3618 | 974 } |
| 975 | |
| 976 static PyObject * | |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
977 VimStrwidth(PyObject *self UNUSED, PyObject *string) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
978 { |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
979 char_u *str; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
980 PyObject *todecref; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
981 int len; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
982 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
983 if (!(str = StringToChars(string, &todecref))) |
| 3618 | 984 return NULL; |
| 985 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
986 len = mb_string2cells(str, (int)STRLEN(str)); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
987 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
988 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
989 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
990 return PyLong_FromLong(len); |
| 3618 | 991 } |
| 992 | |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
993 static PyObject * |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
994 _VimChdir(PyObject *_chdir, PyObject *args, PyObject *kwargs) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
995 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
996 PyObject *ret; |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
997 PyObject *newwd; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
998 PyObject *todecref; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
999 char_u *new_dir; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1000 |
|
4754
be1e4acb30ca
updated for version 7.3.1124
Bram Moolenaar <bram@vim.org>
parents:
4722
diff
changeset
|
1001 if (_chdir == NULL) |
|
be1e4acb30ca
updated for version 7.3.1124
Bram Moolenaar <bram@vim.org>
parents:
4722
diff
changeset
|
1002 return NULL; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1003 if (!(ret = PyObject_Call(_chdir, args, kwargs))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1004 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1005 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1006 if (!(newwd = PyObject_CallFunctionObjArgs(py_getcwd, NULL))) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1007 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1008 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1009 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1010 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1011 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1012 if (!(new_dir = StringToChars(newwd, &todecref))) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1013 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1014 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1015 Py_DECREF(newwd); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1016 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1017 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1018 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1019 VimTryStart(); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1020 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1021 if (vim_chdir(new_dir)) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1022 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1023 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1024 Py_DECREF(newwd); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1025 Py_XDECREF(todecref); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1026 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1027 if (VimTryEnd()) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1028 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1029 |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1030 PyErr_SET_VIM(N_("failed to change directory")); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1031 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1032 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1033 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1034 Py_DECREF(newwd); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1035 Py_XDECREF(todecref); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1036 |
|
16576
bcc343175103
patch 8.1.1291: not easy to change directory and restore
Bram Moolenaar <Bram@vim.org>
parents:
16427
diff
changeset
|
1037 post_chdir(CDSCOPE_GLOBAL); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1038 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1039 if (VimTryEnd()) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1040 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1041 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1042 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1043 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1044 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1045 return ret; |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1046 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1047 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1048 static PyObject * |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1049 VimChdir(PyObject *self UNUSED, PyObject *args, PyObject *kwargs) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1050 { |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1051 return _VimChdir(py_chdir, args, kwargs); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1052 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1053 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1054 static PyObject * |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1055 VimFchdir(PyObject *self UNUSED, PyObject *args, PyObject *kwargs) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1056 { |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1057 return _VimChdir(py_fchdir, args, kwargs); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1058 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
1059 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1060 typedef struct { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1061 PyObject *callable; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1062 PyObject *result; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1063 } map_rtp_data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1064 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1065 static void |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1066 map_rtp_callback(char_u *path, void *_data) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1067 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1068 void **data = (void **) _data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1069 PyObject *pathObject; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1070 map_rtp_data *mr_data = *((map_rtp_data **) data); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1071 |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
1072 if (!(pathObject = PyString_FromString((char *)path))) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1073 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1074 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1075 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1076 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1077 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1078 mr_data->result = PyObject_CallFunctionObjArgs(mr_data->callable, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1079 pathObject, NULL); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1080 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1081 Py_DECREF(pathObject); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1082 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1083 if (!mr_data->result || mr_data->result != Py_None) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1084 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1085 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1086 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1087 Py_DECREF(mr_data->result); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1088 mr_data->result = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1089 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1090 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1091 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1092 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1093 VimForeachRTP(PyObject *self UNUSED, PyObject *callable) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1094 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1095 map_rtp_data data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1096 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1097 data.callable = callable; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1098 data.result = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1099 |
|
8524
2f57bbe870ea
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Christian Brabandt <cb@256bit.org>
parents:
7949
diff
changeset
|
1100 do_in_runtimepath(NULL, 0, &map_rtp_callback, &data); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1101 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1102 if (data.result == NULL) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1103 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1104 if (PyErr_Occurred()) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1105 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1106 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1107 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1108 Py_INCREF(Py_None); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1109 return Py_None; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1110 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1111 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1112 return data.result; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1113 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1114 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1115 /* |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1116 * _vim_runtimepath_ special path implementation. |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1117 */ |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1118 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1119 static void |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1120 map_finder_callback(char_u *path, void *_data) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1121 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1122 void **data = (void **) _data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1123 PyObject *list = *((PyObject **) data); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1124 PyObject *pathObject1, *pathObject2; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1125 char *pathbuf; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1126 size_t pathlen; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1127 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1128 pathlen = STRLEN(path); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1129 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1130 #if PY_MAJOR_VERSION < 3 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1131 # define PY_MAIN_DIR_STRING "python2" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1132 #else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1133 # define PY_MAIN_DIR_STRING "python3" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1134 #endif |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1135 #define PY_ALTERNATE_DIR_STRING "pythonx" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1136 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1137 #define PYTHONX_STRING_LENGTH 7 // STRLEN("pythonx") |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1138 if (!(pathbuf = PyMem_New(char, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1139 pathlen + STRLEN(PATHSEPSTR) + PYTHONX_STRING_LENGTH + 1))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1140 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1141 PyErr_NoMemory(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1142 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1143 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1144 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1145 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1146 mch_memmove(pathbuf, path, pathlen + 1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1147 add_pathsep((char_u *) pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1148 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1149 pathlen = STRLEN(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1150 mch_memmove(pathbuf + pathlen, PY_MAIN_DIR_STRING, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1151 PYTHONX_STRING_LENGTH + 1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1152 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1153 if (!(pathObject1 = PyString_FromString(pathbuf))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1154 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1155 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1156 PyMem_Free(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1157 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1158 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1159 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1160 mch_memmove(pathbuf + pathlen, PY_ALTERNATE_DIR_STRING, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1161 PYTHONX_STRING_LENGTH + 1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1162 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1163 if (!(pathObject2 = PyString_FromString(pathbuf))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1164 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1165 Py_DECREF(pathObject1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1166 PyMem_Free(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1167 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1168 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1169 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1170 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1171 PyMem_Free(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1172 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1173 if (PyList_Append(list, pathObject1) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1174 || PyList_Append(list, pathObject2)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1175 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1176 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1177 Py_DECREF(pathObject1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1178 Py_DECREF(pathObject2); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1179 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1180 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1181 static PyObject * |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1182 Vim_GetPaths(PyObject *self UNUSED) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1183 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1184 PyObject *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1185 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1186 if (!(ret = PyList_New(0))) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1187 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1188 |
|
8524
2f57bbe870ea
commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f
Christian Brabandt <cb@256bit.org>
parents:
7949
diff
changeset
|
1189 do_in_runtimepath(NULL, 0, &map_finder_callback, ret); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1190 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1191 if (PyErr_Occurred()) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1192 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1193 Py_DECREF(ret); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1194 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1195 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1196 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1197 return ret; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1198 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1199 |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1200 #if PY_VERSION_HEX >= 0x030700f0 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1201 static PyObject * |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1202 FinderFindSpec(PyObject *self, PyObject *args) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1203 { |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1204 char *fullname; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1205 PyObject *paths; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1206 PyObject *target = Py_None; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1207 PyObject *spec; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1208 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1209 if (!PyArg_ParseTuple(args, "s|O", &fullname, &target)) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1210 return NULL; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1211 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1212 if (!(paths = Vim_GetPaths(self))) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1213 return NULL; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1214 |
|
16140
ab815ed87969
patch 8.1.1075: function reference count wrong in Python code
Bram Moolenaar <Bram@vim.org>
parents:
16080
diff
changeset
|
1215 spec = PyObject_CallFunction(py_find_spec, "sOO", fullname, paths, target); |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1216 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1217 Py_DECREF(paths); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1218 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1219 if (!spec) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1220 { |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1221 if (PyErr_Occurred()) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1222 return NULL; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1223 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1224 Py_INCREF(Py_None); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1225 return Py_None; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1226 } |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1227 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1228 return spec; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1229 } |
|
16718
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1230 |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1231 static PyObject * |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1232 FinderFindModule(PyObject* self UNUSED, PyObject* args UNUSED) |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1233 { |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1234 // Apparently returning None works. |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1235 Py_INCREF(Py_None); |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1236 return Py_None; |
|
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1237 } |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1238 #else |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1239 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1240 call_load_module(char *name, int len, PyObject *find_module_result) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1241 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1242 PyObject *fd, *pathname, *description; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1243 |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1244 if (!PyTuple_Check(find_module_result)) |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1245 { |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1246 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1247 N_("expected 3-tuple as imp.find_module() result, but got %s"), |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1248 Py_TYPE_NAME(find_module_result)); |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1249 return NULL; |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1250 } |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1251 if (PyTuple_GET_SIZE(find_module_result) != 3) |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1252 { |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1253 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1254 N_("expected 3-tuple as imp.find_module() result, but got " |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1255 "tuple of size %d"), |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1256 (int) PyTuple_GET_SIZE(find_module_result)); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1257 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1258 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1259 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1260 if (!(fd = PyTuple_GET_ITEM(find_module_result, 0)) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1261 || !(pathname = PyTuple_GET_ITEM(find_module_result, 1)) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1262 || !(description = PyTuple_GET_ITEM(find_module_result, 2))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1263 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
1264 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1265 N_("internal error: imp.find_module returned tuple with NULL")); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1266 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1267 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1268 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1269 return PyObject_CallFunction(py_load_module, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1270 "s#OOO", name, len, fd, pathname, description); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1271 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1272 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1273 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1274 find_module(char *fullname, char *tail, PyObject *new_path) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1275 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1276 PyObject *find_module_result; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1277 PyObject *module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1278 char *dot; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1279 |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
1280 if ((dot = (char *)vim_strchr((char_u *) tail, '.'))) |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1281 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1282 /* |
|
4859
e48cabe98453
updated for version 7.3.1176
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
1283 * There is a dot in the name: call find_module recursively without the |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1284 * first component |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1285 */ |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1286 PyObject *newest_path; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1287 int partlen = (int) (dot - 1 - tail); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1288 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1289 if (!(find_module_result = PyObject_CallFunction(py_find_module, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1290 "s#O", tail, partlen, new_path))) |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1291 { |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1292 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_ImportError)) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1293 PyErr_Clear(); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1294 return NULL; |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1295 } |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1296 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1297 if (!(module = call_load_module( |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1298 fullname, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1299 ((int) (tail - fullname)) + partlen, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1300 find_module_result))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1301 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1302 Py_DECREF(find_module_result); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1303 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1304 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1305 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1306 Py_DECREF(find_module_result); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1307 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1308 if (!(newest_path = PyObject_GetAttrString(module, "__path__"))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1309 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1310 Py_DECREF(module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1311 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1312 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1313 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1314 Py_DECREF(module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1315 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1316 find_module_result = find_module(fullname, dot + 1, newest_path); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1317 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1318 Py_DECREF(newest_path); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1319 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1320 return find_module_result; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1321 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1322 else |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1323 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1324 if (!(find_module_result = PyObject_CallFunction(py_find_module, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1325 "sO", tail, new_path))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1326 { |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1327 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_ImportError)) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1328 PyErr_Clear(); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1329 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1330 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1331 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1332 return find_module_result; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1333 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1334 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1335 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1336 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1337 FinderFindModule(PyObject *self, PyObject *args) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1338 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1339 char *fullname; |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1340 PyObject *result; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1341 PyObject *new_path; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1342 LoaderObject *loader; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1343 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1344 if (!PyArg_ParseTuple(args, "s", &fullname)) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1345 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1346 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1347 if (!(new_path = Vim_GetPaths(self))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1348 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1349 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1350 result = find_module(fullname, fullname, new_path); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1351 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1352 Py_DECREF(new_path); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1353 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1354 if (!result) |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1355 { |
|
4984
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1356 if (PyErr_Occurred()) |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1357 return NULL; |
|
4984
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1358 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1359 Py_INCREF(Py_None); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1360 return Py_None; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1361 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1362 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1363 if (!(fullname = (char *)vim_strsave((char_u *)fullname))) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1364 { |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1365 Py_DECREF(result); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1366 PyErr_NoMemory(); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1367 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1368 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1369 |
|
14467
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1370 if (!(loader = PyObject_NEW(LoaderObject, &LoaderType))) |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1371 { |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1372 vim_free(fullname); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1373 Py_DECREF(result); |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1374 return NULL; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1375 } |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1376 |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1377 loader->fullname = fullname; |
|
16cccc953909
patch 8.1.0247: Python: error message for failing import is incorrect
Christian Brabandt <cb@256bit.org>
parents:
14395
diff
changeset
|
1378 loader->result = result; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1379 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1380 return (PyObject *) loader; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1381 } |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1382 #endif |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1383 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1384 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1385 VimPathHook(PyObject *self UNUSED, PyObject *args) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1386 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1387 char *path; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1388 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1389 if (PyArg_ParseTuple(args, "s", &path) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1390 && STRCMP(path, vim_special_path) == 0) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1391 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1392 Py_INCREF(vim_module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1393 return vim_module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1394 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1395 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1396 PyErr_Clear(); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1397 PyErr_SetNone(PyExc_ImportError); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1398 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1399 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1400 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1401 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1402 * Vim module - Definitions |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1403 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1404 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1405 static struct PyMethodDef VimMethods[] = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1406 // name, function, calling, documentation |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1407 {"command", VimCommand, METH_O, "Execute a Vim ex-mode command" }, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1408 {"eval", VimEval, METH_VARARGS, "Evaluate an expression using Vim evaluator" }, |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1409 {"bindeval", VimEvalPy, METH_O, "Like eval(), but returns objects attached to vim ones"}, |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1410 {"strwidth", VimStrwidth, METH_O, "Screen string width, counts <Tab> as having width 1"}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1411 {"chdir", (PyCFunction)VimChdir, METH_VARARGS|METH_KEYWORDS, "Change directory"}, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1412 {"fchdir", (PyCFunction)VimFchdir, METH_VARARGS|METH_KEYWORDS, "Change directory"}, |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1413 {"foreach_rtp", VimForeachRTP, METH_O, "Call given callable for each path in &rtp"}, |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1414 #if PY_VERSION_HEX >= 0x030700f0 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
1415 {"find_spec", FinderFindSpec, METH_VARARGS, "Internal use only, returns spec object for any input it receives"}, |
|
16718
9aa87f5aab55
patch 8.1.1361: Python setuptools don't work with Python 3
Bram Moolenaar <Bram@vim.org>
parents:
16688
diff
changeset
|
1416 #endif |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1417 {"find_module", FinderFindModule, METH_VARARGS, "Internal use only, returns loader object for any input it receives"}, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1418 {"path_hook", VimPathHook, METH_VARARGS, "Hook function to install in sys.path_hooks"}, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1419 {"_get_paths", (PyCFunction)Vim_GetPaths, METH_NOARGS, "Get &rtp-based additions to sys.path"}, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1420 { NULL, NULL, 0, NULL} |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1421 }; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1422 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1423 /* |
| 4397 | 1424 * Generic iterator object |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1425 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1426 |
| 4397 | 1427 static PyTypeObject IterType; |
| 1428 | |
| 1429 typedef PyObject *(*nextfun)(void **); | |
| 1430 typedef void (*destructorfun)(void *); | |
| 4433 | 1431 typedef int (*traversefun)(void *, visitproc, void *); |
| 1432 typedef int (*clearfun)(void **); | |
| 4397 | 1433 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1434 // Main purpose of this object is removing the need for do python |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1435 // initialization (i.e. PyType_Ready and setting type attributes) for a big |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1436 // bunch of objects. |
| 4319 | 1437 typedef struct |
| 1438 { | |
| 1439 PyObject_HEAD | |
| 4397 | 1440 void *cur; |
| 1441 nextfun next; | |
| 1442 destructorfun destruct; | |
| 4433 | 1443 traversefun traverse; |
| 1444 clearfun clear; | |
| 4397 | 1445 } IterObject; |
| 1446 | |
| 1447 static PyObject * | |
| 4433 | 1448 IterNew(void *start, destructorfun destruct, nextfun next, traversefun traverse, |
| 1449 clearfun clear) | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1450 { |
| 4397 | 1451 IterObject *self; |
| 1452 | |
| 4500 | 1453 self = PyObject_GC_New(IterObject, &IterType); |
| 4397 | 1454 self->cur = start; |
| 1455 self->next = next; | |
| 1456 self->destruct = destruct; | |
| 4433 | 1457 self->traverse = traverse; |
| 1458 self->clear = clear; | |
| 4397 | 1459 |
| 1460 return (PyObject *)(self); | |
| 1461 } | |
| 1462 | |
| 1463 static void | |
| 4488 | 1464 IterDestructor(IterObject *self) |
| 4397 | 1465 { |
| 4500 | 1466 PyObject_GC_UnTrack((void *)(self)); |
| 4488 | 1467 self->destruct(self->cur); |
| 4500 | 1468 PyObject_GC_Del((void *)(self)); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1469 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1470 |
| 4433 | 1471 static int |
| 4488 | 1472 IterTraverse(IterObject *self, visitproc visit, void *arg) |
| 4433 | 1473 { |
| 4488 | 1474 if (self->traverse != NULL) |
| 1475 return self->traverse(self->cur, visit, arg); | |
| 4433 | 1476 else |
| 1477 return 0; | |
| 1478 } | |
| 1479 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1480 // Mac OSX defines clear() somewhere. |
| 4438 | 1481 #ifdef clear |
| 1482 # undef clear | |
| 1483 #endif | |
| 1484 | |
| 4433 | 1485 static int |
| 4488 | 1486 IterClear(IterObject *self) |
| 4433 | 1487 { |
| 4488 | 1488 if (self->clear != NULL) |
| 1489 return self->clear(&self->cur); | |
| 4433 | 1490 else |
| 1491 return 0; | |
| 1492 } | |
| 1493 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1494 static PyObject * |
| 4488 | 1495 IterNext(IterObject *self) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1496 { |
| 4488 | 1497 return self->next(&self->cur); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1498 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1499 |
| 4397 | 1500 static PyObject * |
| 1501 IterIter(PyObject *self) | |
| 1502 { | |
|
4609
12421d8a45d5
updated for version 7.3.1052
Bram Moolenaar <bram@vim.org>
parents:
4607
diff
changeset
|
1503 Py_INCREF(self); |
| 4397 | 1504 return self; |
| 1505 } | |
| 4393 | 1506 |
| 3618 | 1507 typedef struct pylinkedlist_S { |
| 1508 struct pylinkedlist_S *pll_next; | |
| 1509 struct pylinkedlist_S *pll_prev; | |
| 1510 PyObject *pll_obj; | |
| 1511 } pylinkedlist_T; | |
| 1512 | |
| 1513 static pylinkedlist_T *lastdict = NULL; | |
| 1514 static pylinkedlist_T *lastlist = NULL; | |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
1515 static pylinkedlist_T *lastfunc = NULL; |
| 3618 | 1516 |
| 1517 static void | |
| 1518 pyll_remove(pylinkedlist_T *ref, pylinkedlist_T **last) | |
| 1519 { | |
| 1520 if (ref->pll_prev == NULL) | |
| 1521 { | |
| 1522 if (ref->pll_next == NULL) | |
| 1523 { | |
| 1524 *last = NULL; | |
| 1525 return; | |
| 1526 } | |
| 1527 } | |
| 1528 else | |
| 1529 ref->pll_prev->pll_next = ref->pll_next; | |
| 1530 | |
| 1531 if (ref->pll_next == NULL) | |
| 1532 *last = ref->pll_prev; | |
| 1533 else | |
| 1534 ref->pll_next->pll_prev = ref->pll_prev; | |
| 1535 } | |
| 1536 | |
| 1537 static void | |
| 1538 pyll_add(PyObject *self, pylinkedlist_T *ref, pylinkedlist_T **last) | |
| 1539 { | |
| 1540 if (*last == NULL) | |
| 1541 ref->pll_prev = NULL; | |
| 1542 else | |
| 1543 { | |
| 1544 (*last)->pll_next = ref; | |
| 1545 ref->pll_prev = *last; | |
| 1546 } | |
| 1547 ref->pll_next = NULL; | |
| 1548 ref->pll_obj = self; | |
| 1549 *last = ref; | |
| 1550 } | |
| 1551 | |
| 1552 static PyTypeObject DictionaryType; | |
| 1553 | |
| 1554 typedef struct | |
| 1555 { | |
| 1556 PyObject_HEAD | |
| 1557 dict_T *dict; | |
| 1558 pylinkedlist_T ref; | |
| 1559 } DictionaryObject; | |
| 1560 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1561 static PyObject *DictionaryUpdate(DictionaryObject *, PyObject *, PyObject *); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1562 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1563 #define NEW_DICTIONARY(dict) DictionaryNew(&DictionaryType, dict) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1564 |
| 3618 | 1565 static PyObject * |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1566 DictionaryNew(PyTypeObject *subtype, dict_T *dict) |
| 3618 | 1567 { |
| 1568 DictionaryObject *self; | |
| 1569 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1570 self = (DictionaryObject *) subtype->tp_alloc(subtype, 0); |
| 3618 | 1571 if (self == NULL) |
| 1572 return NULL; | |
| 1573 self->dict = dict; | |
| 1574 ++dict->dv_refcount; | |
| 1575 | |
| 1576 pyll_add((PyObject *)(self), &self->ref, &lastdict); | |
| 1577 | |
| 1578 return (PyObject *)(self); | |
| 1579 } | |
| 1580 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1581 static dict_T * |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
1582 py_dict_alloc(void) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1583 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1584 dict_T *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1585 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1586 if (!(ret = dict_alloc())) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1587 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1588 PyErr_NoMemory(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1589 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1590 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1591 ++ret->dv_refcount; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1592 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1593 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1594 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1595 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1596 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1597 DictionaryConstructor(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1598 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1599 DictionaryObject *self; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1600 dict_T *dict; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1601 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1602 if (!(dict = py_dict_alloc())) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1603 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1604 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1605 self = (DictionaryObject *) DictionaryNew(subtype, dict); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1606 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1607 --dict->dv_refcount; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1608 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1609 if (kwargs || PyTuple_Size(args)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1610 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1611 PyObject *tmp; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1612 if (!(tmp = DictionaryUpdate(self, args, kwargs))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1613 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1614 Py_DECREF(self); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1615 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1616 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1617 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1618 Py_DECREF(tmp); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1619 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1620 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1621 return (PyObject *)(self); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1622 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1623 |
| 4319 | 1624 static void |
| 4488 | 1625 DictionaryDestructor(DictionaryObject *self) |
| 4319 | 1626 { |
| 4488 | 1627 pyll_remove(&self->ref, &lastdict); |
| 1628 dict_unref(self->dict); | |
| 4319 | 1629 |
| 1630 DESTRUCTOR_FINISH(self); | |
| 1631 } | |
| 1632 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1633 static char *DictionaryAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1634 "locked", "scope", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1635 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1636 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1637 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1638 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1639 DictionaryDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1640 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1641 return ObjectDir(self, DictionaryAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1642 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1643 |
| 3618 | 1644 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1645 DictionarySetattr(DictionaryObject *self, char *name, PyObject *valObject) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1646 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1647 if (valObject == NULL) |
| 3828 | 1648 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
1649 PyErr_SET_STRING(PyExc_AttributeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1650 N_("cannot delete vim.Dictionary attributes")); |
| 3828 | 1651 return -1; |
| 1652 } | |
| 1653 | |
| 1654 if (strcmp(name, "locked") == 0) | |
| 1655 { | |
| 4488 | 1656 if (self->dict->dv_lock == VAR_FIXED) |
| 3828 | 1657 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1658 PyErr_SET_STRING(PyExc_TypeError, |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1659 N_("cannot modify fixed dictionary")); |
| 3828 | 1660 return -1; |
| 1661 } | |
| 1662 else | |
| 1663 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1664 int istrue = PyObject_IsTrue(valObject); |
| 4411 | 1665 if (istrue == -1) |
| 1666 return -1; | |
| 1667 else if (istrue) | |
| 4488 | 1668 self->dict->dv_lock = VAR_LOCKED; |
| 3828 | 1669 else |
| 4488 | 1670 self->dict->dv_lock = 0; |
| 3828 | 1671 } |
| 1672 return 0; | |
| 1673 } | |
| 1674 else | |
| 1675 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1676 PyErr_FORMAT(PyExc_AttributeError, N_("cannot set attribute %s"), name); |
| 3828 | 1677 return -1; |
| 1678 } | |
| 1679 } | |
| 1680 | |
| 1681 static PyInt | |
| 4488 | 1682 DictionaryLength(DictionaryObject *self) |
| 3618 | 1683 { |
| 4488 | 1684 return ((PyInt) (self->dict->dv_hashtab.ht_used)); |
| 3618 | 1685 } |
| 1686 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1687 #define DICT_FLAG_HAS_DEFAULT 0x01 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1688 #define DICT_FLAG_POP 0x02 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1689 #define DICT_FLAG_NONE_DEFAULT 0x04 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
1690 #define DICT_FLAG_RETURN_BOOL 0x08 // Incompatible with DICT_FLAG_POP |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1691 #define DICT_FLAG_RETURN_PAIR 0x10 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1692 |
| 3618 | 1693 static PyObject * |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1694 _DictionaryItem(DictionaryObject *self, PyObject *args, int flags) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1695 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1696 PyObject *keyObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1697 PyObject *defObject = ((flags & DICT_FLAG_NONE_DEFAULT)? Py_None : NULL); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1698 PyObject *ret; |
| 3618 | 1699 char_u *key; |
| 3792 | 1700 dictitem_T *di; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1701 dict_T *dict = self->dict; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1702 hashitem_T *hi; |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1703 PyObject *todecref; |
| 3618 | 1704 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1705 if (flags & DICT_FLAG_HAS_DEFAULT) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1706 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1707 if (!PyArg_ParseTuple(args, "O|O", &keyObject, &defObject)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1708 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1709 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1710 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1711 keyObject = args; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1712 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1713 if (flags & DICT_FLAG_RETURN_BOOL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1714 defObject = Py_False; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1715 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1716 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1717 return NULL; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1718 |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1719 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1720 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1721 RAISE_NO_EMPTY_KEYS; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
1722 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1723 return NULL; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1724 } |
| 3792 | 1725 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1726 hi = hash_find(&dict->dv_hashtab, key); |
| 3792 | 1727 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1728 Py_XDECREF(todecref); |
| 3824 | 1729 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1730 if (HASHITEM_EMPTY(hi)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1731 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1732 if (defObject) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1733 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1734 Py_INCREF(defObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1735 return defObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1736 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1737 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1738 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1739 PyErr_SetObject(PyExc_KeyError, keyObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1740 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1741 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1742 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1743 else if (flags & DICT_FLAG_RETURN_BOOL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1744 { |
| 5666 | 1745 ret = Py_True; |
| 1746 Py_INCREF(ret); | |
| 1747 return ret; | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1748 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1749 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1750 di = dict_lookup(hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1751 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1752 if (!(ret = ConvertToPyObject(&di->di_tv))) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1753 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1754 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1755 if (flags & DICT_FLAG_POP) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1756 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1757 if (dict->dv_lock) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1758 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1759 RAISE_LOCKED_DICTIONARY; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1760 Py_DECREF(ret); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1761 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1762 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1763 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1764 hash_remove(&dict->dv_hashtab, hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1765 dictitem_free(di); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1766 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1767 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1768 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1769 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1770 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1771 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1772 DictionaryItem(DictionaryObject *self, PyObject *keyObject) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1773 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1774 return _DictionaryItem(self, keyObject, 0); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1775 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1776 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1777 static int |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1778 DictionaryContains(DictionaryObject *self, PyObject *keyObject) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1779 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1780 PyObject *rObj = _DictionaryItem(self, keyObject, DICT_FLAG_RETURN_BOOL); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1781 int ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1782 |
| 5426 | 1783 if (rObj == NULL) |
| 1784 return -1; | |
| 1785 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1786 ret = (rObj == Py_True); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1787 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
1788 Py_DECREF(rObj); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1789 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1790 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1791 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1792 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1793 typedef struct |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1794 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1795 hashitem_T *ht_array; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1796 long_u ht_used; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1797 hashtab_T *ht; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1798 hashitem_T *hi; |
|
4667
9e7ef781d494
updated for version 7.3.1081
Bram Moolenaar <bram@vim.org>
parents:
4659
diff
changeset
|
1799 long_u todo; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1800 } dictiterinfo_T; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1801 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1802 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1803 DictionaryIterNext(dictiterinfo_T **dii) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1804 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1805 PyObject *ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1806 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1807 if (!(*dii)->todo) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1808 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1809 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1810 if ((*dii)->ht->ht_array != (*dii)->ht_array || |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1811 (*dii)->ht->ht_used != (*dii)->ht_used) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1812 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
1813 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1814 N_("hashtab changed during iteration")); |
| 3792 | 1815 return NULL; |
| 1816 } | |
| 3618 | 1817 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1818 while (((*dii)->todo) && HASHITEM_EMPTY((*dii)->hi)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1819 ++((*dii)->hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1820 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1821 --((*dii)->todo); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1822 |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
1823 if (!(ret = PyBytes_FromString((char *)(*dii)->hi->hi_key))) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1824 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1825 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1826 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1827 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1828 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1829 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1830 DictionaryIter(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1831 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1832 dictiterinfo_T *dii; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1833 hashtab_T *ht; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1834 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1835 if (!(dii = PyMem_New(dictiterinfo_T, 1))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1836 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1837 PyErr_NoMemory(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1838 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1839 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1840 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1841 ht = &self->dict->dv_hashtab; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1842 dii->ht_array = ht->ht_array; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1843 dii->ht_used = ht->ht_used; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1844 dii->ht = ht; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1845 dii->hi = dii->ht_array; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1846 dii->todo = dii->ht_used; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1847 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1848 return IterNew(dii, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1849 (destructorfun) PyMem_Free, (nextfun) DictionaryIterNext, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1850 NULL, NULL); |
| 3618 | 1851 } |
| 1852 | |
| 1853 static PyInt | |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
1854 DictionaryAssItem( |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
1855 DictionaryObject *self, PyObject *keyObject, PyObject *valObject) |
| 3618 | 1856 { |
| 1857 char_u *key; | |
| 1858 typval_T tv; | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1859 dict_T *dict = self->dict; |
| 3618 | 1860 dictitem_T *di; |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1861 PyObject *todecref; |
| 3618 | 1862 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1863 if (dict->dv_lock) |
| 3618 | 1864 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1865 RAISE_LOCKED_DICTIONARY; |
| 3618 | 1866 return -1; |
| 1867 } | |
| 1868 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1869 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1870 return -1; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
1871 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1872 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1873 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1874 RAISE_NO_EMPTY_KEYS; |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1875 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1876 return -1; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1877 } |
| 3618 | 1878 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1879 di = dict_find(dict, key, -1); |
| 3618 | 1880 |
| 1881 if (valObject == NULL) | |
| 1882 { | |
| 3636 | 1883 hashitem_T *hi; |
| 1884 | |
| 3618 | 1885 if (di == NULL) |
| 1886 { | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1887 Py_XDECREF(todecref); |
| 4403 | 1888 PyErr_SetObject(PyExc_KeyError, keyObject); |
| 3618 | 1889 return -1; |
| 1890 } | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1891 hi = hash_find(&dict->dv_hashtab, di->di_key); |
|
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1892 hash_remove(&dict->dv_hashtab, hi); |
| 3618 | 1893 dictitem_free(di); |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1894 Py_XDECREF(todecref); |
| 3618 | 1895 return 0; |
| 1896 } | |
| 1897 | |
| 1898 if (ConvertFromPyObject(valObject, &tv) == -1) | |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1899 { |
|
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1900 Py_XDECREF(todecref); |
| 3618 | 1901 return -1; |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1902 } |
| 3618 | 1903 |
| 1904 if (di == NULL) | |
| 1905 { | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1906 if (!(di = dictitem_alloc(key))) |
| 3618 | 1907 { |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1908 Py_XDECREF(todecref); |
| 3618 | 1909 PyErr_NoMemory(); |
| 1910 return -1; | |
| 1911 } | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1912 di->di_tv.v_type = VAR_UNKNOWN; |
| 3618 | 1913 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1914 if (dict_add(dict, di) == FAIL) |
| 3618 | 1915 { |
| 1916 vim_free(di); | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1917 dictitem_free(di); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1918 RAISE_KEY_ADD_FAIL(key); |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1919 Py_XDECREF(todecref); |
| 3618 | 1920 return -1; |
| 1921 } | |
| 1922 } | |
| 1923 else | |
| 1924 clear_tv(&di->di_tv); | |
| 1925 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1926 Py_XDECREF(todecref); |
| 3618 | 1927 |
| 1928 copy_tv(&tv, &di->di_tv); | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
1929 clear_tv(&tv); |
| 3618 | 1930 return 0; |
| 1931 } | |
| 1932 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1933 typedef PyObject *(*hi_to_py)(hashitem_T *); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1934 |
| 3618 | 1935 static PyObject * |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1936 DictionaryListObjects(DictionaryObject *self, hi_to_py hiconvert) |
| 3618 | 1937 { |
| 4488 | 1938 dict_T *dict = self->dict; |
| 3618 | 1939 long_u todo = dict->dv_hashtab.ht_used; |
| 1940 Py_ssize_t i = 0; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1941 PyObject *ret; |
| 3618 | 1942 hashitem_T *hi; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1943 PyObject *newObj; |
| 3618 | 1944 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1945 ret = PyList_New(todo); |
| 3618 | 1946 for (hi = dict->dv_hashtab.ht_array; todo > 0; ++hi) |
| 1947 { | |
| 1948 if (!HASHITEM_EMPTY(hi)) | |
| 1949 { | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1950 if (!(newObj = hiconvert(hi))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1951 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1952 Py_DECREF(ret); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1953 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1954 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1955 PyList_SET_ITEM(ret, i, newObj); |
| 3618 | 1956 --todo; |
| 1957 ++i; | |
| 1958 } | |
| 1959 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1960 return ret; |
| 3618 | 1961 } |
| 1962 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1963 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1964 dict_key(hashitem_T *hi) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1965 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1966 return PyBytes_FromString((char *)(hi->hi_key)); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1967 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1968 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1969 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1970 DictionaryListKeys(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1971 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1972 return DictionaryListObjects(self, dict_key); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1973 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1974 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1975 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1976 dict_val(hashitem_T *hi) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1977 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1978 dictitem_T *di; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1979 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1980 di = dict_lookup(hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1981 return ConvertToPyObject(&di->di_tv); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1982 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1983 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1984 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1985 DictionaryListValues(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1986 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1987 return DictionaryListObjects(self, dict_val); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1988 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1989 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1990 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1991 dict_item(hashitem_T *hi) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1992 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1993 PyObject *keyObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1994 PyObject *valObject; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1995 PyObject *ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1996 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1997 if (!(keyObject = dict_key(hi))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1998 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1999 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2000 if (!(valObject = dict_val(hi))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2001 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2002 Py_DECREF(keyObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2003 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2004 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2005 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2006 ret = Py_BuildValue("(OO)", keyObject, valObject); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2007 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2008 Py_DECREF(keyObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2009 Py_DECREF(valObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2010 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2011 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2012 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2013 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2014 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2015 DictionaryListItems(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2016 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2017 return DictionaryListObjects(self, dict_item); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2018 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2019 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2020 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2021 DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2022 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2023 dict_T *dict = self->dict; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2024 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2025 if (dict->dv_lock) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2026 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2027 RAISE_LOCKED_DICTIONARY; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2028 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2029 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2030 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2031 if (kwargs) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2032 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2033 typval_T tv; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2034 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2035 if (ConvertFromPyMapping(kwargs, &tv) == -1) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2036 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2037 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2038 VimTryStart(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2039 dict_extend(self->dict, tv.vval.v_dict, (char_u *) "force"); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2040 clear_tv(&tv); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2041 if (VimTryEnd()) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2042 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2043 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2044 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2045 { |
| 5659 | 2046 PyObject *obj = NULL; |
| 2047 | |
| 2048 if (!PyArg_ParseTuple(args, "|O", &obj)) | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2049 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2050 |
| 5659 | 2051 if (obj == NULL) |
| 2052 { | |
| 2053 Py_INCREF(Py_None); | |
| 2054 return Py_None; | |
| 2055 } | |
| 2056 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2057 if (PyObject_HasAttrString(obj, "keys")) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2058 return DictionaryUpdate(self, NULL, obj); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2059 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2060 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2061 PyObject *iterator; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2062 PyObject *item; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2063 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2064 if (!(iterator = PyObject_GetIter(obj))) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2065 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2066 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2067 while ((item = PyIter_Next(iterator))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2068 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2069 PyObject *fast; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2070 PyObject *keyObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2071 PyObject *valObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2072 PyObject *todecref; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2073 char_u *key; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2074 dictitem_T *di; |
|
12812
381e67ccf02c
patch 8.0.1283: test 86 fails under ASAN
Christian Brabandt <cb@256bit.org>
parents:
12806
diff
changeset
|
2075 hashitem_T *hi; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2076 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2077 if (!(fast = PySequence_Fast(item, ""))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2078 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2079 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2080 Py_DECREF(item); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2081 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2082 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2083 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2084 Py_DECREF(item); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2085 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2086 if (PySequence_Fast_GET_SIZE(fast) != 2) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2087 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2088 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2089 Py_DECREF(fast); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2090 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2091 N_("expected sequence element of size 2, " |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2092 "but got sequence of size %d"), |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
2093 (int) PySequence_Fast_GET_SIZE(fast)); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2094 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2095 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2096 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2097 keyObject = PySequence_Fast_GET_ITEM(fast, 0); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2098 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2099 if (!(key = StringToChars(keyObject, &todecref))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2100 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2101 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2102 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2103 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2104 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2105 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2106 di = dictitem_alloc(key); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2107 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2108 Py_XDECREF(todecref); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2109 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2110 if (di == NULL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2111 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2112 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2113 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2114 PyErr_NoMemory(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2115 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2116 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2117 di->di_tv.v_type = VAR_UNKNOWN; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2118 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2119 valObject = PySequence_Fast_GET_ITEM(fast, 1); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2120 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2121 if (ConvertFromPyObject(valObject, &di->di_tv) == -1) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2122 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2123 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2124 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2125 dictitem_free(di); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2126 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2127 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2128 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2129 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2130 |
|
12812
381e67ccf02c
patch 8.0.1283: test 86 fails under ASAN
Christian Brabandt <cb@256bit.org>
parents:
12806
diff
changeset
|
2131 hi = hash_find(&dict->dv_hashtab, di->di_key); |
|
381e67ccf02c
patch 8.0.1283: test 86 fails under ASAN
Christian Brabandt <cb@256bit.org>
parents:
12806
diff
changeset
|
2132 if (!HASHITEM_EMPTY(hi) || dict_add(dict, di) == FAIL) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2133 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2134 RAISE_KEY_ADD_FAIL(di->di_key); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2135 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2136 dictitem_free(di); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2137 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2138 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2139 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2140 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2141 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2142 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2143 // Iterator may have finished due to an exception |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2144 if (PyErr_Occurred()) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2145 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2146 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2147 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2148 Py_INCREF(Py_None); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2149 return Py_None; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2150 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2151 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2152 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2153 DictionaryGet(DictionaryObject *self, PyObject *args) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2154 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2155 return _DictionaryItem(self, args, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2156 DICT_FLAG_HAS_DEFAULT|DICT_FLAG_NONE_DEFAULT); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2157 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2158 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2159 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2160 DictionaryPop(DictionaryObject *self, PyObject *args) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2161 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2162 return _DictionaryItem(self, args, DICT_FLAG_HAS_DEFAULT|DICT_FLAG_POP); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2163 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2164 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2165 static PyObject * |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2166 DictionaryPopItem(DictionaryObject *self) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2167 { |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2168 hashitem_T *hi; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2169 PyObject *ret; |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2170 PyObject *valObject; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2171 dictitem_T *di; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2172 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2173 if (self->dict->dv_hashtab.ht_used == 0) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2174 { |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2175 PyErr_SetNone(PyExc_KeyError); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2176 return NULL; |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2177 } |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2178 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2179 hi = self->dict->dv_hashtab.ht_array; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2180 while (HASHITEM_EMPTY(hi)) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2181 ++hi; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2182 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2183 di = dict_lookup(hi); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2184 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2185 if (!(valObject = ConvertToPyObject(&di->di_tv))) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2186 return NULL; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2187 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2188 if (!(ret = Py_BuildValue("(" Py_bytes_fmt "O)", hi->hi_key, valObject))) |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2189 { |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2190 Py_DECREF(valObject); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2191 return NULL; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2192 } |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2193 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2194 hash_remove(&self->dict->dv_hashtab, hi); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2195 dictitem_free(di); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2196 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2197 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2198 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2199 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2200 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2201 DictionaryHasKey(DictionaryObject *self, PyObject *keyObject) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2202 { |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2203 return _DictionaryItem(self, keyObject, DICT_FLAG_RETURN_BOOL); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2204 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2205 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2206 static PySequenceMethods DictionaryAsSeq = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2207 0, // sq_length |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2208 0, // sq_concat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2209 0, // sq_repeat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2210 0, // sq_item |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2211 0, // sq_slice |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2212 0, // sq_ass_item |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2213 0, // sq_ass_slice |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2214 (objobjproc) DictionaryContains, // sq_contains |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2215 0, // sq_inplace_concat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2216 0, // sq_inplace_repeat |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2217 }; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2218 |
| 4385 | 2219 static PyMappingMethods DictionaryAsMapping = { |
| 2220 (lenfunc) DictionaryLength, | |
| 2221 (binaryfunc) DictionaryItem, | |
| 2222 (objobjargproc) DictionaryAssItem, | |
| 2223 }; | |
| 2224 | |
| 3618 | 2225 static struct PyMethodDef DictionaryMethods[] = { |
| 4492 | 2226 {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""}, |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2227 {"values", (PyCFunction)DictionaryListValues, METH_NOARGS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2228 {"items", (PyCFunction)DictionaryListItems, METH_NOARGS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2229 {"update", (PyCFunction)DictionaryUpdate, METH_VARARGS|METH_KEYWORDS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2230 {"get", (PyCFunction)DictionaryGet, METH_VARARGS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2231 {"pop", (PyCFunction)DictionaryPop, METH_VARARGS, ""}, |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2232 {"popitem", (PyCFunction)DictionaryPopItem, METH_NOARGS, ""}, |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2233 {"has_key", (PyCFunction)DictionaryHasKey, METH_O, ""}, |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2234 {"__dir__", (PyCFunction)DictionaryDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2235 { NULL, NULL, 0, NULL} |
| 3618 | 2236 }; |
| 2237 | |
| 2238 static PyTypeObject ListType; | |
| 2239 | |
| 2240 typedef struct | |
| 2241 { | |
| 2242 PyObject_HEAD | |
| 2243 list_T *list; | |
| 2244 pylinkedlist_T ref; | |
| 2245 } ListObject; | |
| 2246 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2247 #define NEW_LIST(list) ListNew(&ListType, list) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2248 |
| 3618 | 2249 static PyObject * |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2250 ListNew(PyTypeObject *subtype, list_T *list) |
| 3618 | 2251 { |
| 2252 ListObject *self; | |
| 2253 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2254 self = (ListObject *) subtype->tp_alloc(subtype, 0); |
| 3618 | 2255 if (self == NULL) |
| 2256 return NULL; | |
| 2257 self->list = list; | |
| 2258 ++list->lv_refcount; | |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
2259 range_list_materialize(list); |
| 3618 | 2260 |
| 2261 pyll_add((PyObject *)(self), &self->ref, &lastlist); | |
| 2262 | |
| 2263 return (PyObject *)(self); | |
| 2264 } | |
| 2265 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2266 static list_T * |
|
5166
467efeee8f9e
updated for version 7.4a.009
Bram Moolenaar <bram@vim.org>
parents:
5139
diff
changeset
|
2267 py_list_alloc(void) |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2268 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2269 list_T *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2270 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2271 if (!(ret = list_alloc())) |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2272 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2273 PyErr_NoMemory(); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2274 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2275 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2276 ++ret->lv_refcount; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2277 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2278 return ret; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2279 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2280 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2281 static int |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2282 list_py_concat(list_T *l, PyObject *obj, PyObject *lookup_dict) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2283 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2284 PyObject *iterator; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2285 PyObject *item; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2286 listitem_T *li; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2287 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2288 if (!(iterator = PyObject_GetIter(obj))) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2289 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2290 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2291 while ((item = PyIter_Next(iterator))) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2292 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2293 if (!(li = listitem_alloc())) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2294 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2295 PyErr_NoMemory(); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2296 Py_DECREF(item); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2297 Py_DECREF(iterator); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2298 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2299 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2300 li->li_tv.v_lock = 0; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2301 li->li_tv.v_type = VAR_UNKNOWN; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2302 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2303 if (_ConvertFromPyObject(item, &li->li_tv, lookup_dict) == -1) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2304 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2305 Py_DECREF(item); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2306 Py_DECREF(iterator); |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
2307 listitem_free(l, li); |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2308 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2309 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2310 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2311 Py_DECREF(item); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2312 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2313 list_append(l, li); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2314 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2315 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2316 Py_DECREF(iterator); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2317 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2318 // Iterator may have finished due to an exception |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2319 if (PyErr_Occurred()) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2320 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2321 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2322 return 0; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2323 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2324 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2325 static PyObject * |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2326 ListConstructor(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2327 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2328 list_T *list; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2329 PyObject *obj = NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2330 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2331 if (kwargs) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2332 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
2333 PyErr_SET_STRING(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2334 N_("list constructor does not accept keyword arguments")); |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2335 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2336 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2337 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2338 if (!PyArg_ParseTuple(args, "|O", &obj)) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2339 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2340 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2341 if (!(list = py_list_alloc())) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2342 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2343 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2344 if (obj) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2345 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2346 PyObject *lookup_dict; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2347 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2348 if (!(lookup_dict = PyDict_New())) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2349 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2350 list_unref(list); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2351 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2352 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2353 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2354 if (list_py_concat(list, obj, lookup_dict) == -1) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2355 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2356 Py_DECREF(lookup_dict); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2357 list_unref(list); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2358 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2359 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2360 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2361 Py_DECREF(lookup_dict); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2362 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2363 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2364 return ListNew(subtype, list); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2365 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2366 |
| 4319 | 2367 static void |
| 4488 | 2368 ListDestructor(ListObject *self) |
| 4319 | 2369 { |
| 4488 | 2370 pyll_remove(&self->ref, &lastlist); |
| 2371 list_unref(self->list); | |
| 4319 | 2372 |
| 2373 DESTRUCTOR_FINISH(self); | |
| 2374 } | |
| 2375 | |
| 3618 | 2376 static PyInt |
| 4488 | 2377 ListLength(ListObject *self) |
| 3618 | 2378 { |
| 4488 | 2379 return ((PyInt) (self->list->lv_len)); |
| 3618 | 2380 } |
| 2381 | |
| 2382 static PyObject * | |
| 5608 | 2383 ListIndex(ListObject *self, Py_ssize_t index) |
| 3618 | 2384 { |
| 2385 listitem_T *li; | |
| 2386 | |
| 4488 | 2387 if (index >= ListLength(self)) |
| 3618 | 2388 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2389 PyErr_SET_STRING(PyExc_IndexError, N_("list index out of range")); |
| 3618 | 2390 return NULL; |
| 2391 } | |
| 4488 | 2392 li = list_find(self->list, (long) index); |
| 3618 | 2393 if (li == NULL) |
| 2394 { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2395 // No more suitable format specifications in python-2.3 |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2396 PyErr_VIM_FORMAT(N_("internal error: failed to get vim list item %d"), |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2397 (int) index); |
| 3618 | 2398 return NULL; |
| 2399 } | |
| 2400 return ConvertToPyObject(&li->li_tv); | |
| 2401 } | |
| 2402 | |
| 2403 static PyObject * | |
| 5608 | 2404 ListSlice(ListObject *self, Py_ssize_t first, Py_ssize_t step, |
| 2405 Py_ssize_t slicelen) | |
| 3618 | 2406 { |
| 2407 PyInt i; | |
| 2408 PyObject *list; | |
| 5608 | 2409 |
| 2410 if (step == 0) | |
| 2411 { | |
| 2412 PyErr_SET_STRING(PyExc_ValueError, N_("slice step cannot be zero")); | |
| 2413 return NULL; | |
| 2414 } | |
| 2415 | |
| 2416 list = PyList_New(slicelen); | |
| 3618 | 2417 if (list == NULL) |
| 2418 return NULL; | |
| 2419 | |
| 5608 | 2420 for (i = 0; i < slicelen; ++i) |
| 2421 { | |
| 2422 PyObject *item; | |
| 2423 | |
| 2424 item = ListIndex(self, first + i*step); | |
| 3618 | 2425 if (item == NULL) |
| 2426 { | |
| 2427 Py_DECREF(list); | |
| 2428 return NULL; | |
| 2429 } | |
| 2430 | |
| 5608 | 2431 PyList_SET_ITEM(list, i, item); |
| 3618 | 2432 } |
| 2433 | |
| 2434 return list; | |
| 2435 } | |
| 2436 | |
| 5608 | 2437 static PyObject * |
| 2438 ListItem(ListObject *self, PyObject* idx) | |
| 2439 { | |
| 2440 #if PY_MAJOR_VERSION < 3 | |
| 2441 if (PyInt_Check(idx)) | |
| 2442 { | |
| 2443 long _idx = PyInt_AsLong(idx); | |
| 2444 return ListIndex(self, _idx); | |
| 2445 } | |
| 2446 else | |
| 2447 #endif | |
| 2448 if (PyLong_Check(idx)) | |
| 2449 { | |
| 2450 long _idx = PyLong_AsLong(idx); | |
| 2451 return ListIndex(self, _idx); | |
| 2452 } | |
| 2453 else if (PySlice_Check(idx)) | |
| 2454 { | |
| 2455 Py_ssize_t start, stop, step, slicelen; | |
| 2456 | |
| 5768 | 2457 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, ListLength(self), |
| 5608 | 2458 &start, &stop, &step, &slicelen) < 0) |
| 2459 return NULL; | |
| 2460 return ListSlice(self, start, step, slicelen); | |
| 2461 } | |
| 2462 else | |
| 2463 { | |
| 2464 RAISE_INVALID_INDEX_TYPE(idx); | |
| 2465 return NULL; | |
| 2466 } | |
| 2467 } | |
| 2468 | |
| 2469 static void | |
| 2470 list_restore(Py_ssize_t numadded, Py_ssize_t numreplaced, Py_ssize_t slicelen, | |
| 2471 list_T *l, listitem_T **lis, listitem_T *lastaddedli) | |
| 2472 { | |
| 2473 while (numreplaced--) | |
| 2474 { | |
| 2475 list_insert(l, lis[numreplaced], lis[slicelen + numreplaced]); | |
| 2476 listitem_remove(l, lis[slicelen + numreplaced]); | |
| 2477 } | |
| 2478 while (numadded--) | |
| 2479 { | |
| 2480 listitem_T *next; | |
| 2481 | |
| 2482 next = lastaddedli->li_prev; | |
| 2483 listitem_remove(l, lastaddedli); | |
| 2484 lastaddedli = next; | |
| 2485 } | |
| 2486 } | |
| 2487 | |
| 2488 static int | |
| 2489 ListAssSlice(ListObject *self, Py_ssize_t first, | |
| 2490 Py_ssize_t step, Py_ssize_t slicelen, PyObject *obj) | |
| 2491 { | |
| 2492 PyObject *iterator; | |
| 2493 PyObject *item; | |
| 2494 listitem_T *li; | |
| 2495 listitem_T *lastaddedli = NULL; | |
| 2496 listitem_T *next; | |
| 2497 typval_T v; | |
| 2498 list_T *l = self->list; | |
| 2499 PyInt i; | |
| 2500 PyInt j; | |
| 2501 PyInt numreplaced = 0; | |
| 2502 PyInt numadded = 0; | |
| 2503 PyInt size; | |
| 5655 | 2504 listitem_T **lis = NULL; |
| 5608 | 2505 |
| 2506 size = ListLength(self); | |
| 2507 | |
| 2508 if (l->lv_lock) | |
| 2509 { | |
| 2510 RAISE_LOCKED_LIST; | |
| 2511 return -1; | |
| 2512 } | |
| 2513 | |
| 2514 if (step == 0) | |
| 2515 { | |
| 2516 PyErr_SET_STRING(PyExc_ValueError, N_("slice step cannot be zero")); | |
| 2517 return -1; | |
| 2518 } | |
| 2519 | |
| 2520 if (step != 1 && slicelen == 0) | |
| 2521 { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2522 // Nothing to do. Only error out if obj has some items. |
| 5608 | 2523 int ret = 0; |
| 2524 | |
| 2525 if (obj == NULL) | |
| 2526 return 0; | |
| 2527 | |
| 2528 if (!(iterator = PyObject_GetIter(obj))) | |
| 2529 return -1; | |
| 2530 | |
| 2531 if ((item = PyIter_Next(iterator))) | |
| 2532 { | |
| 2533 PyErr_FORMAT(PyExc_ValueError, | |
| 5695 | 2534 N_("attempt to assign sequence of size greater than %d " |
| 5608 | 2535 "to extended slice"), 0); |
| 2536 Py_DECREF(item); | |
| 2537 ret = -1; | |
| 2538 } | |
| 2539 Py_DECREF(iterator); | |
| 2540 return ret; | |
| 2541 } | |
| 2542 | |
| 2543 if (obj != NULL) | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2544 // XXX May allocate zero bytes. |
| 5608 | 2545 if (!(lis = PyMem_New(listitem_T *, slicelen * 2))) |
| 2546 { | |
| 2547 PyErr_NoMemory(); | |
| 2548 return -1; | |
| 2549 } | |
| 2550 | |
| 2551 if (first == size) | |
| 2552 li = NULL; | |
| 2553 else | |
| 2554 { | |
| 2555 li = list_find(l, (long) first); | |
| 2556 if (li == NULL) | |
| 2557 { | |
| 2558 PyErr_VIM_FORMAT(N_("internal error: no vim list item %d"), | |
| 2559 (int)first); | |
| 2560 if (obj != NULL) | |
| 2561 PyMem_Free(lis); | |
| 2562 return -1; | |
| 2563 } | |
| 2564 i = slicelen; | |
| 2565 while (i-- && li != NULL) | |
| 2566 { | |
| 2567 j = step; | |
| 2568 next = li; | |
| 2569 if (step > 0) | |
| 2570 while (next != NULL && ((next = next->li_next) != NULL) && --j); | |
| 2571 else | |
| 2572 while (next != NULL && ((next = next->li_prev) != NULL) && ++j); | |
| 2573 | |
| 2574 if (obj == NULL) | |
| 2575 listitem_remove(l, li); | |
| 2576 else | |
| 2577 lis[slicelen - i - 1] = li; | |
| 2578 | |
| 2579 li = next; | |
| 2580 } | |
| 2581 if (li == NULL && i != -1) | |
| 2582 { | |
| 2583 PyErr_SET_VIM(N_("internal error: not enough list items")); | |
| 2584 if (obj != NULL) | |
| 2585 PyMem_Free(lis); | |
| 2586 return -1; | |
| 2587 } | |
| 2588 } | |
| 2589 | |
| 2590 if (obj == NULL) | |
| 2591 return 0; | |
| 2592 | |
| 2593 if (!(iterator = PyObject_GetIter(obj))) | |
| 2594 { | |
| 2595 PyMem_Free(lis); | |
| 2596 return -1; | |
| 2597 } | |
| 2598 | |
| 2599 i = 0; | |
| 2600 while ((item = PyIter_Next(iterator))) | |
| 2601 { | |
| 2602 if (ConvertFromPyObject(item, &v) == -1) | |
| 2603 { | |
| 2604 Py_DECREF(iterator); | |
| 2605 Py_DECREF(item); | |
| 2606 PyMem_Free(lis); | |
| 2607 return -1; | |
| 2608 } | |
| 2609 Py_DECREF(item); | |
| 2610 if (list_insert_tv(l, &v, numreplaced < slicelen | |
| 2611 ? lis[numreplaced] | |
| 2612 : li) == FAIL) | |
| 2613 { | |
| 2614 clear_tv(&v); | |
| 2615 PyErr_SET_VIM(N_("internal error: failed to add item to list")); | |
| 2616 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli); | |
| 2617 PyMem_Free(lis); | |
| 2618 return -1; | |
| 2619 } | |
| 2620 if (numreplaced < slicelen) | |
| 2621 { | |
| 2622 lis[slicelen + numreplaced] = lis[numreplaced]->li_prev; | |
| 5871 | 2623 vimlist_remove(l, lis[numreplaced], lis[numreplaced]); |
| 5608 | 2624 numreplaced++; |
| 2625 } | |
| 2626 else | |
| 2627 { | |
| 2628 if (li) | |
| 2629 lastaddedli = li->li_prev; | |
| 2630 else | |
|
19229
d776967d0f0d
patch 8.2.0173: build fails with old compiler
Bram Moolenaar <Bram@vim.org>
parents:
19193
diff
changeset
|
2631 lastaddedli = l->lv_u.mat.lv_last; |
| 5608 | 2632 numadded++; |
| 2633 } | |
| 2634 clear_tv(&v); | |
| 2635 if (step != 1 && i >= slicelen) | |
| 2636 { | |
| 2637 Py_DECREF(iterator); | |
| 2638 PyErr_FORMAT(PyExc_ValueError, | |
| 5695 | 2639 N_("attempt to assign sequence of size greater than %d " |
| 5668 | 2640 "to extended slice"), (int) slicelen); |
| 5608 | 2641 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli); |
| 2642 PyMem_Free(lis); | |
| 2643 return -1; | |
| 2644 } | |
| 2645 ++i; | |
| 2646 } | |
| 2647 Py_DECREF(iterator); | |
| 2648 | |
| 2649 if (step != 1 && i != slicelen) | |
| 2650 { | |
| 2651 PyErr_FORMAT2(PyExc_ValueError, | |
| 5668 | 2652 N_("attempt to assign sequence of size %d to extended slice " |
| 2653 "of size %d"), (int) i, (int) slicelen); | |
| 5608 | 2654 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli); |
| 2655 PyMem_Free(lis); | |
| 2656 return -1; | |
| 2657 } | |
| 2658 | |
| 2659 if (PyErr_Occurred()) | |
| 2660 { | |
| 2661 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli); | |
| 2662 PyMem_Free(lis); | |
| 2663 return -1; | |
| 2664 } | |
| 2665 | |
| 2666 for (i = 0; i < numreplaced; i++) | |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
2667 listitem_free(l, lis[i]); |
| 5608 | 2668 if (step == 1) |
| 2669 for (i = numreplaced; i < slicelen; i++) | |
| 2670 listitem_remove(l, lis[i]); | |
| 2671 | |
| 2672 PyMem_Free(lis); | |
| 2673 | |
| 2674 return 0; | |
| 2675 } | |
| 2676 | |
| 2677 static int | |
| 2678 ListAssIndex(ListObject *self, Py_ssize_t index, PyObject *obj) | |
| 2679 { | |
| 2680 typval_T tv; | |
| 2681 list_T *l = self->list; | |
| 2682 listitem_T *li; | |
| 2683 Py_ssize_t length = ListLength(self); | |
| 2684 | |
| 2685 if (l->lv_lock) | |
| 2686 { | |
| 2687 RAISE_LOCKED_LIST; | |
| 2688 return -1; | |
| 2689 } | |
| 2690 if (index > length || (index == length && obj == NULL)) | |
| 2691 { | |
| 2692 PyErr_SET_STRING(PyExc_IndexError, N_("list index out of range")); | |
| 2693 return -1; | |
| 2694 } | |
| 2695 | |
| 2696 if (obj == NULL) | |
| 2697 { | |
| 2698 li = list_find(l, (long) index); | |
| 5871 | 2699 vimlist_remove(l, li, li); |
| 5608 | 2700 clear_tv(&li->li_tv); |
| 2701 vim_free(li); | |
| 2702 return 0; | |
| 2703 } | |
| 2704 | |
| 2705 if (ConvertFromPyObject(obj, &tv) == -1) | |
| 2706 return -1; | |
| 2707 | |
| 2708 if (index == length) | |
| 2709 { | |
| 2710 if (list_append_tv(l, &tv) == FAIL) | |
| 2711 { | |
| 2712 clear_tv(&tv); | |
| 2713 PyErr_SET_VIM(N_("failed to add item to list")); | |
| 2714 return -1; | |
| 2715 } | |
| 2716 } | |
| 2717 else | |
| 2718 { | |
| 2719 li = list_find(l, (long) index); | |
| 2720 clear_tv(&li->li_tv); | |
| 2721 copy_tv(&tv, &li->li_tv); | |
| 2722 clear_tv(&tv); | |
| 2723 } | |
| 2724 return 0; | |
| 2725 } | |
| 2726 | |
| 2727 static Py_ssize_t | |
| 2728 ListAssItem(ListObject *self, PyObject *idx, PyObject *obj) | |
| 2729 { | |
| 2730 #if PY_MAJOR_VERSION < 3 | |
| 2731 if (PyInt_Check(idx)) | |
| 2732 { | |
| 2733 long _idx = PyInt_AsLong(idx); | |
| 2734 return ListAssIndex(self, _idx, obj); | |
| 2735 } | |
| 2736 else | |
| 2737 #endif | |
| 2738 if (PyLong_Check(idx)) | |
| 2739 { | |
| 2740 long _idx = PyLong_AsLong(idx); | |
| 2741 return ListAssIndex(self, _idx, obj); | |
| 2742 } | |
| 2743 else if (PySlice_Check(idx)) | |
| 2744 { | |
| 2745 Py_ssize_t start, stop, step, slicelen; | |
| 2746 | |
| 5768 | 2747 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, ListLength(self), |
| 5608 | 2748 &start, &stop, &step, &slicelen) < 0) |
| 2749 return -1; | |
| 2750 return ListAssSlice(self, start, step, slicelen, | |
| 2751 obj); | |
| 2752 } | |
| 2753 else | |
| 2754 { | |
| 2755 RAISE_INVALID_INDEX_TYPE(idx); | |
| 2756 return -1; | |
| 2757 } | |
| 2758 } | |
| 2759 | |
| 2760 static PyObject * | |
| 2761 ListConcatInPlace(ListObject *self, PyObject *obj) | |
| 2762 { | |
| 2763 list_T *l = self->list; | |
| 2764 PyObject *lookup_dict; | |
| 2765 | |
| 2766 if (l->lv_lock) | |
| 2767 { | |
| 2768 RAISE_LOCKED_LIST; | |
| 2769 return NULL; | |
| 2770 } | |
| 2771 | |
| 2772 if (!(lookup_dict = PyDict_New())) | |
| 2773 return NULL; | |
| 2774 | |
| 2775 if (list_py_concat(l, obj, lookup_dict) == -1) | |
| 2776 { | |
| 2777 Py_DECREF(lookup_dict); | |
| 2778 return NULL; | |
| 2779 } | |
| 2780 Py_DECREF(lookup_dict); | |
| 2781 | |
| 2782 Py_INCREF(self); | |
| 2783 return (PyObject *)(self); | |
| 2784 } | |
| 2785 | |
| 4397 | 2786 typedef struct |
| 2787 { | |
| 2788 listwatch_T lw; | |
| 2789 list_T *list; | |
| 2790 } listiterinfo_T; | |
| 2791 | |
| 2792 static void | |
| 2793 ListIterDestruct(listiterinfo_T *lii) | |
| 2794 { | |
| 2795 list_rem_watch(lii->list, &lii->lw); | |
| 2796 PyMem_Free(lii); | |
| 2797 } | |
| 2798 | |
| 2799 static PyObject * | |
| 2800 ListIterNext(listiterinfo_T **lii) | |
| 2801 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2802 PyObject *ret; |
| 4397 | 2803 |
| 2804 if (!((*lii)->lw.lw_item)) | |
| 2805 return NULL; | |
| 2806 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2807 if (!(ret = ConvertToPyObject(&((*lii)->lw.lw_item->li_tv)))) |
| 4397 | 2808 return NULL; |
| 2809 | |
| 2810 (*lii)->lw.lw_item = (*lii)->lw.lw_item->li_next; | |
| 2811 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2812 return ret; |
| 4397 | 2813 } |
| 2814 | |
| 2815 static PyObject * | |
| 4488 | 2816 ListIter(ListObject *self) |
| 4397 | 2817 { |
| 2818 listiterinfo_T *lii; | |
| 4488 | 2819 list_T *l = self->list; |
| 4397 | 2820 |
| 2821 if (!(lii = PyMem_New(listiterinfo_T, 1))) | |
| 2822 { | |
| 2823 PyErr_NoMemory(); | |
| 2824 return NULL; | |
| 2825 } | |
| 2826 | |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
2827 range_list_materialize(l); |
| 4397 | 2828 list_add_watch(l, &lii->lw); |
| 2829 lii->lw.lw_item = l->lv_first; | |
| 2830 lii->list = l; | |
| 2831 | |
| 2832 return IterNew(lii, | |
| 4433 | 2833 (destructorfun) ListIterDestruct, (nextfun) ListIterNext, |
| 2834 NULL, NULL); | |
| 4397 | 2835 } |
| 2836 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2837 static char *ListAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2838 "locked", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2839 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2840 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2841 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2842 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2843 ListDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2844 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2845 return ObjectDir(self, ListAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2846 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2847 |
| 3828 | 2848 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2849 ListSetattr(ListObject *self, char *name, PyObject *valObject) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2850 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2851 if (valObject == NULL) |
| 3828 | 2852 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
2853 PyErr_SET_STRING(PyExc_AttributeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2854 N_("cannot delete vim.List attributes")); |
| 3828 | 2855 return -1; |
| 2856 } | |
| 2857 | |
| 2858 if (strcmp(name, "locked") == 0) | |
| 2859 { | |
| 4488 | 2860 if (self->list->lv_lock == VAR_FIXED) |
| 3828 | 2861 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2862 PyErr_SET_STRING(PyExc_TypeError, N_("cannot modify fixed list")); |
| 3828 | 2863 return -1; |
| 2864 } | |
| 2865 else | |
| 2866 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2867 int istrue = PyObject_IsTrue(valObject); |
| 4411 | 2868 if (istrue == -1) |
| 2869 return -1; | |
| 2870 else if (istrue) | |
| 4488 | 2871 self->list->lv_lock = VAR_LOCKED; |
| 3828 | 2872 else |
| 4488 | 2873 self->list->lv_lock = 0; |
| 3828 | 2874 } |
| 2875 return 0; | |
| 2876 } | |
| 2877 else | |
| 2878 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2879 PyErr_FORMAT(PyExc_AttributeError, N_("cannot set attribute %s"), name); |
| 3828 | 2880 return -1; |
| 2881 } | |
| 2882 } | |
| 2883 | |
| 5608 | 2884 static PySequenceMethods ListAsSeq = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2885 (lenfunc) ListLength, // sq_length, len(x) |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2886 (binaryfunc) 0, // RangeConcat, sq_concat, x+y |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2887 0, // RangeRepeat, sq_repeat, x*n |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2888 (PyIntArgFunc) ListIndex, // sq_item, x[i] |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2889 0, // was_sq_slice, x[i:j] |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2890 (PyIntObjArgProc) ListAssIndex, // sq_as_item, x[i]=v |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2891 0, // was_sq_ass_slice, x[i:j]=v |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2892 0, // sq_contains |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2893 (binaryfunc) ListConcatInPlace,// sq_inplace_concat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
2894 0, // sq_inplace_repeat |
| 5608 | 2895 }; |
| 2896 | |
| 2897 static PyMappingMethods ListAsMapping = { | |
| 2898 /* mp_length */ (lenfunc) ListLength, | |
| 2899 /* mp_subscript */ (binaryfunc) ListItem, | |
| 2900 /* mp_ass_subscript */ (objobjargproc) ListAssItem, | |
| 2901 }; | |
| 2902 | |
| 3618 | 2903 static struct PyMethodDef ListMethods[] = { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2904 {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2905 {"__dir__", (PyCFunction)ListDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2906 { NULL, NULL, 0, NULL} |
| 3618 | 2907 }; |
| 2908 | |
| 2909 typedef struct | |
| 2910 { | |
| 2911 PyObject_HEAD | |
| 2912 char_u *name; | |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2913 int argc; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2914 typval_T *argv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2915 dict_T *self; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2916 pylinkedlist_T ref; |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
2917 int auto_rebind; |
| 3618 | 2918 } FunctionObject; |
| 2919 | |
| 2920 static PyTypeObject FunctionType; | |
| 2921 | |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
2922 #define NEW_FUNCTION(name, argc, argv, self, pt_auto) \ |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
2923 FunctionNew(&FunctionType, (name), (argc), (argv), (self), (pt_auto)) |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2924 |
| 3618 | 2925 static PyObject * |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2926 FunctionNew(PyTypeObject *subtype, char_u *name, int argc, typval_T *argv, |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
2927 dict_T *selfdict, int auto_rebind) |
| 3618 | 2928 { |
| 2929 FunctionObject *self; | |
| 2930 | |
|
15234
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2931 self = (FunctionObject *)subtype->tp_alloc(subtype, 0); |
| 3618 | 2932 if (self == NULL) |
| 2933 return NULL; | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2934 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2935 if (isdigit(*name)) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2936 { |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2937 if (!translated_function_exists(name)) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2938 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2939 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2940 N_("unnamed function %s does not exist"), name); |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2941 return NULL; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2942 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2943 self->name = vim_strsave(name); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2944 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2945 else |
|
15234
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2946 { |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2947 char_u *p; |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2948 |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2949 if ((p = get_expanded_name(name, |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2950 vim_strchr(name, AUTOLOAD_CHAR) == NULL)) == NULL) |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2951 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2952 PyErr_FORMAT(PyExc_ValueError, |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2953 N_("function %s does not exist"), name); |
|
4641
59e6c2bd68e3
updated for version 7.3.1068
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
2954 return NULL; |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2955 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2956 |
|
15234
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2957 if (p[0] == K_SPECIAL && p[1] == KS_EXTRA && p[2] == (int)KE_SNR) |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2958 { |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2959 char_u *np; |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2960 size_t len = STRLEN(p) + 1; |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2961 |
|
16782
fc58fee685e2
patch 8.1.1393: unnecessary type casts
Bram Moolenaar <Bram@vim.org>
parents:
16718
diff
changeset
|
2962 if ((np = alloc(len + 2)) == NULL) |
|
15234
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2963 { |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2964 vim_free(p); |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2965 return NULL; |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2966 } |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2967 mch_memmove(np, "<SNR>", 5); |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2968 mch_memmove(np + 5, p + 3, len - 3); |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2969 vim_free(p); |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2970 self->name = np; |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2971 } |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2972 else |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2973 self->name = p; |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2974 } |
|
ee63f4fe3d45
patch 8.1.0627: Python cannot handle function name of script-local function
Bram Moolenaar <Bram@vim.org>
parents:
14467
diff
changeset
|
2975 |
|
9725
4a4a71d67131
commit https://github.com/vim/vim/commit/2d3d60a7d4b410668dfc427120205ccf88789db4
Christian Brabandt <cb@256bit.org>
parents:
9723
diff
changeset
|
2976 func_ref(self->name); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2977 self->argc = argc; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2978 self->argv = argv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2979 self->self = selfdict; |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
2980 self->auto_rebind = selfdict == NULL ? TRUE : auto_rebind; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2981 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2982 if (self->argv || self->self) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2983 pyll_add((PyObject *)(self), &self->ref, &lastfunc); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2984 |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2985 return (PyObject *)(self); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2986 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2987 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2988 static PyObject * |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2989 FunctionConstructor(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2990 { |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2991 PyObject *self; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2992 PyObject *selfdictObject; |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
2993 PyObject *autoRebindObject; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2994 PyObject *argsObject = NULL; |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2995 char_u *name; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2996 typval_T selfdicttv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2997 typval_T argstv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2998 list_T *argslist = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
2999 dict_T *selfdict = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3000 int argc = 0; |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3001 int auto_rebind = TRUE; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3002 typval_T *argv = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3003 typval_T *curtv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3004 listitem_T *li; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3005 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3006 if (kwargs != NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3007 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3008 selfdictObject = PyDict_GetItemString(kwargs, "self"); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3009 if (selfdictObject != NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3010 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3011 if (ConvertFromPyMapping(selfdictObject, &selfdicttv) == -1) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3012 return NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3013 selfdict = selfdicttv.vval.v_dict; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3014 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3015 argsObject = PyDict_GetItemString(kwargs, "args"); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3016 if (argsObject != NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3017 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3018 if (ConvertFromPySequence(argsObject, &argstv) == -1) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3019 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3020 dict_unref(selfdict); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3021 return NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3022 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3023 argslist = argstv.vval.v_list; |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
3024 range_list_materialize(argslist); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3025 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3026 argc = argslist->lv_len; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3027 if (argc != 0) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3028 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3029 argv = PyMem_New(typval_T, (size_t) argc); |
|
8921
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3030 if (argv == NULL) |
|
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3031 { |
|
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3032 PyErr_NoMemory(); |
|
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3033 dict_unref(selfdict); |
|
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3034 list_unref(argslist); |
|
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3035 return NULL; |
|
c3e7cc135754
commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6
Christian Brabandt <cb@256bit.org>
parents:
8915
diff
changeset
|
3036 } |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3037 curtv = argv; |
|
19888
435726a03481
patch 8.2.0500: using the same loop in many places
Bram Moolenaar <Bram@vim.org>
parents:
19229
diff
changeset
|
3038 FOR_ALL_LIST_ITEMS(argslist, li) |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3039 copy_tv(&li->li_tv, curtv++); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3040 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3041 list_unref(argslist); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3042 } |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3043 if (selfdict != NULL) |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3044 { |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3045 auto_rebind = FALSE; |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3046 autoRebindObject = PyDict_GetItemString(kwargs, "auto_rebind"); |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3047 if (autoRebindObject != NULL) |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3048 { |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3049 auto_rebind = PyObject_IsTrue(autoRebindObject); |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3050 if (auto_rebind == -1) |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3051 { |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3052 dict_unref(selfdict); |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3053 list_unref(argslist); |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3054 return NULL; |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3055 } |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3056 } |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3057 } |
| 3618 | 3058 } |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
3059 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
3060 if (!PyArg_ParseTuple(args, "et", "ascii", &name)) |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3061 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3062 dict_unref(selfdict); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3063 while (argc--) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3064 clear_tv(&argv[argc]); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3065 PyMem_Free(argv); |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
3066 return NULL; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3067 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3068 |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3069 self = FunctionNew(subtype, name, argc, argv, selfdict, auto_rebind); |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
3070 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
3071 PyMem_Free(name); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
3072 |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
3073 return self; |
| 3618 | 3074 } |
| 3075 | |
| 4319 | 3076 static void |
| 4488 | 3077 FunctionDestructor(FunctionObject *self) |
| 4319 | 3078 { |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3079 int i; |
| 4488 | 3080 func_unref(self->name); |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
3081 vim_free(self->name); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3082 for (i = 0; i < self->argc; ++i) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3083 clear_tv(&self->argv[i]); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3084 PyMem_Free(self->argv); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3085 dict_unref(self->self); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3086 if (self->argv || self->self) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3087 pyll_remove(&self->ref, &lastfunc); |
| 4319 | 3088 |
| 3089 DESTRUCTOR_FINISH(self); | |
| 3090 } | |
| 3091 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3092 static char *FunctionAttrs[] = { |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3093 "softspace", "args", "self", "auto_rebind", |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3094 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3095 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3096 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3097 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3098 FunctionDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3099 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3100 return ObjectDir(self, FunctionAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3101 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3102 |
| 3618 | 3103 static PyObject * |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3104 FunctionAttr(FunctionObject *self, char *name) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3105 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3106 list_T *list; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3107 int i; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3108 if (strcmp(name, "name") == 0) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3109 return PyString_FromString((char *)(self->name)); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3110 else if (strcmp(name, "args") == 0) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3111 { |
|
9967
45098d7f72b6
commit https://github.com/vim/vim/commit/9f28953f0c1e3d9fffd49af76503f54eaa279acb
Christian Brabandt <cb@256bit.org>
parents:
9725
diff
changeset
|
3112 if (self->argv == NULL || (list = list_alloc()) == NULL) |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3113 return AlwaysNone(NULL); |
|
9967
45098d7f72b6
commit https://github.com/vim/vim/commit/9f28953f0c1e3d9fffd49af76503f54eaa279acb
Christian Brabandt <cb@256bit.org>
parents:
9725
diff
changeset
|
3114 |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3115 for (i = 0; i < self->argc; ++i) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3116 list_append_tv(list, &self->argv[i]); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3117 return NEW_LIST(list); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3118 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3119 else if (strcmp(name, "self") == 0) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3120 return self->self == NULL |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3121 ? AlwaysNone(NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3122 : NEW_DICTIONARY(self->self); |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3123 else if (strcmp(name, "auto_rebind") == 0) |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3124 return self->auto_rebind |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3125 ? AlwaysTrue(NULL) |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3126 : AlwaysFalse(NULL); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3127 else if (strcmp(name, "__members__") == 0) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3128 return ObjectDir(NULL, FunctionAttrs); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3129 return NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3130 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3131 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3132 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3133 * Populate partial_T given function object. |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3134 * |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3135 * "exported" should be set to true when it is needed to construct a partial |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3136 * that may be stored in a variable (i.e. may be freed by Vim). |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3137 */ |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3138 static void |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3139 set_partial(FunctionObject *self, partial_T *pt, int exported) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3140 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3141 int i; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3142 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3143 pt->pt_name = self->name; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3144 if (self->argv) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3145 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3146 pt->pt_argc = self->argc; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3147 if (exported) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3148 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3149 pt->pt_argv = ALLOC_CLEAR_MULT(typval_T, self->argc); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3150 for (i = 0; i < pt->pt_argc; ++i) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3151 copy_tv(&self->argv[i], &pt->pt_argv[i]); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3152 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3153 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3154 pt->pt_argv = self->argv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3155 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3156 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3157 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3158 pt->pt_argc = 0; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3159 pt->pt_argv = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3160 } |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3161 pt->pt_auto = self->auto_rebind || !exported; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3162 pt->pt_dict = self->self; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3163 if (exported && self->self) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3164 ++pt->pt_dict->dv_refcount; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3165 if (exported) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3166 pt->pt_name = vim_strsave(pt->pt_name); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3167 pt->pt_refcount = 1; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3168 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3169 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3170 static PyObject * |
| 4488 | 3171 FunctionCall(FunctionObject *self, PyObject *argsObject, PyObject *kwargs) |
| 3618 | 3172 { |
| 4488 | 3173 char_u *name = self->name; |
| 3618 | 3174 typval_T args; |
| 3175 typval_T selfdicttv; | |
| 3176 typval_T rettv; | |
| 3177 dict_T *selfdict = NULL; | |
| 3178 PyObject *selfdictObject; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3179 PyObject *ret; |
| 3618 | 3180 int error; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3181 partial_T pt; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3182 partial_T *pt_ptr = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3183 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3184 if (ConvertFromPySequence(argsObject, &args) == -1) |
| 3618 | 3185 return NULL; |
| 3186 | |
| 3187 if (kwargs != NULL) | |
| 3188 { | |
| 3189 selfdictObject = PyDict_GetItemString(kwargs, "self"); | |
| 3190 if (selfdictObject != NULL) | |
| 3191 { | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
3192 if (ConvertFromPyMapping(selfdictObject, &selfdicttv) == -1) |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3193 { |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3194 clear_tv(&args); |
| 3618 | 3195 return NULL; |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3196 } |
| 3618 | 3197 selfdict = selfdicttv.vval.v_dict; |
| 3198 } | |
| 3199 } | |
| 3200 | |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3201 if (self->argv || self->self) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3202 { |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3203 vim_memset(&pt, 0, sizeof(partial_T)); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3204 set_partial(self, &pt, FALSE); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3205 pt_ptr = &pt; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3206 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3207 |
| 4415 | 3208 Py_BEGIN_ALLOW_THREADS |
| 3209 Python_Lock_Vim(); | |
| 3210 | |
| 4498 | 3211 VimTryStart(); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3212 error = func_call(name, &args, pt_ptr, selfdict, &rettv); |
| 4415 | 3213 |
| 3214 Python_Release_Vim(); | |
| 3215 Py_END_ALLOW_THREADS | |
| 3216 | |
| 4498 | 3217 if (VimTryEnd()) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3218 ret = NULL; |
| 4498 | 3219 else if (error != OK) |
| 3618 | 3220 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3221 ret = NULL; |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3222 PyErr_VIM_FORMAT(N_("failed to run function %s"), (char *)name); |
| 3618 | 3223 } |
| 3224 else | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3225 ret = ConvertToPyObject(&rettv); |
| 3618 | 3226 |
| 3227 clear_tv(&args); | |
| 3228 clear_tv(&rettv); | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3229 if (selfdict != NULL) |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3230 clear_tv(&selfdicttv); |
| 3618 | 3231 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3232 return ret; |
| 3618 | 3233 } |
| 3234 | |
|
4625
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
3235 static PyObject * |
|
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
3236 FunctionRepr(FunctionObject *self) |
|
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
3237 { |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3238 PyObject *ret; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3239 garray_T repr_ga; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3240 int i; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3241 char_u *tofree = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3242 typval_T tv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3243 char_u numbuf[NUMBUFLEN]; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3244 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3245 ga_init2(&repr_ga, (int)sizeof(char), 70); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3246 ga_concat(&repr_ga, (char_u *)"<vim.Function '"); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3247 if (self->name) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3248 ga_concat(&repr_ga, self->name); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3249 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3250 ga_concat(&repr_ga, (char_u *)"<NULL>"); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3251 ga_append(&repr_ga, '\''); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3252 if (self->argv) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3253 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3254 ga_concat(&repr_ga, (char_u *)", args=["); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3255 ++emsg_silent; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3256 for (i = 0; i < self->argc; i++) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3257 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3258 if (i != 0) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3259 ga_concat(&repr_ga, (char_u *)", "); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3260 ga_concat(&repr_ga, tv2string(&self->argv[i], &tofree, numbuf, |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3261 get_copyID())); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3262 vim_free(tofree); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3263 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3264 --emsg_silent; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3265 ga_append(&repr_ga, ']'); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3266 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3267 if (self->self) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3268 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3269 ga_concat(&repr_ga, (char_u *)", self="); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3270 tv.v_type = VAR_DICT; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3271 tv.vval.v_dict = self->self; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3272 ++emsg_silent; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3273 ga_concat(&repr_ga, tv2string(&tv, &tofree, numbuf, get_copyID())); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3274 --emsg_silent; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3275 vim_free(tofree); |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3276 if (self->auto_rebind) |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
3277 ga_concat(&repr_ga, (char_u *)", auto_rebind=True"); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3278 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3279 ga_append(&repr_ga, '>'); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3280 ret = PyString_FromString((char *)repr_ga.ga_data); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3281 ga_clear(&repr_ga); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
3282 return ret; |
|
4625
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
3283 } |
|
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
3284 |
| 3618 | 3285 static struct PyMethodDef FunctionMethods[] = { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3286 {"__dir__", (PyCFunction)FunctionDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3287 { NULL, NULL, 0, NULL} |
| 3618 | 3288 }; |
| 3289 | |
| 4350 | 3290 /* |
| 3291 * Options object | |
| 3292 */ | |
| 3293 | |
| 3294 static PyTypeObject OptionsType; | |
| 3295 | |
| 3296 typedef int (*checkfun)(void *); | |
| 3297 | |
| 3298 typedef struct | |
| 3299 { | |
| 3300 PyObject_HEAD | |
| 5610 | 3301 int opt_type; |
| 3302 void *from; | |
| 3303 checkfun Check; | |
| 3304 PyObject *fromObj; | |
| 4350 | 3305 } OptionsObject; |
| 3306 | |
| 4433 | 3307 static int |
| 3308 dummy_check(void *arg UNUSED) | |
| 3309 { | |
| 3310 return 0; | |
| 3311 } | |
| 3312 | |
| 3313 static PyObject * | |
| 3314 OptionsNew(int opt_type, void *from, checkfun Check, PyObject *fromObj) | |
| 3315 { | |
| 3316 OptionsObject *self; | |
| 3317 | |
| 4500 | 3318 self = PyObject_GC_New(OptionsObject, &OptionsType); |
| 4433 | 3319 if (self == NULL) |
| 3320 return NULL; | |
| 3321 | |
| 3322 self->opt_type = opt_type; | |
| 3323 self->from = from; | |
| 3324 self->Check = Check; | |
| 3325 self->fromObj = fromObj; | |
| 3326 if (fromObj) | |
| 3327 Py_INCREF(fromObj); | |
| 3328 | |
| 3329 return (PyObject *)(self); | |
| 3330 } | |
| 3331 | |
| 3332 static void | |
| 4488 | 3333 OptionsDestructor(OptionsObject *self) |
| 4433 | 3334 { |
| 4500 | 3335 PyObject_GC_UnTrack((void *)(self)); |
| 3336 Py_XDECREF(self->fromObj); | |
| 3337 PyObject_GC_Del((void *)(self)); | |
| 4433 | 3338 } |
| 3339 | |
| 3340 static int | |
| 4488 | 3341 OptionsTraverse(OptionsObject *self, visitproc visit, void *arg) |
| 4433 | 3342 { |
| 4488 | 3343 Py_VISIT(self->fromObj); |
| 4433 | 3344 return 0; |
| 3345 } | |
| 3346 | |
| 3347 static int | |
| 4488 | 3348 OptionsClear(OptionsObject *self) |
| 4433 | 3349 { |
| 4488 | 3350 Py_CLEAR(self->fromObj); |
| 4433 | 3351 return 0; |
| 3352 } | |
| 3353 | |
| 4350 | 3354 static PyObject * |
| 4488 | 3355 OptionsItem(OptionsObject *self, PyObject *keyObject) |
| 4350 | 3356 { |
| 3357 char_u *key; | |
| 3358 int flags; | |
| 3359 long numval; | |
| 3360 char_u *stringval; | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3361 PyObject *todecref; |
| 4350 | 3362 |
| 4488 | 3363 if (self->Check(self->from)) |
| 4350 | 3364 return NULL; |
| 3365 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3366 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3367 return NULL; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
3368 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3369 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3370 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3371 RAISE_NO_EMPTY_KEYS; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
3372 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3373 return NULL; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3374 } |
| 4350 | 3375 |
| 3376 flags = get_option_value_strict(key, &numval, &stringval, | |
| 4488 | 3377 self->opt_type, self->from); |
| 4350 | 3378 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3379 Py_XDECREF(todecref); |
| 4350 | 3380 |
| 3381 if (flags == 0) | |
| 3382 { | |
| 4403 | 3383 PyErr_SetObject(PyExc_KeyError, keyObject); |
| 4350 | 3384 return NULL; |
| 3385 } | |
| 3386 | |
| 3387 if (flags & SOPT_UNSET) | |
| 3388 { | |
| 3389 Py_INCREF(Py_None); | |
| 3390 return Py_None; | |
| 3391 } | |
| 3392 else if (flags & SOPT_BOOL) | |
| 3393 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3394 PyObject *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3395 ret = numval ? Py_True : Py_False; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3396 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3397 return ret; |
| 4350 | 3398 } |
| 3399 else if (flags & SOPT_NUM) | |
| 3400 return PyInt_FromLong(numval); | |
| 3401 else if (flags & SOPT_STRING) | |
| 3402 { | |
| 3403 if (stringval) | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3404 { |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
3405 PyObject *ret = PyBytes_FromString((char *)stringval); |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3406 vim_free(stringval); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3407 return ret; |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3408 } |
| 4350 | 3409 else |
| 3410 { | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
3411 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3412 N_("unable to get option value")); |
| 4350 | 3413 return NULL; |
| 3414 } | |
| 3415 } | |
| 3416 else | |
| 3417 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3418 PyErr_SET_VIM(N_("internal error: unknown option type")); |
| 4350 | 3419 return NULL; |
| 3420 } | |
| 3421 } | |
| 3422 | |
| 3423 static int | |
| 5610 | 3424 OptionsContains(OptionsObject *self, PyObject *keyObject) |
| 3425 { | |
| 3426 char_u *key; | |
| 3427 PyObject *todecref; | |
| 3428 | |
| 3429 if (!(key = StringToChars(keyObject, &todecref))) | |
| 3430 return -1; | |
| 3431 | |
| 3432 if (*key == NUL) | |
| 3433 { | |
| 3434 Py_XDECREF(todecref); | |
| 3435 return 0; | |
| 3436 } | |
| 3437 | |
| 3438 if (get_option_value_strict(key, NULL, NULL, self->opt_type, NULL)) | |
| 3439 { | |
| 3440 Py_XDECREF(todecref); | |
| 3441 return 1; | |
| 3442 } | |
| 3443 else | |
| 3444 { | |
| 3445 Py_XDECREF(todecref); | |
| 3446 return 0; | |
| 3447 } | |
| 3448 } | |
| 3449 | |
| 3450 typedef struct | |
| 3451 { | |
| 3452 void *lastoption; | |
| 3453 int opt_type; | |
| 3454 } optiterinfo_T; | |
| 3455 | |
| 3456 static PyObject * | |
| 3457 OptionsIterNext(optiterinfo_T **oii) | |
| 3458 { | |
| 3459 char_u *name; | |
| 3460 | |
| 3461 if ((name = option_iter_next(&((*oii)->lastoption), (*oii)->opt_type))) | |
| 3462 return PyString_FromString((char *)name); | |
| 3463 | |
| 3464 return NULL; | |
| 3465 } | |
| 3466 | |
| 3467 static PyObject * | |
| 3468 OptionsIter(OptionsObject *self) | |
| 3469 { | |
| 3470 optiterinfo_T *oii; | |
| 3471 | |
| 3472 if (!(oii = PyMem_New(optiterinfo_T, 1))) | |
| 3473 { | |
| 3474 PyErr_NoMemory(); | |
| 3475 return NULL; | |
| 3476 } | |
| 3477 | |
| 3478 oii->opt_type = self->opt_type; | |
| 3479 oii->lastoption = NULL; | |
| 3480 | |
| 3481 return IterNew(oii, | |
| 3482 (destructorfun) PyMem_Free, (nextfun) OptionsIterNext, | |
| 3483 NULL, NULL); | |
| 3484 } | |
| 3485 | |
| 3486 static int | |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3487 set_option_value_err(char_u *key, int numval, char_u *stringval, int opt_flags) |
|
4513
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3488 { |
|
15472
0fcc1315c061
patch 8.1.0744: compiler warnings for signed/unsigned strings
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3489 char *errmsg; |
|
4513
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3490 |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3491 if ((errmsg = set_option_value(key, numval, stringval, opt_flags))) |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3492 { |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3493 if (VimTryEnd()) |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3494 return FAIL; |
|
15472
0fcc1315c061
patch 8.1.0744: compiler warnings for signed/unsigned strings
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
3495 PyErr_SetVim(errmsg); |
|
4513
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3496 return FAIL; |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3497 } |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3498 return OK; |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3499 } |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3500 |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3501 static int |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3502 set_option_value_for( |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3503 char_u *key, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3504 int numval, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3505 char_u *stringval, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3506 int opt_flags, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3507 int opt_type, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
3508 void *from) |
| 4350 | 3509 { |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3510 win_T *save_curwin = NULL; |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
3511 tabpage_T *save_curtab = NULL; |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
3512 bufref_T save_curbuf; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3513 int set_ret = 0; |
| 4498 | 3514 |
| 3515 VimTryStart(); | |
| 4350 | 3516 switch (opt_type) |
| 3517 { | |
| 3518 case SREQ_WIN: | |
| 4429 | 3519 if (switch_win(&save_curwin, &save_curtab, (win_T *)from, |
|
4918
0792cc5133ce
updated for version 7.3.1204
Bram Moolenaar <bram@vim.org>
parents:
4859
diff
changeset
|
3520 win_find_tabpage((win_T *)from), FALSE) == FAIL) |
| 4350 | 3521 { |
| 6454 | 3522 restore_win(save_curwin, save_curtab, TRUE); |
| 4498 | 3523 if (VimTryEnd()) |
| 3524 return -1; | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3525 PyErr_SET_VIM(N_("problem while switching windows")); |
| 4350 | 3526 return -1; |
| 3527 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3528 set_ret = set_option_value_err(key, numval, stringval, opt_flags); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3529 restore_win(save_curwin, save_curtab, TRUE); |
| 4350 | 3530 break; |
| 3531 case SREQ_BUF: | |
| 4429 | 3532 switch_buffer(&save_curbuf, (buf_T *)from); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3533 set_ret = set_option_value_err(key, numval, stringval, opt_flags); |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
3534 restore_buffer(&save_curbuf); |
| 4350 | 3535 break; |
| 3536 case SREQ_GLOBAL: | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3537 set_ret = set_option_value_err(key, numval, stringval, opt_flags); |
| 4350 | 3538 break; |
| 3539 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3540 if (set_ret == FAIL) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3541 return -1; |
| 4498 | 3542 return VimTryEnd(); |
| 4350 | 3543 } |
| 3544 | |
| 3545 static int | |
| 4488 | 3546 OptionsAssItem(OptionsObject *self, PyObject *keyObject, PyObject *valObject) |
| 4350 | 3547 { |
| 3548 char_u *key; | |
| 3549 int flags; | |
| 3550 int opt_flags; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3551 int ret = 0; |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3552 PyObject *todecref; |
| 4350 | 3553 |
| 4488 | 3554 if (self->Check(self->from)) |
| 4350 | 3555 return -1; |
| 3556 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3557 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3558 return -1; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
3559 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3560 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3561 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3562 RAISE_NO_EMPTY_KEYS; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
3563 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3564 return -1; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3565 } |
| 4350 | 3566 |
| 3567 flags = get_option_value_strict(key, NULL, NULL, | |
| 4488 | 3568 self->opt_type, self->from); |
| 4350 | 3569 |
| 3570 if (flags == 0) | |
| 3571 { | |
| 4403 | 3572 PyErr_SetObject(PyExc_KeyError, keyObject); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3573 Py_XDECREF(todecref); |
| 4350 | 3574 return -1; |
| 3575 } | |
| 3576 | |
| 3577 if (valObject == NULL) | |
| 3578 { | |
| 4488 | 3579 if (self->opt_type == SREQ_GLOBAL) |
| 4350 | 3580 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
3581 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3582 N_("unable to unset global option %s"), key); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3583 Py_XDECREF(todecref); |
| 4350 | 3584 return -1; |
| 3585 } | |
| 3586 else if (!(flags & SOPT_GLOBAL)) | |
| 3587 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
3588 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3589 N_("unable to unset option %s " |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3590 "which does not have global value"), key); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3591 Py_XDECREF(todecref); |
| 4350 | 3592 return -1; |
| 3593 } | |
| 3594 else | |
| 3595 { | |
| 4488 | 3596 unset_global_local_option(key, self->from); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3597 Py_XDECREF(todecref); |
| 4350 | 3598 return 0; |
| 3599 } | |
| 3600 } | |
| 3601 | |
| 4488 | 3602 opt_flags = (self->opt_type ? OPT_LOCAL : OPT_GLOBAL); |
| 4350 | 3603 |
| 3604 if (flags & SOPT_BOOL) | |
| 3605 { | |
| 4411 | 3606 int istrue = PyObject_IsTrue(valObject); |
|
4513
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
3607 |
| 4411 | 3608 if (istrue == -1) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3609 ret = -1; |
|
4587
63c9b681c3db
updated for version 7.3.1041
Bram Moolenaar <bram@vim.org>
parents:
4575
diff
changeset
|
3610 else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3611 ret = set_option_value_for(key, istrue, NULL, |
|
4587
63c9b681c3db
updated for version 7.3.1041
Bram Moolenaar <bram@vim.org>
parents:
4575
diff
changeset
|
3612 opt_flags, self->opt_type, self->from); |
| 4350 | 3613 } |
| 3614 else if (flags & SOPT_NUM) | |
| 3615 { | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3616 long val; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3617 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3618 if (NumberToLong(valObject, &val, NUMBER_INT)) |
| 4350 | 3619 { |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3620 Py_XDECREF(todecref); |
| 4350 | 3621 return -1; |
| 3622 } | |
| 3623 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3624 ret = set_option_value_for(key, (int) val, NULL, opt_flags, |
| 4488 | 3625 self->opt_type, self->from); |
| 4350 | 3626 } |
| 3627 else | |
| 3628 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3629 char_u *val; |
| 5525 | 3630 PyObject *todecref2; |
| 3631 | |
| 3632 if ((val = StringToChars(valObject, &todecref2))) | |
| 3633 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3634 ret = set_option_value_for(key, 0, val, opt_flags, |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
3635 self->opt_type, self->from); |
| 5525 | 3636 Py_XDECREF(todecref2); |
| 3637 } | |
| 4350 | 3638 else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3639 ret = -1; |
| 4350 | 3640 } |
| 3641 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
3642 Py_XDECREF(todecref); |
|
4587
63c9b681c3db
updated for version 7.3.1041
Bram Moolenaar <bram@vim.org>
parents:
4575
diff
changeset
|
3643 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3644 return ret; |
| 4350 | 3645 } |
| 3646 | |
| 5610 | 3647 static PySequenceMethods OptionsAsSeq = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3648 0, // sq_length |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3649 0, // sq_concat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3650 0, // sq_repeat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3651 0, // sq_item |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3652 0, // sq_slice |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3653 0, // sq_ass_item |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3654 0, // sq_ass_slice |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3655 (objobjproc) OptionsContains, // sq_contains |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3656 0, // sq_inplace_concat |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3657 0, // sq_inplace_repeat |
| 5610 | 3658 }; |
| 3659 | |
| 4350 | 3660 static PyMappingMethods OptionsAsMapping = { |
| 3661 (lenfunc) NULL, | |
| 3662 (binaryfunc) OptionsItem, | |
| 3663 (objobjargproc) OptionsAssItem, | |
| 3664 }; | |
| 3665 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3666 // Tabpage object |
| 4401 | 3667 |
| 3668 typedef struct | |
| 3669 { | |
| 3670 PyObject_HEAD | |
| 3671 tabpage_T *tab; | |
| 3672 } TabPageObject; | |
| 3673 | |
| 3674 static PyObject *WinListNew(TabPageObject *tabObject); | |
| 3675 | |
| 3676 static PyTypeObject TabPageType; | |
| 3677 | |
| 3678 static int | |
| 4488 | 3679 CheckTabPage(TabPageObject *self) |
| 4401 | 3680 { |
| 4488 | 3681 if (self->tab == INVALID_TABPAGE_VALUE) |
| 4401 | 3682 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3683 PyErr_SET_VIM(N_("attempt to refer to deleted tab page")); |
| 4401 | 3684 return -1; |
| 3685 } | |
| 3686 | |
| 3687 return 0; | |
| 3688 } | |
| 3689 | |
| 3690 static PyObject * | |
| 3691 TabPageNew(tabpage_T *tab) | |
| 3692 { | |
| 3693 TabPageObject *self; | |
| 3694 | |
| 3695 if (TAB_PYTHON_REF(tab)) | |
| 3696 { | |
| 3697 self = TAB_PYTHON_REF(tab); | |
| 3698 Py_INCREF(self); | |
| 3699 } | |
| 3700 else | |
| 3701 { | |
| 3702 self = PyObject_NEW(TabPageObject, &TabPageType); | |
| 3703 if (self == NULL) | |
| 3704 return NULL; | |
| 3705 self->tab = tab; | |
| 3706 TAB_PYTHON_REF(tab) = self; | |
| 3707 } | |
| 3708 | |
| 3709 return (PyObject *)(self); | |
| 3710 } | |
| 3711 | |
| 3712 static void | |
| 4488 | 3713 TabPageDestructor(TabPageObject *self) |
| 4401 | 3714 { |
| 4488 | 3715 if (self->tab && self->tab != INVALID_TABPAGE_VALUE) |
| 3716 TAB_PYTHON_REF(self->tab) = NULL; | |
| 4401 | 3717 |
| 3718 DESTRUCTOR_FINISH(self); | |
| 3719 } | |
| 3720 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3721 static char *TabPageAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3722 "windows", "number", "vars", "window", "valid", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3723 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3724 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3725 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3726 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3727 TabPageDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3728 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3729 return ObjectDir(self, TabPageAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3730 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3731 |
| 4401 | 3732 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3733 TabPageAttrValid(TabPageObject *self, char *name) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3734 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3735 PyObject *ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3736 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3737 if (strcmp(name, "valid") != 0) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3738 return NULL; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3739 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3740 ret = ((self->tab == INVALID_TABPAGE_VALUE) ? Py_False : Py_True); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3741 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3742 return ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3743 } |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3744 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3745 static PyObject * |
| 4488 | 3746 TabPageAttr(TabPageObject *self, char *name) |
| 4401 | 3747 { |
| 3748 if (strcmp(name, "windows") == 0) | |
| 4488 | 3749 return WinListNew(self); |
| 4401 | 3750 else if (strcmp(name, "number") == 0) |
| 4488 | 3751 return PyLong_FromLong((long) get_tab_number(self->tab)); |
| 4401 | 3752 else if (strcmp(name, "vars") == 0) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
3753 return NEW_DICTIONARY(self->tab->tp_vars); |
| 4401 | 3754 else if (strcmp(name, "window") == 0) |
| 3755 { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3756 // For current tab window.c does not bother to set or update tp_curwin |
| 4488 | 3757 if (self->tab == curtab) |
| 4431 | 3758 return WindowNew(curwin, curtab); |
| 4401 | 3759 else |
| 4488 | 3760 return WindowNew(self->tab->tp_curwin, self->tab); |
| 4401 | 3761 } |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3762 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3763 return ObjectDir(NULL, TabPageAttrs); |
| 4401 | 3764 return NULL; |
| 3765 } | |
| 3766 | |
| 3767 static PyObject * | |
| 4488 | 3768 TabPageRepr(TabPageObject *self) |
| 4401 | 3769 { |
| 4488 | 3770 if (self->tab == INVALID_TABPAGE_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3771 return PyString_FromFormat("<tabpage object (deleted) at %p>", (self)); |
| 4401 | 3772 else |
| 3773 { | |
| 4488 | 3774 int t = get_tab_number(self->tab); |
| 4401 | 3775 |
| 3776 if (t == 0) | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3777 return PyString_FromFormat("<tabpage object (unknown) at %p>", |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3778 (self)); |
| 4401 | 3779 else |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3780 return PyString_FromFormat("<tabpage %d>", t - 1); |
| 4401 | 3781 } |
| 3782 } | |
| 3783 | |
| 3784 static struct PyMethodDef TabPageMethods[] = { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3785 // name, function, calling, documentation |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3786 {"__dir__", (PyCFunction)TabPageDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3787 { NULL, NULL, 0, NULL} |
| 4401 | 3788 }; |
| 3789 | |
| 3790 /* | |
| 3791 * Window list object | |
| 3792 */ | |
| 3793 | |
| 3794 static PyTypeObject TabListType; | |
| 3795 static PySequenceMethods TabListAsSeq; | |
| 3796 | |
| 3797 typedef struct | |
| 3798 { | |
| 3799 PyObject_HEAD | |
| 3800 } TabListObject; | |
| 3801 | |
| 3802 static PyInt | |
| 3803 TabListLength(PyObject *self UNUSED) | |
| 3804 { | |
| 3805 tabpage_T *tp = first_tabpage; | |
| 3806 PyInt n = 0; | |
| 3807 | |
| 3808 while (tp != NULL) | |
| 3809 { | |
| 3810 ++n; | |
| 3811 tp = tp->tp_next; | |
| 3812 } | |
| 3813 | |
| 3814 return n; | |
| 3815 } | |
| 3816 | |
| 3817 static PyObject * | |
| 3818 TabListItem(PyObject *self UNUSED, PyInt n) | |
| 3819 { | |
| 3820 tabpage_T *tp; | |
| 3821 | |
| 3822 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, --n) | |
| 3823 if (n == 0) | |
| 3824 return TabPageNew(tp); | |
| 3825 | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3826 PyErr_SET_STRING(PyExc_IndexError, N_("no such tab page")); |
| 4401 | 3827 return NULL; |
| 3828 } | |
| 3829 | |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
3830 /* |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
3831 * Window object |
| 4385 | 3832 */ |
| 3833 | |
| 3834 typedef struct | |
| 3835 { | |
| 3836 PyObject_HEAD | |
| 3837 win_T *win; | |
| 4431 | 3838 TabPageObject *tabObject; |
| 4385 | 3839 } WindowObject; |
| 3840 | |
| 3841 static PyTypeObject WindowType; | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3842 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3843 static int |
| 4488 | 3844 CheckWindow(WindowObject *self) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3845 { |
| 4488 | 3846 if (self->win == INVALID_WINDOW_VALUE) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3847 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3848 PyErr_SET_VIM(N_("attempt to refer to deleted window")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3849 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3850 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3851 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3852 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3853 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3854 |
| 4319 | 3855 static PyObject * |
| 4431 | 3856 WindowNew(win_T *win, tabpage_T *tab) |
| 4377 | 3857 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3858 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3859 * We need to handle deletion of windows underneath us. |
| 4377 | 3860 * If we add a "w_python*_ref" field to the win_T structure, |
| 3861 * then we can get at it in win_free() in vim. We then | |
| 3862 * need to create only ONE Python object per window - if | |
| 3863 * we try to create a second, just INCREF the existing one | |
| 3864 * and return it. The (single) Python object referring to | |
| 3865 * the window is stored in "w_python*_ref". | |
| 3866 * On a win_free() we set the Python object's win_T* field | |
| 3867 * to an invalid value. We trap all uses of a window | |
| 3868 * object, and reject them if the win_T* field is invalid. | |
| 3869 * | |
| 4385 | 3870 * Python2 and Python3 get different fields and different objects: |
| 4377 | 3871 * w_python_ref and w_python3_ref fields respectively. |
| 3872 */ | |
| 3873 | |
| 3874 WindowObject *self; | |
| 3875 | |
| 3876 if (WIN_PYTHON_REF(win)) | |
| 3877 { | |
| 3878 self = WIN_PYTHON_REF(win); | |
| 3879 Py_INCREF(self); | |
| 3880 } | |
| 3881 else | |
| 3882 { | |
| 4500 | 3883 self = PyObject_GC_New(WindowObject, &WindowType); |
| 4377 | 3884 if (self == NULL) |
| 3885 return NULL; | |
| 3886 self->win = win; | |
| 3887 WIN_PYTHON_REF(win) = self; | |
| 3888 } | |
| 3889 | |
| 4431 | 3890 self->tabObject = ((TabPageObject *)(TabPageNew(tab))); |
| 3891 | |
| 4377 | 3892 return (PyObject *)(self); |
| 3893 } | |
| 3894 | |
| 4385 | 3895 static void |
| 4488 | 3896 WindowDestructor(WindowObject *self) |
| 4385 | 3897 { |
| 4500 | 3898 PyObject_GC_UnTrack((void *)(self)); |
| 4488 | 3899 if (self->win && self->win != INVALID_WINDOW_VALUE) |
| 3900 WIN_PYTHON_REF(self->win) = NULL; | |
| 4500 | 3901 Py_XDECREF(((PyObject *)(self->tabObject))); |
| 3902 PyObject_GC_Del((void *)(self)); | |
| 3903 } | |
| 3904 | |
| 3905 static int | |
| 3906 WindowTraverse(WindowObject *self, visitproc visit, void *arg) | |
| 3907 { | |
| 3908 Py_VISIT(((PyObject *)(self->tabObject))); | |
| 3909 return 0; | |
| 3910 } | |
| 3911 | |
| 3912 static int | |
| 3913 WindowClear(WindowObject *self) | |
| 3914 { | |
| 3915 Py_CLEAR(self->tabObject); | |
| 3916 return 0; | |
| 4385 | 3917 } |
| 3918 | |
| 4431 | 3919 static win_T * |
| 3920 get_firstwin(TabPageObject *tabObject) | |
| 3921 { | |
| 3922 if (tabObject) | |
| 3923 { | |
| 3924 if (CheckTabPage(tabObject)) | |
| 3925 return NULL; | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
3926 // For current tab window.c does not bother to set or update tp_firstwin |
| 4431 | 3927 else if (tabObject->tab == curtab) |
| 3928 return firstwin; | |
| 3929 else | |
| 3930 return tabObject->tab->tp_firstwin; | |
| 3931 } | |
| 3932 else | |
| 3933 return firstwin; | |
| 3934 } | |
|
14047
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3935 |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3936 // Use the same order as in the WindowAttr() function. |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3937 static char *WindowAttrs[] = { |
|
14047
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3938 "buffer", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3939 "cursor", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3940 "height", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3941 "row", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3942 "width", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3943 "col", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3944 "vars", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3945 "options", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3946 "number", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3947 "tabpage", |
|
30a0068f6167
patch 8.1.0041: attribute "width" missing from python window attribute list
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
3948 "valid", |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3949 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3950 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3951 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3952 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3953 WindowDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3954 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3955 return ObjectDir(self, WindowAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3956 } |
| 4431 | 3957 |
| 4377 | 3958 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3959 WindowAttrValid(WindowObject *self, char *name) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3960 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3961 PyObject *ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3962 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3963 if (strcmp(name, "valid") != 0) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3964 return NULL; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3965 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3966 ret = ((self->win == INVALID_WINDOW_VALUE) ? Py_False : Py_True); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3967 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3968 return ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3969 } |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3970 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3971 static PyObject * |
| 4488 | 3972 WindowAttr(WindowObject *self, char *name) |
| 4319 | 3973 { |
| 3974 if (strcmp(name, "buffer") == 0) | |
| 4488 | 3975 return (PyObject *)BufferNew(self->win->w_buffer); |
| 4319 | 3976 else if (strcmp(name, "cursor") == 0) |
| 3977 { | |
| 4488 | 3978 pos_T *pos = &self->win->w_cursor; |
| 4319 | 3979 |
| 3980 return Py_BuildValue("(ll)", (long)(pos->lnum), (long)(pos->col)); | |
| 3981 } | |
| 3982 else if (strcmp(name, "height") == 0) | |
| 4488 | 3983 return PyLong_FromLong((long)(self->win->w_height)); |
| 4383 | 3984 else if (strcmp(name, "row") == 0) |
| 4488 | 3985 return PyLong_FromLong((long)(self->win->w_winrow)); |
| 4319 | 3986 else if (strcmp(name, "width") == 0) |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3987 return PyLong_FromLong((long)(self->win->w_width)); |
| 4383 | 3988 else if (strcmp(name, "col") == 0) |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
3989 return PyLong_FromLong((long)(self->win->w_wincol)); |
| 4323 | 3990 else if (strcmp(name, "vars") == 0) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
3991 return NEW_DICTIONARY(self->win->w_vars); |
| 4350 | 3992 else if (strcmp(name, "options") == 0) |
| 4488 | 3993 return OptionsNew(SREQ_WIN, self->win, (checkfun) CheckWindow, |
| 3994 (PyObject *) self); | |
| 4379 | 3995 else if (strcmp(name, "number") == 0) |
| 4431 | 3996 { |
| 4488 | 3997 if (CheckTabPage(self->tabObject)) |
| 4431 | 3998 return NULL; |
| 3999 return PyLong_FromLong((long) | |
| 4488 | 4000 get_win_number(self->win, get_firstwin(self->tabObject))); |
| 4431 | 4001 } |
| 4002 else if (strcmp(name, "tabpage") == 0) | |
| 4003 { | |
| 4488 | 4004 Py_INCREF(self->tabObject); |
| 4005 return (PyObject *)(self->tabObject); | |
| 4431 | 4006 } |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4007 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4008 return ObjectDir(NULL, WindowAttrs); |
| 4319 | 4009 else |
| 4010 return NULL; | |
| 4011 } | |
| 4012 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4013 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4014 WindowSetattr(WindowObject *self, char *name, PyObject *valObject) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4015 { |
| 4488 | 4016 if (CheckWindow(self)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4017 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4018 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4019 if (strcmp(name, "buffer") == 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4020 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4021 PyErr_SET_STRING(PyExc_TypeError, N_("readonly attribute: buffer")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4022 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4023 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4024 else if (strcmp(name, "cursor") == 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4025 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4026 long lnum; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4027 long col; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4028 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4029 if (!PyArg_Parse(valObject, "(ll)", &lnum, &col)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4030 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4031 |
| 4488 | 4032 if (lnum <= 0 || lnum > self->win->w_buffer->b_ml.ml_line_count) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4033 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4034 PyErr_SET_VIM(N_("cursor position outside buffer")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4035 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4036 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4037 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4038 // Check for keyboard interrupts |
| 4498 | 4039 if (VimCheckInterrupt()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4040 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4041 |
| 4488 | 4042 self->win->w_cursor.lnum = lnum; |
| 4043 self->win->w_cursor.col = col; | |
|
14395
c15bef307de6
patch 8.1.0212: preferred cursor column not set in interfaces
Christian Brabandt <cb@256bit.org>
parents:
14373
diff
changeset
|
4044 self->win->w_set_curswant = TRUE; |
| 4488 | 4045 self->win->w_cursor.coladd = 0; |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4046 // When column is out of range silently correct it. |
| 4488 | 4047 check_cursor_col_win(self->win); |
| 2933 | 4048 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4049 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4050 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4051 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4052 else if (strcmp(name, "height") == 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4053 { |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4054 long height; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4055 win_T *savewin; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4056 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
4057 if (NumberToLong(valObject, &height, NUMBER_INT|NUMBER_UNSIGNED)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4058 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4059 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4060 #ifdef FEAT_GUI |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4061 need_mouse_correct = TRUE; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4062 #endif |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4063 savewin = curwin; |
| 4488 | 4064 curwin = self->win; |
| 4498 | 4065 |
| 4066 VimTryStart(); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4067 win_setheight((int) height); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4068 curwin = savewin; |
| 4498 | 4069 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4070 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4071 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4072 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4073 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4074 else if (strcmp(name, "width") == 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4075 { |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4076 long width; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4077 win_T *savewin; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4078 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
4079 if (NumberToLong(valObject, &width, NUMBER_INT|NUMBER_UNSIGNED)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4080 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4081 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4082 #ifdef FEAT_GUI |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4083 need_mouse_correct = TRUE; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4084 #endif |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4085 savewin = curwin; |
| 4488 | 4086 curwin = self->win; |
| 4498 | 4087 |
| 4088 VimTryStart(); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4089 win_setwidth((int) width); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4090 curwin = savewin; |
| 4498 | 4091 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4092 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4093 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4094 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4095 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4096 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4097 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4098 PyErr_SetString(PyExc_AttributeError, name); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4099 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4100 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4101 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4102 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4103 static PyObject * |
| 4488 | 4104 WindowRepr(WindowObject *self) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4105 { |
| 4488 | 4106 if (self->win == INVALID_WINDOW_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4107 return PyString_FromFormat("<window object (deleted) at %p>", (self)); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4108 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4109 { |
| 4488 | 4110 int w = get_win_number(self->win, firstwin); |
| 4379 | 4111 |
| 4112 if (w == 0) | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4113 return PyString_FromFormat("<window object (unknown) at %p>", |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4114 (self)); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4115 else |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4116 return PyString_FromFormat("<window %d>", w - 1); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4117 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4118 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4119 |
| 4385 | 4120 static struct PyMethodDef WindowMethods[] = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4121 // name, function, calling, documentation |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4122 {"__dir__", (PyCFunction)WindowDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4123 { NULL, NULL, 0, NULL} |
| 4385 | 4124 }; |
| 4125 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4126 /* |
| 4385 | 4127 * Window list object |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4128 */ |
| 4319 | 4129 |
| 4385 | 4130 static PyTypeObject WinListType; |
| 4131 static PySequenceMethods WinListAsSeq; | |
| 4132 | |
| 4319 | 4133 typedef struct |
| 4134 { | |
| 4135 PyObject_HEAD | |
| 4401 | 4136 TabPageObject *tabObject; |
| 4319 | 4137 } WinListObject; |
| 4138 | |
| 4401 | 4139 static PyObject * |
| 4140 WinListNew(TabPageObject *tabObject) | |
| 4141 { | |
| 4142 WinListObject *self; | |
| 4143 | |
| 4144 self = PyObject_NEW(WinListObject, &WinListType); | |
| 4145 self->tabObject = tabObject; | |
| 4146 Py_INCREF(tabObject); | |
| 4147 | |
| 4148 return (PyObject *)(self); | |
| 4149 } | |
| 4150 | |
| 4151 static void | |
| 4488 | 4152 WinListDestructor(WinListObject *self) |
| 4401 | 4153 { |
| 4488 | 4154 TabPageObject *tabObject = self->tabObject; |
| 4401 | 4155 |
| 4156 if (tabObject) | |
|
4523
57393dc4b811
updated for version 7.3.1009
Bram Moolenaar <bram@vim.org>
parents:
4513
diff
changeset
|
4157 { |
| 4401 | 4158 Py_DECREF((PyObject *)(tabObject)); |
|
4523
57393dc4b811
updated for version 7.3.1009
Bram Moolenaar <bram@vim.org>
parents:
4513
diff
changeset
|
4159 } |
| 4401 | 4160 |
| 4161 DESTRUCTOR_FINISH(self); | |
| 4162 } | |
| 4163 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4164 static PyInt |
| 4488 | 4165 WinListLength(WinListObject *self) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4166 { |
| 4401 | 4167 win_T *w; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4168 PyInt n = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4169 |
| 4488 | 4170 if (!(w = get_firstwin(self->tabObject))) |
| 4401 | 4171 return -1; |
| 4172 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4173 while (w != NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4174 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4175 ++n; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4176 w = W_NEXT(w); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4177 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4178 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4179 return n; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4180 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4181 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4182 static PyObject * |
| 4488 | 4183 WinListItem(WinListObject *self, PyInt n) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4184 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4185 win_T *w; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4186 |
| 4488 | 4187 if (!(w = get_firstwin(self->tabObject))) |
| 4401 | 4188 return NULL; |
| 4189 | |
| 4190 for (; w != NULL; w = W_NEXT(w), --n) | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4191 if (n == 0) |
| 4488 | 4192 return WindowNew(w, self->tabObject? self->tabObject->tab: curtab); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4193 |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4194 PyErr_SET_STRING(PyExc_IndexError, N_("no such window")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4195 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4196 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4197 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4198 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4199 * Convert a Python string into a Vim line. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4200 * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4201 * The result is in allocated memory. All internal nulls are replaced by |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4202 * newline characters. It is an error for the string to contain newline |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4203 * characters. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4204 * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4205 * On errors, the Python exception data is set, and NULL is returned. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4206 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4207 static char * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4208 StringToLine(PyObject *obj) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4209 { |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4210 char *str; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4211 char *save; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4212 PyObject *bytes = NULL; |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
4213 Py_ssize_t len = 0; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4214 PyInt i; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4215 char *p; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4216 |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4217 if (PyBytes_Check(obj)) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4218 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4219 if (PyBytes_AsStringAndSize(obj, &str, &len) == -1 |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4220 || str == NULL) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4221 return NULL; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4222 } |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4223 else if (PyUnicode_Check(obj)) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4224 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4225 if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL))) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4226 return NULL; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4227 |
|
4995
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4228 if (PyBytes_AsStringAndSize(bytes, &str, &len) == -1 |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4229 || str == NULL) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4230 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4231 Py_DECREF(bytes); |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4232 return NULL; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4233 } |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4234 } |
|
4995
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4235 else |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4236 { |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4237 #if PY_MAJOR_VERSION < 3 |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4238 PyErr_FORMAT(PyExc_TypeError, |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4239 N_("expected str() or unicode() instance, but got %s"), |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4240 Py_TYPE_NAME(obj)); |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4241 #else |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4242 PyErr_FORMAT(PyExc_TypeError, |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4243 N_("expected bytes() or str() instance, but got %s"), |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4244 Py_TYPE_NAME(obj)); |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4245 #endif |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4246 return NULL; |
|
b4a2eaf28b51
updated for version 7.3.1242
Bram Moolenaar <bram@vim.org>
parents:
4988
diff
changeset
|
4247 } |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4248 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4249 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4250 * Error checking: String must not contain newlines, as we |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4251 * are replacing a single line, and we must replace it with |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4252 * a single line. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4253 * A trailing newline is removed, so that append(f.readlines()) works. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4254 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4255 p = memchr(str, '\n', len); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4256 if (p != NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4257 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4258 if (p == str + len - 1) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4259 --len; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4260 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4261 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4262 PyErr_SET_VIM(N_("string cannot contain newlines")); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
4263 Py_XDECREF(bytes); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4264 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4265 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4266 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4267 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4268 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4269 * Create a copy of the string, with internal nulls replaced by |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4270 * newline characters, as is the vim convention. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4271 */ |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4272 save = alloc(len+1); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4273 if (save == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4274 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4275 PyErr_NoMemory(); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
4276 Py_XDECREF(bytes); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4277 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4278 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4279 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4280 for (i = 0; i < len; ++i) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4281 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4282 if (str[i] == '\0') |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4283 save[i] = '\n'; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4284 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4285 save[i] = str[i]; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4286 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4287 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4288 save[i] = '\0'; |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4289 Py_XDECREF(bytes); // Python 2 does nothing here |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4290 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4291 return save; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4292 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4293 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4294 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4295 * Get a line from the specified buffer. The line number is |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4296 * in Vim format (1-based). The line is returned as a Python |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4297 * string object. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4298 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4299 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4300 GetBufferLine(buf_T *buf, PyInt n) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4301 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4302 return LineToString((char *)ml_get_buf(buf, (linenr_T)n, FALSE)); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4303 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4304 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4305 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4306 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4307 * Get a list of lines from the specified buffer. The line numbers |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4308 * are in Vim format (1-based). The range is from lo up to, but not |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4309 * including, hi. The list is returned as a Python list of string objects. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4310 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4311 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4312 GetBufferLineList(buf_T *buf, PyInt lo, PyInt hi) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4313 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4314 PyInt i; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4315 PyInt n = hi - lo; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4316 PyObject *list = PyList_New(n); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4317 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4318 if (list == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4319 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4320 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4321 for (i = 0; i < n; ++i) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4322 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4323 PyObject *string = LineToString( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4324 (char *)ml_get_buf(buf, (linenr_T)(lo+i), FALSE)); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4325 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4326 // Error check - was the Python string creation OK? |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4327 if (string == NULL) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4328 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4329 Py_DECREF(list); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4330 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4331 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4332 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4333 PyList_SET_ITEM(list, i, string); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4334 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4335 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4336 // The ownership of the Python list is passed to the caller (ie, |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4337 // the caller should Py_DECREF() the object when it is finished |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4338 // with it). |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4339 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4340 return list; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4341 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4342 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4343 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4344 * Check if deleting lines made the cursor position invalid. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4345 * Changed the lines from "lo" to "hi" and added "extra" lines (negative if |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4346 * deleted). |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4347 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4348 static void |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4349 py_fix_cursor(linenr_T lo, linenr_T hi, linenr_T extra) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4350 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4351 if (curwin->w_cursor.lnum >= lo) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4352 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4353 // Adjust the cursor position if it's in/after the changed |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4354 // lines. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4355 if (curwin->w_cursor.lnum >= hi) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4356 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4357 curwin->w_cursor.lnum += extra; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4358 check_cursor_col(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4359 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4360 else if (extra < 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4361 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4362 curwin->w_cursor.lnum = lo; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4363 check_cursor(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4364 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4365 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4366 check_cursor_col(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4367 changed_cline_bef_curs(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4368 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4369 invalidate_botline(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4370 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4371 |
| 2894 | 4372 /* |
| 4373 * Replace a line in the specified buffer. The line number is | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4374 * in Vim format (1-based). The replacement line is given as |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4375 * a Python string object. The object is checked for validity |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4376 * and correct format. Errors are returned as a value of FAIL. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4377 * The return value is OK on success. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4378 * If OK is returned and len_change is not NULL, *len_change |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4379 * is set to the change in the buffer length. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4380 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4381 static int |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4382 SetBufferLine(buf_T *buf, PyInt n, PyObject *line, PyInt *len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4383 { |
|
11447
698ee9d4fe9f
patch 8.0.0607: after :bwipe + :new bufref might still be valid
Christian Brabandt <cb@256bit.org>
parents:
10942
diff
changeset
|
4384 bufref_T save_curbuf = {NULL, 0, 0}; |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4385 win_T *save_curwin = NULL; |
|
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4386 tabpage_T *save_curtab = NULL; |
|
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4387 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4388 // First of all, we check the type of the supplied Python object. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4389 // There are three cases: |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4390 // 1. NULL, or None - this is a deletion. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4391 // 2. A string - this is a replacement. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4392 // 3. Anything else - this is an error. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4393 if (line == Py_None || line == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4394 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4395 PyErr_Clear(); |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4396 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4397 |
| 4498 | 4398 VimTryStart(); |
| 4399 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4400 if (u_savedel((linenr_T)n, 1L) == FAIL) |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4401 RAISE_UNDO_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4402 else if (ml_delete((linenr_T)n, FALSE) == FAIL) |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4403 RAISE_DELETE_LINE_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4404 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4405 { |
|
16080
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4406 if (buf == curbuf && (save_curwin != NULL |
|
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4407 || save_curbuf.br_buf == NULL)) |
|
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4408 // Using an existing window for the buffer, adjust the cursor |
|
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4409 // position. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4410 py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1); |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4411 if (save_curbuf.br_buf == NULL) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4412 // Only adjust marks if we managed to switch to a window that |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4413 // holds the buffer, otherwise line numbers will be invalid. |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4414 deleted_lines_mark((linenr_T)n, 1L); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4415 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4416 |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4417 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4418 |
| 4498 | 4419 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4420 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4421 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4422 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4423 *len_change = -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4424 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4425 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4426 } |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4427 else if (PyBytes_Check(line) || PyUnicode_Check(line)) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4428 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4429 char *save = StringToLine(line); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4430 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4431 if (save == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4432 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4433 |
| 4498 | 4434 VimTryStart(); |
| 4435 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4436 // We do not need to free "save" if ml_replace() consumes it. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4437 PyErr_Clear(); |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4438 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4439 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4440 if (u_savesub((linenr_T)n) == FAIL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4441 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4442 RAISE_UNDO_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4443 vim_free(save); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4444 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4445 else if (ml_replace((linenr_T)n, (char_u *)save, FALSE) == FAIL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4446 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4447 RAISE_REPLACE_LINE_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4448 vim_free(save); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4449 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4450 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4451 changed_bytes((linenr_T)n, 0); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4452 |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4453 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4454 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4455 // Check that the cursor is not beyond the end of the line now. |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4456 if (buf == curbuf) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4457 check_cursor_col(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4458 |
| 4498 | 4459 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4460 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4461 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4462 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4463 *len_change = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4464 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4465 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4466 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4467 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4468 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4469 PyErr_BadArgument(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4470 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4471 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4472 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4473 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4474 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4475 * Replace a range of lines in the specified buffer. The line numbers are in |
| 2894 | 4476 * Vim format (1-based). The range is from lo up to, but not including, hi. |
| 4477 * The replacement lines are given as a Python list of string objects. The | |
| 4478 * list is checked for validity and correct format. Errors are returned as a | |
| 4479 * value of FAIL. The return value is OK on success. | |
| 4480 * If OK is returned and len_change is not NULL, *len_change | |
| 4481 * is set to the change in the buffer length. | |
| 4482 */ | |
| 4483 static int | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4484 SetBufferLineList( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4485 buf_T *buf, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4486 PyInt lo, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4487 PyInt hi, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4488 PyObject *list, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4489 PyInt *len_change) |
| 2894 | 4490 { |
|
11447
698ee9d4fe9f
patch 8.0.0607: after :bwipe + :new bufref might still be valid
Christian Brabandt <cb@256bit.org>
parents:
10942
diff
changeset
|
4491 bufref_T save_curbuf = {NULL, 0, 0}; |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4492 win_T *save_curwin = NULL; |
|
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4493 tabpage_T *save_curtab = NULL; |
|
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4494 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4495 // First of all, we check the type of the supplied Python object. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4496 // There are three cases: |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4497 // 1. NULL, or None - this is a deletion. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4498 // 2. A list - this is a replacement. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4499 // 3. Anything else - this is an error. |
| 2894 | 4500 if (list == Py_None || list == NULL) |
| 4501 { | |
| 4502 PyInt i; | |
| 4503 PyInt n = (int)(hi - lo); | |
| 4504 | |
| 4505 PyErr_Clear(); | |
| 4498 | 4506 VimTryStart(); |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4507 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf); |
| 2894 | 4508 |
| 4509 if (u_savedel((linenr_T)lo, (long)n) == FAIL) | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4510 RAISE_UNDO_FAIL; |
| 2894 | 4511 else |
| 4512 { | |
| 4513 for (i = 0; i < n; ++i) | |
| 4514 { | |
| 4515 if (ml_delete((linenr_T)lo, FALSE) == FAIL) | |
| 4516 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4517 RAISE_DELETE_LINE_FAIL; |
| 2894 | 4518 break; |
| 4519 } | |
| 4520 } | |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4521 if (buf == curbuf && (save_curwin != NULL |
|
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4522 || save_curbuf.br_buf == NULL)) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4523 // Using an existing window for the buffer, adjust the cursor |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4524 // position. |
| 2894 | 4525 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n); |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4526 if (save_curbuf.br_buf == NULL) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4527 // Only adjust marks if we managed to switch to a window that |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4528 // holds the buffer, otherwise line numbers will be invalid. |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4529 deleted_lines_mark((linenr_T)lo, (long)i); |
| 2894 | 4530 } |
| 4531 | |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4532 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); |
| 2894 | 4533 |
| 4498 | 4534 if (VimTryEnd()) |
| 2894 | 4535 return FAIL; |
| 4536 | |
| 4537 if (len_change) | |
| 4538 *len_change = -n; | |
| 4539 | |
| 4540 return OK; | |
| 4541 } | |
| 4542 else if (PyList_Check(list)) | |
| 4543 { | |
| 4544 PyInt i; | |
| 4545 PyInt new_len = PyList_Size(list); | |
| 4546 PyInt old_len = hi - lo; | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4547 PyInt extra = 0; // lines added to text, can be negative |
| 2894 | 4548 char **array; |
| 4549 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4550 if (new_len == 0) // avoid allocating zero bytes |
| 2894 | 4551 array = NULL; |
| 4552 else | |
| 4553 { | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4554 array = PyMem_New(char *, new_len); |
| 2894 | 4555 if (array == NULL) |
| 4556 { | |
| 4557 PyErr_NoMemory(); | |
| 4558 return FAIL; | |
| 4559 } | |
| 4560 } | |
| 4561 | |
| 4562 for (i = 0; i < new_len; ++i) | |
| 4563 { | |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4564 PyObject *line; |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4565 |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4566 if (!(line = PyList_GetItem(list, i)) || |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4567 !(array[i] = StringToLine(line))) |
| 2894 | 4568 { |
| 4569 while (i) | |
| 4570 vim_free(array[--i]); | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4571 PyMem_Free(array); |
| 2894 | 4572 return FAIL; |
| 4573 } | |
| 4574 } | |
| 4575 | |
| 4498 | 4576 VimTryStart(); |
| 2894 | 4577 PyErr_Clear(); |
| 4429 | 4578 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4579 // START of region without "return". Must call restore_buffer()! |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4580 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf); |
| 2894 | 4581 |
| 4582 if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL) | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4583 RAISE_UNDO_FAIL; |
| 2894 | 4584 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4585 // If the size of the range is reducing (ie, new_len < old_len) we |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4586 // need to delete some old_len. We do this at the start, by |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4587 // repeatedly deleting line "lo". |
| 2894 | 4588 if (!PyErr_Occurred()) |
| 4589 { | |
| 4590 for (i = 0; i < old_len - new_len; ++i) | |
| 4591 if (ml_delete((linenr_T)lo, FALSE) == FAIL) | |
| 4592 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4593 RAISE_DELETE_LINE_FAIL; |
| 2894 | 4594 break; |
| 4595 } | |
| 4596 extra -= i; | |
| 4597 } | |
| 4598 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4599 // For as long as possible, replace the existing old_len with the |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4600 // new old_len. This is a more efficient operation, as it requires |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4601 // less memory allocation and freeing. |
| 2894 | 4602 if (!PyErr_Occurred()) |
| 4603 { | |
| 4604 for (i = 0; i < old_len && i < new_len; ++i) | |
| 4605 if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE) | |
| 4606 == FAIL) | |
| 4607 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4608 RAISE_REPLACE_LINE_FAIL; |
| 2894 | 4609 break; |
| 4610 } | |
| 4611 } | |
| 4612 else | |
| 4613 i = 0; | |
| 4614 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4615 // Now we may need to insert the remaining new old_len. If we do, we |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4616 // must free the strings as we finish with them (we can't pass the |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4617 // responsibility to vim in this case). |
| 2894 | 4618 if (!PyErr_Occurred()) |
| 4619 { | |
| 4620 while (i < new_len) | |
| 4621 { | |
| 4622 if (ml_append((linenr_T)(lo + i - 1), | |
| 4623 (char_u *)array[i], 0, FALSE) == FAIL) | |
| 4624 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4625 RAISE_INSERT_LINE_FAIL; |
| 2894 | 4626 break; |
| 4627 } | |
| 4628 vim_free(array[i]); | |
| 4629 ++i; | |
| 4630 ++extra; | |
| 4631 } | |
| 4632 } | |
| 4633 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4634 // Free any left-over old_len, as a result of an error |
| 2894 | 4635 while (i < new_len) |
| 4636 { | |
| 4637 vim_free(array[i]); | |
| 4638 ++i; | |
| 4639 } | |
| 4640 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4641 // Free the array of old_len. All of its contents have now |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4642 // been dealt with (either freed, or the responsibility passed |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4643 // to vim. |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4644 PyMem_Free(array); |
| 2894 | 4645 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4646 // Adjust marks. Invalidate any which lie in the |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4647 // changed range, and move any in the remainder of the buffer. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4648 // Only adjust marks if we managed to switch to a window that holds |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4649 // the buffer, otherwise line numbers will be invalid. |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4650 if (save_curbuf.br_buf == NULL) |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4651 mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), |
| 2894 | 4652 (long)MAXLNUM, (long)extra); |
| 4653 changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); | |
| 4654 | |
|
16080
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4655 if (buf == curbuf && (save_curwin != NULL |
|
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4656 || save_curbuf.br_buf == NULL)) |
|
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4657 // Using an existing window for the buffer, adjust the cursor |
|
bf8cf5c3b784
patch 8.1.1045: E315 ml_get error when using Python and hidden buffer
Bram Moolenaar <Bram@vim.org>
parents:
15818
diff
changeset
|
4658 // position. |
| 2894 | 4659 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra); |
| 4660 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4661 // END of region without "return". |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4662 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); |
| 2894 | 4663 |
| 4498 | 4664 if (VimTryEnd()) |
| 2894 | 4665 return FAIL; |
| 4666 | |
| 4667 if (len_change) | |
| 4668 *len_change = new_len - old_len; | |
| 4669 | |
| 4670 return OK; | |
| 4671 } | |
| 4672 else | |
| 4673 { | |
| 4674 PyErr_BadArgument(); | |
| 4675 return FAIL; | |
| 4676 } | |
| 4677 } | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4678 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4679 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4680 * Insert a number of lines into the specified buffer after the specified line. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4681 * The line number is in Vim format (1-based). The lines to be inserted are |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4682 * given as a Python list of string objects or as a single string. The lines |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4683 * to be added are checked for validity and correct format. Errors are |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4684 * returned as a value of FAIL. The return value is OK on success. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4685 * If OK is returned and len_change is not NULL, *len_change |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4686 * is set to the change in the buffer length. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4687 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4688 static int |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4689 InsertBufferLines(buf_T *buf, PyInt n, PyObject *lines, PyInt *len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4690 { |
|
11447
698ee9d4fe9f
patch 8.0.0607: after :bwipe + :new bufref might still be valid
Christian Brabandt <cb@256bit.org>
parents:
10942
diff
changeset
|
4691 bufref_T save_curbuf = {NULL, 0, 0}; |
|
5202
8edba3805d78
updated for version 7.4a.027
Bram Moolenaar <bram@vim.org>
parents:
5166
diff
changeset
|
4692 win_T *save_curwin = NULL; |
|
8edba3805d78
updated for version 7.4a.027
Bram Moolenaar <bram@vim.org>
parents:
5166
diff
changeset
|
4693 tabpage_T *save_curtab = NULL; |
|
8edba3805d78
updated for version 7.4a.027
Bram Moolenaar <bram@vim.org>
parents:
5166
diff
changeset
|
4694 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4695 // First of all, we check the type of the supplied Python object. |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4696 // It must be a string or a list, or the call is in error. |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
4697 if (PyBytes_Check(lines) || PyUnicode_Check(lines)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4698 { |
|
5202
8edba3805d78
updated for version 7.4a.027
Bram Moolenaar <bram@vim.org>
parents:
5166
diff
changeset
|
4699 char *str = StringToLine(lines); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4700 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4701 if (str == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4702 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4703 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4704 PyErr_Clear(); |
| 4498 | 4705 VimTryStart(); |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4706 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf); |
|
5202
8edba3805d78
updated for version 7.4a.027
Bram Moolenaar <bram@vim.org>
parents:
5166
diff
changeset
|
4707 |
|
8edba3805d78
updated for version 7.4a.027
Bram Moolenaar <bram@vim.org>
parents:
5166
diff
changeset
|
4708 if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL) |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4709 RAISE_UNDO_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4710 else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL) |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4711 RAISE_INSERT_LINE_FAIL; |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4712 else if (save_curbuf.br_buf == NULL) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4713 // Only adjust marks if we managed to switch to a window that |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4714 // holds the buffer, otherwise line numbers will be invalid. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4715 appended_lines_mark((linenr_T)n, 1L); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4716 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4717 vim_free(str); |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4718 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4719 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4720 |
| 4498 | 4721 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4722 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4723 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4724 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4725 *len_change = 1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4726 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4727 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4728 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4729 else if (PyList_Check(lines)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4730 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4731 PyInt i; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4732 PyInt size = PyList_Size(lines); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4733 char **array; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4734 |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4735 array = PyMem_New(char *, size); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4736 if (array == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4737 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4738 PyErr_NoMemory(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4739 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4740 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4741 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4742 for (i = 0; i < size; ++i) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4743 { |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4744 PyObject *line; |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4745 |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4746 if (!(line = PyList_GetItem(lines, i)) || |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4747 !(array[i] = StringToLine(line))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4748 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4749 while (i) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4750 vim_free(array[--i]); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4751 PyMem_Free(array); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4752 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4753 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4754 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4755 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4756 PyErr_Clear(); |
| 4498 | 4757 VimTryStart(); |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4758 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4759 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4760 if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL) |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4761 RAISE_UNDO_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4762 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4763 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4764 for (i = 0; i < size; ++i) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4765 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4766 if (ml_append((linenr_T)(n + i), |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4767 (char_u *)array[i], 0, FALSE) == FAIL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4768 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4769 RAISE_INSERT_LINE_FAIL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4770 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4771 // Free the rest of the lines |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4772 while (i < size) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4773 vim_free(array[i++]); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4774 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4775 break; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4776 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4777 vim_free(array[i]); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4778 } |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4779 if (i > 0 && save_curbuf.br_buf == NULL) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4780 // Only adjust marks if we managed to switch to a window that |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4781 // holds the buffer, otherwise line numbers will be invalid. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4782 appended_lines_mark((linenr_T)n, (long)i); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4783 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4784 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4785 // Free the array of lines. All of its contents have now |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4786 // been freed. |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4787 PyMem_Free(array); |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
4788 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); |
|
5235
6fa64615c8d3
updated for version 7.4a.043
Bram Moolenaar <bram@vim.org>
parents:
5202
diff
changeset
|
4789 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4790 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4791 |
| 4498 | 4792 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4793 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4794 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4795 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4796 *len_change = size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4797 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4798 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4799 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4800 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4801 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4802 PyErr_BadArgument(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4803 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4804 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4805 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4806 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4807 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4808 * Common routines for buffers and line ranges |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4809 * ------------------------------------------- |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4810 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4811 |
| 4385 | 4812 typedef struct |
| 4813 { | |
| 4814 PyObject_HEAD | |
| 4815 buf_T *buf; | |
| 4816 } BufferObject; | |
| 4817 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4818 static int |
| 4488 | 4819 CheckBuffer(BufferObject *self) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4820 { |
| 4488 | 4821 if (self->buf == INVALID_BUFFER_VALUE) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4822 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4823 PyErr_SET_VIM(N_("attempt to refer to deleted buffer")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4824 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4825 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4826 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4827 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4828 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4829 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4830 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4831 RBItem(BufferObject *self, PyInt n, PyInt start, PyInt end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4832 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4833 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4834 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4835 |
| 4387 | 4836 if (end == -1) |
| 4837 end = self->buf->b_ml.ml_line_count; | |
| 4838 | |
| 4389 | 4839 if (n < 0) |
| 4840 n += end - start + 1; | |
| 4841 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4842 if (n < 0 || n > end - start) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4843 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4844 PyErr_SET_STRING(PyExc_IndexError, N_("line number out of range")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4845 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4846 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4847 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4848 return GetBufferLine(self->buf, n+start); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4849 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4850 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4851 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4852 RBSlice(BufferObject *self, PyInt lo, PyInt hi, PyInt start, PyInt end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4853 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4854 PyInt size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4855 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4856 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4857 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4858 |
| 4387 | 4859 if (end == -1) |
| 4860 end = self->buf->b_ml.ml_line_count; | |
| 4861 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4862 size = end - start + 1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4863 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4864 if (lo < 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4865 lo = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4866 else if (lo > size) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4867 lo = size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4868 if (hi < 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4869 hi = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4870 if (hi < lo) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4871 hi = lo; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4872 else if (hi > size) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4873 hi = size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4874 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4875 return GetBufferLineList(self->buf, lo+start, hi+start); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4876 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4877 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4878 static PyInt |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4879 RBAsItem( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4880 BufferObject *self, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4881 PyInt n, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4882 PyObject *valObject, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4883 PyInt start, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4884 PyInt end, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4885 PyInt *new_end) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4886 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4887 PyInt len_change; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4888 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4889 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4890 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4891 |
| 4387 | 4892 if (end == -1) |
| 4893 end = self->buf->b_ml.ml_line_count; | |
| 4894 | |
| 4389 | 4895 if (n < 0) |
| 4896 n += end - start + 1; | |
| 4897 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4898 if (n < 0 || n > end - start) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4899 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4900 PyErr_SET_STRING(PyExc_IndexError, N_("line number out of range")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4901 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4902 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4903 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4904 if (SetBufferLine(self->buf, n+start, valObject, &len_change) == FAIL) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4905 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4906 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4907 if (new_end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4908 *new_end = end + len_change; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4909 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4910 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4911 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4912 |
| 2894 | 4913 static PyInt |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4914 RBAsSlice( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4915 BufferObject *self, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4916 PyInt lo, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4917 PyInt hi, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4918 PyObject *valObject, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4919 PyInt start, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4920 PyInt end, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4921 PyInt *new_end) |
| 2894 | 4922 { |
| 4923 PyInt size; | |
| 4924 PyInt len_change; | |
| 4925 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4926 // Self must be a valid buffer |
| 2894 | 4927 if (CheckBuffer(self)) |
| 4928 return -1; | |
| 4929 | |
| 4387 | 4930 if (end == -1) |
| 4931 end = self->buf->b_ml.ml_line_count; | |
| 4932 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4933 // Sort out the slice range |
| 2894 | 4934 size = end - start + 1; |
| 4935 | |
| 4936 if (lo < 0) | |
| 4937 lo = 0; | |
| 4938 else if (lo > size) | |
| 4939 lo = size; | |
| 4940 if (hi < 0) | |
| 4941 hi = 0; | |
| 4942 if (hi < lo) | |
| 4943 hi = lo; | |
| 4944 else if (hi > size) | |
| 4945 hi = size; | |
| 4946 | |
| 4947 if (SetBufferLineList(self->buf, lo + start, hi + start, | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4948 valObject, &len_change) == FAIL) |
| 2894 | 4949 return -1; |
| 4950 | |
| 4951 if (new_end) | |
| 4952 *new_end = end + len_change; | |
| 4953 | |
| 4954 return 0; | |
| 4955 } | |
| 4956 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4957 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4958 static PyObject * |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4959 RBAppend( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4960 BufferObject *self, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4961 PyObject *args, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4962 PyInt start, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4963 PyInt end, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4964 PyInt *new_end) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4965 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4966 PyObject *lines; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4967 PyInt len_change; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4968 PyInt max; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4969 PyInt n; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4970 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4971 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4972 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4973 |
| 4387 | 4974 if (end == -1) |
| 4975 end = self->buf->b_ml.ml_line_count; | |
| 4976 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4977 max = n = end - start + 1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4978 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4979 if (!PyArg_ParseTuple(args, "O|n", &lines, &n)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4980 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4981 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4982 if (n < 0 || n > max) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4983 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4984 PyErr_SET_STRING(PyExc_IndexError, N_("line number out of range")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4985 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4986 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4987 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4988 if (InsertBufferLines(self->buf, n + start - 1, lines, &len_change) == FAIL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4989 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4990 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4991 if (new_end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4992 *new_end = end + len_change; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4993 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4994 Py_INCREF(Py_None); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4995 return Py_None; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4996 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4997 |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
4998 // Range object |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4999 |
| 4319 | 5000 static PyTypeObject RangeType; |
| 4385 | 5001 static PySequenceMethods RangeAsSeq; |
| 5002 static PyMappingMethods RangeAsMapping; | |
| 4319 | 5003 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5004 typedef struct |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5005 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5006 PyObject_HEAD |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5007 BufferObject *buf; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5008 PyInt start; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5009 PyInt end; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5010 } RangeObject; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5011 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5012 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5013 RangeNew(buf_T *buf, PyInt start, PyInt end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5014 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5015 BufferObject *bufr; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5016 RangeObject *self; |
| 4500 | 5017 self = PyObject_GC_New(RangeObject, &RangeType); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5018 if (self == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5019 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5020 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5021 bufr = (BufferObject *)BufferNew(buf); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5022 if (bufr == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5023 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5024 Py_DECREF(self); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5025 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5026 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5027 Py_INCREF(bufr); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5028 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5029 self->buf = bufr; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5030 self->start = start; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5031 self->end = end; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5032 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5033 return (PyObject *)(self); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5034 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5035 |
| 4319 | 5036 static void |
| 4488 | 5037 RangeDestructor(RangeObject *self) |
| 4319 | 5038 { |
| 4500 | 5039 PyObject_GC_UnTrack((void *)(self)); |
| 4498 | 5040 Py_XDECREF(self->buf); |
| 4500 | 5041 PyObject_GC_Del((void *)(self)); |
| 5042 } | |
| 5043 | |
| 5044 static int | |
| 5045 RangeTraverse(RangeObject *self, visitproc visit, void *arg) | |
| 5046 { | |
| 5047 Py_VISIT(((PyObject *)(self->buf))); | |
| 5048 return 0; | |
| 5049 } | |
| 5050 | |
| 5051 static int | |
| 5052 RangeClear(RangeObject *self) | |
| 5053 { | |
| 5054 Py_CLEAR(self->buf); | |
| 5055 return 0; | |
| 4319 | 5056 } |
| 5057 | |
| 4385 | 5058 static PyInt |
| 4488 | 5059 RangeLength(RangeObject *self) |
| 4385 | 5060 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5061 // HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION? |
| 4488 | 5062 if (CheckBuffer(self->buf)) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5063 return -1; // ??? |
| 4385 | 5064 |
| 4488 | 5065 return (self->end - self->start + 1); |
| 4385 | 5066 } |
| 5067 | |
| 5068 static PyObject * | |
| 4488 | 5069 RangeItem(RangeObject *self, PyInt n) |
| 4385 | 5070 { |
| 4488 | 5071 return RBItem(self->buf, n, self->start, self->end); |
| 4385 | 5072 } |
| 5073 | |
| 5074 static PyObject * | |
| 4488 | 5075 RangeSlice(RangeObject *self, PyInt lo, PyInt hi) |
| 4385 | 5076 { |
| 4488 | 5077 return RBSlice(self->buf, lo, hi, self->start, self->end); |
| 4385 | 5078 } |
| 5079 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5080 static char *RangeAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5081 "start", "end", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5082 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5083 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5084 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5085 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5086 RangeDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5087 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5088 return ObjectDir(self, RangeAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5089 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5090 |
| 4385 | 5091 static PyObject * |
| 4488 | 5092 RangeAppend(RangeObject *self, PyObject *args) |
| 4385 | 5093 { |
| 4488 | 5094 return RBAppend(self->buf, args, self->start, self->end, &self->end); |
| 4385 | 5095 } |
| 5096 | |
| 5097 static PyObject * | |
| 4488 | 5098 RangeRepr(RangeObject *self) |
| 4385 | 5099 { |
| 4488 | 5100 if (self->buf->buf == INVALID_BUFFER_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5101 return PyString_FromFormat("<range object (for deleted buffer) at %p>", |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5102 (self)); |
| 4385 | 5103 else |
| 5104 { | |
| 4488 | 5105 char *name = (char *)self->buf->buf->b_fname; |
| 4385 | 5106 |
| 5107 if (name == NULL) | |
| 5108 name = ""; | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5109 |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5110 return PyString_FromFormat("<range %s (%d:%d)>", |
|
4653
b943fd24c351
updated for version 7.3.1074
Bram Moolenaar <bram@vim.org>
parents:
4645
diff
changeset
|
5111 name, (int)self->start, (int)self->end); |
| 4385 | 5112 } |
| 5113 } | |
| 5114 | |
| 5115 static struct PyMethodDef RangeMethods[] = { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5116 // name, function, calling, documentation |
| 4492 | 5117 {"append", (PyCFunction)RangeAppend, METH_VARARGS, "Append data to the Vim range" }, |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5118 {"__dir__", (PyCFunction)RangeDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5119 { NULL, NULL, 0, NULL} |
| 4385 | 5120 }; |
| 5121 | |
| 4319 | 5122 static PyTypeObject BufferType; |
| 5123 static PySequenceMethods BufferAsSeq; | |
| 5124 static PyMappingMethods BufferAsMapping; | |
| 5125 | |
| 5126 static PyObject * | |
| 4377 | 5127 BufferNew(buf_T *buf) |
| 5128 { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5129 /* |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5130 * We need to handle deletion of buffers underneath us. |
| 4377 | 5131 * If we add a "b_python*_ref" field to the buf_T structure, |
| 5132 * then we can get at it in buf_freeall() in vim. We then | |
| 5133 * need to create only ONE Python object per buffer - if | |
| 5134 * we try to create a second, just INCREF the existing one | |
| 5135 * and return it. The (single) Python object referring to | |
| 5136 * the buffer is stored in "b_python*_ref". | |
| 5137 * Question: what to do on a buf_freeall(). We'll probably | |
| 5138 * have to either delete the Python object (DECREF it to | |
| 5139 * zero - a bad idea, as it leaves dangling refs!) or | |
| 5140 * set the buf_T * value to an invalid value (-1?), which | |
| 5141 * means we need checks in all access functions... Bah. | |
| 5142 * | |
| 4385 | 5143 * Python2 and Python3 get different fields and different objects: |
| 4377 | 5144 * b_python_ref and b_python3_ref fields respectively. |
| 5145 */ | |
| 5146 | |
| 5147 BufferObject *self; | |
| 5148 | |
| 5149 if (BUF_PYTHON_REF(buf) != NULL) | |
| 5150 { | |
| 5151 self = BUF_PYTHON_REF(buf); | |
| 5152 Py_INCREF(self); | |
| 5153 } | |
| 5154 else | |
| 5155 { | |
| 5156 self = PyObject_NEW(BufferObject, &BufferType); | |
| 5157 if (self == NULL) | |
| 5158 return NULL; | |
| 5159 self->buf = buf; | |
| 5160 BUF_PYTHON_REF(buf) = self; | |
| 5161 } | |
| 5162 | |
| 5163 return (PyObject *)(self); | |
| 5164 } | |
| 5165 | |
| 4385 | 5166 static void |
| 4488 | 5167 BufferDestructor(BufferObject *self) |
| 4319 | 5168 { |
| 4488 | 5169 if (self->buf && self->buf != INVALID_BUFFER_VALUE) |
| 5170 BUF_PYTHON_REF(self->buf) = NULL; | |
| 4385 | 5171 |
| 5172 DESTRUCTOR_FINISH(self); | |
| 4319 | 5173 } |
| 5174 | |
| 4377 | 5175 static PyInt |
| 4488 | 5176 BufferLength(BufferObject *self) |
| 4377 | 5177 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5178 // HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION? |
| 4488 | 5179 if (CheckBuffer(self)) |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5180 return -1; // ??? |
| 4377 | 5181 |
| 4488 | 5182 return (PyInt)(self->buf->b_ml.ml_line_count); |
| 4377 | 5183 } |
| 5184 | |
| 5185 static PyObject * | |
| 4488 | 5186 BufferItem(BufferObject *self, PyInt n) |
| 4377 | 5187 { |
| 4488 | 5188 return RBItem(self, n, 1, -1); |
| 4377 | 5189 } |
| 5190 | |
| 5191 static PyObject * | |
| 4488 | 5192 BufferSlice(BufferObject *self, PyInt lo, PyInt hi) |
| 4377 | 5193 { |
| 4488 | 5194 return RBSlice(self, lo, hi, 1, -1); |
| 4377 | 5195 } |
| 5196 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5197 static char *BufferAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5198 "name", "number", "vars", "options", "valid", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5199 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5200 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5201 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5202 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5203 BufferDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5204 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5205 return ObjectDir(self, BufferAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5206 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5207 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5208 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5209 BufferAttrValid(BufferObject *self, char *name) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5210 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5211 PyObject *ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5212 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5213 if (strcmp(name, "valid") != 0) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5214 return NULL; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5215 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5216 ret = ((self->buf == INVALID_BUFFER_VALUE) ? Py_False : Py_True); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5217 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5218 return ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5219 } |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5220 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
5221 static PyObject * |
| 4488 | 5222 BufferAttr(BufferObject *self, char *name) |
| 4385 | 5223 { |
| 5224 if (strcmp(name, "name") == 0) | |
|
4597
00eecb2f8e3e
updated for version 7.3.1046
Bram Moolenaar <bram@vim.org>
parents:
4595
diff
changeset
|
5225 return PyString_FromString((self->buf->b_ffname == NULL |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5226 ? "" : (char *)self->buf->b_ffname)); |
| 4385 | 5227 else if (strcmp(name, "number") == 0) |
| 4488 | 5228 return Py_BuildValue(Py_ssize_t_fmt, self->buf->b_fnum); |
| 4385 | 5229 else if (strcmp(name, "vars") == 0) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5230 return NEW_DICTIONARY(self->buf->b_vars); |
| 4385 | 5231 else if (strcmp(name, "options") == 0) |
| 4488 | 5232 return OptionsNew(SREQ_BUF, self->buf, (checkfun) CheckBuffer, |
| 5233 (PyObject *) self); | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5234 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5235 return ObjectDir(NULL, BufferAttrs); |
| 4385 | 5236 else |
| 5237 return NULL; | |
| 5238 } | |
| 5239 | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5240 static int |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5241 BufferSetattr(BufferObject *self, char *name, PyObject *valObject) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5242 { |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5243 if (CheckBuffer(self)) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5244 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5245 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5246 if (strcmp(name, "name") == 0) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5247 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5248 char_u *val; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5249 aco_save_T aco; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5250 int ren_ret; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5251 PyObject *todecref; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5252 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5253 if (!(val = StringToChars(valObject, &todecref))) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5254 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5255 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5256 VimTryStart(); |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5257 // Using aucmd_*: autocommands will be executed by rename_buffer |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5258 aucmd_prepbuf(&aco, self->buf); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5259 ren_ret = rename_buffer(val); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5260 aucmd_restbuf(&aco); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5261 Py_XDECREF(todecref); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5262 if (VimTryEnd()) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5263 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5264 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5265 if (ren_ret == FAIL) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5266 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5267 PyErr_SET_VIM(N_("failed to rename buffer")); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5268 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5269 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5270 return 0; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5271 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5272 else |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5273 { |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5274 PyErr_SetString(PyExc_AttributeError, name); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5275 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5276 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5277 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5278 |
| 4385 | 5279 static PyObject * |
| 4488 | 5280 BufferAppend(BufferObject *self, PyObject *args) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5281 { |
| 4488 | 5282 return RBAppend(self, args, 1, -1, NULL); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5283 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5284 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5285 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5286 BufferMark(BufferObject *self, PyObject *pmarkObject) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5287 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5288 pos_T *posp; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5289 char_u *pmark; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5290 char_u mark; |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
5291 bufref_T savebuf; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5292 PyObject *todecref; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5293 |
| 4488 | 5294 if (CheckBuffer(self)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5295 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5296 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5297 if (!(pmark = StringToChars(pmarkObject, &todecref))) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5298 return NULL; |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
5299 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5300 if (pmark[0] == '\0' || pmark[1] != '\0') |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
5301 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
5302 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5303 N_("mark name must be a single character")); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
5304 Py_XDECREF(todecref); |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
5305 return NULL; |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
5306 } |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
5307 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5308 mark = *pmark; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5309 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5310 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5311 |
| 4498 | 5312 VimTryStart(); |
| 4488 | 5313 switch_buffer(&savebuf, self->buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5314 posp = getmark(mark, FALSE); |
|
9487
69ed2c9d34a6
commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b
Christian Brabandt <cb@256bit.org>
parents:
9161
diff
changeset
|
5315 restore_buffer(&savebuf); |
| 4498 | 5316 if (VimTryEnd()) |
| 5317 return NULL; | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5318 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5319 if (posp == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5320 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5321 PyErr_SET_VIM(N_("invalid mark name")); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5322 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5323 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5324 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5325 if (posp->lnum <= 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5326 { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5327 // Or raise an error? |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5328 Py_INCREF(Py_None); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5329 return Py_None; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5330 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5331 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5332 return Py_BuildValue("(ll)", (long)(posp->lnum), (long)(posp->col)); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5333 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5334 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5335 static PyObject * |
| 4488 | 5336 BufferRange(BufferObject *self, PyObject *args) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5337 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5338 PyInt start; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5339 PyInt end; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5340 |
| 4488 | 5341 if (CheckBuffer(self)) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5342 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5343 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5344 if (!PyArg_ParseTuple(args, "nn", &start, &end)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5345 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5346 |
| 4488 | 5347 return RangeNew(self->buf, start, end); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5348 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5349 |
| 4319 | 5350 static PyObject * |
| 4488 | 5351 BufferRepr(BufferObject *self) |
| 4319 | 5352 { |
| 4488 | 5353 if (self->buf == INVALID_BUFFER_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5354 return PyString_FromFormat("<buffer object (deleted) at %p>", self); |
| 4319 | 5355 else |
| 5356 { | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5357 char *name = (char *)self->buf->b_fname; |
| 4319 | 5358 |
| 5359 if (name == NULL) | |
| 5360 name = ""; | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5361 |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
5362 return PyString_FromFormat("<buffer %s>", name); |
| 4319 | 5363 } |
| 5364 } | |
| 5365 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5366 static struct PyMethodDef BufferMethods[] = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5367 // name, function, calling, documentation |
| 4492 | 5368 {"append", (PyCFunction)BufferAppend, METH_VARARGS, "Append data to Vim buffer" }, |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
5369 {"mark", (PyCFunction)BufferMark, METH_O, "Return (row,col) representing position of named mark" }, |
| 4492 | 5370 {"range", (PyCFunction)BufferRange, METH_VARARGS, "Return a range object which represents the part of the given buffer between line numbers s and e" }, |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5371 {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5372 { NULL, NULL, 0, NULL} |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5373 }; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5374 |
| 4397 | 5375 /* |
| 5376 * Buffer list object - Implementation | |
| 5377 */ | |
| 5378 | |
| 5379 static PyTypeObject BufMapType; | |
| 5380 | |
| 5381 typedef struct | |
| 5382 { | |
| 5383 PyObject_HEAD | |
| 5384 } BufMapObject; | |
| 5385 | |
| 5386 static PyInt | |
| 5387 BufMapLength(PyObject *self UNUSED) | |
| 5388 { | |
| 5389 buf_T *b = firstbuf; | |
| 5390 PyInt n = 0; | |
| 5391 | |
| 5392 while (b) | |
| 5393 { | |
| 5394 ++n; | |
| 5395 b = b->b_next; | |
| 5396 } | |
| 5397 | |
| 5398 return n; | |
| 5399 } | |
| 5400 | |
| 5401 static PyObject * | |
| 5402 BufMapItem(PyObject *self UNUSED, PyObject *keyObject) | |
| 5403 { | |
| 5404 buf_T *b; | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5405 long bnr; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5406 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5407 if (NumberToLong(keyObject, &bnr, NUMBER_INT|NUMBER_NATURAL)) |
| 4397 | 5408 return NULL; |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5409 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5410 b = buflist_findnr((int) bnr); |
| 4397 | 5411 |
| 5412 if (b) | |
| 5413 return BufferNew(b); | |
| 5414 else | |
| 5415 { | |
| 4403 | 5416 PyErr_SetObject(PyExc_KeyError, keyObject); |
| 4397 | 5417 return NULL; |
| 5418 } | |
| 5419 } | |
| 5420 | |
| 5421 static void | |
| 5422 BufMapIterDestruct(PyObject *buffer) | |
| 5423 { | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5424 // Iteration was stopped before all buffers were processed |
| 4397 | 5425 if (buffer) |
| 5426 { | |
| 5427 Py_DECREF(buffer); | |
| 5428 } | |
| 5429 } | |
| 5430 | |
| 4433 | 5431 static int |
| 5432 BufMapIterTraverse(PyObject *buffer, visitproc visit, void *arg) | |
| 5433 { | |
| 4500 | 5434 if (buffer) |
| 5435 Py_VISIT(buffer); | |
| 4433 | 5436 return 0; |
| 5437 } | |
| 5438 | |
| 5439 static int | |
| 5440 BufMapIterClear(PyObject **buffer) | |
| 5441 { | |
| 4500 | 5442 if (*buffer) |
| 5443 Py_CLEAR(*buffer); | |
| 4433 | 5444 return 0; |
| 5445 } | |
| 5446 | |
| 4397 | 5447 static PyObject * |
| 5448 BufMapIterNext(PyObject **buffer) | |
| 5449 { | |
| 5450 PyObject *next; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5451 PyObject *ret; |
| 4397 | 5452 |
| 5453 if (!*buffer) | |
| 5454 return NULL; | |
| 5455 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5456 ret = *buffer; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5457 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5458 if (CheckBuffer((BufferObject *)(ret))) |
| 4397 | 5459 { |
| 5460 *buffer = NULL; | |
| 5461 return NULL; | |
| 5462 } | |
| 5463 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5464 if (!((BufferObject *)(ret))->buf->b_next) |
| 4397 | 5465 next = NULL; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5466 else if (!(next = BufferNew(((BufferObject *)(ret))->buf->b_next))) |
| 4397 | 5467 return NULL; |
| 5468 *buffer = next; | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5469 // Do not increment reference: we no longer hold it (decref), but whoever |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5470 // on other side will hold (incref). Decref+incref = nothing. |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5471 return ret; |
| 4397 | 5472 } |
| 5473 | |
| 5474 static PyObject * | |
| 5475 BufMapIter(PyObject *self UNUSED) | |
| 5476 { | |
| 5477 PyObject *buffer; | |
| 5478 | |
| 5479 buffer = BufferNew(firstbuf); | |
| 5480 return IterNew(buffer, | |
| 4433 | 5481 (destructorfun) BufMapIterDestruct, (nextfun) BufMapIterNext, |
| 5482 (traversefun) BufMapIterTraverse, (clearfun) BufMapIterClear); | |
| 4397 | 5483 } |
| 5484 | |
| 5485 static PyMappingMethods BufMapAsMapping = { | |
| 5486 (lenfunc) BufMapLength, | |
| 5487 (binaryfunc) BufMapItem, | |
| 5488 (objobjargproc) 0, | |
| 5489 }; | |
| 5490 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5491 // Current items object |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
5492 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5493 static char *CurrentAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5494 "buffer", "window", "line", "range", "tabpage", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5495 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5496 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5497 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5498 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5499 CurrentDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5500 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5501 return ObjectDir(self, CurrentAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5502 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5503 |
| 4319 | 5504 static PyObject * |
| 5505 CurrentGetattr(PyObject *self UNUSED, char *name) | |
| 5506 { | |
| 5507 if (strcmp(name, "buffer") == 0) | |
| 5508 return (PyObject *)BufferNew(curbuf); | |
| 5509 else if (strcmp(name, "window") == 0) | |
| 4431 | 5510 return (PyObject *)WindowNew(curwin, curtab); |
| 4401 | 5511 else if (strcmp(name, "tabpage") == 0) |
| 5512 return (PyObject *)TabPageNew(curtab); | |
| 4319 | 5513 else if (strcmp(name, "line") == 0) |
| 5514 return GetBufferLine(curbuf, (PyInt)curwin->w_cursor.lnum); | |
| 5515 else if (strcmp(name, "range") == 0) | |
| 5516 return RangeNew(curbuf, RangeStart, RangeEnd); | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5517 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5518 return ObjectDir(NULL, CurrentAttrs); |
| 4319 | 5519 else |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5520 #if PY_MAJOR_VERSION < 3 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5521 return Py_FindMethod(WindowMethods, self, name); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5522 #else |
| 4319 | 5523 return NULL; |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5524 #endif |
| 4319 | 5525 } |
| 5526 | |
| 5527 static int | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5528 CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *valObject) |
| 4319 | 5529 { |
| 5530 if (strcmp(name, "line") == 0) | |
| 5531 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5532 if (SetBufferLine(curbuf, (PyInt)curwin->w_cursor.lnum, valObject, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5533 NULL) == FAIL) |
| 4319 | 5534 return -1; |
| 5535 | |
| 5536 return 0; | |
| 5537 } | |
| 4407 | 5538 else if (strcmp(name, "buffer") == 0) |
| 5539 { | |
| 5540 int count; | |
| 5541 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5542 if (valObject->ob_type != &BufferType) |
| 4407 | 5543 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5544 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5545 N_("expected vim.Buffer object, but got %s"), |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5546 Py_TYPE_NAME(valObject)); |
| 4407 | 5547 return -1; |
| 5548 } | |
| 5549 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5550 if (CheckBuffer((BufferObject *)(valObject))) |
| 4407 | 5551 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5552 count = ((BufferObject *)(valObject))->buf->b_fnum; |
| 4407 | 5553 |
| 4498 | 5554 VimTryStart(); |
| 4407 | 5555 if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, count, 0) == FAIL) |
| 5556 { | |
| 4498 | 5557 if (VimTryEnd()) |
| 5558 return -1; | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5559 PyErr_VIM_FORMAT(N_("failed to switch to buffer %d"), count); |
| 4407 | 5560 return -1; |
| 5561 } | |
| 5562 | |
| 4498 | 5563 return VimTryEnd(); |
| 4407 | 5564 } |
| 5565 else if (strcmp(name, "window") == 0) | |
| 5566 { | |
| 5567 int count; | |
| 5568 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5569 if (valObject->ob_type != &WindowType) |
| 4407 | 5570 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5571 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5572 N_("expected vim.Window object, but got %s"), |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5573 Py_TYPE_NAME(valObject)); |
| 4407 | 5574 return -1; |
| 5575 } | |
| 5576 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5577 if (CheckWindow((WindowObject *)(valObject))) |
| 4407 | 5578 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5579 count = get_win_number(((WindowObject *)(valObject))->win, firstwin); |
| 4407 | 5580 |
| 5581 if (!count) | |
| 5582 { | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
5583 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5584 N_("failed to find window in the current tab page")); |
| 4407 | 5585 return -1; |
| 5586 } | |
| 5587 | |
| 4498 | 5588 VimTryStart(); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5589 win_goto(((WindowObject *)(valObject))->win); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5590 if (((WindowObject *)(valObject))->win != curwin) |
| 4407 | 5591 { |
| 4498 | 5592 if (VimTryEnd()) |
| 5593 return -1; | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
5594 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5595 N_("did not switch to the specified window")); |
| 4407 | 5596 return -1; |
| 5597 } | |
| 5598 | |
| 4498 | 5599 return VimTryEnd(); |
| 4407 | 5600 } |
| 5601 else if (strcmp(name, "tabpage") == 0) | |
| 5602 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5603 if (valObject->ob_type != &TabPageType) |
| 4407 | 5604 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5605 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5606 N_("expected vim.TabPage object, but got %s"), |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5607 Py_TYPE_NAME(valObject)); |
| 4407 | 5608 return -1; |
| 5609 } | |
| 5610 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5611 if (CheckTabPage((TabPageObject *)(valObject))) |
| 4407 | 5612 return -1; |
| 5613 | |
| 4498 | 5614 VimTryStart(); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5615 goto_tabpage_tp(((TabPageObject *)(valObject))->tab, TRUE, TRUE); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5616 if (((TabPageObject *)(valObject))->tab != curtab) |
| 4407 | 5617 { |
| 4498 | 5618 if (VimTryEnd()) |
| 5619 return -1; | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
5620 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5621 N_("did not switch to the specified tab page")); |
| 4407 | 5622 return -1; |
| 5623 } | |
| 5624 | |
| 4498 | 5625 return VimTryEnd(); |
| 4407 | 5626 } |
| 4319 | 5627 else |
| 5628 { | |
| 5629 PyErr_SetString(PyExc_AttributeError, name); | |
| 5630 return -1; | |
| 5631 } | |
| 5632 } | |
| 5633 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5634 static struct PyMethodDef CurrentMethods[] = { |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5635 // name, function, calling, documentation |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5636 {"__dir__", (PyCFunction)CurrentDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5637 { NULL, NULL, 0, NULL} |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5638 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5639 |
| 3618 | 5640 static void |
| 4486 | 5641 init_range_cmd(exarg_T *eap) |
| 5642 { | |
| 5643 RangeStart = eap->line1; | |
| 5644 RangeEnd = eap->line2; | |
| 5645 } | |
| 5646 | |
| 5647 static void | |
| 5648 init_range_eval(typval_T *rettv UNUSED) | |
| 5649 { | |
| 5650 RangeStart = (PyInt) curwin->w_cursor.lnum; | |
| 5651 RangeEnd = RangeStart; | |
| 5652 } | |
| 5653 | |
| 5654 static void | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5655 run_cmd(const char *cmd, void *arg UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5656 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5657 , PyGILState_STATE *pygilstate UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5658 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5659 ) |
| 4486 | 5660 { |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5661 PyObject *run_ret; |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5662 run_ret = PyRun_String((char *)cmd, Py_file_input, globals, globals); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5663 if (run_ret != NULL) |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5664 { |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5665 Py_DECREF(run_ret); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5666 } |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5667 else if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit)) |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5668 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5669 semsg(_(e_py_systemexit), "python"); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5670 PyErr_Clear(); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5671 } |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5672 else |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5673 PyErr_PrintEx(1); |
| 4486 | 5674 } |
| 5675 | |
| 5676 static const char *code_hdr = "def " DOPY_FUNC "(line, linenr):\n "; | |
| 5677 static int code_hdr_len = 30; | |
| 5678 | |
| 5679 static void | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5680 run_do(const char *cmd, void *arg UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5681 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5682 , PyGILState_STATE *pygilstate |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5683 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5684 ) |
| 4486 | 5685 { |
| 5686 PyInt lnum; | |
| 5687 size_t len; | |
| 5688 char *code; | |
| 5689 int status; | |
| 5690 PyObject *pyfunc, *pymain; | |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5691 PyObject *run_ret; |
|
10751
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5692 buf_T *was_curbuf = curbuf; |
| 4486 | 5693 |
|
4575
626e9ccb7c48
updated for version 7.3.1035
Bram Moolenaar <bram@vim.org>
parents:
4523
diff
changeset
|
5694 if (u_save((linenr_T)RangeStart - 1, (linenr_T)RangeEnd + 1) != OK) |
| 4486 | 5695 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5696 emsg(_("cannot save undo information")); |
| 4486 | 5697 return; |
| 5698 } | |
| 5699 | |
| 5700 len = code_hdr_len + STRLEN(cmd); | |
| 5701 code = PyMem_New(char, len + 1); | |
| 5702 memcpy(code, code_hdr, code_hdr_len); | |
| 5703 STRCPY(code + code_hdr_len, cmd); | |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5704 run_ret = PyRun_String(code, Py_file_input, globals, globals); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5705 status = -1; |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5706 if (run_ret != NULL) |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5707 { |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5708 status = 0; |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5709 Py_DECREF(run_ret); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5710 } |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5711 else if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit)) |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5712 { |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5713 PyMem_Free(code); |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5714 semsg(_(e_py_systemexit), "python"); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5715 PyErr_Clear(); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5716 return; |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5717 } |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5718 else |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5719 PyErr_PrintEx(1); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5720 |
| 4486 | 5721 PyMem_Free(code); |
| 5722 | |
| 5723 if (status) | |
| 5724 { | |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5725 emsg(_("failed to run the code")); |
| 4486 | 5726 return; |
| 5727 } | |
| 5728 | |
| 5729 status = 0; | |
| 5730 pymain = PyImport_AddModule("__main__"); | |
| 5731 pyfunc = PyObject_GetAttrString(pymain, DOPY_FUNC); | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5732 #ifdef PY_CAN_RECURSE |
| 4486 | 5733 PyGILState_Release(*pygilstate); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5734 #endif |
| 4486 | 5735 |
| 5736 for (lnum = RangeStart; lnum <= RangeEnd; ++lnum) | |
| 5737 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5738 PyObject *line; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5739 PyObject *linenr; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5740 PyObject *ret; |
| 4486 | 5741 |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5742 #ifdef PY_CAN_RECURSE |
| 4486 | 5743 *pygilstate = PyGILState_Ensure(); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5744 #endif |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5745 // Check the line number, the command my have deleted lines. |
|
10751
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5746 if (lnum > curbuf->b_ml.ml_line_count |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5747 || !(line = GetBufferLine(curbuf, lnum))) |
| 4486 | 5748 goto err; |
| 5749 if (!(linenr = PyInt_FromLong((long) lnum))) | |
| 5750 { | |
| 5751 Py_DECREF(line); | |
| 5752 goto err; | |
| 5753 } | |
| 5754 ret = PyObject_CallFunctionObjArgs(pyfunc, line, linenr, NULL); | |
| 5755 Py_DECREF(line); | |
| 5756 Py_DECREF(linenr); | |
| 5757 if (!ret) | |
| 5758 goto err; | |
| 5759 | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
5760 // Check that the command didn't switch to another buffer. |
|
10751
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5761 if (curbuf != was_curbuf) |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5762 { |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5763 Py_XDECREF(ret); |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5764 goto err; |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5765 } |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5766 |
| 4486 | 5767 if (ret != Py_None) |
| 5768 if (SetBufferLine(curbuf, lnum, ret, NULL) == FAIL) | |
|
10751
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5769 { |
|
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5770 Py_XDECREF(ret); |
| 4486 | 5771 goto err; |
|
10751
27b42717662b
patch 8.0.0265: may get ml_get error when :pydo deletes lines
Christian Brabandt <cb@256bit.org>
parents:
9967
diff
changeset
|
5772 } |
| 4486 | 5773 |
| 5774 Py_XDECREF(ret); | |
| 5775 PythonIO_Flush(); | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5776 #ifdef PY_CAN_RECURSE |
| 4486 | 5777 PyGILState_Release(*pygilstate); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5778 #endif |
| 4486 | 5779 } |
| 5780 goto out; | |
| 5781 err: | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5782 #ifdef PY_CAN_RECURSE |
| 4486 | 5783 *pygilstate = PyGILState_Ensure(); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5784 #endif |
| 4486 | 5785 PyErr_PrintEx(0); |
| 5786 PythonIO_Flush(); | |
| 5787 status = 1; | |
| 5788 out: | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5789 #ifdef PY_CAN_RECURSE |
| 4486 | 5790 if (!status) |
| 5791 *pygilstate = PyGILState_Ensure(); | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5792 #endif |
| 4486 | 5793 Py_DECREF(pyfunc); |
| 5794 PyObject_SetAttrString(pymain, DOPY_FUNC, NULL); | |
| 5795 if (status) | |
| 5796 return; | |
| 5797 check_cursor(); | |
| 5798 update_curbuf(NOT_VALID); | |
| 5799 } | |
| 5800 | |
| 5801 static void | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5802 run_eval(const char *cmd, typval_T *rettv |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5803 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5804 , PyGILState_STATE *pygilstate UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5805 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5806 ) |
| 4486 | 5807 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5808 PyObject *run_ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5809 |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5810 run_ret = PyRun_String((char *)cmd, Py_eval_input, globals, globals); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5811 if (run_ret == NULL) |
| 4486 | 5812 { |
|
5139
80bab8b1a30d
updated for version 7.3.1312
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
5813 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit)) |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5814 { |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5815 semsg(_(e_py_systemexit), "python"); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5816 PyErr_Clear(); |
|
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4995
diff
changeset
|
5817 } |
|
5139
80bab8b1a30d
updated for version 7.3.1312
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
5818 else |
|
80bab8b1a30d
updated for version 7.3.1312
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
5819 { |
|
80bab8b1a30d
updated for version 7.3.1312
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
5820 if (PyErr_Occurred() && !msg_silent) |
|
80bab8b1a30d
updated for version 7.3.1312
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
5821 PyErr_PrintEx(0); |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5822 emsg(_("E858: Eval did not return a valid python object")); |
|
5139
80bab8b1a30d
updated for version 7.3.1312
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
5823 } |
| 4486 | 5824 } |
| 5825 else | |
| 5826 { | |
|
12806
ef93c4415667
patch 8.0.1280: Python None cannot be converted to a Vim type
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
5827 if (ConvertFromPyObject(run_ret, rettv) == -1) |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
5828 emsg(_("E859: Failed to convert returned python object to vim value")); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5829 Py_DECREF(run_ret); |
| 4486 | 5830 } |
| 5831 PyErr_Clear(); | |
| 5832 } | |
| 5833 | |
| 6565 | 5834 static int |
| 3618 | 5835 set_ref_in_py(const int copyID) |
| 5836 { | |
| 5837 pylinkedlist_T *cur; | |
|
17168
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5838 list_T *ll; |
|
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5839 int i; |
|
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5840 int abort = FALSE; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5841 FunctionObject *func; |
| 3618 | 5842 |
| 5843 if (lastdict != NULL) | |
| 6565 | 5844 { |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5845 for (cur = lastdict ; !abort && cur != NULL ; cur = cur->pll_prev) |
|
17168
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5846 abort = set_ref_in_dict(((DictionaryObject *)(cur->pll_obj))->dict, |
|
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5847 copyID); |
| 6565 | 5848 } |
| 3618 | 5849 |
| 5850 if (lastlist != NULL) | |
| 6565 | 5851 { |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5852 for (cur = lastlist ; !abort && cur != NULL ; cur = cur->pll_prev) |
| 3618 | 5853 { |
| 5854 ll = ((ListObject *) (cur->pll_obj))->list; | |
|
17168
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5855 abort = set_ref_in_list(ll, copyID); |
| 3618 | 5856 } |
| 6565 | 5857 } |
| 5858 | |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5859 if (lastfunc != NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5860 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5861 for (cur = lastfunc ; !abort && cur != NULL ; cur = cur->pll_prev) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5862 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5863 func = (FunctionObject *) cur->pll_obj; |
|
17168
1d30eb64a7a2
patch 8.1.1583: set_ref_in_list() only sets ref in items
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
5864 abort = set_ref_in_dict(func->self, copyID); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5865 if (func->argc) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5866 for (i = 0; !abort && i < func->argc; ++i) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5867 abort = abort |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5868 || set_ref_in_item(&func->argv[i], copyID, NULL, NULL); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5869 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5870 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
5871 |
| 6565 | 5872 return abort; |
| 3618 | 5873 } |
| 5874 | |
| 5875 static int | |
| 5876 set_string_copy(char_u *str, typval_T *tv) | |
| 5877 { | |
| 5878 tv->vval.v_string = vim_strsave(str); | |
| 5879 if (tv->vval.v_string == NULL) | |
| 5880 { | |
| 5881 PyErr_NoMemory(); | |
| 5882 return -1; | |
| 5883 } | |
| 5884 return 0; | |
| 5885 } | |
| 5886 | |
| 4385 | 5887 static int |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5888 pydict_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 4385 | 5889 { |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5890 dict_T *dict; |
| 4385 | 5891 char_u *key; |
| 5892 dictitem_T *di; | |
| 5893 PyObject *keyObject; | |
| 5894 PyObject *valObject; | |
| 5895 Py_ssize_t iter = 0; | |
| 5896 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5897 if (!(dict = py_dict_alloc())) |
| 4385 | 5898 return -1; |
| 5899 | |
| 5900 tv->v_type = VAR_DICT; | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5901 tv->vval.v_dict = dict; |
| 4385 | 5902 |
| 5903 while (PyDict_Next(obj, &iter, &keyObject, &valObject)) | |
| 5904 { | |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5905 PyObject *todecref = NULL; |
| 4385 | 5906 |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5907 if (keyObject == NULL || valObject == NULL) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5908 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5909 dict_unref(dict); |
| 4385 | 5910 return -1; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5911 } |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5912 |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5913 if (!(key = StringToChars(keyObject, &todecref))) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5914 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5915 dict_unref(dict); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5916 return -1; |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5917 } |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
5918 |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5919 if (*key == NUL) |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5920 { |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5921 dict_unref(dict); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5922 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5923 RAISE_NO_EMPTY_KEYS; |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5924 return -1; |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5925 } |
| 4385 | 5926 |
| 5927 di = dictitem_alloc(key); | |
| 5928 | |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5929 Py_XDECREF(todecref); |
| 4385 | 5930 |
| 5931 if (di == NULL) | |
| 5932 { | |
| 5933 PyErr_NoMemory(); | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5934 dict_unref(dict); |
| 4385 | 5935 return -1; |
| 5936 } | |
| 5937 | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5938 if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1) |
| 4385 | 5939 { |
| 5940 vim_free(di); | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5941 dict_unref(dict); |
| 4385 | 5942 return -1; |
| 5943 } | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5944 |
|
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5945 if (dict_add(dict, di) == FAIL) |
| 4385 | 5946 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5947 RAISE_KEY_ADD_FAIL(di->di_key); |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5948 clear_tv(&di->di_tv); |
| 4385 | 5949 vim_free(di); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5950 dict_unref(dict); |
| 4385 | 5951 return -1; |
| 5952 } | |
| 5953 } | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5954 |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5955 --dict->dv_refcount; |
| 4385 | 5956 return 0; |
| 5957 } | |
| 5958 | |
| 5959 static int | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5960 pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 4385 | 5961 { |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5962 dict_T *dict; |
| 4385 | 5963 char_u *key; |
| 5964 dictitem_T *di; | |
| 5965 PyObject *list; | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5966 PyObject *iterator; |
| 4385 | 5967 PyObject *keyObject; |
| 5968 PyObject *valObject; | |
| 5969 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5970 if (!(dict = py_dict_alloc())) |
| 4385 | 5971 return -1; |
| 5972 | |
| 5973 tv->v_type = VAR_DICT; | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5974 tv->vval.v_dict = dict; |
| 4385 | 5975 |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5976 if (!(list = PyMapping_Keys(obj))) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5977 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5978 dict_unref(dict); |
| 4385 | 5979 return -1; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5980 } |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5981 |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5982 if (!(iterator = PyObject_GetIter(list))) |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5983 { |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5984 dict_unref(dict); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5985 Py_DECREF(list); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5986 return -1; |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5987 } |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5988 Py_DECREF(list); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5989 |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5990 while ((keyObject = PyIter_Next(iterator))) |
| 4385 | 5991 { |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5992 PyObject *todecref; |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5993 |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5994 if (!(key = StringToChars(keyObject, &todecref))) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5995 { |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5996 Py_DECREF(keyObject); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5997 Py_DECREF(iterator); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5998 dict_unref(dict); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5999 return -1; |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6000 } |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
6001 |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6002 if (*key == NUL) |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6003 { |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6004 Py_DECREF(keyObject); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6005 Py_DECREF(iterator); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6006 Py_XDECREF(todecref); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6007 dict_unref(dict); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
6008 RAISE_NO_EMPTY_KEYS; |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6009 return -1; |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6010 } |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6011 |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6012 if (!(valObject = PyObject_GetItem(obj, keyObject))) |
| 4385 | 6013 { |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6014 Py_DECREF(keyObject); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6015 Py_DECREF(iterator); |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6016 Py_XDECREF(todecref); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6017 dict_unref(dict); |
| 4385 | 6018 return -1; |
| 6019 } | |
| 6020 | |
| 6021 di = dictitem_alloc(key); | |
| 6022 | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6023 Py_DECREF(keyObject); |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
6024 Py_XDECREF(todecref); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6025 |
| 4385 | 6026 if (di == NULL) |
| 6027 { | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6028 Py_DECREF(iterator); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6029 Py_DECREF(valObject); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6030 dict_unref(dict); |
| 4385 | 6031 PyErr_NoMemory(); |
| 6032 return -1; | |
| 6033 } | |
| 6034 | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6035 if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1) |
| 4385 | 6036 { |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6037 Py_DECREF(iterator); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6038 Py_DECREF(valObject); |
| 4385 | 6039 vim_free(di); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6040 dict_unref(dict); |
| 4385 | 6041 return -1; |
| 6042 } | |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6043 |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6044 Py_DECREF(valObject); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6045 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6046 if (dict_add(dict, di) == FAIL) |
| 4385 | 6047 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
6048 RAISE_KEY_ADD_FAIL(di->di_key); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6049 Py_DECREF(iterator); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6050 dictitem_free(di); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6051 dict_unref(dict); |
| 4385 | 6052 return -1; |
| 6053 } | |
| 6054 } | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6055 Py_DECREF(iterator); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6056 --dict->dv_refcount; |
| 4385 | 6057 return 0; |
| 6058 } | |
| 6059 | |
| 6060 static int | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6061 pyseq_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 4385 | 6062 { |
| 6063 list_T *l; | |
| 6064 | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6065 if (!(l = py_list_alloc())) |
| 4385 | 6066 return -1; |
| 6067 | |
| 6068 tv->v_type = VAR_LIST; | |
| 6069 tv->vval.v_list = l; | |
| 6070 | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6071 if (list_py_concat(l, obj, lookup_dict) == -1) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6072 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6073 list_unref(l); |
| 4385 | 6074 return -1; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6075 } |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6076 |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6077 --l->lv_refcount; |
| 4385 | 6078 return 0; |
| 6079 } | |
| 6080 | |
| 3618 | 6081 typedef int (*pytotvfunc)(PyObject *, typval_T *, PyObject *); |
| 6082 | |
| 6083 static int | |
| 6084 convert_dl(PyObject *obj, typval_T *tv, | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6085 pytotvfunc py_to_tv, PyObject *lookup_dict) |
| 3618 | 6086 { |
| 6087 PyObject *capsule; | |
| 6088 char hexBuf[sizeof(void *) * 2 + 3]; | |
| 6089 | |
|
13353
8412df1479a3
patch 8.0.1550: various small problems in source files
Christian Brabandt <cb@256bit.org>
parents:
12812
diff
changeset
|
6090 sprintf(hexBuf, "%p", (void *)obj); |
| 3618 | 6091 |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6092 #ifdef PY_USE_CAPSULE |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6093 capsule = PyDict_GetItemString(lookup_dict, hexBuf); |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6094 #else |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6095 capsule = (PyObject *)PyDict_GetItemString(lookup_dict, hexBuf); |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6096 #endif |
| 3618 | 6097 if (capsule == NULL) |
| 6098 { | |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6099 #ifdef PY_USE_CAPSULE |
| 3618 | 6100 capsule = PyCapsule_New(tv, NULL, NULL); |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6101 #else |
| 3648 | 6102 capsule = PyCObject_FromVoidPtr(tv, NULL); |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6103 #endif |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6104 if (PyDict_SetItemString(lookup_dict, hexBuf, capsule)) |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6105 { |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6106 Py_DECREF(capsule); |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6107 tv->v_type = VAR_UNKNOWN; |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6108 return -1; |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
6109 } |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
6110 |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
6111 Py_DECREF(capsule); |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
6112 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6113 if (py_to_tv(obj, tv, lookup_dict) == -1) |
| 3618 | 6114 { |
| 6115 tv->v_type = VAR_UNKNOWN; | |
| 6116 return -1; | |
| 6117 } | |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
6118 // As we are not using copy_tv which increments reference count we must |
|
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
6119 // do it ourself. |
|
7949
3f7382858d4d
commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371
Christian Brabandt <cb@256bit.org>
parents:
7712
diff
changeset
|
6120 if (tv->v_type == VAR_DICT) |
|
3f7382858d4d
commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371
Christian Brabandt <cb@256bit.org>
parents:
7712
diff
changeset
|
6121 ++tv->vval.v_dict->dv_refcount; |
|
3f7382858d4d
commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371
Christian Brabandt <cb@256bit.org>
parents:
7712
diff
changeset
|
6122 else if (tv->v_type == VAR_LIST) |
|
3f7382858d4d
commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371
Christian Brabandt <cb@256bit.org>
parents:
7712
diff
changeset
|
6123 ++tv->vval.v_list->lv_refcount; |
| 3618 | 6124 } |
| 6125 else | |
| 6126 { | |
| 3638 | 6127 typval_T *v; |
| 6128 | |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6129 #ifdef PY_USE_CAPSULE |
| 3638 | 6130 v = PyCapsule_GetPointer(capsule, NULL); |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6131 #else |
| 3648 | 6132 v = PyCObject_AsVoidPtr(capsule); |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6133 #endif |
| 3618 | 6134 copy_tv(v, tv); |
| 6135 } | |
| 6136 return 0; | |
| 6137 } | |
| 6138 | |
| 6139 static int | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6140 ConvertFromPyMapping(PyObject *obj, typval_T *tv) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6141 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6142 PyObject *lookup_dict; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6143 int ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6144 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6145 if (!(lookup_dict = PyDict_New())) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6146 return -1; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6147 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6148 if (PyType_IsSubtype(obj->ob_type, &DictionaryType)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6149 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6150 tv->v_type = VAR_DICT; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6151 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6152 ++tv->vval.v_dict->dv_refcount; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6153 ret = 0; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6154 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6155 else if (PyDict_Check(obj)) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6156 ret = convert_dl(obj, tv, pydict_to_tv, lookup_dict); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6157 else if (PyMapping_Check(obj)) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6158 ret = convert_dl(obj, tv, pymap_to_tv, lookup_dict); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6159 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6160 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
6161 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
6162 N_("unable to convert %s to vim dictionary"), |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
6163 Py_TYPE_NAME(obj)); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6164 ret = -1; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6165 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6166 Py_DECREF(lookup_dict); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6167 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6168 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6169 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6170 static int |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6171 ConvertFromPySequence(PyObject *obj, typval_T *tv) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6172 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6173 PyObject *lookup_dict; |
|
8915
8cbf472483fa
commit https://github.com/vim/vim/commit/66210042892389d36e3d37203ec77f61467bfb1c
Christian Brabandt <cb@256bit.org>
parents:
8913
diff
changeset
|
6174 int ret; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6175 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6176 if (!(lookup_dict = PyDict_New())) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6177 return -1; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6178 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6179 if (PyType_IsSubtype(obj->ob_type, &ListType)) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6180 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6181 tv->v_type = VAR_LIST; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6182 tv->vval.v_list = (((ListObject *)(obj))->list); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6183 ++tv->vval.v_list->lv_refcount; |
|
8915
8cbf472483fa
commit https://github.com/vim/vim/commit/66210042892389d36e3d37203ec77f61467bfb1c
Christian Brabandt <cb@256bit.org>
parents:
8913
diff
changeset
|
6184 ret = 0; |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6185 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6186 else if (PyIter_Check(obj) || PySequence_Check(obj)) |
|
8915
8cbf472483fa
commit https://github.com/vim/vim/commit/66210042892389d36e3d37203ec77f61467bfb1c
Christian Brabandt <cb@256bit.org>
parents:
8913
diff
changeset
|
6187 ret = convert_dl(obj, tv, pyseq_to_tv, lookup_dict); |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6188 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6189 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6190 PyErr_FORMAT(PyExc_TypeError, |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6191 N_("unable to convert %s to vim list"), |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6192 Py_TYPE_NAME(obj)); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6193 ret = -1; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6194 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6195 Py_DECREF(lookup_dict); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6196 return ret; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6197 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6198 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6199 static int |
| 3618 | 6200 ConvertFromPyObject(PyObject *obj, typval_T *tv) |
| 6201 { | |
| 6202 PyObject *lookup_dict; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6203 int ret; |
| 3618 | 6204 |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6205 if (!(lookup_dict = PyDict_New())) |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
6206 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6207 ret = _ConvertFromPyObject(obj, tv, lookup_dict); |
| 3618 | 6208 Py_DECREF(lookup_dict); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6209 return ret; |
| 3618 | 6210 } |
| 6211 | |
| 6212 static int | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6213 _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 3618 | 6214 { |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6215 if (PyType_IsSubtype(obj->ob_type, &DictionaryType)) |
| 3618 | 6216 { |
| 6217 tv->v_type = VAR_DICT; | |
| 6218 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict); | |
| 6219 ++tv->vval.v_dict->dv_refcount; | |
| 6220 } | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
6221 else if (PyType_IsSubtype(obj->ob_type, &ListType)) |
| 3618 | 6222 { |
| 6223 tv->v_type = VAR_LIST; | |
| 6224 tv->vval.v_list = (((ListObject *)(obj))->list); | |
| 6225 ++tv->vval.v_list->lv_refcount; | |
| 6226 } | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
6227 else if (PyType_IsSubtype(obj->ob_type, &FunctionType)) |
| 3618 | 6228 { |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6229 FunctionObject *func = (FunctionObject *) obj; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6230 if (func->self != NULL || func->argv != NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6231 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
6232 partial_T *pt = ALLOC_CLEAR_ONE(partial_T); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
6233 |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6234 set_partial(func, pt, TRUE); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6235 tv->vval.v_partial = pt; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6236 tv->v_type = VAR_PARTIAL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6237 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6238 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6239 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6240 if (set_string_copy(func->name, tv) == -1) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6241 return -1; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6242 |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6243 tv->v_type = VAR_FUNC; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6244 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6245 func_ref(func->name); |
| 3618 | 6246 } |
| 6247 else if (PyBytes_Check(obj)) | |
| 6248 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6249 char_u *str; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6250 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6251 if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1) |
| 3800 | 6252 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6253 if (str == NULL) |
| 3618 | 6254 return -1; |
| 6255 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6256 if (set_string_copy(str, tv) == -1) |
| 3618 | 6257 return -1; |
| 6258 | |
| 6259 tv->v_type = VAR_STRING; | |
| 6260 } | |
| 6261 else if (PyUnicode_Check(obj)) | |
| 6262 { | |
| 6263 PyObject *bytes; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6264 char_u *str; |
| 3618 | 6265 |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
6266 bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL); |
| 3618 | 6267 if (bytes == NULL) |
| 6268 return -1; | |
| 6269 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6270 if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1) |
| 3800 | 6271 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6272 if (str == NULL) |
| 3618 | 6273 return -1; |
| 6274 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6275 if (set_string_copy(str, tv)) |
| 3618 | 6276 { |
| 6277 Py_XDECREF(bytes); | |
| 6278 return -1; | |
| 6279 } | |
| 6280 Py_XDECREF(bytes); | |
| 6281 | |
| 6282 tv->v_type = VAR_STRING; | |
| 6283 } | |
| 4321 | 6284 #if PY_MAJOR_VERSION < 3 |
| 3618 | 6285 else if (PyInt_Check(obj)) |
| 6286 { | |
| 6287 tv->v_type = VAR_NUMBER; | |
| 6288 tv->vval.v_number = (varnumber_T) PyInt_AsLong(obj); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6289 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6290 return -1; |
| 3618 | 6291 } |
| 6292 #endif | |
| 6293 else if (PyLong_Check(obj)) | |
| 6294 { | |
| 6295 tv->v_type = VAR_NUMBER; | |
| 6296 tv->vval.v_number = (varnumber_T) PyLong_AsLong(obj); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6297 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6298 return -1; |
| 3618 | 6299 } |
| 6300 else if (PyDict_Check(obj)) | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6301 return convert_dl(obj, tv, pydict_to_tv, lookup_dict); |
| 3618 | 6302 #ifdef FEAT_FLOAT |
| 6303 else if (PyFloat_Check(obj)) | |
| 6304 { | |
| 6305 tv->v_type = VAR_FLOAT; | |
| 6306 tv->vval.v_float = (float_T) PyFloat_AsDouble(obj); | |
| 6307 } | |
| 6308 #endif | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6309 else if (PyObject_HasAttrString(obj, "keys")) |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
6310 return convert_dl(obj, tv, pymap_to_tv, lookup_dict); |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
6311 // PyObject_GetIter can create built-in iterator for any sequence object |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
6312 else if (PyIter_Check(obj) || PySequence_Check(obj)) |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6313 return convert_dl(obj, tv, pyseq_to_tv, lookup_dict); |
| 3618 | 6314 else if (PyMapping_Check(obj)) |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
6315 return convert_dl(obj, tv, pymap_to_tv, lookup_dict); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6316 else if (PyNumber_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6317 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6318 PyObject *num; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6319 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6320 if (!(num = PyNumber_Long(obj))) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6321 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6322 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6323 tv->v_type = VAR_NUMBER; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6324 tv->vval.v_number = (varnumber_T) PyLong_AsLong(num); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6325 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6326 Py_DECREF(num); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
6327 } |
|
12806
ef93c4415667
patch 8.0.1280: Python None cannot be converted to a Vim type
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
6328 else if (obj == Py_None) |
|
ef93c4415667
patch 8.0.1280: Python None cannot be converted to a Vim type
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
6329 { |
|
ef93c4415667
patch 8.0.1280: Python None cannot be converted to a Vim type
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
6330 tv->v_type = VAR_SPECIAL; |
|
ef93c4415667
patch 8.0.1280: Python None cannot be converted to a Vim type
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
6331 tv->vval.v_number = VVAL_NONE; |
|
ef93c4415667
patch 8.0.1280: Python None cannot be converted to a Vim type
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
6332 } |
| 3618 | 6333 else |
| 6334 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
6335 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
6336 N_("unable to convert %s to vim structure"), |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
6337 Py_TYPE_NAME(obj)); |
| 3618 | 6338 return -1; |
| 6339 } | |
| 6340 return 0; | |
| 6341 } | |
| 6342 | |
| 6343 static PyObject * | |
| 6344 ConvertToPyObject(typval_T *tv) | |
| 6345 { | |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6346 typval_T *argv; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6347 int i; |
| 3618 | 6348 if (tv == NULL) |
| 6349 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
6350 PyErr_SET_VIM(N_("internal error: NULL reference passed")); |
| 3618 | 6351 return NULL; |
| 6352 } | |
| 6353 switch (tv->v_type) | |
| 6354 { | |
| 6355 case VAR_STRING: | |
| 3852 | 6356 return PyBytes_FromString(tv->vval.v_string == NULL |
| 6357 ? "" : (char *)tv->vval.v_string); | |
| 3618 | 6358 case VAR_NUMBER: |
| 6359 return PyLong_FromLong((long) tv->vval.v_number); | |
|
19193
9f98957582d6
patch 8.2.0155: warnings from MinGW compiler; tests fail without +float
Bram Moolenaar <Bram@vim.org>
parents:
19181
diff
changeset
|
6360 case VAR_FLOAT: |
| 3618 | 6361 #ifdef FEAT_FLOAT |
| 6362 return PyFloat_FromDouble((double) tv->vval.v_float); | |
| 6363 #endif | |
| 6364 case VAR_LIST: | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
6365 return NEW_LIST(tv->vval.v_list); |
| 3618 | 6366 case VAR_DICT: |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6367 return NEW_DICTIONARY(tv->vval.v_dict); |
| 3618 | 6368 case VAR_FUNC: |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
6369 return NEW_FUNCTION(tv->vval.v_string == NULL |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6370 ? (char_u *)"" : tv->vval.v_string, |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
6371 0, NULL, NULL, TRUE); |
|
8714
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6372 case VAR_PARTIAL: |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6373 if (tv->vval.v_partial->pt_argc) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6374 { |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6375 argv = PyMem_New(typval_T, (size_t)tv->vval.v_partial->pt_argc); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6376 for (i = 0; i < tv->vval.v_partial->pt_argc; i++) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6377 copy_tv(&tv->vval.v_partial->pt_argv[i], &argv[i]); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6378 } |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6379 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6380 argv = NULL; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6381 if (tv->vval.v_partial->pt_dict != NULL) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6382 tv->vval.v_partial->pt_dict->dv_refcount++; |
|
8714
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6383 return NEW_FUNCTION(tv->vval.v_partial == NULL |
|
9723
80ac9cf77c9b
commit https://github.com/vim/vim/commit/437bafe4c8a83ed71ee006eda7f54b65a90f0d4c
Christian Brabandt <cb@256bit.org>
parents:
9487
diff
changeset
|
6384 ? (char_u *)"" : partial_name(tv->vval.v_partial), |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8714
diff
changeset
|
6385 tv->vval.v_partial->pt_argc, argv, |
|
9119
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
6386 tv->vval.v_partial->pt_dict, |
|
39cc63e8df7c
commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252
Christian Brabandt <cb@256bit.org>
parents:
8967
diff
changeset
|
6387 tv->vval.v_partial->pt_auto); |
|
15454
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
6388 case VAR_BLOB: |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
6389 return PyBytes_FromStringAndSize( |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
6390 (char*) tv->vval.v_blob->bv_ga.ga_data, |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
15236
diff
changeset
|
6391 (Py_ssize_t) tv->vval.v_blob->bv_ga.ga_len); |
| 3618 | 6392 case VAR_UNKNOWN: |
|
19922
1f42c49c3d29
patch 8.2.0517: Vim9: cannot separate "func" and "func(): void"
Bram Moolenaar <Bram@vim.org>
parents:
19888
diff
changeset
|
6393 case VAR_ANY: |
|
19181
94eda51ba9ba
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Bram Moolenaar <Bram@vim.org>
parents:
19102
diff
changeset
|
6394 case VAR_VOID: |
|
8714
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6395 case VAR_CHANNEL: |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6396 case VAR_JOB: |
| 3618 | 6397 Py_INCREF(Py_None); |
| 6398 return Py_None; | |
|
19102
ba9f50bfda83
patch 8.2.0111: VAR_SPECIAL is also used for booleans
Bram Moolenaar <Bram@vim.org>
parents:
19019
diff
changeset
|
6399 case VAR_BOOL: |
|
8714
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6400 case VAR_SPECIAL: |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6401 switch (tv->vval.v_number) |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6402 { |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6403 case VVAL_FALSE: return AlwaysFalse(NULL); |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6404 case VVAL_TRUE: return AlwaysTrue(NULL); |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6405 case VVAL_NONE: |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6406 case VVAL_NULL: return AlwaysNone(NULL); |
|
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6407 } |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
6408 PyErr_SET_VIM(N_("internal error: invalid value type")); |
| 3618 | 6409 return NULL; |
| 6410 } | |
|
8714
a5224eeb3546
commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
6411 return NULL; |
| 3618 | 6412 } |
| 4319 | 6413 |
| 6414 typedef struct | |
| 6415 { | |
| 6416 PyObject_HEAD | |
| 6417 } CurrentObject; | |
| 6418 static PyTypeObject CurrentType; | |
| 6419 | |
| 6420 static void | |
| 6421 init_structs(void) | |
| 6422 { | |
| 6423 vim_memset(&OutputType, 0, sizeof(OutputType)); | |
| 6424 OutputType.tp_name = "vim.message"; | |
| 6425 OutputType.tp_basicsize = sizeof(OutputObject); | |
| 6426 OutputType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 6427 OutputType.tp_doc = "vim message object"; | |
| 6428 OutputType.tp_methods = OutputMethods; | |
| 6429 #if PY_MAJOR_VERSION >= 3 | |
| 4488 | 6430 OutputType.tp_getattro = (getattrofunc)OutputGetattro; |
| 6431 OutputType.tp_setattro = (setattrofunc)OutputSetattro; | |
| 4319 | 6432 OutputType.tp_alloc = call_PyType_GenericAlloc; |
| 6433 OutputType.tp_new = call_PyType_GenericNew; | |
| 6434 OutputType.tp_free = call_PyObject_Free; | |
|
13952
76a65058766f
patch 8.0.1846: Python interface is incompatible with lldb
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
6435 OutputType.tp_base = &PyStdPrinter_Type; |
| 4319 | 6436 #else |
| 4488 | 6437 OutputType.tp_getattr = (getattrfunc)OutputGetattr; |
| 6438 OutputType.tp_setattr = (setattrfunc)OutputSetattr; | |
|
13952
76a65058766f
patch 8.0.1846: Python interface is incompatible with lldb
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
6439 // Disabled, because this causes a crash in test86 |
|
76a65058766f
patch 8.0.1846: Python interface is incompatible with lldb
Christian Brabandt <cb@256bit.org>
parents:
13353
diff
changeset
|
6440 // OutputType.tp_base = &PyFile_Type; |
| 4319 | 6441 #endif |
| 6442 | |
| 4397 | 6443 vim_memset(&IterType, 0, sizeof(IterType)); |
| 6444 IterType.tp_name = "vim.iter"; | |
| 6445 IterType.tp_basicsize = sizeof(IterObject); | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
6446 IterType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4397 | 6447 IterType.tp_doc = "generic iterator object"; |
| 4488 | 6448 IterType.tp_iter = (getiterfunc)IterIter; |
| 6449 IterType.tp_iternext = (iternextfunc)IterNext; | |
| 6450 IterType.tp_dealloc = (destructor)IterDestructor; | |
| 6451 IterType.tp_traverse = (traverseproc)IterTraverse; | |
| 6452 IterType.tp_clear = (inquiry)IterClear; | |
| 4397 | 6453 |
| 4319 | 6454 vim_memset(&BufferType, 0, sizeof(BufferType)); |
| 6455 BufferType.tp_name = "vim.buffer"; | |
| 6456 BufferType.tp_basicsize = sizeof(BufferType); | |
| 4488 | 6457 BufferType.tp_dealloc = (destructor)BufferDestructor; |
| 6458 BufferType.tp_repr = (reprfunc)BufferRepr; | |
| 4319 | 6459 BufferType.tp_as_sequence = &BufferAsSeq; |
| 6460 BufferType.tp_as_mapping = &BufferAsMapping; | |
| 6461 BufferType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 6462 BufferType.tp_doc = "vim buffer object"; | |
| 6463 BufferType.tp_methods = BufferMethods; | |
| 6464 #if PY_MAJOR_VERSION >= 3 | |
| 4488 | 6465 BufferType.tp_getattro = (getattrofunc)BufferGetattro; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
6466 BufferType.tp_setattro = (setattrofunc)BufferSetattro; |
| 4319 | 6467 BufferType.tp_alloc = call_PyType_GenericAlloc; |
| 6468 BufferType.tp_new = call_PyType_GenericNew; | |
| 6469 BufferType.tp_free = call_PyObject_Free; | |
| 6470 #else | |
| 4488 | 6471 BufferType.tp_getattr = (getattrfunc)BufferGetattr; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
6472 BufferType.tp_setattr = (setattrfunc)BufferSetattr; |
| 4319 | 6473 #endif |
| 6474 | |
| 6475 vim_memset(&WindowType, 0, sizeof(WindowType)); | |
| 6476 WindowType.tp_name = "vim.window"; | |
| 6477 WindowType.tp_basicsize = sizeof(WindowObject); | |
| 4488 | 6478 WindowType.tp_dealloc = (destructor)WindowDestructor; |
| 6479 WindowType.tp_repr = (reprfunc)WindowRepr; | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
6480 WindowType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4319 | 6481 WindowType.tp_doc = "vim Window object"; |
| 6482 WindowType.tp_methods = WindowMethods; | |
| 4488 | 6483 WindowType.tp_traverse = (traverseproc)WindowTraverse; |
| 6484 WindowType.tp_clear = (inquiry)WindowClear; | |
| 4319 | 6485 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 6486 WindowType.tp_getattro = (getattrofunc)WindowGetattro; |
| 6487 WindowType.tp_setattro = (setattrofunc)WindowSetattro; | |
| 4319 | 6488 WindowType.tp_alloc = call_PyType_GenericAlloc; |
| 6489 WindowType.tp_new = call_PyType_GenericNew; | |
| 6490 WindowType.tp_free = call_PyObject_Free; | |
| 6491 #else | |
| 4488 | 6492 WindowType.tp_getattr = (getattrfunc)WindowGetattr; |
| 6493 WindowType.tp_setattr = (setattrfunc)WindowSetattr; | |
| 4319 | 6494 #endif |
| 6495 | |
| 4401 | 6496 vim_memset(&TabPageType, 0, sizeof(TabPageType)); |
| 6497 TabPageType.tp_name = "vim.tabpage"; | |
| 6498 TabPageType.tp_basicsize = sizeof(TabPageObject); | |
| 4488 | 6499 TabPageType.tp_dealloc = (destructor)TabPageDestructor; |
| 6500 TabPageType.tp_repr = (reprfunc)TabPageRepr; | |
| 4401 | 6501 TabPageType.tp_flags = Py_TPFLAGS_DEFAULT; |
| 6502 TabPageType.tp_doc = "vim tab page object"; | |
| 6503 TabPageType.tp_methods = TabPageMethods; | |
| 6504 #if PY_MAJOR_VERSION >= 3 | |
| 4488 | 6505 TabPageType.tp_getattro = (getattrofunc)TabPageGetattro; |
| 4401 | 6506 TabPageType.tp_alloc = call_PyType_GenericAlloc; |
| 6507 TabPageType.tp_new = call_PyType_GenericNew; | |
| 6508 TabPageType.tp_free = call_PyObject_Free; | |
| 6509 #else | |
| 4488 | 6510 TabPageType.tp_getattr = (getattrfunc)TabPageGetattr; |
| 4401 | 6511 #endif |
| 6512 | |
| 4393 | 6513 vim_memset(&BufMapType, 0, sizeof(BufMapType)); |
| 6514 BufMapType.tp_name = "vim.bufferlist"; | |
| 6515 BufMapType.tp_basicsize = sizeof(BufMapObject); | |
| 6516 BufMapType.tp_as_mapping = &BufMapAsMapping; | |
| 6517 BufMapType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 4397 | 6518 BufMapType.tp_iter = BufMapIter; |
| 4319 | 6519 BufferType.tp_doc = "vim buffer list"; |
| 6520 | |
| 6521 vim_memset(&WinListType, 0, sizeof(WinListType)); | |
| 6522 WinListType.tp_name = "vim.windowlist"; | |
| 6523 WinListType.tp_basicsize = sizeof(WinListType); | |
| 6524 WinListType.tp_as_sequence = &WinListAsSeq; | |
| 6525 WinListType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 6526 WinListType.tp_doc = "vim window list"; | |
| 4488 | 6527 WinListType.tp_dealloc = (destructor)WinListDestructor; |
| 4401 | 6528 |
| 6529 vim_memset(&TabListType, 0, sizeof(TabListType)); | |
| 6530 TabListType.tp_name = "vim.tabpagelist"; | |
| 6531 TabListType.tp_basicsize = sizeof(TabListType); | |
| 6532 TabListType.tp_as_sequence = &TabListAsSeq; | |
| 6533 TabListType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 6534 TabListType.tp_doc = "vim tab page list"; | |
| 4319 | 6535 |
| 6536 vim_memset(&RangeType, 0, sizeof(RangeType)); | |
| 6537 RangeType.tp_name = "vim.range"; | |
| 6538 RangeType.tp_basicsize = sizeof(RangeObject); | |
| 4488 | 6539 RangeType.tp_dealloc = (destructor)RangeDestructor; |
| 6540 RangeType.tp_repr = (reprfunc)RangeRepr; | |
| 4319 | 6541 RangeType.tp_as_sequence = &RangeAsSeq; |
| 6542 RangeType.tp_as_mapping = &RangeAsMapping; | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
6543 RangeType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4319 | 6544 RangeType.tp_doc = "vim Range object"; |
| 6545 RangeType.tp_methods = RangeMethods; | |
| 4500 | 6546 RangeType.tp_traverse = (traverseproc)RangeTraverse; |
| 6547 RangeType.tp_clear = (inquiry)RangeClear; | |
| 4319 | 6548 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 6549 RangeType.tp_getattro = (getattrofunc)RangeGetattro; |
| 4319 | 6550 RangeType.tp_alloc = call_PyType_GenericAlloc; |
| 6551 RangeType.tp_new = call_PyType_GenericNew; | |
| 6552 RangeType.tp_free = call_PyObject_Free; | |
| 6553 #else | |
| 4488 | 6554 RangeType.tp_getattr = (getattrfunc)RangeGetattr; |
| 4319 | 6555 #endif |
| 6556 | |
| 6557 vim_memset(&CurrentType, 0, sizeof(CurrentType)); | |
| 6558 CurrentType.tp_name = "vim.currentdata"; | |
| 6559 CurrentType.tp_basicsize = sizeof(CurrentObject); | |
| 6560 CurrentType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 6561 CurrentType.tp_doc = "vim current object"; | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
6562 CurrentType.tp_methods = CurrentMethods; |
| 4319 | 6563 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 6564 CurrentType.tp_getattro = (getattrofunc)CurrentGetattro; |
| 6565 CurrentType.tp_setattro = (setattrofunc)CurrentSetattro; | |
| 4319 | 6566 #else |
| 4488 | 6567 CurrentType.tp_getattr = (getattrfunc)CurrentGetattr; |
| 6568 CurrentType.tp_setattr = (setattrfunc)CurrentSetattr; | |
| 4319 | 6569 #endif |
| 6570 | |
| 6571 vim_memset(&DictionaryType, 0, sizeof(DictionaryType)); | |
| 6572 DictionaryType.tp_name = "vim.dictionary"; | |
| 6573 DictionaryType.tp_basicsize = sizeof(DictionaryObject); | |
| 4488 | 6574 DictionaryType.tp_dealloc = (destructor)DictionaryDestructor; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6575 DictionaryType.tp_as_sequence = &DictionaryAsSeq; |
| 4319 | 6576 DictionaryType.tp_as_mapping = &DictionaryAsMapping; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6577 DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE; |
| 4319 | 6578 DictionaryType.tp_doc = "dictionary pushing modifications to vim structure"; |
| 6579 DictionaryType.tp_methods = DictionaryMethods; | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6580 DictionaryType.tp_iter = (getiterfunc)DictionaryIter; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6581 DictionaryType.tp_new = (newfunc)DictionaryConstructor; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
6582 DictionaryType.tp_alloc = (allocfunc)PyType_GenericAlloc; |
| 4319 | 6583 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 6584 DictionaryType.tp_getattro = (getattrofunc)DictionaryGetattro; |
| 6585 DictionaryType.tp_setattro = (setattrofunc)DictionarySetattro; | |
| 4319 | 6586 #else |
| 4488 | 6587 DictionaryType.tp_getattr = (getattrfunc)DictionaryGetattr; |
| 6588 DictionaryType.tp_setattr = (setattrfunc)DictionarySetattr; | |
| 4319 | 6589 #endif |
| 6590 | |
| 6591 vim_memset(&ListType, 0, sizeof(ListType)); | |
| 6592 ListType.tp_name = "vim.list"; | |
| 4488 | 6593 ListType.tp_dealloc = (destructor)ListDestructor; |
| 4319 | 6594 ListType.tp_basicsize = sizeof(ListObject); |
| 6595 ListType.tp_as_sequence = &ListAsSeq; | |
| 6596 ListType.tp_as_mapping = &ListAsMapping; | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
6597 ListType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE; |
| 4319 | 6598 ListType.tp_doc = "list pushing modifications to vim structure"; |
| 6599 ListType.tp_methods = ListMethods; | |
| 4488 | 6600 ListType.tp_iter = (getiterfunc)ListIter; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
6601 ListType.tp_new = (newfunc)ListConstructor; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
6602 ListType.tp_alloc = (allocfunc)PyType_GenericAlloc; |
| 4319 | 6603 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 6604 ListType.tp_getattro = (getattrofunc)ListGetattro; |
| 6605 ListType.tp_setattro = (setattrofunc)ListSetattro; | |
| 4319 | 6606 #else |
| 4488 | 6607 ListType.tp_getattr = (getattrfunc)ListGetattr; |
| 6608 ListType.tp_setattr = (setattrfunc)ListSetattr; | |
| 4319 | 6609 #endif |
| 6610 | |
| 6611 vim_memset(&FunctionType, 0, sizeof(FunctionType)); | |
| 4397 | 6612 FunctionType.tp_name = "vim.function"; |
| 4319 | 6613 FunctionType.tp_basicsize = sizeof(FunctionObject); |
| 4488 | 6614 FunctionType.tp_dealloc = (destructor)FunctionDestructor; |
| 6615 FunctionType.tp_call = (ternaryfunc)FunctionCall; | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
6616 FunctionType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE; |
| 4319 | 6617 FunctionType.tp_doc = "object that calls vim function"; |
| 6618 FunctionType.tp_methods = FunctionMethods; | |
|
4625
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
6619 FunctionType.tp_repr = (reprfunc)FunctionRepr; |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
6620 FunctionType.tp_new = (newfunc)FunctionConstructor; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
6621 FunctionType.tp_alloc = (allocfunc)PyType_GenericAlloc; |
| 4319 | 6622 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 6623 FunctionType.tp_getattro = (getattrofunc)FunctionGetattro; |
| 4319 | 6624 #else |
| 4488 | 6625 FunctionType.tp_getattr = (getattrfunc)FunctionGetattr; |
| 4319 | 6626 #endif |
| 6627 | |
| 4350 | 6628 vim_memset(&OptionsType, 0, sizeof(OptionsType)); |
| 6629 OptionsType.tp_name = "vim.options"; | |
| 6630 OptionsType.tp_basicsize = sizeof(OptionsObject); | |
| 5610 | 6631 OptionsType.tp_as_sequence = &OptionsAsSeq; |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
6632 OptionsType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4350 | 6633 OptionsType.tp_doc = "object for manipulating options"; |
| 5610 | 6634 OptionsType.tp_iter = (getiterfunc)OptionsIter; |
| 4350 | 6635 OptionsType.tp_as_mapping = &OptionsAsMapping; |
| 4488 | 6636 OptionsType.tp_dealloc = (destructor)OptionsDestructor; |
| 6637 OptionsType.tp_traverse = (traverseproc)OptionsTraverse; | |
| 6638 OptionsType.tp_clear = (inquiry)OptionsClear; | |
| 4350 | 6639 |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6640 #if PY_VERSION_HEX < 0x030700f0 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6641 vim_memset(&LoaderType, 0, sizeof(LoaderType)); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6642 LoaderType.tp_name = "vim.Loader"; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6643 LoaderType.tp_basicsize = sizeof(LoaderObject); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6644 LoaderType.tp_flags = Py_TPFLAGS_DEFAULT; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6645 LoaderType.tp_doc = "vim message object"; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6646 LoaderType.tp_methods = LoaderMethods; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6647 LoaderType.tp_dealloc = (destructor)LoaderDestructor; |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6648 #endif |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6649 |
| 4319 | 6650 #if PY_MAJOR_VERSION >= 3 |
| 6651 vim_memset(&vimmodule, 0, sizeof(vimmodule)); | |
| 6652 vimmodule.m_name = "vim"; | |
| 6653 vimmodule.m_doc = "Vim Python interface\n"; | |
| 6654 vimmodule.m_size = -1; | |
| 6655 vimmodule.m_methods = VimMethods; | |
| 6656 #endif | |
| 6657 } | |
| 4494 | 6658 |
| 6659 #define PYTYPE_READY(type) \ | |
| 6660 if (PyType_Ready(&type)) \ | |
| 6661 return -1; | |
| 6662 | |
| 6663 static int | |
|
5166
467efeee8f9e
updated for version 7.4a.009
Bram Moolenaar <bram@vim.org>
parents:
5139
diff
changeset
|
6664 init_types(void) |
| 4494 | 6665 { |
| 6666 PYTYPE_READY(IterType); | |
| 6667 PYTYPE_READY(BufferType); | |
| 6668 PYTYPE_READY(RangeType); | |
| 6669 PYTYPE_READY(WindowType); | |
| 6670 PYTYPE_READY(TabPageType); | |
| 6671 PYTYPE_READY(BufMapType); | |
| 6672 PYTYPE_READY(WinListType); | |
| 6673 PYTYPE_READY(TabListType); | |
| 6674 PYTYPE_READY(CurrentType); | |
| 6675 PYTYPE_READY(DictionaryType); | |
| 6676 PYTYPE_READY(ListType); | |
| 6677 PYTYPE_READY(FunctionType); | |
| 6678 PYTYPE_READY(OptionsType); | |
| 6679 PYTYPE_READY(OutputType); | |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6680 #if PY_VERSION_HEX < 0x030700f0 |
|
4851
96e154e825a7
updated for version 7.3.1172
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
6681 PYTYPE_READY(LoaderType); |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6682 #endif |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6683 return 0; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6684 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6685 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6686 static int |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
6687 init_sys_path(void) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6688 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6689 PyObject *path; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6690 PyObject *path_hook; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6691 PyObject *path_hooks; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6692 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6693 if (!(path_hook = PyObject_GetAttrString(vim_module, "path_hook"))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6694 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6695 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6696 if (!(path_hooks = PySys_GetObject("path_hooks"))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6697 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6698 PyErr_Clear(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6699 path_hooks = PyList_New(1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6700 PyList_SET_ITEM(path_hooks, 0, path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6701 if (PySys_SetObject("path_hooks", path_hooks)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6702 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6703 Py_DECREF(path_hooks); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6704 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6705 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6706 Py_DECREF(path_hooks); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6707 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6708 else if (PyList_Check(path_hooks)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6709 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6710 if (PyList_Append(path_hooks, path_hook)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6711 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6712 Py_DECREF(path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6713 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6714 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6715 Py_DECREF(path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6716 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6717 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6718 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6719 VimTryStart(); |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
6720 emsg(_("Failed to set path hook: sys.path_hooks is not a list\n" |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6721 "You should now do the following:\n" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6722 "- append vim.path_hook to sys.path_hooks\n" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6723 "- append vim.VIM_SPECIAL_PATH to sys.path\n")); |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
6724 VimTryEnd(); // Discard the error |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6725 Py_DECREF(path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6726 return 0; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6727 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6728 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6729 if (!(path = PySys_GetObject("path"))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6730 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6731 PyErr_Clear(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6732 path = PyList_New(1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6733 Py_INCREF(vim_special_path_object); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6734 PyList_SET_ITEM(path, 0, vim_special_path_object); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6735 if (PySys_SetObject("path", path)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6736 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6737 Py_DECREF(path); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6738 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6739 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6740 Py_DECREF(path); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6741 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6742 else if (PyList_Check(path)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6743 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6744 if (PyList_Append(path, vim_special_path_object)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6745 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6746 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6747 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6748 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6749 VimTryStart(); |
|
15470
55ccc2d353bd
patch 8.1.0743: giving error messages is not flexible
Bram Moolenaar <Bram@vim.org>
parents:
15454
diff
changeset
|
6750 emsg(_("Failed to set path: sys.path is not a list\n" |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6751 "You should now append vim.VIM_SPECIAL_PATH to sys.path")); |
|
18753
6e3dc2d630c2
patch 8.1.2366: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18370
diff
changeset
|
6752 VimTryEnd(); // Discard the error |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6753 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6754 |
| 4494 | 6755 return 0; |
| 6756 } | |
| 6757 | |
| 6758 static BufMapObject TheBufferMap = | |
| 6759 { | |
| 6760 PyObject_HEAD_INIT(&BufMapType) | |
| 6761 }; | |
| 6762 | |
| 6763 static WinListObject TheWindowList = | |
| 6764 { | |
| 6765 PyObject_HEAD_INIT(&WinListType) | |
| 6766 NULL | |
| 6767 }; | |
| 6768 | |
| 6769 static CurrentObject TheCurrent = | |
| 6770 { | |
| 6771 PyObject_HEAD_INIT(&CurrentType) | |
| 6772 }; | |
| 6773 | |
| 6774 static TabListObject TheTabPageList = | |
| 6775 { | |
| 6776 PyObject_HEAD_INIT(&TabListType) | |
| 6777 }; | |
| 6778 | |
| 6779 static struct numeric_constant { | |
| 6780 char *name; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6781 int val; |
| 4494 | 6782 } numeric_constants[] = { |
| 6783 {"VAR_LOCKED", VAR_LOCKED}, | |
| 6784 {"VAR_FIXED", VAR_FIXED}, | |
| 6785 {"VAR_SCOPE", VAR_SCOPE}, | |
| 6786 {"VAR_DEF_SCOPE", VAR_DEF_SCOPE}, | |
| 6787 }; | |
| 6788 | |
| 6789 static struct object_constant { | |
| 6790 char *name; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6791 PyObject *valObject; |
| 4494 | 6792 } object_constants[] = { |
| 6793 {"buffers", (PyObject *)(void *)&TheBufferMap}, | |
| 6794 {"windows", (PyObject *)(void *)&TheWindowList}, | |
| 6795 {"tabpages", (PyObject *)(void *)&TheTabPageList}, | |
| 6796 {"current", (PyObject *)(void *)&TheCurrent}, | |
| 4496 | 6797 |
| 6798 {"Buffer", (PyObject *)&BufferType}, | |
| 6799 {"Range", (PyObject *)&RangeType}, | |
| 6800 {"Window", (PyObject *)&WindowType}, | |
| 6801 {"TabPage", (PyObject *)&TabPageType}, | |
| 6802 {"Dictionary", (PyObject *)&DictionaryType}, | |
| 6803 {"List", (PyObject *)&ListType}, | |
| 6804 {"Function", (PyObject *)&FunctionType}, | |
| 6805 {"Options", (PyObject *)&OptionsType}, | |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6806 #if PY_VERSION_HEX < 0x030700f0 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6807 {"_Loader", (PyObject *)&LoaderType}, |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6808 #endif |
| 4494 | 6809 }; |
| 6810 | |
| 6811 #define ADD_OBJECT(m, name, obj) \ | |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
6812 if (PyModule_AddObject(m, name, obj)) \ |
| 4494 | 6813 return -1; |
| 6814 | |
| 6815 #define ADD_CHECKED_OBJECT(m, name, obj) \ | |
| 6816 { \ | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6817 PyObject *valObject = obj; \ |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6818 if (!valObject) \ |
| 4494 | 6819 return -1; \ |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6820 ADD_OBJECT(m, name, valObject); \ |
| 4494 | 6821 } |
| 6822 | |
| 6823 static int | |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
6824 populate_module(PyObject *m) |
| 4494 | 6825 { |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6826 int i; |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6827 PyObject *other_module; |
|
4831
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6828 PyObject *attr; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6829 PyObject *imp; |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6830 #if PY_VERSION_HEX >= 0x030700f0 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6831 PyObject *dict; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6832 PyObject *cls; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6833 #endif |
| 4494 | 6834 |
| 6835 for (i = 0; i < (int)(sizeof(numeric_constants) | |
| 6836 / sizeof(struct numeric_constant)); | |
| 6837 ++i) | |
| 6838 ADD_CHECKED_OBJECT(m, numeric_constants[i].name, | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6839 PyInt_FromLong(numeric_constants[i].val)); |
| 4494 | 6840 |
| 6841 for (i = 0; i < (int)(sizeof(object_constants) | |
| 6842 / sizeof(struct object_constant)); | |
| 6843 ++i) | |
| 6844 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6845 PyObject *valObject; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6846 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6847 valObject = object_constants[i].valObject; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6848 Py_INCREF(valObject); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
6849 ADD_OBJECT(m, object_constants[i].name, valObject); |
| 4494 | 6850 } |
| 6851 | |
| 6852 if (!(VimError = PyErr_NewException("vim.error", NULL, NULL))) | |
| 6853 return -1; | |
| 6854 ADD_OBJECT(m, "error", VimError); | |
| 6855 | |
|
17922
4d63d47d87ef
patch 8.1.1957: more code can be moved to evalvars.c
Bram Moolenaar <Bram@vim.org>
parents:
17168
diff
changeset
|
6856 ADD_CHECKED_OBJECT(m, "vars", NEW_DICTIONARY(get_globvar_dict())); |
|
4d63d47d87ef
patch 8.1.1957: more code can be moved to evalvars.c
Bram Moolenaar <Bram@vim.org>
parents:
17168
diff
changeset
|
6857 ADD_CHECKED_OBJECT(m, "vvars", NEW_DICTIONARY(get_vimvar_dict())); |
| 4494 | 6858 ADD_CHECKED_OBJECT(m, "options", |
| 6859 OptionsNew(SREQ_GLOBAL, NULL, dummy_check, NULL)); | |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6860 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6861 if (!(other_module = PyImport_ImportModule("os"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6862 return -1; |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6863 ADD_OBJECT(m, "os", other_module); |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6864 |
|
9161
56c93626f6f3
commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481
Christian Brabandt <cb@256bit.org>
parents:
9119
diff
changeset
|
6865 #if PY_MAJOR_VERSION >= 3 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6866 if (!(py_getcwd = PyObject_GetAttrString(other_module, "getcwd"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6867 return -1; |
|
9161
56c93626f6f3
commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481
Christian Brabandt <cb@256bit.org>
parents:
9119
diff
changeset
|
6868 #else |
|
56c93626f6f3
commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481
Christian Brabandt <cb@256bit.org>
parents:
9119
diff
changeset
|
6869 if (!(py_getcwd = PyObject_GetAttrString(other_module, "getcwdu"))) |
|
56c93626f6f3
commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481
Christian Brabandt <cb@256bit.org>
parents:
9119
diff
changeset
|
6870 return -1; |
|
56c93626f6f3
commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481
Christian Brabandt <cb@256bit.org>
parents:
9119
diff
changeset
|
6871 #endif |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6872 ADD_OBJECT(m, "_getcwd", py_getcwd) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6873 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6874 if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6875 return -1; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6876 ADD_OBJECT(m, "_chdir", py_chdir); |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
6877 if (!(attr = PyObject_GetAttrString(m, "chdir"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6878 return -1; |
|
4831
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6879 if (PyObject_SetAttrString(other_module, "chdir", attr)) |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6880 { |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6881 Py_DECREF(attr); |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6882 return -1; |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6883 } |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6884 Py_DECREF(attr); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6885 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6886 if ((py_fchdir = PyObject_GetAttrString(other_module, "fchdir"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6887 { |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6888 ADD_OBJECT(m, "_fchdir", py_fchdir); |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
6889 if (!(attr = PyObject_GetAttrString(m, "fchdir"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6890 return -1; |
|
4831
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6891 if (PyObject_SetAttrString(other_module, "fchdir", attr)) |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6892 { |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6893 Py_DECREF(attr); |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6894 return -1; |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6895 } |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6896 Py_DECREF(attr); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6897 } |
|
4722
3534e9b4fa42
updated for version 7.3.1108
Bram Moolenaar <bram@vim.org>
parents:
4706
diff
changeset
|
6898 else |
|
3534e9b4fa42
updated for version 7.3.1108
Bram Moolenaar <bram@vim.org>
parents:
4706
diff
changeset
|
6899 PyErr_Clear(); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6900 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6901 if (!(vim_special_path_object = PyString_FromString(vim_special_path))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6902 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6903 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6904 ADD_OBJECT(m, "VIM_SPECIAL_PATH", vim_special_path_object); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6905 |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6906 #if PY_VERSION_HEX >= 0x030700f0 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6907 if (!(imp = PyImport_ImportModule("importlib.machinery"))) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6908 return -1; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6909 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6910 dict = PyModule_GetDict(imp); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6911 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6912 if (!(cls = PyDict_GetItemString(dict, "PathFinder"))) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6913 { |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6914 Py_DECREF(imp); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6915 return -1; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6916 } |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6917 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6918 if (!(py_find_spec = PyObject_GetAttrString(cls, "find_spec"))) |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6919 { |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6920 Py_DECREF(imp); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6921 return -1; |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6922 } |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6923 |
|
15818
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6924 if ((py_find_module = PyObject_GetAttrString(cls, "find_module"))) |
|
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6925 { |
|
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6926 // find_module() is deprecated, this may stop working in some later |
|
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6927 // version. |
|
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6928 ADD_OBJECT(m, "_find_module", py_find_module); |
|
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6929 } |
|
89486329d9e6
patch 8.1.0916: with Python 3.7 "find_module" is not made available
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
6930 |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6931 Py_DECREF(imp); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6932 |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6933 ADD_OBJECT(m, "_find_spec", py_find_spec); |
|
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6934 #else |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6935 if (!(imp = PyImport_ImportModule("imp"))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6936 return -1; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6937 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6938 if (!(py_find_module = PyObject_GetAttrString(imp, "find_module"))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6939 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6940 Py_DECREF(imp); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6941 return -1; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6942 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6943 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6944 if (!(py_load_module = PyObject_GetAttrString(imp, "load_module"))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6945 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6946 Py_DECREF(py_find_module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6947 Py_DECREF(imp); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6948 return -1; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6949 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6950 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6951 Py_DECREF(imp); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6952 |
|
4851
96e154e825a7
updated for version 7.3.1172
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
6953 ADD_OBJECT(m, "_find_module", py_find_module); |
|
96e154e825a7
updated for version 7.3.1172
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
6954 ADD_OBJECT(m, "_load_module", py_load_module); |
|
14373
380217380738
patch 8.1.0201: newer Python uses "importlib" instead of "imp"
Christian Brabandt <cb@256bit.org>
parents:
14303
diff
changeset
|
6955 #endif |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6956 |
| 4494 | 6957 return 0; |
| 6958 } |