X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/043613346cc5a0a99ad54781212bf7fd2c62c415..09e500b22fc6250ba458d26a9dd7e6571d2c79d8:/limlee.h

diff --git a/limlee.h b/limlee.h
index d6fcc4b..8b03bc3 100644
--- a/limlee.h
+++ b/limlee.h
@@ -1,13 +1,13 @@
 /* -*-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
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * 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 pgen_proc limlee_step;
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @limlee@ --- *