vim: src/if_py_both.h annotate

annotate src/if_py_both.h @ 3852:0f5ee2629635 v7.3.683

updated for version 7.3.683 Problem: ":python" may crash when vimbindeval() returns None. Solution: Check for v_string to be NULL. (Yukihiro Nakadaira)

author	Bram Moolenaar <bram@vim.org>
date	Fri, 05 Oct 2012 21:30:07 +0200
parents	fd6ef931aa77
children	3e22fe67fa69

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 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	10 * Python extensions by Paul Moore, David Leonard, Roland Puntaier.
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	11 *
76f0c4918f5c Move 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 * 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	13 */
76f0c4918f5c Move 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
3734 956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	15 #if PY_VERSION_HEX < 0x02050000
956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	16 typedef int Py_ssize_t; /* Python 2.4 and earlier don't have this type. */
956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	17 #endif
956b1ed19282 updated for version 7.3.626 Bram Moolenaar <bram@vim.org> parents: 3703 diff changeset	18
2919 b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	19 #ifdef FEAT_MBYTE
b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	20 # define ENC_OPT p_enc
b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	21 #else
b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	22 # define ENC_OPT "latin1"
b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	23 #endif
b67d3a44262a updated for version 7.3.232 Bram Moolenaar <bram@vim.org> parents: 2894 diff changeset	24
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	25 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	26 * 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	27 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	28 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	29 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	30 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	31 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	32
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	33 /*
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	34 * 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	35 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	36 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	37 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	38 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	39 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	40
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	41 /* Output object definition
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	42 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	43
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	44 static PyObject OutputWrite(PyObject , PyObject *);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	45 static PyObject OutputWritelines(PyObject , PyObject *);
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	46 static PyObject OutputFlush(PyObject , PyObject *);
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	47
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	48 /* 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	49 typedef void (writefn)(char_u );
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	50 static void writer(writefn fn, char_u *str, PyInt n);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	51
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	52 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	53 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	54 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	55 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	56 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	57 } 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	58
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	59 static struct PyMethodDef OutputMethods[] = {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	60 /* name, function, calling, documentation */
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	61 {"write", OutputWrite, 1, ""},
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	62 {"writelines", OutputWritelines, 1, ""},
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	63 {"flush", OutputFlush, 1, ""},
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	64 { NULL, NULL, 0, NULL}
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	65 };
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	66
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	67 #define PyErr_SetVim(str) PyErr_SetString(VimError, str)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	68
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	69 /*************/
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	70
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	71 /* Output buffer management
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	72 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	73
3826 530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	74 static int
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	75 OutputSetattr(PyObject self, char name, PyObject *val)
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	76 {
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	77 if (val == NULL)
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	78 {
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	79 PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	80 return -1;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	81 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	82
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	83 if (strcmp(name, "softspace") == 0)
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	84 {
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	85 if (!PyInt_Check(val))
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	86 {
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	87 PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	88 return -1;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	89 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	90
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	91 ((OutputObject *)(self))->softspace = PyInt_AsLong(val);
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	92 return 0;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	93 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	94
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	95 PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	96 return -1;
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	97 }
530f5a903031 updated for version 7.3.671 Bram Moolenaar <bram@vim.org> parents: 3824 diff changeset	98
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	99 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	100 OutputWrite(PyObject self, PyObject args)
76f0c4918f5c Move 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 {
3806 5e909c379a1e updated for version 7.3.661 Bram Moolenaar <bram@vim.org> parents: 3800 diff changeset	102 Py_ssize_t len = 0;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	103 char *str = NULL;
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	104 int error = ((OutputObject *)(self))->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	105
3056 2665b456ee59 updated for version 7.3.300 Bram Moolenaar <bram@vim.org> parents: 2933 diff changeset	106 if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &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	107 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	108
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	109 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	110 Python_Lock_Vim();
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	111 writer((writefn)(error ? emsg : msg), (char_u *)str, len);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	112 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	113 Py_END_ALLOW_THREADS
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	114 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	115
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	116 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	117 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	118 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	119
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	120 static PyObject *
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	121 OutputWritelines(PyObject self, PyObject args)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	122 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	123 PyInt n;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	124 PyInt i;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	125 PyObject *list;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	126 int error = ((OutputObject *)(self))->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	127
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	128 if (!PyArg_ParseTuple(args, "O", &list))
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	129 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	130 Py_INCREF(list);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	131
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	132 if (!PyList_Check(list))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	133 {
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	134 PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	135 Py_DECREF(list);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	136 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	137 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	138
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	139 n = PyList_Size(list);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	140
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	141 for (i = 0; i < n; ++i)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	142 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	143 PyObject *line = PyList_GetItem(list, i);
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	144 char *str = NULL;
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	145 PyInt len;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	146
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	147 if (!PyArg_Parse(line, "et#", ENC_OPT, &str, &len))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	148 {
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	149 PyErr_SetString(PyExc_TypeError, _("writelines() requires list of strings"));
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	150 Py_DECREF(list);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	151 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	152 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	153
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	154 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	155 Python_Lock_Vim();
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	156 writer((writefn)(error ? emsg : msg), (char_u *)str, len);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	157 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	158 Py_END_ALLOW_THREADS
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	159 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	160 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	161
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	162 Py_DECREF(list);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	163 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	164 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	165 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	166
2727 62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	167 static PyObject *
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	168 OutputFlush(PyObject self UNUSED, PyObject args UNUSED)
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	169 {
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	170 /* do nothing */
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	171 Py_INCREF(Py_None);
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	172 return Py_None;
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	173 }
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	174
62e8d93241cd updated for version 7.3.142 Bram Moolenaar <bram@vim.org> parents: 2615 diff changeset	175
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	176 /* Buffer IO, we write one whole line at a time. */
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	177 static garray_T io_ga = {0, 0, 1, 80, NULL};
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	178 static writefn old_fn = 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	179
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	180 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	181 PythonIO_Flush(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	182 {
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	183 if (old_fn != NULL && io_ga.ga_len > 0)
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	184 {
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	185 ((char_u *)io_ga.ga_data)[io_ga.ga_len] = NUL;
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	186 old_fn((char_u *)io_ga.ga_data);
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	187 }
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	188 io_ga.ga_len = 0;
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	189 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	190
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	191 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	192 writer(writefn fn, char_u *str, PyInt n)
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	193 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	194 char_u *ptr;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	195
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	196 /* Flush when switching output function. */
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	197 if (fn != old_fn)
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	198 PythonIO_Flush();
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	199 old_fn = fn;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	200
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	201 /* Write each NL separated line. Text after the last NL is kept for
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	202 * writing later. */
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	203 while (n > 0 && (ptr = memchr(str, '\n', n)) != 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	204 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	205 PyInt len = ptr - str;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	206
2615 c6fe65c000d2 updated for version 7.3.037 Bram Moolenaar <bram@vim.org> parents: 2582 diff changeset	207 if (ga_grow(&io_ga, (int)(len + 1)) == FAIL)
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	208 break;
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	209
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	210 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)len);
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	211 ((char *)io_ga.ga_data)[io_ga.ga_len + len] = NUL;
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	212 fn((char_u *)io_ga.ga_data);
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	213 str = ptr + 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	214 n -= len + 1;
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	215 io_ga.ga_len = 0;
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	216 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	217
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	218 /* Put the remaining text into io_ga for later printing. */
2615 c6fe65c000d2 updated for version 7.3.037 Bram Moolenaar <bram@vim.org> parents: 2582 diff changeset	219 if (n > 0 && ga_grow(&io_ga, (int)(n + 1)) == OK)
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	220 {
2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	221 mch_memmove(((char *)io_ga.ga_data) + io_ga.ga_len, str, (size_t)n);
2615 c6fe65c000d2 updated for version 7.3.037 Bram Moolenaar <bram@vim.org> parents: 2582 diff changeset	222 io_ga.ga_len += (int)n;
2582 2cdbc91795ca updated for version 7.3.007 Bram Moolenaar <bram@vim.org> parents: 2520 diff changeset	223 }
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	224 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	225
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	226 /***************/
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	227
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	228 static PyTypeObject 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	229
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	230 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	231 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	232 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	233 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	234 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	235 };
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	236
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	237 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	238 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	239 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	240 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	241 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	242 };
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	243
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	244 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	245 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	246 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	247 PySys_SetObject("stdout", (PyObject )(void )&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	248 PySys_SetObject("stderr", (PyObject )(void )&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	249
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	250 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	251 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	252 EMSG(_("E264: Python: Error initialising I/O objects"));
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	253 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	254 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	255
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	256 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	257 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	258
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	259
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	260 static PyObject *VimError;
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	261
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	262 /* Check to see whether a Vim error has been reported, or a keyboard
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	263 * 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	264 */
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	265 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	266 VimErrorCheck(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	267 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	268 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	269 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	270 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	271 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	272 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	273 else if (did_emsg && !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	274 {
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	275 PyErr_SetNone(VimError);
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	276 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	277 }
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	278
76f0c4918f5c Move some common code from if_python.c and if_python3.c to if_py_both.h. Bram Moolenaar <bram@vim.org> parents: diff changeset	279 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	280 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	281
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	282 /* Vim module - Implementation
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	283 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	284 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	285 VimCommand(PyObject self UNUSED, PyObject args)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	286 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	287 char *cmd;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	288 PyObject *result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	289
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	290 if (!PyArg_ParseTuple(args, "s", &cmd))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	291 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	292
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	293 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	294
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	295 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	296 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	297
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	298 do_cmdline_cmd((char_u *)cmd);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	299 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	300
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	301 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	302 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	303
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	304 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	305 result = NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	306 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	307 result = Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	308
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	309 Py_XINCREF(result);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	310 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	311 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	312
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	313 #ifdef FEAT_EVAL
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	314 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	315 * 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	316 * 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	317 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	318 * 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	319 * you call VimToPython.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	320 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	321 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	322 VimToPython(typval_T our_tv, int depth, PyObject lookupDict)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	323 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	324 PyObject *result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	325 PyObject *newObj;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	326 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	327
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	328 /* Avoid infinite recursion */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	329 if (depth > 100)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	330 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	331 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	332 result = Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	333 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	334 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	335
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	336 /* Check if we run into a recursive loop. The item must be in lookupDict
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	337 * then and we can use it again. */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	338 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	339 \|\| (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	340 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	341 sprintf(ptrBuf, "%p",
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	342 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	343 : (void *)our_tv->vval.v_dict);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	344 result = PyDict_GetItemString(lookupDict, ptrBuf);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	345 if (result != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	346 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	347 Py_INCREF(result);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	348 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	349 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	350 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	351
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	352 if (our_tv->v_type == VAR_STRING)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	353 {
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	354 result = Py_BuildValue("s", our_tv->vval.v_string == NULL
0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	355 ? "" : (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	356 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	357 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	358 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	359 char buf[NUMBUFLEN];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	360
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	361 /* For backwards compatibility numbers are stored as strings. */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	362 sprintf(buf, "%ld", (long)our_tv->vval.v_number);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	363 result = Py_BuildValue("s", buf);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	364 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	365 # ifdef FEAT_FLOAT
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	366 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	367 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	368 char buf[NUMBUFLEN];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	369
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	370 sprintf(buf, "%f", our_tv->vval.v_float);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	371 result = Py_BuildValue("s", buf);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	372 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	373 # endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	374 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	375 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	376 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	377 listitem_T *curr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	378
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	379 result = PyList_New(0);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	380
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	381 if (list != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	382 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	383 PyDict_SetItemString(lookupDict, ptrBuf, result);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	384
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	385 for (curr = list->lv_first; curr != NULL; curr = curr->li_next)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	386 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	387 newObj = VimToPython(&curr->li_tv, depth + 1, lookupDict);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	388 PyList_Append(result, newObj);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	389 Py_DECREF(newObj);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	390 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	391 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	392 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	393 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	394 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	395 result = PyDict_New();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	396
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	397 if (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	398 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	399 hashtab_T *ht = &our_tv->vval.v_dict->dv_hashtab;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	400 long_u todo = ht->ht_used;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	401 hashitem_T *hi;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	402 dictitem_T *di;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	403
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	404 PyDict_SetItemString(lookupDict, ptrBuf, result);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	405
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	406 for (hi = ht->ht_array; todo > 0; ++hi)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	407 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	408 if (!HASHITEM_EMPTY(hi))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	409 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	410 --todo;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	411
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	412 di = dict_lookup(hi);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	413 newObj = VimToPython(&di->di_tv, depth + 1, lookupDict);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	414 PyDict_SetItemString(result, (char *)hi->hi_key, newObj);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	415 Py_DECREF(newObj);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	416 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	417 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	418 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	419 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	420 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	421 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	422 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	423 result = Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	424 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	425
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	426 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	427 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	428 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	429
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	430 static PyObject *
2520 6768ebd0bc04 Remove unused code. Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	431 VimEval(PyObject self UNUSED, PyObject args UNUSED)
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	432 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	433 #ifdef FEAT_EVAL
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	434 char *expr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	435 typval_T *our_tv;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	436 PyObject *result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	437 PyObject *lookup_dict;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	438
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	439 if (!PyArg_ParseTuple(args, "s", &expr))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	440 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	441
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	442 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	443 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	444 our_tv = eval_expr((char_u *)expr, NULL);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	445
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	446 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	447 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	448
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	449 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	450 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	451 PyErr_SetVim(_("invalid expression"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	452 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	453 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	454
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	455 /* Convert the Vim type into a Python type. Create a dictionary that's
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	456 * used to check for recursive loops. */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	457 lookup_dict = PyDict_New();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	458 result = VimToPython(our_tv, 1, lookup_dict);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	459 Py_DECREF(lookup_dict);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	460
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	461
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	462 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	463 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	464 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	465 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	466 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	467
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	468 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	469 #else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	470 PyErr_SetVim(_("expressions disabled at compile time"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	471 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	472 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	473 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	474
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	475 static PyObject ConvertToPyObject(typval_T );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	476
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	477 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	478 VimEvalPy(PyObject self UNUSED, PyObject args UNUSED)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	479 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	480 #ifdef FEAT_EVAL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	481 char *expr;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	482 typval_T *our_tv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	483 PyObject *result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	484
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	485 if (!PyArg_ParseTuple(args, "s", &expr))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	486 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	487
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	488 Py_BEGIN_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	489 Python_Lock_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	490 our_tv = eval_expr((char_u *)expr, NULL);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	491
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	492 Python_Release_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	493 Py_END_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	494
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	495 if (our_tv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	496 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	497 PyErr_SetVim(_("invalid expression"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	498 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	499 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	500
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	501 result = ConvertToPyObject(our_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	502 Py_BEGIN_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	503 Python_Lock_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	504 free_tv(our_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	505 Python_Release_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	506 Py_END_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	507
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	508 return result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	509 #else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	510 PyErr_SetVim(_("expressions disabled at compile time"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	511 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	512 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	513 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	514
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	515 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	516 VimStrwidth(PyObject self UNUSED, PyObject args)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	517 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	518 char *expr;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	519
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	520 if (!PyArg_ParseTuple(args, "s", &expr))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	521 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	522
3640 f02b6ad168ae updated for version 7.3.580 Bram Moolenaar <bram@vim.org> parents: 3638 diff changeset	523 return PyLong_FromLong(mb_string2cells((char_u *)expr, (int)STRLEN(expr)));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	524 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	525
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	526 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	527 * Vim module - Definitions
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	528 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	529
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	530 static struct PyMethodDef VimMethods[] = {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	531 /* name, function, calling, documentation */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	532 {"command", VimCommand, 1, "Execute a Vim ex-mode command" },
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	533 {"eval", VimEval, 1, "Evaluate an expression using Vim evaluator" },
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	534 {"bindeval", VimEvalPy, 1, "Like eval(), but returns objects attached to vim ones"},
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	535 {"strwidth", VimStrwidth, 1, "Screen string width, counts <Tab> as having width 1"},
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	536 { NULL, NULL, 0, NULL }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	537 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	538
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	539 typedef struct
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	540 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	541 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	542 buf_T *buf;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	543 } BufferObject;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	544
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	545 #define INVALID_BUFFER_VALUE ((buf_T *)(-1))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	546
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	547 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	548 * Buffer list object - Implementation
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	549 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	550
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	551 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	552 BufListLength(PyObject *self UNUSED)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	553 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	554 buf_T *b = firstbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	555 PyInt n = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	556
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	557 while (b)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	558 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	559 ++n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	560 b = b->b_next;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	561 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	562
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	563 return n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	564 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	565
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	566 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	567 BufListItem(PyObject *self UNUSED, PyInt n)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	568 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	569 buf_T *b;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	570
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	571 for (b = firstbuf; b; b = b->b_next, --n)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	572 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	573 if (n == 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	574 return BufferNew(b);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	575 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	576
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	577 PyErr_SetString(PyExc_IndexError, _("no such buffer"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	578 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	579 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	580
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	581 typedef struct
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	582 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	583 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	584 win_T *win;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	585 } WindowObject;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	586
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	587 static int ConvertFromPyObject(PyObject , typval_T );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	588 static int _ConvertFromPyObject(PyObject , typval_T , PyObject *);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	589
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	590 typedef struct pylinkedlist_S {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	591 struct pylinkedlist_S *pll_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	592 struct pylinkedlist_S *pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	593 PyObject *pll_obj;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	594 } pylinkedlist_T;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	595
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	596 static pylinkedlist_T *lastdict = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	597 static pylinkedlist_T *lastlist = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	598
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	599 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	600 pyll_remove(pylinkedlist_T ref, pylinkedlist_T *last)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	601 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	602 if (ref->pll_prev == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	603 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	604 if (ref->pll_next == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	605 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	606 *last = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	607 return;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	608 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	609 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	610 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	611 ref->pll_prev->pll_next = ref->pll_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	612
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	613 if (ref->pll_next == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	614 *last = ref->pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	615 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	616 ref->pll_next->pll_prev = ref->pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	617 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	618
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	619 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	620 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	621 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	622 if (*last == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	623 ref->pll_prev = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	624 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	625 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	626 (*last)->pll_next = ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	627 ref->pll_prev = *last;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	628 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	629 ref->pll_next = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	630 ref->pll_obj = self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	631 *last = ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	632 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	633
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	634 static PyTypeObject DictionaryType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	635
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	636 #define DICTKEY_GET_NOTEMPTY(err) \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	637 DICTKEY_GET(err) \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	638 if (*key == NUL) \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	639 { \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	640 PyErr_SetString(PyExc_ValueError, _("empty keys are not allowed")); \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	641 return err; \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	642 }
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	643
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	644 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	645 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	646 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	647 dict_T *dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	648 pylinkedlist_T ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	649 } DictionaryObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	650
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	651 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	652 DictionaryNew(dict_T *dict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	653 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	654 DictionaryObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	655
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	656 self = PyObject_NEW(DictionaryObject, &DictionaryType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	657 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	658 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	659 self->dict = dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	660 ++dict->dv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	661
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	662 pyll_add((PyObject *)(self), &self->ref, &lastdict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	663
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	664 return (PyObject *)(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	665 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	666
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	667 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	668 pydict_to_tv(PyObject obj, typval_T tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	669 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	670 dict_T *d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	671 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	672 dictitem_T *di;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	673 PyObject *keyObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	674 PyObject *valObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	675 Py_ssize_t iter = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	676
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	677 d = dict_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	678 if (d == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	679 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	680 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	681 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	682 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	683
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	684 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	685 tv->vval.v_dict = d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	686
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	687 while (PyDict_Next(obj, &iter, &keyObject, &valObject))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	688 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	689 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	690
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	691 if (keyObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	692 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	693 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	694 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	695
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	696 DICTKEY_GET_NOTEMPTY(-1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	697
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	698 di = dictitem_alloc(key);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	699
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	700 DICTKEY_UNREF
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	701
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	702 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	703 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	704 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	705 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	706 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	707 di->di_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	708
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	709 if (_ConvertFromPyObject(valObject, &di->di_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	710 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	711 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	712 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	713 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	714 if (dict_add(d, di) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	715 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	716 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	717 PyErr_SetVim(_("failed to add key to dictionary"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	718 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	719 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	720 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	721 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	722 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	723
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	724 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	725 pymap_to_tv(PyObject obj, typval_T tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	726 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	727 dict_T *d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	728 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	729 dictitem_T *di;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	730 PyObject *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	731 PyObject *litem;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	732 PyObject *keyObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	733 PyObject *valObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	734 Py_ssize_t lsize;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	735
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	736 d = dict_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	737 if (d == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	738 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	739 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	740 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	741 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	742
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	743 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	744 tv->vval.v_dict = d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	745
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	746 list = PyMapping_Items(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	747 lsize = PyList_Size(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	748 while (lsize--)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	749 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	750 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	751
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	752 litem = PyList_GetItem(list, lsize);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	753 if (litem == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	754 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	755 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	756 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	757 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	758
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	759 keyObject = PyTuple_GetItem(litem, 0);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	760 if (keyObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	761 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	762 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	763 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	764 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	765 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	766
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	767 DICTKEY_GET_NOTEMPTY(-1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	768
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	769 valObject = PyTuple_GetItem(litem, 1);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	770 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	771 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	772 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	773 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	774 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	775 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	776
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	777 di = dictitem_alloc(key);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	778
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	779 DICTKEY_UNREF
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	780
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	781 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	782 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	783 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	784 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	785 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	786 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	787 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	788 di->di_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	789
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	790 if (_ConvertFromPyObject(valObject, &di->di_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	791 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	792 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	793 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	794 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	795 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	796 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	797 if (dict_add(d, di) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	798 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	799 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	800 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	801 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	802 PyErr_SetVim(_("failed to add key to dictionary"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	803 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	804 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	805 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	806 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	807 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	808 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	809 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	810
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	811 static PyInt
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	812 DictionarySetattr(DictionaryObject self, char name, PyObject *val)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	813 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	814 if (val == NULL)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	815 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	816 PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	817 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	818 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	819
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	820 if (strcmp(name, "locked") == 0)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	821 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	822 if (self->dict->dv_lock == VAR_FIXED)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	823 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	824 PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed dictionary"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	825 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	826 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	827 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	828 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	829 if (!PyBool_Check(val))
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	830 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	831 PyErr_SetString(PyExc_TypeError, _("Only boolean objects are allowed"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	832 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	833 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	834
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	835 if (val == Py_True)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	836 self->dict->dv_lock = VAR_LOCKED;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	837 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	838 self->dict->dv_lock = 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	839 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	840 return 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	841 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	842 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	843 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	844 PyErr_SetString(PyExc_AttributeError, _("Cannot set this attribute"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	845 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	846 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	847 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	848
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	849 static PyInt
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	850 DictionaryLength(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	851 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	852 return ((PyInt) ((((DictionaryObject *)(self))->dict->dv_hashtab.ht_used)));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	853 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	854
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	855 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	856 DictionaryItem(PyObject self, PyObject keyObject)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	857 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	858 char_u *key;
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	859 dictitem_T *di;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	860 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	861
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	862 DICTKEY_GET_NOTEMPTY(NULL)
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	863
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	864 di = dict_find(((DictionaryObject *) (self))->dict, key, -1);
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	865
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	866 DICTKEY_UNREF
2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	867
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	868 if (di == NULL)
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	869 {
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	870 PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	871 return NULL;
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	872 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	873
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	874 return ConvertToPyObject(&di->di_tv);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	875 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	876
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	877 static PyInt
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	878 DictionaryAssItem(PyObject self, PyObject keyObject, PyObject *valObject)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	879 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	880 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	881 typval_T tv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	882 dict_T d = ((DictionaryObject )(self))->dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	883 dictitem_T *di;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	884 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	885
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	886 if (d->dv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	887 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	888 PyErr_SetVim(_("dict is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	889 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	890 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	891
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	892 DICTKEY_GET_NOTEMPTY(-1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	893
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	894 di = dict_find(d, key, -1);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	895
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	896 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	897 {
3636 0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	898 hashitem_T *hi;
0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	899
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	900 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	901 {
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	902 DICTKEY_UNREF
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	903 PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	904 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	905 }
3636 0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	906 hi = hash_find(&d->dv_hashtab, di->di_key);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	907 hash_remove(&d->dv_hashtab, hi);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	908 dictitem_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	909 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	910 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	911
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	912 if (ConvertFromPyObject(valObject, &tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	913 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	914
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	915 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	916 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	917 di = dictitem_alloc(key);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	918 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	919 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	920 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	921 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	922 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	923 di->di_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	924
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	925 if (dict_add(d, di) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	926 {
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	927 DICTKEY_UNREF
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	928 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	929 PyErr_SetVim(_("failed to add key to dictionary"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	930 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	931 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	932 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	933 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	934 clear_tv(&di->di_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	935
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	936 DICTKEY_UNREF
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	937
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	938 copy_tv(&tv, &di->di_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	939 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	940 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	941
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	942 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	943 DictionaryListKeys(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	944 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	945 dict_T dict = ((DictionaryObject )(self))->dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	946 long_u todo = dict->dv_hashtab.ht_used;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	947 Py_ssize_t i = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	948 PyObject *r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	949 hashitem_T *hi;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	950
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	951 r = PyList_New(todo);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	952 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	953 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	954 if (!HASHITEM_EMPTY(hi))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	955 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	956 PyList_SetItem(r, i, PyBytes_FromString((char *)(hi->hi_key)));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	957 --todo;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	958 ++i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	959 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	960 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	961 return r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	962 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	963
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	964 static struct PyMethodDef DictionaryMethods[] = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	965 {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	966 { NULL, NULL, 0, NULL }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	967 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	968
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	969 static PyTypeObject ListType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	970
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	971 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	972 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	973 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	974 list_T *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	975 pylinkedlist_T ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	976 } ListObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	977
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	978 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	979 ListNew(list_T *list)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	980 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	981 ListObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	982
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	983 self = PyObject_NEW(ListObject, &ListType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	984 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	985 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	986 self->list = list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	987 ++list->lv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	988
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	989 pyll_add((PyObject *)(self), &self->ref, &lastlist);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	990
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	991 return (PyObject *)(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	992 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	993
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	994 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	995 list_py_concat(list_T l, PyObject obj, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	996 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	997 Py_ssize_t i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	998 Py_ssize_t lsize = PySequence_Size(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	999 PyObject *litem;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1000 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1001
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1002 for(i=0; i<lsize; i++)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1003 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1004 li = listitem_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1005 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1006 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1007 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1008 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1009 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1010 li->li_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1011
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1012 litem = PySequence_GetItem(obj, i);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1013 if (litem == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1014 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1015 if (_ConvertFromPyObject(litem, &li->li_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1016 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1017
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1018 list_append(l, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1019 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1020 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1021 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1022
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1023 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1024 pyseq_to_tv(PyObject obj, typval_T tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1025 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1026 list_T *l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1027
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1028 l = list_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1029 if (l == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1030 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1031 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1032 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1033 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1034
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1035 tv->v_type = VAR_LIST;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1036 tv->vval.v_list = l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1037
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1038 if (list_py_concat(l, obj, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1039 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1040
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1041 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1042 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1043
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1044 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1045 pyiter_to_tv(PyObject obj, typval_T tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1046 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1047 PyObject *iterator = PyObject_GetIter(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1048 PyObject *item;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1049 list_T *l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1050 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1051
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1052 l = list_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1053
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1054 if (l == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1055 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1056 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1057 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1058 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1059
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1060 tv->vval.v_list = l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1061 tv->v_type = VAR_LIST;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1062
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1063
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1064 if (iterator == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1065 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1066
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1067 while ((item = PyIter_Next(obj)))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1068 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1069 li = listitem_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1070 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1071 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1072 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1073 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1074 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1075 li->li_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1076
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1077 if (_ConvertFromPyObject(item, &li->li_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1078 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1079
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1080 list_append(l, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1081
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1082 Py_DECREF(item);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1083 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1084
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1085 Py_DECREF(iterator);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1086 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1087 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1088
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1089 static PyInt
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1090 ListLength(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1091 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1092 return ((PyInt) (((ListObject *) (self))->list->lv_len));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1093 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1094
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1095 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1096 ListItem(PyObject *self, Py_ssize_t index)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1097 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1098 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1099
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1100 if (index>=ListLength(self))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1101 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1102 PyErr_SetString(PyExc_IndexError, "list index out of range");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1103 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1104 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1105 li = list_find(((ListObject *) (self))->list, (long) index);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1106 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1107 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1108 PyErr_SetVim(_("internal error: failed to get vim list item"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1109 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1110 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1111 return ConvertToPyObject(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1112 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1113
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1114 #define PROC_RANGE \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1115 if (last < 0) {\
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1116 if (last < -size) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1117 last = 0; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1118 else \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1119 last += size; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1120 } \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1121 if (first < 0) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1122 first = 0; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1123 if (first > size) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1124 first = size; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1125 if (last > size) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1126 last = size;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1127
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1128 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1129 ListSlice(PyObject *self, Py_ssize_t first, Py_ssize_t last)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1130 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1131 PyInt i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1132 PyInt size = ListLength(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1133 PyInt n;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1134 PyObject *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1135 int reversed = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1136
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1137 PROC_RANGE
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1138 if (first >= last)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1139 first = last;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1140
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1141 n = last-first;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1142 list = PyList_New(n);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1143 if (list == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1144 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1145
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1146 for (i = 0; i < n; ++i)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1147 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1148 PyObject *item = ListItem(self, i);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1149 if (item == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1150 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1151 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1152 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1153 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1154
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1155 if ((PyList_SetItem(list, ((reversed)?(n-i-1):(i)), item)))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1156 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1157 Py_DECREF(item);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1158 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1159 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1160 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1161 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1162
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1163 return list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1164 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1165
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1166 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1167 ListAssItem(PyObject self, Py_ssize_t index, PyObject obj)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1168 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1169 typval_T tv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1170 list_T l = ((ListObject ) (self))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1171 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1172 Py_ssize_t length = ListLength(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1173
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1174 if (l->lv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1175 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1176 PyErr_SetVim(_("list is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1177 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1178 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1179 if (index>length \|\| (index==length && obj==NULL))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1180 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1181 PyErr_SetString(PyExc_IndexError, "list index out of range");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1182 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1183 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1184
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1185 if (obj == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1186 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1187 li = list_find(l, (long) index);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1188 list_remove(l, li, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1189 clear_tv(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1190 vim_free(li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1191 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1192 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1193
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1194 if (ConvertFromPyObject(obj, &tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1195 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1196
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1197 if (index == length)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1198 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1199 if (list_append_tv(l, &tv) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1200 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1201 PyErr_SetVim(_("Failed to add item to list"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1202 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1203 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1204 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1205 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1206 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1207 li = list_find(l, (long) index);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1208 clear_tv(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1209 copy_tv(&tv, &li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1210 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1211 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1212 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1213
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1214 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1215 ListAssSlice(PyObject self, Py_ssize_t first, Py_ssize_t last, PyObject obj)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1216 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1217 PyInt size = ListLength(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1218 Py_ssize_t i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1219 Py_ssize_t lsize;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1220 PyObject *litem;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1221 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1222 listitem_T *next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1223 typval_T v;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1224 list_T l = ((ListObject ) (self))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1225
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1226 if (l->lv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1227 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1228 PyErr_SetVim(_("list is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1229 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1230 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1231
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1232 PROC_RANGE
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1233
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1234 if (first == size)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1235 li = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1236 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1237 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1238 li = list_find(l, (long) first);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1239 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1240 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1241 PyErr_SetVim(_("internal error: no vim list item"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1242 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1243 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1244 if (last > first)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1245 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1246 i = last - first;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1247 while (i-- && li != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1248 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1249 next = li->li_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1250 listitem_remove(l, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1251 li = next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1252 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1253 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1254 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1255
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1256 if (obj == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1257 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1258
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1259 if (!PyList_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1260 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1261 PyErr_SetString(PyExc_TypeError, _("can only assign lists to slice"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1262 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1263 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1264
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1265 lsize = PyList_Size(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1266
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1267 for(i=0; i<lsize; i++)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1268 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1269 litem = PyList_GetItem(obj, i);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1270 if (litem == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1271 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1272 if (ConvertFromPyObject(litem, &v) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1273 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1274 if (list_insert_tv(l, &v, li) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1275 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1276 PyErr_SetVim(_("internal error: failed to add item to list"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1277 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1278 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1279 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1280 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1281 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1282
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1283 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1284 ListConcatInPlace(PyObject self, PyObject obj)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1285 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1286 list_T l = ((ListObject ) (self))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1287 PyObject *lookup_dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1288
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1289 if (l->lv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1290 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1291 PyErr_SetVim(_("list is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1292 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1293 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1294
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1295 if (!PySequence_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1296 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1297 PyErr_SetString(PyExc_TypeError, _("can only concatenate with lists"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1298 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1299 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1300
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1301 lookup_dict = PyDict_New();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1302 if (list_py_concat(l, obj, lookup_dict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1303 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1304 Py_DECREF(lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1305 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1306 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1307 Py_DECREF(lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1308
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1309 Py_INCREF(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1310 return self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1311 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1312
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1313 static int
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1314 ListSetattr(ListObject self, char name, PyObject *val)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1315 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1316 if (val == NULL)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1317 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1318 PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1319 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1320 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1321
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1322 if (strcmp(name, "locked") == 0)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1323 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1324 if (self->list->lv_lock == VAR_FIXED)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1325 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1326 PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed list"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1327 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1328 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1329 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1330 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1331 if (!PyBool_Check(val))
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1332 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1333 PyErr_SetString(PyExc_TypeError, _("Only boolean objects are allowed"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1334 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1335 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1336
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1337 if (val == Py_True)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1338 self->list->lv_lock = VAR_LOCKED;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1339 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1340 self->list->lv_lock = 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1341 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1342 return 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1343 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1344 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1345 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1346 PyErr_SetString(PyExc_AttributeError, _("Cannot set this attribute"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1347 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1348 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1349 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1350
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1351 static struct PyMethodDef ListMethods[] = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1352 {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1353 { NULL, NULL, 0, NULL }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1354 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1355
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1356 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1357 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1358 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1359 char_u *name;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1360 } FunctionObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1361
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1362 static PyTypeObject FunctionType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1363
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1364 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1365 FunctionNew(char_u *name)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1366 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1367 FunctionObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1368
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1369 self = PyObject_NEW(FunctionObject, &FunctionType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1370 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1371 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1372 self->name = PyMem_New(char_u, STRLEN(name) + 1);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1373 if (self->name == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1374 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1375 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1376 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1377 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1378 STRCPY(self->name, name);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1379 func_ref(name);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1380 return (PyObject *)(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1381 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1382
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1383 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1384 FunctionCall(PyObject self, PyObject argsObject, PyObject *kwargs)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1385 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1386 FunctionObject this = (FunctionObject )(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1387 char_u *name = this->name;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1388 typval_T args;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1389 typval_T selfdicttv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1390 typval_T rettv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1391 dict_T *selfdict = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1392 PyObject *selfdictObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1393 PyObject *result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1394 int error;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1395
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1396 if (ConvertFromPyObject(argsObject, &args) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1397 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1398
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1399 if (kwargs != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1400 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1401 selfdictObject = PyDict_GetItemString(kwargs, "self");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1402 if (selfdictObject != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1403 {
3703 e13f2f3568e1 updated for version 7.3.611 Bram Moolenaar <bram@vim.org> parents: 3648 diff changeset	1404 if (!PyMapping_Check(selfdictObject))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1405 {
3703 e13f2f3568e1 updated for version 7.3.611 Bram Moolenaar <bram@vim.org> parents: 3648 diff changeset	1406 PyErr_SetString(PyExc_TypeError,
e13f2f3568e1 updated for version 7.3.611 Bram Moolenaar <bram@vim.org> parents: 3648 diff changeset	1407 _("'self' argument must be a dictionary"));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1408 clear_tv(&args);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1409 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1410 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1411 if (ConvertFromPyObject(selfdictObject, &selfdicttv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1412 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1413 selfdict = selfdicttv.vval.v_dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1414 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1415 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1416
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1417 error = func_call(name, &args, selfdict, &rettv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1418 if (error != OK)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1419 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1420 result = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1421 PyErr_SetVim(_("failed to run function"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1422 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1423 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1424 result = ConvertToPyObject(&rettv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1425
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1426 /* FIXME Check what should really be cleared. */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1427 clear_tv(&args);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1428 clear_tv(&rettv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1429 /*
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1430 * if (selfdict!=NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1431 * clear_tv(selfdicttv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1432 */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1433
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1434 return result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1435 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1436
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1437 static struct PyMethodDef FunctionMethods[] = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1438 {"__call__", (PyCFunction)FunctionCall, METH_VARARGS\|METH_KEYWORDS, ""},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1439 { NULL, NULL, 0, NULL }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1440 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1441
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1442 #define INVALID_WINDOW_VALUE ((win_T *)(-1))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1443
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1444 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1445 CheckWindow(WindowObject *this)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1446 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1447 if (this->win == INVALID_WINDOW_VALUE)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1448 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1449 PyErr_SetVim(_("attempt to refer to deleted window"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1450 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1451 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1452
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1453 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1454 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1455
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1456 static int WindowSetattr(PyObject , char , PyObject *);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1457 static PyObject WindowRepr(PyObject );
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1458
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1459 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1460 WindowSetattr(PyObject self, char name, PyObject *val)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1461 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1462 WindowObject this = (WindowObject )(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1463
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1464 if (CheckWindow(this))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1465 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1466
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1467 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	1468 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1469 PyErr_SetString(PyExc_TypeError, _("readonly attribute"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1470 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1471 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1472 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	1473 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1474 long lnum;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1475 long col;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1476
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1477 if (!PyArg_Parse(val, "(ll)", &lnum, &col))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1478 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1479
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1480 if (lnum <= 0 \|\| lnum > this->win->w_buffer->b_ml.ml_line_count)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1481 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1482 PyErr_SetVim(_("cursor position outside buffer"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1483 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1484 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1485
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1486 /* Check for keyboard interrupts */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1487 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1488 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1489
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1490 this->win->w_cursor.lnum = lnum;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1491 this->win->w_cursor.col = col;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1492 #ifdef FEAT_VIRTUALEDIT
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1493 this->win->w_cursor.coladd = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1494 #endif
2933 0bef86c5c985 updated for version 7.3.239 Bram Moolenaar <bram@vim.org> parents: 2919 diff changeset	1495 /* When column is out of range silently correct it. */
0bef86c5c985 updated for version 7.3.239 Bram Moolenaar <bram@vim.org> parents: 2919 diff changeset	1496 check_cursor_col_win(this->win);
0bef86c5c985 updated for version 7.3.239 Bram Moolenaar <bram@vim.org> parents: 2919 diff changeset	1497
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1498 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1499 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1500 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1501 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	1502 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1503 int height;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1504 win_T *savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1505
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1506 if (!PyArg_Parse(val, "i", &height))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1507 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1508
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1509 #ifdef FEAT_GUI
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1510 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	1511 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1512 savewin = curwin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1513 curwin = this->win;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1514 win_setheight(height);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1515 curwin = savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1516
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1517 /* Check for keyboard interrupts */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1518 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1519 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1520
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1521 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1522 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1523 #ifdef FEAT_VERTSPLIT
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1524 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	1525 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1526 int width;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1527 win_T *savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1528
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1529 if (!PyArg_Parse(val, "i", &width))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1530 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1531
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1532 #ifdef FEAT_GUI
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1533 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	1534 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1535 savewin = curwin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1536 curwin = this->win;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1537 win_setwidth(width);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1538 curwin = savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1539
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1540 /* Check for keyboard interrupts */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1541 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1542 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1543
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1544 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1545 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1546 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1547 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1548 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1549 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	1550 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1551 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1552 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1553
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1554 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1555 WindowRepr(PyObject *self)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1556 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1557 static char repr[100];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1558 WindowObject this = (WindowObject )(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1559
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1560 if (this->win == INVALID_WINDOW_VALUE)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1561 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1562 vim_snprintf(repr, 100, _("<window object (deleted) at %p>"), (self));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1563 return PyString_FromString(repr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1564 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1565 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1566 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1567 int i = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1568 win_T *w;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1569
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1570 for (w = firstwin; w != NULL && w != this->win; 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	1571 ++i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1572
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1573 if (w == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1574 vim_snprintf(repr, 100, _("<window object (unknown) at %p>"),
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1575 (self));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1576 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1577 vim_snprintf(repr, 100, _("<window %d>"), i);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1578
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1579 return PyString_FromString(repr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1580 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1581 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1582
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1583 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1584 * Window list object - Implementation
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1585 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1586 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1587 WinListLength(PyObject *self UNUSED)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1588 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1589 win_T *w = firstwin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1590 PyInt n = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1591
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1592 while (w != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1593 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1594 ++n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1595 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	1596 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1597
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1598 return n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1599 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1600
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1601 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1602 WinListItem(PyObject *self UNUSED, PyInt n)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1603 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1604 win_T *w;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1605
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1606 for (w = firstwin; w != NULL; w = W_NEXT(w), --n)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1607 if (n == 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1608 return WindowNew(w);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1609
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1610 PyErr_SetString(PyExc_IndexError, _("no such window"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1611 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1612 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1613
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1614 /* Convert a Python string into a Vim line.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1615 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1616 * 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	1617 * 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	1618 * characters.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1619 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1620 * 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	1621 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1622 static char *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1623 StringToLine(PyObject *obj)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1624 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1625 const char *str;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1626 char *save;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1627 PyObject *bytes;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1628 PyInt len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1629 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1630 char *p;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1631
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1632 if (obj == NULL \|\| !PyString_Check(obj))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1633 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1634 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1635 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1636 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1637
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1638 bytes = PyString_AsBytes(obj); /* for Python 2 this does nothing */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1639 str = PyString_AsString(bytes);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1640 len = PyString_Size(bytes);
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1641
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1642 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1643 * 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	1644 * 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	1645 * a single line.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1646 * 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	1647 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1648 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	1649 if (p != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1650 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1651 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	1652 --len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1653 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1654 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1655 PyErr_SetVim(_("string cannot contain newlines"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1656 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1657 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1658 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1659
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1660 /* Create a copy of the string, with internal nulls replaced by
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1661 * newline characters, as is the vim convention.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1662 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1663 save = (char *)alloc((unsigned)(len+1));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1664 if (save == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1665 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1666 PyErr_NoMemory();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1667 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1668 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1669
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1670 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	1671 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1672 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	1673 save[i] = '\n';
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1674 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1675 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	1676 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1677
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1678 save[i] = '\0';
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1679 PyString_FreeBytes(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	1680
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1681 return save;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1682 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1683
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1684 /* Get a line from the specified buffer. The line number is
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1685 * 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	1686 * string object.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1687 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1688 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1689 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	1690 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1691 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	1692 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1693
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1694
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1695 /* Get a list of lines from the specified buffer. The line numbers
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1696 * 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	1697 * 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	1698 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1699 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1700 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	1701 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1702 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1703 PyInt n = hi - lo;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1704 PyObject *list = PyList_New(n);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1705
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1706 if (list == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1707 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1708
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1709 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	1710 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1711 PyObject str = LineToString((char )ml_get_buf(buf, (linenr_T)(lo+i), FALSE));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1712
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1713 /* Error check - was the Python string creation OK? */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1714 if (str == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1715 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1716 Py_DECREF(list);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1717 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1718 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1719
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1720 /* Set the list item */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1721 if (PyList_SetItem(list, i, str))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1722 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1723 Py_DECREF(str);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1724 Py_DECREF(list);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1725 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1726 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1727 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1728
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1729 /* The ownership of the Python list is passed to the caller (ie,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1730 * the caller should Py_DECREF() the object when it is finished
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1731 * with it).
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1732 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1733
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1734 return list;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1735 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1736
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1737 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1738 * 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	1739 * 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	1740 * deleted).
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1741 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1742 static void
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1743 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	1744 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1745 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	1746 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1747 /* Adjust the cursor position if it's in/after the changed
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1748 * lines. */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1749 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	1750 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1751 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	1752 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1753 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1754 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	1755 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1756 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	1757 check_cursor();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1758 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1759 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1760 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1761 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	1762 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1763 invalidate_botline();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1764 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1765
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1766 /*
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1767 * 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	1768 * 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	1769 * 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	1770 * 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	1771 * 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	1772 * 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	1773 * 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	1774 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1775 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1776 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	1777 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1778 /* First of all, we check the thpe of the supplied Python object.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1779 * There are three cases:
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1780 * 1. NULL, or None - this is a deletion.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1781 * 2. A string - this is a replacement.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1782 * 3. Anything else - this is an error.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1783 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1784 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	1785 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1786 buf_T *savebuf = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1787
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1788 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1789 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1790
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1791 if (u_savedel((linenr_T)n, 1L) == FAIL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1792 PyErr_SetVim(_("cannot save undo information"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1793 else if (ml_delete((linenr_T)n, FALSE) == FAIL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1794 PyErr_SetVim(_("cannot delete line"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1795 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1796 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1797 if (buf == curwin->w_buffer)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1798 py_fix_cursor((linenr_T)n, (linenr_T)n + 1, (linenr_T)-1);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1799 deleted_lines_mark((linenr_T)n, 1L);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1800 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1801
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1802 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1803
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1804 if (PyErr_Occurred() \|\| VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1805 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1806
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1807 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1808 *len_change = -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1809
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1810 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1811 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1812 else if (PyString_Check(line))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1813 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1814 char *save = StringToLine(line);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1815 buf_T *savebuf = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1816
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1817 if (save == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1818 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1819
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1820 /* We do not need to free "save" if ml_replace() consumes it. */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1821 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1822 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1823
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1824 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	1825 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1826 PyErr_SetVim(_("cannot save undo information"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1827 vim_free(save);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1828 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1829 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	1830 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1831 PyErr_SetVim(_("cannot replace line"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1832 vim_free(save);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1833 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1834 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1835 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	1836
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1837 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1838
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1839 /* Check that the cursor is not beyond the end of the line now. */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1840 if (buf == curwin->w_buffer)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1841 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1842
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1843 if (PyErr_Occurred() \|\| VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1844 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1845
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1846 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1847 *len_change = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1848
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1849 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1850 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1851 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1852 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1853 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1854 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1855 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1856 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1857
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1858 /* Replace a range of lines in the specified buffer. The line numbers are in
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1859 * 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	1860 * 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	1861 * 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	1862 * 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	1863 * 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	1864 * 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	1865 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1866 static int
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1867 SetBufferLineList(buf_T buf, PyInt lo, PyInt hi, PyObject list, PyInt *len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1868 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1869 /* First of all, we check the thpe of the supplied Python object.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1870 * There are three cases:
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1871 * 1. NULL, or None - this is a deletion.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1872 * 2. A list - this is a replacement.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1873 * 3. Anything else - this is an error.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1874 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1875 if (list == Py_None \|\| list == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1876 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1877 PyInt i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1878 PyInt n = (int)(hi - lo);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1879 buf_T *savebuf = curbuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1880
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1881 PyErr_Clear();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1882 curbuf = buf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1883
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1884 if (u_savedel((linenr_T)lo, (long)n) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1885 PyErr_SetVim(_("cannot save undo information"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1886 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1887 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1888 for (i = 0; i < n; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1889 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1890 if (ml_delete((linenr_T)lo, FALSE) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1891 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1892 PyErr_SetVim(_("cannot delete line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1893 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1894 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1895 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1896 if (buf == curwin->w_buffer)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1897 py_fix_cursor((linenr_T)lo, (linenr_T)hi, (linenr_T)-n);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1898 deleted_lines_mark((linenr_T)lo, (long)i);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1899 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1900
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1901 curbuf = savebuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1902
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1903 if (PyErr_Occurred() \|\| VimErrorCheck())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1904 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1905
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1906 if (len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1907 *len_change = -n;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1908
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1909 return OK;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1910 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1911 else if (PyList_Check(list))
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1912 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1913 PyInt i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1914 PyInt new_len = PyList_Size(list);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1915 PyInt old_len = hi - lo;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1916 PyInt extra = 0; /* lines added to text, can be negative */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1917 char **array;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1918 buf_T *savebuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1919
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1920 if (new_len == 0) /* avoid allocating zero bytes */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1921 array = NULL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1922 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1923 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1924 array = (char *)alloc((unsigned)(new_len sizeof(char *)));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1925 if (array == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1926 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1927 PyErr_NoMemory();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1928 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1929 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1930 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1931
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1932 for (i = 0; i < new_len; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1933 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1934 PyObject *line = PyList_GetItem(list, i);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1935
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1936 array[i] = StringToLine(line);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1937 if (array[i] == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1938 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1939 while (i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1940 vim_free(array[--i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1941 vim_free(array);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1942 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1943 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1944 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1945
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1946 savebuf = curbuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1947
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1948 PyErr_Clear();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1949 curbuf = buf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1950
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1951 if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1952 PyErr_SetVim(_("cannot save undo information"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1953
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1954 /* If the size of the range is reducing (ie, new_len < old_len) we
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1955 * need to delete some old_len. We do this at the start, by
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1956 * repeatedly deleting line "lo".
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1957 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1958 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1959 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1960 for (i = 0; i < old_len - new_len; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1961 if (ml_delete((linenr_T)lo, FALSE) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1962 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1963 PyErr_SetVim(_("cannot delete line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1964 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1965 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1966 extra -= i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1967 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1968
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1969 /* For as long as possible, replace the existing old_len with the
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1970 * new old_len. This is a more efficient operation, as it requires
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1971 * less memory allocation and freeing.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1972 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1973 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1974 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1975 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	1976 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	1977 == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1978 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1979 PyErr_SetVim(_("cannot replace line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1980 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1981 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1982 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1983 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1984 i = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1985
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1986 /* Now we may need to insert the remaining new old_len. If we do, we
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1987 * must free the strings as we finish with them (we can't pass the
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1988 * responsibility to vim in this case).
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1989 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1990 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1991 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1992 while (i < new_len)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1993 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1994 if (ml_append((linenr_T)(lo + i - 1),
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1995 (char_u *)array[i], 0, FALSE) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1996 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1997 PyErr_SetVim(_("cannot insert line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1998 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1999 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2000 vim_free(array[i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2001 ++i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2002 ++extra;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2003 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2004 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2005
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2006 /* Free any left-over old_len, as a result of an error */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2007 while (i < new_len)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2008 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2009 vim_free(array[i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2010 ++i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2011 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2012
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2013 /* Free the array of old_len. All of its contents have now
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2014 * been dealt with (either freed, or the responsibility passed
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2015 * to vim.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2016 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2017 vim_free(array);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2018
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2019 /* Adjust marks. Invalidate any which lie in the
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2020 * changed range, and move any in the remainder of the buffer.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2021 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2022 mark_adjust((linenr_T)lo, (linenr_T)(hi - 1),
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2023 (long)MAXLNUM, (long)extra);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2024 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	2025
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2026 if (buf == curwin->w_buffer)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2027 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	2028
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2029 curbuf = savebuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2030
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2031 if (PyErr_Occurred() \|\| VimErrorCheck())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2032 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2033
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2034 if (len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2035 *len_change = new_len - old_len;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2036
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2037 return OK;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2038 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2039 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2040 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2041 PyErr_BadArgument();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2042 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2043 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2044 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2045
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2046 /* Insert a number of lines into the specified buffer after the specifed line.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2047 * 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	2048 * 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	2049 * 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	2050 * 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	2051 * 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	2052 * 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	2053 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2054 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2055 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	2056 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2057 /* First of all, we check the type of the supplied Python object.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2058 * It must be a string or a list, or the call is in error.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2059 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2060 if (PyString_Check(lines))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2061 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2062 char *str = StringToLine(lines);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2063 buf_T *savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2064
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2065 if (str == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2066 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2067
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2068 savebuf = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2069
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2070 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2071 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2072
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2073 if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2074 PyErr_SetVim(_("cannot save undo information"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2075 else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2076 PyErr_SetVim(_("cannot insert line"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2077 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2078 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	2079
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2080 vim_free(str);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2081 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2082 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2083
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2084 if (PyErr_Occurred() \|\| VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2085 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2086
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2087 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2088 *len_change = 1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2089
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2090 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2091 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2092 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	2093 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2094 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2095 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	2096 char **array;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2097 buf_T *savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2098
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2099 array = (char *)alloc((unsigned)(size sizeof(char *)));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2100 if (array == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2101 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2102 PyErr_NoMemory();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2103 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2104 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2105
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2106 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	2107 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2108 PyObject *line = PyList_GetItem(lines, i);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2109 array[i] = StringToLine(line);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2110
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2111 if (array[i] == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2112 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2113 while (i)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2114 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	2115 vim_free(array);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2116 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2117 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2118 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2119
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2120 savebuf = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2121
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2122 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2123 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2124
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2125 if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2126 PyErr_SetVim(_("cannot save undo information"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2127 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2128 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2129 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	2130 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2131 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	2132 (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	2133 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2134 PyErr_SetVim(_("cannot insert line"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2135
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2136 /* Free the rest of the lines */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2137 while (i < size)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2138 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	2139
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2140 break;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2141 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2142 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	2143 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2144 if (i > 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2145 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	2146 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2147
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2148 /* Free the array of lines. All of its contents have now
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2149 * been freed.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2150 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2151 vim_free(array);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2152
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2153 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2154 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2155
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2156 if (PyErr_Occurred() \|\| VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2157 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2158
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2159 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2160 *len_change = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2161
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2162 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2163 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2164 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2165 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2166 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2167 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2168 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2169 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2170
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2171 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2172 * 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	2173 * -------------------------------------------
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2174 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2175
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2176 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2177 CheckBuffer(BufferObject *this)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2178 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2179 if (this->buf == INVALID_BUFFER_VALUE)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2180 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2181 PyErr_SetVim(_("attempt to refer to deleted buffer"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2182 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2183 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2184
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2185 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2186 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2187
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2188 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2189 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	2190 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2191 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2192 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2193
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2194 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	2195 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2196 PyErr_SetString(PyExc_IndexError, _("line number out of range"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2197 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2198 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2199
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2200 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	2201 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2202
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2203 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2204 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	2205 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2206 PyInt size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2207
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2208 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2209 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2210
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2211 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	2212
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2213 if (lo < 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2214 lo = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2215 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	2216 lo = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2217 if (hi < 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2218 hi = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2219 if (hi < lo)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2220 hi = lo;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2221 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	2222 hi = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2223
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2224 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	2225 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2226
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2227 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2228 RBAsItem(BufferObject self, PyInt n, PyObject val, PyInt start, PyInt end, PyInt *new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2229 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2230 PyInt len_change;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2231
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2232 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2233 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2234
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2235 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	2236 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2237 PyErr_SetString(PyExc_IndexError, _("line number out of range"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2238 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2239 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2240
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2241 if (SetBufferLine(self->buf, n+start, val, &len_change) == FAIL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2242 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2243
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2244 if (new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2245 *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	2246
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2247 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2248 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2249
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2250 static PyInt
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2251 RBAsSlice(BufferObject self, PyInt lo, PyInt hi, PyObject val, PyInt start, PyInt end, PyInt *new_end)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2252 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2253 PyInt size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2254 PyInt len_change;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2255
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2256 /* Self must be a valid buffer */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2257 if (CheckBuffer(self))
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2258 return -1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2259
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2260 /* Sort out the slice range */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2261 size = end - start + 1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2262
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2263 if (lo < 0)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2264 lo = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2265 else if (lo > size)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2266 lo = size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2267 if (hi < 0)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2268 hi = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2269 if (hi < lo)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2270 hi = lo;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2271 else if (hi > size)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2272 hi = size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2273
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2274 if (SetBufferLineList(self->buf, lo + start, hi + start,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2275 val, &len_change) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2276 return -1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2277
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2278 if (new_end)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2279 *new_end = end + len_change;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2280
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2281 return 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2282 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2283
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2284
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2285 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2286 RBAppend(BufferObject self, PyObject args, PyInt start, PyInt end, PyInt *new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2287 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2288 PyObject *lines;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2289 PyInt len_change;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2290 PyInt max;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2291 PyInt n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2292
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2293 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2294 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2295
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2296 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	2297
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2298 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	2299 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2300
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2301 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	2302 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2303 PyErr_SetString(PyExc_ValueError, _("line number out of range"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2304 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2305 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2306
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2307 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	2308 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2309
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2310 if (new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2311 *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	2312
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2313 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	2314 return Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2315 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2316
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2317
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2318 /* Buffer object - Definitions
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2319 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2320
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2321 typedef struct
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2322 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2323 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2324 BufferObject *buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2325 PyInt start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2326 PyInt end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2327 } RangeObject;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2328
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2329 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2330 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	2331 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2332 BufferObject *bufr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2333 RangeObject *self;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2334 self = PyObject_NEW(RangeObject, &RangeType);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2335 if (self == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2336 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2337
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2338 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	2339 if (bufr == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2340 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2341 Py_DECREF(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2342 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2343 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2344 Py_INCREF(bufr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2345
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2346 self->buf = bufr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2347 self->start = start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2348 self->end = end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2349
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2350 return (PyObject *)(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2351 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2352
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2353 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2354 BufferAppend(PyObject self, PyObject args)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2355 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2356 return RBAppend((BufferObject *)(self), args, 1,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2357 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2358 NULL);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2359 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2360
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2361 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2362 BufferMark(PyObject self, PyObject args)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2363 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2364 pos_T *posp;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2365 char *pmark;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2366 char mark;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2367 buf_T *curbuf_save;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2368
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2369 if (CheckBuffer((BufferObject *)(self)))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2370 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2371
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2372 if (!PyArg_ParseTuple(args, "s", &pmark))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2373 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2374 mark = *pmark;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2375
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2376 curbuf_save = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2377 curbuf = ((BufferObject *)(self))->buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2378 posp = getmark(mark, FALSE);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2379 curbuf = curbuf_save;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2380
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2381 if (posp == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2382 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2383 PyErr_SetVim(_("invalid mark name"));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2384 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2385 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2386
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2387 /* Ckeck for keyboard interrupt */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2388 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2389 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2390
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2391 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	2392 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2393 /* Or raise an error? */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2394 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	2395 return Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2396 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2397
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2398 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	2399 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2400
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2401 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2402 BufferRange(PyObject self, PyObject args)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2403 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2404 PyInt start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2405 PyInt end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2406
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2407 if (CheckBuffer((BufferObject *)(self)))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2408 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2409
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2410 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	2411 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2412
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2413 return RangeNew(((BufferObject *)(self))->buf, start, end);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2414 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2415
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2416 static struct PyMethodDef BufferMethods[] = {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2417 /* name, function, calling, documentation */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2418 {"append", BufferAppend, 1, "Append data to Vim buffer" },
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2419 {"mark", BufferMark, 1, "Return (row,col) representing position of named mark" },
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2420 {"range", BufferRange, 1, "Return a range object which represents the part of the given buffer between line numbers s and e" },
3310 60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3056 diff changeset	2421 #if PY_VERSION_HEX >= 0x03000000
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3056 diff changeset	2422 {"__dir__", BufferDir, 4, "List its attributes" },
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3056 diff changeset	2423 #endif
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2424 { NULL, NULL, 0, NULL }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2425 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2426
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2427 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2428 RangeAppend(PyObject self, PyObject args)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2429 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2430 return RBAppend(((RangeObject *)(self))->buf, args,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2431 ((RangeObject *)(self))->start,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2432 ((RangeObject *)(self))->end,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2433 &((RangeObject *)(self))->end);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2434 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2435
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2436 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2437 RangeLength(PyObject *self)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2438 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2439 /* HOW DO WE SIGNAL AN ERROR FROM THIS FUNCTION? */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2440 if (CheckBuffer(((RangeObject *)(self))->buf))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2441 return -1; /* ??? */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2442
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2443 return (((RangeObject )(self))->end - ((RangeObject )(self))->start + 1);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2444 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2445
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2446 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2447 RangeItem(PyObject *self, PyInt n)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2448 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2449 return RBItem(((RangeObject *)(self))->buf, n,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2450 ((RangeObject *)(self))->start,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2451 ((RangeObject *)(self))->end);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2452 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2453
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2454 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2455 RangeRepr(PyObject *self)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2456 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2457 static char repr[100];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2458 RangeObject this = (RangeObject )(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2459
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2460 if (this->buf->buf == INVALID_BUFFER_VALUE)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2461 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2462 vim_snprintf(repr, 100, "<range object (for deleted buffer) at %p>",
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2463 (self));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2464 return PyString_FromString(repr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2465 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2466 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2467 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2468 char name = (char )this->buf->buf->b_fname;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2469 int len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2470
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2471 if (name == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2472 name = "";
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2473 len = (int)strlen(name);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2474
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2475 if (len > 45)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2476 name = name + (45 - len);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2477
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2478 vim_snprintf(repr, 100, "<range %s%s (%d:%d)>",
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2479 len > 45 ? "..." : "", name,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2480 this->start, this->end);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2481
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2482 return PyString_FromString(repr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2483 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2484 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2485
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2486 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2487 RangeSlice(PyObject *self, 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	2488 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2489 return RBSlice(((RangeObject *)(self))->buf, lo, hi,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2490 ((RangeObject *)(self))->start,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2491 ((RangeObject *)(self))->end);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2492 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2493
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2494 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2495 * Line range object - Definitions
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2496 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2497
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2498 static struct PyMethodDef RangeMethods[] = {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2499 /* name, function, calling, documentation */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2500 {"append", RangeAppend, 1, "Append data to the Vim range" },
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2501 { NULL, NULL, 0, NULL }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2502 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2503
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2504 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2505 set_ref_in_py(const int copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2506 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2507 pylinkedlist_T *cur;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2508 dict_T *dd;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2509 list_T *ll;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2510
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2511 if (lastdict != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2512 for(cur = lastdict ; cur != NULL ; cur = cur->pll_prev)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2513 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2514 dd = ((DictionaryObject *) (cur->pll_obj))->dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2515 if (dd->dv_copyID != copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2516 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2517 dd->dv_copyID = copyID;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2518 set_ref_in_ht(&dd->dv_hashtab, copyID);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2519 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2520 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2521
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2522 if (lastlist != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2523 for(cur = lastlist ; cur != NULL ; cur = cur->pll_prev)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2524 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2525 ll = ((ListObject *) (cur->pll_obj))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2526 if (ll->lv_copyID != copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2527 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2528 ll->lv_copyID = copyID;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2529 set_ref_in_list(ll, copyID);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2530 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2531 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2532 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2533
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2534 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2535 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	2536 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2537 tv->vval.v_string = vim_strsave(str);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2538 if (tv->vval.v_string == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2539 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2540 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2541 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2542 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2543 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2544 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2545
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2546 #ifdef FEAT_EVAL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2547 typedef int (pytotvfunc)(PyObject , typval_T , PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2548
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2549 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2550 convert_dl(PyObject obj, typval_T tv,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2551 pytotvfunc py_to_tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2552 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2553 PyObject *capsule;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2554 char hexBuf[sizeof(void ) 2 + 3];
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2555
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2556 sprintf(hexBuf, "%p", obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2557
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2558 # ifdef PY_USE_CAPSULE
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2559 capsule = PyDict_GetItemString(lookupDict, hexBuf);
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2560 # else
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2561 capsule = (PyObject *)PyDict_GetItemString(lookupDict, hexBuf);
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2562 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2563 if (capsule == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2564 {
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2565 # ifdef PY_USE_CAPSULE
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2566 capsule = PyCapsule_New(tv, NULL, NULL);
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2567 # else
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2568 capsule = PyCObject_FromVoidPtr(tv, NULL);
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2569 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2570 PyDict_SetItemString(lookupDict, hexBuf, capsule);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2571 Py_DECREF(capsule);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2572 if (py_to_tv(obj, tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2573 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2574 tv->v_type = VAR_UNKNOWN;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2575 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2576 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2577 /* As we are not using copy_tv which increments reference count we must
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2578 * do it ourself. */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2579 switch(tv->v_type)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2580 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2581 case VAR_DICT: ++tv->vval.v_dict->dv_refcount; break;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2582 case VAR_LIST: ++tv->vval.v_list->lv_refcount; break;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2583 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2584 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2585 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2586 {
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2587 typval_T *v;
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2588
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2589 # ifdef PY_USE_CAPSULE
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2590 v = PyCapsule_GetPointer(capsule, NULL);
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2591 # else
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2592 v = PyCObject_AsVoidPtr(capsule);
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2593 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2594 copy_tv(v, tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2595 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2596 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2597 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2598
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2599 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2600 ConvertFromPyObject(PyObject obj, typval_T tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2601 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2602 PyObject *lookup_dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2603 int r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2604
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2605 lookup_dict = PyDict_New();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2606 r = _ConvertFromPyObject(obj, tv, lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2607 Py_DECREF(lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2608 return r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2609 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2610
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2611 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2612 _ConvertFromPyObject(PyObject obj, typval_T tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2613 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2614 if (obj->ob_type == &DictionaryType)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2615 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2616 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2617 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2618 ++tv->vval.v_dict->dv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2619 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2620 else if (obj->ob_type == &ListType)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2621 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2622 tv->v_type = VAR_LIST;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2623 tv->vval.v_list = (((ListObject *)(obj))->list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2624 ++tv->vval.v_list->lv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2625 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2626 else if (obj->ob_type == &FunctionType)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2627 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2628 if (set_string_copy(((FunctionObject *) (obj))->name, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2629 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2630
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2631 tv->v_type = VAR_FUNC;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2632 func_ref(tv->vval.v_string);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2633 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2634 #if PY_MAJOR_VERSION >= 3
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2635 else if (PyBytes_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2636 {
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2637 char_u *result;
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2638
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2639 if (PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2640 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2641 if (result == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2642 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2643
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2644 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2645 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2646
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2647 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2648 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2649 else if (PyUnicode_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2650 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2651 PyObject *bytes;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2652 char_u *result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2653
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2654 bytes = PyString_AsBytes(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2655 if (bytes == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2656 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2657
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2658 if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2659 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2660 if (result == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2661 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2662
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2663 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2664 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2665 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2666 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2667 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2668 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2669
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2670 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2671 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2672 #else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2673 else if (PyUnicode_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2674 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2675 PyObject *bytes;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2676 char_u *result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2677
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2678 bytes = PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2679 if (bytes == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2680 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2681
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2682 if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2683 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2684 if (result == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2685 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2686
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2687 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2688 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2689 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2690 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2691 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2692 Py_XDECREF(bytes);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2693
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2694 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2695 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2696 else if (PyString_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2697 {
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2698 char_u *result;
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2699
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2700 if(PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2701 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2702 if (result == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2703 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2704
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2705 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2706 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2707
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2708 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2709 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2710 else if (PyInt_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2711 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2712 tv->v_type = VAR_NUMBER;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2713 tv->vval.v_number = (varnumber_T) PyInt_AsLong(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2714 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2715 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2716 else if (PyLong_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2717 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2718 tv->v_type = VAR_NUMBER;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2719 tv->vval.v_number = (varnumber_T) PyLong_AsLong(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2720 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2721 else if (PyDict_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2722 return convert_dl(obj, tv, pydict_to_tv, lookupDict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2723 #ifdef FEAT_FLOAT
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2724 else if (PyFloat_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2725 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2726 tv->v_type = VAR_FLOAT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2727 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	2728 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2729 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2730 else if (PyIter_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2731 return convert_dl(obj, tv, pyiter_to_tv, lookupDict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2732 else if (PySequence_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2733 return convert_dl(obj, tv, pyseq_to_tv, lookupDict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2734 else if (PyMapping_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2735 return convert_dl(obj, tv, pymap_to_tv, lookupDict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2736 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2737 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2738 PyErr_SetString(PyExc_TypeError, _("unable to convert to vim structure"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2739 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2740 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2741 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2742 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2743
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2744 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2745 ConvertToPyObject(typval_T *tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2746 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2747 if (tv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2748 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2749 PyErr_SetVim(_("NULL reference passed"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2750 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2751 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2752 switch (tv->v_type)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2753 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2754 case VAR_STRING:
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2755 return PyBytes_FromString(tv->vval.v_string == NULL
0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2756 ? "" : (char *)tv->vval.v_string);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2757 case VAR_NUMBER:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2758 return PyLong_FromLong((long) tv->vval.v_number);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2759 #ifdef FEAT_FLOAT
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2760 case VAR_FLOAT:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2761 return PyFloat_FromDouble((double) tv->vval.v_float);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2762 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2763 case VAR_LIST:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2764 return ListNew(tv->vval.v_list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2765 case VAR_DICT:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2766 return DictionaryNew(tv->vval.v_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2767 case VAR_FUNC:
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2768 return FunctionNew(tv->vval.v_string == NULL
0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2769 ? (char_u *)"" : tv->vval.v_string);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2770 case VAR_UNKNOWN:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2771 Py_INCREF(Py_None);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2772 return Py_None;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2773 default:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2774 PyErr_SetVim(_("internal error: invalid value type"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2775 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2776 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2777 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2778 #endif

Mercurial > vim

annotate src/if_py_both.h @ 3852:0f5ee2629635 v7.3.683