X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/blobdiff_plain/68ec53f32a22b0c38e3b7b53e03edf747c49e416..0b1eafbfd841149f61b47be54713a642f8538a6a:/util.c

diff --git a/util.c b/util.c
index 86b7aba..89130cb 100644
--- a/util.c
+++ b/util.c
@@ -7,7 +7,7 @@
  * (c) 2005 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Catacomb/Python is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Catacomb/Python; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -32,15 +32,13 @@
 
 /*----- Conversions -------------------------------------------------------*/
 
-#define GETU_(n)							\
-  PyObject *getu##n(uint##n w)						\
-  {									\
-    if (w <= MASK##n)							\
-      return (PyInt_FromLong(w));					\
-    else								\
-      return (PyLong_FromUnsignedLong(w));				\
-  }
-DOUINTSZ(GETU_)
+PyObject *getulong(unsigned long w)
+{
+  if (w <= LONG_MAX)
+    return (PyInt_FromLong(w));
+  else
+    return (PyLong_FromUnsignedLong(w));
+}
 
 PyObject *getbool(int b)
 {
@@ -62,7 +60,7 @@ int convulong(PyObject *o, void *pp)
 
   if (PyInt_Check(o)) {
     i = PyInt_AS_LONG(o);
-    if (i < 0) TYERR("must be nonnegative");
+    if (i < 0) VALERR("must be nonnegative");
     *p = i;
   } else {
     if ((t = PyNumber_Long(o)) == 0) goto end;
@@ -82,7 +80,7 @@ end:
     uint##n *p = pp;							\
 									\
     if (!convulong(o, &u)) goto end;					\
-    if (u > MASK##n) TYERR("out of range");				\
+    if (u > MASK##n) VALERR("out of range");				\
     *p = u;								\
     return (1);								\
   end:									\
@@ -96,7 +94,7 @@ int convuint(PyObject *o, void *pp)
   unsigned *p = pp;
 
   if (!convulong(o, &u)) goto end;
-  if (u > UINT_MAX) TYERR("out of range");
+  if (u > UINT_MAX) VALERR("out of range");
   *p = u;
   return (1);
 end:
@@ -109,7 +107,7 @@ int convmpw(PyObject *o, void *pp)
   unsigned *p = pp;
 
   if (!convulong(o, &u)) goto end;
-  if (u > MPW_MAX) TYERR("out of range");
+  if (u > MPW_MAX) VALERR("out of range");
   *p = u;
   return (1);
 end:
@@ -122,7 +120,7 @@ int convszt(PyObject *o, void *pp)
   size_t *p = pp;
 
   if (!convulong(o, &u)) goto end;
-  if (u > ~(size_t)0) TYERR("out of range");
+  if (u > ~(size_t)0) VALERR("out of range");
   *p = u;
   return (1);
 end:
@@ -147,13 +145,13 @@ void *newtype(PyTypeObject *metaty,
     (PyHeapTypeObject *)_PyObject_GC_Malloc(_PyObject_VAR_SIZE(metaty, 0));
   if (!skel) skel = &emptytype;
   memcpy(ty, skel, sizeof(*skel));
-  if (ty->type.tp_base) Py_INCREF(ty->type.tp_base);
+  if (ty->ht_type.tp_base) Py_INCREF(ty->ht_type.tp_base);
 #define COPY(blah) do {							\
-    if (ty->type.tp_as_##blah) {					\
+    if (ty->ht_type.tp_as_##blah) {					\
       memcpy(&ty->as_##blah,						\
-	     ty->type.tp_as_##blah,					\
+	     ty->ht_type.tp_as_##blah,					\
 	     sizeof(ty->as_##blah));					\
-      ty->type.tp_as_##blah = &ty->as_##blah;				\
+      ty->ht_type.tp_as_##blah = &ty->as_##blah;			\
     }									\
   } while (0)
   COPY(number);
@@ -162,12 +160,12 @@ void *newtype(PyTypeObject *metaty,
   COPY(buffer);
 #undef COPY
   if (name)
-    ty->name = PyString_FromString(name);
-  else if (ty->type.tp_name)
-    ty->name = PyString_FromString(ty->type.tp_name);
-  if (ty->name)
-    ty->type.tp_name = PyString_AS_STRING(ty->name);
-  PyObject_INIT(&ty->type, metaty);
+    ty->ht_name = PyString_FromString(name);
+  else if (ty->ht_type.tp_name)
+    ty->ht_name = PyString_FromString(ty->ht_type.tp_name);
+  if (ty->ht_name)
+    ty->ht_type.tp_name = PyString_AS_STRING(ty->ht_name);
+  PyObject_INIT(&ty->ht_type, metaty);
   Py_INCREF(metaty);
   return (ty);
 }
@@ -280,7 +278,7 @@ static void iter_pydealloc(PyObject *me)
 static PyObject *itemiter_pynext(PyObject *me)
 {
   PyObject *k = 0, *v = 0, *rc = 0;
-  
+
   if ((k = PyIter_Next(ITER_I(me))) != 0 &&
       (v = PyObject_GetItem(ITER_MAP(me), k)) != 0)
     rc = Py_BuildValue("(OO)", k, v);
@@ -339,7 +337,7 @@ static PyTypeObject itemiter_pytype_skel = {
 static PyObject *valiter_pynext(PyObject *me)
 {
   PyObject *k = 0, *rc = 0;
-  
+
   if ((k = PyIter_Next(ITER_I(me))) != 0)
     rc = PyObject_GetItem(ITER_MAP(me), k);
   Py_XDECREF(k);
@@ -405,7 +403,7 @@ PySequenceMethods gmap_pysequence = {
   PyMapping_HasKey,			/* @sq_contains@ */
   0,					/* @sq_inplace_concat@ */
   0					/* @sq_inplace_repeat@ */
-};  
+};
 
 int gmap_pysize(PyObject *me)
 {
@@ -456,7 +454,7 @@ PyObject *gmapmeth_values(PyObject *me, PyObject *arg)
       (l = PyList_New(0)) == 0 ||
       (i = PyObject_GetIter(me)) == 0)
     goto done;
-  while ((k = PyIter_Next(i)) != 0) {	
+  while ((k = PyIter_Next(i)) != 0) {
     if ((v = PyObject_GetItem(me, k)) == 0 ||
 	PyList_Append(l, v))
       err = -1;