catacomb/pwsafe.py: Hack around the difference in octal literal syntax.

[catacomb-python] / mp.c

diff --git a/mp.c b/mp.c
index a664627..fe5e7dc 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -33,6 +33,17 @@
 PyTypeObject *mp_pytype = 0;
 PyTypeObject *gf_pytype = 0;
 
+#ifndef PyLong_SHIFT
+#  define PyLong_SHIFT SHIFT
+#endif
+
+#ifndef PyLong_MASK
+#  define PyLong_MASK MASK
+#endif
+
+STATIC_ASSERT(MPW_BITS >= PyLong_SHIFT,
+             "Catacomb's limbs are now narrower than than Python's!");
+
 mp *mp_frompylong(PyObject *obj)
 {
   unsigned long bits;
@@ -47,14 +58,13 @@ mp *mp_frompylong(PyObject *obj)
 
   sz = Py_SIZE(l);
   if (sz < 0) sz = -sz;
-  assert(MPW_BITS >= SHIFT);
-  bits = (unsigned long)sz * SHIFT;
+  bits = (unsigned long)sz * PyLong_SHIFT;
   w = (bits + MPW_BITS - 1)/MPW_BITS;
   x = mp_new(w, Py_SIZE(l) < 0 ? MP_NEG : 0);
   p = x->v;
   for (i = 0; i < sz; i++) {
     r |= (mpd)l->ob_digit[i] << b;
-    b += SHIFT;
+    b += PyLong_SHIFT;
     while (b >= MPW_BITS) {
       *p++ = MPW(r);
       r >>= MPW_BITS;
@@ -73,26 +83,25 @@ mp *mp_frompylong(PyObject *obj)
 PyObject *mp_topylong(mp *x)
 {
   unsigned long bits = mp_bits(x);
-  int sz = (bits + SHIFT - 1)/SHIFT;
+  int sz = (bits + PyLong_SHIFT - 1)/PyLong_SHIFT;
   PyLongObject *l = _PyLong_New(sz);
   mpd r = 0;
   int b = 0;
   mpw *p = x->v;
   int i = 0;
 
-  assert(MPW_BITS >= SHIFT);
   while (i < sz && p < x->vl) {
     r |= (mpd)*p++ << b;
     b += MPW_BITS;
-    while (i < sz && b >= SHIFT) {
-      l->ob_digit[i++] = r & MASK;
-      r >>= SHIFT;
-      b -= SHIFT;
+    while (i < sz && b >= PyLong_SHIFT) {
+      l->ob_digit[i++] = r & PyLong_MASK;
+      r >>= PyLong_SHIFT;
+      b -= PyLong_SHIFT;
     }
   }
   while (i < sz && r) {
-    l->ob_digit[i++] = r & MASK;
-    r >>= SHIFT;
+    l->ob_digit[i++] = r & PyLong_MASK;
+    r >>= PyLong_SHIFT;
   }
   Py_SIZE(l) = (x->f & MP_NEG) ? -sz : sz;
   return ((PyObject *)l);
@@ -697,7 +706,7 @@ end:
                                 PyObject *arg, PyObject *kw)           \
   {                                                                    \
     long len = -1;                                                     \
-    static const char *const kwlist[] = { "len", 0 };                                  \
+    static const char *const kwlist[] = { "len", 0 };                  \
     PyObject *rc = 0;                                                  \
                                                                        \
     if (!PyArg_ParseTupleAndKeywords(arg, kw, "|l:" #name,             \