Expunge revision histories in files.

[u/mdw/catacomb] / limlee.h

diff --git a/limlee.h b/limlee.h
index d6fcc4b..9c7b357 100644 (file)
--- a/limlee.h
+++ b/limlee.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: limlee.h,v 1.1 2000/07/09 21:30:58 mdw Exp $
+ * $Id: limlee.h,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Generate Lim-Lee primes
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: limlee.h,v $
- * Revision 1.1  2000/07/09 21:30:58  mdw
- * Lim-Lee prime generation.
- *
- */
-
 #ifndef CATACOMB_LIMLEE_H
 #define CATACOMB_LIMLEE_H
 
@@ -56,6 +48,55 @@
 #  include "pgen.h"
 #endif
 
+/*----- Data structures ---------------------------------------------------*/
+
+typedef struct limlee_factor {
+  mp *p;                               /* The actual prime */
+  unsigned tag;                                /* A tag, usable by the generator */
+  void *more;                          /* Pointer to more data */
+} limlee_factor;
+
+typedef struct limlee_stepctx {
+
+  /* --- To be initialized by the caller --- */
+
+  unsigned f;                          /* Various useful flags */
+  mp *newp;                            /* Initial valid for new primes */
+  unsigned ql, pl;                     /* Size of factors and result */
+  const struct limlee_primeops *pops;  /* Pointer to generator ops */
+  void *pc;                            /* Context ptr for generator ops */
+  pgen_proc *iev;                      /* Event handler for inner @pgen@ */
+  void *iec;                           /* Context for inner @pgen@ */
+  grand *r;                            /* Random number generator */
+
+  /* --- Output values --- */
+
+  size_t nf;                           /* Number of factors wanted */
+  limlee_factor *v;                    /* Vector of factors */
+
+  /* --- Maintained internally --- */
+
+  octet *c;                            /* Combination byte-flag vector */
+  unsigned long seq;                   /* Sequence number for primes */
+  size_t poolsz;                       /* Size of the small-prime pool */
+  dstr d;                              /* String for subprime name */
+  limlee_factor qq;                    /* Big prime to pick up slack */
+
+} limlee_stepctx;
+
+typedef struct limlee_primeops {
+  void (*pgen)(limlee_factor */*f*/, unsigned /*pl*/, limlee_stepctx */*l*/);
+  void (*pfree)(limlee_factor */*f*/, limlee_stepctx */*l*/);
+} limlee_primeops;
+
+/* --- Flags --- */
+
+#define LIMLEE_KEEPFACTORS 1u
+
+/*----- The Lim-Lee stepper function --------------------------------------*/
+
+extern int limlee_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @limlee@ --- *