# HG changeset patch
# User ZyX <[email protected]>
# Date 1368885495 -14400
# Branch python-extended-2
# Node ID 2a100913fd7195b95cead858e84dcffe138ac765
# Parent 97bbb36fe75d0842ada71d0e62eca7ca411072a6
Refactoring: get rid of magic constants
ml_flags should not use raw numbers as arguments, there are standard descriptive
macros.
diff -r 97bbb36fe75d -r 2a100913fd71 src/if_py_both.h
--- a/src/if_py_both.h Sat May 18 12:35:12 2013 +0400
+++ b/src/if_py_both.h Sat May 18 17:58:15 2013 +0400
@@ -220,7 +220,7 @@
}
static PyObject *
-OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)
+OutputFlush(PyObject *self UNUSED)
{
/* do nothing */
Py_INCREF(Py_None);
@@ -230,11 +230,11 @@
/***************/
static struct PyMethodDef OutputMethods[] = {
- /* name, function, calling, doc */
- {"write", (PyCFunction)OutputWrite, 1, ""},
- {"writelines", (PyCFunction)OutputWritelines, 1, ""},
- {"flush", (PyCFunction)OutputFlush, 1, ""},
- { NULL, NULL, 0, NULL}
+ /* name, function, calling, doc */
+ {"write", (PyCFunction)OutputWrite, METH_VARARGS, ""},
+ {"writelines", (PyCFunction)OutputWritelines, METH_VARARGS, ""},
+ {"flush", (PyCFunction)OutputFlush, METH_NOARGS, ""},
+ { NULL, NULL, 0, NULL}
};
static OutputObject Output =
@@ -533,12 +533,12 @@
*/
static struct PyMethodDef VimMethods[] = {
- /* name, function, calling, documentation */
- {"command", VimCommand, 1, "Execute a Vim
ex-mode command" },
- {"eval", VimEval, 1, "Evaluate an expression
using Vim
evaluator" },
- {"bindeval", VimEvalPy, 1, "Like eval(), but
returns
objects attached to vim ones"},
- {"strwidth", VimStrwidth, 1, "Screen string width, counts
<Tab> as having width 1"},
- { NULL, NULL, 0, NULL }
+ /* name, function, calling, documentation */
+ {"command", VimCommand, METH_VARARGS, "Execute a Vim
ex-mode
command" },
+ {"eval", VimEval, METH_VARARGS, "Evaluate an expression
using Vim evaluator" },
+ {"bindeval", VimEvalPy, METH_VARARGS, "Like eval(),
but
returns objects attached to vim ones"},
+ {"strwidth", VimStrwidth, METH_VARARGS, "Screen string width,
counts <Tab> as having width 1"},
+ { NULL, NULL, 0, NULL }
};
/*
@@ -868,8 +868,8 @@
};
static struct PyMethodDef DictionaryMethods[] = {
- {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
- { NULL, NULL, 0, NULL }
+ {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
+ { NULL, NULL, 0, NULL }
};
static PyTypeObject ListType;
@@ -1248,8 +1248,8 @@
}
static struct PyMethodDef ListMethods[] = {
- {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
- { NULL, NULL, 0, NULL }
+ {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
+ { NULL, NULL, 0, NULL }
};
typedef struct
@@ -1349,8 +1349,8 @@
}
static struct PyMethodDef FunctionMethods[] = {
- {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
- { NULL, NULL, 0, NULL }
+ {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
+ { NULL, NULL, 0, NULL}
};
/*
@@ -2960,9 +2960,9 @@
}
static struct PyMethodDef RangeMethods[] = {
- /* name, function, calling, documentation */
- {"append", (PyCFunction)RangeAppend, 1, "Append data to
the Vim range" },
- { NULL, NULL, 0, NULL }
+ /* name, function, calling, documentation */
+ {"append", (PyCFunction)RangeAppend, METH_VARARGS, "Append data
to the Vim range" },
+ { NULL, NULL, 0, NULL }
};
static PyTypeObject BufferType;
@@ -3146,14 +3146,14 @@
}
static struct PyMethodDef BufferMethods[] = {
- /* name, function, calling, documentation */
- {"append", (PyCFunction)BufferAppend, 1, "Append data to
Vim buffer" },
- {"mark", (PyCFunction)BufferMark, 1, "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" },
+ /* name, function, calling, documentation */
+ {"append", (PyCFunction)BufferAppend, METH_VARARGS, "Append
data to Vim buffer" },
+ {"mark", (PyCFunction)BufferMark, METH_VARARGS, "Return
(row,col) representing position of named mark" },
+ {"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
- {"__dir__", (PyCFunction)BufferDir, 4, "List its
attributes" },
+ {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, "List
buffer
attributes" },
#endif
- { NULL, NULL, 0, NULL }
+ { NULL, NULL, 0, NULL }
};
/*
diff -r 97bbb36fe75d -r 2a100913fd71 src/if_python3.c
--- a/src/if_python3.c Sat May 18 12:35:12 2013 +0400
+++ b/src/if_python3.c Sat May 18 17:58:15 2013 +0400
@@ -666,7 +666,7 @@
return PyType_GenericAlloc(type,nitems);
}
-static PyObject *BufferDir(PyObject *, PyObject *);
+static PyObject *BufferDir(PyObject *);
static PyObject *OutputGetattro(PyObject *, PyObject *);
static int OutputSetattro(PyObject *, PyObject *, PyObject *);
static PyObject *BufferGetattro(PyObject *, PyObject *);
@@ -1091,7 +1091,7 @@
}
static PyObject *
-BufferDir(PyObject *self UNUSED, PyObject *args UNUSED)
+BufferDir(PyObject *self UNUSED)
{
return Py_BuildValue("[sssss]", "name", "number",
"append", "mark", "range");
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
diff -cr vim.97bbb36fe75d/src/if_py_both.h vim.2a100913fd71/src/if_py_both.h
*** vim.97bbb36fe75d/src/if_py_both.h 2013-05-19 17:02:21.991320245 +0400
--- vim.2a100913fd71/src/if_py_both.h 2013-05-19 17:02:21.998320175 +0400
***************
*** 220,226 ****
}
static PyObject *
! OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)
{
/* do nothing */
Py_INCREF(Py_None);
--- 220,226 ----
}
static PyObject *
! OutputFlush(PyObject *self UNUSED)
{
/* do nothing */
Py_INCREF(Py_None);
***************
*** 230,240 ****
/***************/
static struct PyMethodDef OutputMethods[] = {
! /* name, function, calling, doc */
! {"write", (PyCFunction)OutputWrite, 1, ""},
! {"writelines", (PyCFunction)OutputWritelines, 1, ""},
! {"flush", (PyCFunction)OutputFlush, 1, ""},
! { NULL, NULL, 0, NULL}
};
static OutputObject Output =
--- 230,240 ----
/***************/
static struct PyMethodDef OutputMethods[] = {
! /* name, function, calling, doc */
! {"write", (PyCFunction)OutputWrite, METH_VARARGS, ""},
! {"writelines", (PyCFunction)OutputWritelines, METH_VARARGS, ""},
! {"flush", (PyCFunction)OutputFlush, METH_NOARGS, ""},
! { NULL, NULL, 0, NULL}
};
static OutputObject Output =
***************
*** 533,544 ****
*/
static struct PyMethodDef VimMethods[] = {
! /* name, function, calling, documentation */
! {"command", VimCommand, 1, "Execute a Vim ex-mode command" },
! {"eval", VimEval, 1, "Evaluate an expression using Vim evaluator" },
! {"bindeval", VimEvalPy, 1, "Like eval(), but returns objects attached to vim ones"},
! {"strwidth", VimStrwidth, 1, "Screen string width, counts <Tab> as having width 1"},
! { NULL, NULL, 0, NULL }
};
/*
--- 533,544 ----
*/
static struct PyMethodDef VimMethods[] = {
! /* name, function, calling, documentation */
! {"command", VimCommand, METH_VARARGS, "Execute a Vim ex-mode command" },
! {"eval", VimEval, METH_VARARGS, "Evaluate an expression using Vim evaluator" },
! {"bindeval", VimEvalPy, METH_VARARGS, "Like eval(), but returns objects attached to vim ones"},
! {"strwidth", VimStrwidth, METH_VARARGS, "Screen string width, counts <Tab> as having width 1"},
! { NULL, NULL, 0, NULL }
};
/*
***************
*** 868,875 ****
};
static struct PyMethodDef DictionaryMethods[] = {
! {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
! { NULL, NULL, 0, NULL }
};
static PyTypeObject ListType;
--- 868,875 ----
};
static struct PyMethodDef DictionaryMethods[] = {
! {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
! { NULL, NULL, 0, NULL }
};
static PyTypeObject ListType;
***************
*** 1248,1255 ****
}
static struct PyMethodDef ListMethods[] = {
! {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
! { NULL, NULL, 0, NULL }
};
typedef struct
--- 1248,1255 ----
}
static struct PyMethodDef ListMethods[] = {
! {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
! { NULL, NULL, 0, NULL }
};
typedef struct
***************
*** 1349,1356 ****
}
static struct PyMethodDef FunctionMethods[] = {
! {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
! { NULL, NULL, 0, NULL }
};
/*
--- 1349,1356 ----
}
static struct PyMethodDef FunctionMethods[] = {
! {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
! { NULL, NULL, 0, NULL}
};
/*
***************
*** 2960,2968 ****
}
static struct PyMethodDef RangeMethods[] = {
! /* name, function, calling, documentation */
! {"append", (PyCFunction)RangeAppend, 1, "Append data to the Vim range" },
! { NULL, NULL, 0, NULL }
};
static PyTypeObject BufferType;
--- 2960,2968 ----
}
static struct PyMethodDef RangeMethods[] = {
! /* name, function, calling, documentation */
! {"append", (PyCFunction)RangeAppend, METH_VARARGS, "Append data to the Vim range" },
! { NULL, NULL, 0, NULL }
};
static PyTypeObject BufferType;
***************
*** 3146,3159 ****
}
static struct PyMethodDef BufferMethods[] = {
! /* name, function, calling, documentation */
! {"append", (PyCFunction)BufferAppend, 1, "Append data to Vim buffer" },
! {"mark", (PyCFunction)BufferMark, 1, "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" },
#if PY_VERSION_HEX >= 0x03000000
! {"__dir__", (PyCFunction)BufferDir, 4, "List its attributes" },
#endif
! { NULL, NULL, 0, NULL }
};
/*
--- 3146,3159 ----
}
static struct PyMethodDef BufferMethods[] = {
! /* name, function, calling, documentation */
! {"append", (PyCFunction)BufferAppend, METH_VARARGS, "Append data to Vim buffer" },
! {"mark", (PyCFunction)BufferMark, METH_VARARGS, "Return (row,col) representing position of named mark" },
! {"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
! {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, "List buffer attributes" },
#endif
! { NULL, NULL, 0, NULL }
};
/*
diff -cr vim.97bbb36fe75d/src/if_python3.c vim.2a100913fd71/src/if_python3.c
*** vim.97bbb36fe75d/src/if_python3.c 2013-05-19 17:02:21.987320286 +0400
--- vim.2a100913fd71/src/if_python3.c 2013-05-19 17:02:21.995320205 +0400
***************
*** 666,672 ****
return PyType_GenericAlloc(type,nitems);
}
! static PyObject *BufferDir(PyObject *, PyObject *);
static PyObject *OutputGetattro(PyObject *, PyObject *);
static int OutputSetattro(PyObject *, PyObject *, PyObject *);
static PyObject *BufferGetattro(PyObject *, PyObject *);
--- 666,672 ----
return PyType_GenericAlloc(type,nitems);
}
! static PyObject *BufferDir(PyObject *);
static PyObject *OutputGetattro(PyObject *, PyObject *);
static int OutputSetattro(PyObject *, PyObject *, PyObject *);
static PyObject *BufferGetattro(PyObject *, PyObject *);
***************
*** 1091,1097 ****
}
static PyObject *
! BufferDir(PyObject *self UNUSED, PyObject *args UNUSED)
{
return Py_BuildValue("[sssss]", "name", "number",
"append", "mark", "range");
--- 1091,1097 ----
}
static PyObject *
! BufferDir(PyObject *self UNUSED)
{
return Py_BuildValue("[sssss]", "name", "number",
"append", "mark", "range");
