X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/c51a597d1b79460a4225d42c6a76112b12c91a00..d96c882ed6f1852a266fd1a2b61bbc906cc805bb:/pgen.c

diff --git a/pgen.c b/pgen.c
index 6444225..98daa73 100644
--- a/pgen.c
+++ b/pgen.c
@@ -219,7 +219,7 @@ static PyTypeObject pfilt_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"PrimeFilter(X): small-primes filter.",
+  "PrimeFilter(X): small-primes filter.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -352,7 +352,7 @@ static PyTypeObject rabin_pytype_skel = {
     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@ */
@@ -490,7 +490,7 @@ static PyTypeObject pgevent_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Prime-generation event.",
+  "Prime-generation event.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -634,12 +634,12 @@ static PyObject *pgev_stdev(pgen_proc *proc)
 
 static 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 }
 };
@@ -669,7 +669,7 @@ static PyTypeObject pgev_pytype_skel = {
     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@ */
@@ -743,7 +743,7 @@ static PyTypeObject pgstep_pytype_skel = {
     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@ */
@@ -825,7 +825,8 @@ static PyTypeObject pgjump_pytype_skel = {
     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@ */
@@ -886,7 +887,7 @@ static PyTypeObject pgtest_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"PrimeGenTester(): Rabin-Miller tester.",
+  "PrimeGenTester(): Rabin-Miller tester.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1051,21 +1052,22 @@ end:
 
 static 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, ...])")
+  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, ...])")
 #undef METHNAME
   { 0 }
 };