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

[catacomb-python] / field.c

diff --git a/field.c b/field.c
index cce2e89124d10d22ef83d6a613826df65c4c9fef..0a5d908f805dcff2ffe04b2f8d29899bcc14fcec 100644 (file)
--- a/field.c
+++ b/field.c
@@ -263,10 +263,12 @@ end:
 static PyObject *fe_pyint(PyObject *x)
 {
   long l;
 static PyObject *fe_pyint(PyObject *x)
 {
   long l;

+  PyObject *rc;

   mp *xx = F_OUT(FE_F(x), MP_NEW, FE_X(x));
   mp *xx = F_OUT(FE_F(x), MP_NEW, FE_X(x));

-  if (mp_tolong_checked(xx, &l)) { MP_DROP(xx); return (0); }
+  if (!mp_tolong_checked(xx, &l, 0)) rc = PyInt_FromLong(l);
+  else rc = mp_topylong(xx);

   MP_DROP(xx);
   MP_DROP(xx);

-  return (PyInt_FromLong(l));
+  return (rc);

 }
 
 static PyObject *fe_pylong(PyObject *x)
 }
 
 static PyObject *fe_pylong(PyObject *x)


@@ -958,7 +960,7 @@ static PyObject *meth__Field_parse(PyObject *me, PyObject *arg)
   qd.p = p;
   qd.e = 0;
   if ((f = field_parse(&qd)) == 0)
   qd.p = p;
   qd.e = 0;
   if ((f = field_parse(&qd)) == 0)

-    SYNERR(qd.e);
+    VALERR(qd.e);

   rc = Py_BuildValue("(Ns)", field_pywrap(f), qd.p);
 end:
   return (rc);
   rc = Py_BuildValue("(Ns)", field_pywrap(f), qd.p);
 end:
   return (rc);