mp.c: Factor out and export `mphash'.

diff --git a/catacomb-python.h b/catacomb-python.h
index 03077019e36bd6f39c8654318ba742d58cf72721..490862bce7188643b274214f3797a219f19756ca 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -324,6 +324,7 @@ extern mp *getgf(PyObject *);
 extern int convgf(PyObject *, void *);
 extern PyObject *mp_pywrap(mp *);
 extern PyObject *gf_pywrap(mp *);
 extern int convgf(PyObject *, void *);
 extern PyObject *mp_pywrap(mp *);
 extern PyObject *gf_pywrap(mp *);

+extern long mphash(mp *);

 extern mp *mp_frompyobject(PyObject *, int);
 extern PyObject *mp_topystring(mp *, int,
                               const char *, const char *, const char *);
 extern mp *mp_frompyobject(PyObject *, int);
 extern PyObject *mp_topystring(mp *, int,
                               const char *, const char *, const char *);

diff --git a/mp.c b/mp.c
index 88ee73813b538baa863097df8f07232a4fe66523..9330121968644f5eb33f83e9278f82c26d92485c 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -544,13 +544,15 @@ end:
   return ((PyObject *)zz);
 }
 
   return ((PyObject *)zz);
 }
 

-static long mp_pyhash(PyObject *me)
+long mphash(mp *x)

 {
 {

-  long h;
-  PyObject *l = mp_topylong(MP_X(me)); h = PyObject_Hash(l);
+  PyObject *l = mp_topylong(x);
+  long h = PyObject_Hash(l);

   Py_DECREF(l); return (h);
 }
 
   Py_DECREF(l); return (h);
 }
 

+static long mp_pyhash(PyObject *me) { return (mphash(MP_X(me))); }
+

 static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg)
 {
   mp *y = 0;
 static PyObject *mpmeth_jacobi(PyObject *me, PyObject *arg)
 {
   mp *y = 0;