~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ec.c (ecptxl_1): Preparatory reformatting.
[catacomb-python]
/
pgen.c
diff --git
a/pgen.c
b/pgen.c
index
dd2d827
..
3c2a792
100644
(file)
--- a/
pgen.c
+++ b/
pgen.c
@@
-100,12
+100,12
@@
static PyObject *pfmeth_jump(PyObject *me, PyObject *arg)
RETURN_ME;
}
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;
{
mp *x = 0;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "O
O&: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);
rc = PyInt_FromLong(pfilt_smallfactor(x));
end:
mp_drop(x);
@@
-125,8
+125,10
@@
static PyObject *pfilt_pyint(PyObject *me)
return (rc);
}
return (rc);
}
+#ifdef PY2
static PyObject *pfilt_pylong(PyObject *me)
{ return (mp_topylong(PFILT_F(me)->m)); }
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_x(PyObject *me, void *hunoz)
{ return (mp_pywrap(MP_COPY(PFILT_F(me)->m))); }
@@
-147,6
+149,7
@@
static const PyMethodDef pfilt_pymethods[] = {
METH (step, "F.step(N)")
METH (muladd, "F.muladd(M, A)")
METH (jump, "F.jump(FF)")
METH (step, "F.step(N)")
METH (muladd, "F.muladd(M, A)")
METH (jump, "F.jump(FF)")
+ SMTH (smallfactor, "smallfactor(X) -> PGST")
#undef METHNAME
{ 0 }
};
#undef METHNAME
{ 0 }
};
@@
-155,7
+158,9
@@
static const PyNumberMethods pfilt_pynumber = {
0, /* @nb_add@ */
0, /* @nb_subtract@ */
0, /* @nb_multiply@ */
0, /* @nb_add@ */
0, /* @nb_subtract@ */
0, /* @nb_multiply@ */
+#ifdef PY2
0, /* @nb_divide@ */
0, /* @nb_divide@ */
+#endif
0, /* @nb_remainder@ */
0, /* @nb_divmod@ */
0, /* @nb_power@ */
0, /* @nb_remainder@ */
0, /* @nb_divmod@ */
0, /* @nb_power@ */
@@
-169,17
+174,23
@@
static const PyNumberMethods pfilt_pynumber = {
0, /* @nb_and@ */
0, /* @nb_xor@ */
0, /* @nb_or@ */
0, /* @nb_and@ */
0, /* @nb_xor@ */
0, /* @nb_or@ */
+#ifdef PY2
0, /* @nb_coerce@ */
0, /* @nb_coerce@ */
+#endif
pfilt_pyint, /* @nb_int@ */
pfilt_pyint, /* @nb_int@ */
-
pfilt_pylong,
/* @nb_long@ */
+
PY23(pfilt_pylong, 0),
/* @nb_long@ */
0, /* @nb_float@ */
0, /* @nb_float@ */
+#ifdef PY2
0, /* @nb_oct@ */
0, /* @nb_hex@ */
0, /* @nb_oct@ */
0, /* @nb_hex@ */
+#endif
0, /* @nb_inplace_add@ */
0, /* @nb_inplace_subtract@ */
0, /* @nb_inplace_multiply@ */
0, /* @nb_inplace_add@ */
0, /* @nb_inplace_subtract@ */
0, /* @nb_inplace_multiply@ */
+#ifdef PY2
0, /* @nb_inplace_divide@ */
0, /* @nb_inplace_divide@ */
+#endif
0, /* @nb_inplace_remainder@ */
0, /* @nb_inplace_power@ */
0, /* @nb_inplace_lshift@ */
0, /* @nb_inplace_remainder@ */
0, /* @nb_inplace_power@ */
0, /* @nb_inplace_lshift@ */
@@
-194,8
+205,8
@@
static const PyNumberMethods pfilt_pynumber = {
0, /* @nb_inplace_true_divide@ */
};
0, /* @nb_inplace_true_divide@ */
};
-static PyTypeObject pfilt_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject pfilt_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeFilter", /* @tp_name@ */
sizeof(pfilt_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeFilter", /* @tp_name@ */
sizeof(pfilt_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-303,11
+314,11
@@
static PyObject *rget_niters(PyObject *me, void *hunoz)
static PyObject *rget_x(PyObject *me, void *hunoz)
{ return (mp_pywrap(MP_COPY(RABIN_R(me)->mm.m))); }
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;
{
unsigned n;
- if (!PyArg_ParseTuple(arg, "O
O&:iters", &me
, convuint, &n)) return (0);
+ if (!PyArg_ParseTuple(arg, "O
&:iters"
, convuint, &n)) return (0);
return (PyInt_FromLong(rabin_iters(n)));
}
return (PyInt_FromLong(rabin_iters(n)));
}
@@
-323,12
+334,13
@@
static const PyMethodDef rabin_pymethods[] = {
#define METHNAME(name) rmeth_##name
METH (test, "R.test(W) -> PGST")
METH (rtest, "R.rtest(W) -> PGST")
#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 }
};
#undef METHNAME
{ 0 }
};
-static PyTypeObject rabin_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject rabin_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"RabinMiller", /* @tp_name@ */
sizeof(rabin_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"RabinMiller", /* @tp_name@ */
sizeof(rabin_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-417,7
+429,7
@@
static void pgevent_pydealloc(PyObject *me)
} while (0)
static PyObject *peget_name(PyObject *me, void *hunoz)
} 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))); }
static PyObject *peget_x(PyObject *me, void *hunoz)
{ PGEVENT_CHECK(me); return (mp_pywrap(MP_COPY(PGEVENT_EV(me)->m))); }
@@
-464,8
+476,8
@@
static const PyGetSetDef pgevent_pygetset[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject pgevent_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject pgevent_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeGenEvent", /* @tp_name@ */
sizeof(pgevent_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeGenEvent", /* @tp_name@ */
sizeof(pgevent_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-643,8
+655,8
@@
static const PyMethodDef pgev_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject pgev_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject pgev_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeGenBuiltinHandler", /* @tp_name@ */
sizeof(pgev_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeGenBuiltinHandler", /* @tp_name@ */
sizeof(pgev_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-717,8
+729,8
@@
static const PyGetSetDef pgstep_pygetset[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject pgstep_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject pgstep_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeGenStepper", /* @tp_name@ */
sizeof(pgstep_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeGenStepper", /* @tp_name@ */
sizeof(pgstep_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-799,8
+811,8
@@
static const PyGetSetDef pgjump_pygetset[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject pgjump_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject pgjump_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeGenJumper", /* @tp_name@ */
sizeof(pgjump_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeGenJumper", /* @tp_name@ */
sizeof(pgjump_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-861,8
+873,8
@@
end:
return ((PyObject *)rc);
}
return ((PyObject *)rc);
}
-static PyTypeObject pgtest_pytype_skel = {
- Py
Object_HEAD_INIT(0) 0,
/* Header */
+static
const
PyTypeObject pgtest_pytype_skel = {
+ Py
VarObject_HEAD_INIT(0, 0)
/* Header */
"PrimeGenTester", /* @tp_name@ */
sizeof(pgtest_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
"PrimeGenTester", /* @tp_name@ */
sizeof(pgtest_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
@@
-1049,10
+1061,14
@@
end:
/*----- Global stuff ------------------------------------------------------*/
/*----- Global stuff ------------------------------------------------------*/
+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
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"
KWMETH(pgen,
"pgen(START, [name = 'p'], [stepper = PrimeGenStepper(2)],\n"
" [tester = PrimeGenTester()], [event = pgen_nullev],\n"
@@
-1098,6
+1114,7
@@
void pgen_pyinsert(PyObject *mod)
INSERT("pgen_stdev", pgev_stdev(pgen_ev));
INSERT("pgen_spinev", pgev_stdev(pgen_evspin));
INSERT("pgen_subev", pgev_stdev(pgen_subev));
INSERT("pgen_stdev", pgev_stdev(pgen_ev));
INSERT("pgen_spinev", pgev_stdev(pgen_evspin));
INSERT("pgen_subev", pgev_stdev(pgen_subev));
+ setconstants(mod, consts);
}
/*----- That's all, folks -------------------------------------------------*/
}
/*----- That's all, folks -------------------------------------------------*/