RETURN_ME;
}
-static PyObject *meth__PrimeFilter_smallfactor(PyObject *me, PyObject *arg)
+static PyObject *pfmeth_smallfactor(PyObject *me, PyObject *arg)
{
mp *x = 0;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "OO&:smallfactor", &me, convmp, &x)) goto end;
+ if (!PyArg_ParseTuple(arg, "O&:smallfactor", convmp, &x)) goto end;
rc = PyInt_FromLong(pfilt_smallfactor(x));
end:
mp_drop(x);
return (rc);
}
+#ifdef PY2
static PyObject *pfilt_pylong(PyObject *me)
{ return (mp_topylong(PFILT_F(me)->m)); }
+#endif
static PyObject *pfget_x(PyObject *me, void *hunoz)
{ return (mp_pywrap(MP_COPY(PFILT_F(me)->m))); }
static PyObject *pfget_status(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(PFILT_ST(me))); }
-static PyGetSetDef pfilt_pygetset[] = {
+static const PyGetSetDef pfilt_pygetset[] = {
#define GETSETNAME(op, name) pf##op##_##name
GET (x, "F.x -> current position of filter")
GET (status, "F.status -> primality status of filter")
{ 0 }
};
-static PyMethodDef pfilt_pymethods[] = {
+static const PyMethodDef pfilt_pymethods[] = {
#define METHNAME(name) pfmeth_##name
METH (step, "F.step(N)")
METH (muladd, "F.muladd(M, A)")
METH (jump, "F.jump(FF)")
+ SMTH (smallfactor, "smallfactor(X) -> PGST")
#undef METHNAME
{ 0 }
};
-static PyNumberMethods pfilt_pynumber = {
+static const PyNumberMethods pfilt_pynumber = {
0, /* @nb_add@ */
0, /* @nb_subtract@ */
0, /* @nb_multiply@ */
+#ifdef PY2
0, /* @nb_divide@ */
+#endif
0, /* @nb_remainder@ */
0, /* @nb_divmod@ */
0, /* @nb_power@ */
0, /* @nb_and@ */
0, /* @nb_xor@ */
0, /* @nb_or@ */
+#ifdef PY2
0, /* @nb_coerce@ */
+#endif
pfilt_pyint, /* @nb_int@ */
- pfilt_pylong, /* @nb_long@ */
+ PY23(pfilt_pylong, 0), /* @nb_long@ */
0, /* @nb_float@ */
+#ifdef PY2
0, /* @nb_oct@ */
0, /* @nb_hex@ */
+#endif
0, /* @nb_inplace_add@ */
0, /* @nb_inplace_subtract@ */
0, /* @nb_inplace_multiply@ */
+#ifdef PY2
0, /* @nb_inplace_divide@ */
+#endif
0, /* @nb_inplace_remainder@ */
0, /* @nb_inplace_power@ */
0, /* @nb_inplace_lshift@ */
0, /* @nb_inplace_true_divide@ */
};
-static PyTypeObject pfilt_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject pfilt_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"PrimeFilter", /* @tp_name@ */
sizeof(pfilt_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_setattr@ */
0, /* @tp_compare@ */
0, /* @tp_repr@ */
- &pfilt_pynumber, /* @tp_as_number@ */
+ PYNUMBER(pfilt), /* @tp_as_number@ */
0, /* @tp_as_sequence@ */
0, /* @tp_as_mapping@ */
0, /* @tp_hash@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"PrimeFilter(X): small-primes filter.",
+ "PrimeFilter(X): small-primes filter.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
0, /* @tp_iternext@ */
- pfilt_pymethods, /* @tp_methods@ */
+ PYMETHODS(pfilt), /* @tp_methods@ */
0, /* @tp_members@ */
- pfilt_pygetset, /* @tp_getset@ */
+ PYGETSET(pfilt), /* @tp_getset@ */
0, /* @tp_base@ */
0, /* @tp_dict@ */
0, /* @tp_descr_get@ */
static PyObject *rget_x(PyObject *me, void *hunoz)
{ return (mp_pywrap(MP_COPY(RABIN_R(me)->mm.m))); }
-static PyObject *meth__RabinMiller_iters(PyObject *me, PyObject *arg)
+static PyObject *rmeth_iters(PyObject *me, PyObject *arg)
{
unsigned n;
- if (!PyArg_ParseTuple(arg, "OO&:iters", &me, convuint, &n)) return (0);
+ if (!PyArg_ParseTuple(arg, "O&:iters", convuint, &n)) return (0);
return (PyInt_FromLong(rabin_iters(n)));
}
-static PyGetSetDef rabin_pygetset[] = {
+static const PyGetSetDef rabin_pygetset[] = {
#define GETSETNAME(op, name) r##op##_##name
GET (x, "R.x -> number under test")
GET (niters, "R.niters -> suggested number of tests")
{ 0 }
};
-static PyMethodDef rabin_pymethods[] = {
+static const PyMethodDef rabin_pymethods[] = {
#define METHNAME(name) rmeth_##name
METH (test, "R.test(W) -> PGST")
METH (rtest, "R.rtest(W) -> PGST")
+ SMTH (iters, "iters(NBITS) -> NITERS")
#undef METHNAME
{ 0 }
};
-static PyTypeObject rabin_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject rabin_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"RabinMiller", /* @tp_name@ */
sizeof(rabin_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"RabinMiller(X): Rabin-Miller strong primality test.",
+ "RabinMiller(X): Rabin-Miller strong primality test.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
0, /* @tp_iternext@ */
- rabin_pymethods, /* @tp_methods@ */
+ PYMETHODS(rabin), /* @tp_methods@ */
0, /* @tp_members@ */
- rabin_pygetset, /* @tp_getset@ */
+ PYGETSET(rabin), /* @tp_getset@ */
0, /* @tp_base@ */
0, /* @tp_dict@ */
0, /* @tp_descr_get@ */
static void pgevent_pydealloc(PyObject *me)
{
pgevent_pyobj *ev = (pgevent_pyobj *)me;
- if (ev->r) Py_DECREF(ev->r);
- FREEOBJ(me);
+ Py_XDECREF(ev->r); FREEOBJ(me);
}
#define PGEVENT_CHECK(me) do { \
} while (0)
static PyObject *peget_name(PyObject *me, void *hunoz)
- { PGEVENT_CHECK(me); return (PyString_FromString(PGEVENT_EV(me)->name)); }
+ { PGEVENT_CHECK(me); return (TEXT_FROMSTR(PGEVENT_EV(me)->name)); }
static PyObject *peget_x(PyObject *me, void *hunoz)
{ PGEVENT_CHECK(me); return (mp_pywrap(MP_COPY(PGEVENT_EV(me)->m))); }
return (rc);
}
-static PyGetSetDef pgevent_pygetset[] = {
+static const PyGetSetDef pgevent_pygetset[] = {
#define GETSETNAME(op, name) pe##op##_##name
GET (name, "EV.name -> value being generated")
GETSET(x, "EV.x -> value under test")
{ 0 }
};
-static PyTypeObject pgevent_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject pgevent_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"PrimeGenEvent", /* @tp_name@ */
sizeof(pgevent_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"Prime-generation event.",
+ "Prime-generation event.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
- pgevent_pygetset, /* @tp_getset@ */
+ PYGETSET(pgevent), /* @tp_getset@ */
0, /* @tp_base@ */
0, /* @tp_dict@ */
0, /* @tp_descr_get@ */
static PyObject *pgev_stdev(pgen_proc *proc)
{ pgev pg; pg.proc = proc; pg.ctx = 0; return (pgev_pywrap(&pg)); }
-static PyMethodDef pgev_pymethods[] = {
+static const PyMethodDef pgev_pymethods[] = {
#define METHNAME(name) pgmeth_##name
- METH (pg_abort, "E.pg_abort(EV) -> PGRC -- prime generation aborted")
- METH (pg_done, "E.pg_done(EV) -> PGRC -- prime generation finished")
- METH (pg_begin, "E.pg_begin(EV) -> PGRC -- commence stepping/testing")
- METH (pg_try, "E.pg_try(EV) -> PGRC -- found new candidate")
- METH (pg_pass, "E.pg_pass(EV) -> PGRC -- passed primality test")
- METH (pg_fail, "E.pg_fail(EV) -> PGRC -- failed primality test")
+ METH (pg_abort, "E.pg_abort(EV) -> PGST -- prime generation aborted")
+ METH (pg_done, "E.pg_done(EV) -> PGST -- prime generation finished")
+ METH (pg_begin, "E.pg_begin(EV) -> PGST -- commence stepping/testing")
+ METH (pg_try, "E.pg_try(EV) -> PGST -- found new candidate")
+ METH (pg_pass, "E.pg_pass(EV) -> PGST -- passed primality test")
+ METH (pg_fail, "E.pg_fail(EV) -> PGST -- failed primality test")
#undef METHNAME
{ 0 }
};
-static PyTypeObject pgev_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject pgev_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"PrimeGenBuiltinHandler", /* @tp_name@ */
sizeof(pgev_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"Built-in prime-generation event handler, base class.",
+ "Built-in prime-generation event handler, base class.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
0, /* @tp_iternext@ */
- pgev_pymethods, /* @tp_methods@ */
+ PYMETHODS(pgev), /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
0, /* @tp_base@ */
static PyObject *psget_step(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(PGSTEP_STEP(me))); }
-static PyGetSetDef pgstep_pygetset[] = {
+static const PyGetSetDef pgstep_pygetset[] = {
#define GETSETNAME(op, name) ps##op##_##name
GET (step, "S.step -> step size for the stepper")
#undef GETSETNAME
{ 0 }
};
-static PyTypeObject pgstep_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject pgstep_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"PrimeGenStepper", /* @tp_name@ */
sizeof(pgstep_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"PrimeGenStepper(STEP): simple stepper with small-factors filter.",
+ "PrimeGenStepper(STEP): simple stepper with small-factors filter.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
- pgstep_pygetset, /* @tp_getset@ */
+ PYGETSET(pgstep), /* @tp_getset@ */
0, /* @tp_base@ */
0, /* @tp_dict@ */
0, /* @tp_descr_get@ */
static PyObject *pjget_jump(PyObject *me, void *hunoz)
{ RETURN_OBJ(PGJUMP_FOBJ(me)); }
-static PyGetSetDef pgjump_pygetset[] = {
+static const PyGetSetDef pgjump_pygetset[] = {
#define GETSETNAME(op, name) pj##op##_##name
GET (jump, "S.jump -> jump size for the stepper")
#undef GETSETNAME
{ 0 }
};
-static PyTypeObject pgjump_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject pgjump_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"PrimeGenJumper", /* @tp_name@ */
sizeof(pgjump_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"PrimeGenJumper(JUMP): stepper for larger steps with small-factors filter.",
+ "PrimeGenJumper(JUMP): "
+ "stepper for larger steps with small-factors filter.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
- pgjump_pygetset, /* @tp_getset@ */
+ PYGETSET(pgjump), /* @tp_getset@ */
0, /* @tp_base@ */
0, /* @tp_dict@ */
0, /* @tp_descr_get@ */
return ((PyObject *)rc);
}
-static PyTypeObject pgtest_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+static const PyTypeObject pgtest_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"PrimeGenTester", /* @tp_name@ */
sizeof(pgtest_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
Py_TPFLAGS_BASETYPE,
/* @tp_doc@ */
-"PrimeGenTester(): Rabin-Miller tester.",
+ "PrimeGenTester(): Rabin-Miller tester.",
0, /* @tp_traverse@ */
0, /* @tp_clear@ */
0 /* @tp_is_gc@ */
};
+/*----- Prime iteration ---------------------------------------------------*/
+
+static PyTypeObject *piter_pytype;
+
+typedef struct piter_pyobj {
+ PyObject_HEAD
+ primeiter i;
+} piter_pyobj;
+#define PITER_I(o) (&((piter_pyobj *)(o))->i)
+
+static PyObject *piter_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+{
+ piter_pyobj *rc;
+ mp *n = 0;
+ static const char *const kwlist[] = { "start", 0 };
+
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new", KWLIST, convmp, &n))
+ return (0);
+ rc = (piter_pyobj *)ty->tp_alloc(ty, 0);
+ primeiter_create(&rc->i, n);
+ return ((PyObject *)rc);
+}
+
+static void piter_pydealloc(PyObject *me)
+ { primeiter_destroy(PITER_I(me)); FREEOBJ(me); }
+
+static PyObject *piter_pynext(PyObject *me)
+ { return (mp_pywrap(primeiter_next(PITER_I(me), 0))); }
+
+static const PyTypeObject piter_pytype_skel = {
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
+ "PrimeIter", /* @tp_name@ */
+ sizeof(piter_pyobj), /* @tp_basicsize@ */
+ 0, /* @tp_itemsize@ */
+
+ piter_pydealloc, /* @tp_dealloc@ */
+ 0, /* @tp_print@ */
+ 0, /* @tp_getattr@ */
+ 0, /* @tp_setattr@ */
+ 0, /* @tp_compare@ */
+ 0, /* @tp_repr@ */
+ 0, /* @tp_as_number@ */
+ 0, /* @tp_as_sequence@ */
+ 0, /* @tp_as_mapping@ */
+ 0, /* @tp_hash@ */
+ 0, /* @tp_call@ */
+ 0, /* @tp_str@ */
+ 0, /* @tp_getattro@ */
+ 0, /* @tp_setattro@ */
+ 0, /* @tp_as_buffer@ */
+ Py_TPFLAGS_DEFAULT | /* @tp_flags@ */
+ Py_TPFLAGS_BASETYPE,
+
+ /* @tp_doc@ */
+ "PrimeIter([start = N]): Prime-number iterator.",
+
+ 0, /* @tp_traverse@ */
+ 0, /* @tp_clear@ */
+ 0, /* @tp_richcompare@ */
+ 0, /* @tp_weaklistoffset@ */
+ PyObject_SelfIter, /* @tp_iter@ */
+ piter_pynext, /* @tp_iternext@ */
+ 0, /* @tp_methods@ */
+ 0, /* @tp_members@ */
+ 0, /* @tp_getset@ */
+ 0, /* @tp_base@ */
+ 0, /* @tp_dict@ */
+ 0, /* @tp_descr_get@ */
+ 0, /* @tp_descr_set@ */
+ 0, /* @tp_dictoffset@ */
+ 0, /* @tp_init@ */
+ PyType_GenericAlloc, /* @tp_alloc@ */
+ piter_pynew, /* @tp_new@ */
+ 0, /* @tp_free@ */
+ 0 /* @tp_is_gc@ */
+};
+
/*----- Prime generation functions ----------------------------------------*/
void pgenerr(struct excinfo *exc)
PGENERR(&exc);;
vec = PyList_New(nf);
for (i = 0; i < nf; i++)
- PyList_SetItem(vec, i, mp_pywrap(v[i]));
+ PyList_SET_ITEM(vec, i, mp_pywrap(v[i]));
xfree(v);
rc = Py_BuildValue("(NN)", mp_pywrap(x), vec);
end:
/*----- Global stuff ------------------------------------------------------*/
-static PyMethodDef methods[] = {
+static const struct nameval consts[] = {
+ CONST(PGEN_PASS), CONST(PGEN_FAIL), CONST(PGEN_BEGIN), CONST(PGEN_TRY),
+ CONST(PGEN_DONE), CONST(PGEN_ABORT),
+ { 0 }
+};
+
+static const PyMethodDef methods[] = {
#define METHNAME(name) meth_##name
- METH (_PrimeFilter_smallfactor, "smallfactor(X) -> PGRC")
- METH (_RabinMiller_iters, "iters(NBITS) -> NITERS")
- KWMETH(pgen, "\
-pgen(START, [name = 'p'[, [stepper = PrimeGenStepper(2)],\n\
- [tester = PrimeGenTester()], [event = pgen_nullev],\n\
- [nsteps = 0], [ntests = RabinMiller.iters(START.nbits)]) -> P")
- KWMETH(strongprime_setup, "\
-strongprime_setup(NBITS, [name = 'p'], [event = pgen_nullev],\n\
- [rng = rand], [nsteps = 0]) -> (START, JUMP)")
- KWMETH(strongprime, "\
-strongprime(NBITS, [name = 'p'], [event = pgen_nullev],\n\
- [rng = rand], [nsteps = 0]) -> P")
- KWMETH(limlee, "\
-limlee(PBITS, QBITS, [name = 'p'], [event = pgen_nullev],\n\
- [ievent = pgen_nullev], [rng = rand], [nsteps = 0]) -> (P, [Q, ...])")
+ KWMETH(pgen,
+ "pgen(START, [name = 'p'], [stepper = PrimeGenStepper(2)],\n"
+ " [tester = PrimeGenTester()], [event = pgen_nullev],\n"
+ " [nsteps = 0], [ntests = RabinMiller.iters(START.nbits)]) -> P")
+ KWMETH(strongprime_setup,
+ "strongprime_setup(NBITS, [name = 'p'], [event = pgen_nullev],\n"
+ " [rng = rand], [nsteps = 0]) -> (START, JUMP)")
+ KWMETH(strongprime,
+ "strongprime(NBITS, [name = 'p'], [event = pgen_nullev],\n"
+ " [rng = rand], [nsteps = 0]) -> P")
+ KWMETH(limlee,
+ "limlee(PBITS, QBITS, [name = 'p'], [event = pgen_nullev],\n"
+ " [ievent = pgen_nullev], [rng = rand], [nsteps = 0]) "
+ "-> (P, [Q, ...])")
#undef METHNAME
{ 0 }
};
INITTYPE(pgstep, pgev);
INITTYPE(pgjump, pgev);
INITTYPE(pgtest, pgev);
+ INITTYPE(piter, root);
addmethods(methods);
}
INSERT("pgen_stdev", pgev_stdev(pgen_ev));
INSERT("pgen_spinev", pgev_stdev(pgen_evspin));
INSERT("pgen_subev", pgev_stdev(pgen_subev));
+ INSERT("PrimeIter", piter_pytype);
+ setconstants(mod, consts);
}
/*----- That's all, folks -------------------------------------------------*/
~mdw / catacomb-python / blobdiff