*.[ch]: Some preparatory reformatting for the Python 3 porting.

[pyke] / pyke.c

diff --git a/pyke.c b/pyke.c
index 29dd8c5..03f1c1f 100644 (file)
--- a/pyke.c
+++ b/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);
@@ -101,6 +101,25 @@ end:
   return (0);
 }
 
+int convbin(PyObject *o, void *pp)
+{
+  struct bin *r = pp;
+
+  if (BIN_CHECK(o)) {
+    r->p = BIN_PTR(o);
+    r->sz = BIN_LEN(o);
+    return (1);
+  }
+  if (PyUnicode_Check(o)) {
+    o = _PyUnicode_AsDefaultEncodedString(o, 0);
+    if (!o) return (0);
+    r->p = PyString_AS_STRING(o);
+    r->sz = PyString_GET_SIZE(o);
+    return (1);
+  }
+  return (PyObject_AsReadBuffer(o, &r->p, &r->sz) ? 0 : 1);
+}
+
 /*----- Miscellaneous utilities -------------------------------------------*/
 
 PyObject *abstract_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
@@ -109,6 +128,22 @@ PyObject *abstract_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   return (0);
 }
 
+PyObject *enrich_compare(int op, int cmp)
+{
+  int r = -1;
+
+  switch (op) {
+    case Py_LT: r = cmp <  0; break;
+    case Py_LE: r = cmp <= 0; break;
+    case Py_EQ: r = cmp == 0; break;
+    case Py_NE: r = cmp != 0; break;
+    case Py_GE: r = cmp >= 0; break;
+    case Py_GT: r = cmp >  0; break;
+    default: assert(0);
+  }
+  return (getbool(r));
+}
+
 /*----- Saving and restoring exceptions ----------------------------------*/
 
 void report_lost_exception_v(struct excinfo *exc,
@@ -124,7 +159,7 @@ void report_lost_exception_v(struct excinfo *exc,
   assert(!PyErr_Occurred());
 
   /* Format the explanation. */
-  if (why) whyobj = PyString_FromFormatV(why, ap);
+  if (why) whyobj = TEXT_VFORMAT(why, ap);
   else { whyobj = Py_None; Py_INCREF(whyobj); }
 
   /* Find our home module's `lostexchook' function.  This won't work if
@@ -153,8 +188,7 @@ ouch:
    * `sys.excepthook'.
    */
 sys:
-  PySys_WriteStderr("\n!!! LOST EXCEPTION: %s\n",
-                   PyString_AS_STRING(whyobj));
+  PySys_WriteStderr("\n!!! LOST EXCEPTION: %s\n", TEXT_PTR(whyobj));
   RESTORE_EXCINFO(exc);
   PyErr_Print();
   /* drop through... */
@@ -232,11 +266,13 @@ void *newtype(PyTypeObject *metaty,
   COPY(buffer);
 #undef COPY
   if (name)
-    ty->ht_name = PyString_FromString(name);
+    ty->ht_name = TEXT_FROMSTR(name);
   else if (ty->ht_type.tp_name)
-    ty->ht_name = PyString_FromString(ty->ht_type.tp_name);
+    ty->ht_name = TEXT_FROMSTR(ty->ht_type.tp_name);
+  else
+    ty->ht_name = 0;
   if (ty->ht_name)
-    ty->ht_type.tp_name = PyString_AS_STRING(ty->ht_name);
+    ty->ht_type.tp_name = TEXT_STR(ty->ht_name);
   ty->ht_slots = 0;
   (void)PyObject_INIT(&ty->ht_type, metaty);
   Py_INCREF(metaty);
@@ -285,11 +321,8 @@ PyObject *mkexc(PyObject *mod, PyObject *base,
     }
   }
 
-  if ((nameobj = PyString_FromFormat("%s.%s",
-                                    PyModule_GetName(mod),
-                                    name)) == 0 ||
-      (exc = PyErr_NewException(PyString_AS_STRING(nameobj),
-                               base, dict)) == 0)
+  if ((nameobj = TEXT_FORMAT("%s.%s", PyModule_GetName(mod), name)) == 0 ||
+      (exc = PyErr_NewException(TEXT_STR(nameobj), base, dict)) == 0)
     goto fail;
 
 done: