X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/f368b46e168e8accdb0c578ccbba7e7d2ee8c0de..688625b6d288ff893f5e96dd3bd7f10110e23639:/field.c

diff --git a/field.c b/field.c
index bb99b77..fae0365 100644
--- a/field.c
+++ b/field.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
  *
- * $Id$
- *
  * Abstract fields
  *
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +13,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.
@@ -58,17 +56,17 @@ static PyObject *field_dopywrap(PyTypeObject *ty, field *f)
 {
   field_pyobj *fobj = newtype(ty, 0, f->ops->name);
   fobj->f = f;
-  fobj->ty.type.tp_basicsize = sizeof(fe_pyobj);
-  fobj->ty.type.tp_base = fe_pytype;
+  fobj->ty.ht_type.tp_basicsize = sizeof(fe_pyobj);
+  fobj->ty.ht_type.tp_base = fe_pytype;
   Py_INCREF(fe_pytype);
-  fobj->ty.type.tp_flags = (Py_TPFLAGS_DEFAULT |
-			    Py_TPFLAGS_BASETYPE |
-			    Py_TPFLAGS_CHECKTYPES |
-			    Py_TPFLAGS_HEAPTYPE);
-  fobj->ty.type.tp_alloc = PyType_GenericAlloc;
-  fobj->ty.type.tp_free = 0;
-  fobj->ty.type.tp_new = fe_pynew;
-  PyType_Ready(&fobj->ty.type);
+  fobj->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+			       Py_TPFLAGS_BASETYPE |
+			       Py_TPFLAGS_CHECKTYPES |
+			       Py_TPFLAGS_HEAPTYPE);
+  fobj->ty.ht_type.tp_alloc = PyType_GenericAlloc;
+  fobj->ty.ht_type.tp_free = 0;
+  fobj->ty.ht_type.tp_new = fe_pynew;
+  typeready(&fobj->ty.ht_type);
   return ((PyObject *)fobj);
 }
 
@@ -115,16 +113,16 @@ static mp *tofe(field *f, PyObject *o)
 
   if (FE_PYCHECK(o)) {
     if (FE_F(o) != f && !field_samep(FE_F(o), f)) return (0);
-    y = FE_X(o);
-  }
-  if ((x = tomp(o)) != 0) {
+    y = MP_COPY(FE_X(o));
+  } else if ((x = tomp(o)) != 0) {
     if (MP_ZEROP(x))
-      y = f->zero;
+      y = MP_COPY(f->zero);
     else if (MP_EQ(x, MP_ONE))
-      y = f->one;
+      y = MP_COPY(f->one);
+    else
+      y = F_IN(f, MP_NEW, x);
+    MP_DROP(x);
   }
-  if (x) MP_DROP(x);
-  if (y) MP_COPY(y);
   return (y);
 }
 
@@ -231,13 +229,7 @@ end:
 }
 
 static long fe_pyhash(PyObject *me)
-{
-  long i = mp_tolong(FE_X(me));
-  i ^= 0xdcf62d6c; /* random perturbance */
-  if (i == -1)
-    i = -2;
-  return (i);
-}
+  { return (mphash(FE_X(me))); }
 
 static int fe_pycoerce(PyObject **x, PyObject **y)
 {
@@ -263,10 +255,12 @@ end:
 static PyObject *fe_pyint(PyObject *x)
 {
   long l;
+  PyObject *rc;
   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);
-  return (PyInt_FromLong(l));
+  return (rc);
 }
 
 static PyObject *fe_pylong(PyObject *x)
@@ -280,7 +274,7 @@ static PyObject *fe_pylong(PyObject *x)
 #define BASEOP(name, radix, pre)					\
   static PyObject *fe_py##name(PyObject *x) {				\
     mp *xx = F_OUT(FE_F(x), MP_NEW, FE_X(x));				\
-    PyObject *rc = mp_topystring(FE_X(x), radix, 0, pre, 0);		\
+    PyObject *rc = mp_topystring(xx, radix, 0, pre, 0);			\
     MP_DROP(xx);							\
     return (rc);							\
   }
@@ -343,8 +337,8 @@ static PyObject *feget__value(PyObject *me, void *hunoz)
 static PyGetSetDef fe_pygetset[] = {
 #define GETSETNAME(op, name) fe##op##_##name
   GET	(field,		"X.field -> field containing X")
-  GET	(value,		"X.value -> `natural' integer representation of X")
-  GET	(_value,	"X._value -> internal integer representation of X")
+  GET	(value,		"X.value -> `natural' MP/GF representation of X")
+  GET	(_value,	"X._value -> internal MP/GF representation of X")
 #undef GETSETNAME
   { 0 }
 };
