Release 2.1.3.

[u/mdw/catacomb] / limlee.h

diff --git a/limlee.h b/limlee.h
index 2802585..8b03bc3 100644 (file)
--- a/limlee.h
+++ b/limlee.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: limlee.h,v 1.3 2000/12/06 20:33:27 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,33 +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.3  2000/12/06 20:33:27  mdw
- * Make flags be macros rather than enumerations, to ensure that they're
- * unsigned.
- *
- * Revision 1.2  2000/08/18 19:16:51  mdw
- * New stepper interface for constructing Lim-Lee primes.
- *
- * Revision 1.1  2000/07/09 21:30:58  mdw
- * Lim-Lee prime generation.
- *
- */
-
 #ifndef CATACOMB_LIMLEE_H
 #define CATACOMB_LIMLEE_H
 
@@ -82,6 +67,7 @@ typedef struct limlee_stepctx {
   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 --- */
 
@@ -91,7 +77,6 @@ typedef struct limlee_stepctx {
   /* --- Maintained internally --- */
 
   octet *c;                            /* Combination byte-flag vector */
-  grand *r;                            /* Random number generator */
   unsigned long seq;                   /* Sequence number for primes */
   size_t poolsz;                       /* Size of the small-prime pool */
   dstr d;                              /* String for subprime name */
@@ -110,7 +95,7 @@ typedef struct limlee_primeops {
 
 /*----- The Lim-Lee stepper function --------------------------------------*/
 
-extern int limlee_step(int /*rq*/, pgen_event */*ev*/, void */*p*/);
+extern pgen_proc limlee_step;
 
 /*----- Functions provided ------------------------------------------------*/