From 4ea7701c90927b214706fb8a6406a764378753ae Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Tue, 22 Oct 2019 18:50:19 +0100 Subject: [PATCH] *.[ch]: Some preparatory reformatting for the Python 3 porting. Nothing very complicated or profound. These are intended to make the upcoming diff easier to check for stupid mistakes. A lot of this is whitespace change that disappears in `git show -w'. --- buffer.c | 18 ++++++------ mp.c | 3 +- pyke/mapping.c | 3 +- pyke/pyke-mLib.c | 3 +- pyke/pyke.c | 6 ++-- pyke/pyke.h | 88 ++++++++++++++++++++++++++++---------------------------- 6 files changed, 61 insertions(+), 60 deletions(-) diff --git a/buffer.c b/buffer.c index 7f535dc..fe7633d 100644 --- a/buffer.c +++ b/buffer.c @@ -58,11 +58,10 @@ static void buf_pydealloc(PyObject *me) FREEOBJ(me); } -static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn) - { if (nn) *nn = BSZ(BUF_B(me)); return (1); } - -static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q) - { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); } + static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn) + { if (nn) *nn = BSZ(BUF_B(me)); return (1); } + static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q) + { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); } static PyObject *rbmeth_skip(PyObject *me, PyObject *arg) { @@ -356,11 +355,10 @@ end: return ((PyObject *)me); } -static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn) - { if (nn) *nn = BLEN(BUF_B(me)); return (1); } - -static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q) - { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); } + static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn) + { if (nn) *nn = BLEN(BUF_B(me)); return (1); } + static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q) + { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); } static PyObject *wbmeth_zero(PyObject *me, PyObject *arg) { diff --git a/mp.c b/mp.c index daa91ce..3f96a4e 100644 --- a/mp.c +++ b/mp.c @@ -228,7 +228,8 @@ mp *tomp(PyObject *o) if ((x = G_TOINT(GE_G(o), MP_NEW, GE_X(o))) == 0) return (0); return (x); - } else if (PyInt_Check(o)) + } + else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o))); else if ((l = PyNumber_Long(o)) != 0) { x = mp_frompylong(l); diff --git a/pyke/mapping.c b/pyke/mapping.c index 04616e1..3ad1ac7 100644 --- a/pyke/mapping.c +++ b/pyke/mapping.c @@ -493,7 +493,8 @@ static int update_core(PyObject *me, PyObject *map) unsigned foundp; int rc = -1; - i = PyObject_CallMethod(map, "iteritems", 0); + v = PyObject_CallMethod(map, "iteritems", 0); + i = v; v = 0; if (i) { for (;;) { diff --git a/pyke/pyke-mLib.c b/pyke/pyke-mLib.c index a29f34c..fd6f895 100644 --- a/pyke/pyke-mLib.c +++ b/pyke/pyke-mLib.c @@ -53,7 +53,8 @@ PyObject *getk64(kludge64 u) if ((j = PyLong_FromUnsignedLong(LO64(u))) == 0) goto end; if ((t = PyNumber_InPlaceOr(i, j)) == 0) goto end; Py_DECREF(i); i = t; - if ((rc = PyNumber_Int(i)) == 0) goto end; + if ((t = PyNumber_Int(i)) == 0) goto end; + rc = t; end: Py_XDECREF(i); Py_XDECREF(j); diff --git a/pyke/pyke.c b/pyke/pyke.c index 1d4458b..03f1c1f 100644 --- a/pyke/pyke.c +++ b/pyke/pyke.c @@ -46,16 +46,16 @@ PyObject *getbool(int b) int convulong(PyObject *o, void *pp) { - long i; unsigned long *p = pp; PyObject *t; if (!o) VALERR("can't delete"); if (PyInt_Check(o)) { - i = PyInt_AS_LONG(o); + long i = PyInt_AS_LONG(o); if (i < 0) VALERR("must be nonnegative"); *p = i; - } else { + } else + { if ((t = PyNumber_Long(o)) == 0) goto end; *p = PyLong_AsUnsignedLong(t); Py_DECREF(t); diff --git a/pyke/pyke.h b/pyke/pyke.h index 7f4e813..95ef0b6 100644 --- a/pyke/pyke.h +++ b/pyke/pyke.h @@ -115,23 +115,23 @@ PRIVATE_SYMBOLS; # * `YN' is a format character for `PyArg_ParseTuple...' for retrieving an * octet string and length from any sort-of vaguely binary-ish object. */ -#define BINOBJ PyStringObject -#define BIN_TYPE PyString_Type -#define BIN_CHECK(obj) PyString_Check(obj) -#define BIN_PTR(obj) PyString_AS_STRING(obj) -#define BIN_LEN(obj) PyString_GET_SIZE(obj) -#define BIN_FROMSTR(str) PyString_FromString(str) -#define BIN_FROMSTRLEN(str, len) PyString_FromStringAndSize(str, len) -#define BIN_FORMAT PyString_FromFormat -#define BIN_VFORMAT PyString_FromFormatV -#define BIN_PREPAREWRITE(obj, ptr, sz) do { \ - (obj) = PyString_FromStringAndSize(0, (sz)); \ - (ptr) = PyString_AS_STRING(obj); \ -} while (0) -#define BIN_DONEWRITE(obj, sz) do Py_SIZE(obj) = (sz); while (0) -#define BIN_SETLEN(obj, len) do Py_SIZE(obj) = (len); while (0) -#define Y "s" -#define YN "s#" +# define BINOBJ PyStringObject +# define BIN_TYPE PyString_Type +# define BIN_CHECK(obj) PyString_Check(obj) +# define BIN_PTR(obj) PyString_AS_STRING(obj) +# define BIN_LEN(obj) PyString_GET_SIZE(obj) +# define BIN_FROMSTR(str) PyString_FromString(str) +# define BIN_FROMSTRLEN(str, len) PyString_FromStringAndSize(str, len) +# define BIN_FORMAT PyString_FromFormat +# define BIN_VFORMAT PyString_FromFormatV +# define BIN_PREPAREWRITE(obj, ptr, sz) do { \ + (obj) = PyString_FromStringAndSize(0, (sz)); \ + (ptr) = PyString_AS_STRING(obj); \ + } while (0) +# define BIN_DONEWRITE(obj, sz) do Py_SIZE(obj) = (sz); while (0) +# define BIN_SETLEN(obj, len) do Py_SIZE(obj) = (len); while (0) +# define Y "s" +# define YN "s#" /* Text strings. Both Python 2 and Python 3 call these `str', but they're * very different because a Python 3 `str' is Unicode inside. When dealing @@ -161,24 +161,24 @@ PRIVATE_SYMBOLS; * * (Use `s' and `s#' in `PyArg_ParseTuple...'.) */ -#define TEXTOBJ PyStringObject -#define TEXT_TYPE PyString_Type -#define TEXT_CHECK(obj) PyString_Check(obj) -#define TEXT_PTR(obj) PyString_AS_STRING(obj) -#define TEXT_STR(obj) PyString_AsString(obj) -#define TEXT_PTRLEN(obj, ptr, len) do { \ - (ptr) = PyString_AS_STRING(obj); \ - (len) = PyString_GET_SIZE(obj); \ -} while (0) -#define TEXT_FORMAT PyString_FromFormat -#define TEXT_VFORMAT PyString_FromFormatV -#define TEXT_PREPAREWRITE(obj, ptr, sz) do { \ - (obj) = PyString_FromStringAndSize(0, (sz)); \ - (ptr) = PyString_AS_STRING(obj); \ -} while (0) -#define TEXT_DONEWRITE(obj, sz) do { Py_SIZE(obj) = (sz); } while (0) -#define TEXT_FROMSTR(str) PyString_FromString(str) -#define TEXT_FROMSTRLEN(str, len) PyString_FromStringAndSize(str, len) +# define TEXTOBJ PyStringObject +# define TEXT_TYPE PyString_Type +# define TEXT_CHECK(obj) PyString_Check(obj) +# define TEXT_PTR(obj) PyString_AS_STRING(obj) +# define TEXT_STR(obj) PyString_AsString(obj) +# define TEXT_PTRLEN(obj, ptr, len) do { \ + (ptr) = PyString_AS_STRING(obj); \ + (len) = PyString_GET_SIZE(obj); \ + } while (0) +# define TEXT_FORMAT PyString_FromFormat +# define TEXT_VFORMAT PyString_FromFormatV +# define TEXT_PREPAREWRITE(obj, ptr, sz) do { \ + (obj) = PyString_FromStringAndSize(0, (sz)); \ + (ptr) = PyString_AS_STRING(obj); \ + } while (0) +# define TEXT_DONEWRITE(obj, sz) do { Py_SIZE(obj) = (sz); } while (0) +# define TEXT_FROMSTR(str) PyString_FromString(str) +# define TEXT_FROMSTRLEN(str, len) PyString_FromStringAndSize(str, len) /*----- Utilities for returning values and exceptions ---------------------*/ @@ -556,15 +556,15 @@ typedef struct gmap_pyobj { #define GMAP_NAMETHDECL(func, doc) \ extern PyObject *gmapmeth_##func(PyObject *); -#define GMAP_DOROMETHODS(METH, KWMETH, NAMETH) \ - METH (has_key, "D.has_key(KEY) -> BOOL") \ - NAMETH(keys, "D.keys() -> LIST") \ - NAMETH(values, "D.values() -> LIST") \ - NAMETH(items, "D.items() -> LIST") \ - NAMETH(iterkeys, "D.iterkeys() -> ITER") \ - NAMETH(itervalues, "D.itervalues() -> ITER") \ - NAMETH(iteritems, "D.iteritems() -> ITER") \ - KWMETH(get, "D.get(KEY, [default = None]) -> VALUE") +# define GMAP_DOROMETHODS(METH, KWMETH, NAMETH) \ + METH (has_key, "D.has_key(KEY) -> BOOL") \ + NAMETH(keys, "D.keys() -> LIST") \ + NAMETH(values, "D.values() -> LIST") \ + NAMETH(items, "D.items() -> LIST") \ + NAMETH(iterkeys, "D.iterkeys() -> ITER") \ + NAMETH(itervalues, "D.itervalues() -> ITER") \ + NAMETH(iteritems, "D.iteritems() -> ITER") \ + KWMETH(get, "D.get(KEY, [default = None]) -> VALUE") #define GMAP_DOMETHODS(METH, KWMETH, NAMETH) \ GMAP_DOROMETHODS(METH, KWMETH, NAMETH) \ -- 2.11.0