vim: src/if_py_both.h annotate

annotate src/if_py_both.h @ 21194:afed2045ffc9 v8.2.1148

patch 8.2.1148: warning for using int instead of size_t Commit: https://github.com/vim/vim/commit/cbb6bdcd8967edc8ad123746d27ec30ccc7c1718 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 6 21:53:17 2020 +0200 patch 8.2.1148: warning for using int instead of size_t Problem: Warning for using int instead of size_t. Solution: Change "len" argument to size_t. (Mike Williams)

author	Bram Moolenaar <Bram@vim.org>
date	Mon, 06 Jul 2020 22:00:04 +0200
parents	10eb6c38938c
children	8531ddd7dd63

rev	line source
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	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 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	10 * Python extensions by Paul Moore, David Leonard, Roland Puntaier, Nikolay
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	11 * Pavlov.
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	12 *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	13 * Common code for if_python.c and if_python3.c.
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	14 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	15
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	16 static char_u e_py_systemexit[] = "E880: Can't handle SystemExit of %s exception in vim";
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	17
3734 956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	18 #if PY_VERSION_HEX < 0x02050000
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	19 typedef int Py_ssize_t; // Python 2.4 and earlier don't have this type.
3734 956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	20 #endif
956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	21
19019 75562beba71c patch 8.2.0070: crash when using Python 3 with "debug" encoding Bram Moolenaar <Bram@vim.org> parents: 19015 diff changeset	22 // Use values that are known to work, others may make Vim crash.
75562beba71c patch 8.2.0070: crash when using Python 3 with "debug" encoding Bram Moolenaar <Bram@vim.org> parents: 19015 diff changeset	23 #define ENC_OPT (enc_utf8 ? "utf-8" : enc_dbcs ? "euc-jp" : (char *)p_enc)
4435 9b800f0a757f updated for version 7.3.966 Bram Moolenaar <bram@vim.org> parents: 4433 diff changeset	24 #define DOPY_FUNC "_vim_pydo"
2919 b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	25
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	26 static const char *vim_special_path = "_vim_path_";
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	27
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	28 #define PyErr_SET_STRING(exc, str) PyErr_SetString(exc, _(str))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	29 #define PyErr_SetVim(str) PyErr_SetString(VimError, str)
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	30 #define PyErr_SET_VIM(str) PyErr_SET_STRING(VimError, str)
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	31 #define PyErr_FORMAT(exc, str, arg) PyErr_Format(exc, _(str), arg)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	32 #define PyErr_FORMAT2(exc, str, arg1, arg2) PyErr_Format(exc, _(str), arg1,arg2)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	33 #define PyErr_VIM_FORMAT(str, arg) PyErr_FORMAT(VimError, str, arg)
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	34
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	35 #define Py_TYPE_NAME(obj) (obj->ob_type->tp_name == NULL \
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	36 ? "(NULL)" \
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	37 : obj->ob_type->tp_name)
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	38
b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	39 #define RAISE_NO_EMPTY_KEYS PyErr_SET_STRING(PyExc_ValueError, \
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	40 N_("empty keys are not allowed"))
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	41 #define RAISE_LOCKED_DICTIONARY PyErr_SET_VIM(N_("dictionary is locked"))
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	42 #define RAISE_LOCKED_LIST PyErr_SET_VIM(N_("list is locked"))
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	43 #define RAISE_UNDO_FAIL PyErr_SET_VIM(N_("cannot save undo information"))
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	44 #define RAISE_DELETE_LINE_FAIL PyErr_SET_VIM(N_("cannot delete line"))
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	45 #define RAISE_INSERT_LINE_FAIL PyErr_SET_VIM(N_("cannot insert line"))
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	46 #define RAISE_REPLACE_LINE_FAIL PyErr_SET_VIM(N_("cannot replace line"))
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	47 #define RAISE_KEY_ADD_FAIL(key) \
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	48 PyErr_VIM_FORMAT(N_("failed to add key '%s' to dictionary"), key)
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	49 #define RAISE_INVALID_INDEX_TYPE(idx) \
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	50 PyErr_FORMAT(PyExc_TypeError, N_("index must be int or slice, not %s"), \
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	51 Py_TYPE_NAME(idx));
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	52
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	53 #define INVALID_BUFFER_VALUE ((buf_T *)(-1))
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	54 #define INVALID_WINDOW_VALUE ((win_T *)(-1))
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	55 #define INVALID_TABPAGE_VALUE ((tabpage_T *)(-1))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	56
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	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 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	63
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	64 static int ConvertFromPyObject(PyObject , typval_T );
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	65 static int _ConvertFromPyObject(PyObject , typval_T , PyObject *);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	66 static int ConvertFromPyMapping(PyObject , typval_T );
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	67 static int ConvertFromPySequence(PyObject , typval_T );
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	68 static PyObject WindowNew(win_T , tabpage_T *);
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	69 static PyObject BufferNew (buf_T );
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	70 static PyObject LineToString(const char );
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	71
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	72 static PyInt RangeStart;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	73 static PyInt RangeEnd;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	74
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	75 static PyObject *globals;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	76
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	77 static PyObject *py_chdir;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	78 static PyObject *py_fchdir;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	79 static PyObject *py_getcwd;
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	80 static PyObject *vim_module;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	81 static PyObject *vim_special_path_object;
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	82
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	83 #if PY_VERSION_HEX >= 0x030700f0
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	84 static PyObject *py_find_spec;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	85 #else
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	86 static PyObject *py_load_module;
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	87 #endif
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	88 static PyObject *py_find_module;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	89
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	90 static PyObject *VimError;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	91
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	92 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	93 * obtain a lock on the Vim data structures
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	94 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	95 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	96 Python_Lock_Vim(void)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	97 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	98 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	99
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	100 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	101 * release a lock on the Vim data structures
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	102 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	103 static void
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	104 Python_Release_Vim(void)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	105 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	106 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	107
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	108 /*
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	109 * The "todecref" argument holds a pointer to PyObject * that must be
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	110 * DECREF'ed after returned char_u * is no longer needed or NULL if all what
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	111 * was needed to generate returned value is object.
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	112 *
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	113 * Use Py_XDECREF to decrement reference count.
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	114 */
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	115 static char_u *
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	116 StringToChars(PyObject obj, PyObject *todecref)
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	117 {
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	118 char_u *str;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	119
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	120 if (PyBytes_Check(obj))
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	121 {
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	122
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	123 if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	124 \|\| str == NULL)
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	125 return NULL;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	126
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	127 *todecref = NULL;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	128 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	129 else if (PyUnicode_Check(obj))
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	130 {
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	131 PyObject *bytes;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	132
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	133 if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	134 return NULL;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	135
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	136 if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	137 \|\| str == NULL)
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	138 {
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	139 Py_DECREF(bytes);
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	140 return NULL;
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	141 }
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	142
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	143 *todecref = bytes;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	144 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	145 else
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	146 {
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	147 #if PY_MAJOR_VERSION < 3
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	148 PyErr_FORMAT(PyExc_TypeError,
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	149 N_("expected str() or unicode() instance, but got %s"),
e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	150 Py_TYPE_NAME(obj));
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	151 #else
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	152 PyErr_FORMAT(PyExc_TypeError,
e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	153 N_("expected bytes() or str() instance, but got %s"),
e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	154 Py_TYPE_NAME(obj));
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	155 #endif
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	156 return NULL;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	157 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	158
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	159 return (char_u *) str;
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	160 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	161
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	162 #define NUMBER_LONG 1
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	163 #define NUMBER_INT 2
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	164 #define NUMBER_NATURAL 4
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	165 #define NUMBER_UNSIGNED 8
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	166
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	167 static int
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	168 NumberToLong(PyObject obj, long result, int flags)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	169 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	170 #if PY_MAJOR_VERSION < 3
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	171 if (PyInt_Check(obj))
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	172 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	173 *result = PyInt_AsLong(obj);
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	174 if (PyErr_Occurred())
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	175 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	176 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	177 else
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	178 #endif
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	179 if (PyLong_Check(obj))
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	180 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	181 *result = PyLong_AsLong(obj);
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	182 if (PyErr_Occurred())
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	183 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	184 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	185 else if (PyNumber_Check(obj))
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	186 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	187 PyObject *num;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	188
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	189 if (!(num = PyNumber_Long(obj)))
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	190 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	191
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	192 *result = PyLong_AsLong(num);
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	193
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	194 Py_DECREF(num);
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	195
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	196 if (PyErr_Occurred())
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	197 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	198 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	199 else
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	200 {
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	201 #if PY_MAJOR_VERSION < 3
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	202 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	203 N_("expected int(), long() or something supporting "
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	204 "coercing to long(), but got %s"),
e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	205 Py_TYPE_NAME(obj));
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	206 #else
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	207 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	208 N_("expected int() or something supporting coercing to int(), "
4988 e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	209 "but got %s"),
e130cc3d17af updated for version 7.3.1239 Bram Moolenaar <bram@vim.org> parents: 4984 diff changeset	210 Py_TYPE_NAME(obj));
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	211 #endif
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	212 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	213 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	214
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	215 if (flags & NUMBER_INT)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	216 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	217 if (*result > INT_MAX)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	218 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	219 PyErr_SET_STRING(PyExc_OverflowError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	220 N_("value is too large to fit into C int type"));
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	221 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	222 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	223 else if (*result < INT_MIN)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	224 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	225 PyErr_SET_STRING(PyExc_OverflowError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	226 N_("value is too small to fit into C int type"));
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	227 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	228 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	229 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	230
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	231 if (flags & NUMBER_NATURAL)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	232 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	233 if (*result <= 0)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	234 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	235 PyErr_SET_STRING(PyExc_ValueError,
5695 a8650e2a0b5a updated for version 7.4.193 Bram Moolenaar <bram@vim.org> parents: 5668 diff changeset	236 N_("number must be greater than zero"));
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	237 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	238 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	239 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	240 else if (flags & NUMBER_UNSIGNED)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	241 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	242 if (*result < 0)
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	243 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	244 PyErr_SET_STRING(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	245 N_("number must be greater or equal to zero"));
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	246 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	247 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	248 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	249
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	250 return 0;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	251 }
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	252
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	253 static int
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	254 add_string(PyObject list, char s)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	255 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	256 PyObject *string;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	257
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	258 if (!(string = PyString_FromString(s)))
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	259 return -1;
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	260
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	261 if (PyList_Append(list, string))
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	262 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	263 Py_DECREF(string);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	264 return -1;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	265 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	266
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	267 Py_DECREF(string);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	268 return 0;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	269 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	270
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	271 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	272 ObjectDir(PyObject self, char *attributes)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	273 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	274 PyMethodDef *method;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	275 char **attr;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	276 PyObject *ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	277
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	278 if (!(ret = PyList_New(0)))
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	279 return NULL;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	280
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	281 if (self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	282 for (method = self->ob_type->tp_methods ; method->ml_name != NULL ; ++method)
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	283 if (add_string(ret, (char *)method->ml_name))
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	284 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	285 Py_DECREF(ret);
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	286 return NULL;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	287 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	288
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	289 for (attr = attributes ; *attr ; ++attr)
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	290 if (add_string(ret, *attr))
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	291 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	292 Py_DECREF(ret);
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	293 return NULL;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	294 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	295
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	296 #if PY_MAJOR_VERSION < 3
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	297 if (add_string(ret, "__members__"))
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	298 {
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	299 Py_DECREF(ret);
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	300 return NULL;
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	301 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	302 #endif
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	303
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	304 return ret;
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	305 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	306
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	307 // Output buffer management
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	308
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	309 // Function to write a line, points to either msg() or emsg().
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	310 typedef void (writefn)(char_u );
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	311
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	312 static PyTypeObject OutputType;
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	313
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	314 typedef struct
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	315 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	316 PyObject_HEAD
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	317 long softspace;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	318 long error;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	319 } OutputObject;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	320
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	321 static char *OutputAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	322 "softspace",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	323 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	324 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	325
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	326 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	327 OutputDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	328 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	329 return ObjectDir(self, OutputAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	330 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	331
3826 530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	332 static int
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	333 OutputSetattr(OutputObject self, char name, PyObject *valObject)
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	334 {
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	335 if (valObject == NULL)
3826 530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	336 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	337 PyErr_SET_STRING(PyExc_AttributeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	338 N_("can't delete OutputObject attributes"));
3826 530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	339 return -1;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	340 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	341
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	342 if (strcmp(name, "softspace") == 0)
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	343 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	344 if (NumberToLong(valObject, &(self->softspace), NUMBER_UNSIGNED))
3826 530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	345 return -1;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	346 return 0;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	347 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	348
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	349 PyErr_FORMAT(PyExc_AttributeError, N_("invalid attribute: %s"), name);
3826 530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	350 return -1;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	351 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	352
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	353 // Buffer IO, we write one whole line at a time.
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	354 static garray_T io_ga = {0, 0, 1, 80, NULL};
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	355 static writefn old_fn = NULL;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	356
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	357 static void
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	358 PythonIO_Flush(void)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	359 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	360 if (old_fn != NULL && io_ga.ga_len > 0)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	361 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	362 ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	363 old_fn((char_u *)io_ga.ga_data);
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	364 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	365 io_ga.ga_len = 0;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	366 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	367
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	368 static void
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	369 writer(writefn fn, char_u *str, PyInt n)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	370 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	371 char_u *ptr;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	372
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	373 // Flush when switching output function.
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	374 if (fn != old_fn)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	375 PythonIO_Flush();
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	376 old_fn = fn;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	377
18370 026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	378 // Write each NL separated line. Text after the last NL is kept for
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	379 // writing later.
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	380 // For normal messages: Do not output when "got_int" was set. This avoids
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	381 // a loop gone crazy flooding the terminal with messages. Also for when
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	382 // "q" is pressed at the more-prompt.
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	383 while (n > 0 && (ptr = memchr(str, '\n', n)) != NULL
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	384 && (fn == (writefn)emsg \|\| !got_int))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	385 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	386 PyInt len = ptr - str;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	387
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	388 if (ga_grow(&io_ga, (int)(len + 1)) == FAIL)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	389 break;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	390
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	391 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	392 ((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	393 fn((char_u *)io_ga.ga_data);
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	394 str = ptr + 1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	395 n -= len + 1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	396 io_ga.ga_len = 0;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	397 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	398
18370 026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	399 // Put the remaining text into io_ga for later printing.
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	400 if (n > 0 && (fn == (writefn)emsg \|\| !got_int)
026034963159 patch 8.1.2179: pressing "q" at the more prompt doesn't stop Python output Bram Moolenaar <Bram@vim.org> parents: 17922 diff changeset	401 && ga_grow(&io_ga, (int)(n + 1)) == OK)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	402 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	403 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	404 io_ga.ga_len += (int)n;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	405 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	406 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	407
4962 b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	408 static int
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	409 write_output(OutputObject self, PyObject string)
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	410 {
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	411 Py_ssize_t len = 0;
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	412 char *str = NULL;
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	413 int error = self->error;
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	414
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	415 if (!PyArg_Parse(string, "et#", ENC_OPT, &str, &len))
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	416 return -1;
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	417
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	418 Py_BEGIN_ALLOW_THREADS
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	419 Python_Lock_Vim();
16688 e791f29affae patch 8.1.1346: error for Python exception does not show useful info Bram Moolenaar <Bram@vim.org> parents: 16606 diff changeset	420 if (error)
e791f29affae patch 8.1.1346: error for Python exception does not show useful info Bram Moolenaar <Bram@vim.org> parents: 16606 diff changeset	421 emsg_severe = TRUE;
15543 dd725a8ab112 patch 8.1.0779: argument for message functions is inconsistent Bram Moolenaar <Bram@vim.org> parents: 15472 diff changeset	422 writer((writefn)(error ? emsg : msg), (char_u *)str, len);
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	423 Python_Release_Vim();
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	424 Py_END_ALLOW_THREADS
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	425 PyMem_Free(str);
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	426
4962 b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	427 return 0;
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	428 }
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	429
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	430 static PyObject *
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	431 OutputWrite(OutputObject self, PyObject string)
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	432 {
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	433 if (write_output(self, string))
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	434 return NULL;
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	435
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	436 Py_INCREF(Py_None);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	437 return Py_None;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	438 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	439
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	440 static PyObject *
4962 b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	441 OutputWritelines(OutputObject self, PyObject seq)
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	442 {
4619 90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	443 PyObject *iterator;
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	444 PyObject *item;
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	445
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	446 if (!(iterator = PyObject_GetIter(seq)))
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	447 return NULL;
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	448
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	449 while ((item = PyIter_Next(iterator)))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	450 {
4962 b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	451 if (write_output(self, item))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	452 {
4619 90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	453 Py_DECREF(iterator);
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	454 Py_DECREF(item);
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	455 return NULL;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	456 }
4619 90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	457 Py_DECREF(item);
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	458 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	459
4619 90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	460 Py_DECREF(iterator);
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	461
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	462 // Iterator may have finished due to an exception
4619 90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	463 if (PyErr_Occurred())
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	464 return NULL;
90beab957ba9 updated for version 7.3.1057 Bram Moolenaar <bram@vim.org> parents: 4617 diff changeset	465
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	466 Py_INCREF(Py_None);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	467 return Py_None;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	468 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	469
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	470 static PyObject *
7191 692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	471 AlwaysNone(PyObject *self UNUSED)
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	472 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	473 // do nothing
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	474 Py_INCREF(Py_None);
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	475 return Py_None;
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	476 }
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	477
7191 692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	478 static PyObject *
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	479 AlwaysFalse(PyObject *self UNUSED)
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	480 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	481 // do nothing
7202 de43f10a3850 commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66 Christian Brabandt <cb@256bit.org> parents: 7191 diff changeset	482 PyObject *ret = Py_False;
de43f10a3850 commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66 Christian Brabandt <cb@256bit.org> parents: 7191 diff changeset	483 Py_INCREF(ret);
de43f10a3850 commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66 Christian Brabandt <cb@256bit.org> parents: 7191 diff changeset	484 return ret;
7191 692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	485 }
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	486
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	487 static PyObject *
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	488 AlwaysTrue(PyObject *self UNUSED)
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	489 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	490 // do nothing
7202 de43f10a3850 commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66 Christian Brabandt <cb@256bit.org> parents: 7191 diff changeset	491 PyObject *ret = Py_True;
de43f10a3850 commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66 Christian Brabandt <cb@256bit.org> parents: 7191 diff changeset	492 Py_INCREF(ret);
de43f10a3850 commit https://github.com/vim/vim/commit/e7427f4b7e1af6a63600183be6b4c5724beb2f66 Christian Brabandt <cb@256bit.org> parents: 7191 diff changeset	493 return ret;
7191 692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	494 }
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	495
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	496 /***************/
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	497
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	498 static struct PyMethodDef OutputMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	499 // name, function, calling, doc
4962 b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	500 {"write", (PyCFunction)OutputWrite, METH_O, ""},
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	501 {"writelines", (PyCFunction)OutputWritelines, METH_O, ""},
7191 692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	502 {"flush", (PyCFunction)AlwaysNone, METH_NOARGS, ""},
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	503 {"close", (PyCFunction)AlwaysNone, METH_NOARGS, ""},
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	504 {"isatty", (PyCFunction)AlwaysFalse, METH_NOARGS, ""},
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	505 {"readable", (PyCFunction)AlwaysFalse, METH_NOARGS, ""},
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	506 {"seekable", (PyCFunction)AlwaysFalse, METH_NOARGS, ""},
692dac7183de commit https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 Christian Brabandt <cb@256bit.org> parents: 6598 diff changeset	507 {"writable", (PyCFunction)AlwaysTrue, METH_NOARGS, ""},
8967 df5f9284fcba commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953 Christian Brabandt <cb@256bit.org> parents: 8921 diff changeset	508 {"closed", (PyCFunction)AlwaysFalse, METH_NOARGS, ""},
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	509 {"__dir__", (PyCFunction)OutputDir, METH_NOARGS, ""},
4492 f74611bfb1b7 updated for version 7.3.994 Bram Moolenaar <bram@vim.org> parents: 4490 diff changeset	510 { NULL, NULL, 0, NULL}
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	511 };
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	512
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	513 static OutputObject Output =
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	514 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	515 PyObject_HEAD_INIT(&OutputType)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	516 0,
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	517 0
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	518 };
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	519
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	520 static OutputObject Error =
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	521 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	522 PyObject_HEAD_INIT(&OutputType)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	523 0,
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	524 1
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	525 };
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	526
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	527 static int
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	528 PythonIO_Init_io(void)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	529 {
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	530 if (PySys_SetObject("stdout", (PyObject )(void )&Output))
ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	531 return -1;
ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	532 if (PySys_SetObject("stderr", (PyObject )(void )&Error))
ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	533 return -1;
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	534
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	535 if (PyErr_Occurred())
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	536 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	537 emsg(_("E264: Python: Error initialising I/O objects"));
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	538 return -1;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	539 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	540
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	541 return 0;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	542 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	543
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	544 #if PY_VERSION_HEX < 0x030700f0
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	545 static PyObject call_load_module(char name, int len, PyObject *find_module_result);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	546
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	547 typedef struct
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	548 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	549 PyObject_HEAD
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	550 char *fullname;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	551 PyObject *result;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	552 } LoaderObject;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	553 static PyTypeObject LoaderType;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	554
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	555 static void
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	556 LoaderDestructor(LoaderObject *self)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	557 {
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	558 vim_free(self->fullname);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	559 Py_XDECREF(self->result);
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	560 DESTRUCTOR_FINISH(self);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	561 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	562
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	563 static PyObject *
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	564 LoaderLoadModule(LoaderObject self, PyObject args UNUSED)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	565 {
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	566 char *fullname = self->fullname;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	567 PyObject *result = self->result;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	568 PyObject *module;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	569
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	570 if (!fullname)
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	571 {
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	572 module = result ? result : Py_None;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	573 Py_INCREF(module);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	574 return module;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	575 }
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	576
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	577 module = call_load_module(fullname, (int)STRLEN(fullname), result);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	578
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	579 self->fullname = NULL;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	580 self->result = module;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	581
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	582 vim_free(fullname);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	583 Py_DECREF(result);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	584
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	585 if (!module)
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	586 {
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	587 if (PyErr_Occurred())
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	588 return NULL;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	589
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	590 Py_INCREF(Py_None);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	591 return Py_None;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	592 }
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	593
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	594 Py_INCREF(module);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	595 return module;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	596 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	597
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	598 static struct PyMethodDef LoaderMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	599 // name, function, calling, doc
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	600 {"load_module", (PyCFunction)LoaderLoadModule, METH_VARARGS, ""},
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	601 { NULL, NULL, 0, NULL}
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	602 };
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	603 #endif
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	604
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	605 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	606 * Check to see whether a Vim error has been reported, or a keyboard
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	607 * interrupt has been detected.
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	608 */
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	609 static void
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	610 VimTryStart(void)
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	611 {
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	612 ++trylevel;
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	613 }
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	614
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	615 static int
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	616 VimTryEnd(void)
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	617 {
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	618 --trylevel;
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	619 // Without this it stops processing all subsequent Vim script commands and
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	620 // generates strange error messages if I e.g. try calling Test() in a cycle
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	621 did_emsg = FALSE;
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	622 // Keyboard interrupt should be preferred over anything else
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	623 if (got_int)
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	624 {
5629 91f3908748c2 updated for version 7.4.161 Bram Moolenaar <bram@vim.org> parents: 5612 diff changeset	625 if (did_throw)
5469 a56f60cf6834 updated for version 7.4.084 Bram Moolenaar <bram@vim.org> parents: 5426 diff changeset	626 discard_current_exception();
a56f60cf6834 updated for version 7.4.084 Bram Moolenaar <bram@vim.org> parents: 5426 diff changeset	627 got_int = FALSE;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	628 PyErr_SetNone(PyExc_KeyboardInterrupt);
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	629 return -1;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	630 }
5517 064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	631 else if (msg_list != NULL && *msg_list != NULL)
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	632 {
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	633 int should_free;
15472 0fcc1315c061 patch 8.1.0744: compiler warnings for signed/unsigned strings Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	634 char *msg;
5517 064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	635
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	636 msg = get_exception_string(*msg_list, ET_ERROR, NULL, &should_free);
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	637
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	638 if (msg == NULL)
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	639 {
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	640 PyErr_NoMemory();
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	641 return -1;
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	642 }
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	643
15472 0fcc1315c061 patch 8.1.0744: compiler warnings for signed/unsigned strings Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	644 PyErr_SetVim(msg);
5517 064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	645
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	646 free_global_msglist();
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	647
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	648 if (should_free)
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	649 vim_free(msg);
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	650
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	651 return -1;
064e2a080e2e updated for version 7.4.107 Bram Moolenaar <bram@vim.org> parents: 5469 diff changeset	652 }
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	653 else if (!did_throw)
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	654 return (PyErr_Occurred() ? -1 : 0);
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	655 // Python exception is preferred over Vim one; unlikely to occur though
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	656 else if (PyErr_Occurred())
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	657 {
5629 91f3908748c2 updated for version 7.4.161 Bram Moolenaar <bram@vim.org> parents: 5612 diff changeset	658 discard_current_exception();
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	659 return -1;
4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	660 }
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	661 // Finally transform Vim script exception to python one
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	662 else
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	663 {
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	664 PyErr_SetVim((char *)current_exception->value);
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	665 discard_current_exception();
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	666 return -1;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	667 }
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	668 }
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	669
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	670 static int
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	671 VimCheckInterrupt(void)
2399 76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	672 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	673 if (got_int)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	674 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	675 PyErr_SetNone(PyExc_KeyboardInterrupt);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	676 return 1;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	677 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	678 return 0;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	679 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	680
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	681 // Vim module - Implementation
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	682
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	683 static PyObject *
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	684 VimCommand(PyObject self UNUSED, PyObject string)
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	685 {
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	686 char_u *cmd;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	687 PyObject *ret;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	688 PyObject *todecref;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	689
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	690 if (!(cmd = StringToChars(string, &todecref)))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	691 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	692
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	693 Py_BEGIN_ALLOW_THREADS
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	694 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	695
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	696 VimTryStart();
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	697 do_cmdline_cmd(cmd);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	698 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	699
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	700 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	701 Py_END_ALLOW_THREADS
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	702
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	703 if (VimTryEnd())
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	704 ret = NULL;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	705 else
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	706 ret = Py_None;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	707
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	708 Py_XINCREF(ret);
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	709 Py_XDECREF(todecref);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	710 return ret;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	711 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	712
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	713 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	714 * Function to translate a typval_T into a PyObject; this will recursively
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	715 * translate lists/dictionaries into their Python equivalents.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	716 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	717 * The depth parameter is to avoid infinite recursion, set it to 1 when
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	718 * you call VimToPython.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	719 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	720 static PyObject *
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	721 VimToPython(typval_T our_tv, int depth, PyObject lookup_dict)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	722 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	723 PyObject *ret;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	724 PyObject *newObj;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	725 char ptrBuf[sizeof(void ) 2 + 3];
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	726
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	727 // Avoid infinite recursion
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	728 if (depth > 100)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	729 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	730 Py_INCREF(Py_None);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	731 ret = Py_None;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	732 return ret;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	733 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	734
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	735 // Check if we run into a recursive loop. The item must be in lookup_dict
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	736 // then and we can use it again.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	737 if ((our_tv->v_type == VAR_LIST && our_tv->vval.v_list != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	738 \|\| (our_tv->v_type == VAR_DICT && our_tv->vval.v_dict != NULL))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	739 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	740 sprintf(ptrBuf, "%p",
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	741 our_tv->v_type == VAR_LIST ? (void *)our_tv->vval.v_list
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	742 : (void *)our_tv->vval.v_dict);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	743
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	744 if ((ret = PyDict_GetItemString(lookup_dict, ptrBuf)))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	745 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	746 Py_INCREF(ret);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	747 return ret;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	748 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	749 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	750
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	751 if (our_tv->v_type == VAR_STRING)
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	752 ret = PyString_FromString(our_tv->vval.v_string == NULL
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	753 ? "" : (char *)our_tv->vval.v_string);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	754 else if (our_tv->v_type == VAR_NUMBER)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	755 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	756 char buf[NUMBUFLEN];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	757
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	758 // For backwards compatibility numbers are stored as strings.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	759 sprintf(buf, "%ld", (long)our_tv->vval.v_number);
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	760 ret = PyString_FromString((char *)buf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	761 }
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	762 #ifdef FEAT_FLOAT
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	763 else if (our_tv->v_type == VAR_FLOAT)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	764 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	765 char buf[NUMBUFLEN];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	766
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	767 sprintf(buf, "%f", our_tv->vval.v_float);
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	768 ret = PyString_FromString((char *)buf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	769 }
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	770 #endif
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	771 else if (our_tv->v_type == VAR_LIST)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	772 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	773 list_T *list = our_tv->vval.v_list;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	774 listitem_T *curr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	775
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	776 if (list == NULL)
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	777 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	778
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	779 if (!(ret = PyList_New(0)))
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	780 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	781
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	782 if (PyDict_SetItemString(lookup_dict, ptrBuf, ret))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	783 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	784 Py_DECREF(ret);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	785 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	786 }
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	787
20392 4c317d8c1051 patch 8.2.0751: Vim9: performance can be improved Bram Moolenaar <Bram@vim.org> parents: 20369 diff changeset	788 CHECK_LIST_MATERIALIZE(list);
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 19229 diff changeset	789 FOR_ALL_LIST_ITEMS(list, curr)
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	790 {
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	791 if (!(newObj = VimToPython(&curr->li_tv, depth + 1, lookup_dict)))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	792 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	793 Py_DECREF(ret);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	794 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	795 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	796 if (PyList_Append(ret, newObj))
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	797 {
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	798 Py_DECREF(newObj);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	799 Py_DECREF(ret);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	800 return NULL;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	801 }
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	802 Py_DECREF(newObj);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	803 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	804 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	805 else if (our_tv->v_type == VAR_DICT)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	806 {
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	807
6598 4b1e3b3aa78a updated for version 7.4.625 Bram Moolenaar <bram@vim.org> parents: 6565 diff changeset	808 hashtab_T *ht;
4b1e3b3aa78a updated for version 7.4.625 Bram Moolenaar <bram@vim.org> parents: 6565 diff changeset	809 long_u todo;
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	810 hashitem_T *hi;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	811 dictitem_T *di;
6598 4b1e3b3aa78a updated for version 7.4.625 Bram Moolenaar <bram@vim.org> parents: 6565 diff changeset	812
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	813 if (our_tv->vval.v_dict == NULL)
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	814 return NULL;
6598 4b1e3b3aa78a updated for version 7.4.625 Bram Moolenaar <bram@vim.org> parents: 6565 diff changeset	815 ht = &our_tv->vval.v_dict->dv_hashtab;
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	816
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	817 if (!(ret = PyDict_New()))
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	818 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	819
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	820 if (PyDict_SetItemString(lookup_dict, ptrBuf, ret))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	821 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	822 Py_DECREF(ret);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	823 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	824 }
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	825
6598 4b1e3b3aa78a updated for version 7.4.625 Bram Moolenaar <bram@vim.org> parents: 6565 diff changeset	826 todo = ht->ht_used;
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	827 for (hi = ht->ht_array; todo > 0; ++hi)
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	828 {
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	829 if (!HASHITEM_EMPTY(hi))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	830 {
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	831 --todo;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	832
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	833 di = dict_lookup(hi);
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	834 if (!(newObj = VimToPython(&di->di_tv, depth + 1, lookup_dict)))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	835 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	836 Py_DECREF(ret);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	837 return NULL;
29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	838 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	839 if (PyDict_SetItemString(ret, (char *)hi->hi_key, newObj))
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	840 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	841 Py_DECREF(ret);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	842 Py_DECREF(newObj);
4595 29b2be2bba0d updated for version 7.3.1045 Bram Moolenaar <bram@vim.org> parents: 4593 diff changeset	843 return NULL;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	844 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	845 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	846 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	847 }
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	848 else if (our_tv->v_type == VAR_BOOL)
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	849 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	850 if (our_tv->vval.v_number == VVAL_FALSE)
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	851 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	852 ret = Py_False;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	853 Py_INCREF(ret);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	854 }
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	855 else
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	856 {
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	857 ret = Py_True;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	858 Py_INCREF(ret);
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	859 }
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	860 return ret;
ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	861 }
ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	862 else if (our_tv->v_type == VAR_SPECIAL)
ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	863 {
ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	864 Py_INCREF(Py_None);
ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	865 ret = Py_None;
7712 bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	866 return ret;
bce3b5ddb393 commit https://github.com/vim/vim/commit/520e1e41f35b063ede63b41738c82d6636e78c34 Christian Brabandt <cb@256bit.org> parents: 7660 diff changeset	867 }
15454 1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	868 else if (our_tv->v_type == VAR_BLOB)
1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	869 ret = PyBytes_FromStringAndSize(
1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	870 (char*) our_tv->vval.v_blob->bv_ga.ga_data,
1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	871 (Py_ssize_t) our_tv->vval.v_blob->bv_ga.ga_len);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	872 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	873 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	874 Py_INCREF(Py_None);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	875 ret = Py_None;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	876 }
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	877
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	878 return ret;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	879 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	880
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	881 static PyObject *
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	882 VimEval(PyObject self UNUSED, PyObject args)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	883 {
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	884 char_u *expr;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	885 typval_T *our_tv;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	886 PyObject *string;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	887 PyObject *todecref;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	888 PyObject *ret;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	889 PyObject *lookup_dict;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	890
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	891 if (!PyArg_ParseTuple(args, "O", &string))
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	892 return NULL;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	893
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	894 if (!(expr = StringToChars(string, &todecref)))
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	895 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	896
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	897 Py_BEGIN_ALLOW_THREADS
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	898 Python_Lock_Vim();
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	899 VimTryStart();
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	900 our_tv = eval_expr(expr, NULL);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	901 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	902 Py_END_ALLOW_THREADS
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	903
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	904 Py_XDECREF(todecref);
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	905
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	906 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	907 return NULL;
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	908
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	909 if (our_tv == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	910 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	911 PyErr_SET_VIM(N_("invalid expression"));
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	912 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	913 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	914
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	915 // Convert the Vim type into a Python type. Create a dictionary that's
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	916 // used to check for recursive loops.
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	917 if (!(lookup_dict = PyDict_New()))
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	918 ret = NULL;
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	919 else
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	920 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	921 ret = VimToPython(our_tv, 1, lookup_dict);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	922 Py_DECREF(lookup_dict);
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	923 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	924
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	925
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	926 Py_BEGIN_ALLOW_THREADS
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	927 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	928 free_tv(our_tv);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	929 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	930 Py_END_ALLOW_THREADS
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	931
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	932 return ret;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	933 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	934
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	935 static PyObject ConvertToPyObject(typval_T );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	936
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	937 static PyObject *
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	938 VimEvalPy(PyObject self UNUSED, PyObject string)
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	939 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	940 typval_T *our_tv;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	941 PyObject *ret;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	942 char_u *expr;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	943 PyObject *todecref;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	944
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	945 if (!(expr = StringToChars(string, &todecref)))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	946 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	947
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	948 Py_BEGIN_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	949 Python_Lock_Vim();
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	950 VimTryStart();
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	951 our_tv = eval_expr(expr, NULL);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	952 Python_Release_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	953 Py_END_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	954
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	955 Py_XDECREF(todecref);
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	956
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	957 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	958 return NULL;
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	959
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	960 if (our_tv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	961 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	962 PyErr_SET_VIM(N_("invalid expression"));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	963 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	964 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	965
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	966 ret = ConvertToPyObject(our_tv);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	967 Py_BEGIN_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	968 Python_Lock_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	969 free_tv(our_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	970 Python_Release_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	971 Py_END_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	972
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	973 return ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	974 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	975
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	976 static PyObject *
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	977 VimStrwidth(PyObject self UNUSED, PyObject string)
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	978 {
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	979 char_u *str;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	980 PyObject *todecref;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	981 int len;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	982
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	983 if (!(str = StringToChars(string, &todecref)))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	984 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	985
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	986 len = mb_string2cells(str, (int)STRLEN(str));
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	987
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	988 Py_XDECREF(todecref);
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	989
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	990 return PyLong_FromLong(len);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	991 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	992
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	993 static PyObject *
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	994 _VimChdir(PyObject _chdir, PyObject args, PyObject *kwargs)
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	995 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	996 PyObject *ret;
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	997 PyObject *newwd;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	998 PyObject *todecref;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	999 char_u *new_dir;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1000
4754 be1e4acb30ca updated for version 7.3.1124 Bram Moolenaar <bram@vim.org> parents: 4722 diff changeset	1001 if (_chdir == NULL)
be1e4acb30ca updated for version 7.3.1124 Bram Moolenaar <bram@vim.org> parents: 4722 diff changeset	1002 return NULL;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1003 if (!(ret = PyObject_Call(_chdir, args, kwargs)))
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1004 return NULL;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1005
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1006 if (!(newwd = PyObject_CallFunctionObjArgs(py_getcwd, NULL)))
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1007 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1008 Py_DECREF(ret);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1009 return NULL;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1010 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1011
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1012 if (!(new_dir = StringToChars(newwd, &todecref)))
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1013 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1014 Py_DECREF(ret);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1015 Py_DECREF(newwd);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1016 return NULL;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1017 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1018
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1019 VimTryStart();
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1020
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1021 if (vim_chdir(new_dir))
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1022 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1023 Py_DECREF(ret);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1024 Py_DECREF(newwd);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1025 Py_XDECREF(todecref);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1026
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1027 if (VimTryEnd())
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1028 return NULL;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1029
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1030 PyErr_SET_VIM(N_("failed to change directory"));
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1031 return NULL;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1032 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1033
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1034 Py_DECREF(newwd);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1035 Py_XDECREF(todecref);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1036
16576 bcc343175103 patch 8.1.1291: not easy to change directory and restore Bram Moolenaar <Bram@vim.org> parents: 16427 diff changeset	1037 post_chdir(CDSCOPE_GLOBAL);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1038
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1039 if (VimTryEnd())
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1040 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1041 Py_DECREF(ret);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1042 return NULL;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1043 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1044
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1045 return ret;
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1046 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1047
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1048 static PyObject *
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1049 VimChdir(PyObject self UNUSED, PyObject args, PyObject *kwargs)
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1050 {
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1051 return _VimChdir(py_chdir, args, kwargs);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1052 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1053
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1054 static PyObject *
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1055 VimFchdir(PyObject self UNUSED, PyObject args, PyObject *kwargs)
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1056 {
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1057 return _VimChdir(py_fchdir, args, kwargs);
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1058 }
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	1059
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1060 typedef struct {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1061 PyObject *callable;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1062 PyObject *result;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1063 } map_rtp_data;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1064
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1065 static void
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1066 map_rtp_callback(char_u path, void _data)
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1067 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1068 void data = (void ) _data;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1069 PyObject *pathObject;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1070 map_rtp_data mr_data = ((map_rtp_data **) data);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1071
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	1072 if (!(pathObject = PyString_FromString((char *)path)))
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1073 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1074 *data = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1075 return;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1076 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1077
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1078 mr_data->result = PyObject_CallFunctionObjArgs(mr_data->callable,
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1079 pathObject, NULL);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1080
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1081 Py_DECREF(pathObject);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1082
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1083 if (!mr_data->result \|\| mr_data->result != Py_None)
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1084 *data = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1085 else
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1086 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1087 Py_DECREF(mr_data->result);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1088 mr_data->result = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1089 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1090 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1091
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1092 static PyObject *
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	1093 VimForeachRTP(PyObject self UNUSED, PyObject callable)
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1094 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1095 map_rtp_data data;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1096
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	1097 data.callable = callable;
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1098 data.result = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1099
8524 2f57bbe870ea commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f Christian Brabandt <cb@256bit.org> parents: 7949 diff changeset	1100 do_in_runtimepath(NULL, 0, &map_rtp_callback, &data);
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1101
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1102 if (data.result == NULL)
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1103 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1104 if (PyErr_Occurred())
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1105 return NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1106 else
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1107 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1108 Py_INCREF(Py_None);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1109 return Py_None;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1110 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1111 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1112 return data.result;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1113 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1114
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1115 /*
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1116 * _vim_runtimepath_ special path implementation.
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1117 */
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1118
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1119 static void
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1120 map_finder_callback(char_u path, void _data)
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1121 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1122 void data = (void ) _data;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1123 PyObject list = ((PyObject **) data);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1124 PyObject pathObject1, pathObject2;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1125 char *pathbuf;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1126 size_t pathlen;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1127
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1128 pathlen = STRLEN(path);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1129
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1130 #if PY_MAJOR_VERSION < 3
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1131 # define PY_MAIN_DIR_STRING "python2"
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1132 #else
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1133 # define PY_MAIN_DIR_STRING "python3"
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1134 #endif
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1135 #define PY_ALTERNATE_DIR_STRING "pythonx"
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1136
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1137 #define PYTHONX_STRING_LENGTH 7 // STRLEN("pythonx")
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1138 if (!(pathbuf = PyMem_New(char,
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1139 pathlen + STRLEN(PATHSEPSTR) + PYTHONX_STRING_LENGTH + 1)))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1140 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1141 PyErr_NoMemory();
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1142 *data = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1143 return;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1144 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1145
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1146 mch_memmove(pathbuf, path, pathlen + 1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1147 add_pathsep((char_u *) pathbuf);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1148
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1149 pathlen = STRLEN(pathbuf);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1150 mch_memmove(pathbuf + pathlen, PY_MAIN_DIR_STRING,
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1151 PYTHONX_STRING_LENGTH + 1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1152
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1153 if (!(pathObject1 = PyString_FromString(pathbuf)))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1154 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1155 *data = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1156 PyMem_Free(pathbuf);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1157 return;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1158 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1159
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1160 mch_memmove(pathbuf + pathlen, PY_ALTERNATE_DIR_STRING,
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1161 PYTHONX_STRING_LENGTH + 1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1162
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1163 if (!(pathObject2 = PyString_FromString(pathbuf)))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1164 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1165 Py_DECREF(pathObject1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1166 PyMem_Free(pathbuf);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1167 *data = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1168 return;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1169 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1170
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1171 PyMem_Free(pathbuf);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1172
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1173 if (PyList_Append(list, pathObject1)
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1174 \|\| PyList_Append(list, pathObject2))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1175 *data = NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1176
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1177 Py_DECREF(pathObject1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1178 Py_DECREF(pathObject2);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1179 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1180
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1181 static PyObject *
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1182 Vim_GetPaths(PyObject *self UNUSED)
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1183 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1184 PyObject *ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1185
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1186 if (!(ret = PyList_New(0)))
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1187 return NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1188
8524 2f57bbe870ea commit https://github.com/vim/vim/commit/7f8989dd8a627af2185df381195351a913f3777f Christian Brabandt <cb@256bit.org> parents: 7949 diff changeset	1189 do_in_runtimepath(NULL, 0, &map_finder_callback, ret);
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1190
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1191 if (PyErr_Occurred())
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1192 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1193 Py_DECREF(ret);
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1194 return NULL;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1195 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1196
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1197 return ret;
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1198 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1199
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1200 #if PY_VERSION_HEX >= 0x030700f0
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1201 static PyObject *
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1202 FinderFindSpec(PyObject self, PyObject args)
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1203 {
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1204 char *fullname;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1205 PyObject *paths;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1206 PyObject *target = Py_None;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1207 PyObject *spec;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1208
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1209 if (!PyArg_ParseTuple(args, "s\|O", &fullname, &target))
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1210 return NULL;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1211
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1212 if (!(paths = Vim_GetPaths(self)))
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1213 return NULL;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1214
16140 ab815ed87969 patch 8.1.1075: function reference count wrong in Python code Bram Moolenaar <Bram@vim.org> parents: 16080 diff changeset	1215 spec = PyObject_CallFunction(py_find_spec, "sOO", fullname, paths, target);
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1216
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1217 Py_DECREF(paths);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1218
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1219 if (!spec)
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1220 {
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1221 if (PyErr_Occurred())
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1222 return NULL;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1223
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1224 Py_INCREF(Py_None);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1225 return Py_None;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1226 }
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1227
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1228 return spec;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1229 }
16718 9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1230
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1231 static PyObject *
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1232 FinderFindModule(PyObject* self UNUSED, PyObject* args UNUSED)
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1233 {
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1234 // Apparently returning None works.
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1235 Py_INCREF(Py_None);
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1236 return Py_None;
9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1237 }
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1238 #else
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1239 static PyObject *
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1240 call_load_module(char name, int len, PyObject find_module_result)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1241 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1242 PyObject fd, pathname, *description;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1243
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1244 if (!PyTuple_Check(find_module_result))
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1245 {
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1246 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1247 N_("expected 3-tuple as imp.find_module() result, but got %s"),
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1248 Py_TYPE_NAME(find_module_result));
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1249 return NULL;
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1250 }
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1251 if (PyTuple_GET_SIZE(find_module_result) != 3)
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1252 {
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1253 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1254 N_("expected 3-tuple as imp.find_module() result, but got "
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1255 "tuple of size %d"),
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1256 (int) PyTuple_GET_SIZE(find_module_result));
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1257 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1258 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1259
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1260 if (!(fd = PyTuple_GET_ITEM(find_module_result, 0))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1261 \|\| !(pathname = PyTuple_GET_ITEM(find_module_result, 1))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1262 \|\| !(description = PyTuple_GET_ITEM(find_module_result, 2)))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1263 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	1264 PyErr_SET_STRING(PyExc_RuntimeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1265 N_("internal error: imp.find_module returned tuple with NULL"));
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1266 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1267 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1268
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1269 return PyObject_CallFunction(py_load_module,
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1270 "s#OOO", name, len, fd, pathname, description);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1271 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1272
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1273 static PyObject *
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1274 find_module(char fullname, char tail, PyObject *new_path)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1275 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1276 PyObject *find_module_result;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1277 PyObject *module;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1278 char *dot;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1279
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	1280 if ((dot = (char )vim_strchr((char_u ) tail, '.')))
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1281 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1282 /*
4859 e48cabe98453 updated for version 7.3.1176 Bram Moolenaar <bram@vim.org> parents: 4855 diff changeset	1283 * There is a dot in the name: call find_module recursively without the
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1284 * first component
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1285 */
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1286 PyObject *newest_path;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1287 int partlen = (int) (dot - 1 - tail);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1288
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1289 if (!(find_module_result = PyObject_CallFunction(py_find_module,
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1290 "s#O", tail, partlen, new_path)))
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1291 {
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1292 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_ImportError))
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1293 PyErr_Clear();
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1294 return NULL;
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1295 }
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1296
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1297 if (!(module = call_load_module(
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1298 fullname,
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1299 ((int) (tail - fullname)) + partlen,
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1300 find_module_result)))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1301 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1302 Py_DECREF(find_module_result);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1303 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1304 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1305
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1306 Py_DECREF(find_module_result);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1307
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1308 if (!(newest_path = PyObject_GetAttrString(module, "__path__")))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1309 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1310 Py_DECREF(module);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1311 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1312 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1313
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1314 Py_DECREF(module);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1315
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1316 find_module_result = find_module(fullname, dot + 1, newest_path);
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1317
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1318 Py_DECREF(newest_path);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1319
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1320 return find_module_result;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1321 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1322 else
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1323 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1324 if (!(find_module_result = PyObject_CallFunction(py_find_module,
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1325 "sO", tail, new_path)))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1326 {
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1327 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_ImportError))
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1328 PyErr_Clear();
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1329 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1330 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1331
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1332 return find_module_result;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1333 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1334 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1335
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1336 static PyObject *
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1337 FinderFindModule(PyObject self, PyObject args)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1338 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1339 char *fullname;
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1340 PyObject *result;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1341 PyObject *new_path;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1342 LoaderObject *loader;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1343
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1344 if (!PyArg_ParseTuple(args, "s", &fullname))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1345 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1346
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1347 if (!(new_path = Vim_GetPaths(self)))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1348 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1349
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1350 result = find_module(fullname, fullname, new_path);
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1351
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1352 Py_DECREF(new_path);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1353
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1354 if (!result)
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1355 {
4984 5b2c8f3b3906 updated for version 7.3.1237 Bram Moolenaar <bram@vim.org> parents: 4982 diff changeset	1356 if (PyErr_Occurred())
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1357 return NULL;
4984 5b2c8f3b3906 updated for version 7.3.1237 Bram Moolenaar <bram@vim.org> parents: 4982 diff changeset	1358
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1359 Py_INCREF(Py_None);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1360 return Py_None;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1361 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1362
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1363 if (!(fullname = (char )vim_strsave((char_u )fullname)))
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1364 {
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1365 Py_DECREF(result);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1366 PyErr_NoMemory();
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1367 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1368 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1369
14467 16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1370 if (!(loader = PyObject_NEW(LoaderObject, &LoaderType)))
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1371 {
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1372 vim_free(fullname);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1373 Py_DECREF(result);
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1374 return NULL;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1375 }
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1376
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1377 loader->fullname = fullname;
16cccc953909 patch 8.1.0247: Python: error message for failing import is incorrect Christian Brabandt <cb@256bit.org> parents: 14395 diff changeset	1378 loader->result = result;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1379
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1380 return (PyObject *) loader;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1381 }
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1382 #endif
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1383
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1384 static PyObject *
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1385 VimPathHook(PyObject self UNUSED, PyObject args)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1386 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1387 char *path;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1388
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1389 if (PyArg_ParseTuple(args, "s", &path)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1390 && STRCMP(path, vim_special_path) == 0)
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1391 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1392 Py_INCREF(vim_module);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1393 return vim_module;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1394 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1395
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1396 PyErr_Clear();
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1397 PyErr_SetNone(PyExc_ImportError);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1398 return NULL;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1399 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	1400
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1401 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1402 * Vim module - Definitions
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1403 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1404
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1405 static struct PyMethodDef VimMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1406 // name, function, calling, documentation
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	1407 {"command", VimCommand, METH_O, "Execute a Vim ex-mode command" },
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1408 {"eval", VimEval, METH_VARARGS, "Evaluate an expression using Vim evaluator" },
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	1409 {"bindeval", VimEvalPy, METH_O, "Like eval(), but returns objects attached to Vim ones"},
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	1410 {"strwidth", VimStrwidth, METH_O, "Screen string width, counts <Tab> as having width 1"},
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1411 {"chdir", (PyCFunction)VimChdir, METH_VARARGS\|METH_KEYWORDS, "Change directory"},
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1412 {"fchdir", (PyCFunction)VimFchdir, METH_VARARGS\|METH_KEYWORDS, "Change directory"},
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	1413 {"foreach_rtp", VimForeachRTP, METH_O, "Call given callable for each path in &rtp"},
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1414 #if PY_VERSION_HEX >= 0x030700f0
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	1415 {"find_spec", FinderFindSpec, METH_VARARGS, "Internal use only, returns spec object for any input it receives"},
16718 9aa87f5aab55 patch 8.1.1361: Python setuptools don't work with Python 3 Bram Moolenaar <Bram@vim.org> parents: 16688 diff changeset	1416 #endif
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1417 {"find_module", FinderFindModule, METH_VARARGS, "Internal use only, returns loader object for any input it receives"},
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1418 {"path_hook", VimPathHook, METH_VARARGS, "Hook function to install in sys.path_hooks"},
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1419 {"_get_paths", (PyCFunction)Vim_GetPaths, METH_NOARGS, "Get &rtp-based additions to sys.path"},
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	1420 { NULL, NULL, 0, NULL}
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1421 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1422
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1423 /*
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1424 * Generic iterator object
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1425 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1426
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1427 static PyTypeObject IterType;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1428
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1429 typedef PyObject (nextfun)(void **);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1430 typedef void (destructorfun)(void );
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1431 typedef int (traversefun)(void , visitproc, void *);
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1432 typedef int (clearfun)(void *);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1433
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1434 // Main purpose of this object is removing the need for do python
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1435 // initialization (i.e. PyType_Ready and setting type attributes) for a big
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1436 // bunch of objects.
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1437 typedef struct
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1438 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1439 PyObject_HEAD
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1440 void *cur;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1441 nextfun next;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1442 destructorfun destruct;
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1443 traversefun traverse;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1444 clearfun clear;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1445 } IterObject;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1446
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1447 static PyObject *
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1448 IterNew(void *start, destructorfun destruct, nextfun next, traversefun traverse,
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1449 clearfun clear)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1450 {
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1451 IterObject *self;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1452
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	1453 self = PyObject_GC_New(IterObject, &IterType);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1454 self->cur = start;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1455 self->next = next;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1456 self->destruct = destruct;
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1457 self->traverse = traverse;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1458 self->clear = clear;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1459
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1460 return (PyObject *)(self);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1461 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1462
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1463 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1464 IterDestructor(IterObject *self)
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1465 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	1466 PyObject_GC_UnTrack((void *)(self));
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1467 self->destruct(self->cur);
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	1468 PyObject_GC_Del((void *)(self));
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1469 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1470
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1471 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1472 IterTraverse(IterObject self, visitproc visit, void arg)
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1473 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1474 if (self->traverse != NULL)
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1475 return self->traverse(self->cur, visit, arg);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1476 else
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1477 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1478 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1479
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1480 // Mac OSX defines clear() somewhere.
4438 20e30e31bd86 updated for version 7.3.967 Bram Moolenaar <bram@vim.org> parents: 4435 diff changeset	1481 #ifdef clear
20e30e31bd86 updated for version 7.3.967 Bram Moolenaar <bram@vim.org> parents: 4435 diff changeset	1482 # undef clear
20e30e31bd86 updated for version 7.3.967 Bram Moolenaar <bram@vim.org> parents: 4435 diff changeset	1483 #endif
20e30e31bd86 updated for version 7.3.967 Bram Moolenaar <bram@vim.org> parents: 4435 diff changeset	1484
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1485 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1486 IterClear(IterObject *self)
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1487 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1488 if (self->clear != NULL)
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1489 return self->clear(&self->cur);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1490 else
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1491 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1492 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	1493
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1494 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1495 IterNext(IterObject *self)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1496 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1497 return self->next(&self->cur);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1498 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1499
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1500 static PyObject *
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1501 IterIter(PyObject *self)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1502 {
4609 12421d8a45d5 updated for version 7.3.1052 Bram Moolenaar <bram@vim.org> parents: 4607 diff changeset	1503 Py_INCREF(self);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1504 return self;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	1505 }
4393 80eea7a9d6b9 updated for version 7.3.945 Bram Moolenaar <bram@vim.org> parents: 4389 diff changeset	1506
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1507 typedef struct pylinkedlist_S {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1508 struct pylinkedlist_S *pll_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1509 struct pylinkedlist_S *pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1510 PyObject *pll_obj;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1511 } pylinkedlist_T;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1512
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1513 static pylinkedlist_T *lastdict = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1514 static pylinkedlist_T *lastlist = NULL;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	1515 static pylinkedlist_T *lastfunc = NULL;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1516
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1517 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1518 pyll_remove(pylinkedlist_T ref, pylinkedlist_T *last)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1519 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1520 if (ref->pll_prev == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1521 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1522 if (ref->pll_next == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1523 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1524 *last = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1525 return;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1526 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1527 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1528 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1529 ref->pll_prev->pll_next = ref->pll_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1530
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1531 if (ref->pll_next == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1532 *last = ref->pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1533 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1534 ref->pll_next->pll_prev = ref->pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1535 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1536
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1537 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1538 pyll_add(PyObject self, pylinkedlist_T ref, pylinkedlist_T **last)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1539 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1540 if (*last == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1541 ref->pll_prev = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1542 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1543 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1544 (*last)->pll_next = ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1545 ref->pll_prev = *last;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1546 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1547 ref->pll_next = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1548 ref->pll_obj = self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1549 *last = ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1550 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1551
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1552 static PyTypeObject DictionaryType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1553
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1554 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1555 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1556 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1557 dict_T *dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1558 pylinkedlist_T ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1559 } DictionaryObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1560
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1561 static PyObject DictionaryUpdate(DictionaryObject , PyObject , PyObject );
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1562
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1563 #define NEW_DICTIONARY(dict) DictionaryNew(&DictionaryType, dict)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1564
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1565 static PyObject *
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1566 DictionaryNew(PyTypeObject subtype, dict_T dict)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1567 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1568 DictionaryObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1569
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1570 self = (DictionaryObject *) subtype->tp_alloc(subtype, 0);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1571 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1572 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1573 self->dict = dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1574 ++dict->dv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1575
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1576 pyll_add((PyObject *)(self), &self->ref, &lastdict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1577
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1578 return (PyObject *)(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1579 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1580
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1581 static dict_T *
4922 8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	1582 py_dict_alloc(void)
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1583 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1584 dict_T *ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1585
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1586 if (!(ret = dict_alloc()))
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1587 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1588 PyErr_NoMemory();
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1589 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1590 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1591 ++ret->dv_refcount;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1592
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1593 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1594 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1595
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1596 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1597 DictionaryConstructor(PyTypeObject subtype, PyObject args, PyObject *kwargs)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1598 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1599 DictionaryObject *self;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1600 dict_T *dict;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1601
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1602 if (!(dict = py_dict_alloc()))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1603 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1604
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1605 self = (DictionaryObject *) DictionaryNew(subtype, dict);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1606
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1607 --dict->dv_refcount;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1608
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1609 if (kwargs \|\| PyTuple_Size(args))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1610 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1611 PyObject *tmp;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1612 if (!(tmp = DictionaryUpdate(self, args, kwargs)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1613 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1614 Py_DECREF(self);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1615 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1616 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1617
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1618 Py_DECREF(tmp);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1619 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1620
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1621 return (PyObject *)(self);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1622 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1623
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1624 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1625 DictionaryDestructor(DictionaryObject *self)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1626 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1627 pyll_remove(&self->ref, &lastdict);
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1628 dict_unref(self->dict);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1629
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1630 DESTRUCTOR_FINISH(self);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1631 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	1632
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1633 static char *DictionaryAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1634 "locked", "scope",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1635 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1636 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1637
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1638 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1639 DictionaryDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1640 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1641 return ObjectDir(self, DictionaryAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1642 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	1643
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1644 static int
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1645 DictionarySetattr(DictionaryObject self, char name, PyObject *valObject)
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1646 {
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1647 if (valObject == NULL)
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1648 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	1649 PyErr_SET_STRING(PyExc_AttributeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1650 N_("cannot delete vim.Dictionary attributes"));
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1651 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1652 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1653
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1654 if (strcmp(name, "locked") == 0)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1655 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1656 if (self->dict->dv_lock == VAR_FIXED)
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1657 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1658 PyErr_SET_STRING(PyExc_TypeError,
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1659 N_("cannot modify fixed dictionary"));
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1660 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1661 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1662 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1663 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1664 int istrue = PyObject_IsTrue(valObject);
4411 1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	1665 if (istrue == -1)
1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	1666 return -1;
1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	1667 else if (istrue)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1668 self->dict->dv_lock = VAR_LOCKED;
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1669 else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1670 self->dict->dv_lock = 0;
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1671 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1672 return 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1673 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1674 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1675 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1676 PyErr_FORMAT(PyExc_AttributeError, N_("cannot set attribute %s"), name);
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1677 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1678 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1679 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1680
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1681 static PyInt
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1682 DictionaryLength(DictionaryObject *self)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1683 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1684 return ((PyInt) (self->dict->dv_hashtab.ht_used));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1685 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1686
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1687 #define DICT_FLAG_HAS_DEFAULT 0x01
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1688 #define DICT_FLAG_POP 0x02
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1689 #define DICT_FLAG_NONE_DEFAULT 0x04
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	1690 #define DICT_FLAG_RETURN_BOOL 0x08 // Incompatible with DICT_FLAG_POP
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1691 #define DICT_FLAG_RETURN_PAIR 0x10
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1692
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1693 static PyObject *
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1694 _DictionaryItem(DictionaryObject self, PyObject args, int flags)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1695 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1696 PyObject *keyObject;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1697 PyObject *defObject = ((flags & DICT_FLAG_NONE_DEFAULT)? Py_None : NULL);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1698 PyObject *ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1699 char_u *key;
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	1700 dictitem_T *di;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1701 dict_T *dict = self->dict;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1702 hashitem_T *hi;
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1703 PyObject *todecref;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1704
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1705 if (flags & DICT_FLAG_HAS_DEFAULT)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1706 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1707 if (!PyArg_ParseTuple(args, "O\|O", &keyObject, &defObject))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1708 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1709 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1710 else
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1711 keyObject = args;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1712
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1713 if (flags & DICT_FLAG_RETURN_BOOL)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1714 defObject = Py_False;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1715
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1716 if (!(key = StringToChars(keyObject, &todecref)))
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1717 return NULL;
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1718
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1719 if (*key == NUL)
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1720 {
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1721 RAISE_NO_EMPTY_KEYS;
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	1722 Py_XDECREF(todecref);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1723 return NULL;
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1724 }
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	1725
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1726 hi = hash_find(&dict->dv_hashtab, key);
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	1727
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1728 Py_XDECREF(todecref);
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	1729
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1730 if (HASHITEM_EMPTY(hi))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1731 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1732 if (defObject)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1733 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1734 Py_INCREF(defObject);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1735 return defObject;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1736 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1737 else
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1738 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1739 PyErr_SetObject(PyExc_KeyError, keyObject);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1740 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1741 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1742 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1743 else if (flags & DICT_FLAG_RETURN_BOOL)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1744 {
5666 d1c8c1d64034 updated for version 7.4.179 Bram Moolenaar <bram@vim.org> parents: 5659 diff changeset	1745 ret = Py_True;
d1c8c1d64034 updated for version 7.4.179 Bram Moolenaar <bram@vim.org> parents: 5659 diff changeset	1746 Py_INCREF(ret);
d1c8c1d64034 updated for version 7.4.179 Bram Moolenaar <bram@vim.org> parents: 5659 diff changeset	1747 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1748 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1749
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1750 di = dict_lookup(hi);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1751
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1752 if (!(ret = ConvertToPyObject(&di->di_tv)))
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1753 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1754
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1755 if (flags & DICT_FLAG_POP)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1756 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1757 if (dict->dv_lock)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1758 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1759 RAISE_LOCKED_DICTIONARY;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1760 Py_DECREF(ret);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1761 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1762 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1763
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1764 hash_remove(&dict->dv_hashtab, hi);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1765 dictitem_free(di);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1766 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1767
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1768 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1769 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1770
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1771 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1772 DictionaryItem(DictionaryObject self, PyObject keyObject)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1773 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1774 return _DictionaryItem(self, keyObject, 0);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1775 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1776
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1777 static int
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1778 DictionaryContains(DictionaryObject self, PyObject keyObject)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1779 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1780 PyObject *rObj = _DictionaryItem(self, keyObject, DICT_FLAG_RETURN_BOOL);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1781 int ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1782
5426 9cedb4dfd4c8 updated for version 7.4.063 Bram Moolenaar <bram@vim.org> parents: 5235 diff changeset	1783 if (rObj == NULL)
9cedb4dfd4c8 updated for version 7.4.063 Bram Moolenaar <bram@vim.org> parents: 5235 diff changeset	1784 return -1;
9cedb4dfd4c8 updated for version 7.4.063 Bram Moolenaar <bram@vim.org> parents: 5235 diff changeset	1785
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1786 ret = (rObj == Py_True);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1787
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	1788 Py_DECREF(rObj);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1789
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1790 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1791 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1792
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1793 typedef struct
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1794 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1795 hashitem_T *ht_array;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1796 long_u ht_used;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1797 hashtab_T *ht;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1798 hashitem_T *hi;
4667 9e7ef781d494 updated for version 7.3.1081 Bram Moolenaar <bram@vim.org> parents: 4659 diff changeset	1799 long_u todo;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1800 } dictiterinfo_T;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1801
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1802 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1803 DictionaryIterNext(dictiterinfo_T **dii)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1804 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1805 PyObject *ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1806
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1807 if (!(*dii)->todo)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1808 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1809
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1810 if ((dii)->ht->ht_array != (dii)->ht_array \|\|
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1811 (dii)->ht->ht_used != (dii)->ht_used)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1812 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	1813 PyErr_SET_STRING(PyExc_RuntimeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	1814 N_("hashtab changed during iteration"));
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	1815 return NULL;
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	1816 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1817
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1818 while (((dii)->todo) && HASHITEM_EMPTY((dii)->hi))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1819 ++((*dii)->hi);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1820
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1821 --((*dii)->todo);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1822
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	1823 if (!(ret = PyBytes_FromString((char )(dii)->hi->hi_key)))
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1824 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1825
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1826 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1827 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1828
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1829 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1830 DictionaryIter(DictionaryObject *self)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1831 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1832 dictiterinfo_T *dii;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1833 hashtab_T *ht;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1834
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1835 if (!(dii = PyMem_New(dictiterinfo_T, 1)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1836 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1837 PyErr_NoMemory();
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1838 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1839 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1840
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1841 ht = &self->dict->dv_hashtab;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1842 dii->ht_array = ht->ht_array;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1843 dii->ht_used = ht->ht_used;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1844 dii->ht = ht;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1845 dii->hi = dii->ht_array;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1846 dii->todo = dii->ht_used;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1847
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1848 return IterNew(dii,
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1849 (destructorfun) PyMem_Free, (nextfun) DictionaryIterNext,
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1850 NULL, NULL);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1851 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1852
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1853 static PyInt
4922 8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	1854 DictionaryAssItem(
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	1855 DictionaryObject self, PyObject keyObject, PyObject *valObject)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1856 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1857 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1858 typval_T tv;
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	1859 dict_T *dict = self->dict;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1860 dictitem_T *di;
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1861 PyObject *todecref;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1862
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	1863 if (dict->dv_lock)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1864 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1865 RAISE_LOCKED_DICTIONARY;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1866 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1867 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1868
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1869 if (!(key = StringToChars(keyObject, &todecref)))
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1870 return -1;
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	1871
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1872 if (*key == NUL)
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1873 {
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1874 RAISE_NO_EMPTY_KEYS;
4706 bf917ee1fad2 updated for version 7.3.1100 Bram Moolenaar <bram@vim.org> parents: 4704 diff changeset	1875 Py_XDECREF(todecref);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1876 return -1;
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1877 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1878
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	1879 di = dict_find(dict, key, -1);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1880
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1881 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1882 {
3636 0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	1883 hashitem_T *hi;
0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	1884
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1885 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1886 {
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1887 Py_XDECREF(todecref);
4403 d4816e7c3328 updated for version 7.3.950 Bram Moolenaar <bram@vim.org> parents: 4401 diff changeset	1888 PyErr_SetObject(PyExc_KeyError, keyObject);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1889 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1890 }
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	1891 hi = hash_find(&dict->dv_hashtab, di->di_key);
19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	1892 hash_remove(&dict->dv_hashtab, hi);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1893 dictitem_free(di);
4706 bf917ee1fad2 updated for version 7.3.1100 Bram Moolenaar <bram@vim.org> parents: 4704 diff changeset	1894 Py_XDECREF(todecref);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1895 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1896 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1897
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1898 if (ConvertFromPyObject(valObject, &tv) == -1)
4706 bf917ee1fad2 updated for version 7.3.1100 Bram Moolenaar <bram@vim.org> parents: 4704 diff changeset	1899 {
bf917ee1fad2 updated for version 7.3.1100 Bram Moolenaar <bram@vim.org> parents: 4704 diff changeset	1900 Py_XDECREF(todecref);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1901 return -1;
4706 bf917ee1fad2 updated for version 7.3.1100 Bram Moolenaar <bram@vim.org> parents: 4704 diff changeset	1902 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1903
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1904 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1905 {
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1906 if (!(di = dictitem_alloc(key)))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1907 {
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1908 Py_XDECREF(todecref);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1909 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1910 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1911 }
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1912 di->di_tv.v_type = VAR_UNKNOWN;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1913
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	1914 if (dict_add(dict, di) == FAIL)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1915 {
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1916 dictitem_free(di);
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1917 RAISE_KEY_ADD_FAIL(key);
f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	1918 Py_XDECREF(todecref);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1919 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1920 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1921 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1922 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1923 clear_tv(&di->di_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1924
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	1925 Py_XDECREF(todecref);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1926
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1927 copy_tv(&tv, &di->di_tv);
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	1928 clear_tv(&tv);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1929 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1930 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1931
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1932 typedef PyObject (hi_to_py)(hashitem_T *);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1933
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1934 static PyObject *
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1935 DictionaryListObjects(DictionaryObject *self, hi_to_py hiconvert)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1936 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	1937 dict_T *dict = self->dict;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1938 long_u todo = dict->dv_hashtab.ht_used;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1939 Py_ssize_t i = 0;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1940 PyObject *ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1941 hashitem_T *hi;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1942 PyObject *newObj;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1943
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1944 ret = PyList_New(todo);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1945 for (hi = dict->dv_hashtab.ht_array; todo > 0; ++hi)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1946 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1947 if (!HASHITEM_EMPTY(hi))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1948 {
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1949 if (!(newObj = hiconvert(hi)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1950 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1951 Py_DECREF(ret);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1952 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1953 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1954 PyList_SET_ITEM(ret, i, newObj);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1955 --todo;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1956 ++i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1957 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1958 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1959 return ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1960 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1961
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1962 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1963 dict_key(hashitem_T *hi)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1964 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1965 return PyBytes_FromString((char *)(hi->hi_key));
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1966 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1967
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1968 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1969 DictionaryListKeys(DictionaryObject *self)
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 return DictionaryListObjects(self, dict_key);
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
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1974 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1975 dict_val(hashitem_T *hi)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1976 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1977 dictitem_T *di;
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 di = dict_lookup(hi);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1980 return ConvertToPyObject(&di->di_tv);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1981 }
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 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1984 DictionaryListValues(DictionaryObject *self)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1985 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1986 return DictionaryListObjects(self, dict_val);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1987 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1988
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1989 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1990 dict_item(hashitem_T *hi)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1991 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1992 PyObject *keyObject;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1993 PyObject *valObject;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	1994 PyObject *ret;
4627 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 if (!(keyObject = dict_key(hi)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1997 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1998
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	1999 if (!(valObject = dict_val(hi)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2000 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2001 Py_DECREF(keyObject);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2002 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2003 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2004
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2005 ret = Py_BuildValue("(OO)", keyObject, valObject);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2006
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2007 Py_DECREF(keyObject);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2008 Py_DECREF(valObject);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2009
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2010 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2011 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2012
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2013 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2014 DictionaryListItems(DictionaryObject *self)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2015 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2016 return DictionaryListObjects(self, dict_item);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2017 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2018
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2019 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2020 DictionaryUpdate(DictionaryObject self, PyObject args, PyObject *kwargs)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2021 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2022 dict_T *dict = self->dict;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2023
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2024 if (dict->dv_lock)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2025 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	2026 RAISE_LOCKED_DICTIONARY;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2027 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2028 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2029
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2030 if (kwargs)
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 typval_T tv;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2033
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2034 if (ConvertFromPyMapping(kwargs, &tv) == -1)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2035 return NULL;
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 VimTryStart();
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2038 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	2039 clear_tv(&tv);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2040 if (VimTryEnd())
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2041 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2042 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2043 else
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2044 {
5659 ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2045 PyObject *obj = NULL;
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2046
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2047 if (!PyArg_ParseTuple(args, "\|O", &obj))
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2048 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2049
5659 ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2050 if (obj == NULL)
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2051 {
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2052 Py_INCREF(Py_None);
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2053 return Py_None;
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2054 }
ae228baaec2c updated for version 7.4.176 Bram Moolenaar <bram@vim.org> parents: 5655 diff changeset	2055
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2056 if (PyObject_HasAttrString(obj, "keys"))
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2057 return DictionaryUpdate(self, NULL, obj);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2058 else
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2059 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2060 PyObject *iterator;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2061 PyObject *item;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2062
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2063 if (!(iterator = PyObject_GetIter(obj)))
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2064 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2065
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2066 while ((item = PyIter_Next(iterator)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2067 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2068 PyObject *fast;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2069 PyObject *keyObject;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2070 PyObject *valObject;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2071 PyObject *todecref;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2072 char_u *key;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2073 dictitem_T *di;
12812 381e67ccf02c patch 8.0.1283: test 86 fails under ASAN Christian Brabandt <cb@256bit.org> parents: 12806 diff changeset	2074 hashitem_T *hi;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2075
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2076 if (!(fast = PySequence_Fast(item, "")))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2077 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2078 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2079 Py_DECREF(item);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2080 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2081 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2082
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2083 Py_DECREF(item);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2084
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2085 if (PySequence_Fast_GET_SIZE(fast) != 2)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2086 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2087 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2088 Py_DECREF(fast);
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	2089 PyErr_FORMAT(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2090 N_("expected sequence element of size 2, "
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2091 "but got sequence of size %d"),
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	2092 (int) PySequence_Fast_GET_SIZE(fast));
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2093 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2094 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2095
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2096 keyObject = PySequence_Fast_GET_ITEM(fast, 0);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2097
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2098 if (!(key = StringToChars(keyObject, &todecref)))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2099 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2100 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2101 Py_DECREF(fast);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2102 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2103 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2104
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2105 di = dictitem_alloc(key);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2106
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2107 Py_XDECREF(todecref);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2108
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2109 if (di == NULL)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2110 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2111 Py_DECREF(fast);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2112 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2113 PyErr_NoMemory();
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2114 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2115 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2116 di->di_tv.v_type = VAR_UNKNOWN;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2117
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2118 valObject = PySequence_Fast_GET_ITEM(fast, 1);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2119
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2120 if (ConvertFromPyObject(valObject, &di->di_tv) == -1)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2121 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2122 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2123 Py_DECREF(fast);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2124 dictitem_free(di);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2125 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2126 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2127
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2128 Py_DECREF(fast);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2129
12812 381e67ccf02c patch 8.0.1283: test 86 fails under ASAN Christian Brabandt <cb@256bit.org> parents: 12806 diff changeset	2130 hi = hash_find(&dict->dv_hashtab, di->di_key);
381e67ccf02c patch 8.0.1283: test 86 fails under ASAN Christian Brabandt <cb@256bit.org> parents: 12806 diff changeset	2131 if (!HASHITEM_EMPTY(hi) \|\| dict_add(dict, di) == FAIL)
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2132 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	2133 RAISE_KEY_ADD_FAIL(di->di_key);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2134 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2135 dictitem_free(di);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2136 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2137 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2138 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2139
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2140 Py_DECREF(iterator);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2141
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2142 // Iterator may have finished due to an exception
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2143 if (PyErr_Occurred())
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2144 return NULL;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2145 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2146 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2147 Py_INCREF(Py_None);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2148 return Py_None;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2149 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2150
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2151 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2152 DictionaryGet(DictionaryObject self, PyObject args)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2153 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2154 return _DictionaryItem(self, args,
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2155 DICT_FLAG_HAS_DEFAULT\|DICT_FLAG_NONE_DEFAULT);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2156 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2157
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2158 static PyObject *
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2159 DictionaryPop(DictionaryObject self, PyObject args)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2160 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2161 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	2162 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2163
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2164 static PyObject *
4698 2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2165 DictionaryPopItem(DictionaryObject *self)
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2166 {
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2167 hashitem_T *hi;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2168 PyObject *ret;
4698 2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2169 PyObject *valObject;
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2170 dictitem_T *di;
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2171
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2172 if (self->dict->dv_hashtab.ht_used == 0)
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2173 {
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2174 PyErr_SetNone(PyExc_KeyError);
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2175 return NULL;
4698 2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2176 }
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2177
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2178 hi = self->dict->dv_hashtab.ht_array;
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2179 while (HASHITEM_EMPTY(hi))
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2180 ++hi;
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2181
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2182 di = dict_lookup(hi);
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2183
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2184 if (!(valObject = ConvertToPyObject(&di->di_tv)))
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2185 return NULL;
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2186
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2187 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	2188 {
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2189 Py_DECREF(valObject);
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2190 return NULL;
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2191 }
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2192
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2193 hash_remove(&self->dict->dv_hashtab, hi);
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2194 dictitem_free(di);
2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2195
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2196 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2197 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2198
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2199 static PyObject *
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	2200 DictionaryHasKey(DictionaryObject self, PyObject keyObject)
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	2201 {
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2202 return _DictionaryItem(self, keyObject, DICT_FLAG_RETURN_BOOL);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2203 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2204
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2205 static PySequenceMethods DictionaryAsSeq = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2206 0, // sq_length
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2207 0, // sq_concat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2208 0, // sq_repeat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2209 0, // sq_item
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2210 0, // sq_slice
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2211 0, // sq_ass_item
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2212 0, // sq_ass_slice
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2213 (objobjproc) DictionaryContains, // sq_contains
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2214 0, // sq_inplace_concat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2215 0, // sq_inplace_repeat
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2216 };
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2217
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	2218 static PyMappingMethods DictionaryAsMapping = {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	2219 (lenfunc) DictionaryLength,
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	2220 (binaryfunc) DictionaryItem,
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	2221 (objobjargproc) DictionaryAssItem,
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	2222 };
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	2223
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2224 static struct PyMethodDef DictionaryMethods[] = {
4492 f74611bfb1b7 updated for version 7.3.994 Bram Moolenaar <bram@vim.org> parents: 4490 diff changeset	2225 {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2226 {"values", (PyCFunction)DictionaryListValues, METH_NOARGS, ""},
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2227 {"items", (PyCFunction)DictionaryListItems, METH_NOARGS, ""},
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2228 {"update", (PyCFunction)DictionaryUpdate, METH_VARARGS\|METH_KEYWORDS, ""},
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2229 {"get", (PyCFunction)DictionaryGet, METH_VARARGS, ""},
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	2230 {"pop", (PyCFunction)DictionaryPop, METH_VARARGS, ""},
4698 2db005052371 updated for version 7.3.1096 Bram Moolenaar <bram@vim.org> parents: 4667 diff changeset	2231 {"popitem", (PyCFunction)DictionaryPopItem, METH_NOARGS, ""},
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	2232 {"has_key", (PyCFunction)DictionaryHasKey, METH_O, ""},
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2233 {"__dir__", (PyCFunction)DictionaryDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2234 { NULL, NULL, 0, NULL}
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2235 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2236
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2237 static PyTypeObject ListType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2238
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2239 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2240 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2241 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2242 list_T *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2243 pylinkedlist_T ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2244 } ListObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2245
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2246 #define NEW_LIST(list) ListNew(&ListType, list)
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2247
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2248 static PyObject *
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2249 ListNew(PyTypeObject subtype, list_T list)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2250 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2251 ListObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2252
21190 10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2253 if (list == NULL)
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2254 return NULL;
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2255
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2256 self = (ListObject *) subtype->tp_alloc(subtype, 0);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2257 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2258 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2259 self->list = list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2260 ++list->lv_refcount;
20392 4c317d8c1051 patch 8.2.0751: Vim9: performance can be improved Bram Moolenaar <Bram@vim.org> parents: 20369 diff changeset	2261 CHECK_LIST_MATERIALIZE(list);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2262
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2263 pyll_add((PyObject *)(self), &self->ref, &lastlist);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2264
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2265 return (PyObject *)(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2266 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2267
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2268 static list_T *
5166 467efeee8f9e updated for version 7.4a.009 Bram Moolenaar <bram@vim.org> parents: 5139 diff changeset	2269 py_list_alloc(void)
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2270 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2271 list_T *ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2272
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2273 if (!(ret = list_alloc()))
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2274 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2275 PyErr_NoMemory();
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2276 return NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2277 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2278 ++ret->lv_refcount;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2279
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2280 return ret;
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2281 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2282
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2283 static int
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2284 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	2285 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2286 PyObject *iterator;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2287 PyObject *item;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2288 listitem_T *li;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2289
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2290 if (!(iterator = PyObject_GetIter(obj)))
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2291 return -1;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2292
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2293 while ((item = PyIter_Next(iterator)))
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2294 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2295 if (!(li = listitem_alloc()))
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2296 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2297 PyErr_NoMemory();
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2298 Py_DECREF(item);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2299 Py_DECREF(iterator);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2300 return -1;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2301 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2302 li->li_tv.v_lock = 0;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2303 li->li_tv.v_type = VAR_UNKNOWN;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2304
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2305 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	2306 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2307 Py_DECREF(item);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2308 Py_DECREF(iterator);
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: 19102 diff changeset	2309 listitem_free(l, li);
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2310 return -1;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2311 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2312
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2313 Py_DECREF(item);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2314
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2315 list_append(l, li);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2316 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2317
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2318 Py_DECREF(iterator);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2319
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2320 // Iterator may have finished due to an exception
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2321 if (PyErr_Occurred())
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2322 return -1;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2323
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2324 return 0;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2325 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2326
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2327 static PyObject *
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2328 ListConstructor(PyTypeObject subtype, PyObject args, PyObject *kwargs)
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2329 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2330 list_T *list;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2331 PyObject *obj = NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2332
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2333 if (kwargs)
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2334 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	2335 PyErr_SET_STRING(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2336 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	2337 return NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2338 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2339
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2340 if (!PyArg_ParseTuple(args, "\|O", &obj))
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2341 return NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2342
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2343 if (!(list = py_list_alloc()))
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2344 return NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2345
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2346 if (obj)
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2347 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2348 PyObject *lookup_dict;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2349
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2350 if (!(lookup_dict = PyDict_New()))
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2351 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2352 list_unref(list);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2353 return NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2354 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2355
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2356 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	2357 {
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2358 Py_DECREF(lookup_dict);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2359 list_unref(list);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2360 return NULL;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2361 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2362
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2363 Py_DECREF(lookup_dict);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2364 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2365
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2366 return ListNew(subtype, list);
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2367 }
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	2368
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	2369 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2370 ListDestructor(ListObject *self)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	2371 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2372 pyll_remove(&self->ref, &lastlist);
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2373 list_unref(self->list);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	2374
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	2375 DESTRUCTOR_FINISH(self);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	2376 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	2377
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2378 static PyInt
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2379 ListLength(ListObject *self)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2380 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2381 return ((PyInt) (self->list->lv_len));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2382 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2383
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2384 static PyObject *
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2385 ListIndex(ListObject *self, Py_ssize_t index)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2386 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2387 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2388
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2389 if (index >= ListLength(self))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2390 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2391 PyErr_SET_STRING(PyExc_IndexError, N_("list index out of range"));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2392 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2393 }
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2394 li = list_find(self->list, (long) index);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2395 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2396 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2397 // No more suitable format specifications in python-2.3
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	2398 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	2399 (int) index);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2400 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2401 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2402 return ConvertToPyObject(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2403 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2404
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2405 static PyObject *
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2406 ListSlice(ListObject *self, Py_ssize_t first, Py_ssize_t step,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2407 Py_ssize_t slicelen)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2408 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2409 PyInt i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2410 PyObject *list;
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2411
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2412 if (step == 0)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2413 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2414 PyErr_SET_STRING(PyExc_ValueError, N_("slice step cannot be zero"));
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2415 return NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2416 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2417
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2418 list = PyList_New(slicelen);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2419 if (list == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2420 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2421
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2422 for (i = 0; i < slicelen; ++i)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2423 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2424 PyObject *item;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2425
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2426 item = ListIndex(self, first + i*step);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2427 if (item == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2428 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2429 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2430 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2431 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2432
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2433 PyList_SET_ITEM(list, i, item);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2434 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2435
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2436 return list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2437 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2438
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2439 static PyObject *
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2440 ListItem(ListObject self, PyObject idx)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2441 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2442 #if PY_MAJOR_VERSION < 3
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2443 if (PyInt_Check(idx))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2444 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2445 long _idx = PyInt_AsLong(idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2446 return ListIndex(self, _idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2447 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2448 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2449 #endif
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2450 if (PyLong_Check(idx))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2451 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2452 long _idx = PyLong_AsLong(idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2453 return ListIndex(self, _idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2454 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2455 else if (PySlice_Check(idx))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2456 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2457 Py_ssize_t start, stop, step, slicelen;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2458
5768 3ee5808a293c updated for version 7.4.228 Bram Moolenaar <bram@vim.org> parents: 5695 diff changeset	2459 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, ListLength(self),
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2460 &start, &stop, &step, &slicelen) < 0)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2461 return NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2462 return ListSlice(self, start, step, slicelen);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2463 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2464 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2465 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2466 RAISE_INVALID_INDEX_TYPE(idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2467 return NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2468 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2469 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2470
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2471 static void
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2472 list_restore(Py_ssize_t numadded, Py_ssize_t numreplaced, Py_ssize_t slicelen,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2473 list_T l, listitem_T lis, listitem_T lastaddedli)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2474 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2475 while (numreplaced--)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2476 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2477 list_insert(l, lis[numreplaced], lis[slicelen + numreplaced]);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2478 listitem_remove(l, lis[slicelen + numreplaced]);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2479 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2480 while (numadded--)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2481 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2482 listitem_T *next;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2483
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2484 next = lastaddedli->li_prev;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2485 listitem_remove(l, lastaddedli);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2486 lastaddedli = next;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2487 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2488 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2489
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2490 static int
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2491 ListAssSlice(ListObject *self, Py_ssize_t first,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2492 Py_ssize_t step, Py_ssize_t slicelen, PyObject *obj)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2493 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2494 PyObject *iterator;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2495 PyObject *item;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2496 listitem_T *li;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2497 listitem_T *lastaddedli = NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2498 listitem_T *next;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2499 typval_T v;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2500 list_T *l = self->list;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2501 PyInt i;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2502 PyInt j;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2503 PyInt numreplaced = 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2504 PyInt numadded = 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2505 PyInt size;
5655 f2c8d86c460d updated for version 7.4.174 Bram Moolenaar <bram@vim.org> parents: 5629 diff changeset	2506 listitem_T **lis = NULL;
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2507
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2508 size = ListLength(self);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2509
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2510 if (l->lv_lock)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2511 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2512 RAISE_LOCKED_LIST;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2513 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2514 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2515
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2516 if (step == 0)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2517 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2518 PyErr_SET_STRING(PyExc_ValueError, N_("slice step cannot be zero"));
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2519 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2520 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2521
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2522 if (step != 1 && slicelen == 0)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2523 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2524 // Nothing to do. Only error out if obj has some items.
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2525 int ret = 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2526
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2527 if (obj == NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2528 return 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2529
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2530 if (!(iterator = PyObject_GetIter(obj)))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2531 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2532
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2533 if ((item = PyIter_Next(iterator)))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2534 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2535 PyErr_FORMAT(PyExc_ValueError,
5695 a8650e2a0b5a updated for version 7.4.193 Bram Moolenaar <bram@vim.org> parents: 5668 diff changeset	2536 N_("attempt to assign sequence of size greater than %d "
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2537 "to extended slice"), 0);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2538 Py_DECREF(item);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2539 ret = -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2540 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2541 Py_DECREF(iterator);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2542 return ret;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2543 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2544
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2545 if (obj != NULL)
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2546 // XXX May allocate zero bytes.
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2547 if (!(lis = PyMem_New(listitem_T , slicelen 2)))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2548 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2549 PyErr_NoMemory();
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2550 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2551 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2552
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2553 if (first == size)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2554 li = NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2555 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2556 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2557 li = list_find(l, (long) first);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2558 if (li == NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2559 {
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	2560 PyErr_VIM_FORMAT(N_("internal error: no Vim list item %d"),
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2561 (int)first);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2562 if (obj != NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2563 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2564 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2565 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2566 i = slicelen;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2567 while (i-- && li != NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2568 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2569 j = step;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2570 next = li;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2571 if (step > 0)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2572 while (next != NULL && ((next = next->li_next) != NULL) && --j);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2573 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2574 while (next != NULL && ((next = next->li_prev) != NULL) && ++j);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2575
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2576 if (obj == NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2577 listitem_remove(l, li);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2578 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2579 lis[slicelen - i - 1] = li;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2580
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2581 li = next;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2582 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2583 if (li == NULL && i != -1)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2584 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2585 PyErr_SET_VIM(N_("internal error: not enough list items"));
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2586 if (obj != NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2587 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2588 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2589 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2590 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2591
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2592 if (obj == NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2593 return 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2594
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2595 if (!(iterator = PyObject_GetIter(obj)))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2596 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2597 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2598 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2599 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2600
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2601 i = 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2602 while ((item = PyIter_Next(iterator)))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2603 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2604 if (ConvertFromPyObject(item, &v) == -1)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2605 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2606 Py_DECREF(iterator);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2607 Py_DECREF(item);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2608 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2609 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2610 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2611 Py_DECREF(item);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2612 if (list_insert_tv(l, &v, numreplaced < slicelen
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2613 ? lis[numreplaced]
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2614 : li) == FAIL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2615 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2616 clear_tv(&v);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2617 PyErr_SET_VIM(N_("internal error: failed to add item to list"));
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2618 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2619 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2620 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2621 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2622 if (numreplaced < slicelen)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2623 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2624 lis[slicelen + numreplaced] = lis[numreplaced]->li_prev;
5871 b4ce0e1fb5a6 updated for version 7.4.278 Bram Moolenaar <bram@vim.org> parents: 5768 diff changeset	2625 vimlist_remove(l, lis[numreplaced], lis[numreplaced]);
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2626 numreplaced++;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2627 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2628 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2629 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2630 if (li)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2631 lastaddedli = li->li_prev;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2632 else
19229 d776967d0f0d patch 8.2.0173: build fails with old compiler Bram Moolenaar <Bram@vim.org> parents: 19193 diff changeset	2633 lastaddedli = l->lv_u.mat.lv_last;
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2634 numadded++;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2635 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2636 clear_tv(&v);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2637 if (step != 1 && i >= slicelen)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2638 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2639 Py_DECREF(iterator);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2640 PyErr_FORMAT(PyExc_ValueError,
5695 a8650e2a0b5a updated for version 7.4.193 Bram Moolenaar <bram@vim.org> parents: 5668 diff changeset	2641 N_("attempt to assign sequence of size greater than %d "
5668 b1b8b097539a updated for version 7.4.180 Bram Moolenaar <bram@vim.org> parents: 5666 diff changeset	2642 "to extended slice"), (int) slicelen);
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2643 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2644 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2645 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2646 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2647 ++i;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2648 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2649 Py_DECREF(iterator);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2650
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2651 if (step != 1 && i != slicelen)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2652 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2653 PyErr_FORMAT2(PyExc_ValueError,
5668 b1b8b097539a updated for version 7.4.180 Bram Moolenaar <bram@vim.org> parents: 5666 diff changeset	2654 N_("attempt to assign sequence of size %d to extended slice "
b1b8b097539a updated for version 7.4.180 Bram Moolenaar <bram@vim.org> parents: 5666 diff changeset	2655 "of size %d"), (int) i, (int) slicelen);
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2656 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2657 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2658 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2659 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2660
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2661 if (PyErr_Occurred())
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2662 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2663 list_restore(numadded, numreplaced, slicelen, l, lis, lastaddedli);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2664 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2665 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2666 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2667
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2668 for (i = 0; i < numreplaced; i++)
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: 19102 diff changeset	2669 listitem_free(l, lis[i]);
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2670 if (step == 1)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2671 for (i = numreplaced; i < slicelen; i++)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2672 listitem_remove(l, lis[i]);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2673
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2674 PyMem_Free(lis);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2675
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2676 return 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2677 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2678
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2679 static int
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2680 ListAssIndex(ListObject self, Py_ssize_t index, PyObject obj)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2681 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2682 typval_T tv;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2683 list_T *l = self->list;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2684 listitem_T *li;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2685 Py_ssize_t length = ListLength(self);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2686
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2687 if (l->lv_lock)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2688 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2689 RAISE_LOCKED_LIST;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2690 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2691 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2692 if (index > length \|\| (index == length && obj == NULL))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2693 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2694 PyErr_SET_STRING(PyExc_IndexError, N_("list index out of range"));
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2695 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2696 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2697
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2698 if (obj == NULL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2699 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2700 li = list_find(l, (long) index);
21190 10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2701 if (li == NULL)
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2702 {
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2703 PyErr_VIM_FORMAT(N_("internal error: failed to get Vim "
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2704 "list item %d"), (int) index);
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2705 return -1;
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2706 }
5871 b4ce0e1fb5a6 updated for version 7.4.278 Bram Moolenaar <bram@vim.org> parents: 5768 diff changeset	2707 vimlist_remove(l, li, li);
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2708 clear_tv(&li->li_tv);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2709 vim_free(li);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2710 return 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2711 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2712
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2713 if (ConvertFromPyObject(obj, &tv) == -1)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2714 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2715
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2716 if (index == length)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2717 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2718 if (list_append_tv(l, &tv) == FAIL)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2719 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2720 clear_tv(&tv);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2721 PyErr_SET_VIM(N_("failed to add item to list"));
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2722 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2723 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2724 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2725 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2726 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2727 li = list_find(l, (long) index);
21190 10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2728 if (li == NULL)
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2729 {
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2730 PyErr_VIM_FORMAT(N_("internal error: failed to get Vim "
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2731 "list item %d"), (int) index);
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2732 return -1;
10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	2733 }
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2734 clear_tv(&li->li_tv);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2735 copy_tv(&tv, &li->li_tv);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2736 clear_tv(&tv);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2737 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2738 return 0;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2739 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2740
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2741 static Py_ssize_t
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2742 ListAssItem(ListObject self, PyObject idx, PyObject *obj)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2743 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2744 #if PY_MAJOR_VERSION < 3
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2745 if (PyInt_Check(idx))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2746 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2747 long _idx = PyInt_AsLong(idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2748 return ListAssIndex(self, _idx, obj);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2749 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2750 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2751 #endif
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2752 if (PyLong_Check(idx))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2753 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2754 long _idx = PyLong_AsLong(idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2755 return ListAssIndex(self, _idx, obj);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2756 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2757 else if (PySlice_Check(idx))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2758 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2759 Py_ssize_t start, stop, step, slicelen;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2760
5768 3ee5808a293c updated for version 7.4.228 Bram Moolenaar <bram@vim.org> parents: 5695 diff changeset	2761 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, ListLength(self),
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2762 &start, &stop, &step, &slicelen) < 0)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2763 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2764 return ListAssSlice(self, start, step, slicelen,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2765 obj);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2766 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2767 else
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2768 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2769 RAISE_INVALID_INDEX_TYPE(idx);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2770 return -1;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2771 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2772 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2773
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2774 static PyObject *
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2775 ListConcatInPlace(ListObject self, PyObject obj)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2776 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2777 list_T *l = self->list;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2778 PyObject *lookup_dict;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2779
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2780 if (l->lv_lock)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2781 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2782 RAISE_LOCKED_LIST;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2783 return NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2784 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2785
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2786 if (!(lookup_dict = PyDict_New()))
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2787 return NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2788
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2789 if (list_py_concat(l, obj, lookup_dict) == -1)
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2790 {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2791 Py_DECREF(lookup_dict);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2792 return NULL;
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2793 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2794 Py_DECREF(lookup_dict);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2795
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2796 Py_INCREF(self);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2797 return (PyObject *)(self);
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2798 }
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2799
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2800 typedef struct
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2801 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2802 listwatch_T lw;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2803 list_T *list;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2804 } listiterinfo_T;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2805
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2806 static void
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2807 ListIterDestruct(listiterinfo_T *lii)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2808 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2809 list_rem_watch(lii->list, &lii->lw);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2810 PyMem_Free(lii);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2811 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2812
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2813 static PyObject *
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2814 ListIterNext(listiterinfo_T **lii)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2815 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2816 PyObject *ret;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2817
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2818 if (!((*lii)->lw.lw_item))
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2819 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2820
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2821 if (!(ret = ConvertToPyObject(&((*lii)->lw.lw_item->li_tv))))
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2822 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2823
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2824 (lii)->lw.lw_item = (lii)->lw.lw_item->li_next;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2825
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2826 return ret;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2827 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2828
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2829 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2830 ListIter(ListObject *self)
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2831 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2832 listiterinfo_T *lii;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2833 list_T *l = self->list;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2834
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2835 if (!(lii = PyMem_New(listiterinfo_T, 1)))
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2836 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2837 PyErr_NoMemory();
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2838 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2839 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2840
20392 4c317d8c1051 patch 8.2.0751: Vim9: performance can be improved Bram Moolenaar <Bram@vim.org> parents: 20369 diff changeset	2841 CHECK_LIST_MATERIALIZE(l);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2842 list_add_watch(l, &lii->lw);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2843 lii->lw.lw_item = l->lv_first;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2844 lii->list = l;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2845
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2846 return IterNew(lii,
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	2847 (destructorfun) ListIterDestruct, (nextfun) ListIterNext,
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	2848 NULL, NULL);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2849 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	2850
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2851 static char *ListAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2852 "locked",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2853 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2854 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2855
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2856 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2857 ListDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2858 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2859 return ObjectDir(self, ListAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2860 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2861
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2862 static int
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2863 ListSetattr(ListObject self, char name, PyObject *valObject)
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2864 {
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2865 if (valObject == NULL)
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2866 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	2867 PyErr_SET_STRING(PyExc_AttributeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2868 N_("cannot delete vim.List attributes"));
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2869 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2870 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2871
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2872 if (strcmp(name, "locked") == 0)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2873 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2874 if (self->list->lv_lock == VAR_FIXED)
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2875 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2876 PyErr_SET_STRING(PyExc_TypeError, N_("cannot modify fixed list"));
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2877 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2878 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2879 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2880 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	2881 int istrue = PyObject_IsTrue(valObject);
4411 1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	2882 if (istrue == -1)
1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	2883 return -1;
1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	2884 else if (istrue)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2885 self->list->lv_lock = VAR_LOCKED;
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2886 else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	2887 self->list->lv_lock = 0;
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2888 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2889 return 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2890 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2891 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2892 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2893 PyErr_FORMAT(PyExc_AttributeError, N_("cannot set attribute %s"), name);
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2894 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2895 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2896 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	2897
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2898 static PySequenceMethods ListAsSeq = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2899 (lenfunc) ListLength, // sq_length, len(x)
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2900 (binaryfunc) 0, // RangeConcat, sq_concat, x+y
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2901 0, // RangeRepeat, sq_repeat, x*n
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2902 (PyIntArgFunc) ListIndex, // sq_item, x[i]
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2903 0, // was_sq_slice, x[i:j]
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2904 (PyIntObjArgProc) ListAssIndex, // sq_as_item, x[i]=v
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2905 0, // was_sq_ass_slice, x[i:j]=v
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2906 0, // sq_contains
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2907 (binaryfunc) ListConcatInPlace,// sq_inplace_concat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	2908 0, // sq_inplace_repeat
5608 ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2909 };
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2910
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2911 static PyMappingMethods ListAsMapping = {
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2912 /* mp_length */ (lenfunc) ListLength,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2913 /* mp_subscript */ (binaryfunc) ListItem,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2914 /* mp_ass_subscript */ (objobjargproc) ListAssItem,
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2915 };
ec02e1474bc2 updated for version 7.4.151 Bram Moolenaar <bram@vim.org> parents: 5588 diff changeset	2916
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2917 static struct PyMethodDef ListMethods[] = {
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2918 {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2919 {"__dir__", (PyCFunction)ListDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	2920 { NULL, NULL, 0, NULL}
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2921 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2922
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2923 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2924 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2925 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2926 char_u *name;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2927 int argc;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2928 typval_T *argv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2929 dict_T *self;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2930 pylinkedlist_T ref;
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	2931 int auto_rebind;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2932 } FunctionObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2933
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2934 static PyTypeObject FunctionType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2935
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	2936 #define NEW_FUNCTION(name, argc, argv, self, pt_auto) \
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	2937 FunctionNew(&FunctionType, (name), (argc), (argv), (self), (pt_auto))
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2938
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2939 static PyObject *
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2940 FunctionNew(PyTypeObject subtype, char_u name, int argc, typval_T *argv,
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	2941 dict_T *selfdict, int auto_rebind)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2942 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2943 FunctionObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2944
15234 ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2945 self = (FunctionObject *)subtype->tp_alloc(subtype, 0);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2946 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2947 return NULL;
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2948
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2949 if (isdigit(*name))
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2950 {
20197 7e84afe0831e patch 8.2.0654: building with Python fails Bram Moolenaar <Bram@vim.org> parents: 20007 diff changeset	2951 if (!translated_function_exists(name, FALSE))
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2952 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	2953 PyErr_FORMAT(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2954 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	2955 return NULL;
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2956 }
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2957 self->name = vim_strsave(name);
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2958 }
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2959 else
15234 ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2960 {
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2961 char_u *p;
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2962
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2963 if ((p = get_expanded_name(name,
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2964 vim_strchr(name, AUTOLOAD_CHAR) == NULL)) == NULL)
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2965 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2966 PyErr_FORMAT(PyExc_ValueError,
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	2967 N_("function %s does not exist"), name);
4641 59e6c2bd68e3 updated for version 7.3.1068 Bram Moolenaar <bram@vim.org> parents: 4635 diff changeset	2968 return NULL;
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2969 }
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2970
15234 ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2971 if (p[0] == K_SPECIAL && p[1] == KS_EXTRA && p[2] == (int)KE_SNR)
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2972 {
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2973 char_u *np;
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2974 size_t len = STRLEN(p) + 1;
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2975
16782 fc58fee685e2 patch 8.1.1393: unnecessary type casts Bram Moolenaar <Bram@vim.org> parents: 16718 diff changeset	2976 if ((np = alloc(len + 2)) == NULL)
15234 ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2977 {
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2978 vim_free(p);
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2979 return NULL;
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2980 }
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2981 mch_memmove(np, "<SNR>", 5);
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2982 mch_memmove(np + 5, p + 3, len - 3);
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2983 vim_free(p);
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2984 self->name = np;
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2985 }
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2986 else
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2987 self->name = p;
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2988 }
ee63f4fe3d45 patch 8.1.0627: Python cannot handle function name of script-local function Bram Moolenaar <Bram@vim.org> parents: 14467 diff changeset	2989
9725 4a4a71d67131 commit https://github.com/vim/vim/commit/2d3d60a7d4b410668dfc427120205ccf88789db4 Christian Brabandt <cb@256bit.org> parents: 9723 diff changeset	2990 func_ref(self->name);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2991 self->argc = argc;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2992 self->argv = argv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2993 self->self = selfdict;
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	2994 self->auto_rebind = selfdict == NULL ? TRUE : auto_rebind;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2995
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2996 if (self->argv \|\| self->self)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2997 pyll_add((PyObject *)(self), &self->ref, &lastfunc);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	2998
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	2999 return (PyObject *)(self);
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3000 }
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3001
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3002 static PyObject *
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3003 FunctionConstructor(PyTypeObject subtype, PyObject args, PyObject *kwargs)
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3004 {
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3005 PyObject *self;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3006 PyObject *selfdictObject;
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3007 PyObject *autoRebindObject;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3008 PyObject *argsObject = NULL;
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3009 char_u *name;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3010 typval_T selfdicttv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3011 typval_T argstv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3012 list_T *argslist = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3013 dict_T *selfdict = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3014 int argc = 0;
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3015 int auto_rebind = TRUE;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3016 typval_T *argv = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3017 typval_T *curtv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3018 listitem_T *li;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3019
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3020 if (kwargs != NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3021 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3022 selfdictObject = PyDict_GetItemString(kwargs, "self");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3023 if (selfdictObject != NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3024 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3025 if (ConvertFromPyMapping(selfdictObject, &selfdicttv) == -1)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3026 return NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3027 selfdict = selfdicttv.vval.v_dict;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3028 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3029 argsObject = PyDict_GetItemString(kwargs, "args");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3030 if (argsObject != NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3031 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3032 if (ConvertFromPySequence(argsObject, &argstv) == -1)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3033 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3034 dict_unref(selfdict);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3035 return NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3036 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3037 argslist = argstv.vval.v_list;
20392 4c317d8c1051 patch 8.2.0751: Vim9: performance can be improved Bram Moolenaar <Bram@vim.org> parents: 20369 diff changeset	3038 CHECK_LIST_MATERIALIZE(argslist);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3039
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3040 argc = argslist->lv_len;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3041 if (argc != 0)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3042 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3043 argv = PyMem_New(typval_T, (size_t) argc);
8921 c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3044 if (argv == NULL)
c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3045 {
c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3046 PyErr_NoMemory();
c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3047 dict_unref(selfdict);
c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3048 list_unref(argslist);
c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3049 return NULL;
c3e7cc135754 commit https://github.com/vim/vim/commit/fe4b18640656ddea41f60cf7a76956c9cc5494d6 Christian Brabandt <cb@256bit.org> parents: 8915 diff changeset	3050 }
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3051 curtv = argv;
19888 435726a03481 patch 8.2.0500: using the same loop in many places Bram Moolenaar <Bram@vim.org> parents: 19229 diff changeset	3052 FOR_ALL_LIST_ITEMS(argslist, li)
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3053 copy_tv(&li->li_tv, curtv++);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3054 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3055 list_unref(argslist);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3056 }
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3057 if (selfdict != NULL)
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3058 {
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3059 auto_rebind = FALSE;
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3060 autoRebindObject = PyDict_GetItemString(kwargs, "auto_rebind");
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3061 if (autoRebindObject != NULL)
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3062 {
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3063 auto_rebind = PyObject_IsTrue(autoRebindObject);
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3064 if (auto_rebind == -1)
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3065 {
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3066 dict_unref(selfdict);
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3067 list_unref(argslist);
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3068 return NULL;
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3069 }
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3070 }
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3071 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3072 }
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3073
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	3074 if (!PyArg_ParseTuple(args, "et", "ascii", &name))
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3075 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3076 dict_unref(selfdict);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3077 while (argc--)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3078 clear_tv(&argv[argc]);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3079 PyMem_Free(argv);
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3080 return NULL;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3081 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3082
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3083 self = FunctionNew(subtype, name, argc, argv, selfdict, auto_rebind);
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3084
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	3085 PyMem_Free(name);
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	3086
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3087 return self;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3088 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3089
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3090 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3091 FunctionDestructor(FunctionObject *self)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3092 {
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3093 int i;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3094 func_unref(self->name);
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	3095 vim_free(self->name);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3096 for (i = 0; i < self->argc; ++i)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3097 clear_tv(&self->argv[i]);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3098 PyMem_Free(self->argv);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3099 dict_unref(self->self);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3100 if (self->argv \|\| self->self)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3101 pyll_remove(&self->ref, &lastfunc);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3102
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3103 DESTRUCTOR_FINISH(self);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3104 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3105
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3106 static char *FunctionAttrs[] = {
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3107 "softspace", "args", "self", "auto_rebind",
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3108 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3109 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3110
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3111 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3112 FunctionDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3113 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3114 return ObjectDir(self, FunctionAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3115 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3116
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3117 static PyObject *
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3118 FunctionAttr(FunctionObject self, char name)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3119 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3120 list_T *list;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3121 int i;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3122 if (strcmp(name, "name") == 0)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3123 return PyString_FromString((char *)(self->name));
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3124 else if (strcmp(name, "args") == 0)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3125 {
9967 45098d7f72b6 commit https://github.com/vim/vim/commit/9f28953f0c1e3d9fffd49af76503f54eaa279acb Christian Brabandt <cb@256bit.org> parents: 9725 diff changeset	3126 if (self->argv == NULL \|\| (list = list_alloc()) == NULL)
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3127 return AlwaysNone(NULL);
9967 45098d7f72b6 commit https://github.com/vim/vim/commit/9f28953f0c1e3d9fffd49af76503f54eaa279acb Christian Brabandt <cb@256bit.org> parents: 9725 diff changeset	3128
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3129 for (i = 0; i < self->argc; ++i)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3130 list_append_tv(list, &self->argv[i]);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3131 return NEW_LIST(list);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3132 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3133 else if (strcmp(name, "self") == 0)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3134 return self->self == NULL
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3135 ? AlwaysNone(NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3136 : NEW_DICTIONARY(self->self);
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3137 else if (strcmp(name, "auto_rebind") == 0)
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3138 return self->auto_rebind
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3139 ? AlwaysTrue(NULL)
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3140 : AlwaysFalse(NULL);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3141 else if (strcmp(name, "__members__") == 0)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3142 return ObjectDir(NULL, FunctionAttrs);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3143 return NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3144 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3145
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3146 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3147 * Populate partial_T given function object.
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3148 *
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3149 * "exported" should be set to true when it is needed to construct a partial
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3150 * that may be stored in a variable (i.e. may be freed by Vim).
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3151 */
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3152 static void
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3153 set_partial(FunctionObject self, partial_T pt, int exported)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3154 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3155 int i;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3156
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3157 pt->pt_name = self->name;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3158 if (self->argv)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3159 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3160 pt->pt_argc = self->argc;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3161 if (exported)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3162 {
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16782 diff changeset	3163 pt->pt_argv = ALLOC_CLEAR_MULT(typval_T, self->argc);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3164 for (i = 0; i < pt->pt_argc; ++i)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3165 copy_tv(&self->argv[i], &pt->pt_argv[i]);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3166 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3167 else
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3168 pt->pt_argv = self->argv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3169 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3170 else
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3171 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3172 pt->pt_argc = 0;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3173 pt->pt_argv = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3174 }
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3175 pt->pt_auto = self->auto_rebind \|\| !exported;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3176 pt->pt_dict = self->self;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3177 if (exported && self->self)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3178 ++pt->pt_dict->dv_refcount;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3179 if (exported)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3180 pt->pt_name = vim_strsave(pt->pt_name);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3181 pt->pt_refcount = 1;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3182 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3183
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3184 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3185 FunctionCall(FunctionObject self, PyObject argsObject, PyObject *kwargs)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3186 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3187 char_u *name = self->name;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3188 typval_T args;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3189 typval_T selfdicttv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3190 typval_T rettv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3191 dict_T *selfdict = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3192 PyObject *selfdictObject;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3193 PyObject *ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3194 int error;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3195 partial_T pt;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3196 partial_T *pt_ptr = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3197
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3198 if (ConvertFromPySequence(argsObject, &args) == -1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3199 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3200
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3201 if (kwargs != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3202 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3203 selfdictObject = PyDict_GetItemString(kwargs, "self");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3204 if (selfdictObject != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3205 {
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	3206 if (ConvertFromPyMapping(selfdictObject, &selfdicttv) == -1)
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3207 {
b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3208 clear_tv(&args);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3209 return NULL;
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3210 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3211 selfdict = selfdicttv.vval.v_dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3212 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3213 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3214
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3215 if (self->argv \|\| self->self)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3216 {
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	3217 CLEAR_FIELD(pt);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3218 set_partial(self, &pt, FALSE);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3219 pt_ptr = &pt;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3220 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3221
4415 0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3222 Py_BEGIN_ALLOW_THREADS
0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3223 Python_Lock_Vim();
0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3224
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3225 VimTryStart();
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3226 error = func_call(name, &args, pt_ptr, selfdict, &rettv);
4415 0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3227
0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3228 Python_Release_Vim();
0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3229 Py_END_ALLOW_THREADS
0bbacb6a83bd updated for version 7.3.956 Bram Moolenaar <bram@vim.org> parents: 4411 diff changeset	3230
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3231 if (VimTryEnd())
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3232 ret = NULL;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3233 else if (error != OK)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3234 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3235 ret = NULL;
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3236 PyErr_VIM_FORMAT(N_("failed to run function %s"), (char *)name);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3237 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3238 else
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3239 ret = ConvertToPyObject(&rettv);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3240
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3241 clear_tv(&args);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3242 clear_tv(&rettv);
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3243 if (selfdict != NULL)
b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3244 clear_tv(&selfdicttv);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3245
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3246 return ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3247 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3248
4625 cb5c1e37ad4d updated for version 7.3.1060 Bram Moolenaar <bram@vim.org> parents: 4623 diff changeset	3249 static PyObject *
cb5c1e37ad4d updated for version 7.3.1060 Bram Moolenaar <bram@vim.org> parents: 4623 diff changeset	3250 FunctionRepr(FunctionObject *self)
cb5c1e37ad4d updated for version 7.3.1060 Bram Moolenaar <bram@vim.org> parents: 4623 diff changeset	3251 {
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3252 PyObject *ret;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3253 garray_T repr_ga;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3254 int i;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3255 char_u *tofree = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3256 typval_T tv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3257 char_u numbuf[NUMBUFLEN];
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3258
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3259 ga_init2(&repr_ga, (int)sizeof(char), 70);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3260 ga_concat(&repr_ga, (char_u *)"<vim.Function '");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3261 if (self->name)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3262 ga_concat(&repr_ga, self->name);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3263 else
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3264 ga_concat(&repr_ga, (char_u *)"<NULL>");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3265 ga_append(&repr_ga, '\'');
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3266 if (self->argv)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3267 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3268 ga_concat(&repr_ga, (char_u *)", args=[");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3269 ++emsg_silent;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3270 for (i = 0; i < self->argc; i++)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3271 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3272 if (i != 0)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3273 ga_concat(&repr_ga, (char_u *)", ");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3274 ga_concat(&repr_ga, tv2string(&self->argv[i], &tofree, numbuf,
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3275 get_copyID()));
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3276 vim_free(tofree);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3277 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3278 --emsg_silent;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3279 ga_append(&repr_ga, ']');
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3280 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3281 if (self->self)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3282 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3283 ga_concat(&repr_ga, (char_u *)", self=");
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3284 tv.v_type = VAR_DICT;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3285 tv.vval.v_dict = self->self;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3286 ++emsg_silent;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3287 ga_concat(&repr_ga, tv2string(&tv, &tofree, numbuf, get_copyID()));
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3288 --emsg_silent;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3289 vim_free(tofree);
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3290 if (self->auto_rebind)
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	3291 ga_concat(&repr_ga, (char_u *)", auto_rebind=True");
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3292 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3293 ga_append(&repr_ga, '>');
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3294 ret = PyString_FromString((char *)repr_ga.ga_data);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3295 ga_clear(&repr_ga);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	3296 return ret;
4625 cb5c1e37ad4d updated for version 7.3.1060 Bram Moolenaar <bram@vim.org> parents: 4623 diff changeset	3297 }
cb5c1e37ad4d updated for version 7.3.1060 Bram Moolenaar <bram@vim.org> parents: 4623 diff changeset	3298
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3299 static struct PyMethodDef FunctionMethods[] = {
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3300 {"__dir__", (PyCFunction)FunctionDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3301 { NULL, NULL, 0, NULL}
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3302 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	3303
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3304 /*
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3305 * Options object
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3306 */
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3307
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3308 static PyTypeObject OptionsType;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3309
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3310 typedef int (checkfun)(void );
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3311
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3312 typedef struct
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3313 {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3314 PyObject_HEAD
5610 2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3315 int opt_type;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3316 void *from;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3317 checkfun Check;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3318 PyObject *fromObj;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3319 } OptionsObject;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3320
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3321 static int
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3322 dummy_check(void *arg UNUSED)
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3323 {
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3324 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3325 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3326
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3327 static PyObject *
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3328 OptionsNew(int opt_type, void from, checkfun Check, PyObject fromObj)
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3329 {
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3330 OptionsObject *self;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3331
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3332 self = PyObject_GC_New(OptionsObject, &OptionsType);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3333 if (self == NULL)
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3334 return NULL;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3335
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3336 self->opt_type = opt_type;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3337 self->from = from;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3338 self->Check = Check;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3339 self->fromObj = fromObj;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3340 if (fromObj)
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3341 Py_INCREF(fromObj);
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3342
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3343 return (PyObject *)(self);
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3344 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3345
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3346 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3347 OptionsDestructor(OptionsObject *self)
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3348 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3349 PyObject_GC_UnTrack((void *)(self));
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3350 Py_XDECREF(self->fromObj);
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3351 PyObject_GC_Del((void *)(self));
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3352 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3353
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3354 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3355 OptionsTraverse(OptionsObject self, visitproc visit, void arg)
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3356 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3357 Py_VISIT(self->fromObj);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3358 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3359 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3360
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3361 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3362 OptionsClear(OptionsObject *self)
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3363 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3364 Py_CLEAR(self->fromObj);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3365 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3366 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	3367
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3368 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3369 OptionsItem(OptionsObject self, PyObject keyObject)
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3370 {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3371 char_u *key;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3372 int flags;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3373 long numval;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3374 char_u *stringval;
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3375 PyObject *todecref;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3376
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3377 if (self->Check(self->from))
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3378 return NULL;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3379
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3380 if (!(key = StringToChars(keyObject, &todecref)))
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3381 return NULL;
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	3382
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3383 if (*key == NUL)
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3384 {
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3385 RAISE_NO_EMPTY_KEYS;
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	3386 Py_XDECREF(todecref);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3387 return NULL;
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3388 }
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3389
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3390 flags = get_option_value_strict(key, &numval, &stringval,
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3391 self->opt_type, self->from);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3392
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3393 Py_XDECREF(todecref);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3394
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3395 if (flags == 0)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3396 {
4403 d4816e7c3328 updated for version 7.3.950 Bram Moolenaar <bram@vim.org> parents: 4401 diff changeset	3397 PyErr_SetObject(PyExc_KeyError, keyObject);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3398 return NULL;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3399 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3400
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3401 if (flags & SOPT_UNSET)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3402 {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3403 Py_INCREF(Py_None);
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3404 return Py_None;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3405 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3406 else if (flags & SOPT_BOOL)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3407 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3408 PyObject *ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3409 ret = numval ? Py_True : Py_False;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3410 Py_INCREF(ret);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3411 return ret;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3412 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3413 else if (flags & SOPT_NUM)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3414 return PyInt_FromLong(numval);
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3415 else if (flags & SOPT_STRING)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3416 {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3417 if (stringval)
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3418 {
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	3419 PyObject ret = PyBytes_FromString((char )stringval);
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3420 vim_free(stringval);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3421 return ret;
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3422 }
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3423 else
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3424 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	3425 PyErr_SET_STRING(PyExc_RuntimeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3426 N_("unable to get option value"));
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3427 return NULL;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3428 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3429 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3430 else
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3431 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3432 PyErr_SET_VIM(N_("internal error: unknown option type"));
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3433 return NULL;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3434 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3435 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3436
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3437 static int
5610 2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3438 OptionsContains(OptionsObject self, PyObject keyObject)
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3439 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3440 char_u *key;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3441 PyObject *todecref;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3442
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3443 if (!(key = StringToChars(keyObject, &todecref)))
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3444 return -1;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3445
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3446 if (*key == NUL)
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3447 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3448 Py_XDECREF(todecref);
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3449 return 0;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3450 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3451
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3452 if (get_option_value_strict(key, NULL, NULL, self->opt_type, NULL))
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3453 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3454 Py_XDECREF(todecref);
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3455 return 1;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3456 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3457 else
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3458 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3459 Py_XDECREF(todecref);
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3460 return 0;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3461 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3462 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3463
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3464 typedef struct
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3465 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3466 void *lastoption;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3467 int opt_type;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3468 } optiterinfo_T;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3469
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3470 static PyObject *
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3471 OptionsIterNext(optiterinfo_T **oii)
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3472 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3473 char_u *name;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3474
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3475 if ((name = option_iter_next(&((oii)->lastoption), (oii)->opt_type)))
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3476 return PyString_FromString((char *)name);
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3477
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3478 return NULL;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3479 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3480
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3481 static PyObject *
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3482 OptionsIter(OptionsObject *self)
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3483 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3484 optiterinfo_T *oii;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3485
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3486 if (!(oii = PyMem_New(optiterinfo_T, 1)))
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3487 {
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3488 PyErr_NoMemory();
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3489 return NULL;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3490 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3491
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3492 oii->opt_type = self->opt_type;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3493 oii->lastoption = NULL;
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3494
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3495 return IterNew(oii,
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3496 (destructorfun) PyMem_Free, (nextfun) OptionsIterNext,
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3497 NULL, NULL);
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3498 }
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3499
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3500 static int
4922 8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3501 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	3502 {
15472 0fcc1315c061 patch 8.1.0744: compiler warnings for signed/unsigned strings Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3503 char *errmsg;
4513 cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3504
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3505 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	3506 {
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3507 if (VimTryEnd())
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3508 return FAIL;
15472 0fcc1315c061 patch 8.1.0744: compiler warnings for signed/unsigned strings Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	3509 PyErr_SetVim(errmsg);
4513 cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3510 return FAIL;
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3511 }
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3512 return OK;
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3513 }
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3514
cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3515 static int
4922 8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3516 set_option_value_for(
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3517 char_u *key,
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3518 int numval,
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3519 char_u *stringval,
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3520 int opt_flags,
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3521 int opt_type,
8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	3522 void *from)
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3523 {
4509 b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3524 win_T *save_curwin = NULL;
b498224f5b41 updated for version 7.3.1002 Bram Moolenaar <bram@vim.org> parents: 4500 diff changeset	3525 tabpage_T *save_curtab = NULL;
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	3526 bufref_T save_curbuf;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3527 int set_ret = 0;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3528
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3529 VimTryStart();
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3530 switch (opt_type)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3531 {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3532 case SREQ_WIN:
4429 7eafa576528e updated for version 7.3.963 Bram Moolenaar <bram@vim.org> parents: 4419 diff changeset	3533 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	3534 win_find_tabpage((win_T *)from), FALSE) == FAIL)
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3535 {
6454 a35752526cd0 updated for version 7.4.556 Bram Moolenaar <bram@vim.org> parents: 6176 diff changeset	3536 restore_win(save_curwin, save_curtab, TRUE);
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3537 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3538 return -1;
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3539 PyErr_SET_VIM(N_("problem while switching windows"));
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3540 return -1;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3541 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3542 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	3543 restore_win(save_curwin, save_curtab, TRUE);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3544 break;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3545 case SREQ_BUF:
4429 7eafa576528e updated for version 7.3.963 Bram Moolenaar <bram@vim.org> parents: 4419 diff changeset	3546 switch_buffer(&save_curbuf, (buf_T *)from);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3547 set_ret = set_option_value_err(key, numval, stringval, opt_flags);
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	3548 restore_buffer(&save_curbuf);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3549 break;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3550 case SREQ_GLOBAL:
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3551 set_ret = set_option_value_err(key, numval, stringval, opt_flags);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3552 break;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3553 }
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3554 if (set_ret == FAIL)
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3555 return -1;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	3556 return VimTryEnd();
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3557 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3558
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3559 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3560 OptionsAssItem(OptionsObject self, PyObject keyObject, PyObject *valObject)
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3561 {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3562 char_u *key;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3563 int flags;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3564 int opt_flags;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3565 int ret = 0;
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3566 PyObject *todecref;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3567
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3568 if (self->Check(self->from))
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3569 return -1;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3570
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3571 if (!(key = StringToChars(keyObject, &todecref)))
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3572 return -1;
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	3573
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3574 if (*key == NUL)
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3575 {
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3576 RAISE_NO_EMPTY_KEYS;
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	3577 Py_XDECREF(todecref);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3578 return -1;
80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3579 }
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3580
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3581 flags = get_option_value_strict(key, NULL, NULL,
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3582 self->opt_type, self->from);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3583
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3584 if (flags == 0)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3585 {
4403 d4816e7c3328 updated for version 7.3.950 Bram Moolenaar <bram@vim.org> parents: 4401 diff changeset	3586 PyErr_SetObject(PyExc_KeyError, keyObject);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3587 Py_XDECREF(todecref);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3588 return -1;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3589 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3590
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3591 if (valObject == NULL)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3592 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3593 if (self->opt_type == SREQ_GLOBAL)
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3594 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	3595 PyErr_FORMAT(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3596 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	3597 Py_XDECREF(todecref);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3598 return -1;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3599 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3600 else if (!(flags & SOPT_GLOBAL))
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3601 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	3602 PyErr_FORMAT(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3603 N_("unable to unset option %s "
f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3604 "which does not have global value"), key);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3605 Py_XDECREF(todecref);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3606 return -1;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3607 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3608 else
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3609 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3610 unset_global_local_option(key, self->from);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3611 Py_XDECREF(todecref);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3612 return 0;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3613 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3614 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3615
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3616 opt_flags = (self->opt_type ? OPT_LOCAL : OPT_GLOBAL);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3617
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3618 if (flags & SOPT_BOOL)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3619 {
4411 1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	3620 int istrue = PyObject_IsTrue(valObject);
4513 cadb57fbb781 updated for version 7.3.1004 Bram Moolenaar <bram@vim.org> parents: 4511 diff changeset	3621
4411 1afdb7d21c14 updated for version 7.3.954 Bram Moolenaar <bram@vim.org> parents: 4407 diff changeset	3622 if (istrue == -1)
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3623 ret = -1;
4587 63c9b681c3db updated for version 7.3.1041 Bram Moolenaar <bram@vim.org> parents: 4575 diff changeset	3624 else
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3625 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	3626 opt_flags, self->opt_type, self->from);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3627 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3628 else if (flags & SOPT_NUM)
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3629 {
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	3630 long val;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	3631
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	3632 if (NumberToLong(valObject, &val, NUMBER_INT))
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3633 {
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3634 Py_XDECREF(todecref);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3635 return -1;
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3636 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3637
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3638 ret = set_option_value_for(key, (int) val, NULL, opt_flags,
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3639 self->opt_type, self->from);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3640 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3641 else
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3642 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3643 char_u *val;
5525 3fbda56bb200 updated for version 7.4.111 Bram Moolenaar <bram@vim.org> parents: 5517 diff changeset	3644 PyObject *todecref2;
3fbda56bb200 updated for version 7.4.111 Bram Moolenaar <bram@vim.org> parents: 5517 diff changeset	3645
3fbda56bb200 updated for version 7.4.111 Bram Moolenaar <bram@vim.org> parents: 5517 diff changeset	3646 if ((val = StringToChars(valObject, &todecref2)))
3fbda56bb200 updated for version 7.4.111 Bram Moolenaar <bram@vim.org> parents: 5517 diff changeset	3647 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3648 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	3649 self->opt_type, self->from);
5525 3fbda56bb200 updated for version 7.4.111 Bram Moolenaar <bram@vim.org> parents: 5517 diff changeset	3650 Py_XDECREF(todecref2);
3fbda56bb200 updated for version 7.4.111 Bram Moolenaar <bram@vim.org> parents: 5517 diff changeset	3651 }
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3652 else
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3653 ret = -1;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3654 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3655
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	3656 Py_XDECREF(todecref);
4587 63c9b681c3db updated for version 7.3.1041 Bram Moolenaar <bram@vim.org> parents: 4575 diff changeset	3657
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3658 return ret;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3659 }
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3660
5610 2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3661 static PySequenceMethods OptionsAsSeq = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3662 0, // sq_length
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3663 0, // sq_concat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3664 0, // sq_repeat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3665 0, // sq_item
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3666 0, // sq_slice
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3667 0, // sq_ass_item
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3668 0, // sq_ass_slice
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3669 (objobjproc) OptionsContains, // sq_contains
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3670 0, // sq_inplace_concat
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3671 0, // sq_inplace_repeat
5610 2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3672 };
2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	3673
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3674 static PyMappingMethods OptionsAsMapping = {
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3675 (lenfunc) NULL,
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3676 (binaryfunc) OptionsItem,
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3677 (objobjargproc) OptionsAssItem,
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3678 };
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	3679
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3680 // Tabpage object
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3681
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3682 typedef struct
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3683 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3684 PyObject_HEAD
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3685 tabpage_T *tab;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3686 } TabPageObject;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3687
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3688 static PyObject WinListNew(TabPageObject tabObject);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3689
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3690 static PyTypeObject TabPageType;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3691
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3692 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3693 CheckTabPage(TabPageObject *self)
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3694 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3695 if (self->tab == INVALID_TABPAGE_VALUE)
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3696 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3697 PyErr_SET_VIM(N_("attempt to refer to deleted tab page"));
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3698 return -1;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3699 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3700
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3701 return 0;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3702 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3703
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3704 static PyObject *
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3705 TabPageNew(tabpage_T *tab)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3706 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3707 TabPageObject *self;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3708
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3709 if (TAB_PYTHON_REF(tab))
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3710 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3711 self = TAB_PYTHON_REF(tab);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3712 Py_INCREF(self);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3713 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3714 else
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3715 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3716 self = PyObject_NEW(TabPageObject, &TabPageType);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3717 if (self == NULL)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3718 return NULL;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3719 self->tab = tab;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3720 TAB_PYTHON_REF(tab) = self;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3721 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3722
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3723 return (PyObject *)(self);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3724 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3725
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3726 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3727 TabPageDestructor(TabPageObject *self)
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3728 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3729 if (self->tab && self->tab != INVALID_TABPAGE_VALUE)
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3730 TAB_PYTHON_REF(self->tab) = NULL;
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3731
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3732 DESTRUCTOR_FINISH(self);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3733 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3734
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3735 static char *TabPageAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3736 "windows", "number", "vars", "window", "valid",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3737 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3738 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3739
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3740 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3741 TabPageDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3742 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3743 return ObjectDir(self, TabPageAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3744 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3745
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3746 static PyObject *
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3747 TabPageAttrValid(TabPageObject self, char name)
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3748 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3749 PyObject *ret;
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3750
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3751 if (strcmp(name, "valid") != 0)
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3752 return NULL;
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3753
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3754 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	3755 Py_INCREF(ret);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3756 return ret;
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3757 }
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3758
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3759 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3760 TabPageAttr(TabPageObject self, char name)
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3761 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3762 if (strcmp(name, "windows") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3763 return WinListNew(self);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3764 else if (strcmp(name, "number") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3765 return PyLong_FromLong((long) get_tab_number(self->tab));
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3766 else if (strcmp(name, "vars") == 0)
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	3767 return NEW_DICTIONARY(self->tab->tp_vars);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3768 else if (strcmp(name, "window") == 0)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3769 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3770 // For current tab window.c does not bother to set or update tp_curwin
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3771 if (self->tab == curtab)
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3772 return WindowNew(curwin, curtab);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3773 else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3774 return WindowNew(self->tab->tp_curwin, self->tab);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3775 }
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3776 else if (strcmp(name, "__members__") == 0)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3777 return ObjectDir(NULL, TabPageAttrs);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3778 return NULL;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3779 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3780
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3781 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3782 TabPageRepr(TabPageObject *self)
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3783 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3784 if (self->tab == INVALID_TABPAGE_VALUE)
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	3785 return PyString_FromFormat("<tabpage object (deleted) at %p>", (self));
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3786 else
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3787 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3788 int t = get_tab_number(self->tab);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3789
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3790 if (t == 0)
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	3791 return PyString_FromFormat("<tabpage object (unknown) at %p>",
548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	3792 (self));
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3793 else
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	3794 return PyString_FromFormat("<tabpage %d>", t - 1);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3795 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3796 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3797
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3798 static struct PyMethodDef TabPageMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3799 // name, function, calling, documentation
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3800 {"__dir__", (PyCFunction)TabPageDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3801 { NULL, NULL, 0, NULL}
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3802 };
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3803
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3804 /*
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3805 * Window list object
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3806 */
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3807
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3808 static PyTypeObject TabListType;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3809 static PySequenceMethods TabListAsSeq;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3810
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3811 typedef struct
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3812 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3813 PyObject_HEAD
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3814 } TabListObject;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3815
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3816 static PyInt
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3817 TabListLength(PyObject *self UNUSED)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3818 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3819 tabpage_T *tp = first_tabpage;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3820 PyInt n = 0;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3821
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3822 while (tp != NULL)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3823 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3824 ++n;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3825 tp = tp->tp_next;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3826 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3827
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3828 return n;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3829 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3830
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3831 static PyObject *
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3832 TabListItem(PyObject *self UNUSED, PyInt n)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3833 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3834 tabpage_T *tp;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3835
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3836 for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, --n)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3837 if (n == 0)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3838 return TabPageNew(tp);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3839
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3840 PyErr_SET_STRING(PyExc_IndexError, N_("no such tab page"));
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3841 return NULL;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3842 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	3843
4962 b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	3844 /*
b34d719b13cd updated for version 7.3.1226 Bram Moolenaar <bram@vim.org> parents: 4922 diff changeset	3845 * Window object
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3846 */
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3847
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3848 typedef struct
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3849 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3850 PyObject_HEAD
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3851 win_T *win;
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3852 TabPageObject *tabObject;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3853 } WindowObject;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3854
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3855 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	3856
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	3857 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3858 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	3859 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3860 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	3861 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	3862 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	3863 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	3864 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	3865
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	3866 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	3867 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	3868
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3869 static PyObject *
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3870 WindowNew(win_T win, tabpage_T tab)
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3871 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3872 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3873 * We need to handle deletion of windows underneath us.
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3874 * If we add a "w_python*_ref" field to the win_T structure,
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3875 * then we can get at it in win_free() in vim. We then
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3876 * need to create only ONE Python object per window - if
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3877 * we try to create a second, just INCREF the existing one
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3878 * and return it. The (single) Python object referring to
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3879 * the window is stored in "w_python*_ref".
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3880 * On a win_free() we set the Python object's win_T* field
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3881 * to an invalid value. We trap all uses of a window
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3882 * object, and reject them if the win_T* field is invalid.
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3883 *
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3884 * Python2 and Python3 get different fields and different objects:
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3885 * w_python_ref and w_python3_ref fields respectively.
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3886 */
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3887
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3888 WindowObject *self;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3889
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3890 if (WIN_PYTHON_REF(win))
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3891 {
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3892 self = WIN_PYTHON_REF(win);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3893 Py_INCREF(self);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3894 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3895 else
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3896 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3897 self = PyObject_GC_New(WindowObject, &WindowType);
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3898 if (self == NULL)
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3899 return NULL;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3900 self->win = win;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3901 WIN_PYTHON_REF(win) = self;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3902 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3903
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3904 self->tabObject = ((TabPageObject *)(TabPageNew(tab)));
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3905
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3906 return (PyObject *)(self);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3907 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3908
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3909 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3910 WindowDestructor(WindowObject *self)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3911 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3912 PyObject_GC_UnTrack((void *)(self));
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3913 if (self->win && self->win != INVALID_WINDOW_VALUE)
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3914 WIN_PYTHON_REF(self->win) = NULL;
21190 10eb6c38938c patch 8.2.1146: not enough testing for Python Bram Moolenaar <Bram@vim.org> parents: 21083 diff changeset	3915 Py_XDECREF(((PyObject *)(self->tabObject)));
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3916 PyObject_GC_Del((void *)(self));
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3917 }
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3918
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3919 static int
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3920 WindowTraverse(WindowObject self, visitproc visit, void arg)
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3921 {
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3922 Py_VISIT(((PyObject *)(self->tabObject)));
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3923 return 0;
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3924 }
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3925
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3926 static int
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3927 WindowClear(WindowObject *self)
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3928 {
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3929 Py_CLEAR(self->tabObject);
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	3930 return 0;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3931 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	3932
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3933 static win_T *
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3934 get_firstwin(TabPageObject *tabObject)
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3935 {
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3936 if (tabObject)
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3937 {
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3938 if (CheckTabPage(tabObject))
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3939 return NULL;
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	3940 // For current tab window.c does not bother to set or update tp_firstwin
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3941 else if (tabObject->tab == curtab)
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3942 return firstwin;
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3943 else
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3944 return tabObject->tab->tp_firstwin;
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3945 }
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3946 else
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3947 return firstwin;
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3948 }
14047 30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3949
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3950 // Use the same order as in the WindowAttr() function.
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3951 static char *WindowAttrs[] = {
14047 30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3952 "buffer",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3953 "cursor",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3954 "height",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3955 "row",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3956 "width",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3957 "col",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3958 "vars",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3959 "options",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3960 "number",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3961 "tabpage",
30a0068f6167 patch 8.1.0041: attribute "width" missing from python window attribute list Christian Brabandt <cb@256bit.org> parents: 13952 diff changeset	3962 "valid",
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3963 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3964 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3965
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3966 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3967 WindowDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3968 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3969 return ObjectDir(self, WindowAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	3970 }
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	3971
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	3972 static PyObject *
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3973 WindowAttrValid(WindowObject self, char name)
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3974 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3975 PyObject *ret;
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3976
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3977 if (strcmp(name, "valid") != 0)
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3978 return NULL;
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3979
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3980 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	3981 Py_INCREF(ret);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	3982 return ret;
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3983 }
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3984
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	3985 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3986 WindowAttr(WindowObject self, char name)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3987 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3988 if (strcmp(name, "buffer") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3989 return (PyObject *)BufferNew(self->win->w_buffer);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3990 else if (strcmp(name, "cursor") == 0)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3991 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3992 pos_T *pos = &self->win->w_cursor;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3993
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3994 return Py_BuildValue("(ll)", (long)(pos->lnum), (long)(pos->col));
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3995 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	3996 else if (strcmp(name, "height") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3997 return PyLong_FromLong((long)(self->win->w_height));
4383 e2db42528a5b updated for version 7.3.940 Bram Moolenaar <bram@vim.org> parents: 4381 diff changeset	3998 else if (strcmp(name, "row") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	3999 return PyLong_FromLong((long)(self->win->w_winrow));
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4000 else if (strcmp(name, "width") == 0)
12515 972ea22c946f patch 8.0.1136: W_WIDTH() is always the same Christian Brabandt <cb@256bit.org> parents: 12513 diff changeset	4001 return PyLong_FromLong((long)(self->win->w_width));
4383 e2db42528a5b updated for version 7.3.940 Bram Moolenaar <bram@vim.org> parents: 4381 diff changeset	4002 else if (strcmp(name, "col") == 0)
12513 3ca08bf99396 patch 8.0.1135: W_WINCOL() is always the same Christian Brabandt <cb@256bit.org> parents: 12477 diff changeset	4003 return PyLong_FromLong((long)(self->win->w_wincol));
4323 f1eab4f77a6f updated for version 7.3.911 Bram Moolenaar <bram@vim.org> parents: 4321 diff changeset	4004 else if (strcmp(name, "vars") == 0)
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	4005 return NEW_DICTIONARY(self->win->w_vars);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	4006 else if (strcmp(name, "options") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4007 return OptionsNew(SREQ_WIN, self->win, (checkfun) CheckWindow,
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4008 (PyObject *) self);
4379 a2f03b41dca7 updated for version 7.3.938 Bram Moolenaar <bram@vim.org> parents: 4377 diff changeset	4009 else if (strcmp(name, "number") == 0)
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4010 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4011 if (CheckTabPage(self->tabObject))
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4012 return NULL;
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4013 return PyLong_FromLong((long)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4014 get_win_number(self->win, get_firstwin(self->tabObject)));
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4015 }
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4016 else if (strcmp(name, "tabpage") == 0)
7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4017 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4018 Py_INCREF(self->tabObject);
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4019 return (PyObject *)(self->tabObject);
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	4020 }
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	4021 else if (strcmp(name, "__members__") == 0)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	4022 return ObjectDir(NULL, WindowAttrs);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4023 else
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4024 return NULL;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4025 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4026
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4027 static int
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4028 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	4029 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4030 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	4031 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4032
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4033 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	4034 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4035 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	4036 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4037 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4038 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	4039 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4040 long lnum;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4041 long col;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4042
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4043 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	4044 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4045
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4046 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	4047 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4048 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	4049 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4050 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4051
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4052 // Check for keyboard interrupts
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4053 if (VimCheckInterrupt())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4054 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4055
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4056 self->win->w_cursor.lnum = lnum;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4057 self->win->w_cursor.col = col;
14395 c15bef307de6 patch 8.1.0212: preferred cursor column not set in interfaces Christian Brabandt <cb@256bit.org> parents: 14373 diff changeset	4058 self->win->w_set_curswant = TRUE;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4059 self->win->w_cursor.coladd = 0;
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4060 // When column is out of range silently correct it.
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4061 check_cursor_col_win(self->win);
2933 0bef86c5c985 updated for version 7.3.239 Bram Moolenaar <bram@vim.org> parents: 2919 diff changeset	4062
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4063 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4064 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4065 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4066 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	4067 {
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	4068 long height;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4069 win_T *savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4070
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	4071 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	4072 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4073
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4074 #ifdef FEAT_GUI
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4075 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	4076 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4077 savewin = curwin;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4078 curwin = self->win;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4079
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4080 VimTryStart();
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	4081 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	4082 curwin = savewin;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4083 if (VimTryEnd())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4084 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4085
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4086 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4087 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4088 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	4089 {
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	4090 long width;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4091 win_T *savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4092
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	4093 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	4094 return -1;
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 #ifdef FEAT_GUI
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4097 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	4098 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4099 savewin = curwin;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4100 curwin = self->win;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4101
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4102 VimTryStart();
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	4103 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	4104 curwin = savewin;
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4105 if (VimTryEnd())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4106 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4107
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4108 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4109 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4110 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4111 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4112 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	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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4117 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4118 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	4119 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4120 if (self->win == INVALID_WINDOW_VALUE)
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	4121 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	4122 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4123 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4124 int w = get_win_number(self->win, firstwin);
4379 a2f03b41dca7 updated for version 7.3.938 Bram Moolenaar <bram@vim.org> parents: 4377 diff changeset	4125
a2f03b41dca7 updated for version 7.3.938 Bram Moolenaar <bram@vim.org> parents: 4377 diff changeset	4126 if (w == 0)
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	4127 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	4128 (self));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4129 else
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	4130 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	4131 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4132 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4133
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4134 static struct PyMethodDef WindowMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4135 // name, function, calling, documentation
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	4136 {"__dir__", (PyCFunction)WindowDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	4137 { NULL, NULL, 0, NULL}
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4138 };
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4139
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4140 /*
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4141 * 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	4142 */
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4143
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4144 static PyTypeObject WinListType;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4145 static PySequenceMethods WinListAsSeq;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4146
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4147 typedef struct
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4148 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4149 PyObject_HEAD
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4150 TabPageObject *tabObject;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4151 } WinListObject;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	4152
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4153 static PyObject *
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4154 WinListNew(TabPageObject *tabObject)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4155 {
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4156 WinListObject *self;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4157
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4158 self = PyObject_NEW(WinListObject, &WinListType);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4159 self->tabObject = tabObject;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4160 Py_INCREF(tabObject);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4161
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4162 return (PyObject *)(self);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4163 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4164
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4165 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4166 WinListDestructor(WinListObject *self)
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4167 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4168 TabPageObject *tabObject = self->tabObject;
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4169
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4170 if (tabObject)
4523 57393dc4b811 updated for version 7.3.1009 Bram Moolenaar <bram@vim.org> parents: 4513 diff changeset	4171 {
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4172 Py_DECREF((PyObject *)(tabObject));
4523 57393dc4b811 updated for version 7.3.1009 Bram Moolenaar <bram@vim.org> parents: 4513 diff changeset	4173 }
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4174
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4175 DESTRUCTOR_FINISH(self);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4176 }
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4177
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4178 static PyInt
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4179 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	4180 {
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4181 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	4182 PyInt n = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4183
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4184 if (!(w = get_firstwin(self->tabObject)))
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4185 return -1;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4186
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4187 while (w != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4188 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4189 ++n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4190 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	4191 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4192
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4193 return n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4194 }
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 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4197 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	4198 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4199 win_T *w;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4200
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4201 if (!(w = get_firstwin(self->tabObject)))
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4202 return NULL;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4203
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	4204 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	4205 if (n == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4206 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	4207
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4208 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	4209 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4210 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4211
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4212 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4213 * Convert a Python string into a Vim line.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4214 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4215 * 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	4216 * 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	4217 * characters.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4218 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4219 * 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	4220 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4221 static char *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4222 StringToLine(PyObject *obj)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4223 {
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4224 char *str;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4225 char *save;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4226 PyObject *bytes = NULL;
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	4227 Py_ssize_t len = 0;
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4228 PyInt i;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4229 char *p;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4230
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4231 if (PyBytes_Check(obj))
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4232 {
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4233 if (PyBytes_AsStringAndSize(obj, &str, &len) == -1
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4234 \|\| str == NULL)
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4235 return NULL;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4236 }
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4237 else if (PyUnicode_Check(obj))
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4238 {
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4239 if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4240 return NULL;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4241
4995 b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4242 if (PyBytes_AsStringAndSize(bytes, &str, &len) == -1
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4243 \|\| str == NULL)
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4244 {
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4245 Py_DECREF(bytes);
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4246 return NULL;
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4247 }
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4248 }
4995 b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4249 else
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4250 {
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4251 #if PY_MAJOR_VERSION < 3
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4252 PyErr_FORMAT(PyExc_TypeError,
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4253 N_("expected str() or unicode() instance, but got %s"),
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4254 Py_TYPE_NAME(obj));
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4255 #else
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4256 PyErr_FORMAT(PyExc_TypeError,
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4257 N_("expected bytes() or str() instance, but got %s"),
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4258 Py_TYPE_NAME(obj));
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4259 #endif
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4260 return NULL;
b4a2eaf28b51 updated for version 7.3.1242 Bram Moolenaar <bram@vim.org> parents: 4988 diff changeset	4261 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4262
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4263 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4264 * 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	4265 * 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	4266 * a single line.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4267 * 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	4268 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4269 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	4270 if (p != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4271 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4272 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	4273 --len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4274 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4275 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4276 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	4277 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	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 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4281
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4282 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4283 * Create a copy of the string, with internal nulls replaced by
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	4284 * newline characters, as is the Vim convention.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4285 */
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16782 diff changeset	4286 save = alloc(len+1);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4287 if (save == NULL)
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 PyErr_NoMemory();
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	4290 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	4291 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4292 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4293
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4294 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	4295 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4296 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	4297 save[i] = '\n';
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4298 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4299 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	4300 }
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 save[i] = '\0';
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4303 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	4304
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4305 return save;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4306 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4307
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4308 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4309 * Get a line from the specified buffer. The line number is
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4310 * 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	4311 * string object.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4312 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4313 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4314 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	4315 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4316 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	4317 }
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
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4320 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4321 * Get a list of lines from the specified buffer. The line numbers
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4322 * 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	4323 * 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	4324 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4325 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4326 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	4327 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4328 PyInt i;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4329 PyInt n = hi - lo;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4330 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	4331
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4332 if (list == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4333 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4334
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4335 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	4336 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4337 PyObject *string = LineToString(
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4338 (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	4339
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4340 // 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	4341 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	4342 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4343 Py_DECREF(list);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4344 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4345 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4346
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4347 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	4348 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4349
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4350 // The ownership of the Python list is passed to the caller (ie,
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4351 // the caller should Py_DECREF() the object when it is finished
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4352 // with it).
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4353
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4354 return list;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4355 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4356
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4357 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4358 * 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	4359 * 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	4360 * deleted).
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4361 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4362 static void
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4363 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	4364 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4365 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	4366 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4367 // Adjust the cursor position if it's in/after the changed
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4368 // lines.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4369 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	4370 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4371 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	4372 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4373 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4374 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	4375 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4376 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	4377 check_cursor();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4378 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4379 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4380 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4381 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	4382 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4383 invalidate_botline();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4384 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4385
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4386 /*
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4387 * 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	4388 * 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	4389 * 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	4390 * 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	4391 * 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	4392 * 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	4393 * 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	4394 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4395 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4396 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	4397 {
11447 698ee9d4fe9f patch 8.0.0607: after :bwipe + :new bufref might still be valid Christian Brabandt <cb@256bit.org> parents: 10942 diff changeset	4398 bufref_T save_curbuf = {NULL, 0, 0};
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4399 win_T *save_curwin = NULL;
6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4400 tabpage_T *save_curtab = NULL;
6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4401
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4402 // First of all, we check the type of the supplied Python object.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4403 // There are three cases:
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4404 // 1. NULL, or None - this is a deletion.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4405 // 2. A string - this is a replacement.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4406 // 3. Anything else - this is an error.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4407 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	4408 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4409 PyErr_Clear();
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4410 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4411
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4412 VimTryStart();
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4413
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4414 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	4415 RAISE_UNDO_FAIL;
20599 d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument Bram Moolenaar <Bram@vim.org> parents: 20392 diff changeset	4416 else if (ml_delete((linenr_T)n) == FAIL)
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4417 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	4418 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4419 {
16080 bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4420 if (buf == curbuf && (save_curwin != NULL
bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4421 \|\| save_curbuf.br_buf == NULL))
bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4422 // Using an existing window for the buffer, adjust the cursor
bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4423 // position.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4424 py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4425 if (save_curbuf.br_buf == NULL)
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4426 // Only adjust marks if we managed to switch to a window that
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4427 // holds the buffer, otherwise line numbers will be invalid.
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4428 deleted_lines_mark((linenr_T)n, 1L);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4429 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4430
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4431 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4432
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4433 if (VimTryEnd())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4434 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4435
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4436 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4437 *len_change = -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4438
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4439 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4440 }
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4441 else if (PyBytes_Check(line) \|\| PyUnicode_Check(line))
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4442 {
620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4443 char *save = StringToLine(line);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4444
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4445 if (save == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4446 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4447
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4448 VimTryStart();
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4449
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4450 // We do not need to free "save" if ml_replace() consumes it.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4451 PyErr_Clear();
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4452 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4453
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4454 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	4455 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	4456 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	4457 vim_free(save);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4458 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4459 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	4460 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4461 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	4462 vim_free(save);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4463 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4464 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4465 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	4466
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4467 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4468
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4469 // Check that the cursor is not beyond the end of the line now.
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4470 if (buf == curbuf)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4471 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4472
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4473 if (VimTryEnd())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4474 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4475
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4476 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4477 *len_change = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4478
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4479 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4480 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4481 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4482 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4483 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4484 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4485 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4486 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4487
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4488 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4489 * Replace a range of lines in the specified buffer. The line numbers are in
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4490 * Vim format (1-based). The range is from lo up to, but not including, hi.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4491 * The replacement lines are given as a Python list of string objects. The
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4492 * list is checked for validity and correct format. Errors are returned as a
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4493 * value of FAIL. The return value is OK on success.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4494 * If OK is returned and len_change is not NULL, *len_change
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4495 * is set to the change in the buffer length.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4496 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4497 static int
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4498 SetBufferLineList(
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4499 buf_T *buf,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4500 PyInt lo,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4501 PyInt hi,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4502 PyObject *list,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4503 PyInt *len_change)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4504 {
11447 698ee9d4fe9f patch 8.0.0607: after :bwipe + :new bufref might still be valid Christian Brabandt <cb@256bit.org> parents: 10942 diff changeset	4505 bufref_T save_curbuf = {NULL, 0, 0};
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4506 win_T *save_curwin = NULL;
6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4507 tabpage_T *save_curtab = NULL;
6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4508
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4509 // First of all, we check the type of the supplied Python object.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4510 // There are three cases:
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4511 // 1. NULL, or None - this is a deletion.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4512 // 2. A list - this is a replacement.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4513 // 3. Anything else - this is an error.
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4514 if (list == Py_None \|\| list == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4515 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4516 PyInt i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4517 PyInt n = (int)(hi - lo);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4518
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4519 PyErr_Clear();
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4520 VimTryStart();
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4521 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4522
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4523 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	4524 RAISE_UNDO_FAIL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4525 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4526 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4527 for (i = 0; i < n; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4528 {
20599 d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument Bram Moolenaar <Bram@vim.org> parents: 20392 diff changeset	4529 if (ml_delete((linenr_T)lo) == FAIL)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4530 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4531 RAISE_DELETE_LINE_FAIL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4532 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4533 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4534 }
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4535 if (buf == curbuf && (save_curwin != NULL
69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4536 \|\| save_curbuf.br_buf == NULL))
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4537 // Using an existing window for the buffer, adjust the cursor
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4538 // position.
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4539 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4540 if (save_curbuf.br_buf == NULL)
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4541 // Only adjust marks if we managed to switch to a window that
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4542 // holds the buffer, otherwise line numbers will be invalid.
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4543 deleted_lines_mark((linenr_T)lo, (long)i);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4544 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4545
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4546 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4547
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4548 if (VimTryEnd())
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4549 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4550
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4551 if (len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4552 *len_change = -n;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4553
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4554 return OK;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4555 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4556 else if (PyList_Check(list))
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4557 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4558 PyInt i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4559 PyInt new_len = PyList_Size(list);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4560 PyInt old_len = hi - lo;
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4561 PyInt extra = 0; // lines added to text, can be negative
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4562 char **array;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4563
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4564 if (new_len == 0) // avoid allocating zero bytes
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4565 array = NULL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4566 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4567 {
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	4568 array = PyMem_New(char *, new_len);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4569 if (array == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4570 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4571 PyErr_NoMemory();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4572 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4573 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4574 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4575
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4576 for (i = 0; i < new_len; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4577 {
4633 3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4578 PyObject *line;
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4579
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4580 if (!(line = PyList_GetItem(list, i)) \|\|
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4581 !(array[i] = StringToLine(line)))
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4582 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4583 while (i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4584 vim_free(array[--i]);
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	4585 PyMem_Free(array);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4586 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4587 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4588 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4589
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4590 VimTryStart();
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4591 PyErr_Clear();
4429 7eafa576528e updated for version 7.3.963 Bram Moolenaar <bram@vim.org> parents: 4419 diff changeset	4592
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4593 // START of region without "return". Must call restore_buffer()!
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4594 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4595
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4596 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	4597 RAISE_UNDO_FAIL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4598
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4599 // If the size of the range is reducing (ie, new_len < old_len) we
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4600 // need to delete some old_len. We do this at the start, by
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4601 // repeatedly deleting line "lo".
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4602 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4603 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4604 for (i = 0; i < old_len - new_len; ++i)
20599 d571231175b4 patch 8.2.0853: ml_delete() often called with FALSE argument Bram Moolenaar <Bram@vim.org> parents: 20392 diff changeset	4605 if (ml_delete((linenr_T)lo) == FAIL)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4606 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4607 RAISE_DELETE_LINE_FAIL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4608 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4609 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4610 extra -= i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4611 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4612
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4613 // For as long as possible, replace the existing old_len with the
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4614 // new old_len. This is a more efficient operation, as it requires
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4615 // less memory allocation and freeing.
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4616 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4617 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4618 for (i = 0; i < old_len && i < new_len; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4619 if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4620 == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4621 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4622 RAISE_REPLACE_LINE_FAIL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4623 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4624 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4625 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4626 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4627 i = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4628
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4629 // Now we may need to insert the remaining new old_len. If we do, we
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4630 // must free the strings as we finish with them (we can't pass the
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	4631 // responsibility to Vim in this case).
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4632 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4633 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4634 while (i < new_len)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4635 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4636 if (ml_append((linenr_T)(lo + i - 1),
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4637 (char_u *)array[i], 0, FALSE) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4638 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4639 RAISE_INSERT_LINE_FAIL;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4640 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4641 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4642 vim_free(array[i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4643 ++i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4644 ++extra;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4645 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4646 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4647
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4648 // Free any left-over old_len, as a result of an error
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4649 while (i < new_len)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4650 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4651 vim_free(array[i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4652 ++i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4653 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4654
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4655 // Free the array of old_len. All of its contents have now
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4656 // been dealt with (either freed, or the responsibility passed
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4657 // to vim.
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	4658 PyMem_Free(array);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4659
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4660 // Adjust marks. Invalidate any which lie in the
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4661 // changed range, and move any in the remainder of the buffer.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4662 // Only adjust marks if we managed to switch to a window that holds
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4663 // the buffer, otherwise line numbers will be invalid.
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4664 if (save_curbuf.br_buf == NULL)
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4665 mark_adjust((linenr_T)lo, (linenr_T)(hi - 1),
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4666 (long)MAXLNUM, (long)extra);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4667 changed_lines((linenr_T)lo, 0, (linenr_T)hi, (long)extra);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4668
16080 bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4669 if (buf == curbuf && (save_curwin != NULL
bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4670 \|\| save_curbuf.br_buf == NULL))
bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4671 // Using an existing window for the buffer, adjust the cursor
bf8cf5c3b784 patch 8.1.1045: E315 ml_get error when using Python and hidden buffer Bram Moolenaar <Bram@vim.org> parents: 15818 diff changeset	4672 // position.
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4673 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)extra);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4674
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4675 // END of region without "return".
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4676 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4677
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4678 if (VimTryEnd())
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4679 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4680
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4681 if (len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4682 *len_change = new_len - old_len;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4683
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4684 return OK;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4685 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4686 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4687 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4688 PyErr_BadArgument();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4689 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4690 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4691 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4692
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4693 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4694 * 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	4695 * 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	4696 * 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	4697 * 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	4698 * 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	4699 * 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	4700 * 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	4701 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4702 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4703 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	4704 {
11447 698ee9d4fe9f patch 8.0.0607: after :bwipe + :new bufref might still be valid Christian Brabandt <cb@256bit.org> parents: 10942 diff changeset	4705 bufref_T save_curbuf = {NULL, 0, 0};
5202 8edba3805d78 updated for version 7.4a.027 Bram Moolenaar <bram@vim.org> parents: 5166 diff changeset	4706 win_T *save_curwin = NULL;
8edba3805d78 updated for version 7.4a.027 Bram Moolenaar <bram@vim.org> parents: 5166 diff changeset	4707 tabpage_T *save_curtab = NULL;
8edba3805d78 updated for version 7.4a.027 Bram Moolenaar <bram@vim.org> parents: 5166 diff changeset	4708
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4709 // First of all, we check the type of the supplied Python object.
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4710 // It must be a string or a list, or the call is in error.
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	4711 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	4712 {
5202 8edba3805d78 updated for version 7.4a.027 Bram Moolenaar <bram@vim.org> parents: 5166 diff changeset	4713 char *str = StringToLine(lines);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4714
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4715 if (str == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4716 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4717
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4718 PyErr_Clear();
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4719 VimTryStart();
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4720 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
5202 8edba3805d78 updated for version 7.4a.027 Bram Moolenaar <bram@vim.org> parents: 5166 diff changeset	4721
8edba3805d78 updated for version 7.4a.027 Bram Moolenaar <bram@vim.org> parents: 5166 diff changeset	4722 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	4723 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	4724 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	4725 RAISE_INSERT_LINE_FAIL;
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4726 else if (save_curbuf.br_buf == NULL)
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4727 // Only adjust marks if we managed to switch to a window that
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4728 // holds the buffer, otherwise line numbers will be invalid.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4729 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	4730
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4731 vim_free(str);
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4732 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4733 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4734
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4735 if (VimTryEnd())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4736 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4737
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4738 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4739 *len_change = 1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4740
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4741 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4742 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4743 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	4744 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4745 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4746 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	4747 char **array;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4748
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	4749 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	4750 if (array == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4751 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4752 PyErr_NoMemory();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4753 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4754 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4755
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4756 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	4757 {
4633 3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4758 PyObject *line;
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4759
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4760 if (!(line = PyList_GetItem(lines, i)) \|\|
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	4761 !(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	4762 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4763 while (i)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4764 vim_free(array[--i]);
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	4765 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	4766 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4767 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4768 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4769
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4770 PyErr_Clear();
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4771 VimTryStart();
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4772 switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4773
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4774 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	4775 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	4776 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4777 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4778 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	4779 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4780 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	4781 (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	4782 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4783 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	4784
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4785 // Free the rest of the lines
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4786 while (i < size)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4787 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	4788
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4789 break;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4790 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4791 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	4792 }
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4793 if (i > 0 && save_curbuf.br_buf == NULL)
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4794 // Only adjust marks if we managed to switch to a window that
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4795 // holds the buffer, otherwise line numbers will be invalid.
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4796 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	4797 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4798
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4799 // Free the array of lines. All of its contents have now
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4800 // been freed.
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	4801 PyMem_Free(array);
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	4802 restore_win_for_buf(save_curwin, save_curtab, &save_curbuf);
5235 6fa64615c8d3 updated for version 7.4a.043 Bram Moolenaar <bram@vim.org> parents: 5202 diff changeset	4803
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4804 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4805
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	4806 if (VimTryEnd())
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4807 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4808
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4809 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4810 *len_change = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4811
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4812 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4813 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4814 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4815 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4816 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4817 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4818 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4819 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4820
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4821 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4822 * 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	4823 * -------------------------------------------
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4824 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4825
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4826 typedef struct
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4827 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4828 PyObject_HEAD
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4829 buf_T *buf;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4830 } BufferObject;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	4831
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4832 static int
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4833 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	4834 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	4835 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	4836 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4837 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	4838 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4839 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4840
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4841 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4842 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4843
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4844 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4845 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	4846 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4847 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4848 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4849
4387 358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4850 if (end == -1)
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4851 end = self->buf->b_ml.ml_line_count;
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4852
4389 736b8e18a3bc updated for version 7.3.943 Bram Moolenaar <bram@vim.org> parents: 4387 diff changeset	4853 if (n < 0)
736b8e18a3bc updated for version 7.3.943 Bram Moolenaar <bram@vim.org> parents: 4387 diff changeset	4854 n += end - start + 1;
736b8e18a3bc updated for version 7.3.943 Bram Moolenaar <bram@vim.org> parents: 4387 diff changeset	4855
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4856 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	4857 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4858 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	4859 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4860 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4861
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4862 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	4863 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4864
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4865 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4866 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	4867 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4868 PyInt size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4869
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4870 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4871 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4872
4387 358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4873 if (end == -1)
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4874 end = self->buf->b_ml.ml_line_count;
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4875
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4876 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	4877
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4878 if (lo < 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4879 lo = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4880 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	4881 lo = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4882 if (hi < 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4883 hi = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4884 if (hi < lo)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4885 hi = lo;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4886 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	4887 hi = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4888
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4889 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	4890 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4891
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4892 static PyInt
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4893 RBAsItem(
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4894 BufferObject *self,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4895 PyInt n,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4896 PyObject *valObject,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4897 PyInt start,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4898 PyInt end,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4899 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	4900 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4901 PyInt len_change;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4902
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4903 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4904 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4905
4387 358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4906 if (end == -1)
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4907 end = self->buf->b_ml.ml_line_count;
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4908
4389 736b8e18a3bc updated for version 7.3.943 Bram Moolenaar <bram@vim.org> parents: 4387 diff changeset	4909 if (n < 0)
736b8e18a3bc updated for version 7.3.943 Bram Moolenaar <bram@vim.org> parents: 4387 diff changeset	4910 n += end - start + 1;
736b8e18a3bc updated for version 7.3.943 Bram Moolenaar <bram@vim.org> parents: 4387 diff changeset	4911
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4912 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	4913 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4914 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	4915 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4916 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4917
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4918 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	4919 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4920
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4921 if (new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4922 *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	4923
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4924 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4925 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4926
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4927 static PyInt
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4928 RBAsSlice(
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4929 BufferObject *self,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4930 PyInt lo,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4931 PyInt hi,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4932 PyObject *valObject,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4933 PyInt start,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4934 PyInt end,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4935 PyInt *new_end)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4936 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4937 PyInt size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4938 PyInt len_change;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4939
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4940 // Self must be a valid buffer
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4941 if (CheckBuffer(self))
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4942 return -1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4943
4387 358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4944 if (end == -1)
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4945 end = self->buf->b_ml.ml_line_count;
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4946
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	4947 // Sort out the slice range
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4948 size = end - start + 1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4949
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4950 if (lo < 0)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4951 lo = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4952 else if (lo > size)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4953 lo = size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4954 if (hi < 0)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4955 hi = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4956 if (hi < lo)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4957 hi = lo;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4958 else if (hi > size)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4959 hi = size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4960
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4961 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	4962 valObject, &len_change) == FAIL)
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4963 return -1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4964
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4965 if (new_end)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4966 *new_end = end + len_change;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4967
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4968 return 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4969 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	4970
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4971
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4972 static PyObject *
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4973 RBAppend(
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4974 BufferObject *self,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4975 PyObject *args,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4976 PyInt start,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4977 PyInt end,
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	4978 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	4979 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4980 PyObject *lines;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4981 PyInt len_change;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4982 PyInt max;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4983 PyInt n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4984
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4985 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4986 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4987
4387 358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4988 if (end == -1)
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4989 end = self->buf->b_ml.ml_line_count;
358c10968c7f updated for version 7.3.942 Bram Moolenaar <bram@vim.org> parents: 4385 diff changeset	4990
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4991 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	4992
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4993 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	4994 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4995
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	4996 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	4997 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	4998 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	4999 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5000 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5001
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5002 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	5003 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5004
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5005 if (new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5006 *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	5007
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5008 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	5009 return Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5010 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5011
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5012 // Range object
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5013
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5014 static PyTypeObject RangeType;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5015 static PySequenceMethods RangeAsSeq;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5016 static PyMappingMethods RangeAsMapping;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5017
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5018 typedef struct
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5019 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5020 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5021 BufferObject *buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5022 PyInt start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5023 PyInt end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5024 } RangeObject;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5025
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5026 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5027 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	5028 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5029 BufferObject *bufr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5030 RangeObject *self;
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5031 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	5032 if (self == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5033 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5034
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5035 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	5036 if (bufr == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5037 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5038 Py_DECREF(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5039 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5040 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5041 Py_INCREF(bufr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5042
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5043 self->buf = bufr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5044 self->start = start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5045 self->end = end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5046
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5047 return (PyObject *)(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5048 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5049
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5050 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5051 RangeDestructor(RangeObject *self)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5052 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5053 PyObject_GC_UnTrack((void *)(self));
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5054 Py_XDECREF(self->buf);
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5055 PyObject_GC_Del((void *)(self));
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5056 }
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5057
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5058 static int
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5059 RangeTraverse(RangeObject self, visitproc visit, void arg)
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5060 {
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5061 Py_VISIT(((PyObject *)(self->buf)));
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5062 return 0;
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5063 }
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5064
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5065 static int
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5066 RangeClear(RangeObject *self)
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5067 {
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5068 Py_CLEAR(self->buf);
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5069 return 0;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5070 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5071
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5072 static PyInt
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5073 RangeLength(RangeObject *self)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5074 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5075 // HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION?
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5076 if (CheckBuffer(self->buf))
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5077 return -1; // ???
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5078
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5079 return (self->end - self->start + 1);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5080 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5081
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5082 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5083 RangeItem(RangeObject *self, PyInt n)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5084 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5085 return RBItem(self->buf, n, self->start, self->end);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5086 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5087
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5088 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5089 RangeSlice(RangeObject *self, PyInt lo, PyInt hi)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5090 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5091 return RBSlice(self->buf, lo, hi, self->start, self->end);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5092 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5093
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5094 static char *RangeAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5095 "start", "end",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5096 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5097 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5098
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5099 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5100 RangeDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5101 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5102 return ObjectDir(self, RangeAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5103 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5104
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5105 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5106 RangeAppend(RangeObject self, PyObject args)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5107 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5108 return RBAppend(self->buf, args, self->start, self->end, &self->end);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5109 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5110
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5111 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5112 RangeRepr(RangeObject *self)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5113 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5114 if (self->buf->buf == INVALID_BUFFER_VALUE)
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5115 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	5116 (self));
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5117 else
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5118 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5119 char name = (char )self->buf->buf->b_fname;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5120
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5121 if (name == NULL)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5122 name = "";
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5123
548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5124 return PyString_FromFormat("<range %s (%d:%d)>",
4653 b943fd24c351 updated for version 7.3.1074 Bram Moolenaar <bram@vim.org> parents: 4645 diff changeset	5125 name, (int)self->start, (int)self->end);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5126 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5127 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5128
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5129 static struct PyMethodDef RangeMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5130 // name, function, calling, documentation
4492 f74611bfb1b7 updated for version 7.3.994 Bram Moolenaar <bram@vim.org> parents: 4490 diff changeset	5131 {"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	5132 {"__dir__", (PyCFunction)RangeDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5133 { NULL, NULL, 0, NULL}
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5134 };
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5135
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5136 static PyTypeObject BufferType;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5137 static PySequenceMethods BufferAsSeq;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5138 static PyMappingMethods BufferAsMapping;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5139
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5140 static PyObject *
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5141 BufferNew(buf_T *buf)
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5142 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5143 /*
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5144 * We need to handle deletion of buffers underneath us.
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5145 * If we add a "b_python*_ref" field to the buf_T structure,
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5146 * then we can get at it in buf_freeall() in vim. We then
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5147 * need to create only ONE Python object per buffer - if
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5148 * we try to create a second, just INCREF the existing one
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5149 * and return it. The (single) Python object referring to
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5150 * the buffer is stored in "b_python*_ref".
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5151 * Question: what to do on a buf_freeall(). We'll probably
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5152 * have to either delete the Python object (DECREF it to
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5153 * zero - a bad idea, as it leaves dangling refs!) or
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5154 * set the buf_T * value to an invalid value (-1?), which
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5155 * means we need checks in all access functions... Bah.
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5156 *
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5157 * Python2 and Python3 get different fields and different objects:
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5158 * b_python_ref and b_python3_ref fields respectively.
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5159 */
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5160
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5161 BufferObject *self;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5162
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5163 if (BUF_PYTHON_REF(buf) != NULL)
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5164 {
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5165 self = BUF_PYTHON_REF(buf);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5166 Py_INCREF(self);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5167 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5168 else
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5169 {
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5170 self = PyObject_NEW(BufferObject, &BufferType);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5171 if (self == NULL)
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5172 return NULL;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5173 self->buf = buf;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5174 BUF_PYTHON_REF(buf) = self;
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5175 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5176
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5177 return (PyObject *)(self);
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5178 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5179
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5180 static void
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5181 BufferDestructor(BufferObject *self)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5182 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5183 if (self->buf && self->buf != INVALID_BUFFER_VALUE)
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5184 BUF_PYTHON_REF(self->buf) = NULL;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5185
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5186 DESTRUCTOR_FINISH(self);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5187 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5188
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5189 static PyInt
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5190 BufferLength(BufferObject *self)
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5191 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5192 // HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION?
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5193 if (CheckBuffer(self))
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5194 return -1; // ???
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5195
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5196 return (PyInt)(self->buf->b_ml.ml_line_count);
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5197 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5198
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5199 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5200 BufferItem(BufferObject *self, PyInt n)
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5201 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5202 return RBItem(self, n, 1, -1);
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5203 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5204
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5205 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5206 BufferSlice(BufferObject *self, PyInt lo, PyInt hi)
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5207 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5208 return RBSlice(self, lo, hi, 1, -1);
4377 8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5209 }
8ec7323f417d updated for version 7.3.937 Bram Moolenaar <bram@vim.org> parents: 4359 diff changeset	5210
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5211 static char *BufferAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5212 "name", "number", "vars", "options", "valid",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5213 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5214 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5215
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5216 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5217 BufferDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5218 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5219 return ObjectDir(self, BufferAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5220 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5221
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5222 static PyObject *
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5223 BufferAttrValid(BufferObject self, char name)
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5224 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5225 PyObject *ret;
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5226
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5227 if (strcmp(name, "valid") != 0)
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5228 return NULL;
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5229
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5230 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	5231 Py_INCREF(ret);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5232 return ret;
4593 0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5233 }
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5234
0cf552b325b5 updated for version 7.3.1044 Bram Moolenaar <bram@vim.org> parents: 4589 diff changeset	5235 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5236 BufferAttr(BufferObject self, char name)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5237 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5238 if (strcmp(name, "name") == 0)
4597 00eecb2f8e3e updated for version 7.3.1046 Bram Moolenaar <bram@vim.org> parents: 4595 diff changeset	5239 return PyString_FromString((self->buf->b_ffname == NULL
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5240 ? "" : (char *)self->buf->b_ffname));
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5241 else if (strcmp(name, "number") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5242 return Py_BuildValue(Py_ssize_t_fmt, self->buf->b_fnum);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5243 else if (strcmp(name, "vars") == 0)
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	5244 return NEW_DICTIONARY(self->buf->b_vars);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5245 else if (strcmp(name, "options") == 0)
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5246 return OptionsNew(SREQ_BUF, self->buf, (checkfun) CheckBuffer,
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5247 (PyObject *) self);
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5248 else if (strcmp(name, "__members__") == 0)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5249 return ObjectDir(NULL, BufferAttrs);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5250 else
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5251 return NULL;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5252 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5253
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5254 static int
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5255 BufferSetattr(BufferObject self, char name, PyObject *valObject)
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5256 {
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5257 if (CheckBuffer(self))
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5258 return -1;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5259
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5260 if (strcmp(name, "name") == 0)
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5261 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5262 char_u *val;
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5263 aco_save_T aco;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5264 int ren_ret;
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5265 PyObject *todecref;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5266
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5267 if (!(val = StringToChars(valObject, &todecref)))
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5268 return -1;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5269
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5270 VimTryStart();
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5271 // Using aucmd_*: autocommands will be executed by rename_buffer
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5272 aucmd_prepbuf(&aco, self->buf);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5273 ren_ret = rename_buffer(val);
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5274 aucmd_restbuf(&aco);
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5275 Py_XDECREF(todecref);
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5276 if (VimTryEnd())
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5277 return -1;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5278
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5279 if (ren_ret == FAIL)
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5280 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5281 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	5282 return -1;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5283 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5284 return 0;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5285 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5286 else
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5287 {
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5288 PyErr_SetString(PyExc_AttributeError, name);
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5289 return -1;
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5290 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5291 }
fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	5292
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5293 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5294 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	5295 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5296 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	5297 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5298
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5299 static PyObject *
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5300 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	5301 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5302 pos_T *posp;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5303 char_u *pmark;
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5304 char_u mark;
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	5305 bufref_T savebuf;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5306 PyObject *todecref;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5307
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5308 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	5309 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5310
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5311 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	5312 return NULL;
4633 3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	5313
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5314 if (pmark[0] == '\0' \|\| pmark[1] != '\0')
4633 3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	5315 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	5316 PyErr_SET_STRING(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5317 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	5318 Py_XDECREF(todecref);
4633 3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	5319 return NULL;
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	5320 }
3857d399ab41 updated for version 7.3.1064 Bram Moolenaar <bram@vim.org> parents: 4631 diff changeset	5321
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5322 mark = *pmark;
4964 5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5323
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5324 Py_XDECREF(todecref);
5cee875f3096 updated for version 7.3.1227 Bram Moolenaar <bram@vim.org> parents: 4962 diff changeset	5325
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5326 VimTryStart();
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5327 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	5328 posp = getmark(mark, FALSE);
9487 69ed2c9d34a6 commit https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b Christian Brabandt <cb@256bit.org> parents: 9161 diff changeset	5329 restore_buffer(&savebuf);
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5330 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5331 return NULL;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5332
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5333 if (posp == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5334 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5335 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	5336 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5337 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5338
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5339 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	5340 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5341 // Or raise an error?
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5342 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	5343 return Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5344 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5345
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5346 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	5347 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5348
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5349 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5350 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	5351 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5352 PyInt start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5353 PyInt end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5354
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5355 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	5356 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5357
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5358 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	5359 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5360
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5361 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	5362 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5363
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5364 static PyObject *
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5365 BufferRepr(BufferObject *self)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5366 {
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	5367 if (self->buf == INVALID_BUFFER_VALUE)
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5368 return PyString_FromFormat("<buffer object (deleted) at %p>", self);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5369 else
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5370 {
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5371 char name = (char )self->buf->b_fname;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5372
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5373 if (name == NULL)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5374 name = "";
4623 548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5375
548b889fe3cf updated for version 7.3.1059 Bram Moolenaar <bram@vim.org> parents: 4619 diff changeset	5376 return PyString_FromFormat("<buffer %s>", name);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5377 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5378 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5379
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5380 static struct PyMethodDef BufferMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5381 // name, function, calling, documentation
4492 f74611bfb1b7 updated for version 7.3.994 Bram Moolenaar <bram@vim.org> parents: 4490 diff changeset	5382 {"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	5383 {"mark", (PyCFunction)BufferMark, METH_O, "Return (row,col) representing position of named mark" },
4492 f74611bfb1b7 updated for version 7.3.994 Bram Moolenaar <bram@vim.org> parents: 4490 diff changeset	5384 {"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	5385 {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5386 { 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	5387 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	5388
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5389 /*
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5390 * Buffer list object - Implementation
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5391 */
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5392
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5393 static PyTypeObject BufMapType;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5394
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5395 typedef struct
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5396 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5397 PyObject_HEAD
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5398 } BufMapObject;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5399
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5400 static PyInt
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5401 BufMapLength(PyObject *self UNUSED)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5402 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5403 buf_T *b = firstbuf;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5404 PyInt n = 0;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5405
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5406 while (b)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5407 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5408 ++n;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5409 b = b->b_next;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5410 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5411
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5412 return n;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5413 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5414
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5415 static PyObject *
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5416 BufMapItem(PyObject self UNUSED, PyObject keyObject)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5417 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5418 buf_T *b;
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	5419 long bnr;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	5420
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	5421 if (NumberToLong(keyObject, &bnr, NUMBER_INT\|NUMBER_NATURAL))
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5422 return NULL;
4972 537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	5423
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	5424 b = buflist_findnr((int) bnr);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5425
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5426 if (b)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5427 return BufferNew(b);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5428 else
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5429 {
4403 d4816e7c3328 updated for version 7.3.950 Bram Moolenaar <bram@vim.org> parents: 4401 diff changeset	5430 PyErr_SetObject(PyExc_KeyError, keyObject);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5431 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5432 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5433 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5434
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5435 static void
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5436 BufMapIterDestruct(PyObject *buffer)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5437 {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5438 // Iteration was stopped before all buffers were processed
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5439 if (buffer)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5440 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5441 Py_DECREF(buffer);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5442 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5443 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5444
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5445 static int
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5446 BufMapIterTraverse(PyObject buffer, visitproc visit, void arg)
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5447 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5448 if (buffer)
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5449 Py_VISIT(buffer);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5450 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5451 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5452
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5453 static int
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5454 BufMapIterClear(PyObject **buffer)
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5455 {
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5456 if (*buffer)
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	5457 Py_CLEAR(*buffer);
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5458 return 0;
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5459 }
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5460
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5461 static PyObject *
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5462 BufMapIterNext(PyObject **buffer)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5463 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5464 PyObject *next;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5465 PyObject *ret;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5466
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5467 if (!*buffer)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5468 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5469
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5470 ret = *buffer;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5471
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5472 if (CheckBuffer((BufferObject *)(ret)))
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5473 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5474 *buffer = NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5475 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5476 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5477
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5478 if (!((BufferObject *)(ret))->buf->b_next)
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5479 next = NULL;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5480 else if (!(next = BufferNew(((BufferObject *)(ret))->buf->b_next)))
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5481 return NULL;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5482 *buffer = next;
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5483 // Do not increment reference: we no longer hold it (decref), but whoever
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5484 // 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	5485 return ret;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5486 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5487
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5488 static PyObject *
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5489 BufMapIter(PyObject *self UNUSED)
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5490 {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5491 PyObject *buffer;
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5492
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5493 buffer = BufferNew(firstbuf);
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5494 return IterNew(buffer,
4433 8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5495 (destructorfun) BufMapIterDestruct, (nextfun) BufMapIterNext,
8a3ca4adb5d8 updated for version 7.3.965 Bram Moolenaar <bram@vim.org> parents: 4431 diff changeset	5496 (traversefun) BufMapIterTraverse, (clearfun) BufMapIterClear);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5497 }
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5498
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5499 static PyMappingMethods BufMapAsMapping = {
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5500 (lenfunc) BufMapLength,
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5501 (binaryfunc) BufMapItem,
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5502 (objobjargproc) 0,
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5503 };
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	5504
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5505 // 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	5506
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5507 static char *CurrentAttrs[] = {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5508 "buffer", "window", "line", "range", "tabpage",
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5509 NULL
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5510 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5511
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5512 static PyObject *
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5513 CurrentDir(PyObject *self)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5514 {
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5515 return ObjectDir(self, CurrentAttrs);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5516 }
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5517
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5518 static PyObject *
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5519 CurrentGetattr(PyObject self UNUSED, char name)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5520 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5521 if (strcmp(name, "buffer") == 0)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5522 return (PyObject *)BufferNew(curbuf);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5523 else if (strcmp(name, "window") == 0)
4431 7d81f4e96728 updated for version 7.3.964 Bram Moolenaar <bram@vim.org> parents: 4429 diff changeset	5524 return (PyObject *)WindowNew(curwin, curtab);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	5525 else if (strcmp(name, "tabpage") == 0)
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	5526 return (PyObject *)TabPageNew(curtab);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5527 else if (strcmp(name, "line") == 0)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5528 return GetBufferLine(curbuf, (PyInt)curwin->w_cursor.lnum);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5529 else if (strcmp(name, "range") == 0)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5530 return RangeNew(curbuf, RangeStart, RangeEnd);
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5531 else if (strcmp(name, "__members__") == 0)
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5532 return ObjectDir(NULL, CurrentAttrs);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5533 else
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5534 #if PY_MAJOR_VERSION < 3
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5535 return Py_FindMethod(WindowMethods, self, name);
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5536 #else
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5537 return NULL;
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5538 #endif
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5539 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5540
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5541 static int
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5542 CurrentSetattr(PyObject self UNUSED, char name, PyObject *valObject)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5543 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5544 if (strcmp(name, "line") == 0)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5545 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5546 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	5547 NULL) == FAIL)
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5548 return -1;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5549
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5550 return 0;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5551 }
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5552 else if (strcmp(name, "buffer") == 0)
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5553 {
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5554 int count;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5555
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5556 if (valObject->ob_type != &BufferType)
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5557 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	5558 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5559 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	5560 Py_TYPE_NAME(valObject));
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5561 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5562 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5563
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5564 if (CheckBuffer((BufferObject *)(valObject)))
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5565 return -1;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5566 count = ((BufferObject *)(valObject))->buf->b_fnum;
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5567
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5568 VimTryStart();
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5569 if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, count, 0) == FAIL)
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5570 {
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5571 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5572 return -1;
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5573 PyErr_VIM_FORMAT(N_("failed to switch to buffer %d"), count);
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5574 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5575 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5576
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5577 return VimTryEnd();
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5578 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5579 else if (strcmp(name, "window") == 0)
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5580 {
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5581 int count;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5582
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5583 if (valObject->ob_type != &WindowType)
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5584 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	5585 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5586 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	5587 Py_TYPE_NAME(valObject));
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5588 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5589 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5590
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5591 if (CheckWindow((WindowObject *)(valObject)))
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5592 return -1;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5593 count = get_win_number(((WindowObject *)(valObject))->win, firstwin);
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5594
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5595 if (!count)
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5596 {
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	5597 PyErr_SET_STRING(PyExc_ValueError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5598 N_("failed to find window in the current tab page"));
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5599 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5600 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5601
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5602 VimTryStart();
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5603 win_goto(((WindowObject *)(valObject))->win);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5604 if (((WindowObject *)(valObject))->win != curwin)
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5605 {
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5606 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5607 return -1;
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	5608 PyErr_SET_STRING(PyExc_RuntimeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5609 N_("did not switch to the specified window"));
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5610 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5611 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5612
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5613 return VimTryEnd();
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5614 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5615 else if (strcmp(name, "tabpage") == 0)
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5616 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5617 if (valObject->ob_type != &TabPageType)
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5618 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	5619 PyErr_FORMAT(PyExc_TypeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5620 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	5621 Py_TYPE_NAME(valObject));
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5622 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5623 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5624
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5625 if (CheckTabPage((TabPageObject *)(valObject)))
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5626 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5627
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5628 VimTryStart();
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5629 goto_tabpage_tp(((TabPageObject *)(valObject))->tab, TRUE, TRUE);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5630 if (((TabPageObject *)(valObject))->tab != curtab)
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5631 {
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5632 if (VimTryEnd())
ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5633 return -1;
4968 b6e693e1f946 updated for version 7.3.1229 Bram Moolenaar <bram@vim.org> parents: 4966 diff changeset	5634 PyErr_SET_STRING(PyExc_RuntimeError,
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	5635 N_("did not switch to the specified tab page"));
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5636 return -1;
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5637 }
2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5638
4498 ef02f32d8e53 updated for version 7.3.997 Bram Moolenaar <bram@vim.org> parents: 4496 diff changeset	5639 return VimTryEnd();
4407 2a166caf8709 updated for version 7.3.952 Bram Moolenaar <bram@vim.org> parents: 4405 diff changeset	5640 }
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5641 else
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5642 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5643 PyErr_SetString(PyExc_AttributeError, name);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5644 return -1;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5645 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5646 }
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	5647
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5648 static struct PyMethodDef CurrentMethods[] = {
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5649 // name, function, calling, documentation
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5650 {"__dir__", (PyCFunction)CurrentDir, METH_NOARGS, ""},
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5651 { NULL, NULL, 0, NULL}
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5652 };
89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	5653
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5654 static void
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5655 init_range_cmd(exarg_T *eap)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5656 {
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5657 RangeStart = eap->line1;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5658 RangeEnd = eap->line2;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5659 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5660
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5661 static void
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5662 init_range_eval(typval_T *rettv UNUSED)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5663 {
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5664 RangeStart = (PyInt) curwin->w_cursor.lnum;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5665 RangeEnd = RangeStart;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5666 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5667
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5668 static void
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5669 run_cmd(const char cmd, void arg UNUSED
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5670 #ifdef PY_CAN_RECURSE
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5671 , PyGILState_STATE *pygilstate UNUSED
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5672 #endif
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5673 )
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5674 {
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5675 PyObject *run_ret;
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5676 run_ret = PyRun_String((char *)cmd, Py_file_input, globals, globals);
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5677 if (run_ret != NULL)
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5678 {
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5679 Py_DECREF(run_ret);
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5680 }
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5681 else if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit))
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5682 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	5683 semsg(_(e_py_systemexit), "python");
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5684 PyErr_Clear();
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5685 }
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5686 else
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5687 PyErr_PrintEx(1);
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5688 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5689
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5690 static const char *code_hdr = "def " DOPY_FUNC "(line, linenr):\n ";
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5691 static int code_hdr_len = 30;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5692
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5693 static void
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5694 run_do(const char cmd, void arg UNUSED
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5695 #ifdef PY_CAN_RECURSE
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5696 , PyGILState_STATE *pygilstate
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5697 #endif
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5698 )
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5699 {
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5700 PyInt lnum;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5701 size_t len;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5702 char *code;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5703 int status;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5704 PyObject pyfunc, pymain;
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5705 PyObject *run_ret;
10751 27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5706 buf_T *was_curbuf = curbuf;
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5707
4575 626e9ccb7c48 updated for version 7.3.1035 Bram Moolenaar <bram@vim.org> parents: 4523 diff changeset	5708 if (u_save((linenr_T)RangeStart - 1, (linenr_T)RangeEnd + 1) != OK)
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5709 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	5710 emsg(_("cannot save undo information"));
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5711 return;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5712 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5713
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5714 len = code_hdr_len + STRLEN(cmd);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5715 code = PyMem_New(char, len + 1);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5716 memcpy(code, code_hdr, code_hdr_len);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5717 STRCPY(code + code_hdr_len, cmd);
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5718 run_ret = PyRun_String(code, Py_file_input, globals, globals);
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5719 status = -1;
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5720 if (run_ret != NULL)
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5721 {
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5722 status = 0;
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5723 Py_DECREF(run_ret);
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5724 }
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5725 else if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit))
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5726 {
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5727 PyMem_Free(code);
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	5728 semsg(_(e_py_systemexit), "python");
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5729 PyErr_Clear();
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5730 return;
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5731 }
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5732 else
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5733 PyErr_PrintEx(1);
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5734
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5735 PyMem_Free(code);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5736
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5737 if (status)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5738 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	5739 emsg(_("failed to run the code"));
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5740 return;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5741 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5742
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5743 status = 0;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5744 pymain = PyImport_AddModule("__main__");
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5745 pyfunc = PyObject_GetAttrString(pymain, DOPY_FUNC);
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5746 #ifdef PY_CAN_RECURSE
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5747 PyGILState_Release(*pygilstate);
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5748 #endif
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5749
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5750 for (lnum = RangeStart; lnum <= RangeEnd; ++lnum)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5751 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5752 PyObject *line;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5753 PyObject *linenr;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5754 PyObject *ret;
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5755
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5756 #ifdef PY_CAN_RECURSE
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5757 *pygilstate = PyGILState_Ensure();
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5758 #endif
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5759 // Check the line number, the command my have deleted lines.
10751 27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5760 if (lnum > curbuf->b_ml.ml_line_count
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5761 \|\| !(line = GetBufferLine(curbuf, lnum)))
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5762 goto err;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5763 if (!(linenr = PyInt_FromLong((long) lnum)))
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5764 {
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5765 Py_DECREF(line);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5766 goto err;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5767 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5768 ret = PyObject_CallFunctionObjArgs(pyfunc, line, linenr, NULL);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5769 Py_DECREF(line);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5770 Py_DECREF(linenr);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5771 if (!ret)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5772 goto err;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5773
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	5774 // Check that the command didn't switch to another buffer.
10751 27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5775 if (curbuf != was_curbuf)
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5776 {
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5777 Py_XDECREF(ret);
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5778 goto err;
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5779 }
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5780
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5781 if (ret != Py_None)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5782 if (SetBufferLine(curbuf, lnum, ret, NULL) == FAIL)
10751 27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5783 {
27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5784 Py_XDECREF(ret);
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5785 goto err;
10751 27b42717662b patch 8.0.0265: may get ml_get error when :pydo deletes lines Christian Brabandt <cb@256bit.org> parents: 9967 diff changeset	5786 }
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5787
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5788 Py_XDECREF(ret);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5789 PythonIO_Flush();
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5790 #ifdef PY_CAN_RECURSE
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5791 PyGILState_Release(*pygilstate);
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5792 #endif
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5793 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5794 goto out;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5795 err:
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5796 #ifdef PY_CAN_RECURSE
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5797 *pygilstate = PyGILState_Ensure();
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5798 #endif
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5799 PyErr_PrintEx(0);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5800 PythonIO_Flush();
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5801 status = 1;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5802 out:
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5803 #ifdef PY_CAN_RECURSE
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5804 if (!status)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5805 *pygilstate = PyGILState_Ensure();
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5806 #endif
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5807 Py_DECREF(pyfunc);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5808 PyObject_SetAttrString(pymain, DOPY_FUNC, NULL);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5809 if (status)
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5810 return;
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5811 check_cursor();
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5812 update_curbuf(NOT_VALID);
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5813 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5814
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5815 static void
4511 ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5816 run_eval(const char cmd, typval_T rettv
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5817 #ifdef PY_CAN_RECURSE
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5818 , PyGILState_STATE *pygilstate UNUSED
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5819 #endif
ce94a870b59b updated for version 7.3.1003 Bram Moolenaar <bram@vim.org> parents: 4509 diff changeset	5820 )
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5821 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5822 PyObject *run_ret;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5823
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5824 run_ret = PyRun_String((char *)cmd, Py_eval_input, globals, globals);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5825 if (run_ret == NULL)
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5826 {
5139 80bab8b1a30d updated for version 7.3.1312 Bram Moolenaar <bram@vim.org> parents: 5088 diff changeset	5827 if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_SystemExit))
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5828 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	5829 semsg(_(e_py_systemexit), "python");
5088 34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5830 PyErr_Clear();
34c629c3b4ba updated for version 7.3.1287 Bram Moolenaar <bram@vim.org> parents: 4995 diff changeset	5831 }
5139 80bab8b1a30d updated for version 7.3.1312 Bram Moolenaar <bram@vim.org> parents: 5088 diff changeset	5832 else
80bab8b1a30d updated for version 7.3.1312 Bram Moolenaar <bram@vim.org> parents: 5088 diff changeset	5833 {
80bab8b1a30d updated for version 7.3.1312 Bram Moolenaar <bram@vim.org> parents: 5088 diff changeset	5834 if (PyErr_Occurred() && !msg_silent)
80bab8b1a30d updated for version 7.3.1312 Bram Moolenaar <bram@vim.org> parents: 5088 diff changeset	5835 PyErr_PrintEx(0);
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	5836 emsg(_("E858: Eval did not return a valid python object"));
5139 80bab8b1a30d updated for version 7.3.1312 Bram Moolenaar <bram@vim.org> parents: 5088 diff changeset	5837 }
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5838 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5839 else
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5840 {
12806 ef93c4415667 patch 8.0.1280: Python None cannot be converted to a Vim type Christian Brabandt <cb@256bit.org> parents: 12515 diff changeset	5841 if (ConvertFromPyObject(run_ret, rettv) == -1)
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	5842 emsg(_("E859: Failed to convert returned python object to a Vim value"));
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	5843 Py_DECREF(run_ret);
4486 8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5844 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5845 PyErr_Clear();
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5846 }
8fe768bc1234 updated for version 7.3.991 Bram Moolenaar <bram@vim.org> parents: 4438 diff changeset	5847
6565 38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5848 static int
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5849 set_ref_in_py(const int copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5850 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5851 pylinkedlist_T *cur;
17168 1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5852 list_T *ll;
1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5853 int i;
1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5854 int abort = FALSE;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5855 FunctionObject *func;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5856
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5857 if (lastdict != NULL)
6565 38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5858 {
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5859 for (cur = lastdict ; !abort && cur != NULL ; cur = cur->pll_prev)
17168 1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5860 abort = set_ref_in_dict(((DictionaryObject *)(cur->pll_obj))->dict,
1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5861 copyID);
6565 38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5862 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5863
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5864 if (lastlist != NULL)
6565 38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5865 {
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5866 for (cur = lastlist ; !abort && cur != NULL ; cur = cur->pll_prev)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5867 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5868 ll = ((ListObject *) (cur->pll_obj))->list;
17168 1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5869 abort = set_ref_in_list(ll, copyID);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5870 }
6565 38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5871 }
38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5872
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5873 if (lastfunc != NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5874 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5875 for (cur = lastfunc ; !abort && cur != NULL ; cur = cur->pll_prev)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5876 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5877 func = (FunctionObject *) cur->pll_obj;
17168 1d30eb64a7a2 patch 8.1.1583: set_ref_in_list() only sets ref in items Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	5878 abort = set_ref_in_dict(func->self, copyID);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5879 if (func->argc)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5880 for (i = 0; !abort && i < func->argc; ++i)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5881 abort = abort
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5882 \|\| set_ref_in_item(&func->argv[i], copyID, NULL, NULL);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5883 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5884 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	5885
6565 38add5a3d617 updated for version 7.4.609 Bram Moolenaar <bram@vim.org> parents: 6454 diff changeset	5886 return abort;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5887 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5888
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5889 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5890 set_string_copy(char_u str, typval_T tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5891 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5892 tv->vval.v_string = vim_strsave(str);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5893 if (tv->vval.v_string == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5894 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5895 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5896 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5897 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5898 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5899 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	5900
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5901 static int
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5902 pydict_to_tv(PyObject obj, typval_T tv, PyObject *lookup_dict)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5903 {
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5904 dict_T *dict;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5905 char_u *key;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5906 dictitem_T *di;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5907 PyObject *keyObject;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5908 PyObject *valObject;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5909 Py_ssize_t iter = 0;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5910
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	5911 if (!(dict = py_dict_alloc()))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5912 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5913
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5914 tv->v_type = VAR_DICT;
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5915 tv->vval.v_dict = dict;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5916
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5917 while (PyDict_Next(obj, &iter, &keyObject, &valObject))
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5918 {
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5919 PyObject *todecref = NULL;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5920
4607 70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	5921 if (keyObject == NULL \|\| valObject == NULL)
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5922 {
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5923 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5924 return -1;
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5925 }
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5926
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5927 if (!(key = StringToChars(keyObject, &todecref)))
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5928 {
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5929 dict_unref(dict);
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5930 return -1;
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5931 }
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	5932
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5933 if (*key == NUL)
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5934 {
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5935 dict_unref(dict);
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5936 Py_XDECREF(todecref);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	5937 RAISE_NO_EMPTY_KEYS;
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5938 return -1;
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5939 }
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5940
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5941 di = dictitem_alloc(key);
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5942
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	5943 Py_XDECREF(todecref);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5944
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5945 if (di == NULL)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5946 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5947 PyErr_NoMemory();
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5948 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5949 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5950 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5951
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5952 if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5953 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5954 vim_free(di);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5955 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5956 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5957 }
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5958
19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5959 if (dict_add(dict, di) == FAIL)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5960 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	5961 RAISE_KEY_ADD_FAIL(di->di_key);
4607 70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	5962 clear_tv(&di->di_tv);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5963 vim_free(di);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5964 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5965 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5966 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5967 }
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5968
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5969 --dict->dv_refcount;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5970 return 0;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5971 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5972
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5973 static int
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5974 pymap_to_tv(PyObject obj, typval_T tv, PyObject *lookup_dict)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5975 {
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5976 dict_T *dict;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5977 char_u *key;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5978 dictitem_T *di;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5979 PyObject *list;
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5980 PyObject *iterator;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5981 PyObject *keyObject;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5982 PyObject *valObject;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5983
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	5984 if (!(dict = py_dict_alloc()))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5985 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5986
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5987 tv->v_type = VAR_DICT;
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	5988 tv->vval.v_dict = dict;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5989
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5990 if (!(list = PyMapping_Keys(obj)))
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5991 {
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5992 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	5993 return -1;
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	5994 }
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5995
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5996 if (!(iterator = PyObject_GetIter(list)))
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5997 {
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5998 dict_unref(dict);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	5999 Py_DECREF(list);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6000 return -1;
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6001 }
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6002 Py_DECREF(list);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6003
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6004 while ((keyObject = PyIter_Next(iterator)))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6005 {
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6006 PyObject *todecref;
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6007
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6008 if (!(key = StringToChars(keyObject, &todecref)))
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6009 {
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6010 Py_DECREF(keyObject);
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6011 Py_DECREF(iterator);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6012 dict_unref(dict);
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6013 return -1;
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6014 }
4702 26f2dbea7443 updated for version 7.3.1098 Bram Moolenaar <bram@vim.org> parents: 4698 diff changeset	6015
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6016 if (*key == NUL)
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6017 {
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6018 Py_DECREF(keyObject);
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6019 Py_DECREF(iterator);
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6020 Py_XDECREF(todecref);
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6021 dict_unref(dict);
4659 80b0081824fa updated for version 7.3.1077 Bram Moolenaar <bram@vim.org> parents: 4653 diff changeset	6022 RAISE_NO_EMPTY_KEYS;
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6023 return -1;
6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6024 }
4607 70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6025
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6026 if (!(valObject = PyObject_GetItem(obj, keyObject)))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6027 {
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6028 Py_DECREF(keyObject);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6029 Py_DECREF(iterator);
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6030 Py_XDECREF(todecref);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6031 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6032 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6033 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6034
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6035 di = dictitem_alloc(key);
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6036
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6037 Py_DECREF(keyObject);
4643 6ec3dada4ad3 updated for version 7.3.1069 Bram Moolenaar <bram@vim.org> parents: 4641 diff changeset	6038 Py_XDECREF(todecref);
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6039
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6040 if (di == NULL)
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6041 {
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6042 Py_DECREF(iterator);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6043 Py_DECREF(valObject);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6044 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6045 PyErr_NoMemory();
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6046 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6047 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6048
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6049 if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6050 {
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6051 Py_DECREF(iterator);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6052 Py_DECREF(valObject);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6053 vim_free(di);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6054 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6055 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6056 }
4607 70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6057
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6058 Py_DECREF(valObject);
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6059
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6060 if (dict_add(dict, di) == FAIL)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6061 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	6062 RAISE_KEY_ADD_FAIL(di->di_key);
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6063 Py_DECREF(iterator);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6064 dictitem_free(di);
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6065 dict_unref(dict);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6066 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6067 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6068 }
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6069 Py_DECREF(iterator);
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6070 --dict->dv_refcount;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6071 return 0;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6072 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6073
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6074 static int
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6075 pyseq_to_tv(PyObject obj, typval_T tv, PyObject *lookup_dict)
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6076 {
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6077 list_T *l;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6078
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6079 if (!(l = py_list_alloc()))
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6080 return -1;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6081
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6082 tv->v_type = VAR_LIST;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6083 tv->vval.v_list = l;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6084
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6085 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	6086 {
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6087 list_unref(l);
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6088 return -1;
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6089 }
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6090
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6091 --l->lv_refcount;
4385 da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6092 return 0;
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6093 }
da71e66dc1d4 updated for version 7.3.941 Bram Moolenaar <bram@vim.org> parents: 4383 diff changeset	6094
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6095 typedef int (pytotvfunc)(PyObject , typval_T , PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6096
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6097 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6098 convert_dl(PyObject obj, typval_T tv,
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6099 pytotvfunc py_to_tv, PyObject *lookup_dict)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6100 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6101 PyObject *capsule;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6102 char hexBuf[sizeof(void ) 2 + 3];
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6103
13353 8412df1479a3 patch 8.0.1550: various small problems in source files Christian Brabandt <cb@256bit.org> parents: 12812 diff changeset	6104 sprintf(hexBuf, "%p", (void *)obj);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6105
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6106 #ifdef PY_USE_CAPSULE
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6107 capsule = PyDict_GetItemString(lookup_dict, hexBuf);
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6108 #else
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6109 capsule = (PyObject *)PyDict_GetItemString(lookup_dict, hexBuf);
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6110 #endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6111 if (capsule == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6112 {
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6113 #ifdef PY_USE_CAPSULE
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6114 capsule = PyCapsule_New(tv, NULL, NULL);
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6115 #else
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	6116 capsule = PyCObject_FromVoidPtr(tv, NULL);
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6117 #endif
4607 70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6118 if (PyDict_SetItemString(lookup_dict, hexBuf, capsule))
70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6119 {
70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6120 Py_DECREF(capsule);
70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6121 tv->v_type = VAR_UNKNOWN;
70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6122 return -1;
70600448f9e7 updated for version 7.3.1051 Bram Moolenaar <bram@vim.org> parents: 4605 diff changeset	6123 }
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	6124
4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	6125 Py_DECREF(capsule);
4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	6126
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6127 if (py_to_tv(obj, tv, lookup_dict) == -1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6128 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6129 tv->v_type = VAR_UNKNOWN;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6130 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6131 }
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	6132 // As we are not using copy_tv which increments reference count we must
6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	6133 // do it ourself.
7949 3f7382858d4d commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371 Christian Brabandt <cb@256bit.org> parents: 7712 diff changeset	6134 if (tv->v_type == VAR_DICT)
3f7382858d4d commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371 Christian Brabandt <cb@256bit.org> parents: 7712 diff changeset	6135 ++tv->vval.v_dict->dv_refcount;
3f7382858d4d commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371 Christian Brabandt <cb@256bit.org> parents: 7712 diff changeset	6136 else if (tv->v_type == VAR_LIST)
3f7382858d4d commit https://github.com/vim/vim/commit/81e7a9c3fb37cad46c8f04a5ce871fb06819a371 Christian Brabandt <cb@256bit.org> parents: 7712 diff changeset	6137 ++tv->vval.v_list->lv_refcount;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6138 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6139 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6140 {
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	6141 typval_T *v;
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	6142
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6143 #ifdef PY_USE_CAPSULE
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	6144 v = PyCapsule_GetPointer(capsule, NULL);
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6145 #else
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	6146 v = PyCObject_AsVoidPtr(capsule);
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6147 #endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6148 copy_tv(v, tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6149 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6150 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6151 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6152
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6153 static int
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6154 ConvertFromPyMapping(PyObject obj, typval_T tv)
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6155 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6156 PyObject *lookup_dict;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6157 int ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6158
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6159 if (!(lookup_dict = PyDict_New()))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6160 return -1;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6161
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6162 if (PyType_IsSubtype(obj->ob_type, &DictionaryType))
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6163 {
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6164 tv->v_type = VAR_DICT;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6165 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6166 ++tv->vval.v_dict->dv_refcount;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6167 ret = 0;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6168 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6169 else if (PyDict_Check(obj))
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6170 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	6171 else if (PyMapping_Check(obj))
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6172 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	6173 else
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6174 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	6175 PyErr_FORMAT(PyExc_TypeError,
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	6176 N_("unable to convert %s to a Vim dictionary"),
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	6177 Py_TYPE_NAME(obj));
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6178 ret = -1;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6179 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6180 Py_DECREF(lookup_dict);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6181 return ret;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6182 }
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6183
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6184 static int
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6185 ConvertFromPySequence(PyObject obj, typval_T tv)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6186 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6187 PyObject *lookup_dict;
8915 8cbf472483fa commit https://github.com/vim/vim/commit/66210042892389d36e3d37203ec77f61467bfb1c Christian Brabandt <cb@256bit.org> parents: 8913 diff changeset	6188 int ret;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6189
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6190 if (!(lookup_dict = PyDict_New()))
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6191 return -1;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6192
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6193 if (PyType_IsSubtype(obj->ob_type, &ListType))
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6194 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6195 tv->v_type = VAR_LIST;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6196 tv->vval.v_list = (((ListObject *)(obj))->list);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6197 ++tv->vval.v_list->lv_refcount;
8915 8cbf472483fa commit https://github.com/vim/vim/commit/66210042892389d36e3d37203ec77f61467bfb1c Christian Brabandt <cb@256bit.org> parents: 8913 diff changeset	6198 ret = 0;
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6199 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6200 else if (PyIter_Check(obj) \|\| PySequence_Check(obj))
8915 8cbf472483fa commit https://github.com/vim/vim/commit/66210042892389d36e3d37203ec77f61467bfb1c Christian Brabandt <cb@256bit.org> parents: 8913 diff changeset	6201 ret = convert_dl(obj, tv, pyseq_to_tv, lookup_dict);
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6202 else
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6203 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6204 PyErr_FORMAT(PyExc_TypeError,
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	6205 N_("unable to convert %s to a Vim list"),
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6206 Py_TYPE_NAME(obj));
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6207 ret = -1;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6208 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6209 Py_DECREF(lookup_dict);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6210 return ret;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6211 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6212
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6213 static int
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6214 ConvertFromPyObject(PyObject obj, typval_T tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6215 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6216 PyObject *lookup_dict;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6217 int ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6218
4617 21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6219 if (!(lookup_dict = PyDict_New()))
21a99611149b updated for version 7.3.1056 Bram Moolenaar <bram@vim.org> parents: 4611 diff changeset	6220 return -1;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6221 ret = _ConvertFromPyObject(obj, tv, lookup_dict);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6222 Py_DECREF(lookup_dict);
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6223 return ret;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6224 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6225
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6226 static int
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6227 _ConvertFromPyObject(PyObject obj, typval_T tv, PyObject *lookup_dict)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6228 {
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6229 if (PyType_IsSubtype(obj->ob_type, &DictionaryType))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6230 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6231 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6232 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6233 ++tv->vval.v_dict->dv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6234 }
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	6235 else if (PyType_IsSubtype(obj->ob_type, &ListType))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6236 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6237 tv->v_type = VAR_LIST;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6238 tv->vval.v_list = (((ListObject *)(obj))->list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6239 ++tv->vval.v_list->lv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6240 }
4976 4ed713442c51 updated for version 7.3.1233 Bram Moolenaar <bram@vim.org> parents: 4974 diff changeset	6241 else if (PyType_IsSubtype(obj->ob_type, &FunctionType))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6242 {
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6243 FunctionObject func = (FunctionObject ) obj;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6244 if (func->self != NULL \|\| func->argv != NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6245 {
16825 ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16782 diff changeset	6246 partial_T *pt = ALLOC_CLEAR_ONE(partial_T);
ce04ebdf26b8 patch 8.1.1414: alloc() returning "char_u " causes a lot of type casts Bram Moolenaar <Bram@vim.org>* parents: 16782 diff changeset	6247
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6248 set_partial(func, pt, TRUE);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6249 tv->vval.v_partial = pt;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6250 tv->v_type = VAR_PARTIAL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6251 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6252 else
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6253 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6254 if (set_string_copy(func->name, tv) == -1)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6255 return -1;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6256
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6257 tv->v_type = VAR_FUNC;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6258 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6259 func_ref(func->name);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6260 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6261 else if (PyBytes_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6262 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6263 char_u *str;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6264
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6265 if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1)
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	6266 return -1;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6267 if (str == NULL)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6268 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6269
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6270 if (set_string_copy(str, tv) == -1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6271 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6272
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6273 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6274 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6275 else if (PyUnicode_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6276 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6277 PyObject *bytes;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6278 char_u *str;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6279
4966 620d9b59d4ed updated for version 7.3.1228 Bram Moolenaar <bram@vim.org> parents: 4964 diff changeset	6280 bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6281 if (bytes == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6282 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6283
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6284 if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1)
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	6285 return -1;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6286 if (str == NULL)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6287 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6288
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6289 if (set_string_copy(str, tv))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6290 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6291 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6292 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6293 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6294 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6295
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6296 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6297 }
4321 d8d9c591c50f updated for version 7.3.910 Bram Moolenaar <bram@vim.org> parents: 4319 diff changeset	6298 #if PY_MAJOR_VERSION < 3
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6299 else if (PyInt_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6300 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6301 tv->v_type = VAR_NUMBER;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6302 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	6303 if (PyErr_Occurred())
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6304 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6305 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6306 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6307 else if (PyLong_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6308 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6309 tv->v_type = VAR_NUMBER;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6310 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	6311 if (PyErr_Occurred())
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6312 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6313 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6314 else if (PyDict_Check(obj))
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6315 return convert_dl(obj, tv, pydict_to_tv, lookup_dict);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6316 #ifdef FEAT_FLOAT
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6317 else if (PyFloat_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6318 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6319 tv->v_type = VAR_FLOAT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6320 tv->vval.v_float = (float_T) PyFloat_AsDouble(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6321 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6322 #endif
4635 07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6323 else if (PyObject_HasAttrString(obj, "keys"))
07c534fe9b6c updated for version 7.3.1065 Bram Moolenaar <bram@vim.org> parents: 4633 diff changeset	6324 return convert_dl(obj, tv, pymap_to_tv, lookup_dict);
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	6325 // 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	6326 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	6327 return convert_dl(obj, tv, pyseq_to_tv, lookup_dict);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6328 else if (PyMapping_Check(obj))
4601 19d406a8509d updated for version 7.3.1048 Bram Moolenaar <bram@vim.org> parents: 4599 diff changeset	6329 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	6330 else if (PyNumber_Check(obj))
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6331 {
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6332 PyObject *num;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6333
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6334 if (!(num = PyNumber_Long(obj)))
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6335 return -1;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6336
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6337 tv->v_type = VAR_NUMBER;
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6338 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	6339
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6340 Py_DECREF(num);
537bbfff0c5c updated for version 7.3.1231 Bram Moolenaar <bram@vim.org> parents: 4970 diff changeset	6341 }
12806 ef93c4415667 patch 8.0.1280: Python None cannot be converted to a Vim type Christian Brabandt <cb@256bit.org> parents: 12515 diff changeset	6342 else if (obj == Py_None)
ef93c4415667 patch 8.0.1280: Python None cannot be converted to a Vim type Christian Brabandt <cb@256bit.org> parents: 12515 diff changeset	6343 {
ef93c4415667 patch 8.0.1280: Python None cannot be converted to a Vim type Christian Brabandt <cb@256bit.org> parents: 12515 diff changeset	6344 tv->v_type = VAR_SPECIAL;
ef93c4415667 patch 8.0.1280: Python None cannot be converted to a Vim type Christian Brabandt <cb@256bit.org> parents: 12515 diff changeset	6345 tv->vval.v_number = VVAL_NONE;
ef93c4415667 patch 8.0.1280: Python None cannot be converted to a Vim type Christian Brabandt <cb@256bit.org> parents: 12515 diff changeset	6346 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6347 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6348 {
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	6349 PyErr_FORMAT(PyExc_TypeError,
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	6350 N_("unable to convert %s to a Vim structure"),
4970 f5c822e5a0eb updated for version 7.3.1230 Bram Moolenaar <bram@vim.org> parents: 4968 diff changeset	6351 Py_TYPE_NAME(obj));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6352 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6353 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6354 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6355 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6356
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6357 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6358 ConvertToPyObject(typval_T *tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6359 {
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6360 typval_T *argv;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6361 int i;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6362 if (tv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6363 {
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	6364 PyErr_SET_VIM(N_("internal error: NULL reference passed"));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6365 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6366 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6367 switch (tv->v_type)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6368 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6369 case VAR_STRING:
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	6370 return PyBytes_FromString(tv->vval.v_string == NULL
0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	6371 ? "" : (char *)tv->vval.v_string);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6372 case VAR_NUMBER:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6373 return PyLong_FromLong((long) tv->vval.v_number);
19193 9f98957582d6 patch 8.2.0155: warnings from MinGW compiler; tests fail without +float Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	6374 case VAR_FLOAT:
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6375 #ifdef FEAT_FLOAT
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6376 return PyFloat_FromDouble((double) tv->vval.v_float);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6377 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6378 case VAR_LIST:
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	6379 return NEW_LIST(tv->vval.v_list);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6380 case VAR_DICT:
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6381 return NEW_DICTIONARY(tv->vval.v_dict);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6382 case VAR_FUNC:
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	6383 return NEW_FUNCTION(tv->vval.v_string == NULL
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6384 ? (char_u *)"" : tv->vval.v_string,
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	6385 0, NULL, NULL, TRUE);
8714 a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6386 case VAR_PARTIAL:
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6387 if (tv->vval.v_partial->pt_argc)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6388 {
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6389 argv = PyMem_New(typval_T, (size_t)tv->vval.v_partial->pt_argc);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6390 for (i = 0; i < tv->vval.v_partial->pt_argc; i++)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6391 copy_tv(&tv->vval.v_partial->pt_argv[i], &argv[i]);
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6392 }
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6393 else
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6394 argv = NULL;
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6395 if (tv->vval.v_partial->pt_dict != NULL)
8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6396 tv->vval.v_partial->pt_dict->dv_refcount++;
8714 a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6397 return NEW_FUNCTION(tv->vval.v_partial == NULL
9723 80ac9cf77c9b commit https://github.com/vim/vim/commit/437bafe4c8a83ed71ee006eda7f54b65a90f0d4c Christian Brabandt <cb@256bit.org> parents: 9487 diff changeset	6398 ? (char_u *)"" : partial_name(tv->vval.v_partial),
8889 8755d57debaa commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509 Christian Brabandt <cb@256bit.org> parents: 8714 diff changeset	6399 tv->vval.v_partial->pt_argc, argv,
9119 39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	6400 tv->vval.v_partial->pt_dict,
39cc63e8df7c commit https://github.com/vim/vim/commit/2177f9fe18a927ef65ccebb0856722a28dc00252 Christian Brabandt <cb@256bit.org> parents: 8967 diff changeset	6401 tv->vval.v_partial->pt_auto);
15454 1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	6402 case VAR_BLOB:
1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	6403 return PyBytes_FromStringAndSize(
1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	6404 (char*) tv->vval.v_blob->bv_ga.ga_data,
1d2b5c016f17 patch 8.1.0735: cannot handle binary data Bram Moolenaar <Bram@vim.org> parents: 15236 diff changeset	6405 (Py_ssize_t) tv->vval.v_blob->bv_ga.ga_len);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6406 case VAR_UNKNOWN:
19922 1f42c49c3d29 patch 8.2.0517: Vim9: cannot separate "func" and "func(): void" Bram Moolenaar <Bram@vim.org> parents: 19888 diff changeset	6407 case VAR_ANY:
19181 94eda51ba9ba patch 8.2.0149: maintaining a Vim9 branch separately is more work Bram Moolenaar <Bram@vim.org> parents: 19102 diff changeset	6408 case VAR_VOID:
8714 a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6409 case VAR_CHANNEL:
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6410 case VAR_JOB:
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6411 Py_INCREF(Py_None);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6412 return Py_None;
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19019 diff changeset	6413 case VAR_BOOL:
8714 a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6414 case VAR_SPECIAL:
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6415 switch (tv->vval.v_number)
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6416 {
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6417 case VVAL_FALSE: return AlwaysFalse(NULL);
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6418 case VVAL_TRUE: return AlwaysTrue(NULL);
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6419 case VVAL_NONE:
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6420 case VVAL_NULL: return AlwaysNone(NULL);
a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6421 }
4978 f4969f8f66e9 updated for version 7.3.1234 Bram Moolenaar <bram@vim.org> parents: 4976 diff changeset	6422 PyErr_SET_VIM(N_("internal error: invalid value type"));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6423 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6424 }
8714 a5224eeb3546 commit https://github.com/vim/vim/commit/4c90861e9f864eab94f043c432acff508396ed62 Christian Brabandt <cb@256bit.org> parents: 8643 diff changeset	6425 return NULL;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	6426 }
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6427
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6428 typedef struct
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6429 {
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6430 PyObject_HEAD
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6431 } CurrentObject;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6432 static PyTypeObject CurrentType;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6433
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6434 static void
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6435 init_structs(void)
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6436 {
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6437 CLEAR_FIELD(OutputType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6438 OutputType.tp_name = "vim.message";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6439 OutputType.tp_basicsize = sizeof(OutputObject);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6440 OutputType.tp_flags = Py_TPFLAGS_DEFAULT;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6441 OutputType.tp_doc = "vim message object";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6442 OutputType.tp_methods = OutputMethods;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6443 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6444 OutputType.tp_getattro = (getattrofunc)OutputGetattro;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6445 OutputType.tp_setattro = (setattrofunc)OutputSetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6446 OutputType.tp_alloc = call_PyType_GenericAlloc;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6447 OutputType.tp_new = call_PyType_GenericNew;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6448 OutputType.tp_free = call_PyObject_Free;
13952 76a65058766f patch 8.0.1846: Python interface is incompatible with lldb Christian Brabandt <cb@256bit.org> parents: 13353 diff changeset	6449 OutputType.tp_base = &PyStdPrinter_Type;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6450 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6451 OutputType.tp_getattr = (getattrfunc)OutputGetattr;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6452 OutputType.tp_setattr = (setattrfunc)OutputSetattr;
13952 76a65058766f patch 8.0.1846: Python interface is incompatible with lldb Christian Brabandt <cb@256bit.org> parents: 13353 diff changeset	6453 // Disabled, because this causes a crash in test86
76a65058766f patch 8.0.1846: Python interface is incompatible with lldb Christian Brabandt <cb@256bit.org> parents: 13353 diff changeset	6454 // OutputType.tp_base = &PyFile_Type;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6455 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6456
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6457 CLEAR_FIELD(IterType);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	6458 IterType.tp_name = "vim.iter";
a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	6459 IterType.tp_basicsize = sizeof(IterObject);
4611 49f0fcd9762c updated for version 7.3.1053 Bram Moolenaar <bram@vim.org> parents: 4609 diff changeset	6460 IterType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_HAVE_GC;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	6461 IterType.tp_doc = "generic iterator object";
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6462 IterType.tp_iter = (getiterfunc)IterIter;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6463 IterType.tp_iternext = (iternextfunc)IterNext;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6464 IterType.tp_dealloc = (destructor)IterDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6465 IterType.tp_traverse = (traverseproc)IterTraverse;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6466 IterType.tp_clear = (inquiry)IterClear;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	6467
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6468 CLEAR_FIELD(BufferType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6469 BufferType.tp_name = "vim.buffer";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6470 BufferType.tp_basicsize = sizeof(BufferType);
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6471 BufferType.tp_dealloc = (destructor)BufferDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6472 BufferType.tp_repr = (reprfunc)BufferRepr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6473 BufferType.tp_as_sequence = &BufferAsSeq;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6474 BufferType.tp_as_mapping = &BufferAsMapping;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6475 BufferType.tp_flags = Py_TPFLAGS_DEFAULT;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6476 BufferType.tp_doc = "vim buffer object";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6477 BufferType.tp_methods = BufferMethods;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6478 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6479 BufferType.tp_getattro = (getattrofunc)BufferGetattro;
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	6480 BufferType.tp_setattro = (setattrofunc)BufferSetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6481 BufferType.tp_alloc = call_PyType_GenericAlloc;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6482 BufferType.tp_new = call_PyType_GenericNew;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6483 BufferType.tp_free = call_PyObject_Free;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6484 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6485 BufferType.tp_getattr = (getattrfunc)BufferGetattr;
4589 fa39483a1363 updated for version 7.3.1042 Bram Moolenaar <bram@vim.org> parents: 4587 diff changeset	6486 BufferType.tp_setattr = (setattrfunc)BufferSetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6487 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6488
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6489 CLEAR_FIELD(WindowType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6490 WindowType.tp_name = "vim.window";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6491 WindowType.tp_basicsize = sizeof(WindowObject);
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6492 WindowType.tp_dealloc = (destructor)WindowDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6493 WindowType.tp_repr = (reprfunc)WindowRepr;
4611 49f0fcd9762c updated for version 7.3.1053 Bram Moolenaar <bram@vim.org> parents: 4609 diff changeset	6494 WindowType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_HAVE_GC;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6495 WindowType.tp_doc = "vim Window object";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6496 WindowType.tp_methods = WindowMethods;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6497 WindowType.tp_traverse = (traverseproc)WindowTraverse;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6498 WindowType.tp_clear = (inquiry)WindowClear;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6499 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6500 WindowType.tp_getattro = (getattrofunc)WindowGetattro;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6501 WindowType.tp_setattro = (setattrofunc)WindowSetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6502 WindowType.tp_alloc = call_PyType_GenericAlloc;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6503 WindowType.tp_new = call_PyType_GenericNew;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6504 WindowType.tp_free = call_PyObject_Free;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6505 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6506 WindowType.tp_getattr = (getattrfunc)WindowGetattr;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6507 WindowType.tp_setattr = (setattrfunc)WindowSetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6508 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6509
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6510 CLEAR_FIELD(TabPageType);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6511 TabPageType.tp_name = "vim.tabpage";
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6512 TabPageType.tp_basicsize = sizeof(TabPageObject);
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6513 TabPageType.tp_dealloc = (destructor)TabPageDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6514 TabPageType.tp_repr = (reprfunc)TabPageRepr;
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6515 TabPageType.tp_flags = Py_TPFLAGS_DEFAULT;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6516 TabPageType.tp_doc = "vim tab page object";
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6517 TabPageType.tp_methods = TabPageMethods;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6518 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6519 TabPageType.tp_getattro = (getattrofunc)TabPageGetattro;
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6520 TabPageType.tp_alloc = call_PyType_GenericAlloc;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6521 TabPageType.tp_new = call_PyType_GenericNew;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6522 TabPageType.tp_free = call_PyObject_Free;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6523 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6524 TabPageType.tp_getattr = (getattrfunc)TabPageGetattr;
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6525 #endif
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6526
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6527 CLEAR_FIELD(BufMapType);
4393 80eea7a9d6b9 updated for version 7.3.945 Bram Moolenaar <bram@vim.org> parents: 4389 diff changeset	6528 BufMapType.tp_name = "vim.bufferlist";
80eea7a9d6b9 updated for version 7.3.945 Bram Moolenaar <bram@vim.org> parents: 4389 diff changeset	6529 BufMapType.tp_basicsize = sizeof(BufMapObject);
80eea7a9d6b9 updated for version 7.3.945 Bram Moolenaar <bram@vim.org> parents: 4389 diff changeset	6530 BufMapType.tp_as_mapping = &BufMapAsMapping;
80eea7a9d6b9 updated for version 7.3.945 Bram Moolenaar <bram@vim.org> parents: 4389 diff changeset	6531 BufMapType.tp_flags = Py_TPFLAGS_DEFAULT;
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	6532 BufMapType.tp_iter = BufMapIter;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6533 BufferType.tp_doc = "vim buffer list";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6534
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6535 CLEAR_FIELD(WinListType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6536 WinListType.tp_name = "vim.windowlist";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6537 WinListType.tp_basicsize = sizeof(WinListType);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6538 WinListType.tp_as_sequence = &WinListAsSeq;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6539 WinListType.tp_flags = Py_TPFLAGS_DEFAULT;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6540 WinListType.tp_doc = "vim window list";
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6541 WinListType.tp_dealloc = (destructor)WinListDestructor;
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6542
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6543 CLEAR_FIELD(TabListType);
4401 cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6544 TabListType.tp_name = "vim.tabpagelist";
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6545 TabListType.tp_basicsize = sizeof(TabListType);
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6546 TabListType.tp_as_sequence = &TabListAsSeq;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6547 TabListType.tp_flags = Py_TPFLAGS_DEFAULT;
cfd76908da25 updated for version 7.3.949 Bram Moolenaar <bram@vim.org> parents: 4399 diff changeset	6548 TabListType.tp_doc = "vim tab page list";
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6549
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6550 CLEAR_FIELD(RangeType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6551 RangeType.tp_name = "vim.range";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6552 RangeType.tp_basicsize = sizeof(RangeObject);
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6553 RangeType.tp_dealloc = (destructor)RangeDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6554 RangeType.tp_repr = (reprfunc)RangeRepr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6555 RangeType.tp_as_sequence = &RangeAsSeq;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6556 RangeType.tp_as_mapping = &RangeAsMapping;
4611 49f0fcd9762c updated for version 7.3.1053 Bram Moolenaar <bram@vim.org> parents: 4609 diff changeset	6557 RangeType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_HAVE_GC;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6558 RangeType.tp_doc = "vim Range object";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6559 RangeType.tp_methods = RangeMethods;
4500 47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	6560 RangeType.tp_traverse = (traverseproc)RangeTraverse;
47e6dec5ce3c updated for version 7.3.998 Bram Moolenaar <bram@vim.org> parents: 4498 diff changeset	6561 RangeType.tp_clear = (inquiry)RangeClear;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6562 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6563 RangeType.tp_getattro = (getattrofunc)RangeGetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6564 RangeType.tp_alloc = call_PyType_GenericAlloc;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6565 RangeType.tp_new = call_PyType_GenericNew;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6566 RangeType.tp_free = call_PyObject_Free;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6567 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6568 RangeType.tp_getattr = (getattrfunc)RangeGetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6569 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6570
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6571 CLEAR_FIELD(CurrentType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6572 CurrentType.tp_name = "vim.currentdata";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6573 CurrentType.tp_basicsize = sizeof(CurrentObject);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6574 CurrentType.tp_flags = Py_TPFLAGS_DEFAULT;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6575 CurrentType.tp_doc = "vim current object";
4599 89bec74fd793 updated for version 7.3.1047 Bram Moolenaar <bram@vim.org> parents: 4597 diff changeset	6576 CurrentType.tp_methods = CurrentMethods;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6577 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6578 CurrentType.tp_getattro = (getattrofunc)CurrentGetattro;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6579 CurrentType.tp_setattro = (setattrofunc)CurrentSetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6580 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6581 CurrentType.tp_getattr = (getattrfunc)CurrentGetattr;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6582 CurrentType.tp_setattr = (setattrfunc)CurrentSetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6583 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6584
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6585 CLEAR_FIELD(DictionaryType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6586 DictionaryType.tp_name = "vim.dictionary";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6587 DictionaryType.tp_basicsize = sizeof(DictionaryObject);
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6588 DictionaryType.tp_dealloc = (destructor)DictionaryDestructor;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6589 DictionaryType.tp_as_sequence = &DictionaryAsSeq;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6590 DictionaryType.tp_as_mapping = &DictionaryAsMapping;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6591 DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE;
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	6592 DictionaryType.tp_doc = "dictionary pushing modifications to Vim structure";
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6593 DictionaryType.tp_methods = DictionaryMethods;
4627 18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6594 DictionaryType.tp_iter = (getiterfunc)DictionaryIter;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6595 DictionaryType.tp_new = (newfunc)DictionaryConstructor;
18ba89e06fab updated for version 7.3.1061 Bram Moolenaar <bram@vim.org> parents: 4625 diff changeset	6596 DictionaryType.tp_alloc = (allocfunc)PyType_GenericAlloc;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6597 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6598 DictionaryType.tp_getattro = (getattrofunc)DictionaryGetattro;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6599 DictionaryType.tp_setattro = (setattrofunc)DictionarySetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6600 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6601 DictionaryType.tp_getattr = (getattrfunc)DictionaryGetattr;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6602 DictionaryType.tp_setattr = (setattrfunc)DictionarySetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6603 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6604
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6605 CLEAR_FIELD(ListType);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6606 ListType.tp_name = "vim.list";
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6607 ListType.tp_dealloc = (destructor)ListDestructor;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6608 ListType.tp_basicsize = sizeof(ListObject);
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6609 ListType.tp_as_sequence = &ListAsSeq;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6610 ListType.tp_as_mapping = &ListAsMapping;
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	6611 ListType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE;
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	6612 ListType.tp_doc = "list pushing modifications to Vim structure";
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6613 ListType.tp_methods = ListMethods;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6614 ListType.tp_iter = (getiterfunc)ListIter;
4629 e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	6615 ListType.tp_new = (newfunc)ListConstructor;
e4e48d4ee040 updated for version 7.3.1062 Bram Moolenaar <bram@vim.org> parents: 4627 diff changeset	6616 ListType.tp_alloc = (allocfunc)PyType_GenericAlloc;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6617 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6618 ListType.tp_getattro = (getattrofunc)ListGetattro;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6619 ListType.tp_setattro = (setattrofunc)ListSetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6620 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6621 ListType.tp_getattr = (getattrfunc)ListGetattr;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6622 ListType.tp_setattr = (setattrfunc)ListSetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6623 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6624
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6625 CLEAR_FIELD(FunctionType);
4397 a84f21892563 updated for version 7.3.947 Bram Moolenaar <bram@vim.org> parents: 4393 diff changeset	6626 FunctionType.tp_name = "vim.function";
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6627 FunctionType.tp_basicsize = sizeof(FunctionObject);
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6628 FunctionType.tp_dealloc = (destructor)FunctionDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6629 FunctionType.tp_call = (ternaryfunc)FunctionCall;
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	6630 FunctionType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_BASETYPE;
20369 6e1e4d7a7b39 patch 8.2.0740: minor message mistakes Bram Moolenaar <Bram@vim.org> parents: 20197 diff changeset	6631 FunctionType.tp_doc = "object that calls Vim function";
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6632 FunctionType.tp_methods = FunctionMethods;
4625 cb5c1e37ad4d updated for version 7.3.1060 Bram Moolenaar <bram@vim.org> parents: 4623 diff changeset	6633 FunctionType.tp_repr = (reprfunc)FunctionRepr;
4631 4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	6634 FunctionType.tp_new = (newfunc)FunctionConstructor;
4157fef7b950 updated for version 7.3.1063 Bram Moolenaar <bram@vim.org> parents: 4629 diff changeset	6635 FunctionType.tp_alloc = (allocfunc)PyType_GenericAlloc;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6636 #if PY_MAJOR_VERSION >= 3
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6637 FunctionType.tp_getattro = (getattrofunc)FunctionGetattro;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6638 #else
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6639 FunctionType.tp_getattr = (getattrfunc)FunctionGetattr;
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6640 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6641
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6642 CLEAR_FIELD(OptionsType);
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	6643 OptionsType.tp_name = "vim.options";
7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	6644 OptionsType.tp_basicsize = sizeof(OptionsObject);
5610 2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	6645 OptionsType.tp_as_sequence = &OptionsAsSeq;
4611 49f0fcd9762c updated for version 7.3.1053 Bram Moolenaar <bram@vim.org> parents: 4609 diff changeset	6646 OptionsType.tp_flags = Py_TPFLAGS_DEFAULT\|Py_TPFLAGS_HAVE_GC;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	6647 OptionsType.tp_doc = "object for manipulating options";
5610 2ace11abcfb5 updated for version 7.4.152 Bram Moolenaar <bram@vim.org> parents: 5608 diff changeset	6648 OptionsType.tp_iter = (getiterfunc)OptionsIter;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	6649 OptionsType.tp_as_mapping = &OptionsAsMapping;
4488 89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6650 OptionsType.tp_dealloc = (destructor)OptionsDestructor;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6651 OptionsType.tp_traverse = (traverseproc)OptionsTraverse;
89ea7593fc0c updated for version 7.3.992 Bram Moolenaar <bram@vim.org> parents: 4486 diff changeset	6652 OptionsType.tp_clear = (inquiry)OptionsClear;
4350 7eaccdaa5304 updated for version 7.3.924 Bram Moolenaar <bram@vim.org> parents: 4323 diff changeset	6653
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6654 #if PY_VERSION_HEX < 0x030700f0
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6655 CLEAR_FIELD(LoaderType);
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6656 LoaderType.tp_name = "vim.Loader";
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6657 LoaderType.tp_basicsize = sizeof(LoaderObject);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6658 LoaderType.tp_flags = Py_TPFLAGS_DEFAULT;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6659 LoaderType.tp_doc = "vim message object";
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6660 LoaderType.tp_methods = LoaderMethods;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6661 LoaderType.tp_dealloc = (destructor)LoaderDestructor;
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6662 #endif
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6663
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6664 #if PY_MAJOR_VERSION >= 3
20007 aadd1cae2ff5 patch 8.2.0559: clearing a struct is verbose Bram Moolenaar <Bram@vim.org> parents: 19922 diff changeset	6665 CLEAR_FIELD(vimmodule);
4319 b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6666 vimmodule.m_name = "vim";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6667 vimmodule.m_doc = "Vim Python interface\n";
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6668 vimmodule.m_size = -1;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6669 vimmodule.m_methods = VimMethods;
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6670 #endif
b79f3c3a584c updated for version 7.3.909 Bram Moolenaar <bram@vim.org> parents: 4317 diff changeset	6671 }
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6672
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6673 #define PYTYPE_READY(type) \
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6674 if (PyType_Ready(&type)) \
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6675 return -1;
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6676
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6677 static int
5166 467efeee8f9e updated for version 7.4a.009 Bram Moolenaar <bram@vim.org> parents: 5139 diff changeset	6678 init_types(void)
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6679 {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6680 PYTYPE_READY(IterType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6681 PYTYPE_READY(BufferType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6682 PYTYPE_READY(RangeType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6683 PYTYPE_READY(WindowType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6684 PYTYPE_READY(TabPageType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6685 PYTYPE_READY(BufMapType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6686 PYTYPE_READY(WinListType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6687 PYTYPE_READY(TabListType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6688 PYTYPE_READY(CurrentType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6689 PYTYPE_READY(DictionaryType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6690 PYTYPE_READY(ListType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6691 PYTYPE_READY(FunctionType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6692 PYTYPE_READY(OptionsType);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6693 PYTYPE_READY(OutputType);
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6694 #if PY_VERSION_HEX < 0x030700f0
4851 96e154e825a7 updated for version 7.3.1172 Bram Moolenaar <bram@vim.org> parents: 4833 diff changeset	6695 PYTYPE_READY(LoaderType);
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6696 #endif
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6697 return 0;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6698 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6699
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6700 static int
4922 8dd2769ab75c updated for version 7.3.1206 Bram Moolenaar <bram@vim.org> parents: 4918 diff changeset	6701 init_sys_path(void)
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6702 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6703 PyObject *path;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6704 PyObject *path_hook;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6705 PyObject *path_hooks;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6706
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6707 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	6708 return -1;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6709
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6710 if (!(path_hooks = PySys_GetObject("path_hooks")))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6711 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6712 PyErr_Clear();
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6713 path_hooks = PyList_New(1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6714 PyList_SET_ITEM(path_hooks, 0, path_hook);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6715 if (PySys_SetObject("path_hooks", path_hooks))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6716 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6717 Py_DECREF(path_hooks);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6718 return -1;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6719 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6720 Py_DECREF(path_hooks);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6721 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6722 else if (PyList_Check(path_hooks))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6723 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6724 if (PyList_Append(path_hooks, path_hook))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6725 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6726 Py_DECREF(path_hook);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6727 return -1;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6728 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6729 Py_DECREF(path_hook);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6730 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6731 else
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6732 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6733 VimTryStart();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	6734 emsg(_("Failed to set path hook: sys.path_hooks is not a list\n"
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6735 "You should now do the following:\n"
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6736 "- 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	6737 "- append vim.VIM_SPECIAL_PATH to sys.path\n"));
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	6738 VimTryEnd(); // Discard the error
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6739 Py_DECREF(path_hook);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6740 return 0;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6741 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6742
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6743 if (!(path = PySys_GetObject("path")))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6744 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6745 PyErr_Clear();
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6746 path = PyList_New(1);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6747 Py_INCREF(vim_special_path_object);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6748 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	6749 if (PySys_SetObject("path", path))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6750 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6751 Py_DECREF(path);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6752 return -1;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6753 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6754 Py_DECREF(path);
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6755 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6756 else if (PyList_Check(path))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6757 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6758 if (PyList_Append(path, vim_special_path_object))
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6759 return -1;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6760 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6761 else
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6762 {
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6763 VimTryStart();
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15454 diff changeset	6764 emsg(_("Failed to set path: sys.path is not a list\n"
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6765 "You should now append vim.VIM_SPECIAL_PATH to sys.path"));
18753 6e3dc2d630c2 patch 8.1.2366: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18370 diff changeset	6766 VimTryEnd(); // Discard the error
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6767 }
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6768
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6769 return 0;
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6770 }
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6771
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6772 static BufMapObject TheBufferMap =
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6773 {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6774 PyObject_HEAD_INIT(&BufMapType)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6775 };
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6776
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6777 static WinListObject TheWindowList =
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6778 {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6779 PyObject_HEAD_INIT(&WinListType)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6780 NULL
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6781 };
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6782
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6783 static CurrentObject TheCurrent =
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6784 {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6785 PyObject_HEAD_INIT(&CurrentType)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6786 };
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6787
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6788 static TabListObject TheTabPageList =
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6789 {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6790 PyObject_HEAD_INIT(&TabListType)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6791 };
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6792
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6793 static struct numeric_constant {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6794 char *name;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6795 int val;
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6796 } numeric_constants[] = {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6797 {"VAR_LOCKED", VAR_LOCKED},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6798 {"VAR_FIXED", VAR_FIXED},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6799 {"VAR_SCOPE", VAR_SCOPE},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6800 {"VAR_DEF_SCOPE", VAR_DEF_SCOPE},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6801 };
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6802
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6803 static struct object_constant {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6804 char *name;
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6805 PyObject *valObject;
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6806 } object_constants[] = {
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6807 {"buffers", (PyObject )(void )&TheBufferMap},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6808 {"windows", (PyObject )(void )&TheWindowList},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6809 {"tabpages", (PyObject )(void )&TheTabPageList},
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6810 {"current", (PyObject )(void )&TheCurrent},
4496 ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6811
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6812 {"Buffer", (PyObject *)&BufferType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6813 {"Range", (PyObject *)&RangeType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6814 {"Window", (PyObject *)&WindowType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6815 {"TabPage", (PyObject *)&TabPageType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6816 {"Dictionary", (PyObject *)&DictionaryType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6817 {"List", (PyObject *)&ListType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6818 {"Function", (PyObject *)&FunctionType},
ebd94eabfd80 updated for version 7.3.996 Bram Moolenaar <bram@vim.org> parents: 4494 diff changeset	6819 {"Options", (PyObject *)&OptionsType},
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6820 #if PY_VERSION_HEX < 0x030700f0
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6821 {"_Loader", (PyObject *)&LoaderType},
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6822 #endif
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6823 };
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6824
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6825 #define ADD_OBJECT(m, name, obj) \
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	6826 if (PyModule_AddObject(m, name, obj)) \
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6827 return -1;
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6828
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6829 #define ADD_CHECKED_OBJECT(m, name, obj) \
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6830 { \
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6831 PyObject *valObject = obj; \
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6832 if (!valObject) \
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6833 return -1; \
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6834 ADD_OBJECT(m, name, valObject); \
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6835 }
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6836
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6837 static int
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	6838 populate_module(PyObject *m)
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6839 {
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6840 int i;
ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6841 PyObject *other_module;
4831 b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6842 PyObject *attr;
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6843 PyObject *imp;
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6844 #if PY_VERSION_HEX >= 0x030700f0
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6845 PyObject *dict;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6846 PyObject *cls;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6847 #endif
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6848
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6849 for (i = 0; i < (int)(sizeof(numeric_constants)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6850 / sizeof(struct numeric_constant));
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6851 ++i)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6852 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	6853 PyInt_FromLong(numeric_constants[i].val));
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6854
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6855 for (i = 0; i < (int)(sizeof(object_constants)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6856 / sizeof(struct object_constant));
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6857 ++i)
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6858 {
4974 a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6859 PyObject *valObject;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6860
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6861 valObject = object_constants[i].valObject;
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6862 Py_INCREF(valObject);
a594ce86b5ea updated for version 7.3.1232 Bram Moolenaar <bram@vim.org> parents: 4972 diff changeset	6863 ADD_OBJECT(m, object_constants[i].name, valObject);
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6864 }
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6865
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6866 if (!(VimError = PyErr_NewException("vim.error", NULL, NULL)))
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6867 return -1;
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6868 ADD_OBJECT(m, "error", VimError);
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6869
17922 4d63d47d87ef patch 8.1.1957: more code can be moved to evalvars.c Bram Moolenaar <Bram@vim.org> parents: 17168 diff changeset	6870 ADD_CHECKED_OBJECT(m, "vars", NEW_DICTIONARY(get_globvar_dict()));
4d63d47d87ef patch 8.1.1957: more code can be moved to evalvars.c Bram Moolenaar <Bram@vim.org> parents: 17168 diff changeset	6871 ADD_CHECKED_OBJECT(m, "vvars", NEW_DICTIONARY(get_vimvar_dict()));
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6872 ADD_CHECKED_OBJECT(m, "options",
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6873 OptionsNew(SREQ_GLOBAL, NULL, dummy_check, NULL));
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6874
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6875 if (!(other_module = PyImport_ImportModule("os")))
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6876 return -1;
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6877 ADD_OBJECT(m, "os", other_module);
ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6878
9161 56c93626f6f3 commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481 Christian Brabandt <cb@256bit.org> parents: 9119 diff changeset	6879 #if PY_MAJOR_VERSION >= 3
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6880 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	6881 return -1;
9161 56c93626f6f3 commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481 Christian Brabandt <cb@256bit.org> parents: 9119 diff changeset	6882 #else
56c93626f6f3 commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481 Christian Brabandt <cb@256bit.org> parents: 9119 diff changeset	6883 if (!(py_getcwd = PyObject_GetAttrString(other_module, "getcwdu")))
56c93626f6f3 commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481 Christian Brabandt <cb@256bit.org> parents: 9119 diff changeset	6884 return -1;
56c93626f6f3 commit https://github.com/vim/vim/commit/22081f4a3397704645841121d994058abd6cb481 Christian Brabandt <cb@256bit.org> parents: 9119 diff changeset	6885 #endif
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6886 ADD_OBJECT(m, "_getcwd", py_getcwd)
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6887
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6888 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	6889 return -1;
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6890 ADD_OBJECT(m, "_chdir", py_chdir);
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	6891 if (!(attr = PyObject_GetAttrString(m, "chdir")))
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6892 return -1;
4831 b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6893 if (PyObject_SetAttrString(other_module, "chdir", attr))
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6894 {
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6895 Py_DECREF(attr);
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6896 return -1;
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6897 }
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6898 Py_DECREF(attr);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6899
4829 ff3935926449 updated for version 7.3.1161 Bram Moolenaar <bram@vim.org> parents: 4754 diff changeset	6900 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	6901 {
542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6902 ADD_OBJECT(m, "_fchdir", py_fchdir);
4982 39980afcf54a updated for version 7.3.1236 Bram Moolenaar <bram@vim.org> parents: 4978 diff changeset	6903 if (!(attr = PyObject_GetAttrString(m, "fchdir")))
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6904 return -1;
4831 b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6905 if (PyObject_SetAttrString(other_module, "fchdir", attr))
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6906 {
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6907 Py_DECREF(attr);
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6908 return -1;
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6909 }
b8eabb6a9687 updated for version 7.3.1162 Bram Moolenaar <bram@vim.org> parents: 4829 diff changeset	6910 Py_DECREF(attr);
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6911 }
4722 3534e9b4fa42 updated for version 7.3.1108 Bram Moolenaar <bram@vim.org> parents: 4706 diff changeset	6912 else
3534e9b4fa42 updated for version 7.3.1108 Bram Moolenaar <bram@vim.org> parents: 4706 diff changeset	6913 PyErr_Clear();
4704 542af01979be updated for version 7.3.1099 Bram Moolenaar <bram@vim.org> parents: 4702 diff changeset	6914
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6915 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	6916 return -1;
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6917
70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6918 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	6919
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6920 #if PY_VERSION_HEX >= 0x030700f0
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6921 if (!(imp = PyImport_ImportModule("importlib.machinery")))
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6922 return -1;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6923
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6924 dict = PyModule_GetDict(imp);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6925
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6926 if (!(cls = PyDict_GetItemString(dict, "PathFinder")))
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6927 {
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6928 Py_DECREF(imp);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6929 return -1;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6930 }
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6931
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6932 if (!(py_find_spec = PyObject_GetAttrString(cls, "find_spec")))
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6933 {
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6934 Py_DECREF(imp);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6935 return -1;
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6936 }
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6937
15818 89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6938 if ((py_find_module = PyObject_GetAttrString(cls, "find_module")))
89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6939 {
89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6940 // find_module() is deprecated, this may stop working in some later
89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6941 // version.
89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6942 ADD_OBJECT(m, "_find_module", py_find_module);
89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6943 }
89486329d9e6 patch 8.1.0916: with Python 3.7 "find_module" is not made available Bram Moolenaar <Bram@vim.org> parents: 15636 diff changeset	6944
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6945 Py_DECREF(imp);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6946
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6947 ADD_OBJECT(m, "_find_spec", py_find_spec);
380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6948 #else
4855 52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6949 if (!(imp = PyImport_ImportModule("imp")))
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6950 return -1;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6951
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6952 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	6953 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6954 Py_DECREF(imp);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6955 return -1;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6956 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6957
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6958 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	6959 {
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6960 Py_DECREF(py_find_module);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6961 Py_DECREF(imp);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6962 return -1;
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6963 }
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6964
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6965 Py_DECREF(imp);
52850ef928f8 updated for version 7.3.1174 Bram Moolenaar <bram@vim.org> parents: 4851 diff changeset	6966
4851 96e154e825a7 updated for version 7.3.1172 Bram Moolenaar <bram@vim.org> parents: 4833 diff changeset	6967 ADD_OBJECT(m, "_find_module", py_find_module);
96e154e825a7 updated for version 7.3.1172 Bram Moolenaar <bram@vim.org> parents: 4833 diff changeset	6968 ADD_OBJECT(m, "_load_module", py_load_module);
14373 380217380738 patch 8.1.0201: newer Python uses "importlib" instead of "imp" Christian Brabandt <cb@256bit.org> parents: 14303 diff changeset	6969 #endif
4833 70b1178dec79 updated for version 7.3.1163 Bram Moolenaar <bram@vim.org> parents: 4831 diff changeset	6970
4494 6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6971 return 0;
6d517f6e5f0b updated for version 7.3.995 Bram Moolenaar <bram@vim.org> parents: 4492 diff changeset	6972 }

Mercurial > vim

annotate src/if_py_both.h @ 21194:afed2045ffc9 v8.2.1148