*.c: Use the new `Py_TYPE' and `Py_SIZE' macros; define them if necessary.

[catacomb-python] / ec.c

diff --git a/ec.c b/ec.c
index b69dbf3..0644ea5 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -106,7 +106,7 @@ int getecpt(ec_curve *c, ec *d, PyObject *p)
 {
   if (toecpt(c, d, p)) {
     PyErr_Format(PyExc_TypeError, "can't convert %.100s to ecpt",
-                p->ob_type->tp_name);
+                Py_TYPE(p)->tp_name);
     return (-1);
   }
   return (0);
@@ -308,9 +308,6 @@ end:
   return (rc);
 }
 
-static PyObject *epget_curve(PyObject *me, void *hunoz)
-  { RETURN_OBJ(ECPT_COBJ(me)); }
-
 static PyObject *epmeth_frombuf(PyObject *me, PyObject *arg)
 {
   buf b;
@@ -687,7 +684,7 @@ static const PyNumberMethods ecpt_pynumber = {
   0,                                   /* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject ecpt_pytype_skel = {
+static const PyTypeObject ecpt_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECPt",                              /* @tp_name@ */
   sizeof(ecpt_pyobj),                  /* @tp_basicsize@ */
@@ -738,9 +735,16 @@ static PyTypeObject ecpt_pytype_skel = {
   0                                    /* @tp_is_gc@ */
 };
 
+static const PyMemberDef ecpt_pymembers[] = {
+#define MEMBERSTRUCT ecpt_pyobj
+  MEMRNM(curve, T_OBJECT, ob_type, READONLY,
+                                   "P.curve -> elliptic curve containing P")
+#undef MEMBERSTRUCT
+  { 0 }
+};
+
 static const PyGetSetDef ecpt_pygetset[] = {
 #define GETSETNAME(op, name) ep##op##_##name
-  GET  (curve,         "P.curve -> elliptic curve containing P")
   GET  (point,         "P.point -> standalone curve point")
   GET  (x,             "P.x -> Cartesian x coordinate of P")
   GET  (y,             "P.y -> Cartesian y coordinate of P")
@@ -806,7 +810,7 @@ static const PyNumberMethods ecptcurve_pynumber = {
   0,                                   /* @nb_inplace_true_divide@ */
 };
 
-static PyTypeObject ecptcurve_pytype_skel = {
+static const PyTypeObject ecptcurve_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECPtCurve",                         /* @tp_name@ */
   sizeof(ecpt_pyobj),                  /* @tp_basicsize@ */
@@ -841,7 +845,7 @@ static PyTypeObject ecptcurve_pytype_skel = {
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
   PYMETHODS(ecpt),                     /* @tp_methods@ */
-  0,                                   /* @tp_members@ */
+  PYMEMBERS(ecpt),                     /* @tp_members@ */
   PYGETSET(ecpt),                      /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
@@ -1065,7 +1069,7 @@ static const PyMethodDef eccurve_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject eccurve_pytype_skel = {
+static const PyTypeObject eccurve_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECCurve",                           /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
@@ -1119,7 +1123,7 @@ static PyObject *ecprimecurve_pynew(PyTypeObject *ty,
   return (eccurve_pynew(ty, ec_prime, arg, kw));
 }
 
-static PyTypeObject ecprimecurve_pytype_skel = {
+static const PyTypeObject ecprimecurve_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECPrimeCurve",                      /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
@@ -1174,7 +1178,7 @@ static PyObject *ecprimeprojcurve_pynew(PyTypeObject *ty,
   return (eccurve_pynew(ty, ec_primeproj, arg, kw));
 }
 
-static PyTypeObject ecprimeprojcurve_pytype_skel = {
+static const PyTypeObject ecprimeprojcurve_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECPrimeProjCurve",                  /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
@@ -1229,7 +1233,7 @@ static PyObject *ecbincurve_pynew(PyTypeObject *ty,
   return (eccurve_pynew(ty, ec_bin, arg, kw));
 }
 
-static PyTypeObject ecbincurve_pytype_skel = {
+static const PyTypeObject ecbincurve_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECBinCurve",                                /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
@@ -1284,7 +1288,7 @@ static PyObject *ecbinprojcurve_pynew(PyTypeObject *ty,
   return (eccurve_pynew(ty, ec_binproj, arg, kw));
 }
 
-static PyTypeObject ecbinprojcurve_pytype_skel = {
+static const PyTypeObject ecbinprojcurve_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECBinProjCurve",                    /* @tp_name@ */
   sizeof(eccurve_pyobj),               /* @tp_basicsize@ */
@@ -1335,8 +1339,6 @@ static PyTypeObject ecbinprojcurve_pytype_skel = {
 
 /*----- Curve info --------------------------------------------------------*/
 
-static int ncurves = -1;
-
 void ecinfo_copy(ec_info *eic, const ec_info *ei)
 {
   eic->c = eccurve_copy(ei->c);
@@ -1410,20 +1412,6 @@ end:
   return (rc);
 }
 
-static PyObject *eimeth__curven(PyObject *me, PyObject *arg)
-{
-  int i;
-  ec_info ei;
-  PyObject *rc = 0;
-
-  if (!PyArg_ParseTuple(arg, "i:_curven", &i)) goto end;
-  if (i < 0 || i >= ncurves) VALERR("curve index out of range");
-  ec_infofromdata(&ei, ectab[i].data);
-  rc = ecinfo_pywrap(&ei);
-end:
-  return (rc);
-}
-
 static PyObject *ecinfo_pyrichcompare(PyObject *x, PyObject *y, int op)
 {
   int b = ec_sameinfop(ECINFO_EI(x), ECINFO_EI(y));
@@ -1484,12 +1472,11 @@ static const PyMethodDef ecinfo_pymethods[] = {
 #define METHNAME(name) eimeth_##name
   KWMETH(check,                "I.check([rng = rand]) -> None")
   SMTH (parse,         "parse(STR) -> (I, REST)")
-  SMTH (_curven,       "_curven(N) -> I")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject ecinfo_pytype_skel = {
+static const PyTypeObject ecinfo_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,             /* Header */
   "ECInfo",                            /* @tp_name@ */
   sizeof(ecinfo_pyobj),                        /* @tp_basicsize@ */
@@ -1539,6 +1526,12 @@ static PyTypeObject ecinfo_pytype_skel = {
 
 /*----- Setup -------------------------------------------------------------*/
 
+static const struct nameval consts[] = {
+  CONST(EC_XONLY), CONST(EC_YBIT), CONST(EC_LSB),
+  CONST(EC_CMPR), CONST(EC_EXPLY), CONST(EC_SORT),
+  { 0 }
+};
+
 void ec_pyinit(void)
 {
   INITTYPE(ecpt, root);
@@ -1551,29 +1544,25 @@ void ec_pyinit(void)
   INITTYPE(ecinfo, root);
 }
 
-static PyObject *namedcurves(void)
+static const char *ec_namefn(const void *p)
+  { const ecentry *ec = p; return (ec->name); }
+
+static int ec_ixfn(const void *p)
 {
-  int i, j;
-  const char *p;
-  PyObject *d, *c;
-
-  d = PyDict_New();
-  for (i = 0; ectab[i].name; i++) {
-    p = ectab[i].name;
-    for (j = 0; j < i; j++) {
-      if (ectab[i].data == ectab[j].data) {
-       c = PyDict_GetItemString(d, (/*unconst*/ char *)ectab[j].name);
-       Py_INCREF(c);
-       goto found;
-      }
-    }
-    c = PyInt_FromLong(i);
-  found:
-    PyDict_SetItemString(d, (/*unconst*/ char *)p, c);
-    Py_DECREF(c);
-  }
-  ncurves = i;
-  return (d);
+  const ecentry *ec = p;
+  int i;
+
+  for (i = 0; ectab[i].name; i++)
+    if (ectab[i].data == ec->data) return (i);
+  return (-1);
+}
+
+static PyObject *ec_valfn(int i)
+{
+  ec_info ei;
+
+  ec_infofromdata(&ei, ectab[i].data);
+  return (ecinfo_pywrap(&ei));
 }
 
 void ec_pyinsert(PyObject *mod)
@@ -1586,7 +1575,9 @@ void ec_pyinsert(PyObject *mod)
   INSERT("ECBinCurve", ecbincurve_pytype);
   INSERT("ECBinProjCurve", ecbinprojcurve_pytype);
   INSERT("ECInfo", ecinfo_pytype);
-  INSERT("_eccurves", namedcurves());
+  INSERT("eccurves", make_grouptab(ectab, sizeof(*ectab),
+                                  ec_namefn, ec_ixfn, ec_valfn));
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/