X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/bc243788edd0e564df8b67d0750a238d978c954b..f281293ca70de172b275ecb3224ea36839f2f830:/field.c

diff --git a/field.c b/field.c
index 0a5d908..7fc1f9d 100644
--- a/field.c
+++ b/field.c
@@ -42,9 +42,9 @@ static PyObject *fe_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   PyObject *x;
   mp *z;
-  char *kwlist[] = { "x", 0 };
+  static const char *const kwlist[] = { "x", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:fe", kwlist, &x))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:fe", KWLIST, &x))
     return (0);
   if (FE_PYCHECK(x) && FE_F(x) == FIELD_F(ty)) RETURN_OBJ(x);
   if ((z = getmp(x)) == 0) return (0);
@@ -74,23 +74,23 @@ PyObject *field_pywrap(field *f)
 {
   PyTypeObject *ty;
 
-  if (strcmp(F_NAME(f), "prime") == 0) ty = primefield_pytype;
-  else if (strcmp(F_NAME(f), "niceprime") == 0) ty = niceprimefield_pytype;
-  else if (strcmp(F_NAME(f), "binpoly") == 0) ty = binpolyfield_pytype;
-  else if (strcmp(F_NAME(f), "binnorm") == 0) ty = binnormfield_pytype;
+  if (STRCMP(F_NAME(f), ==, "prime")) ty = primefield_pytype;
+  else if (STRCMP(F_NAME(f), ==, "niceprime")) ty = niceprimefield_pytype;
+  else if (STRCMP(F_NAME(f), ==, "binpoly")) ty = binpolyfield_pytype;
+  else if (STRCMP(F_NAME(f), ==, "binnorm")) ty = binnormfield_pytype;
   else abort();
   return (field_dopywrap(ty, f));
 }
 
 field *field_copy(field *f)
 {
-  if (strcmp(F_NAME(f), "prime") == 0)
+  if (STRCMP(F_NAME(f), ==, "prime"))
     f = field_prime(f->m);
-  else if (strcmp(F_NAME(f), "niceprime") == 0)
+  else if (STRCMP(F_NAME(f), ==, "niceprime"))
     f = field_niceprime(f->m);
-  else if (strcmp(F_NAME(f), "binpoly") == 0)
+  else if (STRCMP(F_NAME(f), ==, "binpoly"))
     f = field_binpoly(f->m);
-  else if (strcmp(F_NAME(f), "binnorm") == 0) {
+  else if (STRCMP(F_NAME(f), ==, "binnorm")) {
     fctx_binnorm *fc = (fctx_binnorm *)f;
     f = field_binnorm(f->m, fc->ntop.r[fc->ntop.n - 1]);
   } else
@@ -126,16 +126,6 @@ static mp *tofe(field *f, PyObject *o)
   return (y);
 }
 
-mp *getfe(field *f, PyObject *o)
-{
-  mp *x = 0;
-  if ((x = tofe(f, o)) == 0) {
-    PyErr_Format(PyExc_TypeError, "can't convert %.100s to fe",
-		 o->ob_type->tp_name);
-  }
-  return (x);
-}
-
 /*----- Field elements ----------------------------------------------------*/
 
 static int febinop(PyObject *x, PyObject *y,
@@ -229,15 +219,7 @@ end:
 }
 
 static long fe_pyhash(PyObject *me)
-{
-  size_t sz = FE_F(me)->noctets;
-  uint32 h = 0xe0c127ca + FE_F(me)->ops->ty;
-  octet *p = xmalloc(sz);
-  mp_storeb(FE_X(me), p, sz);
-  h = unihash_hash(&unihash_global, h, p, sz);
-  xfree(p);
-  return (h % LONG_MAX);
-}
+  { return (mphash(FE_X(me))); }
 
 static int fe_pycoerce(PyObject **x, PyObject **y)
 {
@@ -282,7 +264,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);							\
   }
@@ -342,16 +324,16 @@ static PyObject *feget__value(PyObject *me, void *hunoz)
     return (mp_pywrap(x));
 }
 
-static PyGetSetDef fe_pygetset[] = {
+static const 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 }
 };
 