@@ -408,7 +402,7 @@ static PyNumberMethods fe_pynumber = {
 
 static PyTypeObject fe_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.FE",			/* @tp_name@ */
+  "FE",					/* @tp_name@ */
   sizeof(fe_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -531,14 +525,14 @@ static PyGetSetDef field_pygetset[] = {
 static PyMethodDef field_pymethods[] = {
 #define METHNAME(name) fmeth_##name
   METH	(_adopt,	"F._adopt(X) -> FE")
-  KWMETH(rand,		"F.rand(rng = rand) -> FE, uniformly distributed")
+  KWMETH(rand,		"F.rand([rng = rand]) -> FE, uniformly distributed")
 #undef METHNAME
   { 0 }
 };
 
 static PyTypeObject field_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.Field",			/* @tp_name@ */
+  "Field",				/* @tp_name@ */
   sizeof(field_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -610,13 +604,13 @@ static PyObject *pfget_p(PyObject *me, void *hunoz)
 
 static PyGetSetDef primefield_pygetset[] = {
 #define GETSETNAME(op, name) pf##op##_##name
-  GET	(p, 		"F.p -> prime field characteristic")
+  GET	(p,		"F.p -> prime field characteristic")
 #undef GETSETNAME
 };
 
 static PyTypeObject primefield_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.PrimeField",		/* @tp_name@ */
+  "PrimeField",				/* @tp_name@ */
   sizeof(field_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -683,7 +677,7 @@ end:
 
 static PyTypeObject niceprimefield_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.NicePrimeField",		/* @tp_name@ */
+  "NicePrimeField",			/* @tp_name@ */
   sizeof(field_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -736,14 +730,14 @@ static PyObject *bfget_m(PyObject *me, void *hunoz)
 
 static PyGetSetDef binfield_pygetset[] = {
 #define GETSETNAME(op, name) bf##op##_##name
-  GET	(m, 		"F.m -> field polynomial degree")
+  GET	(m,		"F.m -> field polynomial degree")
 #undef GETSETNAME
   { 0 }
 };
 
 static PyTypeObject binfield_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.BinField",			/* @tp_name@ */
+  "BinField",				/* @tp_name@ */
   sizeof(field_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -807,16 +801,19 @@ end:
   return (0);
 }
 
+static PyObject *bfget_p(PyObject *me, void *hunoz)
+  { return (gf_pywrap(MP_COPY(FIELD_F(me)->m))); }
+
 static PyGetSetDef binpolyfield_pygetset[] = {
-#define GETSETNAME(op, name) pf##op##_##name
-  GET	(p, 		"F.p -> field polynomial")
+#define GETSETNAME(op, name) bf##op##_##name
+  GET	(p,		"F.p -> field polynomial")
 #undef GETSETNAME
   { 0 }
 };
 
 static PyTypeObject binpolyfield_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.BinPolyField",		/* @tp_name@ */
+  "BinPolyField",			/* @tp_name@ */
   sizeof(field_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -887,18 +884,18 @@ static PyObject *bnfget_beta(PyObject *me, void *hunoz)
 }
 
 static PyGetSetDef binnormfield_pygetset[] = {
-#define GETSETNAME(op, name) pf##op##_##name
-  GET	(p, 		"F.p -> field polynomial")
+#define GETSETNAME(op, name) bf##op##_##name
+  GET	(p,		"F.p -> field polynomial")
 #undef GETSETNAME
 #define GETSETNAME(op, name) bnf##op##_##name
-  GET	(beta, 		"F.beta -> conversion factor")
+  GET	(beta,		"F.beta -> conversion factor")
 #undef GETSETNAME
   { 0 }
 };
 
 static PyTypeObject binnormfield_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.BinNormField",		/* @tp_name@ */
+  "BinNormField",			/* @tp_name@ */
   sizeof(field_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -958,7 +955,7 @@ static PyObject *meth__Field_parse(PyObject *me, PyObject *arg)
   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);
@@ -966,7 +963,7 @@ end:
 
 static PyMethodDef methods[] = {
 #define METHNAME(func) meth_##func
-  METH	(_Field_parse, 		"parse(STR) -> F, REST")
+  METH	(_Field_parse,		"parse(STR) -> F, REST")
 #undef METHNAME
   { 0 }
 };