thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

updated for version 7.3.994

Browse Source 
Problem:    Python: using magic constants.
Solution:   Use descriptive values for ml_flags. (ZyX)
This commit is contained in:
Bram Moolenaar 2013-05-21 19:01:55 +02:00
parent e64faa6645
commit 182dc4f2ab
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/if_py_both.h
View File

@ -220,7 +220,7 @@ OutputWritelines(OutputObject *self, PyObject *args)
} }
static PyObject * static PyObject *
OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED) OutputFlush(PyObject *self UNUSED)
{ {
/* do nothing */ /* do nothing */
Py_INCREF(Py_None); Py_INCREF(Py_None);
@ -230,11 +230,11 @@ OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)
/***************/ /***************/
static struct PyMethodDef OutputMethods[] = { static struct PyMethodDef OutputMethods[] = {
/* name, function, calling, doc */ /* name, function, calling, doc */
{"write", (PyCFunction)OutputWrite, 1, ""}, {"write", (PyCFunction)OutputWrite, METH_VARARGS, ""},
{"writelines", (PyCFunction)OutputWritelines, 1, ""}, {"writelines", (PyCFunction)OutputWritelines, METH_VARARGS, ""},
{"flush", (PyCFunction)OutputFlush, 1, ""}, {"flush", (PyCFunction)OutputFlush, METH_NOARGS, ""},
{ NULL, NULL, 0, NULL} { NULL, NULL, 0, NULL}
}; };
static OutputObject Output = static OutputObject Output =
@ -533,12 +533,12 @@ VimStrwidth(PyObject *self UNUSED, PyObject *args)
*/ */
static struct PyMethodDef VimMethods[] = { static struct PyMethodDef VimMethods[] = {
/* name, function, calling, documentation */ /* name, function, calling, documentation */
{"command", VimCommand, 1, "Execute a Vim ex-mode command" }, {"command", VimCommand, METH_VARARGS, "Execute a Vim ex-mode command" },
{"eval", VimEval, 1, "Evaluate an expression using Vim evaluator" }, {"eval", VimEval, METH_VARARGS, "Evaluate an expression using Vim evaluator" },
{"bindeval", VimEvalPy, 1, "Like eval(), but returns objects attached to vim ones"}, {"bindeval", VimEvalPy, METH_VARARGS, "Like eval(), but returns objects attached to vim ones"},
{"strwidth", VimStrwidth, 1, "Screen string width, counts <Tab> as having width 1"}, {"strwidth", VimStrwidth, METH_VARARGS, "Screen string width, counts <Tab> as having width 1"},
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };
/* /*
@ -868,8 +868,8 @@ static PyMappingMethods DictionaryAsMapping = {
}; };
static struct PyMethodDef DictionaryMethods[] = { static struct PyMethodDef DictionaryMethods[] = {
{"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""}, {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };
static PyTypeObject ListType; static PyTypeObject ListType;
@ -1248,8 +1248,8 @@ ListSetattr(ListObject *self, char *name, PyObject *val)
} }
static struct PyMethodDef ListMethods[] = { static struct PyMethodDef ListMethods[] = {
{"extend", (PyCFunction)ListConcatInPlace, METH_O, ""}, {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };
typedef struct typedef struct
@ -1349,8 +1349,8 @@ FunctionCall(FunctionObject *self, PyObject *argsObject, PyObject *kwargs)
} }
static struct PyMethodDef FunctionMethods[] = { static struct PyMethodDef FunctionMethods[] = {
{"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""}, {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL}
}; };
/* /*
@ -2960,9 +2960,9 @@ RangeRepr(RangeObject *self)
} }
static struct PyMethodDef RangeMethods[] = { static struct PyMethodDef RangeMethods[] = {
/* name, function, calling, documentation */ /* name, function, calling, documentation */
{"append", (PyCFunction)RangeAppend, 1, "Append data to the Vim range" }, {"append", (PyCFunction)RangeAppend, METH_VARARGS, "Append data to the Vim range" },
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };
static PyTypeObject BufferType; static PyTypeObject BufferType;
@ -3146,14 +3146,14 @@ BufferRepr(BufferObject *self)
} }
static struct PyMethodDef BufferMethods[] = { static struct PyMethodDef BufferMethods[] = {
/* name, function, calling, documentation */ /* name, function, calling, documentation */
{"append", (PyCFunction)BufferAppend, 1, "Append data to Vim buffer" }, {"append", (PyCFunction)BufferAppend, METH_VARARGS, "Append data to Vim buffer" },
{"mark", (PyCFunction)BufferMark, 1, "Return (row,col) representing position of named mark" }, {"mark", (PyCFunction)BufferMark, METH_VARARGS, "Return (row,col) representing position of named mark" },
{"range", (PyCFunction)BufferRange, 1, "Return a range object which represents the part of the given buffer between line numbers s and e" }, {"range", (PyCFunction)BufferRange, METH_VARARGS, "Return a range object which represents the part of the given buffer between line numbers s and e" },
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
{"__dir__", (PyCFunction)BufferDir, 4, "List its attributes" }, {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, "List buffer attributes" },
#endif #endif
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };
/* /*

4
src/if_python3.c
View File

@ -666,7 +666,7 @@ call_PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems)
return PyType_GenericAlloc(type,nitems); return PyType_GenericAlloc(type,nitems);
} }
static PyObject *BufferDir(PyObject *, PyObject *); static PyObject *BufferDir(PyObject *);
static PyObject *OutputGetattro(PyObject *, PyObject *); static PyObject *OutputGetattro(PyObject *, PyObject *);
static int OutputSetattro(PyObject *, PyObject *, PyObject *); static int OutputSetattro(PyObject *, PyObject *, PyObject *);
static PyObject *BufferGetattro(PyObject *, PyObject *); static PyObject *BufferGetattro(PyObject *, PyObject *);
@ -1091,7 +1091,7 @@ BufferGetattro(PyObject *self, PyObject*nameobj)
} }
static PyObject * static PyObject *
BufferDir(PyObject *self UNUSED, PyObject *args UNUSED) BufferDir(PyObject *self UNUSED)
{ {
return Py_BuildValue("[sssss]", "name", "number", return Py_BuildValue("[sssss]", "name", "number",
"append", "mark", "range"); "append", "mark", "range");

2
src/version.c
View File

@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
994,
/**/ /**/
993, 993,
/**/ /**/