vim: src/if_py_both.h annotate

annotate src/if_py_both.h @ 4317:4281875776fb v7.3.908

updated for version 7.3.908 Problem: Possible crash when using a list in Python. Solution: Return early if the list is NULL. (ZyX)

author	Bram Moolenaar <bram@vim.org>
date	Wed, 24 Apr 2013 13:10:41 +0200
parents	9f3da1dea7c0
children	b79f3c3a584c

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 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	314 * 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	315 * 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	316 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	317 * 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	318 * you call VimToPython.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	319 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	320 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	321 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	322 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	323 PyObject *result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	324 PyObject *newObj;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	325 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	326
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	327 /* Avoid infinite recursion */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	328 if (depth > 100)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	329 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	330 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	331 result = Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	332 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	333 }
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 /* 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	336 * 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	337 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	338 \|\| (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	339 {
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	340 sprintf(ptrBuf, "%p",
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	341 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	342 : (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	343 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	344 if (result != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	345 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	346 Py_INCREF(result);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	347 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	348 }
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 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	352 {
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	353 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	354 ? "" : (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	355 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	356 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	357 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	358 char buf[NUMBUFLEN];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	359
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	360 /* 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	361 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	362 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	363 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	364 # ifdef FEAT_FLOAT
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	365 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	366 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	367 char buf[NUMBUFLEN];
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	368
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	369 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	370 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	371 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	372 # endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	373 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	374 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	375 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	376 listitem_T *curr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	377
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	378 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	379
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	380 if (list != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	381 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	382 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	383
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	384 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	385 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	386 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	387 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	388 Py_DECREF(newObj);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	389 }
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 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	393 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	394 result = PyDict_New();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	395
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	396 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	397 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	398 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	399 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	400 hashitem_T *hi;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	401 dictitem_T *di;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	402
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	403 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	404
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	405 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	406 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	407 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	408 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	409 --todo;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	410
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	411 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	412 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	413 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	414 Py_DECREF(newObj);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	415 }
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 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	420 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	421 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	422 result = Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	423 }
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 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	426 }
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 static PyObject *
2520 6768ebd0bc04 Remove unused code. Bram Moolenaar <bram@vim.org> parents: 2447 diff changeset	429 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	430 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	431 char *expr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	432 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	433 PyObject *result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	434 PyObject *lookup_dict;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	435
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	436 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	437 return NULL;
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 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	440 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	441 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	442
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	443 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	444 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	445
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	446 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	447 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	448 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	449 return 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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	452 /* 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	453 * 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	454 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	455 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	456 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	457
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	458
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	459 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	460 Python_Lock_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	461 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	462 Python_Release_Vim();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	463 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	464
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	465 return result;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	466 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	467
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	468 static PyObject ConvertToPyObject(typval_T );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	469
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	470 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	471 VimEvalPy(PyObject self UNUSED, PyObject args UNUSED)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	472 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	473 char *expr;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	474 typval_T *our_tv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	475 PyObject *result;
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 if (!PyArg_ParseTuple(args, "s", &expr))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	478 return NULL;
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 Py_BEGIN_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	481 Python_Lock_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	482 our_tv = eval_expr((char_u *)expr, NULL);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	483
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	484 Python_Release_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	485 Py_END_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	486
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	487 if (our_tv == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	488 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	489 PyErr_SetVim(_("invalid expression"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	490 return 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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	493 result = ConvertToPyObject(our_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	494 Py_BEGIN_ALLOW_THREADS
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	495 Python_Lock_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	496 free_tv(our_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	497 Python_Release_Vim();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	498 Py_END_ALLOW_THREADS
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 return result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	501 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	502
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	503 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	504 VimStrwidth(PyObject self UNUSED, PyObject args)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	505 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	506 char *expr;
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 if (!PyArg_ParseTuple(args, "s", &expr))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	509 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	510
3988 3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	511 return PyLong_FromLong(
3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	512 #ifdef FEAT_MBYTE
3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	513 mb_string2cells((char_u *)expr, (int)STRLEN(expr))
3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	514 #else
3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	515 STRLEN(expr)
3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	516 #endif
3e22fe67fa69 updated for version 7.3.749 Bram Moolenaar <bram@vim.org> parents: 3852 diff changeset	517 );
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	518 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	519
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	520 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	521 * Vim module - Definitions
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	522 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	523
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	524 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	525 /* 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	526 {"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	527 {"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	528 {"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	529 {"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	530 { 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	531 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	532
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	533 typedef struct
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	534 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	535 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	536 buf_T *buf;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	537 } BufferObject;
2447 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 #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	540
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	541 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	542 * 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	543 */
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 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	546 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	547 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	548 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	549 PyInt n = 0;
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 while (b)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	552 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	553 ++n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	554 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	555 }
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 return n;
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	560 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	561 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	562 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	563 buf_T *b;
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 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	566 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	567 if (n == 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	568 return BufferNew(b);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	569 }
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 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	572 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	573 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	574
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	575 typedef struct
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 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	578 win_T *win;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	579 } WindowObject;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	580
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	581 static int ConvertFromPyObject(PyObject , typval_T );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	582 static int _ConvertFromPyObject(PyObject , typval_T , PyObject *);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	583
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	584 typedef struct pylinkedlist_S {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	585 struct pylinkedlist_S *pll_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	586 struct pylinkedlist_S *pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	587 PyObject *pll_obj;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	588 } pylinkedlist_T;
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 static pylinkedlist_T *lastdict = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	591 static pylinkedlist_T *lastlist = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	592
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	593 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	594 pyll_remove(pylinkedlist_T ref, pylinkedlist_T *last)
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 if (ref->pll_prev == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	597 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	598 if (ref->pll_next == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	599 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	600 *last = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	601 return;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	602 }
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 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	605 ref->pll_prev->pll_next = ref->pll_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	606
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	607 if (ref->pll_next == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	608 *last = ref->pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	609 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	610 ref->pll_next->pll_prev = ref->pll_prev;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	611 }
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 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	614 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	615 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	616 if (*last == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	617 ref->pll_prev = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	618 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	619 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	620 (*last)->pll_next = ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	621 ref->pll_prev = *last;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	622 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	623 ref->pll_next = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	624 ref->pll_obj = self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	625 *last = ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	626 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	627
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	628 static PyTypeObject DictionaryType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	629
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	630 #define DICTKEY_GET_NOTEMPTY(err) \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	631 DICTKEY_GET(err) \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	632 if (*key == NUL) \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	633 { \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	634 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	635 return err; \
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	636 }
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	637
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	638 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	639 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	640 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	641 dict_T *dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	642 pylinkedlist_T ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	643 } DictionaryObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	644
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	645 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	646 DictionaryNew(dict_T *dict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	647 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	648 DictionaryObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	649
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	650 self = PyObject_NEW(DictionaryObject, &DictionaryType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	651 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	652 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	653 self->dict = dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	654 ++dict->dv_refcount;
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 pyll_add((PyObject *)(self), &self->ref, &lastdict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	657
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	658 return (PyObject *)(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	659 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	660
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	661 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	662 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	663 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	664 dict_T *d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	665 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	666 dictitem_T *di;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	667 PyObject *keyObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	668 PyObject *valObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	669 Py_ssize_t iter = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	670
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	671 d = dict_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	672 if (d == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	673 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	674 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	675 return -1;
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	678 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	679 tv->vval.v_dict = d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	680
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	681 while (PyDict_Next(obj, &iter, &keyObject, &valObject))
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 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	684
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	685 if (keyObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	686 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	687 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	688 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	689
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	690 DICTKEY_GET_NOTEMPTY(-1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	691
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	692 di = dictitem_alloc(key);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	693
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	694 DICTKEY_UNREF
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	695
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	696 if (di == NULL)
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 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	699 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	700 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	701 di->di_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	702
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	703 if (_ConvertFromPyObject(valObject, &di->di_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	704 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	705 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	706 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	707 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	708 if (dict_add(d, di) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	709 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	710 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	711 PyErr_SetVim(_("failed to add key to dictionary"));
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	715 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	716 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	717
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	718 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	719 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	720 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	721 dict_T *d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	722 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	723 dictitem_T *di;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	724 PyObject *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	725 PyObject *litem;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	726 PyObject *keyObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	727 PyObject *valObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	728 Py_ssize_t lsize;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	729
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	730 d = dict_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	731 if (d == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	732 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	733 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	734 return -1;
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	737 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	738 tv->vval.v_dict = d;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	739
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	740 list = PyMapping_Items(obj);
4317 4281875776fb updated for version 7.3.908 Bram Moolenaar <bram@vim.org> parents: 4315 diff changeset	741 if (list == NULL)
4281875776fb updated for version 7.3.908 Bram Moolenaar <bram@vim.org> parents: 4315 diff changeset	742 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	743 lsize = PyList_Size(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	744 while (lsize--)
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 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	747
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	748 litem = PyList_GetItem(list, lsize);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	749 if (litem == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	750 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	751 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	752 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	753 }
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 keyObject = PyTuple_GetItem(litem, 0);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	756 if (keyObject == NULL)
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 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	759 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	760 return -1;
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
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	763 DICTKEY_GET_NOTEMPTY(-1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	764
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	765 valObject = PyTuple_GetItem(litem, 1);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	766 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	767 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	768 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	769 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	770 return -1;
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	773 di = dictitem_alloc(key);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	774
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	775 DICTKEY_UNREF
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 if (di == NULL)
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 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	780 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	781 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	782 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	783 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	784 di->di_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	785
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	786 if (_ConvertFromPyObject(valObject, &di->di_tv, lookupDict) == -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 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	789 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	790 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	791 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	792 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	793 if (dict_add(d, di) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	794 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	795 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	796 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	797 Py_DECREF(litem);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	798 PyErr_SetVim(_("failed to add key to dictionary"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	799 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	800 }
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	803 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	804 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	805 }
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 static PyInt
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	808 DictionarySetattr(DictionaryObject self, char name, PyObject *val)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	809 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	810 if (val == NULL)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	811 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	812 PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	813 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	814 }
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 if (strcmp(name, "locked") == 0)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	817 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	818 if (self->dict->dv_lock == VAR_FIXED)
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 PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed dictionary"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	821 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	822 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	823 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	824 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	825 if (!PyBool_Check(val))
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 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	828 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	829 }
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 if (val == Py_True)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	832 self->dict->dv_lock = VAR_LOCKED;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	833 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	834 self->dict->dv_lock = 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	835 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	836 return 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	837 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	838 else
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 PyErr_SetString(PyExc_AttributeError, _("Cannot set this attribute"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	841 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	842 }
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
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	845 static PyInt
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	846 DictionaryLength(PyObject *self)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	847 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	848 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	849 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	850
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	851 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	852 DictionaryItem(PyObject self, PyObject keyObject)
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 char_u *key;
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	855 dictitem_T *di;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	856 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	857
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	858 DICTKEY_GET_NOTEMPTY(NULL)
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	859
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	860 di = dict_find(((DictionaryObject *) (self))->dict, key, -1);
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	861
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	862 DICTKEY_UNREF
2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	863
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	864 if (di == NULL)
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	865 {
4315 9f3da1dea7c0 updated for version 7.3.907 Bram Moolenaar <bram@vim.org> parents: 4260 diff changeset	866 PyErr_SetString(PyExc_KeyError, _("no such key in dictionary"));
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	867 return NULL;
73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	868 }
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	869
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	870 return ConvertToPyObject(&di->di_tv);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	871 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	872
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	873 static PyInt
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	874 DictionaryAssItem(PyObject self, PyObject keyObject, PyObject *valObject)
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 char_u *key;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	877 typval_T tv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	878 dict_T d = ((DictionaryObject )(self))->dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	879 dictitem_T *di;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	880 DICTKEY_DECL
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	881
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	882 if (d->dv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	883 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	884 PyErr_SetVim(_("dict is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	885 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	886 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	887
3792 73557eda7027 updated for version 7.3.654 Bram Moolenaar <bram@vim.org> parents: 3788 diff changeset	888 DICTKEY_GET_NOTEMPTY(-1)
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	889
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	890 di = dict_find(d, key, -1);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	891
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	892 if (valObject == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	893 {
3636 0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	894 hashitem_T *hi;
0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	895
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	896 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	897 {
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	898 DICTKEY_UNREF
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	899 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	900 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	901 }
3636 0e9b2622c94a updated for version 7.3.578 Bram Moolenaar <bram@vim.org> parents: 3618 diff changeset	902 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	903 hash_remove(&d->dv_hashtab, hi);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	904 dictitem_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	905 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	906 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	907
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	908 if (ConvertFromPyObject(valObject, &tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	909 return -1;
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 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	912 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	913 di = dictitem_alloc(key);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	914 if (di == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	915 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	916 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	917 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	918 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	919 di->di_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	920
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	921 if (dict_add(d, di) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	922 {
3824 2bf8c00741f7 updated for version 7.3.670 Bram Moolenaar <bram@vim.org> parents: 3806 diff changeset	923 DICTKEY_UNREF
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	924 vim_free(di);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	925 PyErr_SetVim(_("failed to add key to dictionary"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	926 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	927 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	928 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	929 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	930 clear_tv(&di->di_tv);
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 DICTKEY_UNREF
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	933
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	934 copy_tv(&tv, &di->di_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	935 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	936 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	937
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	938 static PyObject *
4133 36fd800b8c6c updated for version 7.3.819 Bram Moolenaar <bram@vim.org> parents: 3988 diff changeset	939 DictionaryListKeys(PyObject *self UNUSED)
3618 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 dict_T dict = ((DictionaryObject )(self))->dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	942 long_u todo = dict->dv_hashtab.ht_used;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	943 Py_ssize_t i = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	944 PyObject *r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	945 hashitem_T *hi;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	946
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	947 r = PyList_New(todo);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	948 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	949 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	950 if (!HASHITEM_EMPTY(hi))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	951 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	952 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	953 --todo;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	954 ++i;
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	957 return r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	958 }
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 static struct PyMethodDef DictionaryMethods[] = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	961 {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	962 { NULL, NULL, 0, NULL }
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	965 static PyTypeObject ListType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	966
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	967 typedef struct
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 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	970 list_T *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	971 pylinkedlist_T ref;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	972 } ListObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	973
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	974 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	975 ListNew(list_T *list)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	976 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	977 ListObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	978
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	979 self = PyObject_NEW(ListObject, &ListType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	980 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	981 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	982 self->list = list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	983 ++list->lv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	984
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	985 pyll_add((PyObject *)(self), &self->ref, &lastlist);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	986
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	987 return (PyObject *)(self);
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	990 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	991 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	992 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	993 Py_ssize_t i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	994 Py_ssize_t lsize = PySequence_Size(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	995 PyObject *litem;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	996 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	997
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	998 for(i=0; i<lsize; i++)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	999 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1000 li = listitem_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1001 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1002 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1003 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1004 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1005 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1006 li->li_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1007
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1008 litem = PySequence_GetItem(obj, i);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1009 if (litem == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1010 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1011 if (_ConvertFromPyObject(litem, &li->li_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1012 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1013
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1014 list_append(l, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1015 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1016 return 0;
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1019 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1020 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	1021 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1022 list_T *l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1023
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1024 l = list_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1025 if (l == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1026 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1027 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1028 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1029 }
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 tv->v_type = VAR_LIST;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1032 tv->vval.v_list = l;
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 if (list_py_concat(l, obj, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1035 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1036
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1037 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1038 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1039
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1040 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1041 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	1042 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1043 PyObject *iterator = PyObject_GetIter(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1044 PyObject *item;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1045 list_T *l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1046 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1047
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1048 l = list_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1049
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1050 if (l == NULL)
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 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1053 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1054 }
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 tv->vval.v_list = l;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1057 tv->v_type = VAR_LIST;
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 if (iterator == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1061 return -1;
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 while ((item = PyIter_Next(obj)))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1064 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1065 li = listitem_alloc();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1066 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1067 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1068 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1069 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1070 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1071 li->li_tv.v_lock = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1072
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1073 if (_ConvertFromPyObject(item, &li->li_tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1074 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1075
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1076 list_append(l, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1077
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1078 Py_DECREF(item);
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1081 Py_DECREF(iterator);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1082 return 0;
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 static PyInt
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1086 ListLength(PyObject *self)
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 return ((PyInt) (((ListObject *) (self))->list->lv_len));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1089 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1090
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1091 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1092 ListItem(PyObject *self, Py_ssize_t index)
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 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1095
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1096 if (index>=ListLength(self))
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 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	1099 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1100 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1101 li = list_find(((ListObject *) (self))->list, (long) index);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1102 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1103 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1104 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	1105 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1106 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1107 return ConvertToPyObject(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1108 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1109
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1110 #define PROC_RANGE \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1111 if (last < 0) {\
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1112 if (last < -size) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1113 last = 0; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1114 else \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1115 last += size; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1116 } \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1117 if (first < 0) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1118 first = 0; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1119 if (first > size) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1120 first = size; \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1121 if (last > size) \
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1122 last = size;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1123
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1124 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1125 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	1126 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1127 PyInt i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1128 PyInt size = ListLength(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1129 PyInt n;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1130 PyObject *list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1131 int reversed = 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1132
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1133 PROC_RANGE
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1134 if (first >= last)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1135 first = last;
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 n = last-first;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1138 list = PyList_New(n);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1139 if (list == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1140 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1141
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1142 for (i = 0; i < n; ++i)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1143 {
4260 d8acfc49d94e updated for version 7.3.881 Bram Moolenaar <bram@vim.org> parents: 4133 diff changeset	1144 PyObject *item = ListItem(self, first + i);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1145 if (item == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1146 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1147 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1148 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1149 }
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 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	1152 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1153 Py_DECREF(item);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1154 Py_DECREF(list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1155 return NULL;
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1158
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1159 return list;
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 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1163 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	1164 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1165 typval_T tv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1166 list_T l = ((ListObject ) (self))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1167 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1168 Py_ssize_t length = ListLength(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1169
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1170 if (l->lv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1171 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1172 PyErr_SetVim(_("list is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1173 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1174 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1175 if (index>length \|\| (index==length && obj==NULL))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1176 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1177 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	1178 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1179 }
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 if (obj == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1182 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1183 li = list_find(l, (long) index);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1184 list_remove(l, li, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1185 clear_tv(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1186 vim_free(li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1187 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1188 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1189
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1190 if (ConvertFromPyObject(obj, &tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1191 return -1;
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 if (index == length)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1194 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1195 if (list_append_tv(l, &tv) == FAIL)
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 PyErr_SetVim(_("Failed to add item to list"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1198 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1199 }
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 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1202 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1203 li = list_find(l, (long) index);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1204 clear_tv(&li->li_tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1205 copy_tv(&tv, &li->li_tv);
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 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1208 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1209
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1210 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1211 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	1212 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1213 PyInt size = ListLength(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1214 Py_ssize_t i;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1215 Py_ssize_t lsize;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1216 PyObject *litem;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1217 listitem_T *li;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1218 listitem_T *next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1219 typval_T v;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1220 list_T l = ((ListObject ) (self))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1221
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1222 if (l->lv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1223 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1224 PyErr_SetVim(_("list is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1225 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1226 }
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 PROC_RANGE
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1229
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1230 if (first == size)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1231 li = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1232 else
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 li = list_find(l, (long) first);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1235 if (li == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1236 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1237 PyErr_SetVim(_("internal error: no vim list item"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1238 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1239 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1240 if (last > first)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1241 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1242 i = last - first;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1243 while (i-- && li != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1244 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1245 next = li->li_next;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1246 listitem_remove(l, li);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1247 li = next;
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1250 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1251
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1252 if (obj == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1253 return 0;
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 if (!PyList_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1256 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1257 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	1258 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1259 }
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 lsize = PyList_Size(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1262
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1263 for(i=0; i<lsize; i++)
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 litem = PyList_GetItem(obj, i);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1266 if (litem == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1267 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1268 if (ConvertFromPyObject(litem, &v) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1269 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1270 if (list_insert_tv(l, &v, li) == FAIL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1271 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1272 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	1273 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1274 }
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 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1277 }
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 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1280 ListConcatInPlace(PyObject self, PyObject obj)
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 list_T l = ((ListObject ) (self))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1283 PyObject *lookup_dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1284
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1285 if (l->lv_lock)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1286 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1287 PyErr_SetVim(_("list is locked"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1288 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1289 }
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 if (!PySequence_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1292 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1293 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	1294 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1295 }
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 lookup_dict = PyDict_New();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1298 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	1299 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1300 Py_DECREF(lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1301 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1302 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1303 Py_DECREF(lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1304
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1305 Py_INCREF(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1306 return self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1307 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1308
3828 fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1309 static int
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1310 ListSetattr(ListObject self, char name, PyObject *val)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1311 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1312 if (val == NULL)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1313 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1314 PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1315 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1316 }
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 if (strcmp(name, "locked") == 0)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1319 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1320 if (self->list->lv_lock == VAR_FIXED)
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 PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed list"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1323 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1324 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1325 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1326 {
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1327 if (!PyBool_Check(val))
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 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	1330 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1331 }
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 if (val == Py_True)
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1334 self->list->lv_lock = VAR_LOCKED;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1335 else
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1336 self->list->lv_lock = 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1337 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1338 return 0;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1339 }
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1340 else
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 PyErr_SetString(PyExc_AttributeError, _("Cannot set this attribute"));
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1343 return -1;
fd6ef931aa77 updated for version 7.3.672 Bram Moolenaar <bram@vim.org> parents: 3826 diff changeset	1344 }
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
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1347 static struct PyMethodDef ListMethods[] = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1348 {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1349 { NULL, NULL, 0, NULL }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1350 };
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1351
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1352 typedef struct
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1353 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1354 PyObject_HEAD
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1355 char_u *name;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1356 } FunctionObject;
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 static PyTypeObject FunctionType;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1359
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1360 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1361 FunctionNew(char_u *name)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1362 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1363 FunctionObject *self;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1364
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1365 self = PyObject_NEW(FunctionObject, &FunctionType);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1366 if (self == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1367 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1368 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	1369 if (self->name == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1370 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1371 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1372 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1373 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1374 STRCPY(self->name, name);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1375 func_ref(name);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1376 return (PyObject *)(self);
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1379 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1380 FunctionCall(PyObject self, PyObject argsObject, PyObject *kwargs)
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 FunctionObject this = (FunctionObject )(self);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1383 char_u *name = this->name;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1384 typval_T args;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1385 typval_T selfdicttv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1386 typval_T rettv;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1387 dict_T *selfdict = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1388 PyObject *selfdictObject;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1389 PyObject *result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1390 int error;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1391
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1392 if (ConvertFromPyObject(argsObject, &args) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1393 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1394
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1395 if (kwargs != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1396 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1397 selfdictObject = PyDict_GetItemString(kwargs, "self");
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1398 if (selfdictObject != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1399 {
3703 e13f2f3568e1 updated for version 7.3.611 Bram Moolenaar <bram@vim.org> parents: 3648 diff changeset	1400 if (!PyMapping_Check(selfdictObject))
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1401 {
3703 e13f2f3568e1 updated for version 7.3.611 Bram Moolenaar <bram@vim.org> parents: 3648 diff changeset	1402 PyErr_SetString(PyExc_TypeError,
e13f2f3568e1 updated for version 7.3.611 Bram Moolenaar <bram@vim.org> parents: 3648 diff changeset	1403 _("'self' argument must be a dictionary"));
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1404 clear_tv(&args);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1405 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1406 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1407 if (ConvertFromPyObject(selfdictObject, &selfdicttv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1408 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1409 selfdict = selfdicttv.vval.v_dict;
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1412
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1413 error = func_call(name, &args, selfdict, &rettv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1414 if (error != OK)
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 result = NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1417 PyErr_SetVim(_("failed to run function"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1418 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1419 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1420 result = ConvertToPyObject(&rettv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1421
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1422 /* FIXME Check what should really be cleared. */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1423 clear_tv(&args);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1424 clear_tv(&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 * if (selfdict!=NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1427 * clear_tv(selfdicttv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1428 */
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 return result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1431 }
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 static struct PyMethodDef FunctionMethods[] = {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1434 {"__call__", (PyCFunction)FunctionCall, METH_VARARGS\|METH_KEYWORDS, ""},
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	1435 { NULL, NULL, 0, NULL }
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
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1438 #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	1439
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1440 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1441 CheckWindow(WindowObject *this)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1442 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1443 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	1444 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1445 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	1446 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1447 }
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 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1450 }
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 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	1453 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	1454
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1455 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1456 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	1457 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1458 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	1459
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1460 if (CheckWindow(this))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1461 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1462
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1463 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	1464 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1465 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	1466 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1467 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1468 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	1469 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1470 long lnum;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1471 long col;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1472
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1473 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	1474 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1475
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1476 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	1477 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1478 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	1479 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1480 }
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 /* 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	1483 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1484 return -1;
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 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	1487 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	1488 #ifdef FEAT_VIRTUALEDIT
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1489 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	1490 #endif
2933 0bef86c5c985 updated for version 7.3.239 Bram Moolenaar <bram@vim.org> parents: 2919 diff changeset	1491 /* 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	1492 check_cursor_col_win(this->win);
0bef86c5c985 updated for version 7.3.239 Bram Moolenaar <bram@vim.org> parents: 2919 diff changeset	1493
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1494 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1495 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1496 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1497 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	1498 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1499 int height;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1500 win_T *savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1501
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1502 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	1503 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1504
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1505 #ifdef FEAT_GUI
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1506 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	1507 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1508 savewin = curwin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1509 curwin = this->win;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1510 win_setheight(height);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1511 curwin = savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1512
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1513 /* 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	1514 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1515 return -1;
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 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1518 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1519 #ifdef FEAT_VERTSPLIT
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1520 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	1521 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1522 int width;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1523 win_T *savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1524
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1525 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	1526 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1527
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1528 #ifdef FEAT_GUI
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1529 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	1530 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1531 savewin = curwin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1532 curwin = this->win;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1533 win_setwidth(width);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1534 curwin = savewin;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1535
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1536 /* 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	1537 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1538 return -1;
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 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1541 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1542 #endif
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1543 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1544 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1545 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	1546 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1547 }
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1550 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1551 WindowRepr(PyObject *self)
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 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	1554 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	1555
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1556 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	1557 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1558 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	1559 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	1560 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1561 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1562 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1563 int i = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1564 win_T *w;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1565
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1566 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	1567 ++i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1568
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1569 if (w == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1570 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	1571 (self));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1572 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1573 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	1574
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1575 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	1576 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1577 }
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 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1580 * 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	1581 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1582 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1583 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	1584 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1585 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	1586 PyInt n = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1587
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1588 while (w != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1589 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1590 ++n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1591 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	1592 }
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 return n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1595 }
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 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1598 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	1599 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1600 win_T *w;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1601
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1602 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	1603 if (n == 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1604 return WindowNew(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 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	1607 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1608 }
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 /* 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	1611 *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1612 * 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	1613 * 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	1614 * characters.
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 * 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	1617 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1618 static char *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1619 StringToLine(PyObject *obj)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1620 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1621 const char *str;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1622 char *save;
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1623 PyObject *bytes;
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1624 PyInt len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1625 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1626 char *p;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1627
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1628 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	1629 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1630 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1631 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1632 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1633
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1634 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	1635 str = PyString_AsString(bytes);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1636 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	1637
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1638 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1639 * 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	1640 * 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	1641 * a single line.
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1642 * 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	1643 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1644 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	1645 if (p != NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1646 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1647 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	1648 --len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1649 else
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 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	1652 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1653 }
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1656 /* 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	1657 * 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	1658 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1659 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	1660 if (save == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1661 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1662 PyErr_NoMemory();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1663 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1664 }
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 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	1667 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1668 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	1669 save[i] = '\n';
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1670 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1671 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	1672 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1673
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1674 save[i] = '\0';
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1675 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	1676
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1677 return save;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1678 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1679
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1680 /* 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	1681 * 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	1682 * string object.
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 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1685 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	1686 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1687 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	1688 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1689
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 /* 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	1692 * 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	1693 * 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	1694 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1695 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1696 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	1697 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1698 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1699 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	1700 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	1701
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1702 if (list == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1703 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1704
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1705 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	1706 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1707 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	1708
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1709 /* 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	1710 if (str == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1711 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1712 Py_DECREF(list);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1713 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1714 }
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 /* 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	1717 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	1718 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1719 Py_DECREF(str);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1720 Py_DECREF(list);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1721 return NULL;
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 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1724
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1725 /* 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	1726 * 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	1727 * with it).
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1730 return list;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1731 }
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 * 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	1735 * 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	1736 * deleted).
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 static void
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1739 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	1740 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1741 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	1742 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1743 /* 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	1744 * lines. */
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 >= hi)
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 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	1748 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1749 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1750 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	1751 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1752 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	1753 check_cursor();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1754 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1755 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1756 check_cursor_col();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1757 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	1758 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1759 invalidate_botline();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1760 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1761
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1762 /*
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1763 * 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	1764 * 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	1765 * 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	1766 * 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	1767 * 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	1768 * 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	1769 * 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	1770 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1771 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1772 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	1773 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1774 /* 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	1775 * 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	1776 * 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	1777 * 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	1778 * 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	1779 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1780 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	1781 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1782 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	1783
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1784 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1785 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1786
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1787 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	1788 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	1789 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	1790 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	1791 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1792 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1793 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	1794 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	1795 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	1796 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1797
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1798 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1799
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1800 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	1801 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1802
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1803 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1804 *len_change = -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1805
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1806 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1807 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1808 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	1809 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1810 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	1811 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	1812
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1813 if (save == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1814 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1815
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1816 /* 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	1817 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1818 curbuf = buf;
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 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	1821 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1822 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	1823 vim_free(save);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1824 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1825 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	1826 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1827 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	1828 vim_free(save);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1829 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1830 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1831 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	1832
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1833 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1834
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1835 /* 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	1836 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	1837 check_cursor_col();
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 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	1840 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1841
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1842 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1843 *len_change = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1844
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1845 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1846 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1847 else
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 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1850 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	1851 }
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
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1854 /* 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	1855 * 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	1856 * 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	1857 * 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	1858 * 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	1859 * 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	1860 * 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	1861 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1862 static int
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1863 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	1864 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1865 /* 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	1866 * There are three cases:
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1867 * 1. NULL, or None - this is a deletion.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1868 * 2. A list - this is a replacement.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1869 * 3. Anything else - this is an error.
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1870 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1871 if (list == Py_None \|\| list == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1872 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1873 PyInt i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1874 PyInt n = (int)(hi - lo);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1875 buf_T *savebuf = curbuf;
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 PyErr_Clear();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1878 curbuf = buf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1879
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1880 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	1881 PyErr_SetVim(_("cannot save undo information"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1882 else
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 for (i = 0; i < n; ++i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1885 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1886 if (ml_delete((linenr_T)lo, FALSE) == FAIL)
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 PyErr_SetVim(_("cannot delete line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1889 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1890 }
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 if (buf == curwin->w_buffer)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1893 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	1894 deleted_lines_mark((linenr_T)lo, (long)i);
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
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1897 curbuf = savebuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1898
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1899 if (PyErr_Occurred() \|\| VimErrorCheck())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1900 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1901
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1902 if (len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1903 *len_change = -n;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1904
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1905 return OK;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1906 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1907 else if (PyList_Check(list))
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 PyInt i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1910 PyInt new_len = PyList_Size(list);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1911 PyInt old_len = hi - lo;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1912 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	1913 char **array;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1914 buf_T *savebuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1915
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1916 if (new_len == 0) /* avoid allocating zero bytes */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1917 array = NULL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1918 else
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 array = (char *)alloc((unsigned)(new_len sizeof(char *)));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1921 if (array == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1922 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1923 PyErr_NoMemory();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1924 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1925 }
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
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1928 for (i = 0; i < new_len; ++i)
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 PyObject *line = PyList_GetItem(list, i);
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 array[i] = StringToLine(line);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1933 if (array[i] == NULL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1934 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1935 while (i)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1936 vim_free(array[--i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1937 vim_free(array);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1938 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1939 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1940 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1941
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1942 savebuf = curbuf;
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 PyErr_Clear();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1945 curbuf = buf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1946
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1947 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	1948 PyErr_SetVim(_("cannot save undo information"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1949
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1950 /* 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	1951 * 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	1952 * repeatedly deleting line "lo".
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 (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1955 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1956 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	1957 if (ml_delete((linenr_T)lo, FALSE) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1958 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1959 PyErr_SetVim(_("cannot delete line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1960 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1961 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1962 extra -= i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1963 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1964
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1965 /* 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	1966 * 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	1967 * less memory allocation and freeing.
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 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1970 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1971 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	1972 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	1973 == FAIL)
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 PyErr_SetVim(_("cannot replace line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1976 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1977 }
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 else
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1980 i = 0;
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 /* 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	1983 * 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	1984 * responsibility to vim in this case).
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 if (!PyErr_Occurred())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1987 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1988 while (i < new_len)
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 (ml_append((linenr_T)(lo + i - 1),
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1991 (char_u *)array[i], 0, FALSE) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1992 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1993 PyErr_SetVim(_("cannot insert line"));
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1994 break;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1995 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1996 vim_free(array[i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1997 ++i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	1998 ++extra;
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 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2001
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2002 /* 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	2003 while (i < new_len)
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 vim_free(array[i]);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2006 ++i;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2007 }
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 /* 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	2010 * 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	2011 * to vim.
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 vim_free(array);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2014
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2015 /* Adjust marks. Invalidate any which lie in the
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2016 * 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	2017 */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2018 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	2019 (long)MAXLNUM, (long)extra);
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2020 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	2021
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2022 if (buf == curwin->w_buffer)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2023 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	2024
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2025 curbuf = savebuf;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2026
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2027 if (PyErr_Occurred() \|\| VimErrorCheck())
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2028 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2029
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2030 if (len_change)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2031 *len_change = new_len - old_len;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2032
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2033 return OK;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2034 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2035 else
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 PyErr_BadArgument();
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2038 return FAIL;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2039 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2040 }
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2041
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2042 /* 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	2043 * 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	2044 * 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	2045 * 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	2046 * 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	2047 * 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	2048 * 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	2049 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2050 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2051 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	2052 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2053 /* 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	2054 * 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	2055 */
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2056 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	2057 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2058 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	2059 buf_T *savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2060
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2061 if (str == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2062 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2063
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2064 savebuf = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2065
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2066 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2067 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2068
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2069 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	2070 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	2071 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	2072 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	2073 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2074 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	2075
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2076 vim_free(str);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2077 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2078 update_screen(VALID);
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 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	2081 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2082
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2083 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2084 *len_change = 1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2085
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2086 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2087 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2088 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	2089 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2090 PyInt i;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2091 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	2092 char **array;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2093 buf_T *savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2094
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2095 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	2096 if (array == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2097 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2098 PyErr_NoMemory();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2099 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2100 }
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 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	2103 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2104 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	2105 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	2106
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2107 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	2108 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2109 while (i)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2110 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	2111 vim_free(array);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2112 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2113 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2114 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2115
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2116 savebuf = curbuf;
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 PyErr_Clear();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2119 curbuf = buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2120
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2121 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	2122 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	2123 else
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 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	2126 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2127 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	2128 (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	2129 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2130 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	2131
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2132 /* 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	2133 while (i < size)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2134 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	2135
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2136 break;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2137 }
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 if (i > 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2141 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	2142 }
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 /* 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	2145 * been freed.
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 vim_free(array);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2148
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2149 curbuf = savebuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2150 update_screen(VALID);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2151
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2152 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	2153 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2154
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2155 if (len_change)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2156 *len_change = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2157
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2158 return OK;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2159 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2160 else
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 PyErr_BadArgument();
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2163 return FAIL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2164 }
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2167 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2168 * 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	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 static int
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2173 CheckBuffer(BufferObject *this)
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 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	2176 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2177 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	2178 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2179 }
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 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2182 }
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 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2185 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	2186 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2187 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2188 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2189
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2190 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	2191 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2192 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	2193 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2194 }
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 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	2197 }
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 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2200 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	2201 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2202 PyInt size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2203
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2204 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2205 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2206
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2207 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	2208
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2209 if (lo < 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2210 lo = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2211 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	2212 lo = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2213 if (hi < 0)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2214 hi = 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2215 if (hi < lo)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2216 hi = lo;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2217 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	2218 hi = size;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2219
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2220 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	2221 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2222
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2223 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2224 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	2225 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2226 PyInt len_change;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2227
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2228 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2229 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2230
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2231 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	2232 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2233 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	2234 return -1;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2235 }
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 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	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 if (new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2241 *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	2242
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2243 return 0;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2244 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2245
2894 fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2246 static PyInt
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2247 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	2248 {
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2249 PyInt size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2250 PyInt len_change;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2251
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2252 /* Self must be a valid buffer */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2253 if (CheckBuffer(self))
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2254 return -1;
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 /* Sort out the slice range */
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2257 size = end - start + 1;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2258
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2259 if (lo < 0)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2260 lo = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2261 else if (lo > size)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2262 lo = size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2263 if (hi < 0)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2264 hi = 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2265 if (hi < lo)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2266 hi = lo;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2267 else if (hi > size)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2268 hi = size;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2269
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2270 if (SetBufferLineList(self->buf, lo + start, hi + start,
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2271 val, &len_change) == FAIL)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2272 return -1;
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 (new_end)
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2275 *new_end = end + len_change;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2276
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2277 return 0;
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2278 }
fe9c7da98b5e updated for version 7.3.220 Bram Moolenaar <bram@vim.org> parents: 2727 diff changeset	2279
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2280
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2281 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2282 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	2283 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2284 PyObject *lines;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2285 PyInt len_change;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2286 PyInt max;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2287 PyInt n;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2288
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2289 if (CheckBuffer(self))
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2290 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2291
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2292 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	2293
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2294 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	2295 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2296
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2297 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	2298 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2299 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	2300 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2301 }
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 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	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 if (new_end)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2307 *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	2308
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2309 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	2310 return Py_None;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2311 }
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2314 /* Buffer object - Definitions
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 typedef struct
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2318 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2319 PyObject_HEAD
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2320 BufferObject *buf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2321 PyInt start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2322 PyInt end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2323 } RangeObject;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2324
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2325 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2326 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	2327 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2328 BufferObject *bufr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2329 RangeObject *self;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2330 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	2331 if (self == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2332 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2333
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2334 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	2335 if (bufr == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2336 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2337 Py_DECREF(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2338 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2339 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2340 Py_INCREF(bufr);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2341
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2342 self->buf = bufr;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2343 self->start = start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2344 self->end = end;
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 return (PyObject *)(self);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2347 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2348
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2349 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2350 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	2351 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2352 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	2353 (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	2354 NULL);
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2357 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2358 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	2359 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2360 pos_T *posp;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2361 char *pmark;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2362 char mark;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2363 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	2364
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2365 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	2366 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2367
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2368 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	2369 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2370 mark = *pmark;
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 curbuf_save = curbuf;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2373 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	2374 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	2375 curbuf = curbuf_save;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2376
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2377 if (posp == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2378 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2379 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	2380 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2381 }
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 /* 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	2384 if (VimErrorCheck())
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2385 return NULL;
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 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	2388 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2389 /* 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	2390 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	2391 return Py_None;
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2394 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	2395 }
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 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2398 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	2399 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2400 PyInt start;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2401 PyInt end;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2402
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2403 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	2404 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2405
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2406 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	2407 return NULL;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2408
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2409 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	2410 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2411
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2412 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	2413 /* 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	2414 {"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	2415 {"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	2416 {"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	2417 #if PY_VERSION_HEX >= 0x03000000
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3056 diff changeset	2418 {"__dir__", BufferDir, 4, "List its attributes" },
60f6df978a41 updated for version 7.3.422 Bram Moolenaar <bram@vim.org> parents: 3056 diff changeset	2419 #endif
2447 84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2420 { 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	2421 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2422
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2423 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2424 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	2425 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2426 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	2427 ((RangeObject *)(self))->start,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2428 ((RangeObject *)(self))->end,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2429 &((RangeObject *)(self))->end);
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2430 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2431
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2432 static PyInt
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2433 RangeLength(PyObject *self)
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 /* 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	2436 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	2437 return -1; /* ??? */
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 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	2440 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2441
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2442 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2443 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	2444 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2445 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	2446 ((RangeObject *)(self))->start,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2447 ((RangeObject *)(self))->end);
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2450 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2451 RangeRepr(PyObject *self)
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 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	2454 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	2455
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2456 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	2457 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2458 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	2459 (self));
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2460 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	2461 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2462 else
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2463 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2464 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	2465 int len;
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2466
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2467 if (name == NULL)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2468 name = "";
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2469 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	2470
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2471 if (len > 45)
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2472 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	2473
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2474 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	2475 len > 45 ? "..." : "", name,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2476 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	2477
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2478 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	2479 }
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2480 }
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 static PyObject *
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2483 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	2484 {
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2485 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	2486 ((RangeObject *)(self))->start,
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2487 ((RangeObject *)(self))->end);
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
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2490 /*
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2491 * 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	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 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	2495 /* 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	2496 {"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	2497 { 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	2498 };
84d353762845 Move many more common Python items to if_py_both.c. Bram Moolenaar <bram@vim.org> parents: 2399 diff changeset	2499
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2500 static void
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2501 set_ref_in_py(const int copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2502 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2503 pylinkedlist_T *cur;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2504 dict_T *dd;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2505 list_T *ll;
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 if (lastdict != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2508 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	2509 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2510 dd = ((DictionaryObject *) (cur->pll_obj))->dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2511 if (dd->dv_copyID != copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2512 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2513 dd->dv_copyID = copyID;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2514 set_ref_in_ht(&dd->dv_hashtab, copyID);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2515 }
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2518 if (lastlist != NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2519 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	2520 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2521 ll = ((ListObject *) (cur->pll_obj))->list;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2522 if (ll->lv_copyID != copyID)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2523 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2524 ll->lv_copyID = copyID;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2525 set_ref_in_list(ll, copyID);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2526 }
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 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2529
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2530 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2531 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	2532 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2533 tv->vval.v_string = vim_strsave(str);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2534 if (tv->vval.v_string == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2535 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2536 PyErr_NoMemory();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2537 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2538 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2539 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2540 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2541
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2542 typedef int (pytotvfunc)(PyObject , typval_T , PyObject );
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2543
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2544 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2545 convert_dl(PyObject obj, typval_T tv,
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2546 pytotvfunc py_to_tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2547 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2548 PyObject *capsule;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2549 char hexBuf[sizeof(void ) 2 + 3];
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2550
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2551 sprintf(hexBuf, "%p", obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2552
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2553 # ifdef PY_USE_CAPSULE
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2554 capsule = PyDict_GetItemString(lookupDict, hexBuf);
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2555 # else
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2556 capsule = (PyObject *)PyDict_GetItemString(lookupDict, hexBuf);
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2557 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2558 if (capsule == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2559 {
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2560 # ifdef PY_USE_CAPSULE
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2561 capsule = PyCapsule_New(tv, NULL, NULL);
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2562 # else
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2563 capsule = PyCObject_FromVoidPtr(tv, NULL);
2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2564 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2565 PyDict_SetItemString(lookupDict, hexBuf, capsule);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2566 Py_DECREF(capsule);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2567 if (py_to_tv(obj, tv, lookupDict) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2568 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2569 tv->v_type = VAR_UNKNOWN;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2570 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2571 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2572 /* 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	2573 * do it ourself. */
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2574 switch(tv->v_type)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2575 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2576 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	2577 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	2578 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2579 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2580 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2581 {
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2582 typval_T *v;
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2583
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2584 # ifdef PY_USE_CAPSULE
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2585 v = PyCapsule_GetPointer(capsule, NULL);
80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2586 # else
3648 2d107086903a updated for version 7.3.584 Bram Moolenaar <bram@vim.org> parents: 3640 diff changeset	2587 v = PyCObject_AsVoidPtr(capsule);
3638 80ed6aa7b9eb updated for version 7.3.579 Bram Moolenaar <bram@vim.org> parents: 3636 diff changeset	2588 # endif
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2589 copy_tv(v, tv);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2590 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2591 return 0;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2592 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2593
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2594 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2595 ConvertFromPyObject(PyObject obj, typval_T tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2596 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2597 PyObject *lookup_dict;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2598 int r;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2599
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2600 lookup_dict = PyDict_New();
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2601 r = _ConvertFromPyObject(obj, tv, lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2602 Py_DECREF(lookup_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2603 return 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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2606 static int
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2607 _ConvertFromPyObject(PyObject obj, typval_T tv, PyObject *lookupDict)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2608 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2609 if (obj->ob_type == &DictionaryType)
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 tv->v_type = VAR_DICT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2612 tv->vval.v_dict = (((DictionaryObject *)(obj))->dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2613 ++tv->vval.v_dict->dv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2614 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2615 else if (obj->ob_type == &ListType)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2616 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2617 tv->v_type = VAR_LIST;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2618 tv->vval.v_list = (((ListObject *)(obj))->list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2619 ++tv->vval.v_list->lv_refcount;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2620 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2621 else if (obj->ob_type == &FunctionType)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2622 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2623 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	2624 return -1;
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 tv->v_type = VAR_FUNC;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2627 func_ref(tv->vval.v_string);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2628 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2629 #if PY_MAJOR_VERSION >= 3
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2630 else if (PyBytes_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2631 {
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2632 char_u *result;
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2633
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2634 if (PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2635 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2636 if (result == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2637 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2638
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2639 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2640 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2641
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2642 tv->v_type = VAR_STRING;
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 else if (PyUnicode_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2645 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2646 PyObject *bytes;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2647 char_u *result;
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 bytes = PyString_AsBytes(obj);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2650 if (bytes == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2651 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2652
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2653 if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2654 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2655 if (result == 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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2658 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2659 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2660 Py_XDECREF(bytes);
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 Py_XDECREF(bytes);
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 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2666 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2667 #else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2668 else if (PyUnicode_Check(obj))
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 PyObject *bytes;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2671 char_u *result;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2672
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2673 bytes = PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2674 if (bytes == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2675 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2676
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2677 if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2678 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2679 if (result == 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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2682 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2683 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2684 Py_XDECREF(bytes);
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 Py_XDECREF(bytes);
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 tv->v_type = VAR_STRING;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2690 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2691 else if (PyString_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2692 {
3800 15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2693 char_u *result;
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2694
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2695 if(PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
15cdcb8ddcfb updated for version 7.3.658 Bram Moolenaar <bram@vim.org> parents: 3792 diff changeset	2696 return -1;
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2697 if (result == NULL)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2698 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2699
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2700 if (set_string_copy(result, tv) == -1)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2701 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2702
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2703 tv->v_type = VAR_STRING;
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 else if (PyInt_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2706 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2707 tv->v_type = VAR_NUMBER;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2708 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	2709 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2710 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2711 else if (PyLong_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2712 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2713 tv->v_type = VAR_NUMBER;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2714 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	2715 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2716 else if (PyDict_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2717 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	2718 #ifdef FEAT_FLOAT
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2719 else if (PyFloat_Check(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 tv->v_type = VAR_FLOAT;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2722 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	2723 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2724 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2725 else if (PyIter_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2726 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	2727 else if (PySequence_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2728 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	2729 else if (PyMapping_Check(obj))
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2730 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	2731 else
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2732 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2733 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	2734 return -1;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2735 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2736 return 0;
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
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2739 static PyObject *
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2740 ConvertToPyObject(typval_T *tv)
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2741 {
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2742 if (tv == NULL)
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 PyErr_SetVim(_("NULL reference passed"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2745 return NULL;
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 switch (tv->v_type)
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 case VAR_STRING:
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2750 return PyBytes_FromString(tv->vval.v_string == NULL
0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2751 ? "" : (char *)tv->vval.v_string);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2752 case VAR_NUMBER:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2753 return PyLong_FromLong((long) tv->vval.v_number);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2754 #ifdef FEAT_FLOAT
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2755 case VAR_FLOAT:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2756 return PyFloat_FromDouble((double) tv->vval.v_float);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2757 #endif
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2758 case VAR_LIST:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2759 return ListNew(tv->vval.v_list);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2760 case VAR_DICT:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2761 return DictionaryNew(tv->vval.v_dict);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2762 case VAR_FUNC:
3852 0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2763 return FunctionNew(tv->vval.v_string == NULL
0f5ee2629635 updated for version 7.3.683 Bram Moolenaar <bram@vim.org> parents: 3828 diff changeset	2764 ? (char_u *)"" : tv->vval.v_string);
3618 c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2765 case VAR_UNKNOWN:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2766 Py_INCREF(Py_None);
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2767 return Py_None;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2768 default:
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2769 PyErr_SetVim(_("internal error: invalid value type"));
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2770 return NULL;
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2771 }
c052f3b79b99 updated for version 7.3.569 Bram Moolenaar <bram@vim.org> parents: 3466 diff changeset	2772 }

Mercurial > vim

annotate src/if_py_both.h @ 4317:4281875776fb v7.3.908