Mercurial > vim
annotate src/if_py_both.h @ 4988:e130cc3d17af v7.3.1239
updated for version 7.3.1239
Problem: Can't build with Python and MSVC10.
Solution: Move #if outside of macro. (Taro Muraoka)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 24 Jun 2013 21:21:58 +0200 |
| parents | 5b2c8f3b3906 |
| children | b4a2eaf28b51 |
| 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 |
| 3734 | 16 #if PY_VERSION_HEX < 0x02050000 |
| 17 typedef int Py_ssize_t; /* Python 2.4 and earlier don't have this type. */ | |
| 18 #endif | |
| 19 | |
| 2919 | 20 #ifdef FEAT_MBYTE |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
21 # define ENC_OPT ((char *)p_enc) |
| 2919 | 22 #else |
| 23 # define ENC_OPT "latin1" | |
| 24 #endif | |
| 4435 | 25 #define DOPY_FUNC "_vim_pydo" |
| 2919 | 26 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
27 static const char *vim_special_path = "_vim_path_"; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
28 |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
29 #define PyErr_SET_STRING(exc, str) PyErr_SetString(exc, _(str)) |
| 4385 | 30 #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
|
31 #define PyErr_SET_VIM(str) PyErr_SET_STRING(VimError, str) |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
32 #define PyErr_FORMAT(exc, str, tail) PyErr_Format(exc, _(str), tail) |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
33 #define PyErr_VIM_FORMAT(str, tail) PyErr_FORMAT(VimError, str, tail) |
|
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 *); |
| 4431 | 67 static PyObject *WindowNew(win_T *, tabpage_T *); |
| 68 static PyObject *BufferNew (buf_T *); | |
| 69 static PyObject *LineToString(const char *); | |
| 4385 | 70 |
| 71 static PyInt RangeStart; | |
| 72 static PyInt RangeEnd; | |
| 73 | |
| 4486 | 74 static PyObject *globals; |
| 75 | |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
76 static PyObject *py_chdir; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
77 static PyObject *py_fchdir; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
78 static PyObject *py_getcwd; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
79 static PyObject *vim_module; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
80 static PyObject *vim_special_path_object; |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
81 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
82 static PyObject *py_find_module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
83 static PyObject *py_load_module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
84 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
85 static PyObject *VimError; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
86 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
87 /* |
|
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
|
88 * 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
|
89 */ |
|
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
|
90 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
|
91 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
|
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 } |
|
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 /* |
|
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 * 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
|
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 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
|
99 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
|
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 } |
|
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 |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
103 /* |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
104 * 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
|
105 * 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
|
106 * was needed to generate returned value is object. |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
107 * |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
108 * Use Py_XDECREF to decrement reference count. |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
109 */ |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
110 static char_u * |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
111 StringToChars(PyObject *obj, PyObject **todecref) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
112 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
113 char_u *str; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
114 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
115 if (PyBytes_Check(obj)) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
116 { |
|
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 if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
119 || str == NULL) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
120 return NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
121 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
122 *todecref = NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
123 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
124 else if (PyUnicode_Check(obj)) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
125 { |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
126 PyObject *bytes; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
127 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
128 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
|
129 return NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
130 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
131 if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
132 || str == NULL) |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
133 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
134 Py_DECREF(bytes); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
135 return NULL; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
136 } |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
137 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
138 *todecref = bytes; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
139 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
140 else |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
141 { |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
142 #if PY_MAJOR_VERSION < 3 |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
143 PyErr_FORMAT(PyExc_TypeError, |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
144 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
|
145 Py_TYPE_NAME(obj)); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
146 #else |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
147 PyErr_FORMAT(PyExc_TypeError, |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
148 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
|
149 Py_TYPE_NAME(obj)); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
150 #endif |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
151 return NULL; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
152 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
153 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
154 return (char_u *) str; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
155 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
156 |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
157 #define NUMBER_LONG 1 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
158 #define NUMBER_INT 2 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
159 #define NUMBER_NATURAL 4 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
160 #define NUMBER_UNSIGNED 8 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
161 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
162 static int |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
163 NumberToLong(PyObject *obj, long *result, int flags) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
164 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
165 #if PY_MAJOR_VERSION < 3 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
166 if (PyInt_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
167 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
168 *result = PyInt_AsLong(obj); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
169 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
170 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
171 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
172 else |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
173 #endif |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
174 if (PyLong_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
175 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
176 *result = PyLong_AsLong(obj); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
177 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
178 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
179 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
180 else if (PyNumber_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
181 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
182 PyObject *num; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
183 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
184 if (!(num = PyNumber_Long(obj))) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
185 return -1; |
|
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 *result = PyLong_AsLong(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 Py_DECREF(num); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
190 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
191 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
192 return -1; |
|
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 else |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
195 { |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
196 #if PY_MAJOR_VERSION < 3 |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
197 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
198 N_("expected int(), long() or something supporting " |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
199 "coercing to long(), but got %s"), |
|
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
200 Py_TYPE_NAME(obj)); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
201 #else |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
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() or something supporting coercing to int(), " |
|
4988
e130cc3d17af
updated for version 7.3.1239
Bram Moolenaar <bram@vim.org>
parents:
4984
diff
changeset
|
204 "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 #endif |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
207 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
208 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
209 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
210 if (flags & NUMBER_INT) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
211 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
212 if (*result > INT_MAX) |
|
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 PyErr_SET_STRING(PyExc_OverflowError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
215 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
|
216 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
217 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
218 else if (*result < INT_MIN) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
219 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
220 PyErr_SET_STRING(PyExc_OverflowError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
221 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
|
222 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
223 } |
|
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 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
226 if (flags & NUMBER_NATURAL) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
227 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
228 if (*result <= 0) |
|
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 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
231 N_("number must be greater then zero")); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
232 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
233 } |
|
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 else if (flags & NUMBER_UNSIGNED) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
236 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
237 if (*result < 0) |
|
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 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
240 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
|
241 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
242 } |
|
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 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
245 return 0; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
246 } |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
247 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
248 static int |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
249 add_string(PyObject *list, char *s) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
250 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
251 PyObject *string; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
252 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
253 if (!(string = PyString_FromString(s))) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
254 return -1; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
255 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
256 if (PyList_Append(list, 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 Py_DECREF(string); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
259 return -1; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
260 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
261 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
262 Py_DECREF(string); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
263 return 0; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
264 } |
|
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 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
267 ObjectDir(PyObject *self, char **attributes) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
268 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
269 PyMethodDef *method; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
270 char **attr; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
271 PyObject *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
272 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
273 if (!(ret = PyList_New(0))) |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
274 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
275 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
276 if (self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
277 for (method = self->ob_type->tp_methods ; method->ml_name != NULL ; ++method) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
278 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
|
279 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
280 Py_DECREF(ret); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
281 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
282 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
283 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
284 for (attr = attributes ; *attr ; ++attr) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
285 if (add_string(ret, *attr)) |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
286 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
287 Py_DECREF(ret); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
288 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
289 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
290 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
291 #if PY_MAJOR_VERSION < 3 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
292 if (add_string(ret, "__members__")) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
293 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
294 Py_DECREF(ret); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
295 return NULL; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
296 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
297 #endif |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
298 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
299 return ret; |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
300 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
301 |
| 4385 | 302 /* Output buffer management |
|
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
|
303 */ |
|
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
|
304 |
| 2582 | 305 /* 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
|
306 typedef void (*writefn)(char_u *); |
| 4385 | 307 |
| 308 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
|
309 |
|
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 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
|
311 { |
|
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
|
312 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
|
313 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
|
314 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
|
315 } 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
|
316 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
317 static char *OutputAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
318 "softspace", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
319 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
320 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
321 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
322 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
323 OutputDir(PyObject *self) |
|
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 return ObjectDir(self, OutputAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
326 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
327 |
| 3826 | 328 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
329 OutputSetattr(OutputObject *self, char *name, PyObject *valObject) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
330 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
331 if (valObject == NULL) |
| 3826 | 332 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
333 PyErr_SET_STRING(PyExc_AttributeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
334 N_("can't delete OutputObject attributes")); |
| 3826 | 335 return -1; |
| 336 } | |
| 337 | |
| 338 if (strcmp(name, "softspace") == 0) | |
| 339 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
340 if (NumberToLong(valObject, &(self->softspace), NUMBER_UNSIGNED)) |
| 3826 | 341 return -1; |
| 342 return 0; | |
| 343 } | |
| 344 | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
345 PyErr_FORMAT(PyExc_AttributeError, N_("invalid attribute: %s"), name); |
| 3826 | 346 return -1; |
| 347 } | |
| 348 | |
| 4385 | 349 /* Buffer IO, we write one whole line at a time. */ |
| 350 static garray_T io_ga = {0, 0, 1, 80, NULL}; | |
| 351 static writefn old_fn = NULL; | |
| 352 | |
| 353 static void | |
| 354 PythonIO_Flush(void) | |
| 355 { | |
| 356 if (old_fn != NULL && io_ga.ga_len > 0) | |
| 357 { | |
| 358 ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL; | |
| 359 old_fn((char_u *)io_ga.ga_data); | |
| 360 } | |
| 361 io_ga.ga_len = 0; | |
| 362 } | |
| 363 | |
| 364 static void | |
| 365 writer(writefn fn, char_u *str, PyInt n) | |
| 366 { | |
| 367 char_u *ptr; | |
| 368 | |
| 369 /* Flush when switching output function. */ | |
| 370 if (fn != old_fn) | |
| 371 PythonIO_Flush(); | |
| 372 old_fn = fn; | |
| 373 | |
| 374 /* Write each NL separated line. Text after the last NL is kept for | |
| 375 * writing later. */ | |
| 376 while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL) | |
| 377 { | |
| 378 PyInt len = ptr - str; | |
| 379 | |
| 380 if (ga_grow(&io_ga, (int)(len + 1)) == FAIL) | |
| 381 break; | |
| 382 | |
| 383 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len); | |
| 384 ((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL; | |
| 385 fn((char_u *)io_ga.ga_data); | |
| 386 str = ptr + 1; | |
| 387 n -= len + 1; | |
| 388 io_ga.ga_len = 0; | |
| 389 } | |
| 390 | |
| 391 /* Put the remaining text into io_ga for later printing. */ | |
| 392 if (n > 0 && ga_grow(&io_ga, (int)(n + 1)) == OK) | |
| 393 { | |
| 394 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n); | |
| 395 io_ga.ga_len += (int)n; | |
| 396 } | |
| 397 } | |
| 398 | |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
399 static int |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
400 write_output(OutputObject *self, PyObject *string) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
401 { |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
402 Py_ssize_t len = 0; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
403 char *str = NULL; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
404 int error = self->error; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
405 |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
406 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
|
407 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
|
408 |
|
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
|
409 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
|
410 Python_Lock_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
|
411 writer((writefn)(error ? emsg : msg), (char_u *)str, len); |
|
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
|
412 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
|
413 Py_END_ALLOW_THREADS |
| 2894 | 414 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
|
415 |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
416 return 0; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
417 } |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
418 |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
419 static PyObject * |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
420 OutputWrite(OutputObject *self, PyObject *string) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
421 { |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
422 if (write_output(self, string)) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
423 return NULL; |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
424 |
|
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
|
425 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
|
426 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
|
427 } |
|
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
|
428 |
|
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
|
429 static PyObject * |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
430 OutputWritelines(OutputObject *self, PyObject *seq) |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
431 { |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
432 PyObject *iterator; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
433 PyObject *item; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
434 |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
435 if (!(iterator = PyObject_GetIter(seq))) |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
436 return NULL; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
437 |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
438 while ((item = PyIter_Next(iterator))) |
| 3618 | 439 { |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
440 if (write_output(self, item)) |
| 3618 | 441 { |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
442 Py_DECREF(iterator); |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
443 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
|
444 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
|
445 } |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
446 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
|
447 } |
|
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
|
448 |
|
4619
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
449 Py_DECREF(iterator); |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
450 |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
451 /* Iterator may have finished due to an exception */ |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
452 if (PyErr_Occurred()) |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
453 return NULL; |
|
90beab957ba9
updated for version 7.3.1057
Bram Moolenaar <bram@vim.org>
parents:
4617
diff
changeset
|
454 |
|
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 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
|
456 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
|
457 } |
|
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 |
| 2727 | 459 static PyObject * |
| 4492 | 460 OutputFlush(PyObject *self UNUSED) |
| 2727 | 461 { |
| 462 /* do nothing */ | |
| 463 Py_INCREF(Py_None); | |
| 464 return Py_None; | |
| 465 } | |
| 466 | |
|
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
|
467 /***************/ |
|
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 |
| 4385 | 469 static struct PyMethodDef OutputMethods[] = { |
| 4492 | 470 /* name, function, calling, doc */ |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
471 {"write", (PyCFunction)OutputWrite, METH_O, ""}, |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
472 {"writelines", (PyCFunction)OutputWritelines, METH_O, ""}, |
| 4492 | 473 {"flush", (PyCFunction)OutputFlush, METH_NOARGS, ""}, |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
474 {"__dir__", (PyCFunction)OutputDir, METH_NOARGS, ""}, |
| 4492 | 475 { NULL, NULL, 0, NULL} |
| 4385 | 476 }; |
|
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
|
477 |
|
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
|
478 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
|
479 { |
|
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
|
480 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
|
481 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
|
482 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
|
483 }; |
|
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
|
484 |
|
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
|
485 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
|
486 { |
|
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
|
487 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
|
488 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
|
489 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
|
490 }; |
|
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
|
491 |
|
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
|
492 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
|
493 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
|
494 { |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
495 if (PySys_SetObject("stdout", (PyObject *)(void *)&Output)) |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
496 return -1; |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
497 if (PySys_SetObject("stderr", (PyObject *)(void *)&Error)) |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
498 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
|
499 |
|
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
|
500 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
|
501 { |
|
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
|
502 EMSG(_("E264: Python: Error initialising I/O objects")); |
|
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
|
503 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
|
504 } |
|
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
|
505 |
|
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
|
506 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
|
507 } |
|
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
|
508 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
509 typedef struct |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
510 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
511 PyObject_HEAD |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
512 PyObject *module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
513 } LoaderObject; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
514 static PyTypeObject LoaderType; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
515 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
516 static void |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
517 LoaderDestructor(LoaderObject *self) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
518 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
519 Py_DECREF(self->module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
520 DESTRUCTOR_FINISH(self); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
521 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
522 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
523 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
524 LoaderLoadModule(LoaderObject *self, PyObject *args UNUSED) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
525 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
526 PyObject *ret = self->module; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
527 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
528 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
529 return ret; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
530 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
531 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
532 static struct PyMethodDef LoaderMethods[] = { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
533 /* name, function, calling, doc */ |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
534 {"load_module", (PyCFunction)LoaderLoadModule, METH_VARARGS, ""}, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
535 { NULL, NULL, 0, NULL} |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
536 }; |
|
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
|
537 |
|
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 /* Check to see whether a Vim error has been reported, or a keyboard |
|
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 * 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
|
540 */ |
| 4498 | 541 |
| 542 static void | |
| 543 VimTryStart(void) | |
| 544 { | |
| 545 ++trylevel; | |
| 546 } | |
| 547 | |
|
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
|
548 static int |
| 4498 | 549 VimTryEnd(void) |
| 550 { | |
| 551 --trylevel; | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
552 /* Without this it stops processing all subsequent VimL commands and |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
553 * generates strange error messages if I e.g. try calling Test() in a cycle */ |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
554 did_emsg = FALSE; |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
555 /* Keyboard interrupt should be preferred over anything else */ |
| 4498 | 556 if (got_int) |
| 557 { | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
558 did_throw = got_int = FALSE; |
| 4498 | 559 PyErr_SetNone(PyExc_KeyboardInterrupt); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
560 return -1; |
| 4498 | 561 } |
| 562 else if (!did_throw) | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
563 return (PyErr_Occurred() ? -1 : 0); |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
564 /* Python exception is preferred over vim one; unlikely to occur though */ |
| 4498 | 565 else if (PyErr_Occurred()) |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
566 { |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
567 did_throw = FALSE; |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
568 return -1; |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
569 } |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
570 /* Finally transform VimL exception to python one */ |
| 4498 | 571 else |
| 572 { | |
| 573 PyErr_SetVim((char *) current_exception->value); | |
| 574 discard_current_exception(); | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
575 return -1; |
| 4498 | 576 } |
| 577 } | |
| 578 | |
| 579 static int | |
| 580 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
|
581 { |
|
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
|
582 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
|
583 { |
|
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
|
584 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
|
585 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
|
586 } |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
587 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
|
588 } |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
589 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
590 /* Vim module - Implementation |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
591 */ |
| 4385 | 592 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
593 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
594 VimCommand(PyObject *self UNUSED, PyObject *string) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
595 { |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
596 char_u *cmd; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
597 PyObject *ret; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
598 PyObject *todecref; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
599 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
600 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
|
601 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
602 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
603 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
|
604 Python_Lock_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
605 |
| 4498 | 606 VimTryStart(); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
607 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
|
608 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
609 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
610 Python_Release_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
611 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
|
612 |
| 4498 | 613 if (VimTryEnd()) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
614 ret = NULL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
615 else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
616 ret = Py_None; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
617 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
618 Py_XINCREF(ret); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
619 Py_XDECREF(todecref); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
620 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
621 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
622 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
623 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
624 * 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
|
625 * 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
|
626 * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
627 * 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
|
628 * you call VimToPython. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
629 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
630 static PyObject * |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
631 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
|
632 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
633 PyObject *ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
634 PyObject *newObj; |
| 3618 | 635 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
|
636 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
637 /* Avoid infinite recursion */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
638 if (depth > 100) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
639 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
640 Py_INCREF(Py_None); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
641 ret = Py_None; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
642 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
643 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
644 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
645 /* Check if we run into a recursive loop. The item must be in lookup_dict |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
646 * then and we can use it again. */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
647 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
|
648 || (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
|
649 { |
| 3618 | 650 sprintf(ptrBuf, "%p", |
| 651 our_tv->v_type == VAR_LIST ? (void *)our_tv->vval.v_list | |
| 652 : (void *)our_tv->vval.v_dict); | |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
653 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
654 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
|
655 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
656 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
657 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
658 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
659 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
660 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
661 if (our_tv->v_type == VAR_STRING) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
662 ret = PyString_FromString(our_tv->vval.v_string == NULL |
| 3852 | 663 ? "" : (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
|
664 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
|
665 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
666 char buf[NUMBUFLEN]; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
667 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
668 /* For backwards compatibility numbers are stored as strings. */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
669 sprintf(buf, "%ld", (long)our_tv->vval.v_number); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
670 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
|
671 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
672 # ifdef FEAT_FLOAT |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
673 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
|
674 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
675 char buf[NUMBUFLEN]; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
676 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
677 sprintf(buf, "%f", our_tv->vval.v_float); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
678 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
|
679 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
680 # endif |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
681 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
|
682 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
683 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
|
684 listitem_T *curr; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
685 |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
686 if (list == NULL) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
687 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
688 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
689 if (!(ret = PyList_New(0))) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
690 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
691 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
692 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
|
693 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
694 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
695 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
696 } |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
697 |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
698 for (curr = list->lv_first; curr != NULL; curr = curr->li_next) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
699 { |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
700 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
|
701 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
702 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
703 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
704 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
705 if (PyList_Append(ret, newObj)) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
706 { |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
707 Py_DECREF(newObj); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
708 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
709 return NULL; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
710 } |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
711 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
|
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 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
|
715 { |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
716 |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
717 hashtab_T *ht = &our_tv->vval.v_dict->dv_hashtab; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
718 long_u todo = ht->ht_used; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
719 hashitem_T *hi; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
720 dictitem_T *di; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
721 if (our_tv->vval.v_dict == NULL) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
722 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
723 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
724 if (!(ret = PyDict_New())) |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
725 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
726 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
727 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
|
728 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
729 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
730 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
731 } |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
732 |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
733 for (hi = ht->ht_array; todo > 0; ++hi) |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
734 { |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
735 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
|
736 { |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
737 --todo; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
738 |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
739 di = dict_lookup(hi); |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
740 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
|
741 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
742 Py_DECREF(ret); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
743 return NULL; |
|
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
744 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
745 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
|
746 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
747 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
|
748 Py_DECREF(newObj); |
|
4595
29b2be2bba0d
updated for version 7.3.1045
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
749 return NULL; |
|
2447
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 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
752 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
753 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
754 else |
|
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 Py_INCREF(Py_None); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
757 ret = Py_None; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
758 } |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
759 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
760 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
761 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
762 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
763 static PyObject * |
| 4500 | 764 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
|
765 { |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
766 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
|
767 typval_T *our_tv; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
768 PyObject *string; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
769 PyObject *todecref; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
770 PyObject *ret; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
771 PyObject *lookup_dict; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
772 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
773 if (!PyArg_ParseTuple(args, "O", &string)) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
774 return NULL; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
775 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
776 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
|
777 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
778 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
779 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
|
780 Python_Lock_Vim(); |
| 4498 | 781 VimTryStart(); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
782 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
|
783 Python_Release_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
784 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
|
785 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
786 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
787 |
| 4498 | 788 if (VimTryEnd()) |
| 789 return NULL; | |
| 790 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
791 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
|
792 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
793 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
|
794 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
795 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
796 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
797 /* Convert the Vim type into a Python type. Create a dictionary that's |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
798 * used to check for recursive loops. */ |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
799 if (!(lookup_dict = PyDict_New())) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
800 ret = NULL; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
801 else |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
802 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
803 ret = VimToPython(our_tv, 1, lookup_dict); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
804 Py_DECREF(lookup_dict); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
805 } |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
806 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
807 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
808 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
|
809 Python_Lock_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
810 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
|
811 Python_Release_Vim(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
812 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
|
813 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
814 return ret; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
815 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
816 |
| 3618 | 817 static PyObject *ConvertToPyObject(typval_T *); |
| 818 | |
| 819 static PyObject * | |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
820 VimEvalPy(PyObject *self UNUSED, PyObject *string) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
821 { |
| 3618 | 822 typval_T *our_tv; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
823 PyObject *ret; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
824 char_u *expr; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
825 PyObject *todecref; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
826 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
827 if (!(expr = StringToChars(string, &todecref))) |
| 3618 | 828 return NULL; |
| 829 | |
| 830 Py_BEGIN_ALLOW_THREADS | |
| 831 Python_Lock_Vim(); | |
| 4498 | 832 VimTryStart(); |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
833 our_tv = eval_expr(expr, NULL); |
| 3618 | 834 Python_Release_Vim(); |
| 835 Py_END_ALLOW_THREADS | |
| 836 | |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
837 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
838 |
| 4498 | 839 if (VimTryEnd()) |
| 840 return NULL; | |
| 841 | |
| 3618 | 842 if (our_tv == NULL) |
| 843 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
844 PyErr_SET_VIM(N_("invalid expression")); |
| 3618 | 845 return NULL; |
| 846 } | |
| 847 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
848 ret = ConvertToPyObject(our_tv); |
| 3618 | 849 Py_BEGIN_ALLOW_THREADS |
| 850 Python_Lock_Vim(); | |
| 851 free_tv(our_tv); | |
| 852 Python_Release_Vim(); | |
| 853 Py_END_ALLOW_THREADS | |
| 854 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
855 return ret; |
| 3618 | 856 } |
| 857 | |
| 858 static PyObject * | |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
859 VimStrwidth(PyObject *self UNUSED, PyObject *string) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
860 { |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
861 char_u *str; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
862 PyObject *todecref; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
863 int len; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
864 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
865 if (!(str = StringToChars(string, &todecref))) |
| 3618 | 866 return NULL; |
| 867 | |
| 3988 | 868 #ifdef FEAT_MBYTE |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
869 len = mb_string2cells(str, (int)STRLEN(str)); |
| 3988 | 870 #else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
871 len = STRLEN(str); |
| 3988 | 872 #endif |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
873 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
874 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
875 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
876 return PyLong_FromLong(len); |
| 3618 | 877 } |
| 878 | |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
879 static PyObject * |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
880 _VimChdir(PyObject *_chdir, PyObject *args, PyObject *kwargs) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
881 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
882 PyObject *ret; |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
883 PyObject *newwd; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
884 PyObject *todecref; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
885 char_u *new_dir; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
886 |
|
4754
be1e4acb30ca
updated for version 7.3.1124
Bram Moolenaar <bram@vim.org>
parents:
4722
diff
changeset
|
887 if (_chdir == NULL) |
|
be1e4acb30ca
updated for version 7.3.1124
Bram Moolenaar <bram@vim.org>
parents:
4722
diff
changeset
|
888 return NULL; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
889 if (!(ret = PyObject_Call(_chdir, args, kwargs))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
890 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
891 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
892 if (!(newwd = PyObject_CallFunctionObjArgs(py_getcwd, NULL))) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
893 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
894 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
895 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
896 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
897 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
898 if (!(new_dir = StringToChars(newwd, &todecref))) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
899 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
900 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
901 Py_DECREF(newwd); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
902 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
903 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
904 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
905 VimTryStart(); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
906 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
907 if (vim_chdir(new_dir)) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
908 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
909 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
910 Py_DECREF(newwd); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
911 Py_XDECREF(todecref); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
912 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
913 if (VimTryEnd()) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
914 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
915 |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
916 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
|
917 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
918 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
919 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
920 Py_DECREF(newwd); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
921 Py_XDECREF(todecref); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
922 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
923 post_chdir(FALSE); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
924 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
925 if (VimTryEnd()) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
926 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
927 Py_DECREF(ret); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
928 return NULL; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
929 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
930 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
931 return ret; |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
932 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
933 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
934 static PyObject * |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
935 VimChdir(PyObject *self UNUSED, PyObject *args, PyObject *kwargs) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
936 { |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
937 return _VimChdir(py_chdir, args, kwargs); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
938 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
939 |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
940 static PyObject * |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
941 VimFchdir(PyObject *self UNUSED, PyObject *args, PyObject *kwargs) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
942 { |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
943 return _VimChdir(py_fchdir, args, kwargs); |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
944 } |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
945 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
946 typedef struct { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
947 PyObject *callable; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
948 PyObject *result; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
949 } map_rtp_data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
950 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
951 static void |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
952 map_rtp_callback(char_u *path, void *_data) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
953 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
954 void **data = (void **) _data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
955 PyObject *pathObject; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
956 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
|
957 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
958 if (!(pathObject = PyString_FromString((char *) path))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
959 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
960 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
961 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
962 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
963 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
964 mr_data->result = PyObject_CallFunctionObjArgs(mr_data->callable, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
965 pathObject, NULL); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
966 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
967 Py_DECREF(pathObject); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
968 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
969 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
|
970 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
971 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
972 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
973 Py_DECREF(mr_data->result); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
974 mr_data->result = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
975 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
976 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
977 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
978 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
979 VimForeachRTP(PyObject *self UNUSED, PyObject *callable) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
980 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
981 map_rtp_data data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
982 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
983 data.callable = callable; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
984 data.result = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
985 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
986 do_in_runtimepath(NULL, FALSE, &map_rtp_callback, &data); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
987 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
988 if (data.result == NULL) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
989 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
990 if (PyErr_Occurred()) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
991 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
992 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
993 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
994 Py_INCREF(Py_None); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
995 return Py_None; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
996 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
997 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
998 return data.result; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
999 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1000 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1001 /* |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1002 * _vim_runtimepath_ special path implementation. |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1003 */ |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1004 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1005 static void |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1006 map_finder_callback(char_u *path, void *_data) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1007 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1008 void **data = (void **) _data; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1009 PyObject *list = *((PyObject **) data); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1010 PyObject *pathObject1, *pathObject2; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1011 char *pathbuf; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1012 size_t pathlen; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1013 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1014 pathlen = STRLEN(path); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1015 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1016 #if PY_MAJOR_VERSION < 3 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1017 # define PY_MAIN_DIR_STRING "python2" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1018 #else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1019 # define PY_MAIN_DIR_STRING "python3" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1020 #endif |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1021 #define PY_ALTERNATE_DIR_STRING "pythonx" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1022 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1023 #define PYTHONX_STRING_LENGTH 7 /* STRLEN("pythonx") */ |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1024 if (!(pathbuf = PyMem_New(char, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1025 pathlen + STRLEN(PATHSEPSTR) + PYTHONX_STRING_LENGTH + 1))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1026 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1027 PyErr_NoMemory(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1028 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1029 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1030 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1031 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1032 mch_memmove(pathbuf, path, pathlen + 1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1033 add_pathsep((char_u *) pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1034 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1035 pathlen = STRLEN(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1036 mch_memmove(pathbuf + pathlen, PY_MAIN_DIR_STRING, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1037 PYTHONX_STRING_LENGTH + 1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1038 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1039 if (!(pathObject1 = PyString_FromString(pathbuf))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1040 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1041 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1042 PyMem_Free(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1043 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1044 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1045 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1046 mch_memmove(pathbuf + pathlen, PY_ALTERNATE_DIR_STRING, |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1047 PYTHONX_STRING_LENGTH + 1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1048 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1049 if (!(pathObject2 = PyString_FromString(pathbuf))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1050 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1051 Py_DECREF(pathObject1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1052 PyMem_Free(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1053 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1054 return; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1055 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1056 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1057 PyMem_Free(pathbuf); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1058 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1059 if (PyList_Append(list, pathObject1) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1060 || PyList_Append(list, pathObject2)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1061 *data = NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1062 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1063 Py_DECREF(pathObject1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1064 Py_DECREF(pathObject2); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1065 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1066 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1067 static PyObject * |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1068 Vim_GetPaths(PyObject *self UNUSED) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1069 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1070 PyObject *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1071 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1072 if (!(ret = PyList_New(0))) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1073 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1074 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1075 do_in_runtimepath(NULL, FALSE, &map_finder_callback, ret); |
|
4833
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 if (PyErr_Occurred()) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1078 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1079 Py_DECREF(ret); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1080 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1081 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1082 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1083 return ret; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1084 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1085 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1086 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1087 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
|
1088 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1089 PyObject *fd, *pathname, *description; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1090 |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1091 if (!PyTuple_Check(find_module_result)) |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1092 { |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1093 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1094 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
|
1095 Py_TYPE_NAME(find_module_result)); |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1096 return NULL; |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1097 } |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1098 if (PyTuple_GET_SIZE(find_module_result) != 3) |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1099 { |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1100 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1101 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
|
1102 "tuple of size %d"), |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1103 (int) PyTuple_GET_SIZE(find_module_result)); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1104 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1105 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1106 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1107 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
|
1108 || !(pathname = PyTuple_GET_ITEM(find_module_result, 1)) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1109 || !(description = PyTuple_GET_ITEM(find_module_result, 2))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1110 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
1111 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1112 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
|
1113 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1114 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1115 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1116 return PyObject_CallFunction(py_load_module, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1117 "s#OOO", name, len, fd, pathname, description); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1118 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1119 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1120 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1121 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
|
1122 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1123 PyObject *find_module_result; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1124 PyObject *module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1125 char *dot; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1126 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1127 if ((dot = (char *) vim_strchr((char_u *) tail, '.'))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1128 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1129 /* |
|
4859
e48cabe98453
updated for version 7.3.1176
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
1130 * 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
|
1131 * first component |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1132 */ |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1133 PyObject *newest_path; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1134 int partlen = (int) (dot - 1 - tail); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1135 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1136 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
|
1137 "s#O", tail, partlen, new_path))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1138 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1139 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1140 if (!(module = call_load_module( |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1141 fullname, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1142 ((int) (tail - fullname)) + partlen, |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1143 find_module_result))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1144 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1145 Py_DECREF(find_module_result); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1146 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1147 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1148 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1149 Py_DECREF(find_module_result); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1150 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1151 if (!(newest_path = PyObject_GetAttrString(module, "__path__"))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1152 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1153 Py_DECREF(module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1154 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1155 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1156 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1157 Py_DECREF(module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1158 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1159 module = find_module(fullname, dot + 1, newest_path); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1160 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1161 Py_DECREF(newest_path); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1162 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1163 return module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1164 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1165 else |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1166 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1167 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
|
1168 "sO", tail, new_path))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1169 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1170 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1171 if (!(module = call_load_module( |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1172 fullname, |
|
4859
e48cabe98453
updated for version 7.3.1176
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
1173 (int)STRLEN(fullname), |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1174 find_module_result))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1175 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1176 Py_DECREF(find_module_result); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1177 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1178 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1179 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1180 Py_DECREF(find_module_result); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1181 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1182 return module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1183 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1184 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1185 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1186 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1187 FinderFindModule(PyObject *self, PyObject *args) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1188 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1189 char *fullname; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1190 PyObject *module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1191 PyObject *new_path; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1192 LoaderObject *loader; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1193 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1194 if (!PyArg_ParseTuple(args, "s", &fullname)) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1195 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1196 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1197 if (!(new_path = Vim_GetPaths(self))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1198 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1199 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1200 module = find_module(fullname, fullname, new_path); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1201 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1202 Py_DECREF(new_path); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1203 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1204 if (!module) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1205 { |
|
4984
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1206 if (PyErr_Occurred()) |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1207 { |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1208 if (PyErr_ExceptionMatches(PyExc_ImportError)) |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1209 PyErr_Clear(); |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1210 else |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1211 return NULL; |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1212 } |
|
5b2c8f3b3906
updated for version 7.3.1237
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
1213 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1214 Py_INCREF(Py_None); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1215 return Py_None; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1216 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1217 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1218 if (!(loader = PyObject_NEW(LoaderObject, &LoaderType))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1219 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1220 Py_DECREF(module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1221 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1222 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1223 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1224 loader->module = module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1225 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1226 return (PyObject *) loader; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1227 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1228 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1229 static PyObject * |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1230 VimPathHook(PyObject *self UNUSED, PyObject *args) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1231 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1232 char *path; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1233 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1234 if (PyArg_ParseTuple(args, "s", &path) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1235 && STRCMP(path, vim_special_path) == 0) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1236 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1237 Py_INCREF(vim_module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1238 return vim_module; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1239 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1240 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1241 PyErr_Clear(); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1242 PyErr_SetNone(PyExc_ImportError); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1243 return NULL; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1244 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
1245 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1246 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1247 * Vim module - Definitions |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1248 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1249 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1250 static struct PyMethodDef VimMethods[] = { |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1251 /* name, function, calling, documentation */ |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
1252 {"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
|
1253 {"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
|
1254 {"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
|
1255 {"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
|
1256 {"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
|
1257 {"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
|
1258 {"foreach_rtp", VimForeachRTP, METH_O, "Call given callable for each path in &rtp"}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
1259 {"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
|
1260 {"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
|
1261 {"_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
|
1262 { 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
|
1263 }; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1264 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1265 /* |
| 4397 | 1266 * 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
|
1267 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1268 |
| 4397 | 1269 static PyTypeObject IterType; |
| 1270 | |
| 1271 typedef PyObject *(*nextfun)(void **); | |
| 1272 typedef void (*destructorfun)(void *); | |
| 4433 | 1273 typedef int (*traversefun)(void *, visitproc, void *); |
| 1274 typedef int (*clearfun)(void **); | |
| 4397 | 1275 |
| 4438 | 1276 /* Main purpose of this object is removing the need for do python |
| 1277 * initialization (i.e. PyType_Ready and setting type attributes) for a big | |
| 1278 * bunch of objects. */ | |
| 4385 | 1279 |
| 4319 | 1280 typedef struct |
| 1281 { | |
| 1282 PyObject_HEAD | |
| 4397 | 1283 void *cur; |
| 1284 nextfun next; | |
| 1285 destructorfun destruct; | |
| 4433 | 1286 traversefun traverse; |
| 1287 clearfun clear; | |
| 4397 | 1288 } IterObject; |
| 1289 | |
| 1290 static PyObject * | |
| 4433 | 1291 IterNew(void *start, destructorfun destruct, nextfun next, traversefun traverse, |
| 1292 clearfun clear) | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1293 { |
| 4397 | 1294 IterObject *self; |
| 1295 | |
| 4500 | 1296 self = PyObject_GC_New(IterObject, &IterType); |
| 4397 | 1297 self->cur = start; |
| 1298 self->next = next; | |
| 1299 self->destruct = destruct; | |
| 4433 | 1300 self->traverse = traverse; |
| 1301 self->clear = clear; | |
| 4397 | 1302 |
| 1303 return (PyObject *)(self); | |
| 1304 } | |
| 1305 | |
| 1306 static void | |
| 4488 | 1307 IterDestructor(IterObject *self) |
| 4397 | 1308 { |
| 4500 | 1309 PyObject_GC_UnTrack((void *)(self)); |
| 4488 | 1310 self->destruct(self->cur); |
| 4500 | 1311 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
|
1312 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1313 |
| 4433 | 1314 static int |
| 4488 | 1315 IterTraverse(IterObject *self, visitproc visit, void *arg) |
| 4433 | 1316 { |
| 4488 | 1317 if (self->traverse != NULL) |
| 1318 return self->traverse(self->cur, visit, arg); | |
| 4433 | 1319 else |
| 1320 return 0; | |
| 1321 } | |
| 1322 | |
| 4438 | 1323 /* Mac OSX defines clear() somewhere. */ |
| 1324 #ifdef clear | |
| 1325 # undef clear | |
| 1326 #endif | |
| 1327 | |
| 4433 | 1328 static int |
| 4488 | 1329 IterClear(IterObject *self) |
| 4433 | 1330 { |
| 4488 | 1331 if (self->clear != NULL) |
| 1332 return self->clear(&self->cur); | |
| 4433 | 1333 else |
| 1334 return 0; | |
| 1335 } | |
| 1336 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1337 static PyObject * |
| 4488 | 1338 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
|
1339 { |
| 4488 | 1340 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
|
1341 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
1342 |
| 4397 | 1343 static PyObject * |
| 1344 IterIter(PyObject *self) | |
| 1345 { | |
|
4609
12421d8a45d5
updated for version 7.3.1052
Bram Moolenaar <bram@vim.org>
parents:
4607
diff
changeset
|
1346 Py_INCREF(self); |
| 4397 | 1347 return self; |
| 1348 } | |
| 4393 | 1349 |
| 3618 | 1350 typedef struct pylinkedlist_S { |
| 1351 struct pylinkedlist_S *pll_next; | |
| 1352 struct pylinkedlist_S *pll_prev; | |
| 1353 PyObject *pll_obj; | |
| 1354 } pylinkedlist_T; | |
| 1355 | |
| 1356 static pylinkedlist_T *lastdict = NULL; | |
| 1357 static pylinkedlist_T *lastlist = NULL; | |
| 1358 | |
| 1359 static void | |
| 1360 pyll_remove(pylinkedlist_T *ref, pylinkedlist_T **last) | |
| 1361 { | |
| 1362 if (ref->pll_prev == NULL) | |
| 1363 { | |
| 1364 if (ref->pll_next == NULL) | |
| 1365 { | |
| 1366 *last = NULL; | |
| 1367 return; | |
| 1368 } | |
| 1369 } | |
| 1370 else | |
| 1371 ref->pll_prev->pll_next = ref->pll_next; | |
| 1372 | |
| 1373 if (ref->pll_next == NULL) | |
| 1374 *last = ref->pll_prev; | |
| 1375 else | |
| 1376 ref->pll_next->pll_prev = ref->pll_prev; | |
| 1377 } | |
| 1378 | |
| 1379 static void | |
| 1380 pyll_add(PyObject *self, pylinkedlist_T *ref, pylinkedlist_T **last) | |
| 1381 { | |
| 1382 if (*last == NULL) | |
| 1383 ref->pll_prev = NULL; | |
| 1384 else | |
| 1385 { | |
| 1386 (*last)->pll_next = ref; | |
| 1387 ref->pll_prev = *last; | |
| 1388 } | |
| 1389 ref->pll_next = NULL; | |
| 1390 ref->pll_obj = self; | |
| 1391 *last = ref; | |
| 1392 } | |
| 1393 | |
| 1394 static PyTypeObject DictionaryType; | |
| 1395 | |
| 1396 typedef struct | |
| 1397 { | |
| 1398 PyObject_HEAD | |
| 1399 dict_T *dict; | |
| 1400 pylinkedlist_T ref; | |
| 1401 } DictionaryObject; | |
| 1402 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1403 static PyObject *DictionaryUpdate(DictionaryObject *, PyObject *, PyObject *); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1404 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1405 #define NEW_DICTIONARY(dict) DictionaryNew(&DictionaryType, dict) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1406 |
| 3618 | 1407 static PyObject * |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1408 DictionaryNew(PyTypeObject *subtype, dict_T *dict) |
| 3618 | 1409 { |
| 1410 DictionaryObject *self; | |
| 1411 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1412 self = (DictionaryObject *) subtype->tp_alloc(subtype, 0); |
| 3618 | 1413 if (self == NULL) |
| 1414 return NULL; | |
| 1415 self->dict = dict; | |
| 1416 ++dict->dv_refcount; | |
| 1417 | |
| 1418 pyll_add((PyObject *)(self), &self->ref, &lastdict); | |
| 1419 | |
| 1420 return (PyObject *)(self); | |
| 1421 } | |
| 1422 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1423 static dict_T * |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
1424 py_dict_alloc(void) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1425 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1426 dict_T *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1427 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1428 if (!(ret = dict_alloc())) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1429 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1430 PyErr_NoMemory(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1431 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1432 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1433 ++ret->dv_refcount; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1434 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1435 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1436 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1437 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1438 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1439 DictionaryConstructor(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1440 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1441 DictionaryObject *self; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1442 dict_T *dict; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1443 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1444 if (!(dict = py_dict_alloc())) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1445 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1446 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1447 self = (DictionaryObject *) DictionaryNew(subtype, dict); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1448 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1449 --dict->dv_refcount; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1450 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1451 if (kwargs || PyTuple_Size(args)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1452 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1453 PyObject *tmp; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1454 if (!(tmp = DictionaryUpdate(self, args, kwargs))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1455 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1456 Py_DECREF(self); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1457 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1458 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1459 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1460 Py_DECREF(tmp); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1461 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1462 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1463 return (PyObject *)(self); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1464 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1465 |
| 4319 | 1466 static void |
| 4488 | 1467 DictionaryDestructor(DictionaryObject *self) |
| 4319 | 1468 { |
| 4488 | 1469 pyll_remove(&self->ref, &lastdict); |
| 1470 dict_unref(self->dict); | |
| 4319 | 1471 |
| 1472 DESTRUCTOR_FINISH(self); | |
| 1473 } | |
| 1474 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1475 static char *DictionaryAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1476 "locked", "scope", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1477 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1478 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1479 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1480 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1481 DictionaryDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1482 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1483 return ObjectDir(self, DictionaryAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1484 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
1485 |
| 3618 | 1486 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1487 DictionarySetattr(DictionaryObject *self, char *name, PyObject *valObject) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1488 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1489 if (valObject == NULL) |
| 3828 | 1490 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
1491 PyErr_SET_STRING(PyExc_AttributeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1492 N_("cannot delete vim.Dictionary attributes")); |
| 3828 | 1493 return -1; |
| 1494 } | |
| 1495 | |
| 1496 if (strcmp(name, "locked") == 0) | |
| 1497 { | |
| 4488 | 1498 if (self->dict->dv_lock == VAR_FIXED) |
| 3828 | 1499 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1500 PyErr_SET_STRING(PyExc_TypeError, |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1501 N_("cannot modify fixed dictionary")); |
| 3828 | 1502 return -1; |
| 1503 } | |
| 1504 else | |
| 1505 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1506 int istrue = PyObject_IsTrue(valObject); |
| 4411 | 1507 if (istrue == -1) |
| 1508 return -1; | |
| 1509 else if (istrue) | |
| 4488 | 1510 self->dict->dv_lock = VAR_LOCKED; |
| 3828 | 1511 else |
| 4488 | 1512 self->dict->dv_lock = 0; |
| 3828 | 1513 } |
| 1514 return 0; | |
| 1515 } | |
| 1516 else | |
| 1517 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1518 PyErr_FORMAT(PyExc_AttributeError, N_("cannot set attribute %s"), name); |
| 3828 | 1519 return -1; |
| 1520 } | |
| 1521 } | |
| 1522 | |
| 1523 static PyInt | |
| 4488 | 1524 DictionaryLength(DictionaryObject *self) |
| 3618 | 1525 { |
| 4488 | 1526 return ((PyInt) (self->dict->dv_hashtab.ht_used)); |
| 3618 | 1527 } |
| 1528 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1529 #define DICT_FLAG_HAS_DEFAULT 0x01 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1530 #define DICT_FLAG_POP 0x02 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1531 #define DICT_FLAG_NONE_DEFAULT 0x04 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1532 #define DICT_FLAG_RETURN_BOOL 0x08 /* Incompatible with DICT_FLAG_POP */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1533 #define DICT_FLAG_RETURN_PAIR 0x10 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1534 |
| 3618 | 1535 static PyObject * |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1536 _DictionaryItem(DictionaryObject *self, PyObject *args, int flags) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1537 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1538 PyObject *keyObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1539 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
|
1540 PyObject *ret; |
| 3618 | 1541 char_u *key; |
| 3792 | 1542 dictitem_T *di; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1543 dict_T *dict = self->dict; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1544 hashitem_T *hi; |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1545 PyObject *todecref; |
| 3618 | 1546 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1547 if (flags & DICT_FLAG_HAS_DEFAULT) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1548 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1549 if (!PyArg_ParseTuple(args, "O|O", &keyObject, &defObject)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1550 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1551 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1552 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1553 keyObject = args; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1554 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1555 if (flags & DICT_FLAG_RETURN_BOOL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1556 defObject = Py_False; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1557 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1558 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1559 return NULL; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1560 |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1561 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1562 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1563 RAISE_NO_EMPTY_KEYS; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
1564 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1565 return NULL; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1566 } |
| 3792 | 1567 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1568 hi = hash_find(&dict->dv_hashtab, key); |
| 3792 | 1569 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1570 Py_XDECREF(todecref); |
| 3824 | 1571 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1572 if (HASHITEM_EMPTY(hi)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1573 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1574 if (defObject) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1575 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1576 Py_INCREF(defObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1577 return defObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1578 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1579 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1580 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1581 PyErr_SetObject(PyExc_KeyError, keyObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1582 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1583 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1584 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1585 else if (flags & DICT_FLAG_RETURN_BOOL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1586 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1587 Py_INCREF(Py_True); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1588 return Py_True; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1589 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1590 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1591 di = dict_lookup(hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1592 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1593 if (!(ret = ConvertToPyObject(&di->di_tv))) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1594 return NULL; |
|
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 if (flags & DICT_FLAG_POP) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1597 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1598 if (dict->dv_lock) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1599 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1600 RAISE_LOCKED_DICTIONARY; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1601 Py_DECREF(ret); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1602 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1603 } |
|
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 hash_remove(&dict->dv_hashtab, hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1606 dictitem_free(di); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1607 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1608 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1609 return ret; |
|
4627
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 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1612 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1613 DictionaryItem(DictionaryObject *self, PyObject *keyObject) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1614 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1615 return _DictionaryItem(self, keyObject, 0); |
|
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 static int |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1619 DictionaryContains(DictionaryObject *self, PyObject *keyObject) |
|
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 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
|
1622 int ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1623 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1624 ret = (rObj == Py_True); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1625 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
1626 Py_DECREF(rObj); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1627 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1628 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1629 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1630 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1631 typedef struct |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1632 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1633 hashitem_T *ht_array; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1634 long_u ht_used; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1635 hashtab_T *ht; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1636 hashitem_T *hi; |
|
4667
9e7ef781d494
updated for version 7.3.1081
Bram Moolenaar <bram@vim.org>
parents:
4659
diff
changeset
|
1637 long_u todo; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1638 } dictiterinfo_T; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1639 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1640 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1641 DictionaryIterNext(dictiterinfo_T **dii) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1642 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1643 PyObject *ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1644 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1645 if (!(*dii)->todo) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1646 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1647 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1648 if ((*dii)->ht->ht_array != (*dii)->ht_array || |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1649 (*dii)->ht->ht_used != (*dii)->ht_used) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1650 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
1651 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1652 N_("hashtab changed during iteration")); |
| 3792 | 1653 return NULL; |
| 1654 } | |
| 3618 | 1655 |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1656 while (((*dii)->todo) && HASHITEM_EMPTY((*dii)->hi)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1657 ++((*dii)->hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1658 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1659 --((*dii)->todo); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1660 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1661 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
|
1662 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1663 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1664 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1665 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1666 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1667 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1668 DictionaryIter(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1669 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1670 dictiterinfo_T *dii; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1671 hashtab_T *ht; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1672 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1673 if (!(dii = PyMem_New(dictiterinfo_T, 1))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1674 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1675 PyErr_NoMemory(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1676 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1677 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1678 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1679 ht = &self->dict->dv_hashtab; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1680 dii->ht_array = ht->ht_array; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1681 dii->ht_used = ht->ht_used; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1682 dii->ht = ht; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1683 dii->hi = dii->ht_array; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1684 dii->todo = dii->ht_used; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1685 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1686 return IterNew(dii, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1687 (destructorfun) PyMem_Free, (nextfun) DictionaryIterNext, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1688 NULL, NULL); |
| 3618 | 1689 } |
| 1690 | |
| 1691 static PyInt | |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
1692 DictionaryAssItem( |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
1693 DictionaryObject *self, PyObject *keyObject, PyObject *valObject) |
| 3618 | 1694 { |
| 1695 char_u *key; | |
| 1696 typval_T tv; | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1697 dict_T *dict = self->dict; |
| 3618 | 1698 dictitem_T *di; |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1699 PyObject *todecref; |
| 3618 | 1700 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1701 if (dict->dv_lock) |
| 3618 | 1702 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1703 RAISE_LOCKED_DICTIONARY; |
| 3618 | 1704 return -1; |
| 1705 } | |
| 1706 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1707 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1708 return -1; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
1709 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1710 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1711 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1712 RAISE_NO_EMPTY_KEYS; |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1713 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1714 return -1; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1715 } |
| 3618 | 1716 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1717 di = dict_find(dict, key, -1); |
| 3618 | 1718 |
| 1719 if (valObject == NULL) | |
| 1720 { | |
| 3636 | 1721 hashitem_T *hi; |
| 1722 | |
| 3618 | 1723 if (di == NULL) |
| 1724 { | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1725 Py_XDECREF(todecref); |
| 4403 | 1726 PyErr_SetObject(PyExc_KeyError, keyObject); |
| 3618 | 1727 return -1; |
| 1728 } | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1729 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
|
1730 hash_remove(&dict->dv_hashtab, hi); |
| 3618 | 1731 dictitem_free(di); |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1732 Py_XDECREF(todecref); |
| 3618 | 1733 return 0; |
| 1734 } | |
| 1735 | |
| 1736 if (ConvertFromPyObject(valObject, &tv) == -1) | |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1737 { |
|
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1738 Py_XDECREF(todecref); |
| 3618 | 1739 return -1; |
|
4706
bf917ee1fad2
updated for version 7.3.1100
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
1740 } |
| 3618 | 1741 |
| 1742 if (di == NULL) | |
| 1743 { | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1744 if (!(di = dictitem_alloc(key))) |
| 3618 | 1745 { |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1746 Py_XDECREF(todecref); |
| 3618 | 1747 PyErr_NoMemory(); |
| 1748 return -1; | |
| 1749 } | |
| 1750 di->di_tv.v_lock = 0; | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1751 di->di_tv.v_type = VAR_UNKNOWN; |
| 3618 | 1752 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
1753 if (dict_add(dict, di) == FAIL) |
| 3618 | 1754 { |
| 1755 vim_free(di); | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1756 dictitem_free(di); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1757 RAISE_KEY_ADD_FAIL(key); |
|
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1758 Py_XDECREF(todecref); |
| 3618 | 1759 return -1; |
| 1760 } | |
| 1761 } | |
| 1762 else | |
| 1763 clear_tv(&di->di_tv); | |
| 1764 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
1765 Py_XDECREF(todecref); |
| 3618 | 1766 |
| 1767 copy_tv(&tv, &di->di_tv); | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
1768 clear_tv(&tv); |
| 3618 | 1769 return 0; |
| 1770 } | |
| 1771 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1772 typedef PyObject *(*hi_to_py)(hashitem_T *); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1773 |
| 3618 | 1774 static PyObject * |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1775 DictionaryListObjects(DictionaryObject *self, hi_to_py hiconvert) |
| 3618 | 1776 { |
| 4488 | 1777 dict_T *dict = self->dict; |
| 3618 | 1778 long_u todo = dict->dv_hashtab.ht_used; |
| 1779 Py_ssize_t i = 0; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1780 PyObject *ret; |
| 3618 | 1781 hashitem_T *hi; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1782 PyObject *newObj; |
| 3618 | 1783 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1784 ret = PyList_New(todo); |
| 3618 | 1785 for (hi = dict->dv_hashtab.ht_array; todo > 0; ++hi) |
| 1786 { | |
| 1787 if (!HASHITEM_EMPTY(hi)) | |
| 1788 { | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1789 if (!(newObj = hiconvert(hi))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1790 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1791 Py_DECREF(ret); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1792 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1793 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1794 PyList_SET_ITEM(ret, i, newObj); |
| 3618 | 1795 --todo; |
| 1796 ++i; | |
| 1797 } | |
| 1798 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1799 return ret; |
| 3618 | 1800 } |
| 1801 | |
|
4627
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 dict_key(hashitem_T *hi) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1804 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1805 return PyBytes_FromString((char *)(hi->hi_key)); |
|
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 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1808 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1809 DictionaryListKeys(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1810 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1811 return DictionaryListObjects(self, dict_key); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1812 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1813 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1814 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1815 dict_val(hashitem_T *hi) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1816 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1817 dictitem_T *di; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1818 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1819 di = dict_lookup(hi); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1820 return ConvertToPyObject(&di->di_tv); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1821 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1822 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1823 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1824 DictionaryListValues(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1825 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1826 return DictionaryListObjects(self, dict_val); |
|
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 dict_item(hashitem_T *hi) |
|
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 PyObject *keyObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1833 PyObject *valObject; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1834 PyObject *ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1835 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1836 if (!(keyObject = dict_key(hi))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1837 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1838 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1839 if (!(valObject = dict_val(hi))) |
|
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 Py_DECREF(keyObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1842 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1843 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1844 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1845 ret = Py_BuildValue("(OO)", keyObject, valObject); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1846 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1847 Py_DECREF(keyObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1848 Py_DECREF(valObject); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1849 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1850 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1851 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1852 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1853 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1854 DictionaryListItems(DictionaryObject *self) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1855 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1856 return DictionaryListObjects(self, dict_item); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1857 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1858 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1859 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1860 DictionaryUpdate(DictionaryObject *self, PyObject *args, PyObject *kwargs) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1861 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1862 dict_T *dict = self->dict; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1863 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1864 if (dict->dv_lock) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1865 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1866 RAISE_LOCKED_DICTIONARY; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1867 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1868 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1869 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1870 if (kwargs) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1871 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1872 typval_T tv; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1873 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1874 if (ConvertFromPyMapping(kwargs, &tv) == -1) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1875 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1876 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1877 VimTryStart(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1878 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
|
1879 clear_tv(&tv); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1880 if (VimTryEnd()) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1881 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1882 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1883 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1884 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1885 PyObject *obj; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1886 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1887 if (!PyArg_ParseTuple(args, "O", &obj)) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1888 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1889 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1890 if (PyObject_HasAttrString(obj, "keys")) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1891 return DictionaryUpdate(self, NULL, obj); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1892 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1893 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1894 PyObject *iterator; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1895 PyObject *item; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1896 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1897 if (!(iterator = PyObject_GetIter(obj))) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1898 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1899 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1900 while ((item = PyIter_Next(iterator))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1901 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1902 PyObject *fast; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1903 PyObject *keyObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1904 PyObject *valObject; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1905 PyObject *todecref; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1906 char_u *key; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1907 dictitem_T *di; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1908 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1909 if (!(fast = PySequence_Fast(item, ""))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1910 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1911 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1912 Py_DECREF(item); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1913 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1914 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1915 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1916 Py_DECREF(item); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1917 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1918 if (PySequence_Fast_GET_SIZE(fast) != 2) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1919 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1920 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1921 Py_DECREF(fast); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1922 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1923 N_("expected sequence element of size 2, " |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
1924 "but got sequence of size %d"), |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
1925 (int) PySequence_Fast_GET_SIZE(fast)); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1926 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1927 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1928 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1929 keyObject = PySequence_Fast_GET_ITEM(fast, 0); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1930 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1931 if (!(key = StringToChars(keyObject, &todecref))) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1932 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1933 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1934 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1935 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1936 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1937 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1938 di = dictitem_alloc(key); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1939 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1940 Py_XDECREF(todecref); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1941 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1942 if (di == NULL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1943 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1944 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1945 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1946 PyErr_NoMemory(); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1947 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1948 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1949 di->di_tv.v_lock = 0; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1950 di->di_tv.v_type = VAR_UNKNOWN; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1951 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1952 valObject = PySequence_Fast_GET_ITEM(fast, 1); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1953 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1954 if (ConvertFromPyObject(valObject, &di->di_tv) == -1) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1955 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1956 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1957 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1958 dictitem_free(di); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1959 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1960 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1961 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1962 Py_DECREF(fast); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1963 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1964 if (dict_add(dict, di) == FAIL) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1965 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1966 RAISE_KEY_ADD_FAIL(di->di_key); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1967 Py_DECREF(iterator); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1968 dictitem_free(di); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1969 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1970 } |
|
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 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1973 Py_DECREF(iterator); |
|
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 /* Iterator may have finished due to an exception */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1976 if (PyErr_Occurred()) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1977 return NULL; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1978 } |
|
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 Py_INCREF(Py_None); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1981 return Py_None; |
|
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 DictionaryGet(DictionaryObject *self, PyObject *args) |
|
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 _DictionaryItem(self, args, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1988 DICT_FLAG_HAS_DEFAULT|DICT_FLAG_NONE_DEFAULT); |
|
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 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1991 static PyObject * |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1992 DictionaryPop(DictionaryObject *self, PyObject *args) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1993 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
1994 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
|
1995 } |
|
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 static PyObject * |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
1998 DictionaryPopItem(DictionaryObject *self) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
1999 { |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2000 hashitem_T *hi; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2001 PyObject *ret; |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2002 PyObject *valObject; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2003 dictitem_T *di; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2004 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2005 if (self->dict->dv_hashtab.ht_used == 0) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2006 { |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2007 PyErr_SetNone(PyExc_KeyError); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2008 return NULL; |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2009 } |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2010 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2011 hi = self->dict->dv_hashtab.ht_array; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2012 while (HASHITEM_EMPTY(hi)) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2013 ++hi; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2014 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2015 di = dict_lookup(hi); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2016 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2017 if (!(valObject = ConvertToPyObject(&di->di_tv))) |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2018 return NULL; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2019 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2020 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
|
2021 { |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2022 Py_DECREF(valObject); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2023 return NULL; |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2024 } |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2025 |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2026 hash_remove(&self->dict->dv_hashtab, hi); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2027 dictitem_free(di); |
|
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2028 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2029 return ret; |
|
4627
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 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2032 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2033 DictionaryHasKey(DictionaryObject *self, PyObject *keyObject) |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2034 { |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2035 return _DictionaryItem(self, keyObject, DICT_FLAG_RETURN_BOOL); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2036 } |
|
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 static PySequenceMethods DictionaryAsSeq = { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2039 0, /* sq_length */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2040 0, /* sq_concat */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2041 0, /* sq_repeat */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2042 0, /* sq_item */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2043 0, /* sq_slice */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2044 0, /* sq_ass_item */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2045 0, /* sq_ass_slice */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2046 (objobjproc) DictionaryContains, /* sq_contains */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2047 0, /* sq_inplace_concat */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2048 0, /* sq_inplace_repeat */ |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2049 }; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2050 |
| 4385 | 2051 static PyMappingMethods DictionaryAsMapping = { |
| 2052 (lenfunc) DictionaryLength, | |
| 2053 (binaryfunc) DictionaryItem, | |
| 2054 (objobjargproc) DictionaryAssItem, | |
| 2055 }; | |
| 2056 | |
| 3618 | 2057 static struct PyMethodDef DictionaryMethods[] = { |
| 4492 | 2058 {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""}, |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2059 {"values", (PyCFunction)DictionaryListValues, METH_NOARGS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2060 {"items", (PyCFunction)DictionaryListItems, METH_NOARGS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2061 {"update", (PyCFunction)DictionaryUpdate, METH_VARARGS|METH_KEYWORDS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2062 {"get", (PyCFunction)DictionaryGet, METH_VARARGS, ""}, |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2063 {"pop", (PyCFunction)DictionaryPop, METH_VARARGS, ""}, |
|
4698
2db005052371
updated for version 7.3.1096
Bram Moolenaar <bram@vim.org>
parents:
4667
diff
changeset
|
2064 {"popitem", (PyCFunction)DictionaryPopItem, METH_NOARGS, ""}, |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2065 {"has_key", (PyCFunction)DictionaryHasKey, METH_O, ""}, |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2066 {"__dir__", (PyCFunction)DictionaryDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2067 { NULL, NULL, 0, NULL} |
| 3618 | 2068 }; |
| 2069 | |
| 2070 static PyTypeObject ListType; | |
| 4319 | 2071 static PySequenceMethods ListAsSeq; |
| 2072 static PyMappingMethods ListAsMapping; | |
| 3618 | 2073 |
| 2074 typedef struct | |
| 2075 { | |
| 2076 PyObject_HEAD | |
| 2077 list_T *list; | |
| 2078 pylinkedlist_T ref; | |
| 2079 } ListObject; | |
| 2080 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2081 #define NEW_LIST(list) ListNew(&ListType, list) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2082 |
| 3618 | 2083 static PyObject * |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2084 ListNew(PyTypeObject *subtype, list_T *list) |
| 3618 | 2085 { |
| 2086 ListObject *self; | |
| 2087 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2088 self = (ListObject *) subtype->tp_alloc(subtype, 0); |
| 3618 | 2089 if (self == NULL) |
| 2090 return NULL; | |
| 2091 self->list = list; | |
| 2092 ++list->lv_refcount; | |
| 2093 | |
| 2094 pyll_add((PyObject *)(self), &self->ref, &lastlist); | |
| 2095 | |
| 2096 return (PyObject *)(self); | |
| 2097 } | |
| 2098 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2099 static list_T * |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2100 py_list_alloc() |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2101 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2102 list_T *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2103 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2104 if (!(ret = list_alloc())) |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2105 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2106 PyErr_NoMemory(); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2107 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2108 } |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2109 ++ret->lv_refcount; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2110 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2111 return ret; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2112 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2113 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2114 static int |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2115 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
|
2116 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2117 PyObject *iterator; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2118 PyObject *item; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2119 listitem_T *li; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2120 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2121 if (!(iterator = PyObject_GetIter(obj))) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2122 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2123 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2124 while ((item = PyIter_Next(iterator))) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2125 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2126 if (!(li = listitem_alloc())) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2127 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2128 PyErr_NoMemory(); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2129 Py_DECREF(item); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2130 Py_DECREF(iterator); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2131 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2132 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2133 li->li_tv.v_lock = 0; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2134 li->li_tv.v_type = VAR_UNKNOWN; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2135 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2136 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
|
2137 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2138 Py_DECREF(item); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2139 Py_DECREF(iterator); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2140 listitem_free(li); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2141 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2142 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2143 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2144 Py_DECREF(item); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2145 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2146 list_append(l, li); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2147 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2148 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2149 Py_DECREF(iterator); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2150 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2151 /* Iterator may have finished due to an exception */ |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2152 if (PyErr_Occurred()) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2153 return -1; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2154 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2155 return 0; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2156 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2157 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2158 static PyObject * |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2159 ListConstructor(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2160 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2161 list_T *list; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2162 PyObject *obj = NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2163 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2164 if (kwargs) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2165 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
2166 PyErr_SET_STRING(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2167 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
|
2168 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2169 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2170 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2171 if (!PyArg_ParseTuple(args, "|O", &obj)) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2172 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2173 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2174 if (!(list = py_list_alloc())) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2175 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2176 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2177 if (obj) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2178 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2179 PyObject *lookup_dict; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2180 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2181 if (!(lookup_dict = PyDict_New())) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2182 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2183 list_unref(list); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2184 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2185 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2186 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2187 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
|
2188 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2189 Py_DECREF(lookup_dict); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2190 list_unref(list); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2191 return NULL; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2192 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2193 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2194 Py_DECREF(lookup_dict); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2195 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2196 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2197 return ListNew(subtype, list); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2198 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2199 |
| 4319 | 2200 static void |
| 4488 | 2201 ListDestructor(ListObject *self) |
| 4319 | 2202 { |
| 4488 | 2203 pyll_remove(&self->ref, &lastlist); |
| 2204 list_unref(self->list); | |
| 4319 | 2205 |
| 2206 DESTRUCTOR_FINISH(self); | |
| 2207 } | |
| 2208 | |
| 3618 | 2209 static PyInt |
| 4488 | 2210 ListLength(ListObject *self) |
| 3618 | 2211 { |
| 4488 | 2212 return ((PyInt) (self->list->lv_len)); |
| 3618 | 2213 } |
| 2214 | |
| 2215 static PyObject * | |
| 4488 | 2216 ListItem(ListObject *self, Py_ssize_t index) |
| 3618 | 2217 { |
| 2218 listitem_T *li; | |
| 2219 | |
| 4488 | 2220 if (index >= ListLength(self)) |
| 3618 | 2221 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2222 PyErr_SET_STRING(PyExc_IndexError, N_("list index out of range")); |
| 3618 | 2223 return NULL; |
| 2224 } | |
| 4488 | 2225 li = list_find(self->list, (long) index); |
| 3618 | 2226 if (li == NULL) |
| 2227 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2228 /* 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
|
2229 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
|
2230 (int) index); |
| 3618 | 2231 return NULL; |
| 2232 } | |
| 2233 return ConvertToPyObject(&li->li_tv); | |
| 2234 } | |
| 2235 | |
| 2236 #define PROC_RANGE \ | |
| 2237 if (last < 0) {\ | |
| 2238 if (last < -size) \ | |
| 2239 last = 0; \ | |
| 2240 else \ | |
| 2241 last += size; \ | |
| 2242 } \ | |
| 2243 if (first < 0) \ | |
| 2244 first = 0; \ | |
| 2245 if (first > size) \ | |
| 2246 first = size; \ | |
| 2247 if (last > size) \ | |
| 2248 last = size; | |
| 2249 | |
| 2250 static PyObject * | |
| 4488 | 2251 ListSlice(ListObject *self, Py_ssize_t first, Py_ssize_t last) |
| 3618 | 2252 { |
| 2253 PyInt i; | |
| 2254 PyInt size = ListLength(self); | |
| 2255 PyInt n; | |
| 2256 PyObject *list; | |
| 2257 int reversed = 0; | |
| 2258 | |
| 2259 PROC_RANGE | |
| 2260 if (first >= last) | |
| 2261 first = last; | |
| 2262 | |
| 2263 n = last-first; | |
| 2264 list = PyList_New(n); | |
| 2265 if (list == NULL) | |
| 2266 return NULL; | |
| 2267 | |
| 2268 for (i = 0; i < n; ++i) | |
| 2269 { | |
| 4260 | 2270 PyObject *item = ListItem(self, first + i); |
| 3618 | 2271 if (item == NULL) |
| 2272 { | |
| 2273 Py_DECREF(list); | |
| 2274 return NULL; | |
| 2275 } | |
| 2276 | |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
2277 PyList_SET_ITEM(list, ((reversed)?(n-i-1):(i)), item); |
| 3618 | 2278 } |
| 2279 | |
| 2280 return list; | |
| 2281 } | |
| 2282 | |
| 4397 | 2283 typedef struct |
| 2284 { | |
| 2285 listwatch_T lw; | |
| 2286 list_T *list; | |
| 2287 } listiterinfo_T; | |
| 2288 | |
| 2289 static void | |
| 2290 ListIterDestruct(listiterinfo_T *lii) | |
| 2291 { | |
| 2292 list_rem_watch(lii->list, &lii->lw); | |
| 2293 PyMem_Free(lii); | |
| 2294 } | |
| 2295 | |
| 2296 static PyObject * | |
| 2297 ListIterNext(listiterinfo_T **lii) | |
| 2298 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2299 PyObject *ret; |
| 4397 | 2300 |
| 2301 if (!((*lii)->lw.lw_item)) | |
| 2302 return NULL; | |
| 2303 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2304 if (!(ret = ConvertToPyObject(&((*lii)->lw.lw_item->li_tv)))) |
| 4397 | 2305 return NULL; |
| 2306 | |
| 2307 (*lii)->lw.lw_item = (*lii)->lw.lw_item->li_next; | |
| 2308 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2309 return ret; |
| 4397 | 2310 } |
| 2311 | |
| 2312 static PyObject * | |
| 4488 | 2313 ListIter(ListObject *self) |
| 4397 | 2314 { |
| 2315 listiterinfo_T *lii; | |
| 4488 | 2316 list_T *l = self->list; |
| 4397 | 2317 |
| 2318 if (!(lii = PyMem_New(listiterinfo_T, 1))) | |
| 2319 { | |
| 2320 PyErr_NoMemory(); | |
| 2321 return NULL; | |
| 2322 } | |
| 2323 | |
| 2324 list_add_watch(l, &lii->lw); | |
| 2325 lii->lw.lw_item = l->lv_first; | |
| 2326 lii->list = l; | |
| 2327 | |
| 2328 return IterNew(lii, | |
| 4433 | 2329 (destructorfun) ListIterDestruct, (nextfun) ListIterNext, |
| 2330 NULL, NULL); | |
| 4397 | 2331 } |
| 2332 | |
| 3618 | 2333 static int |
| 4488 | 2334 ListAssItem(ListObject *self, Py_ssize_t index, PyObject *obj) |
| 3618 | 2335 { |
| 2336 typval_T tv; | |
| 4488 | 2337 list_T *l = self->list; |
| 3618 | 2338 listitem_T *li; |
| 2339 Py_ssize_t length = ListLength(self); | |
| 2340 | |
| 2341 if (l->lv_lock) | |
| 2342 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2343 RAISE_LOCKED_LIST; |
| 3618 | 2344 return -1; |
| 2345 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2346 if (index > length || (index == length && obj == NULL)) |
| 3618 | 2347 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2348 PyErr_SET_STRING(PyExc_IndexError, N_("list index out of range")); |
| 3618 | 2349 return -1; |
| 2350 } | |
| 2351 | |
| 2352 if (obj == NULL) | |
| 2353 { | |
| 2354 li = list_find(l, (long) index); | |
| 2355 list_remove(l, li, li); | |
| 2356 clear_tv(&li->li_tv); | |
| 2357 vim_free(li); | |
| 2358 return 0; | |
| 2359 } | |
| 2360 | |
| 2361 if (ConvertFromPyObject(obj, &tv) == -1) | |
| 2362 return -1; | |
| 2363 | |
| 2364 if (index == length) | |
| 2365 { | |
| 2366 if (list_append_tv(l, &tv) == FAIL) | |
| 2367 { | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2368 clear_tv(&tv); |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2369 PyErr_SET_VIM(N_("failed to add item to list")); |
| 3618 | 2370 return -1; |
| 2371 } | |
| 2372 } | |
| 2373 else | |
| 2374 { | |
| 2375 li = list_find(l, (long) index); | |
| 2376 clear_tv(&li->li_tv); | |
| 2377 copy_tv(&tv, &li->li_tv); | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2378 clear_tv(&tv); |
| 3618 | 2379 } |
| 2380 return 0; | |
| 2381 } | |
| 2382 | |
| 2383 static int | |
| 4488 | 2384 ListAssSlice(ListObject *self, Py_ssize_t first, Py_ssize_t last, PyObject *obj) |
| 3618 | 2385 { |
| 2386 PyInt size = ListLength(self); | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2387 PyObject *iterator; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2388 PyObject *item; |
| 3618 | 2389 listitem_T *li; |
| 2390 listitem_T *next; | |
| 2391 typval_T v; | |
| 4488 | 2392 list_T *l = self->list; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2393 PyInt i; |
| 3618 | 2394 |
| 2395 if (l->lv_lock) | |
| 2396 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2397 RAISE_LOCKED_LIST; |
| 3618 | 2398 return -1; |
| 2399 } | |
| 2400 | |
| 2401 PROC_RANGE | |
| 2402 | |
| 2403 if (first == size) | |
| 2404 li = NULL; | |
| 2405 else | |
| 2406 { | |
| 2407 li = list_find(l, (long) first); | |
| 2408 if (li == NULL) | |
| 2409 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2410 PyErr_VIM_FORMAT(N_("internal error: no vim list item %d"), |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2411 (int)first); |
| 3618 | 2412 return -1; |
| 2413 } | |
| 2414 if (last > first) | |
| 2415 { | |
| 2416 i = last - first; | |
| 2417 while (i-- && li != NULL) | |
| 2418 { | |
| 2419 next = li->li_next; | |
| 2420 listitem_remove(l, li); | |
| 2421 li = next; | |
| 2422 } | |
| 2423 } | |
| 2424 } | |
| 2425 | |
| 2426 if (obj == NULL) | |
| 2427 return 0; | |
| 2428 | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2429 if (!(iterator = PyObject_GetIter(obj))) |
| 3618 | 2430 return -1; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2431 |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2432 while ((item = PyIter_Next(iterator))) |
| 3618 | 2433 { |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2434 if (ConvertFromPyObject(item, &v) == -1) |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2435 { |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2436 Py_DECREF(iterator); |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2437 Py_DECREF(item); |
| 3618 | 2438 return -1; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2439 } |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2440 Py_DECREF(item); |
| 3618 | 2441 if (list_insert_tv(l, &v, li) == FAIL) |
| 2442 { | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2443 clear_tv(&v); |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2444 PyErr_SET_VIM(N_("internal error: failed to add item to list")); |
| 3618 | 2445 return -1; |
| 2446 } | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2447 clear_tv(&v); |
| 3618 | 2448 } |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
2449 Py_DECREF(iterator); |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
2450 |
|
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
2451 if (PyErr_Occurred()) |
|
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
2452 return -1; |
|
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
2453 |
| 3618 | 2454 return 0; |
| 2455 } | |
| 2456 | |
| 2457 static PyObject * | |
| 4488 | 2458 ListConcatInPlace(ListObject *self, PyObject *obj) |
| 3618 | 2459 { |
| 4488 | 2460 list_T *l = self->list; |
| 3618 | 2461 PyObject *lookup_dict; |
| 2462 | |
| 2463 if (l->lv_lock) | |
| 2464 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2465 RAISE_LOCKED_LIST; |
| 3618 | 2466 return NULL; |
| 2467 } | |
| 2468 | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
2469 if (!(lookup_dict = PyDict_New())) |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
2470 return NULL; |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
2471 |
| 3618 | 2472 if (list_py_concat(l, obj, lookup_dict) == -1) |
| 2473 { | |
| 2474 Py_DECREF(lookup_dict); | |
| 2475 return NULL; | |
| 2476 } | |
| 2477 Py_DECREF(lookup_dict); | |
| 2478 | |
| 2479 Py_INCREF(self); | |
| 4488 | 2480 return (PyObject *)(self); |
| 3618 | 2481 } |
| 2482 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2483 static char *ListAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2484 "locked", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2485 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2486 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2487 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2488 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2489 ListDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2490 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2491 return ObjectDir(self, ListAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2492 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2493 |
| 3828 | 2494 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2495 ListSetattr(ListObject *self, char *name, PyObject *valObject) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2496 { |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2497 if (valObject == NULL) |
| 3828 | 2498 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
2499 PyErr_SET_STRING(PyExc_AttributeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2500 N_("cannot delete vim.List attributes")); |
| 3828 | 2501 return -1; |
| 2502 } | |
| 2503 | |
| 2504 if (strcmp(name, "locked") == 0) | |
| 2505 { | |
| 4488 | 2506 if (self->list->lv_lock == VAR_FIXED) |
| 3828 | 2507 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2508 PyErr_SET_STRING(PyExc_TypeError, N_("cannot modify fixed list")); |
| 3828 | 2509 return -1; |
| 2510 } | |
| 2511 else | |
| 2512 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2513 int istrue = PyObject_IsTrue(valObject); |
| 4411 | 2514 if (istrue == -1) |
| 2515 return -1; | |
| 2516 else if (istrue) | |
| 4488 | 2517 self->list->lv_lock = VAR_LOCKED; |
| 3828 | 2518 else |
| 4488 | 2519 self->list->lv_lock = 0; |
| 3828 | 2520 } |
| 2521 return 0; | |
| 2522 } | |
| 2523 else | |
| 2524 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2525 PyErr_FORMAT(PyExc_AttributeError, N_("cannot set attribute %s"), name); |
| 3828 | 2526 return -1; |
| 2527 } | |
| 2528 } | |
| 2529 | |
| 3618 | 2530 static struct PyMethodDef ListMethods[] = { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2531 {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2532 {"__dir__", (PyCFunction)ListDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2533 { NULL, NULL, 0, NULL} |
| 3618 | 2534 }; |
| 2535 | |
| 2536 typedef struct | |
| 2537 { | |
| 2538 PyObject_HEAD | |
| 2539 char_u *name; | |
| 2540 } FunctionObject; | |
| 2541 | |
| 2542 static PyTypeObject FunctionType; | |
| 2543 | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2544 #define NEW_FUNCTION(name) FunctionNew(&FunctionType, name) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2545 |
| 3618 | 2546 static PyObject * |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2547 FunctionNew(PyTypeObject *subtype, char_u *name) |
| 3618 | 2548 { |
| 2549 FunctionObject *self; | |
| 2550 | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2551 self = (FunctionObject *) subtype->tp_alloc(subtype, 0); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2552 |
| 3618 | 2553 if (self == NULL) |
| 2554 return NULL; | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2555 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2556 if (isdigit(*name)) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2557 { |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2558 if (!translated_function_exists(name)) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2559 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2560 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2561 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
|
2562 return NULL; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2563 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2564 self->name = vim_strsave(name); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2565 func_ref(self->name); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2566 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2567 else |
|
4641
59e6c2bd68e3
updated for version 7.3.1068
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
2568 if ((self->name = get_expanded_name(name, |
|
59e6c2bd68e3
updated for version 7.3.1068
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
2569 vim_strchr(name, AUTOLOAD_CHAR) == NULL)) |
|
59e6c2bd68e3
updated for version 7.3.1068
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
2570 == NULL) |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2571 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2572 PyErr_FORMAT(PyExc_ValueError, |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2573 N_("function %s does not exist"), name); |
|
4641
59e6c2bd68e3
updated for version 7.3.1068
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
2574 return NULL; |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2575 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2576 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2577 return (PyObject *)(self); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2578 } |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2579 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2580 static PyObject * |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2581 FunctionConstructor(PyTypeObject *subtype, PyObject *args, PyObject *kwargs) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2582 { |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2583 PyObject *self; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2584 char_u *name; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2585 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2586 if (kwargs) |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2587 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
2588 PyErr_SET_STRING(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2589 N_("function constructor does not accept keyword arguments")); |
| 3618 | 2590 return NULL; |
| 2591 } | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2592 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2593 if (!PyArg_ParseTuple(args, "et", "ascii", &name)) |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2594 return NULL; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2595 |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2596 self = FunctionNew(subtype, name); |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2597 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2598 PyMem_Free(name); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
2599 |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2600 return self; |
| 3618 | 2601 } |
| 2602 | |
| 4319 | 2603 static void |
| 4488 | 2604 FunctionDestructor(FunctionObject *self) |
| 4319 | 2605 { |
| 4488 | 2606 func_unref(self->name); |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
2607 vim_free(self->name); |
| 4319 | 2608 |
| 2609 DESTRUCTOR_FINISH(self); | |
| 2610 } | |
| 2611 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2612 static char *FunctionAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2613 "softspace", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2614 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2615 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2616 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2617 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2618 FunctionDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2619 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2620 return ObjectDir(self, FunctionAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2621 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2622 |
| 3618 | 2623 static PyObject * |
| 4488 | 2624 FunctionCall(FunctionObject *self, PyObject *argsObject, PyObject *kwargs) |
| 3618 | 2625 { |
| 4488 | 2626 char_u *name = self->name; |
| 3618 | 2627 typval_T args; |
| 2628 typval_T selfdicttv; | |
| 2629 typval_T rettv; | |
| 2630 dict_T *selfdict = NULL; | |
| 2631 PyObject *selfdictObject; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2632 PyObject *ret; |
| 3618 | 2633 int error; |
| 2634 | |
| 2635 if (ConvertFromPyObject(argsObject, &args) == -1) | |
| 2636 return NULL; | |
| 2637 | |
| 2638 if (kwargs != NULL) | |
| 2639 { | |
| 2640 selfdictObject = PyDict_GetItemString(kwargs, "self"); | |
| 2641 if (selfdictObject != NULL) | |
| 2642 { | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
2643 if (ConvertFromPyMapping(selfdictObject, &selfdicttv) == -1) |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2644 { |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2645 clear_tv(&args); |
| 3618 | 2646 return NULL; |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2647 } |
| 3618 | 2648 selfdict = selfdicttv.vval.v_dict; |
| 2649 } | |
| 2650 } | |
| 2651 | |
| 4415 | 2652 Py_BEGIN_ALLOW_THREADS |
| 2653 Python_Lock_Vim(); | |
| 2654 | |
| 4498 | 2655 VimTryStart(); |
| 3618 | 2656 error = func_call(name, &args, selfdict, &rettv); |
| 4415 | 2657 |
| 2658 Python_Release_Vim(); | |
| 2659 Py_END_ALLOW_THREADS | |
| 2660 | |
| 4498 | 2661 if (VimTryEnd()) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2662 ret = NULL; |
| 4498 | 2663 else if (error != OK) |
| 3618 | 2664 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2665 ret = NULL; |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2666 PyErr_VIM_FORMAT(N_("failed to run function %s"), (char *)name); |
| 3618 | 2667 } |
| 2668 else | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2669 ret = ConvertToPyObject(&rettv); |
| 3618 | 2670 |
| 2671 clear_tv(&args); | |
| 2672 clear_tv(&rettv); | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2673 if (selfdict != NULL) |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2674 clear_tv(&selfdicttv); |
| 3618 | 2675 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2676 return ret; |
| 3618 | 2677 } |
| 2678 | |
|
4625
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
2679 static PyObject * |
|
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
2680 FunctionRepr(FunctionObject *self) |
|
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
2681 { |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2682 #ifdef Py_TRACE_REFS |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2683 /* For unknown reason self->name may be NULL after calling |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2684 * Finalize */ |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2685 return PyString_FromFormat("<vim.Function '%s'>", |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2686 (self->name == NULL ? "<NULL>" : (char *) self->name)); |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2687 #else |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2688 return PyString_FromFormat("<vim.Function '%s'>", (char *) self->name); |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
2689 #endif |
|
4625
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
2690 } |
|
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
2691 |
| 3618 | 2692 static struct PyMethodDef FunctionMethods[] = { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2693 {"__dir__", (PyCFunction)FunctionDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
2694 { NULL, NULL, 0, NULL} |
| 3618 | 2695 }; |
| 2696 | |
| 4350 | 2697 /* |
| 2698 * Options object | |
| 2699 */ | |
| 2700 | |
| 2701 static PyTypeObject OptionsType; | |
| 2702 | |
| 2703 typedef int (*checkfun)(void *); | |
| 2704 | |
| 2705 typedef struct | |
| 2706 { | |
| 2707 PyObject_HEAD | |
| 2708 int opt_type; | |
| 2709 void *from; | |
| 2710 checkfun Check; | |
| 2711 PyObject *fromObj; | |
| 2712 } OptionsObject; | |
| 2713 | |
| 4433 | 2714 static int |
| 2715 dummy_check(void *arg UNUSED) | |
| 2716 { | |
| 2717 return 0; | |
| 2718 } | |
| 2719 | |
| 2720 static PyObject * | |
| 2721 OptionsNew(int opt_type, void *from, checkfun Check, PyObject *fromObj) | |
| 2722 { | |
| 2723 OptionsObject *self; | |
| 2724 | |
| 4500 | 2725 self = PyObject_GC_New(OptionsObject, &OptionsType); |
| 4433 | 2726 if (self == NULL) |
| 2727 return NULL; | |
| 2728 | |
| 2729 self->opt_type = opt_type; | |
| 2730 self->from = from; | |
| 2731 self->Check = Check; | |
| 2732 self->fromObj = fromObj; | |
| 2733 if (fromObj) | |
| 2734 Py_INCREF(fromObj); | |
| 2735 | |
| 2736 return (PyObject *)(self); | |
| 2737 } | |
| 2738 | |
| 2739 static void | |
| 4488 | 2740 OptionsDestructor(OptionsObject *self) |
| 4433 | 2741 { |
| 4500 | 2742 PyObject_GC_UnTrack((void *)(self)); |
| 2743 Py_XDECREF(self->fromObj); | |
| 2744 PyObject_GC_Del((void *)(self)); | |
| 4433 | 2745 } |
| 2746 | |
| 2747 static int | |
| 4488 | 2748 OptionsTraverse(OptionsObject *self, visitproc visit, void *arg) |
| 4433 | 2749 { |
| 4488 | 2750 Py_VISIT(self->fromObj); |
| 4433 | 2751 return 0; |
| 2752 } | |
| 2753 | |
| 2754 static int | |
| 4488 | 2755 OptionsClear(OptionsObject *self) |
| 4433 | 2756 { |
| 4488 | 2757 Py_CLEAR(self->fromObj); |
| 4433 | 2758 return 0; |
| 2759 } | |
| 2760 | |
| 4350 | 2761 static PyObject * |
| 4488 | 2762 OptionsItem(OptionsObject *self, PyObject *keyObject) |
| 4350 | 2763 { |
| 2764 char_u *key; | |
| 2765 int flags; | |
| 2766 long numval; | |
| 2767 char_u *stringval; | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2768 PyObject *todecref; |
| 4350 | 2769 |
| 4488 | 2770 if (self->Check(self->from)) |
| 4350 | 2771 return NULL; |
| 2772 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2773 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2774 return NULL; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
2775 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2776 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2777 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2778 RAISE_NO_EMPTY_KEYS; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
2779 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2780 return NULL; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2781 } |
| 4350 | 2782 |
| 2783 flags = get_option_value_strict(key, &numval, &stringval, | |
| 4488 | 2784 self->opt_type, self->from); |
| 4350 | 2785 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2786 Py_XDECREF(todecref); |
| 4350 | 2787 |
| 2788 if (flags == 0) | |
| 2789 { | |
| 4403 | 2790 PyErr_SetObject(PyExc_KeyError, keyObject); |
| 4350 | 2791 return NULL; |
| 2792 } | |
| 2793 | |
| 2794 if (flags & SOPT_UNSET) | |
| 2795 { | |
| 2796 Py_INCREF(Py_None); | |
| 2797 return Py_None; | |
| 2798 } | |
| 2799 else if (flags & SOPT_BOOL) | |
| 2800 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2801 PyObject *ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2802 ret = numval ? Py_True : Py_False; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2803 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2804 return ret; |
| 4350 | 2805 } |
| 2806 else if (flags & SOPT_NUM) | |
| 2807 return PyInt_FromLong(numval); | |
| 2808 else if (flags & SOPT_STRING) | |
| 2809 { | |
| 2810 if (stringval) | |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2811 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2812 PyObject *ret = PyBytes_FromString((char *) stringval); |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2813 vim_free(stringval); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2814 return ret; |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2815 } |
| 4350 | 2816 else |
| 2817 { | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
2818 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2819 N_("unable to get option value")); |
| 4350 | 2820 return NULL; |
| 2821 } | |
| 2822 } | |
| 2823 else | |
| 2824 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2825 PyErr_SET_VIM(N_("internal error: unknown option type")); |
| 4350 | 2826 return NULL; |
| 2827 } | |
| 2828 } | |
| 2829 | |
| 2830 static int | |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2831 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
|
2832 { |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2833 char_u *errmsg; |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2834 |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2835 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
|
2836 { |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2837 if (VimTryEnd()) |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2838 return FAIL; |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2839 PyErr_SetVim((char *)errmsg); |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2840 return FAIL; |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2841 } |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2842 return OK; |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2843 } |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2844 |
|
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2845 static int |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2846 set_option_value_for( |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2847 char_u *key, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2848 int numval, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2849 char_u *stringval, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2850 int opt_flags, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2851 int opt_type, |
|
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
2852 void *from) |
| 4350 | 2853 { |
|
4509
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2854 win_T *save_curwin = NULL; |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2855 tabpage_T *save_curtab = NULL; |
|
b498224f5b41
updated for version 7.3.1002
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
2856 buf_T *save_curbuf = NULL; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2857 int set_ret = 0; |
| 4498 | 2858 |
| 2859 VimTryStart(); | |
| 4350 | 2860 switch (opt_type) |
| 2861 { | |
| 2862 case SREQ_WIN: | |
| 4429 | 2863 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
|
2864 win_find_tabpage((win_T *)from), FALSE) == FAIL) |
| 4350 | 2865 { |
| 4498 | 2866 if (VimTryEnd()) |
| 2867 return -1; | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2868 PyErr_SET_VIM(N_("problem while switching windows")); |
| 4350 | 2869 return -1; |
| 2870 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2871 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
|
2872 restore_win(save_curwin, save_curtab, TRUE); |
| 4350 | 2873 break; |
| 2874 case SREQ_BUF: | |
| 4429 | 2875 switch_buffer(&save_curbuf, (buf_T *)from); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2876 set_ret = set_option_value_err(key, numval, stringval, opt_flags); |
| 4429 | 2877 restore_buffer(save_curbuf); |
| 4350 | 2878 break; |
| 2879 case SREQ_GLOBAL: | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2880 set_ret = set_option_value_err(key, numval, stringval, opt_flags); |
| 4350 | 2881 break; |
| 2882 } | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2883 if (set_ret == FAIL) |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2884 return -1; |
| 4498 | 2885 return VimTryEnd(); |
| 4350 | 2886 } |
| 2887 | |
| 2888 static int | |
| 4488 | 2889 OptionsAssItem(OptionsObject *self, PyObject *keyObject, PyObject *valObject) |
| 4350 | 2890 { |
| 2891 char_u *key; | |
| 2892 int flags; | |
| 2893 int opt_flags; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2894 int ret = 0; |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2895 PyObject *todecref; |
| 4350 | 2896 |
| 4488 | 2897 if (self->Check(self->from)) |
| 4350 | 2898 return -1; |
| 2899 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2900 if (!(key = StringToChars(keyObject, &todecref))) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2901 return -1; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
2902 |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2903 if (*key == NUL) |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2904 { |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2905 RAISE_NO_EMPTY_KEYS; |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
2906 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2907 return -1; |
|
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2908 } |
| 4350 | 2909 |
| 2910 flags = get_option_value_strict(key, NULL, NULL, | |
| 4488 | 2911 self->opt_type, self->from); |
| 4350 | 2912 |
| 2913 if (flags == 0) | |
| 2914 { | |
| 4403 | 2915 PyErr_SetObject(PyExc_KeyError, keyObject); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2916 Py_XDECREF(todecref); |
| 4350 | 2917 return -1; |
| 2918 } | |
| 2919 | |
| 2920 if (valObject == NULL) | |
| 2921 { | |
| 4488 | 2922 if (self->opt_type == SREQ_GLOBAL) |
| 4350 | 2923 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2924 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2925 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
|
2926 Py_XDECREF(todecref); |
| 4350 | 2927 return -1; |
| 2928 } | |
| 2929 else if (!(flags & SOPT_GLOBAL)) | |
| 2930 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
2931 PyErr_FORMAT(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2932 N_("unable to unset option %s " |
|
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
2933 "which does not have global value"), key); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2934 Py_XDECREF(todecref); |
| 4350 | 2935 return -1; |
| 2936 } | |
| 2937 else | |
| 2938 { | |
| 4488 | 2939 unset_global_local_option(key, self->from); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2940 Py_XDECREF(todecref); |
| 4350 | 2941 return 0; |
| 2942 } | |
| 2943 } | |
| 2944 | |
| 4488 | 2945 opt_flags = (self->opt_type ? OPT_LOCAL : OPT_GLOBAL); |
| 4350 | 2946 |
| 2947 if (flags & SOPT_BOOL) | |
| 2948 { | |
| 4411 | 2949 int istrue = PyObject_IsTrue(valObject); |
|
4513
cadb57fbb781
updated for version 7.3.1004
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
2950 |
| 4411 | 2951 if (istrue == -1) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2952 ret = -1; |
|
4587
63c9b681c3db
updated for version 7.3.1041
Bram Moolenaar <bram@vim.org>
parents:
4575
diff
changeset
|
2953 else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2954 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
|
2955 opt_flags, self->opt_type, self->from); |
| 4350 | 2956 } |
| 2957 else if (flags & SOPT_NUM) | |
| 2958 { | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
2959 long val; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
2960 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
2961 if (NumberToLong(valObject, &val, NUMBER_INT)) |
| 4350 | 2962 { |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2963 Py_XDECREF(todecref); |
| 4350 | 2964 return -1; |
| 2965 } | |
| 2966 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2967 ret = set_option_value_for(key, (int) val, NULL, opt_flags, |
| 4488 | 2968 self->opt_type, self->from); |
| 4350 | 2969 } |
| 2970 else | |
| 2971 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2972 char_u *val; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
2973 PyObject *todecref; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
2974 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
2975 if ((val = StringToChars(valObject, &todecref))) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2976 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
|
2977 self->opt_type, self->from); |
| 4350 | 2978 else |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2979 ret = -1; |
| 4350 | 2980 } |
| 2981 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
2982 Py_XDECREF(todecref); |
|
4587
63c9b681c3db
updated for version 7.3.1041
Bram Moolenaar <bram@vim.org>
parents:
4575
diff
changeset
|
2983 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
2984 return ret; |
| 4350 | 2985 } |
| 2986 | |
| 2987 static PyMappingMethods OptionsAsMapping = { | |
| 2988 (lenfunc) NULL, | |
| 2989 (binaryfunc) OptionsItem, | |
| 2990 (objobjargproc) OptionsAssItem, | |
| 2991 }; | |
| 2992 | |
| 4401 | 2993 /* Tabpage object |
| 2994 */ | |
| 2995 | |
| 2996 typedef struct | |
| 2997 { | |
| 2998 PyObject_HEAD | |
| 2999 tabpage_T *tab; | |
| 3000 } TabPageObject; | |
| 3001 | |
| 3002 static PyObject *WinListNew(TabPageObject *tabObject); | |
| 3003 | |
| 3004 static PyTypeObject TabPageType; | |
| 3005 | |
| 3006 static int | |
| 4488 | 3007 CheckTabPage(TabPageObject *self) |
| 4401 | 3008 { |
| 4488 | 3009 if (self->tab == INVALID_TABPAGE_VALUE) |
| 4401 | 3010 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3011 PyErr_SET_VIM(N_("attempt to refer to deleted tab page")); |
| 4401 | 3012 return -1; |
| 3013 } | |
| 3014 | |
| 3015 return 0; | |
| 3016 } | |
| 3017 | |
| 3018 static PyObject * | |
| 3019 TabPageNew(tabpage_T *tab) | |
| 3020 { | |
| 3021 TabPageObject *self; | |
| 3022 | |
| 3023 if (TAB_PYTHON_REF(tab)) | |
| 3024 { | |
| 3025 self = TAB_PYTHON_REF(tab); | |
| 3026 Py_INCREF(self); | |
| 3027 } | |
| 3028 else | |
| 3029 { | |
| 3030 self = PyObject_NEW(TabPageObject, &TabPageType); | |
| 3031 if (self == NULL) | |
| 3032 return NULL; | |
| 3033 self->tab = tab; | |
| 3034 TAB_PYTHON_REF(tab) = self; | |
| 3035 } | |
| 3036 | |
| 3037 return (PyObject *)(self); | |
| 3038 } | |
| 3039 | |
| 3040 static void | |
| 4488 | 3041 TabPageDestructor(TabPageObject *self) |
| 4401 | 3042 { |
| 4488 | 3043 if (self->tab && self->tab != INVALID_TABPAGE_VALUE) |
| 3044 TAB_PYTHON_REF(self->tab) = NULL; | |
| 4401 | 3045 |
| 3046 DESTRUCTOR_FINISH(self); | |
| 3047 } | |
| 3048 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3049 static char *TabPageAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3050 "windows", "number", "vars", "window", "valid", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3051 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3052 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3053 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3054 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3055 TabPageDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3056 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3057 return ObjectDir(self, TabPageAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3058 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3059 |
| 4401 | 3060 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3061 TabPageAttrValid(TabPageObject *self, char *name) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3062 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3063 PyObject *ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3064 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3065 if (strcmp(name, "valid") != 0) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3066 return NULL; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3067 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3068 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
|
3069 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3070 return ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3071 } |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3072 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3073 static PyObject * |
| 4488 | 3074 TabPageAttr(TabPageObject *self, char *name) |
| 4401 | 3075 { |
| 3076 if (strcmp(name, "windows") == 0) | |
| 4488 | 3077 return WinListNew(self); |
| 4401 | 3078 else if (strcmp(name, "number") == 0) |
| 4488 | 3079 return PyLong_FromLong((long) get_tab_number(self->tab)); |
| 4401 | 3080 else if (strcmp(name, "vars") == 0) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
3081 return NEW_DICTIONARY(self->tab->tp_vars); |
| 4401 | 3082 else if (strcmp(name, "window") == 0) |
| 3083 { | |
| 3084 /* For current tab window.c does not bother to set or update tp_curwin | |
| 3085 */ | |
| 4488 | 3086 if (self->tab == curtab) |
| 4431 | 3087 return WindowNew(curwin, curtab); |
| 4401 | 3088 else |
| 4488 | 3089 return WindowNew(self->tab->tp_curwin, self->tab); |
| 4401 | 3090 } |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3091 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3092 return ObjectDir(NULL, TabPageAttrs); |
| 4401 | 3093 return NULL; |
| 3094 } | |
| 3095 | |
| 3096 static PyObject * | |
| 4488 | 3097 TabPageRepr(TabPageObject *self) |
| 4401 | 3098 { |
| 4488 | 3099 if (self->tab == INVALID_TABPAGE_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3100 return PyString_FromFormat("<tabpage object (deleted) at %p>", (self)); |
| 4401 | 3101 else |
| 3102 { | |
| 4488 | 3103 int t = get_tab_number(self->tab); |
| 4401 | 3104 |
| 3105 if (t == 0) | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3106 return PyString_FromFormat("<tabpage object (unknown) at %p>", |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3107 (self)); |
| 4401 | 3108 else |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3109 return PyString_FromFormat("<tabpage %d>", t - 1); |
| 4401 | 3110 } |
| 3111 } | |
| 3112 | |
| 3113 static struct PyMethodDef TabPageMethods[] = { | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3114 /* name, function, calling, documentation */ |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3115 {"__dir__", (PyCFunction)TabPageDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3116 { NULL, NULL, 0, NULL} |
| 4401 | 3117 }; |
| 3118 | |
| 3119 /* | |
| 3120 * Window list object | |
| 3121 */ | |
| 3122 | |
| 3123 static PyTypeObject TabListType; | |
| 3124 static PySequenceMethods TabListAsSeq; | |
| 3125 | |
| 3126 typedef struct | |
| 3127 { | |
| 3128 PyObject_HEAD | |
| 3129 } TabListObject; | |
| 3130 | |
| 3131 static PyInt | |
| 3132 TabListLength(PyObject *self UNUSED) | |
| 3133 { | |
| 3134 tabpage_T *tp = first_tabpage; | |
| 3135 PyInt n = 0; | |
| 3136 | |
| 3137 while (tp != NULL) | |
| 3138 { | |
| 3139 ++n; | |
| 3140 tp = tp->tp_next; | |
| 3141 } | |
| 3142 | |
| 3143 return n; | |
| 3144 } | |
| 3145 | |
| 3146 static PyObject * | |
| 3147 TabListItem(PyObject *self UNUSED, PyInt n) | |
| 3148 { | |
| 3149 tabpage_T *tp; | |
| 3150 | |
| 3151 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, --n) | |
| 3152 if (n == 0) | |
| 3153 return TabPageNew(tp); | |
| 3154 | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3155 PyErr_SET_STRING(PyExc_IndexError, N_("no such tab page")); |
| 4401 | 3156 return NULL; |
| 3157 } | |
| 3158 | |
|
4962
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
3159 /* |
|
b34d719b13cd
updated for version 7.3.1226
Bram Moolenaar <bram@vim.org>
parents:
4922
diff
changeset
|
3160 * Window object |
| 4385 | 3161 */ |
| 3162 | |
| 3163 typedef struct | |
| 3164 { | |
| 3165 PyObject_HEAD | |
| 3166 win_T *win; | |
| 4431 | 3167 TabPageObject *tabObject; |
| 4385 | 3168 } WindowObject; |
| 3169 | |
| 3170 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
|
3171 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3172 static int |
| 4488 | 3173 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
|
3174 { |
| 4488 | 3175 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
|
3176 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3177 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
|
3178 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3179 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3180 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3181 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3182 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3183 |
| 4319 | 3184 static PyObject * |
| 4431 | 3185 WindowNew(win_T *win, tabpage_T *tab) |
| 4377 | 3186 { |
| 3187 /* We need to handle deletion of windows underneath us. | |
| 3188 * If we add a "w_python*_ref" field to the win_T structure, | |
| 3189 * then we can get at it in win_free() in vim. We then | |
| 3190 * need to create only ONE Python object per window - if | |
| 3191 * we try to create a second, just INCREF the existing one | |
| 3192 * and return it. The (single) Python object referring to | |
| 3193 * the window is stored in "w_python*_ref". | |
| 3194 * On a win_free() we set the Python object's win_T* field | |
| 3195 * to an invalid value. We trap all uses of a window | |
| 3196 * object, and reject them if the win_T* field is invalid. | |
| 3197 * | |
| 4385 | 3198 * Python2 and Python3 get different fields and different objects: |
| 4377 | 3199 * w_python_ref and w_python3_ref fields respectively. |
| 3200 */ | |
| 3201 | |
| 3202 WindowObject *self; | |
| 3203 | |
| 3204 if (WIN_PYTHON_REF(win)) | |
| 3205 { | |
| 3206 self = WIN_PYTHON_REF(win); | |
| 3207 Py_INCREF(self); | |
| 3208 } | |
| 3209 else | |
| 3210 { | |
| 4500 | 3211 self = PyObject_GC_New(WindowObject, &WindowType); |
| 4377 | 3212 if (self == NULL) |
| 3213 return NULL; | |
| 3214 self->win = win; | |
| 3215 WIN_PYTHON_REF(win) = self; | |
| 3216 } | |
| 3217 | |
| 4431 | 3218 self->tabObject = ((TabPageObject *)(TabPageNew(tab))); |
| 3219 | |
| 4377 | 3220 return (PyObject *)(self); |
| 3221 } | |
| 3222 | |
| 4385 | 3223 static void |
| 4488 | 3224 WindowDestructor(WindowObject *self) |
| 4385 | 3225 { |
| 4500 | 3226 PyObject_GC_UnTrack((void *)(self)); |
| 4488 | 3227 if (self->win && self->win != INVALID_WINDOW_VALUE) |
| 3228 WIN_PYTHON_REF(self->win) = NULL; | |
| 4500 | 3229 Py_XDECREF(((PyObject *)(self->tabObject))); |
| 3230 PyObject_GC_Del((void *)(self)); | |
| 3231 } | |
| 3232 | |
| 3233 static int | |
| 3234 WindowTraverse(WindowObject *self, visitproc visit, void *arg) | |
| 3235 { | |
| 3236 Py_VISIT(((PyObject *)(self->tabObject))); | |
| 3237 return 0; | |
| 3238 } | |
| 3239 | |
| 3240 static int | |
| 3241 WindowClear(WindowObject *self) | |
| 3242 { | |
| 3243 Py_CLEAR(self->tabObject); | |
| 3244 return 0; | |
| 4385 | 3245 } |
| 3246 | |
| 4431 | 3247 static win_T * |
| 3248 get_firstwin(TabPageObject *tabObject) | |
| 3249 { | |
| 3250 if (tabObject) | |
| 3251 { | |
| 3252 if (CheckTabPage(tabObject)) | |
| 3253 return NULL; | |
| 3254 /* For current tab window.c does not bother to set or update tp_firstwin | |
| 3255 */ | |
| 3256 else if (tabObject->tab == curtab) | |
| 3257 return firstwin; | |
| 3258 else | |
| 3259 return tabObject->tab->tp_firstwin; | |
| 3260 } | |
| 3261 else | |
| 3262 return firstwin; | |
| 3263 } | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3264 static char *WindowAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3265 "buffer", "cursor", "height", "vars", "options", "number", "row", "col", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3266 "tabpage", "valid", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3267 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3268 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3269 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3270 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3271 WindowDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3272 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3273 return ObjectDir(self, WindowAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3274 } |
| 4431 | 3275 |
| 4377 | 3276 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3277 WindowAttrValid(WindowObject *self, char *name) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3278 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3279 PyObject *ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3280 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3281 if (strcmp(name, "valid") != 0) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3282 return NULL; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3283 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3284 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
|
3285 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3286 return ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3287 } |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3288 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
3289 static PyObject * |
| 4488 | 3290 WindowAttr(WindowObject *self, char *name) |
| 4319 | 3291 { |
| 3292 if (strcmp(name, "buffer") == 0) | |
| 4488 | 3293 return (PyObject *)BufferNew(self->win->w_buffer); |
| 4319 | 3294 else if (strcmp(name, "cursor") == 0) |
| 3295 { | |
| 4488 | 3296 pos_T *pos = &self->win->w_cursor; |
| 4319 | 3297 |
| 3298 return Py_BuildValue("(ll)", (long)(pos->lnum), (long)(pos->col)); | |
| 3299 } | |
| 3300 else if (strcmp(name, "height") == 0) | |
| 4488 | 3301 return PyLong_FromLong((long)(self->win->w_height)); |
| 4383 | 3302 #ifdef FEAT_WINDOWS |
| 3303 else if (strcmp(name, "row") == 0) | |
| 4488 | 3304 return PyLong_FromLong((long)(self->win->w_winrow)); |
| 4383 | 3305 #endif |
| 4319 | 3306 #ifdef FEAT_VERTSPLIT |
| 3307 else if (strcmp(name, "width") == 0) | |
| 4488 | 3308 return PyLong_FromLong((long)(W_WIDTH(self->win))); |
| 4383 | 3309 else if (strcmp(name, "col") == 0) |
| 4488 | 3310 return PyLong_FromLong((long)(W_WINCOL(self->win))); |
| 4319 | 3311 #endif |
| 4323 | 3312 else if (strcmp(name, "vars") == 0) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
3313 return NEW_DICTIONARY(self->win->w_vars); |
| 4350 | 3314 else if (strcmp(name, "options") == 0) |
| 4488 | 3315 return OptionsNew(SREQ_WIN, self->win, (checkfun) CheckWindow, |
| 3316 (PyObject *) self); | |
| 4379 | 3317 else if (strcmp(name, "number") == 0) |
| 4431 | 3318 { |
| 4488 | 3319 if (CheckTabPage(self->tabObject)) |
| 4431 | 3320 return NULL; |
| 3321 return PyLong_FromLong((long) | |
| 4488 | 3322 get_win_number(self->win, get_firstwin(self->tabObject))); |
| 4431 | 3323 } |
| 3324 else if (strcmp(name, "tabpage") == 0) | |
| 3325 { | |
| 4488 | 3326 Py_INCREF(self->tabObject); |
| 3327 return (PyObject *)(self->tabObject); | |
| 4431 | 3328 } |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3329 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3330 return ObjectDir(NULL, WindowAttrs); |
| 4319 | 3331 else |
| 3332 return NULL; | |
| 3333 } | |
| 3334 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3335 static int |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3336 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
|
3337 { |
| 4488 | 3338 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
|
3339 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3340 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3341 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
|
3342 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3343 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
|
3344 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3345 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3346 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
|
3347 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3348 long lnum; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3349 long col; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3350 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3351 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
|
3352 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3353 |
| 4488 | 3354 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
|
3355 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3356 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
|
3357 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3358 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3359 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3360 /* Check for keyboard interrupts */ |
| 4498 | 3361 if (VimCheckInterrupt()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3362 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3363 |
| 4488 | 3364 self->win->w_cursor.lnum = lnum; |
| 3365 self->win->w_cursor.col = col; | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3366 #ifdef FEAT_VIRTUALEDIT |
| 4488 | 3367 self->win->w_cursor.coladd = 0; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3368 #endif |
| 2933 | 3369 /* When column is out of range silently correct it. */ |
| 4488 | 3370 check_cursor_col_win(self->win); |
| 2933 | 3371 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3372 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3373 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3374 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3375 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
|
3376 { |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3377 long height; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3378 win_T *savewin; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3379 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
3380 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
|
3381 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3382 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3383 #ifdef FEAT_GUI |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3384 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
|
3385 #endif |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3386 savewin = curwin; |
| 4488 | 3387 curwin = self->win; |
| 4498 | 3388 |
| 3389 VimTryStart(); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3390 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
|
3391 curwin = savewin; |
| 4498 | 3392 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3393 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3394 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3395 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3396 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3397 #ifdef FEAT_VERTSPLIT |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3398 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
|
3399 { |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3400 long width; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3401 win_T *savewin; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3402 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
3403 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
|
3404 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3405 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3406 #ifdef FEAT_GUI |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3407 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
|
3408 #endif |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3409 savewin = curwin; |
| 4488 | 3410 curwin = self->win; |
| 4498 | 3411 |
| 3412 VimTryStart(); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
3413 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
|
3414 curwin = savewin; |
| 4498 | 3415 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3416 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3417 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3418 return 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3419 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3420 #endif |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3421 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3422 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3423 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
|
3424 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3425 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3426 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3427 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3428 static PyObject * |
| 4488 | 3429 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
|
3430 { |
| 4488 | 3431 if (self->win == INVALID_WINDOW_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3432 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
|
3433 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3434 { |
| 4488 | 3435 int w = get_win_number(self->win, firstwin); |
| 4379 | 3436 |
| 3437 if (w == 0) | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3438 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
|
3439 (self)); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3440 else |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
3441 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
|
3442 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3443 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3444 |
| 4385 | 3445 static struct PyMethodDef WindowMethods[] = { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3446 /* name, function, calling, documentation */ |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3447 {"__dir__", (PyCFunction)WindowDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
3448 { NULL, NULL, 0, NULL} |
| 4385 | 3449 }; |
| 3450 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3451 /* |
| 4385 | 3452 * 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
|
3453 */ |
| 4319 | 3454 |
| 4385 | 3455 static PyTypeObject WinListType; |
| 3456 static PySequenceMethods WinListAsSeq; | |
| 3457 | |
| 4319 | 3458 typedef struct |
| 3459 { | |
| 3460 PyObject_HEAD | |
| 4401 | 3461 TabPageObject *tabObject; |
| 4319 | 3462 } WinListObject; |
| 3463 | |
| 4401 | 3464 static PyObject * |
| 3465 WinListNew(TabPageObject *tabObject) | |
| 3466 { | |
| 3467 WinListObject *self; | |
| 3468 | |
| 3469 self = PyObject_NEW(WinListObject, &WinListType); | |
| 3470 self->tabObject = tabObject; | |
| 3471 Py_INCREF(tabObject); | |
| 3472 | |
| 3473 return (PyObject *)(self); | |
| 3474 } | |
| 3475 | |
| 3476 static void | |
| 4488 | 3477 WinListDestructor(WinListObject *self) |
| 4401 | 3478 { |
| 4488 | 3479 TabPageObject *tabObject = self->tabObject; |
| 4401 | 3480 |
| 3481 if (tabObject) | |
|
4523
57393dc4b811
updated for version 7.3.1009
Bram Moolenaar <bram@vim.org>
parents:
4513
diff
changeset
|
3482 { |
| 4401 | 3483 Py_DECREF((PyObject *)(tabObject)); |
|
4523
57393dc4b811
updated for version 7.3.1009
Bram Moolenaar <bram@vim.org>
parents:
4513
diff
changeset
|
3484 } |
| 4401 | 3485 |
| 3486 DESTRUCTOR_FINISH(self); | |
| 3487 } | |
| 3488 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3489 static PyInt |
| 4488 | 3490 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
|
3491 { |
| 4401 | 3492 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
|
3493 PyInt n = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3494 |
| 4488 | 3495 if (!(w = get_firstwin(self->tabObject))) |
| 4401 | 3496 return -1; |
| 3497 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3498 while (w != NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3499 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3500 ++n; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3501 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
|
3502 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3503 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3504 return n; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3505 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3506 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3507 static PyObject * |
| 4488 | 3508 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
|
3509 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3510 win_T *w; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3511 |
| 4488 | 3512 if (!(w = get_firstwin(self->tabObject))) |
| 4401 | 3513 return NULL; |
| 3514 | |
| 3515 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
|
3516 if (n == 0) |
| 4488 | 3517 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
|
3518 |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3519 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
|
3520 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3521 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3522 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3523 /* Convert a Python string into a Vim line. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3524 * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3525 * 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
|
3526 * 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
|
3527 * characters. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3528 * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3529 * 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
|
3530 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3531 static char * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3532 StringToLine(PyObject *obj) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3533 { |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3534 char *str; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3535 char *save; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3536 PyObject *bytes = NULL; |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
3537 Py_ssize_t len = 0; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3538 PyInt i; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3539 char *p; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3540 |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3541 if (PyBytes_Check(obj)) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3542 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3543 if (PyBytes_AsStringAndSize(obj, &str, &len) == -1 |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3544 || str == NULL) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3545 return NULL; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3546 } |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3547 else if (PyUnicode_Check(obj)) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3548 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3549 if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL))) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3550 return NULL; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3551 |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3552 if(PyBytes_AsStringAndSize(bytes, &str, &len) == -1 |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3553 || str == NULL) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3554 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3555 Py_DECREF(bytes); |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3556 return NULL; |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3557 } |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3558 } |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3559 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3560 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3561 * 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
|
3562 * 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
|
3563 * a single line. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3564 * 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
|
3565 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3566 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
|
3567 if (p != NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3568 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3569 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
|
3570 --len; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3571 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3572 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3573 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
|
3574 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
|
3575 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3576 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3577 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3578 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3579 /* Create a copy of the string, with internal nulls replaced by |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3580 * 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
|
3581 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3582 save = (char *)alloc((unsigned)(len+1)); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3583 if (save == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3584 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3585 PyErr_NoMemory(); |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
3586 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
|
3587 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3588 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3589 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3590 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
|
3591 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3592 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
|
3593 save[i] = '\n'; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3594 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3595 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
|
3596 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3597 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3598 save[i] = '\0'; |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3599 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
|
3600 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3601 return save; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3602 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3603 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3604 /* Get a line from the specified buffer. The line number is |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3605 * 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
|
3606 * string object. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3607 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3608 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3609 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
|
3610 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3611 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
|
3612 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3613 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3614 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3615 /* Get a list of lines from the specified buffer. The line numbers |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3616 * 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
|
3617 * 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
|
3618 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3619 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3620 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
|
3621 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3622 PyInt i; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3623 PyInt n = hi - lo; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3624 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
|
3625 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3626 if (list == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3627 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3628 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3629 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
|
3630 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3631 PyObject *string = LineToString( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3632 (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
|
3633 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3634 /* 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
|
3635 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
|
3636 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3637 Py_DECREF(list); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3638 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3639 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3640 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3641 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
|
3642 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3643 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3644 /* The ownership of the Python list is passed to the caller (ie, |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3645 * the caller should Py_DECREF() the object when it is finished |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3646 * with it). |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3647 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3648 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3649 return list; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3650 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3651 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3652 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3653 * 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
|
3654 * 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
|
3655 * deleted). |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3656 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3657 static void |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3658 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
|
3659 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3660 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
|
3661 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3662 /* Adjust the cursor position if it's in/after the changed |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3663 * lines. */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3664 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
|
3665 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3666 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
|
3667 check_cursor_col(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3668 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3669 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
|
3670 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3671 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
|
3672 check_cursor(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3673 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3674 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3675 check_cursor_col(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3676 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
|
3677 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3678 invalidate_botline(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3679 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3680 |
| 2894 | 3681 /* |
| 3682 * 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
|
3683 * 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
|
3684 * 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
|
3685 * 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
|
3686 * 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
|
3687 * 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
|
3688 * 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
|
3689 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3690 static int |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3691 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
|
3692 { |
| 4352 | 3693 /* First of all, we check the type of the supplied Python object. |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3694 * There are three cases: |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3695 * 1. NULL, or None - this is a deletion. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3696 * 2. A string - this is a replacement. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3697 * 3. Anything else - this is an error. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3698 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3699 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
|
3700 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3701 buf_T *savebuf; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3702 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3703 PyErr_Clear(); |
| 4429 | 3704 switch_buffer(&savebuf, buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3705 |
| 4498 | 3706 VimTryStart(); |
| 3707 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3708 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
|
3709 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
|
3710 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
|
3711 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
|
3712 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3713 { |
| 4429 | 3714 if (buf == savebuf) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3715 py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3716 deleted_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
|
3717 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3718 |
| 4429 | 3719 restore_buffer(savebuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3720 |
| 4498 | 3721 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3722 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3723 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3724 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3725 *len_change = -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3726 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3727 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3728 } |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3729 else if (PyBytes_Check(line) || PyUnicode_Check(line)) |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3730 { |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3731 char *save = StringToLine(line); |
|
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3732 buf_T *savebuf; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3733 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3734 if (save == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3735 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3736 |
| 4498 | 3737 VimTryStart(); |
| 3738 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3739 /* We do not need to free "save" if ml_replace() consumes it. */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3740 PyErr_Clear(); |
| 4429 | 3741 switch_buffer(&savebuf, buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3742 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3743 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
|
3744 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
3745 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
|
3746 vim_free(save); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3747 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3748 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
|
3749 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3750 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
|
3751 vim_free(save); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3752 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3753 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3754 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
|
3755 |
| 4429 | 3756 restore_buffer(savebuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3757 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3758 /* Check that the cursor is not beyond the end of the line now. */ |
| 4429 | 3759 if (buf == savebuf) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3760 check_cursor_col(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3761 |
| 4498 | 3762 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3763 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3764 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3765 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3766 *len_change = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3767 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3768 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3769 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3770 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3771 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3772 PyErr_BadArgument(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3773 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3774 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3775 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3776 |
| 2894 | 3777 /* Replace a range of lines in the specified buffer. The line numbers are in |
| 3778 * Vim format (1-based). The range is from lo up to, but not including, hi. | |
| 3779 * The replacement lines are given as a Python list of string objects. The | |
| 3780 * list is checked for validity and correct format. Errors are returned as a | |
| 3781 * value of FAIL. The return value is OK on success. | |
| 3782 * If OK is returned and len_change is not NULL, *len_change | |
| 3783 * is set to the change in the buffer length. | |
| 3784 */ | |
| 3785 static int | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3786 SetBufferLineList( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3787 buf_T *buf, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3788 PyInt lo, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3789 PyInt hi, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3790 PyObject *list, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
3791 PyInt *len_change) |
| 2894 | 3792 { |
| 4352 | 3793 /* First of all, we check the type of the supplied Python object. |
| 2894 | 3794 * There are three cases: |
| 3795 * 1. NULL, or None - this is a deletion. | |
| 3796 * 2. A list - this is a replacement. | |
| 3797 * 3. Anything else - this is an error. | |
| 3798 */ | |
| 3799 if (list == Py_None || list == NULL) | |
| 3800 { | |
| 3801 PyInt i; | |
| 3802 PyInt n = (int)(hi - lo); | |
| 4429 | 3803 buf_T *savebuf; |
| 2894 | 3804 |
| 3805 PyErr_Clear(); | |
| 4498 | 3806 VimTryStart(); |
| 4429 | 3807 switch_buffer(&savebuf, buf); |
| 2894 | 3808 |
| 3809 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
|
3810 RAISE_UNDO_FAIL; |
| 2894 | 3811 else |
| 3812 { | |
| 3813 for (i = 0; i < n; ++i) | |
| 3814 { | |
| 3815 if (ml_delete((linenr_T)lo, FALSE) == FAIL) | |
| 3816 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3817 RAISE_DELETE_LINE_FAIL; |
| 2894 | 3818 break; |
| 3819 } | |
| 3820 } | |
| 4429 | 3821 if (buf == savebuf) |
| 2894 | 3822 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n); |
| 3823 deleted_lines_mark((linenr_T)lo, (long)i); | |
| 3824 } | |
| 3825 | |
| 4429 | 3826 restore_buffer(savebuf); |
| 2894 | 3827 |
| 4498 | 3828 if (VimTryEnd()) |
| 2894 | 3829 return FAIL; |
| 3830 | |
| 3831 if (len_change) | |
| 3832 *len_change = -n; | |
| 3833 | |
| 3834 return OK; | |
| 3835 } | |
| 3836 else if (PyList_Check(list)) | |
| 3837 { | |
| 3838 PyInt i; | |
| 3839 PyInt new_len = PyList_Size(list); | |
| 3840 PyInt old_len = hi - lo; | |
| 3841 PyInt extra = 0; /* lines added to text, can be negative */ | |
| 3842 char **array; | |
| 3843 buf_T *savebuf; | |
| 3844 | |
| 3845 if (new_len == 0) /* avoid allocating zero bytes */ | |
| 3846 array = NULL; | |
| 3847 else | |
| 3848 { | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
3849 array = PyMem_New(char *, new_len); |
| 2894 | 3850 if (array == NULL) |
| 3851 { | |
| 3852 PyErr_NoMemory(); | |
| 3853 return FAIL; | |
| 3854 } | |
| 3855 } | |
| 3856 | |
| 3857 for (i = 0; i < new_len; ++i) | |
| 3858 { | |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
3859 PyObject *line; |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
3860 |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
3861 if (!(line = PyList_GetItem(list, i)) || |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
3862 !(array[i] = StringToLine(line))) |
| 2894 | 3863 { |
| 3864 while (i) | |
| 3865 vim_free(array[--i]); | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
3866 PyMem_Free(array); |
| 2894 | 3867 return FAIL; |
| 3868 } | |
| 3869 } | |
| 3870 | |
| 4498 | 3871 VimTryStart(); |
| 2894 | 3872 PyErr_Clear(); |
| 4429 | 3873 |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
3874 /* START of region without "return". Must call restore_buffer()! */ |
| 4429 | 3875 switch_buffer(&savebuf, buf); |
| 2894 | 3876 |
| 3877 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
|
3878 RAISE_UNDO_FAIL; |
| 2894 | 3879 |
| 3880 /* If the size of the range is reducing (ie, new_len < old_len) we | |
| 3881 * need to delete some old_len. We do this at the start, by | |
| 3882 * repeatedly deleting line "lo". | |
| 3883 */ | |
| 3884 if (!PyErr_Occurred()) | |
| 3885 { | |
| 3886 for (i = 0; i < old_len - new_len; ++i) | |
| 3887 if (ml_delete((linenr_T)lo, FALSE) == FAIL) | |
| 3888 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3889 RAISE_DELETE_LINE_FAIL; |
| 2894 | 3890 break; |
| 3891 } | |
| 3892 extra -= i; | |
| 3893 } | |
| 3894 | |
| 3895 /* For as long as possible, replace the existing old_len with the | |
| 3896 * new old_len. This is a more efficient operation, as it requires | |
| 3897 * less memory allocation and freeing. | |
| 3898 */ | |
| 3899 if (!PyErr_Occurred()) | |
| 3900 { | |
| 3901 for (i = 0; i < old_len && i < new_len; ++i) | |
| 3902 if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE) | |
| 3903 == FAIL) | |
| 3904 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3905 RAISE_REPLACE_LINE_FAIL; |
| 2894 | 3906 break; |
| 3907 } | |
| 3908 } | |
| 3909 else | |
| 3910 i = 0; | |
| 3911 | |
| 3912 /* Now we may need to insert the remaining new old_len. If we do, we | |
| 3913 * must free the strings as we finish with them (we can't pass the | |
| 3914 * responsibility to vim in this case). | |
| 3915 */ | |
| 3916 if (!PyErr_Occurred()) | |
| 3917 { | |
| 3918 while (i < new_len) | |
| 3919 { | |
| 3920 if (ml_append((linenr_T)(lo + i - 1), | |
| 3921 (char_u *)array[i], 0, FALSE) == FAIL) | |
| 3922 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
3923 RAISE_INSERT_LINE_FAIL; |
| 2894 | 3924 break; |
| 3925 } | |
| 3926 vim_free(array[i]); | |
| 3927 ++i; | |
| 3928 ++extra; | |
| 3929 } | |
| 3930 } | |
| 3931 | |
| 3932 /* Free any left-over old_len, as a result of an error */ | |
| 3933 while (i < new_len) | |
| 3934 { | |
| 3935 vim_free(array[i]); | |
| 3936 ++i; | |
| 3937 } | |
| 3938 | |
| 3939 /* Free the array of old_len. All of its contents have now | |
| 3940 * been dealt with (either freed, or the responsibility passed | |
| 3941 * to vim. | |
| 3942 */ | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
3943 PyMem_Free(array); |
| 2894 | 3944 |
| 3945 /* Adjust marks. Invalidate any which lie in the | |
| 3946 * changed range, and move any in the remainder of the buffer. | |
| 3947 */ | |
| 3948 mark_adjust((linenr_T)lo, (linenr_T)(hi - 1), | |
| 3949 (long)MAXLNUM, (long)extra); | |
| 3950 changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra); | |
| 3951 | |
| 4429 | 3952 if (buf == savebuf) |
| 2894 | 3953 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra); |
| 3954 | |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
3955 /* END of region without "return". */ |
| 4429 | 3956 restore_buffer(savebuf); |
| 2894 | 3957 |
| 4498 | 3958 if (VimTryEnd()) |
| 2894 | 3959 return FAIL; |
| 3960 | |
| 3961 if (len_change) | |
| 3962 *len_change = new_len - old_len; | |
| 3963 | |
| 3964 return OK; | |
| 3965 } | |
| 3966 else | |
| 3967 { | |
| 3968 PyErr_BadArgument(); | |
| 3969 return FAIL; | |
| 3970 } | |
| 3971 } | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3972 |
| 4352 | 3973 /* 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
|
3974 * 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
|
3975 * 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
|
3976 * 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
|
3977 * 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
|
3978 * 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
|
3979 * 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
|
3980 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3981 static int |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3982 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
|
3983 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3984 /* First of all, we check the type of the supplied Python object. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3985 * It must be a string or a list, or the call is in error. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3986 */ |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
3987 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
|
3988 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3989 char *str = StringToLine(lines); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3990 buf_T *savebuf; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3991 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3992 if (str == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3993 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3994 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3995 PyErr_Clear(); |
| 4498 | 3996 VimTryStart(); |
| 4429 | 3997 switch_buffer(&savebuf, buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3998 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
3999 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
|
4000 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
|
4001 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
|
4002 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
|
4003 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4004 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
|
4005 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4006 vim_free(str); |
| 4429 | 4007 restore_buffer(savebuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4008 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4009 |
| 4498 | 4010 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4011 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4012 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4013 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4014 *len_change = 1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4015 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4016 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4017 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4018 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
|
4019 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4020 PyInt i; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4021 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
|
4022 char **array; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4023 buf_T *savebuf; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4024 |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4025 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
|
4026 if (array == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4027 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4028 PyErr_NoMemory(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4029 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4030 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4031 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4032 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
|
4033 { |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4034 PyObject *line; |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4035 |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4036 if (!(line = PyList_GetItem(lines, i)) || |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4037 !(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
|
4038 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4039 while (i) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4040 vim_free(array[--i]); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4041 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
|
4042 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4043 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4044 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4045 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4046 PyErr_Clear(); |
| 4498 | 4047 VimTryStart(); |
| 4429 | 4048 switch_buffer(&savebuf, buf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4049 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4050 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
|
4051 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
|
4052 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4053 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4054 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
|
4055 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4056 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
|
4057 (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
|
4058 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4059 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
|
4060 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4061 /* Free the rest of the lines */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4062 while (i < size) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4063 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
|
4064 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4065 break; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4066 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4067 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
|
4068 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4069 if (i > 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4070 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
|
4071 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4072 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4073 /* Free the array of lines. All of its contents have now |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4074 * been freed. |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4075 */ |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4076 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
|
4077 |
| 4429 | 4078 restore_buffer(savebuf); |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4079 update_screen(VALID); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4080 |
| 4498 | 4081 if (VimTryEnd()) |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4082 return FAIL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4083 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4084 if (len_change) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4085 *len_change = size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4086 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4087 return OK; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4088 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4089 else |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4090 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4091 PyErr_BadArgument(); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4092 return FAIL; |
|
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 } |
|
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 /* |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4097 * 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
|
4098 * ------------------------------------------- |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4099 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4100 |
| 4385 | 4101 typedef struct |
| 4102 { | |
| 4103 PyObject_HEAD | |
| 4104 buf_T *buf; | |
| 4105 } BufferObject; | |
| 4106 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4107 static int |
| 4488 | 4108 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
|
4109 { |
| 4488 | 4110 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
|
4111 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4112 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
|
4113 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4114 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4115 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4116 return 0; |
|
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 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4120 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
|
4121 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4122 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4123 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4124 |
| 4387 | 4125 if (end == -1) |
| 4126 end = self->buf->b_ml.ml_line_count; | |
| 4127 | |
| 4389 | 4128 if (n < 0) |
| 4129 n += end - start + 1; | |
| 4130 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4131 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
|
4132 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4133 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
|
4134 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4135 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4136 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4137 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
|
4138 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4139 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4140 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4141 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
|
4142 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4143 PyInt size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4144 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4145 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4146 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4147 |
| 4387 | 4148 if (end == -1) |
| 4149 end = self->buf->b_ml.ml_line_count; | |
| 4150 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4151 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
|
4152 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4153 if (lo < 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4154 lo = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4155 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
|
4156 lo = size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4157 if (hi < 0) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4158 hi = 0; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4159 if (hi < lo) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4160 hi = lo; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4161 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
|
4162 hi = size; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4163 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4164 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
|
4165 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4166 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4167 static PyInt |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4168 RBAsItem( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4169 BufferObject *self, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4170 PyInt n, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4171 PyObject *valObject, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4172 PyInt start, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4173 PyInt end, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4174 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
|
4175 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4176 PyInt len_change; |
|
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 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4179 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4180 |
| 4387 | 4181 if (end == -1) |
| 4182 end = self->buf->b_ml.ml_line_count; | |
| 4183 | |
| 4389 | 4184 if (n < 0) |
| 4185 n += end - start + 1; | |
| 4186 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4187 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
|
4188 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4189 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
|
4190 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4191 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4192 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4193 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
|
4194 return -1; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4195 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4196 if (new_end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4197 *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
|
4198 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4199 return 0; |
|
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 |
| 2894 | 4202 static PyInt |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4203 RBAsSlice( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4204 BufferObject *self, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4205 PyInt lo, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4206 PyInt hi, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4207 PyObject *valObject, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4208 PyInt start, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4209 PyInt end, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4210 PyInt *new_end) |
| 2894 | 4211 { |
| 4212 PyInt size; | |
| 4213 PyInt len_change; | |
| 4214 | |
| 4215 /* Self must be a valid buffer */ | |
| 4216 if (CheckBuffer(self)) | |
| 4217 return -1; | |
| 4218 | |
| 4387 | 4219 if (end == -1) |
| 4220 end = self->buf->b_ml.ml_line_count; | |
| 4221 | |
| 2894 | 4222 /* Sort out the slice range */ |
| 4223 size = end - start + 1; | |
| 4224 | |
| 4225 if (lo < 0) | |
| 4226 lo = 0; | |
| 4227 else if (lo > size) | |
| 4228 lo = size; | |
| 4229 if (hi < 0) | |
| 4230 hi = 0; | |
| 4231 if (hi < lo) | |
| 4232 hi = lo; | |
| 4233 else if (hi > size) | |
| 4234 hi = size; | |
| 4235 | |
| 4236 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
|
4237 valObject, &len_change) == FAIL) |
| 2894 | 4238 return -1; |
| 4239 | |
| 4240 if (new_end) | |
| 4241 *new_end = end + len_change; | |
| 4242 | |
| 4243 return 0; | |
| 4244 } | |
| 4245 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4246 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4247 static PyObject * |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4248 RBAppend( |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4249 BufferObject *self, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4250 PyObject *args, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4251 PyInt start, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4252 PyInt end, |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4253 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
|
4254 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4255 PyObject *lines; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4256 PyInt len_change; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4257 PyInt max; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4258 PyInt n; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4259 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4260 if (CheckBuffer(self)) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4261 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4262 |
| 4387 | 4263 if (end == -1) |
| 4264 end = self->buf->b_ml.ml_line_count; | |
| 4265 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4266 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
|
4267 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4268 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
|
4269 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4270 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4271 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
|
4272 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4273 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
|
4274 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4275 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4276 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4277 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
|
4278 return NULL; |
|
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 if (new_end) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4281 *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
|
4282 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4283 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
|
4284 return Py_None; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4285 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4286 |
| 4385 | 4287 /* Range object |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4288 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4289 |
| 4319 | 4290 static PyTypeObject RangeType; |
| 4385 | 4291 static PySequenceMethods RangeAsSeq; |
| 4292 static PyMappingMethods RangeAsMapping; | |
| 4319 | 4293 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4294 typedef struct |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4295 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4296 PyObject_HEAD |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4297 BufferObject *buf; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4298 PyInt start; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4299 PyInt end; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4300 } RangeObject; |
|
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 static PyObject * |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4303 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
|
4304 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4305 BufferObject *bufr; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4306 RangeObject *self; |
| 4500 | 4307 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
|
4308 if (self == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4309 return NULL; |
|
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 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
|
4312 if (bufr == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4313 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4314 Py_DECREF(self); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4315 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4316 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4317 Py_INCREF(bufr); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4318 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4319 self->buf = bufr; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4320 self->start = start; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4321 self->end = end; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4322 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4323 return (PyObject *)(self); |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4324 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4325 |
| 4319 | 4326 static void |
| 4488 | 4327 RangeDestructor(RangeObject *self) |
| 4319 | 4328 { |
| 4500 | 4329 PyObject_GC_UnTrack((void *)(self)); |
| 4498 | 4330 Py_XDECREF(self->buf); |
| 4500 | 4331 PyObject_GC_Del((void *)(self)); |
| 4332 } | |
| 4333 | |
| 4334 static int | |
| 4335 RangeTraverse(RangeObject *self, visitproc visit, void *arg) | |
| 4336 { | |
| 4337 Py_VISIT(((PyObject *)(self->buf))); | |
| 4338 return 0; | |
| 4339 } | |
| 4340 | |
| 4341 static int | |
| 4342 RangeClear(RangeObject *self) | |
| 4343 { | |
| 4344 Py_CLEAR(self->buf); | |
| 4345 return 0; | |
| 4319 | 4346 } |
| 4347 | |
| 4385 | 4348 static PyInt |
| 4488 | 4349 RangeLength(RangeObject *self) |
| 4385 | 4350 { |
| 4351 /* HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION? */ | |
| 4488 | 4352 if (CheckBuffer(self->buf)) |
| 4385 | 4353 return -1; /* ??? */ |
| 4354 | |
| 4488 | 4355 return (self->end - self->start + 1); |
| 4385 | 4356 } |
| 4357 | |
| 4358 static PyObject * | |
| 4488 | 4359 RangeItem(RangeObject *self, PyInt n) |
| 4385 | 4360 { |
| 4488 | 4361 return RBItem(self->buf, n, self->start, self->end); |
| 4385 | 4362 } |
| 4363 | |
| 4364 static PyObject * | |
| 4488 | 4365 RangeSlice(RangeObject *self, PyInt lo, PyInt hi) |
| 4385 | 4366 { |
| 4488 | 4367 return RBSlice(self->buf, lo, hi, self->start, self->end); |
| 4385 | 4368 } |
| 4369 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4370 static char *RangeAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4371 "start", "end", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4372 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4373 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4374 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4375 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4376 RangeDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4377 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4378 return ObjectDir(self, RangeAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4379 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4380 |
| 4385 | 4381 static PyObject * |
| 4488 | 4382 RangeAppend(RangeObject *self, PyObject *args) |
| 4385 | 4383 { |
| 4488 | 4384 return RBAppend(self->buf, args, self->start, self->end, &self->end); |
| 4385 | 4385 } |
| 4386 | |
| 4387 static PyObject * | |
| 4488 | 4388 RangeRepr(RangeObject *self) |
| 4385 | 4389 { |
| 4488 | 4390 if (self->buf->buf == INVALID_BUFFER_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4391 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
|
4392 (self)); |
| 4385 | 4393 else |
| 4394 { | |
| 4488 | 4395 char *name = (char *)self->buf->buf->b_fname; |
| 4385 | 4396 |
| 4397 if (name == NULL) | |
| 4398 name = ""; | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4399 |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4400 return PyString_FromFormat("<range %s (%d:%d)>", |
|
4653
b943fd24c351
updated for version 7.3.1074
Bram Moolenaar <bram@vim.org>
parents:
4645
diff
changeset
|
4401 name, (int)self->start, (int)self->end); |
| 4385 | 4402 } |
| 4403 } | |
| 4404 | |
| 4405 static struct PyMethodDef RangeMethods[] = { | |
| 4492 | 4406 /* name, function, calling, documentation */ |
| 4407 {"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
|
4408 {"__dir__", (PyCFunction)RangeDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4409 { NULL, NULL, 0, NULL} |
| 4385 | 4410 }; |
| 4411 | |
| 4319 | 4412 static PyTypeObject BufferType; |
| 4413 static PySequenceMethods BufferAsSeq; | |
| 4414 static PyMappingMethods BufferAsMapping; | |
| 4415 | |
| 4416 static PyObject * | |
| 4377 | 4417 BufferNew(buf_T *buf) |
| 4418 { | |
| 4419 /* We need to handle deletion of buffers underneath us. | |
| 4420 * If we add a "b_python*_ref" field to the buf_T structure, | |
| 4421 * then we can get at it in buf_freeall() in vim. We then | |
| 4422 * need to create only ONE Python object per buffer - if | |
| 4423 * we try to create a second, just INCREF the existing one | |
| 4424 * and return it. The (single) Python object referring to | |
| 4425 * the buffer is stored in "b_python*_ref". | |
| 4426 * Question: what to do on a buf_freeall(). We'll probably | |
| 4427 * have to either delete the Python object (DECREF it to | |
| 4428 * zero - a bad idea, as it leaves dangling refs!) or | |
| 4429 * set the buf_T * value to an invalid value (-1?), which | |
| 4430 * means we need checks in all access functions... Bah. | |
| 4431 * | |
| 4385 | 4432 * Python2 and Python3 get different fields and different objects: |
| 4377 | 4433 * b_python_ref and b_python3_ref fields respectively. |
| 4434 */ | |
| 4435 | |
| 4436 BufferObject *self; | |
| 4437 | |
| 4438 if (BUF_PYTHON_REF(buf) != NULL) | |
| 4439 { | |
| 4440 self = BUF_PYTHON_REF(buf); | |
| 4441 Py_INCREF(self); | |
| 4442 } | |
| 4443 else | |
| 4444 { | |
| 4445 self = PyObject_NEW(BufferObject, &BufferType); | |
| 4446 if (self == NULL) | |
| 4447 return NULL; | |
| 4448 self->buf = buf; | |
| 4449 BUF_PYTHON_REF(buf) = self; | |
| 4450 } | |
| 4451 | |
| 4452 return (PyObject *)(self); | |
| 4453 } | |
| 4454 | |
| 4385 | 4455 static void |
| 4488 | 4456 BufferDestructor(BufferObject *self) |
| 4319 | 4457 { |
| 4488 | 4458 if (self->buf && self->buf != INVALID_BUFFER_VALUE) |
| 4459 BUF_PYTHON_REF(self->buf) = NULL; | |
| 4385 | 4460 |
| 4461 DESTRUCTOR_FINISH(self); | |
| 4319 | 4462 } |
| 4463 | |
| 4377 | 4464 static PyInt |
| 4488 | 4465 BufferLength(BufferObject *self) |
| 4377 | 4466 { |
| 4467 /* HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION? */ | |
| 4488 | 4468 if (CheckBuffer(self)) |
| 4377 | 4469 return -1; /* ??? */ |
| 4470 | |
| 4488 | 4471 return (PyInt)(self->buf->b_ml.ml_line_count); |
| 4377 | 4472 } |
| 4473 | |
| 4474 static PyObject * | |
| 4488 | 4475 BufferItem(BufferObject *self, PyInt n) |
| 4377 | 4476 { |
| 4488 | 4477 return RBItem(self, n, 1, -1); |
| 4377 | 4478 } |
| 4479 | |
| 4480 static PyObject * | |
| 4488 | 4481 BufferSlice(BufferObject *self, PyInt lo, PyInt hi) |
| 4377 | 4482 { |
| 4488 | 4483 return RBSlice(self, lo, hi, 1, -1); |
| 4377 | 4484 } |
| 4485 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4486 static char *BufferAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4487 "name", "number", "vars", "options", "valid", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4488 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4489 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4490 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4491 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4492 BufferDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4493 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4494 return ObjectDir(self, BufferAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4495 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4496 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4497 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4498 BufferAttrValid(BufferObject *self, char *name) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4499 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4500 PyObject *ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4501 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4502 if (strcmp(name, "valid") != 0) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4503 return NULL; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4504 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4505 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
|
4506 Py_INCREF(ret); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4507 return ret; |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4508 } |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4509 |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
4510 static PyObject * |
| 4488 | 4511 BufferAttr(BufferObject *self, char *name) |
| 4385 | 4512 { |
| 4513 if (strcmp(name, "name") == 0) | |
|
4597
00eecb2f8e3e
updated for version 7.3.1046
Bram Moolenaar <bram@vim.org>
parents:
4595
diff
changeset
|
4514 return PyString_FromString((self->buf->b_ffname == NULL |
|
00eecb2f8e3e
updated for version 7.3.1046
Bram Moolenaar <bram@vim.org>
parents:
4595
diff
changeset
|
4515 ? "" : (char *) self->buf->b_ffname)); |
| 4385 | 4516 else if (strcmp(name, "number") == 0) |
| 4488 | 4517 return Py_BuildValue(Py_ssize_t_fmt, self->buf->b_fnum); |
| 4385 | 4518 else if (strcmp(name, "vars") == 0) |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
4519 return NEW_DICTIONARY(self->buf->b_vars); |
| 4385 | 4520 else if (strcmp(name, "options") == 0) |
| 4488 | 4521 return OptionsNew(SREQ_BUF, self->buf, (checkfun) CheckBuffer, |
| 4522 (PyObject *) self); | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4523 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4524 return ObjectDir(NULL, BufferAttrs); |
| 4385 | 4525 else |
| 4526 return NULL; | |
| 4527 } | |
| 4528 | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4529 static int |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4530 BufferSetattr(BufferObject *self, char *name, PyObject *valObject) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4531 { |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4532 if (CheckBuffer(self)) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4533 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4534 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4535 if (strcmp(name, "name") == 0) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4536 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4537 char_u *val; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4538 aco_save_T aco; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4539 int ren_ret; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4540 PyObject *todecref; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4541 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4542 if (!(val = StringToChars(valObject, &todecref))) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4543 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4544 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4545 VimTryStart(); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4546 /* Using aucmd_*: autocommands will be executed by rename_buffer */ |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4547 aucmd_prepbuf(&aco, self->buf); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4548 ren_ret = rename_buffer(val); |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4549 aucmd_restbuf(&aco); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4550 Py_XDECREF(todecref); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4551 if (VimTryEnd()) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4552 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4553 |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4554 if (ren_ret == FAIL) |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4555 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4556 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
|
4557 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4558 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4559 return 0; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4560 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4561 else |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4562 { |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4563 PyErr_SetString(PyExc_AttributeError, name); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4564 return -1; |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4565 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4566 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
4567 |
| 4385 | 4568 static PyObject * |
| 4488 | 4569 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
|
4570 { |
| 4488 | 4571 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
|
4572 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4573 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4574 static PyObject * |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4575 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
|
4576 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4577 pos_T *posp; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4578 char_u *pmark; |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4579 char_u mark; |
| 4429 | 4580 buf_T *savebuf; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4581 PyObject *todecref; |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4582 |
| 4488 | 4583 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
|
4584 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4585 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4586 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
|
4587 return NULL; |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4588 |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4589 if (pmark[0] == '\0' || pmark[1] != '\0') |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4590 { |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
4591 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4592 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
|
4593 Py_XDECREF(todecref); |
|
4633
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4594 return NULL; |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4595 } |
|
3857d399ab41
updated for version 7.3.1064
Bram Moolenaar <bram@vim.org>
parents:
4631
diff
changeset
|
4596 |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4597 mark = *pmark; |
|
4964
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4598 |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4599 Py_XDECREF(todecref); |
|
5cee875f3096
updated for version 7.3.1227
Bram Moolenaar <bram@vim.org>
parents:
4962
diff
changeset
|
4600 |
| 4498 | 4601 VimTryStart(); |
| 4488 | 4602 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
|
4603 posp = getmark(mark, FALSE); |
| 4429 | 4604 restore_buffer(savebuf); |
| 4498 | 4605 if (VimTryEnd()) |
| 4606 return NULL; | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4607 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4608 if (posp == NULL) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4609 { |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4610 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
|
4611 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4612 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4613 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4614 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
|
4615 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4616 /* Or raise an error? */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4617 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
|
4618 return Py_None; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4619 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4620 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4621 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
|
4622 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4623 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4624 static PyObject * |
| 4488 | 4625 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
|
4626 { |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4627 PyInt start; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4628 PyInt end; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4629 |
| 4488 | 4630 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
|
4631 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4632 |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4633 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
|
4634 return NULL; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4635 |
| 4488 | 4636 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
|
4637 } |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4638 |
| 4319 | 4639 static PyObject * |
| 4488 | 4640 BufferRepr(BufferObject *self) |
| 4319 | 4641 { |
| 4488 | 4642 if (self->buf == INVALID_BUFFER_VALUE) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4643 return PyString_FromFormat("<buffer object (deleted) at %p>", self); |
| 4319 | 4644 else |
| 4645 { | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4646 char *name = (char *)self->buf->b_fname; |
| 4319 | 4647 |
| 4648 if (name == NULL) | |
| 4649 name = ""; | |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4650 |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4619
diff
changeset
|
4651 return PyString_FromFormat("<buffer %s>", name); |
| 4319 | 4652 } |
| 4653 } | |
| 4654 | |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4655 static struct PyMethodDef BufferMethods[] = { |
| 4492 | 4656 /* name, function, calling, documentation */ |
| 4657 {"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
|
4658 {"mark", (PyCFunction)BufferMark, METH_O, "Return (row,col) representing position of named mark" }, |
| 4492 | 4659 {"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
|
4660 {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4661 { 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
|
4662 }; |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4663 |
| 4397 | 4664 /* |
| 4665 * Buffer list object - Implementation | |
| 4666 */ | |
| 4667 | |
| 4668 static PyTypeObject BufMapType; | |
| 4669 | |
| 4670 typedef struct | |
| 4671 { | |
| 4672 PyObject_HEAD | |
| 4673 } BufMapObject; | |
| 4674 | |
| 4675 static PyInt | |
| 4676 BufMapLength(PyObject *self UNUSED) | |
| 4677 { | |
| 4678 buf_T *b = firstbuf; | |
| 4679 PyInt n = 0; | |
| 4680 | |
| 4681 while (b) | |
| 4682 { | |
| 4683 ++n; | |
| 4684 b = b->b_next; | |
| 4685 } | |
| 4686 | |
| 4687 return n; | |
| 4688 } | |
| 4689 | |
| 4690 static PyObject * | |
| 4691 BufMapItem(PyObject *self UNUSED, PyObject *keyObject) | |
| 4692 { | |
| 4693 buf_T *b; | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4694 long bnr; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4695 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4696 if (NumberToLong(keyObject, &bnr, NUMBER_INT|NUMBER_NATURAL)) |
| 4397 | 4697 return NULL; |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4698 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
4699 b = buflist_findnr((int) bnr); |
| 4397 | 4700 |
| 4701 if (b) | |
| 4702 return BufferNew(b); | |
| 4703 else | |
| 4704 { | |
| 4403 | 4705 PyErr_SetObject(PyExc_KeyError, keyObject); |
| 4397 | 4706 return NULL; |
| 4707 } | |
| 4708 } | |
| 4709 | |
| 4710 static void | |
| 4711 BufMapIterDestruct(PyObject *buffer) | |
| 4712 { | |
| 4713 /* Iteration was stopped before all buffers were processed */ | |
| 4714 if (buffer) | |
| 4715 { | |
| 4716 Py_DECREF(buffer); | |
| 4717 } | |
| 4718 } | |
| 4719 | |
| 4433 | 4720 static int |
| 4721 BufMapIterTraverse(PyObject *buffer, visitproc visit, void *arg) | |
| 4722 { | |
| 4500 | 4723 if (buffer) |
| 4724 Py_VISIT(buffer); | |
| 4433 | 4725 return 0; |
| 4726 } | |
| 4727 | |
| 4728 static int | |
| 4729 BufMapIterClear(PyObject **buffer) | |
| 4730 { | |
| 4500 | 4731 if (*buffer) |
| 4732 Py_CLEAR(*buffer); | |
| 4433 | 4733 return 0; |
| 4734 } | |
| 4735 | |
| 4397 | 4736 static PyObject * |
| 4737 BufMapIterNext(PyObject **buffer) | |
| 4738 { | |
| 4739 PyObject *next; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4740 PyObject *ret; |
| 4397 | 4741 |
| 4742 if (!*buffer) | |
| 4743 return NULL; | |
| 4744 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4745 ret = *buffer; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4746 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4747 if (CheckBuffer((BufferObject *)(ret))) |
| 4397 | 4748 { |
| 4749 *buffer = NULL; | |
| 4750 return NULL; | |
| 4751 } | |
| 4752 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4753 if (!((BufferObject *)(ret))->buf->b_next) |
| 4397 | 4754 next = NULL; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4755 else if (!(next = BufferNew(((BufferObject *)(ret))->buf->b_next))) |
| 4397 | 4756 return NULL; |
| 4757 *buffer = next; | |
| 4438 | 4758 /* Do not increment reference: we no longer hold it (decref), but whoever |
| 4759 * 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
|
4760 return ret; |
| 4397 | 4761 } |
| 4762 | |
| 4763 static PyObject * | |
| 4764 BufMapIter(PyObject *self UNUSED) | |
| 4765 { | |
| 4766 PyObject *buffer; | |
| 4767 | |
| 4768 buffer = BufferNew(firstbuf); | |
| 4769 return IterNew(buffer, | |
| 4433 | 4770 (destructorfun) BufMapIterDestruct, (nextfun) BufMapIterNext, |
| 4771 (traversefun) BufMapIterTraverse, (clearfun) BufMapIterClear); | |
| 4397 | 4772 } |
| 4773 | |
| 4774 static PyMappingMethods BufMapAsMapping = { | |
| 4775 (lenfunc) BufMapLength, | |
| 4776 (binaryfunc) BufMapItem, | |
| 4777 (objobjargproc) 0, | |
| 4778 }; | |
| 4779 | |
| 4385 | 4780 /* 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
|
4781 */ |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
4782 |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4783 static char *CurrentAttrs[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4784 "buffer", "window", "line", "range", "tabpage", |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4785 NULL |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4786 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4787 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4788 static PyObject * |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4789 CurrentDir(PyObject *self) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4790 { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4791 return ObjectDir(self, CurrentAttrs); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4792 } |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4793 |
| 4319 | 4794 static PyObject * |
| 4795 CurrentGetattr(PyObject *self UNUSED, char *name) | |
| 4796 { | |
| 4797 if (strcmp(name, "buffer") == 0) | |
| 4798 return (PyObject *)BufferNew(curbuf); | |
| 4799 else if (strcmp(name, "window") == 0) | |
| 4431 | 4800 return (PyObject *)WindowNew(curwin, curtab); |
| 4401 | 4801 else if (strcmp(name, "tabpage") == 0) |
| 4802 return (PyObject *)TabPageNew(curtab); | |
| 4319 | 4803 else if (strcmp(name, "line") == 0) |
| 4804 return GetBufferLine(curbuf, (PyInt)curwin->w_cursor.lnum); | |
| 4805 else if (strcmp(name, "range") == 0) | |
| 4806 return RangeNew(curbuf, RangeStart, RangeEnd); | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4807 else if (strcmp(name, "__members__") == 0) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4808 return ObjectDir(NULL, CurrentAttrs); |
| 4319 | 4809 else |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4810 #if PY_MAJOR_VERSION < 3 |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4811 return Py_FindMethod(WindowMethods, self, name); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4812 #else |
| 4319 | 4813 return NULL; |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4814 #endif |
| 4319 | 4815 } |
| 4816 | |
| 4817 static int | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4818 CurrentSetattr(PyObject *self UNUSED, char *name, PyObject *valObject) |
| 4319 | 4819 { |
| 4820 if (strcmp(name, "line") == 0) | |
| 4821 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4822 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
|
4823 NULL) == FAIL) |
| 4319 | 4824 return -1; |
| 4825 | |
| 4826 return 0; | |
| 4827 } | |
| 4407 | 4828 else if (strcmp(name, "buffer") == 0) |
| 4829 { | |
| 4830 int count; | |
| 4831 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4832 if (valObject->ob_type != &BufferType) |
| 4407 | 4833 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4834 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4835 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
|
4836 Py_TYPE_NAME(valObject)); |
| 4407 | 4837 return -1; |
| 4838 } | |
| 4839 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4840 if (CheckBuffer((BufferObject *)(valObject))) |
| 4407 | 4841 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4842 count = ((BufferObject *)(valObject))->buf->b_fnum; |
| 4407 | 4843 |
| 4498 | 4844 VimTryStart(); |
| 4407 | 4845 if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, count, 0) == FAIL) |
| 4846 { | |
| 4498 | 4847 if (VimTryEnd()) |
| 4848 return -1; | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4849 PyErr_VIM_FORMAT(N_("failed to switch to buffer %d"), count); |
| 4407 | 4850 return -1; |
| 4851 } | |
| 4852 | |
| 4498 | 4853 return VimTryEnd(); |
| 4407 | 4854 } |
| 4855 else if (strcmp(name, "window") == 0) | |
| 4856 { | |
| 4857 int count; | |
| 4858 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4859 if (valObject->ob_type != &WindowType) |
| 4407 | 4860 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4861 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4862 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
|
4863 Py_TYPE_NAME(valObject)); |
| 4407 | 4864 return -1; |
| 4865 } | |
| 4866 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4867 if (CheckWindow((WindowObject *)(valObject))) |
| 4407 | 4868 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4869 count = get_win_number(((WindowObject *)(valObject))->win, firstwin); |
| 4407 | 4870 |
| 4871 if (!count) | |
| 4872 { | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
4873 PyErr_SET_STRING(PyExc_ValueError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4874 N_("failed to find window in the current tab page")); |
| 4407 | 4875 return -1; |
| 4876 } | |
| 4877 | |
| 4498 | 4878 VimTryStart(); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4879 win_goto(((WindowObject *)(valObject))->win); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4880 if (((WindowObject *)(valObject))->win != curwin) |
| 4407 | 4881 { |
| 4498 | 4882 if (VimTryEnd()) |
| 4883 return -1; | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
4884 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4885 N_("did not switch to the specified window")); |
| 4407 | 4886 return -1; |
| 4887 } | |
| 4888 | |
| 4498 | 4889 return VimTryEnd(); |
| 4407 | 4890 } |
| 4891 else if (strcmp(name, "tabpage") == 0) | |
| 4892 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4893 if (valObject->ob_type != &TabPageType) |
| 4407 | 4894 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
4895 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4896 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
|
4897 Py_TYPE_NAME(valObject)); |
| 4407 | 4898 return -1; |
| 4899 } | |
| 4900 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4901 if (CheckTabPage((TabPageObject *)(valObject))) |
| 4407 | 4902 return -1; |
| 4903 | |
| 4498 | 4904 VimTryStart(); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4905 goto_tabpage_tp(((TabPageObject *)(valObject))->tab, TRUE, TRUE); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4906 if (((TabPageObject *)(valObject))->tab != curtab) |
| 4407 | 4907 { |
| 4498 | 4908 if (VimTryEnd()) |
| 4909 return -1; | |
|
4968
b6e693e1f946
updated for version 7.3.1229
Bram Moolenaar <bram@vim.org>
parents:
4966
diff
changeset
|
4910 PyErr_SET_STRING(PyExc_RuntimeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
4911 N_("did not switch to the specified tab page")); |
| 4407 | 4912 return -1; |
| 4913 } | |
| 4914 | |
| 4498 | 4915 return VimTryEnd(); |
| 4407 | 4916 } |
| 4319 | 4917 else |
| 4918 { | |
| 4919 PyErr_SetString(PyExc_AttributeError, name); | |
| 4920 return -1; | |
| 4921 } | |
| 4922 } | |
| 4923 | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4924 static struct PyMethodDef CurrentMethods[] = { |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4925 /* name, function, calling, documentation */ |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4926 {"__dir__", (PyCFunction)CurrentDir, METH_NOARGS, ""}, |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4927 { NULL, NULL, 0, NULL} |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4928 }; |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
4929 |
| 3618 | 4930 static void |
| 4486 | 4931 init_range_cmd(exarg_T *eap) |
| 4932 { | |
| 4933 RangeStart = eap->line1; | |
| 4934 RangeEnd = eap->line2; | |
| 4935 } | |
| 4936 | |
| 4937 static void | |
| 4938 init_range_eval(typval_T *rettv UNUSED) | |
| 4939 { | |
| 4940 RangeStart = (PyInt) curwin->w_cursor.lnum; | |
| 4941 RangeEnd = RangeStart; | |
| 4942 } | |
| 4943 | |
| 4944 static void | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4945 run_cmd(const char *cmd, void *arg UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4946 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4947 , PyGILState_STATE *pygilstate UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4948 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4949 ) |
| 4486 | 4950 { |
| 4951 PyRun_SimpleString((char *) cmd); | |
| 4952 } | |
| 4953 | |
| 4954 static const char *code_hdr = "def " DOPY_FUNC "(line, linenr):\n "; | |
| 4955 static int code_hdr_len = 30; | |
| 4956 | |
| 4957 static void | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4958 run_do(const char *cmd, void *arg UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4959 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4960 , PyGILState_STATE *pygilstate |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4961 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4962 ) |
| 4486 | 4963 { |
| 4964 PyInt lnum; | |
| 4965 size_t len; | |
| 4966 char *code; | |
| 4967 int status; | |
| 4968 PyObject *pyfunc, *pymain; | |
| 4969 | |
|
4575
626e9ccb7c48
updated for version 7.3.1035
Bram Moolenaar <bram@vim.org>
parents:
4523
diff
changeset
|
4970 if (u_save((linenr_T)RangeStart - 1, (linenr_T)RangeEnd + 1) != OK) |
| 4486 | 4971 { |
| 4972 EMSG(_("cannot save undo information")); | |
| 4973 return; | |
| 4974 } | |
| 4975 | |
| 4976 len = code_hdr_len + STRLEN(cmd); | |
| 4977 code = PyMem_New(char, len + 1); | |
| 4978 memcpy(code, code_hdr, code_hdr_len); | |
| 4979 STRCPY(code + code_hdr_len, cmd); | |
| 4980 status = PyRun_SimpleString(code); | |
| 4981 PyMem_Free(code); | |
| 4982 | |
| 4983 if (status) | |
| 4984 { | |
| 4985 EMSG(_("failed to run the code")); | |
| 4986 return; | |
| 4987 } | |
| 4988 | |
| 4989 status = 0; | |
| 4990 pymain = PyImport_AddModule("__main__"); | |
| 4991 pyfunc = PyObject_GetAttrString(pymain, DOPY_FUNC); | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4992 #ifdef PY_CAN_RECURSE |
| 4486 | 4993 PyGILState_Release(*pygilstate); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
4994 #endif |
| 4486 | 4995 |
| 4996 for (lnum = RangeStart; lnum <= RangeEnd; ++lnum) | |
| 4997 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4998 PyObject *line; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
4999 PyObject *linenr; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5000 PyObject *ret; |
| 4486 | 5001 |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5002 #ifdef PY_CAN_RECURSE |
| 4486 | 5003 *pygilstate = PyGILState_Ensure(); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5004 #endif |
| 4486 | 5005 if (!(line = GetBufferLine(curbuf, lnum))) |
| 5006 goto err; | |
| 5007 if (!(linenr = PyInt_FromLong((long) lnum))) | |
| 5008 { | |
| 5009 Py_DECREF(line); | |
| 5010 goto err; | |
| 5011 } | |
| 5012 ret = PyObject_CallFunctionObjArgs(pyfunc, line, linenr, NULL); | |
| 5013 Py_DECREF(line); | |
| 5014 Py_DECREF(linenr); | |
| 5015 if (!ret) | |
| 5016 goto err; | |
| 5017 | |
| 5018 if (ret != Py_None) | |
| 5019 if (SetBufferLine(curbuf, lnum, ret, NULL) == FAIL) | |
| 5020 goto err; | |
| 5021 | |
| 5022 Py_XDECREF(ret); | |
| 5023 PythonIO_Flush(); | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5024 #ifdef PY_CAN_RECURSE |
| 4486 | 5025 PyGILState_Release(*pygilstate); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5026 #endif |
| 4486 | 5027 } |
| 5028 goto out; | |
| 5029 err: | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5030 #ifdef PY_CAN_RECURSE |
| 4486 | 5031 *pygilstate = PyGILState_Ensure(); |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5032 #endif |
| 4486 | 5033 PyErr_PrintEx(0); |
| 5034 PythonIO_Flush(); | |
| 5035 status = 1; | |
| 5036 out: | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5037 #ifdef PY_CAN_RECURSE |
| 4486 | 5038 if (!status) |
| 5039 *pygilstate = PyGILState_Ensure(); | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5040 #endif |
| 4486 | 5041 Py_DECREF(pyfunc); |
| 5042 PyObject_SetAttrString(pymain, DOPY_FUNC, NULL); | |
| 5043 if (status) | |
| 5044 return; | |
| 5045 check_cursor(); | |
| 5046 update_curbuf(NOT_VALID); | |
| 5047 } | |
| 5048 | |
| 5049 static void | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5050 run_eval(const char *cmd, typval_T *rettv |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5051 #ifdef PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5052 , PyGILState_STATE *pygilstate UNUSED |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5053 #endif |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4509
diff
changeset
|
5054 ) |
| 4486 | 5055 { |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5056 PyObject *run_ret; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5057 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5058 run_ret = PyRun_String((char *) cmd, Py_eval_input, globals, globals); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5059 if (run_ret == NULL) |
| 4486 | 5060 { |
| 5061 if (PyErr_Occurred() && !msg_silent) | |
| 5062 PyErr_PrintEx(0); | |
| 5063 EMSG(_("E858: Eval did not return a valid python object")); | |
| 5064 } | |
| 5065 else | |
| 5066 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5067 if (ConvertFromPyObject(run_ret, rettv) == -1) |
| 4486 | 5068 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
|
5069 Py_DECREF(run_ret); |
| 4486 | 5070 } |
| 5071 PyErr_Clear(); | |
| 5072 } | |
| 5073 | |
| 5074 static void | |
| 3618 | 5075 set_ref_in_py(const int copyID) |
| 5076 { | |
| 5077 pylinkedlist_T *cur; | |
| 5078 dict_T *dd; | |
| 5079 list_T *ll; | |
| 5080 | |
| 5081 if (lastdict != NULL) | |
| 5082 for(cur = lastdict ; cur != NULL ; cur = cur->pll_prev) | |
| 5083 { | |
| 5084 dd = ((DictionaryObject *) (cur->pll_obj))->dict; | |
| 5085 if (dd->dv_copyID != copyID) | |
| 5086 { | |
| 5087 dd->dv_copyID = copyID; | |
| 5088 set_ref_in_ht(&dd->dv_hashtab, copyID); | |
| 5089 } | |
| 5090 } | |
| 5091 | |
| 5092 if (lastlist != NULL) | |
| 5093 for(cur = lastlist ; cur != NULL ; cur = cur->pll_prev) | |
| 5094 { | |
| 5095 ll = ((ListObject *) (cur->pll_obj))->list; | |
| 5096 if (ll->lv_copyID != copyID) | |
| 5097 { | |
| 5098 ll->lv_copyID = copyID; | |
| 5099 set_ref_in_list(ll, copyID); | |
| 5100 } | |
| 5101 } | |
| 5102 } | |
| 5103 | |
| 5104 static int | |
| 5105 set_string_copy(char_u *str, typval_T *tv) | |
| 5106 { | |
| 5107 tv->vval.v_string = vim_strsave(str); | |
| 5108 if (tv->vval.v_string == NULL) | |
| 5109 { | |
| 5110 PyErr_NoMemory(); | |
| 5111 return -1; | |
| 5112 } | |
| 5113 return 0; | |
| 5114 } | |
| 5115 | |
| 4385 | 5116 static int |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5117 pydict_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 4385 | 5118 { |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5119 dict_T *dict; |
| 4385 | 5120 char_u *key; |
| 5121 dictitem_T *di; | |
| 5122 PyObject *keyObject; | |
| 5123 PyObject *valObject; | |
| 5124 Py_ssize_t iter = 0; | |
| 5125 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5126 if (!(dict = py_dict_alloc())) |
| 4385 | 5127 return -1; |
| 5128 | |
| 5129 tv->v_type = VAR_DICT; | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5130 tv->vval.v_dict = dict; |
| 4385 | 5131 |
| 5132 while (PyDict_Next(obj, &iter, &keyObject, &valObject)) | |
| 5133 { | |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5134 PyObject *todecref = NULL; |
| 4385 | 5135 |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5136 if (keyObject == NULL || valObject == NULL) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5137 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5138 dict_unref(dict); |
| 4385 | 5139 return -1; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5140 } |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5141 |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5142 if (!(key = StringToChars(keyObject, &todecref))) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5143 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5144 dict_unref(dict); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5145 return -1; |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5146 } |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
5147 |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5148 if (*key == NUL) |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5149 { |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5150 dict_unref(dict); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5151 Py_XDECREF(todecref); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5152 RAISE_NO_EMPTY_KEYS; |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5153 return -1; |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5154 } |
| 4385 | 5155 |
| 5156 di = dictitem_alloc(key); | |
| 5157 | |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5158 Py_XDECREF(todecref); |
| 4385 | 5159 |
| 5160 if (di == NULL) | |
| 5161 { | |
| 5162 PyErr_NoMemory(); | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5163 dict_unref(dict); |
| 4385 | 5164 return -1; |
| 5165 } | |
| 5166 di->di_tv.v_lock = 0; | |
| 5167 | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5168 if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1) |
| 4385 | 5169 { |
| 5170 vim_free(di); | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5171 dict_unref(dict); |
| 4385 | 5172 return -1; |
| 5173 } | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5174 |
|
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5175 if (dict_add(dict, di) == FAIL) |
| 4385 | 5176 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5177 RAISE_KEY_ADD_FAIL(di->di_key); |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5178 clear_tv(&di->di_tv); |
| 4385 | 5179 vim_free(di); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5180 dict_unref(dict); |
| 4385 | 5181 return -1; |
| 5182 } | |
| 5183 } | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5184 |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5185 --dict->dv_refcount; |
| 4385 | 5186 return 0; |
| 5187 } | |
| 5188 | |
| 5189 static int | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5190 pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 4385 | 5191 { |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5192 dict_T *dict; |
| 4385 | 5193 char_u *key; |
| 5194 dictitem_T *di; | |
| 5195 PyObject *list; | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5196 PyObject *iterator; |
| 4385 | 5197 PyObject *keyObject; |
| 5198 PyObject *valObject; | |
| 5199 | |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5200 if (!(dict = py_dict_alloc())) |
| 4385 | 5201 return -1; |
| 5202 | |
| 5203 tv->v_type = VAR_DICT; | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5204 tv->vval.v_dict = dict; |
| 4385 | 5205 |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5206 if (!(list = PyMapping_Keys(obj))) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5207 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5208 dict_unref(dict); |
| 4385 | 5209 return -1; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5210 } |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5211 |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5212 if (!(iterator = PyObject_GetIter(list))) |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5213 { |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5214 dict_unref(dict); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5215 Py_DECREF(list); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5216 return -1; |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5217 } |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5218 Py_DECREF(list); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5219 |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5220 while ((keyObject = PyIter_Next(iterator))) |
| 4385 | 5221 { |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5222 PyObject *todecref; |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5223 |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5224 if (!(key = StringToChars(keyObject, &todecref))) |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5225 { |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5226 Py_DECREF(keyObject); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5227 Py_DECREF(iterator); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5228 dict_unref(dict); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5229 return -1; |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5230 } |
|
4702
26f2dbea7443
updated for version 7.3.1098
Bram Moolenaar <bram@vim.org>
parents:
4698
diff
changeset
|
5231 |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5232 if (*key == NUL) |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5233 { |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5234 Py_DECREF(keyObject); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5235 Py_DECREF(iterator); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5236 Py_XDECREF(todecref); |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5237 dict_unref(dict); |
|
4659
80b0081824fa
updated for version 7.3.1077
Bram Moolenaar <bram@vim.org>
parents:
4653
diff
changeset
|
5238 RAISE_NO_EMPTY_KEYS; |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5239 return -1; |
|
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5240 } |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5241 |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5242 if (!(valObject = PyObject_GetItem(obj, keyObject))) |
| 4385 | 5243 { |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5244 Py_DECREF(keyObject); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5245 Py_DECREF(iterator); |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5246 Py_XDECREF(todecref); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5247 dict_unref(dict); |
| 4385 | 5248 return -1; |
| 5249 } | |
| 5250 | |
| 5251 di = dictitem_alloc(key); | |
| 5252 | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5253 Py_DECREF(keyObject); |
|
4643
6ec3dada4ad3
updated for version 7.3.1069
Bram Moolenaar <bram@vim.org>
parents:
4641
diff
changeset
|
5254 Py_XDECREF(todecref); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5255 |
| 4385 | 5256 if (di == NULL) |
| 5257 { | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5258 Py_DECREF(iterator); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5259 Py_DECREF(valObject); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5260 dict_unref(dict); |
| 4385 | 5261 PyErr_NoMemory(); |
| 5262 return -1; | |
| 5263 } | |
| 5264 di->di_tv.v_lock = 0; | |
| 5265 | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5266 if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1) |
| 4385 | 5267 { |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5268 Py_DECREF(iterator); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5269 Py_DECREF(valObject); |
| 4385 | 5270 vim_free(di); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5271 dict_unref(dict); |
| 4385 | 5272 return -1; |
| 5273 } | |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5274 |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5275 Py_DECREF(valObject); |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5276 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5277 if (dict_add(dict, di) == FAIL) |
| 4385 | 5278 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5279 RAISE_KEY_ADD_FAIL(di->di_key); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5280 Py_DECREF(iterator); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5281 dictitem_free(di); |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5282 dict_unref(dict); |
| 4385 | 5283 return -1; |
| 5284 } | |
| 5285 } | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5286 Py_DECREF(iterator); |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5287 --dict->dv_refcount; |
| 4385 | 5288 return 0; |
| 5289 } | |
| 5290 | |
| 5291 static int | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5292 pyseq_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 4385 | 5293 { |
| 5294 list_T *l; | |
| 5295 | |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5296 if (!(l = py_list_alloc())) |
| 4385 | 5297 return -1; |
| 5298 | |
| 5299 tv->v_type = VAR_LIST; | |
| 5300 tv->vval.v_list = l; | |
| 5301 | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5302 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
|
5303 { |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5304 list_unref(l); |
| 4385 | 5305 return -1; |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5306 } |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5307 |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5308 --l->lv_refcount; |
| 4385 | 5309 return 0; |
| 5310 } | |
| 5311 | |
| 3618 | 5312 typedef int (*pytotvfunc)(PyObject *, typval_T *, PyObject *); |
| 5313 | |
| 5314 static int | |
| 5315 convert_dl(PyObject *obj, typval_T *tv, | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5316 pytotvfunc py_to_tv, PyObject *lookup_dict) |
| 3618 | 5317 { |
| 5318 PyObject *capsule; | |
| 5319 char hexBuf[sizeof(void *) * 2 + 3]; | |
| 5320 | |
| 5321 sprintf(hexBuf, "%p", obj); | |
| 5322 | |
| 3638 | 5323 # ifdef PY_USE_CAPSULE |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5324 capsule = PyDict_GetItemString(lookup_dict, hexBuf); |
| 3648 | 5325 # else |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5326 capsule = (PyObject *)PyDict_GetItemString(lookup_dict, hexBuf); |
| 3648 | 5327 # endif |
| 3618 | 5328 if (capsule == NULL) |
| 5329 { | |
| 3638 | 5330 # ifdef PY_USE_CAPSULE |
| 3618 | 5331 capsule = PyCapsule_New(tv, NULL, NULL); |
| 3648 | 5332 # else |
| 5333 capsule = PyCObject_FromVoidPtr(tv, NULL); | |
| 5334 # endif | |
|
4607
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5335 if (PyDict_SetItemString(lookup_dict, hexBuf, capsule)) |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5336 { |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5337 Py_DECREF(capsule); |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5338 tv->v_type = VAR_UNKNOWN; |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5339 return -1; |
|
70600448f9e7
updated for version 7.3.1051
Bram Moolenaar <bram@vim.org>
parents:
4605
diff
changeset
|
5340 } |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
5341 |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
5342 Py_DECREF(capsule); |
|
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
5343 |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5344 if (py_to_tv(obj, tv, lookup_dict) == -1) |
| 3618 | 5345 { |
| 5346 tv->v_type = VAR_UNKNOWN; | |
| 5347 return -1; | |
| 5348 } | |
| 5349 /* As we are not using copy_tv which increments reference count we must | |
| 5350 * do it ourself. */ | |
| 5351 switch(tv->v_type) | |
| 5352 { | |
| 5353 case VAR_DICT: ++tv->vval.v_dict->dv_refcount; break; | |
| 5354 case VAR_LIST: ++tv->vval.v_list->lv_refcount; break; | |
| 5355 } | |
| 5356 } | |
| 5357 else | |
| 5358 { | |
| 3638 | 5359 typval_T *v; |
| 5360 | |
| 5361 # ifdef PY_USE_CAPSULE | |
| 5362 v = PyCapsule_GetPointer(capsule, NULL); | |
| 5363 # else | |
| 3648 | 5364 v = PyCObject_AsVoidPtr(capsule); |
| 3638 | 5365 # endif |
| 3618 | 5366 copy_tv(v, tv); |
| 5367 } | |
| 5368 return 0; | |
| 5369 } | |
| 5370 | |
| 5371 static int | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5372 ConvertFromPyMapping(PyObject *obj, typval_T *tv) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5373 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5374 PyObject *lookup_dict; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5375 int ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5376 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5377 if (!(lookup_dict = PyDict_New())) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5378 return -1; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5379 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5380 if (PyType_IsSubtype(obj->ob_type, &DictionaryType)) |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5381 { |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5382 tv->v_type = VAR_DICT; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5383 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5384 ++tv->vval.v_dict->dv_refcount; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5385 ret = 0; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5386 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5387 else if (PyDict_Check(obj)) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5388 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
|
5389 else if (PyMapping_Check(obj)) |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5390 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
|
5391 else |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5392 { |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5393 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5394 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
|
5395 Py_TYPE_NAME(obj)); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5396 ret = -1; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5397 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5398 Py_DECREF(lookup_dict); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5399 return ret; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5400 } |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5401 |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5402 static int |
| 3618 | 5403 ConvertFromPyObject(PyObject *obj, typval_T *tv) |
| 5404 { | |
| 5405 PyObject *lookup_dict; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5406 int ret; |
| 3618 | 5407 |
|
4617
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5408 if (!(lookup_dict = PyDict_New())) |
|
21a99611149b
updated for version 7.3.1056
Bram Moolenaar <bram@vim.org>
parents:
4611
diff
changeset
|
5409 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5410 ret = _ConvertFromPyObject(obj, tv, lookup_dict); |
| 3618 | 5411 Py_DECREF(lookup_dict); |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5412 return ret; |
| 3618 | 5413 } |
| 5414 | |
| 5415 static int | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5416 _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookup_dict) |
| 3618 | 5417 { |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5418 if (PyType_IsSubtype(obj->ob_type, &DictionaryType)) |
| 3618 | 5419 { |
| 5420 tv->v_type = VAR_DICT; | |
| 5421 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict); | |
| 5422 ++tv->vval.v_dict->dv_refcount; | |
| 5423 } | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
5424 else if (PyType_IsSubtype(obj->ob_type, &ListType)) |
| 3618 | 5425 { |
| 5426 tv->v_type = VAR_LIST; | |
| 5427 tv->vval.v_list = (((ListObject *)(obj))->list); | |
| 5428 ++tv->vval.v_list->lv_refcount; | |
| 5429 } | |
|
4976
4ed713442c51
updated for version 7.3.1233
Bram Moolenaar <bram@vim.org>
parents:
4974
diff
changeset
|
5430 else if (PyType_IsSubtype(obj->ob_type, &FunctionType)) |
| 3618 | 5431 { |
| 5432 if (set_string_copy(((FunctionObject *) (obj))->name, tv) == -1) | |
| 5433 return -1; | |
| 5434 | |
| 5435 tv->v_type = VAR_FUNC; | |
| 5436 func_ref(tv->vval.v_string); | |
| 5437 } | |
| 5438 else if (PyBytes_Check(obj)) | |
| 5439 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5440 char_u *str; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5441 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5442 if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1) |
| 3800 | 5443 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5444 if (str == NULL) |
| 3618 | 5445 return -1; |
| 5446 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5447 if (set_string_copy(str, tv) == -1) |
| 3618 | 5448 return -1; |
| 5449 | |
| 5450 tv->v_type = VAR_STRING; | |
| 5451 } | |
| 5452 else if (PyUnicode_Check(obj)) | |
| 5453 { | |
| 5454 PyObject *bytes; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5455 char_u *str; |
| 3618 | 5456 |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4964
diff
changeset
|
5457 bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL); |
| 3618 | 5458 if (bytes == NULL) |
| 5459 return -1; | |
| 5460 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5461 if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1) |
| 3800 | 5462 return -1; |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5463 if (str == NULL) |
| 3618 | 5464 return -1; |
| 5465 | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5466 if (set_string_copy(str, tv)) |
| 3618 | 5467 { |
| 5468 Py_XDECREF(bytes); | |
| 5469 return -1; | |
| 5470 } | |
| 5471 Py_XDECREF(bytes); | |
| 5472 | |
| 5473 tv->v_type = VAR_STRING; | |
| 5474 } | |
| 4321 | 5475 #if PY_MAJOR_VERSION < 3 |
| 3618 | 5476 else if (PyInt_Check(obj)) |
| 5477 { | |
| 5478 tv->v_type = VAR_NUMBER; | |
| 5479 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
|
5480 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5481 return -1; |
| 3618 | 5482 } |
| 5483 #endif | |
| 5484 else if (PyLong_Check(obj)) | |
| 5485 { | |
| 5486 tv->v_type = VAR_NUMBER; | |
| 5487 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
|
5488 if (PyErr_Occurred()) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5489 return -1; |
| 3618 | 5490 } |
| 5491 else if (PyDict_Check(obj)) | |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5492 return convert_dl(obj, tv, pydict_to_tv, lookup_dict); |
| 3618 | 5493 #ifdef FEAT_FLOAT |
| 5494 else if (PyFloat_Check(obj)) | |
| 5495 { | |
| 5496 tv->v_type = VAR_FLOAT; | |
| 5497 tv->vval.v_float = (float_T) PyFloat_AsDouble(obj); | |
| 5498 } | |
| 5499 #endif | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5500 else if (PyObject_HasAttrString(obj, "keys")) |
|
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4633
diff
changeset
|
5501 return convert_dl(obj, tv, pymap_to_tv, lookup_dict); |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
5502 /* 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
|
5503 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
|
5504 return convert_dl(obj, tv, pyseq_to_tv, lookup_dict); |
| 3618 | 5505 else if (PyMapping_Check(obj)) |
|
4601
19d406a8509d
updated for version 7.3.1048
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
5506 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
|
5507 else if (PyNumber_Check(obj)) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5508 { |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5509 PyObject *num; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5510 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5511 if (!(num = PyNumber_Long(obj))) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5512 return -1; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5513 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5514 tv->v_type = VAR_NUMBER; |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5515 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
|
5516 |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5517 Py_DECREF(num); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
5518 } |
| 3618 | 5519 else |
| 5520 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
5521 PyErr_FORMAT(PyExc_TypeError, |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5522 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
|
5523 Py_TYPE_NAME(obj)); |
| 3618 | 5524 return -1; |
| 5525 } | |
| 5526 return 0; | |
| 5527 } | |
| 5528 | |
| 5529 static PyObject * | |
| 5530 ConvertToPyObject(typval_T *tv) | |
| 5531 { | |
| 5532 if (tv == NULL) | |
| 5533 { | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5534 PyErr_SET_VIM(N_("internal error: NULL reference passed")); |
| 3618 | 5535 return NULL; |
| 5536 } | |
| 5537 switch (tv->v_type) | |
| 5538 { | |
| 5539 case VAR_STRING: | |
| 3852 | 5540 return PyBytes_FromString(tv->vval.v_string == NULL |
| 5541 ? "" : (char *)tv->vval.v_string); | |
| 3618 | 5542 case VAR_NUMBER: |
| 5543 return PyLong_FromLong((long) tv->vval.v_number); | |
| 5544 #ifdef FEAT_FLOAT | |
| 5545 case VAR_FLOAT: | |
| 5546 return PyFloat_FromDouble((double) tv->vval.v_float); | |
| 5547 #endif | |
| 5548 case VAR_LIST: | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
5549 return NEW_LIST(tv->vval.v_list); |
| 3618 | 5550 case VAR_DICT: |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5551 return NEW_DICTIONARY(tv->vval.v_dict); |
| 3618 | 5552 case VAR_FUNC: |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
5553 return NEW_FUNCTION(tv->vval.v_string == NULL |
| 3852 | 5554 ? (char_u *)"" : tv->vval.v_string); |
| 3618 | 5555 case VAR_UNKNOWN: |
| 5556 Py_INCREF(Py_None); | |
| 5557 return Py_None; | |
| 5558 default: | |
|
4978
f4969f8f66e9
updated for version 7.3.1234
Bram Moolenaar <bram@vim.org>
parents:
4976
diff
changeset
|
5559 PyErr_SET_VIM(N_("internal error: invalid value type")); |
| 3618 | 5560 return NULL; |
| 5561 } | |
| 5562 } | |
| 4319 | 5563 |
| 5564 typedef struct | |
| 5565 { | |
| 5566 PyObject_HEAD | |
| 5567 } CurrentObject; | |
| 5568 static PyTypeObject CurrentType; | |
| 5569 | |
| 5570 static void | |
| 5571 init_structs(void) | |
| 5572 { | |
| 5573 vim_memset(&OutputType, 0, sizeof(OutputType)); | |
| 5574 OutputType.tp_name = "vim.message"; | |
| 5575 OutputType.tp_basicsize = sizeof(OutputObject); | |
| 5576 OutputType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 5577 OutputType.tp_doc = "vim message object"; | |
| 5578 OutputType.tp_methods = OutputMethods; | |
| 5579 #if PY_MAJOR_VERSION >= 3 | |
| 4488 | 5580 OutputType.tp_getattro = (getattrofunc)OutputGetattro; |
| 5581 OutputType.tp_setattro = (setattrofunc)OutputSetattro; | |
| 4319 | 5582 OutputType.tp_alloc = call_PyType_GenericAlloc; |
| 5583 OutputType.tp_new = call_PyType_GenericNew; | |
| 5584 OutputType.tp_free = call_PyObject_Free; | |
| 5585 #else | |
| 4488 | 5586 OutputType.tp_getattr = (getattrfunc)OutputGetattr; |
| 5587 OutputType.tp_setattr = (setattrfunc)OutputSetattr; | |
| 4319 | 5588 #endif |
| 5589 | |
| 4397 | 5590 vim_memset(&IterType, 0, sizeof(IterType)); |
| 5591 IterType.tp_name = "vim.iter"; | |
| 5592 IterType.tp_basicsize = sizeof(IterObject); | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
5593 IterType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4397 | 5594 IterType.tp_doc = "generic iterator object"; |
| 4488 | 5595 IterType.tp_iter = (getiterfunc)IterIter; |
| 5596 IterType.tp_iternext = (iternextfunc)IterNext; | |
| 5597 IterType.tp_dealloc = (destructor)IterDestructor; | |
| 5598 IterType.tp_traverse = (traverseproc)IterTraverse; | |
| 5599 IterType.tp_clear = (inquiry)IterClear; | |
| 4397 | 5600 |
| 4319 | 5601 vim_memset(&BufferType, 0, sizeof(BufferType)); |
| 5602 BufferType.tp_name = "vim.buffer"; | |
| 5603 BufferType.tp_basicsize = sizeof(BufferType); | |
| 4488 | 5604 BufferType.tp_dealloc = (destructor)BufferDestructor; |
| 5605 BufferType.tp_repr = (reprfunc)BufferRepr; | |
| 4319 | 5606 BufferType.tp_as_sequence = &BufferAsSeq; |
| 5607 BufferType.tp_as_mapping = &BufferAsMapping; | |
| 5608 BufferType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 5609 BufferType.tp_doc = "vim buffer object"; | |
| 5610 BufferType.tp_methods = BufferMethods; | |
| 5611 #if PY_MAJOR_VERSION >= 3 | |
| 4488 | 5612 BufferType.tp_getattro = (getattrofunc)BufferGetattro; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5613 BufferType.tp_setattro = (setattrofunc)BufferSetattro; |
| 4319 | 5614 BufferType.tp_alloc = call_PyType_GenericAlloc; |
| 5615 BufferType.tp_new = call_PyType_GenericNew; | |
| 5616 BufferType.tp_free = call_PyObject_Free; | |
| 5617 #else | |
| 4488 | 5618 BufferType.tp_getattr = (getattrfunc)BufferGetattr; |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4587
diff
changeset
|
5619 BufferType.tp_setattr = (setattrfunc)BufferSetattr; |
| 4319 | 5620 #endif |
| 5621 | |
| 5622 vim_memset(&WindowType, 0, sizeof(WindowType)); | |
| 5623 WindowType.tp_name = "vim.window"; | |
| 5624 WindowType.tp_basicsize = sizeof(WindowObject); | |
| 4488 | 5625 WindowType.tp_dealloc = (destructor)WindowDestructor; |
| 5626 WindowType.tp_repr = (reprfunc)WindowRepr; | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
5627 WindowType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4319 | 5628 WindowType.tp_doc = "vim Window object"; |
| 5629 WindowType.tp_methods = WindowMethods; | |
| 4488 | 5630 WindowType.tp_traverse = (traverseproc)WindowTraverse; |
| 5631 WindowType.tp_clear = (inquiry)WindowClear; | |
| 4319 | 5632 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 5633 WindowType.tp_getattro = (getattrofunc)WindowGetattro; |
| 5634 WindowType.tp_setattro = (setattrofunc)WindowSetattro; | |
| 4319 | 5635 WindowType.tp_alloc = call_PyType_GenericAlloc; |
| 5636 WindowType.tp_new = call_PyType_GenericNew; | |
| 5637 WindowType.tp_free = call_PyObject_Free; | |
| 5638 #else | |
| 4488 | 5639 WindowType.tp_getattr = (getattrfunc)WindowGetattr; |
| 5640 WindowType.tp_setattr = (setattrfunc)WindowSetattr; | |
| 4319 | 5641 #endif |
| 5642 | |
| 4401 | 5643 vim_memset(&TabPageType, 0, sizeof(TabPageType)); |
| 5644 TabPageType.tp_name = "vim.tabpage"; | |
| 5645 TabPageType.tp_basicsize = sizeof(TabPageObject); | |
| 4488 | 5646 TabPageType.tp_dealloc = (destructor)TabPageDestructor; |
| 5647 TabPageType.tp_repr = (reprfunc)TabPageRepr; | |
| 4401 | 5648 TabPageType.tp_flags = Py_TPFLAGS_DEFAULT; |
| 5649 TabPageType.tp_doc = "vim tab page object"; | |
| 5650 TabPageType.tp_methods = TabPageMethods; | |
| 5651 #if PY_MAJOR_VERSION >= 3 | |
| 4488 | 5652 TabPageType.tp_getattro = (getattrofunc)TabPageGetattro; |
| 4401 | 5653 TabPageType.tp_alloc = call_PyType_GenericAlloc; |
| 5654 TabPageType.tp_new = call_PyType_GenericNew; | |
| 5655 TabPageType.tp_free = call_PyObject_Free; | |
| 5656 #else | |
| 4488 | 5657 TabPageType.tp_getattr = (getattrfunc)TabPageGetattr; |
| 4401 | 5658 #endif |
| 5659 | |
| 4393 | 5660 vim_memset(&BufMapType, 0, sizeof(BufMapType)); |
| 5661 BufMapType.tp_name = "vim.bufferlist"; | |
| 5662 BufMapType.tp_basicsize = sizeof(BufMapObject); | |
| 5663 BufMapType.tp_as_mapping = &BufMapAsMapping; | |
| 5664 BufMapType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 4397 | 5665 BufMapType.tp_iter = BufMapIter; |
| 4319 | 5666 BufferType.tp_doc = "vim buffer list"; |
| 5667 | |
| 5668 vim_memset(&WinListType, 0, sizeof(WinListType)); | |
| 5669 WinListType.tp_name = "vim.windowlist"; | |
| 5670 WinListType.tp_basicsize = sizeof(WinListType); | |
| 5671 WinListType.tp_as_sequence = &WinListAsSeq; | |
| 5672 WinListType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 5673 WinListType.tp_doc = "vim window list"; | |
| 4488 | 5674 WinListType.tp_dealloc = (destructor)WinListDestructor; |
| 4401 | 5675 |
| 5676 vim_memset(&TabListType, 0, sizeof(TabListType)); | |
| 5677 TabListType.tp_name = "vim.tabpagelist"; | |
| 5678 TabListType.tp_basicsize = sizeof(TabListType); | |
| 5679 TabListType.tp_as_sequence = &TabListAsSeq; | |
| 5680 TabListType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 5681 TabListType.tp_doc = "vim tab page list"; | |
| 4319 | 5682 |
| 5683 vim_memset(&RangeType, 0, sizeof(RangeType)); | |
| 5684 RangeType.tp_name = "vim.range"; | |
| 5685 RangeType.tp_basicsize = sizeof(RangeObject); | |
| 4488 | 5686 RangeType.tp_dealloc = (destructor)RangeDestructor; |
| 5687 RangeType.tp_repr = (reprfunc)RangeRepr; | |
| 4319 | 5688 RangeType.tp_as_sequence = &RangeAsSeq; |
| 5689 RangeType.tp_as_mapping = &RangeAsMapping; | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
5690 RangeType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4319 | 5691 RangeType.tp_doc = "vim Range object"; |
| 5692 RangeType.tp_methods = RangeMethods; | |
| 4500 | 5693 RangeType.tp_traverse = (traverseproc)RangeTraverse; |
| 5694 RangeType.tp_clear = (inquiry)RangeClear; | |
| 4319 | 5695 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 5696 RangeType.tp_getattro = (getattrofunc)RangeGetattro; |
| 4319 | 5697 RangeType.tp_alloc = call_PyType_GenericAlloc; |
| 5698 RangeType.tp_new = call_PyType_GenericNew; | |
| 5699 RangeType.tp_free = call_PyObject_Free; | |
| 5700 #else | |
| 4488 | 5701 RangeType.tp_getattr = (getattrfunc)RangeGetattr; |
| 4319 | 5702 #endif |
| 5703 | |
| 5704 vim_memset(&CurrentType, 0, sizeof(CurrentType)); | |
| 5705 CurrentType.tp_name = "vim.currentdata"; | |
| 5706 CurrentType.tp_basicsize = sizeof(CurrentObject); | |
| 5707 CurrentType.tp_flags = Py_TPFLAGS_DEFAULT; | |
| 5708 CurrentType.tp_doc = "vim current object"; | |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4597
diff
changeset
|
5709 CurrentType.tp_methods = CurrentMethods; |
| 4319 | 5710 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 5711 CurrentType.tp_getattro = (getattrofunc)CurrentGetattro; |
| 5712 CurrentType.tp_setattro = (setattrofunc)CurrentSetattro; | |
| 4319 | 5713 #else |
| 4488 | 5714 CurrentType.tp_getattr = (getattrfunc)CurrentGetattr; |
| 5715 CurrentType.tp_setattr = (setattrfunc)CurrentSetattr; | |
| 4319 | 5716 #endif |
| 5717 | |
| 5718 vim_memset(&DictionaryType, 0, sizeof(DictionaryType)); | |
| 5719 DictionaryType.tp_name = "vim.dictionary"; | |
| 5720 DictionaryType.tp_basicsize = sizeof(DictionaryObject); | |
| 4488 | 5721 DictionaryType.tp_dealloc = (destructor)DictionaryDestructor; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5722 DictionaryType.tp_as_sequence = &DictionaryAsSeq; |
| 4319 | 5723 DictionaryType.tp_as_mapping = &DictionaryAsMapping; |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5724 DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE; |
| 4319 | 5725 DictionaryType.tp_doc = "dictionary pushing modifications to vim structure"; |
| 5726 DictionaryType.tp_methods = DictionaryMethods; | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5727 DictionaryType.tp_iter = (getiterfunc)DictionaryIter; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5728 DictionaryType.tp_new = (newfunc)DictionaryConstructor; |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5729 DictionaryType.tp_alloc = (allocfunc)PyType_GenericAlloc; |
| 4319 | 5730 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 5731 DictionaryType.tp_getattro = (getattrofunc)DictionaryGetattro; |
| 5732 DictionaryType.tp_setattro = (setattrofunc)DictionarySetattro; | |
| 4319 | 5733 #else |
| 4488 | 5734 DictionaryType.tp_getattr = (getattrfunc)DictionaryGetattr; |
| 5735 DictionaryType.tp_setattr = (setattrfunc)DictionarySetattr; | |
| 4319 | 5736 #endif |
| 5737 | |
| 5738 vim_memset(&ListType, 0, sizeof(ListType)); | |
| 5739 ListType.tp_name = "vim.list"; | |
| 4488 | 5740 ListType.tp_dealloc = (destructor)ListDestructor; |
| 4319 | 5741 ListType.tp_basicsize = sizeof(ListObject); |
| 5742 ListType.tp_as_sequence = &ListAsSeq; | |
| 5743 ListType.tp_as_mapping = &ListAsMapping; | |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
5744 ListType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE; |
| 4319 | 5745 ListType.tp_doc = "list pushing modifications to vim structure"; |
| 5746 ListType.tp_methods = ListMethods; | |
| 4488 | 5747 ListType.tp_iter = (getiterfunc)ListIter; |
|
4629
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
5748 ListType.tp_new = (newfunc)ListConstructor; |
|
e4e48d4ee040
updated for version 7.3.1062
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
5749 ListType.tp_alloc = (allocfunc)PyType_GenericAlloc; |
| 4319 | 5750 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 5751 ListType.tp_getattro = (getattrofunc)ListGetattro; |
| 5752 ListType.tp_setattro = (setattrofunc)ListSetattro; | |
| 4319 | 5753 #else |
| 4488 | 5754 ListType.tp_getattr = (getattrfunc)ListGetattr; |
| 5755 ListType.tp_setattr = (setattrfunc)ListSetattr; | |
| 4319 | 5756 #endif |
| 5757 | |
| 5758 vim_memset(&FunctionType, 0, sizeof(FunctionType)); | |
| 4397 | 5759 FunctionType.tp_name = "vim.function"; |
| 4319 | 5760 FunctionType.tp_basicsize = sizeof(FunctionObject); |
| 4488 | 5761 FunctionType.tp_dealloc = (destructor)FunctionDestructor; |
| 5762 FunctionType.tp_call = (ternaryfunc)FunctionCall; | |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
5763 FunctionType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE; |
| 4319 | 5764 FunctionType.tp_doc = "object that calls vim function"; |
| 5765 FunctionType.tp_methods = FunctionMethods; | |
|
4625
cb5c1e37ad4d
updated for version 7.3.1060
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
5766 FunctionType.tp_repr = (reprfunc)FunctionRepr; |
|
4631
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
5767 FunctionType.tp_new = (newfunc)FunctionConstructor; |
|
4157fef7b950
updated for version 7.3.1063
Bram Moolenaar <bram@vim.org>
parents:
4629
diff
changeset
|
5768 FunctionType.tp_alloc = (allocfunc)PyType_GenericAlloc; |
| 4319 | 5769 #if PY_MAJOR_VERSION >= 3 |
| 4488 | 5770 FunctionType.tp_getattro = (getattrofunc)FunctionGetattro; |
| 4319 | 5771 #else |
| 4488 | 5772 FunctionType.tp_getattr = (getattrfunc)FunctionGetattr; |
| 4319 | 5773 #endif |
| 5774 | |
| 4350 | 5775 vim_memset(&OptionsType, 0, sizeof(OptionsType)); |
| 5776 OptionsType.tp_name = "vim.options"; | |
| 5777 OptionsType.tp_basicsize = sizeof(OptionsObject); | |
|
4611
49f0fcd9762c
updated for version 7.3.1053
Bram Moolenaar <bram@vim.org>
parents:
4609
diff
changeset
|
5778 OptionsType.tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_GC; |
| 4350 | 5779 OptionsType.tp_doc = "object for manipulating options"; |
| 5780 OptionsType.tp_as_mapping = &OptionsAsMapping; | |
| 4488 | 5781 OptionsType.tp_dealloc = (destructor)OptionsDestructor; |
| 5782 OptionsType.tp_traverse = (traverseproc)OptionsTraverse; | |
| 5783 OptionsType.tp_clear = (inquiry)OptionsClear; | |
| 4350 | 5784 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5785 vim_memset(&LoaderType, 0, sizeof(LoaderType)); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5786 LoaderType.tp_name = "vim.Loader"; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5787 LoaderType.tp_basicsize = sizeof(LoaderObject); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5788 LoaderType.tp_flags = Py_TPFLAGS_DEFAULT; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5789 LoaderType.tp_doc = "vim message object"; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5790 LoaderType.tp_methods = LoaderMethods; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5791 LoaderType.tp_dealloc = (destructor)LoaderDestructor; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5792 |
| 4319 | 5793 #if PY_MAJOR_VERSION >= 3 |
| 5794 vim_memset(&vimmodule, 0, sizeof(vimmodule)); | |
| 5795 vimmodule.m_name = "vim"; | |
| 5796 vimmodule.m_doc = "Vim Python interface\n"; | |
| 5797 vimmodule.m_size = -1; | |
| 5798 vimmodule.m_methods = VimMethods; | |
| 5799 #endif | |
| 5800 } | |
| 4494 | 5801 |
| 5802 #define PYTYPE_READY(type) \ | |
| 5803 if (PyType_Ready(&type)) \ | |
| 5804 return -1; | |
| 5805 | |
| 5806 static int | |
| 5807 init_types() | |
| 5808 { | |
| 5809 PYTYPE_READY(IterType); | |
| 5810 PYTYPE_READY(BufferType); | |
| 5811 PYTYPE_READY(RangeType); | |
| 5812 PYTYPE_READY(WindowType); | |
| 5813 PYTYPE_READY(TabPageType); | |
| 5814 PYTYPE_READY(BufMapType); | |
| 5815 PYTYPE_READY(WinListType); | |
| 5816 PYTYPE_READY(TabListType); | |
| 5817 PYTYPE_READY(CurrentType); | |
| 5818 PYTYPE_READY(DictionaryType); | |
| 5819 PYTYPE_READY(ListType); | |
| 5820 PYTYPE_READY(FunctionType); | |
| 5821 PYTYPE_READY(OptionsType); | |
| 5822 PYTYPE_READY(OutputType); | |
|
4851
96e154e825a7
updated for version 7.3.1172
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
5823 PYTYPE_READY(LoaderType); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5824 return 0; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5825 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5826 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5827 static int |
|
4922
8dd2769ab75c
updated for version 7.3.1206
Bram Moolenaar <bram@vim.org>
parents:
4918
diff
changeset
|
5828 init_sys_path(void) |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5829 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5830 PyObject *path; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5831 PyObject *path_hook; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5832 PyObject *path_hooks; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5833 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5834 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
|
5835 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5836 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5837 if (!(path_hooks = PySys_GetObject("path_hooks"))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5838 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5839 PyErr_Clear(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5840 path_hooks = PyList_New(1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5841 PyList_SET_ITEM(path_hooks, 0, path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5842 if (PySys_SetObject("path_hooks", path_hooks)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5843 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5844 Py_DECREF(path_hooks); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5845 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5846 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5847 Py_DECREF(path_hooks); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5848 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5849 else if (PyList_Check(path_hooks)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5850 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5851 if (PyList_Append(path_hooks, path_hook)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5852 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5853 Py_DECREF(path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5854 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5855 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5856 Py_DECREF(path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5857 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5858 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5859 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5860 VimTryStart(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5861 EMSG(_("Failed to set path hook: sys.path_hooks is not a list\n" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5862 "You should now do the following:\n" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5863 "- 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
|
5864 "- append vim.VIM_SPECIAL_PATH to sys.path\n")); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5865 VimTryEnd(); /* Discard the error */ |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5866 Py_DECREF(path_hook); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5867 return 0; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5868 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5869 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5870 if (!(path = PySys_GetObject("path"))) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5871 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5872 PyErr_Clear(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5873 path = PyList_New(1); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5874 Py_INCREF(vim_special_path_object); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5875 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
|
5876 if (PySys_SetObject("path", path)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5877 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5878 Py_DECREF(path); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5879 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5880 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5881 Py_DECREF(path); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5882 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5883 else if (PyList_Check(path)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5884 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5885 if (PyList_Append(path, vim_special_path_object)) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5886 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5887 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5888 else |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5889 { |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5890 VimTryStart(); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5891 EMSG(_("Failed to set path: sys.path is not a list\n" |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5892 "You should now append vim.VIM_SPECIAL_PATH to sys.path")); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5893 VimTryEnd(); /* Discard the error */ |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5894 } |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
5895 |
| 4494 | 5896 return 0; |
| 5897 } | |
| 5898 | |
| 5899 static BufMapObject TheBufferMap = | |
| 5900 { | |
| 5901 PyObject_HEAD_INIT(&BufMapType) | |
| 5902 }; | |
| 5903 | |
| 5904 static WinListObject TheWindowList = | |
| 5905 { | |
| 5906 PyObject_HEAD_INIT(&WinListType) | |
| 5907 NULL | |
| 5908 }; | |
| 5909 | |
| 5910 static CurrentObject TheCurrent = | |
| 5911 { | |
| 5912 PyObject_HEAD_INIT(&CurrentType) | |
| 5913 }; | |
| 5914 | |
| 5915 static TabListObject TheTabPageList = | |
| 5916 { | |
| 5917 PyObject_HEAD_INIT(&TabListType) | |
| 5918 }; | |
| 5919 | |
| 5920 static struct numeric_constant { | |
| 5921 char *name; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5922 int val; |
| 4494 | 5923 } numeric_constants[] = { |
| 5924 {"VAR_LOCKED", VAR_LOCKED}, | |
| 5925 {"VAR_FIXED", VAR_FIXED}, | |
| 5926 {"VAR_SCOPE", VAR_SCOPE}, | |
| 5927 {"VAR_DEF_SCOPE", VAR_DEF_SCOPE}, | |
| 5928 }; | |
| 5929 | |
| 5930 static struct object_constant { | |
| 5931 char *name; | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5932 PyObject *valObject; |
| 4494 | 5933 } object_constants[] = { |
| 5934 {"buffers", (PyObject *)(void *)&TheBufferMap}, | |
| 5935 {"windows", (PyObject *)(void *)&TheWindowList}, | |
| 5936 {"tabpages", (PyObject *)(void *)&TheTabPageList}, | |
| 5937 {"current", (PyObject *)(void *)&TheCurrent}, | |
| 4496 | 5938 |
| 5939 {"Buffer", (PyObject *)&BufferType}, | |
| 5940 {"Range", (PyObject *)&RangeType}, | |
| 5941 {"Window", (PyObject *)&WindowType}, | |
| 5942 {"TabPage", (PyObject *)&TabPageType}, | |
| 5943 {"Dictionary", (PyObject *)&DictionaryType}, | |
| 5944 {"List", (PyObject *)&ListType}, | |
| 5945 {"Function", (PyObject *)&FunctionType}, | |
| 5946 {"Options", (PyObject *)&OptionsType}, | |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5947 {"_Loader", (PyObject *)&LoaderType}, |
| 4494 | 5948 }; |
| 5949 | |
| 5950 #define ADD_OBJECT(m, name, obj) \ | |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
5951 if (PyModule_AddObject(m, name, obj)) \ |
| 4494 | 5952 return -1; |
| 5953 | |
| 5954 #define ADD_CHECKED_OBJECT(m, name, obj) \ | |
| 5955 { \ | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5956 PyObject *valObject = obj; \ |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5957 if (!valObject) \ |
| 4494 | 5958 return -1; \ |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5959 ADD_OBJECT(m, name, valObject); \ |
| 4494 | 5960 } |
| 5961 | |
| 5962 static int | |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
5963 populate_module(PyObject *m) |
| 4494 | 5964 { |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
5965 int i; |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
5966 PyObject *other_module; |
|
4831
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
5967 PyObject *attr; |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
5968 PyObject *imp; |
| 4494 | 5969 |
| 5970 for (i = 0; i < (int)(sizeof(numeric_constants) | |
| 5971 / sizeof(struct numeric_constant)); | |
| 5972 ++i) | |
| 5973 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
|
5974 PyInt_FromLong(numeric_constants[i].val)); |
| 4494 | 5975 |
| 5976 for (i = 0; i < (int)(sizeof(object_constants) | |
| 5977 / sizeof(struct object_constant)); | |
| 5978 ++i) | |
| 5979 { | |
|
4974
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5980 PyObject *valObject; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5981 |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5982 valObject = object_constants[i].valObject; |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5983 Py_INCREF(valObject); |
|
a594ce86b5ea
updated for version 7.3.1232
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
5984 ADD_OBJECT(m, object_constants[i].name, valObject); |
| 4494 | 5985 } |
| 5986 | |
| 5987 if (!(VimError = PyErr_NewException("vim.error", NULL, NULL))) | |
| 5988 return -1; | |
| 5989 ADD_OBJECT(m, "error", VimError); | |
| 5990 | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5991 ADD_CHECKED_OBJECT(m, "vars", NEW_DICTIONARY(&globvardict)); |
|
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4625
diff
changeset
|
5992 ADD_CHECKED_OBJECT(m, "vvars", NEW_DICTIONARY(&vimvardict)); |
| 4494 | 5993 ADD_CHECKED_OBJECT(m, "options", |
| 5994 OptionsNew(SREQ_GLOBAL, NULL, dummy_check, NULL)); | |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
5995 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
5996 if (!(other_module = PyImport_ImportModule("os"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
5997 return -1; |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
5998 ADD_OBJECT(m, "os", other_module); |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
5999 |
|
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6000 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
|
6001 return -1; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6002 ADD_OBJECT(m, "_getcwd", py_getcwd) |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6003 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6004 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
|
6005 return -1; |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6006 ADD_OBJECT(m, "_chdir", py_chdir); |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
6007 if (!(attr = PyObject_GetAttrString(m, "chdir"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6008 return -1; |
|
4831
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6009 if (PyObject_SetAttrString(other_module, "chdir", attr)) |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6010 { |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6011 Py_DECREF(attr); |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6012 return -1; |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6013 } |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6014 Py_DECREF(attr); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6015 |
|
4829
ff3935926449
updated for version 7.3.1161
Bram Moolenaar <bram@vim.org>
parents:
4754
diff
changeset
|
6016 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
|
6017 { |
|
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6018 ADD_OBJECT(m, "_fchdir", py_fchdir); |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4978
diff
changeset
|
6019 if (!(attr = PyObject_GetAttrString(m, "fchdir"))) |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6020 return -1; |
|
4831
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6021 if (PyObject_SetAttrString(other_module, "fchdir", attr)) |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6022 { |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6023 Py_DECREF(attr); |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6024 return -1; |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6025 } |
|
b8eabb6a9687
updated for version 7.3.1162
Bram Moolenaar <bram@vim.org>
parents:
4829
diff
changeset
|
6026 Py_DECREF(attr); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6027 } |
|
4722
3534e9b4fa42
updated for version 7.3.1108
Bram Moolenaar <bram@vim.org>
parents:
4706
diff
changeset
|
6028 else |
|
3534e9b4fa42
updated for version 7.3.1108
Bram Moolenaar <bram@vim.org>
parents:
4706
diff
changeset
|
6029 PyErr_Clear(); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4702
diff
changeset
|
6030 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6031 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
|
6032 return -1; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6033 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6034 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
|
6035 |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6036 if (!(imp = PyImport_ImportModule("imp"))) |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6037 return -1; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6038 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6039 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
|
6040 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6041 Py_DECREF(imp); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6042 return -1; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6043 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6044 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6045 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
|
6046 { |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6047 Py_DECREF(py_find_module); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6048 Py_DECREF(imp); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6049 return -1; |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6050 } |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6051 |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6052 Py_DECREF(imp); |
|
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4851
diff
changeset
|
6053 |
|
4851
96e154e825a7
updated for version 7.3.1172
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
6054 ADD_OBJECT(m, "_find_module", py_find_module); |
|
96e154e825a7
updated for version 7.3.1172
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
6055 ADD_OBJECT(m, "_load_module", py_load_module); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4831
diff
changeset
|
6056 |
| 4494 | 6057 return 0; |
| 6058 } |