-static PyMethodDef fe_pymethods[] = {
+static const PyMethodDef fe_pymethods[] = {
 #define METHNAME(func) femeth_##func
   METH	(inv,		"X.inv() -> X^{-1}")
   METH	(sqr,		"X.sqr() -> X^2")
@@ -365,7 +347,7 @@ static PyMethodDef fe_pymethods[] = {
   { 0 }
 };
 
-static PyNumberMethods fe_pynumber = {
+static const PyNumberMethods fe_pynumber = {
   fe_pyadd,				/* @nb_add@ */
   fe_pysub,				/* @nb_subtract@ */
   fe_pymul,				/* @nb_multiply@ */
@@ -420,7 +402,7 @@ static PyTypeObject fe_pytype_skel = {
   0,					/* @tp_setattr@ */
   0,					/* @tp_compare@ */
   0,					/* @tp_repr@ */
-  &fe_pynumber,				/* @tp_as_number@ */
+  PYNUMBER(fe),				/* @tp_as_number@ */
   0,					/* @tp_as_sequence@ */
   0,					/* @tp_as_mapping@ */
   fe_pyhash,				/* @tp_hash@ */
@@ -434,7 +416,7 @@ static PyTypeObject fe_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Finite field elements, abstract base class.",
+  "Finite field elements, abstract base class.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -442,9 +424,9 @@ static PyTypeObject fe_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  fe_pymethods,				/* @tp_methods@ */
+  PYMETHODS(fe),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  fe_pygetset,				/* @tp_getset@ */
+  PYGETSET(fe),				/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -474,10 +456,10 @@ end:
 
 static PyObject *fmeth_rand(PyObject *me, PyObject *arg, PyObject *kw)
 {
-  char *kwlist[] = { "rng", 0 };
+  static const char *const kwlist[] = { "rng", 0 };
   grand *r = &rand_global;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:rand", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:rand", KWLIST,
 				   convgrand, &r))
     return (0);
   return (fe_pywrap(me, F_RAND(FIELD_F(me), MP_NEW, r)));
@@ -490,6 +472,21 @@ static PyObject *fmeth__adopt(PyObject *me, PyObject *arg)
   return (fe_pywrap(me, xx));
 }
 
+static PyObject *meth__Field_parse(PyObject *me, PyObject *arg)
+{
+  field *f;
+  char *p;
+  PyObject *rc = 0;
+  qd_parse qd;
+
+  if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p)) goto end;
+  qd.p = p; qd.e = 0;
+  if ((f = field_parse(&qd)) == 0) VALERR(qd.e);
+  rc = Py_BuildValue("(Ns)", field_pywrap(f), qd.p);
+end:
+  return (rc);
+}
+
 static void field_pydealloc(PyObject *me)
 {
   F_DESTROY(FIELD_F(me));
@@ -517,7 +514,7 @@ static PyObject *fget_name(PyObject *me, void *hunoz)
 static PyObject *fget_type(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(F_TYPE(FIELD_F(me)))); }
 
-static PyGetSetDef field_pygetset[] = {
+static const PyGetSetDef field_pygetset[] = {
 #define GETSETNAME(op, name) f##op##_##name
   GET	(zero,		"F.zero -> field additive identity")
   GET	(one,		"F.one -> field multiplicative identity")
@@ -530,10 +527,10 @@ static PyGetSetDef field_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef field_pymethods[] = {
+static const 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 }
 };
@@ -563,7 +560,7 @@ static PyTypeObject field_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"An abstract field.  This is an abstract type.",
+  "An abstract field.  This is an abstract type.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -571,9 +568,9 @@ static PyTypeObject field_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  field_pymethods,			/* @tp_methods@ */
+  PYMETHODS(field),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  field_pygetset,			/* @tp_getset@ */
+  PYGETSET(field),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -593,9 +590,9 @@ static PyObject *primefield_pynew(PyTypeObject *ty,
 {
   mp *xx = 0;
   field *f;
-  char *kwlist[] = { "p", 0 };
+  static const char *const kwlist[] = { "p", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:primefield", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:primefield", KWLIST,
 				   convmp, &xx))
     goto end;
   if ((f = field_prime(xx)) == 0)
@@ -610,7 +607,7 @@ end:
 static PyObject *pfget_p(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(FIELD_F(me)->m))); }
 
-static PyGetSetDef primefield_pygetset[] = {
+static const PyGetSetDef primefield_pygetset[] = {
 #define GETSETNAME(op, name) pf##op##_##name
   GET	(p,		"F.p -> prime field characteristic")
 #undef GETSETNAME
@@ -641,7 +638,7 @@ static PyTypeObject primefield_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-  "Prime fields.",
+  "PrimeField(P): prime fields.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -651,7 +648,7 @@ static PyTypeObject primefield_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  primefield_pygetset,			/* @tp_getset@ */
+  PYGETSET(primefield),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -669,10 +666,10 @@ static PyObject *niceprimefield_pynew(PyTypeObject *ty,
 {
   mp *xx = 0;
   field *f;
-  char *kwlist[] = { "p", 0 };
+  static const char *const kwlist[] = { "p", 0 };
 
   if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:niceprimefield",
-				   kwlist, convmp, &xx))
+				   KWLIST, convmp, &xx))
     goto end;
   if ((f = field_niceprime(xx)) == 0)
     VALERR("bad prime for niceprimefield");
@@ -708,7 +705,7 @@ static PyTypeObject niceprimefield_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-  "Nice prime fields.",
+  "NicePrimeField(P): prime field using Solinas reduction.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -736,9 +733,13 @@ static PyTypeObject niceprimefield_pytype_skel = {
 static PyObject *bfget_m(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(FIELD_F(me)->nbits)); }
 
