From: mdw <mdw>
Date: Sat, 13 Nov 1999 01:55:10 +0000 (+0000)
Subject: Fixed so that they compile.  Minor interface changes.
X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/commitdiff_plain/962405ef18fa03650b4c0607d176cdf967e7fd66

Fixed so that they compile.  Minor interface changes.
---

diff --git a/mpscan.c b/mpscan.c
index a49eddf..cbfd138 100644
--- a/mpscan.c
+++ b/mpscan.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpscan.c,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: mpscan.c,v 1.2 1999/11/13 01:55:10 mdw Exp $
  *
  * Sequential bit scan of multiprecision integers
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mpscan.c,v $
+ * Revision 1.2  1999/11/13 01:55:10  mdw
+ * Fixed so that they compile.  Minor interface changes.
+ *
  * Revision 1.1  1999/09/03 08:41:12  mdw
  * Initial import.
  *
@@ -37,17 +40,14 @@
 
 /*----- Header files ------------------------------------------------------*/
 
-/*----- Data structures ---------------------------------------------------*/
-
-/*----- Static variables --------------------------------------------------*/
+#include "mpscan.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @mpscan_initx@ --- *
  *
  * Arguments:	@mpscan *m@ = pointer to bitscanner structure
- *		@const mpw *v@ = vector of words to scan
- *		@size_t len@ = length of vector in words
+ *		@const mpw *v, *vl@ = vector of words to scan
  *
  * Returns:	---
  *
@@ -57,9 +57,9 @@
  *		out.
  */
 
-void mpscan_initx(mpscan *m, const mpw *v, size_t len)
+void mpscan_initx(mpscan *m, const mpw *v, const mpw *vl)
 {
-  MPSCAN_INITX(m, v, len);
+  MPSCAN_INITX(m, v, vl);
 }
 
 /* --- @mpscan_step@ --- *
diff --git a/mpscan.h b/mpscan.h
index 6ec09cc..af7306d 100644
--- a/mpscan.h
+++ b/mpscan.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mpscan.h,v 1.1 1999/09/03 08:41:12 mdw Exp $
+ * $Id: mpscan.h,v 1.2 1999/11/13 01:55:10 mdw Exp $
  *
  * Sequential bit scan of multiprecision integers
  *
@@ -30,6 +30,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mpscan.h,v $
+ * Revision 1.2  1999/11/13 01:55:10  mdw
+ * Fixed so that they compile.  Minor interface changes.
+ *
  * Revision 1.1  1999/09/03 08:41:12  mdw
  * Initial import.
  *
@@ -44,17 +47,16 @@
 
 /*----- Header files ------------------------------------------------------*/
 
-#ifndef MPTYPES_H
-#  include "mptypes.h"
+#ifndef MPW_H
+#  include "mpw.h"
 #endif
 
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct mpscan {
-  const mpw *v;				/* Vector of words to scan */
+  const mpw *v, *vl;			/* Vector of words to scan */
   mpw w;				/* Current word to scan */
   int bits;				/* Number of bits left in @w@ */
-  size_t len;				/* Length of the vector in words */
 } mpscan;
 
 /*----- Functions provided ------------------------------------------------*/
@@ -62,25 +64,24 @@ typedef struct mpscan {
 /* --- @mpscan_initx@ --- *
  *
  * Arguments:	@mpscan *m@ = pointer to bitscanner structure
- *		@const mpw *v@ = vector of words to scan
- *		@size_t len@ = length of vector in words
+ *		@const mpw *v, *vl@ = vector of words to scan
  *
  * Returns:	---
  *
- * Use:		Initializes a bitscanner from a low-level vector-and-length
+ * Use:		Initializes a bitscanner from a low-level base-and-limit
  *		representation of an integer.  Initially no bit is ready; you
  *		must call @mpscan_step@ before anything useful will come
  *		out.
  */
 
-#define MPSCAN_INITX(m_, v_, len_) do {					\
+#define MPSCAN_INITX(m_, v_, vl_) do {					\
   mpscan *_m = (m_);							\
   _m->v = (v_);								\
-  _m->len = (len_);							\
+  _m->vl = (vl_);							\
   _m->bits = 0;								\
 } while (0)
 
-extern void mpscan_initx(mpscan */*m*/, const mpw */*v*/, size_t /*len*/);
+extern void mpscan_initx(mpscan */*m*/, const mpw */*v*/, const mpw */*vl*/);
 
 /* --- @mpscan_step@ --- *
  *
@@ -95,9 +96,8 @@ extern void mpscan_initx(mpscan */*m*/, const mpw */*v*/, size_t /*len*/);
 #define MPSCAN_STEP(m)							\
   ((m)->bits ? ((m)->w >>= 1,						\
 		(m)->bits--, 1) :					\
-   (m)->len ? ((m)->len--,						\
-	       (m)->w = *(m)->v++,					\
-	       (m)->bits = MP_WBITS - 1, 1) :				\
+   (m)->v < (m)->vl ? ((m)->w = *(m)->v++,				\
+		       (m)->bits = MPW_BITS - 1, 1) :			\
    0)
 
 extern int mpscan_step(mpscan */*m*/);