-static PyGetSetDef binfield_pygetset[] = {
+static PyObject *bfget_p(PyObject *me, void *hunoz)
+  { return (gf_pywrap(MP_COPY(FIELD_F(me)->m))); }
+
+static const PyGetSetDef binfield_pygetset[] = {
 #define GETSETNAME(op, name) bf##op##_##name
   GET	(m,		"F.m -> field polynomial degree")
+  GET	(p,		"F.p -> field polynomial")
 #undef GETSETNAME
   { 0 }
 };
@@ -778,7 +779,7 @@ static PyTypeObject binfield_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  binfield_pygetset,			/* @tp_getset@ */
+  PYGETSET(binfield),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -796,9 +797,9 @@ static PyObject *binpolyfield_pynew(PyTypeObject *ty,
 {
   mp *xx = 0;
   field *f;
-  char *kwlist[] = { "p", 0 };
+  static const char *const kwlist[] = { "p", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:binpolyfield", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:binpolyfield", KWLIST,
 				   convgf, &xx))
     goto end;
   if ((f = field_binpoly(xx)) == 0) VALERR("bad poly for binpolyfield");
@@ -809,13 +810,6 @@ end:
   return (0);
 }
 
-static PyGetSetDef binpolyfield_pygetset[] = {
-#define GETSETNAME(op, name) pf##op##_##name
-  GET	(p,		"F.p -> field polynomial")
-#undef GETSETNAME
-  { 0 }
-};
-
 static PyTypeObject binpolyfield_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "BinPolyField",			/* @tp_name@ */
@@ -841,7 +835,7 @@ static PyTypeObject binpolyfield_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-  "Binary fields with polynomial basis representation.",
+  "BinPolyField(P): binary fields with polynomial basis representation.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -851,7 +845,7 @@ static PyTypeObject binpolyfield_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  binpolyfield_pygetset,		/* @tp_getset@ */
+  0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -869,10 +863,10 @@ static PyObject *binnormfield_pynew(PyTypeObject *ty,
 {
   mp *xx = 0, *yy = 0;
   field *f;
-  char *kwlist[] = { "p", "beta", 0 };
+  static const char *const kwlist[] = { "p", "beta", 0 };
 
   if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&:binnormfield",
-				   kwlist, convgf, &xx, convgf, &yy))
+				   KWLIST, convgf, &xx, convgf, &yy))
     goto end;
   if ((f = field_binnorm(xx, yy)) == 0) VALERR("bad args for binnormfield");
   MP_DROP(xx); MP_DROP(yy);
@@ -888,10 +882,7 @@ static PyObject *bnfget_beta(PyObject *me, void *hunoz)
   return (gf_pywrap(MP_COPY(fc->ntop.r[fc->ntop.n - 1])));
 }
 
-static PyGetSetDef binnormfield_pygetset[] = {
-#define GETSETNAME(op, name) pf##op##_##name
-  GET	(p,		"F.p -> field polynomial")
-#undef GETSETNAME
+static const PyGetSetDef binnormfield_pygetset[] = {
 #define GETSETNAME(op, name) bnf##op##_##name
   GET	(beta,		"F.beta -> conversion factor")
 #undef GETSETNAME
@@ -923,7 +914,7 @@ static PyTypeObject binnormfield_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-  "Binary fields with normal basis representation.",
+  "BinNormField(P, BETA): binary fields with normal basis representation.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -933,7 +924,7 @@ static PyTypeObject binnormfield_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  binnormfield_pygetset,		/* @tp_getset@ */
+  PYGETSET(binnormfield),		/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -948,27 +939,9 @@ static PyTypeObject binnormfield_pytype_skel = {
 
 /*----- Setup -------------------------------------------------------------*/
 
-static PyObject *meth__Field_parse(PyObject *me, PyObject *arg)
-{
-  field *f;
-  char *p;
-  PyObject *rc = 0;
-  qd_parse qd;
-
-  if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p))
-    goto end;
-  qd.p = p;
-  qd.e = 0;
-  if ((f = field_parse(&qd)) == 0)
-    VALERR(qd.e);
-  rc = Py_BuildValue("(Ns)", field_pywrap(f), qd.p);
-end:
-  return (rc);
-}
-
-static PyMethodDef methods[] = {
+static const PyMethodDef methods[] = {
 #define METHNAME(func) meth_##func
-  METH	(_Field_parse,		"parse(STR) -> F, REST")
+  METH	(_Field_parse,	"parse(STR) -> F, REST")
 #undef METHNAME
   { 0 }
 };