X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d3409d5ecf2492cff862616de72a580d1a8e8dc0..59919ae4b1721ca271c3d3e5955c09d322573821:/mptext.h

diff --git a/mptext.h b/mptext.h
index 667c098..57c4dc2 100644
--- a/mptext.h
+++ b/mptext.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mptext.h,v 1.1 1999/11/17 18:02:16 mdw Exp $
+ * $Id: mptext.h,v 1.6 2002/10/15 22:58:29 mdw Exp $
  *
  * Textual representation of multiprecision numbers
  *
@@ -30,13 +30,29 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mptext.h,v $
+ * Revision 1.6  2002/10/15 22:58:29  mdw
+ * Fast estimation of number representation lengths.
+ *
+ * Revision 1.5  2000/10/08 12:04:58  mdw
+ * (MP_DOFPRINTFR): cope with null pointers.
+ *
+ * Revision 1.4  2000/06/17 11:46:58  mdw
+ * Convenience macros for producing debugging output containing MP
+ * integers.
+ *
+ * Revision 1.3  1999/12/22 15:56:30  mdw
+ * Make the buffer passed to `put' op constant.
+ *
+ * Revision 1.2  1999/12/10 23:29:48  mdw
+ * Change header file guard names.
+ *
  * Revision 1.1  1999/11/17 18:02:16  mdw
  * New multiprecision integer arithmetic suite.
  *
  */
 
-#ifndef MPTEXT_H
-#define MPTEXT_H
+#ifndef CATACOMB_MPTEXT_H
+#define CATACOMB_MPTEXT_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -44,7 +60,7 @@
 
 /*----- Header files ------------------------------------------------------*/
 
-#ifndef MP_H
+#ifndef CATACOMB_MP_H
 #  include "mp.h"
 #endif
 
@@ -53,7 +69,7 @@
 typedef struct mptext_ops {
   int (*get)(void */*p*/);
   void (*unget)(int /*ch*/, void */*p*/);
-  int (*put)(char */*s*/, size_t /*len*/, void */*p*/);
+  int (*put)(const char */*s*/, size_t /*len*/, void */*p*/);
 } mptext_ops;
 
 /*----- Functions provided ------------------------------------------------*/
@@ -94,6 +110,20 @@ extern mp *mp_read(mp */*m*/, int /*radix*/,
 extern int mp_write(mp */*m*/, int /*radix*/,
 		    const mptext_ops */*ops*/, void */*p*/);
 
+/* --- @mptext_len@ --- *
+ *
+ * Arguments:	@mp *x@ = number to work on
+ *		@int r@ = radix the number will be expressed in
+ *
+ * Returns:	The number of digits needed to represent the number in the
+ *		given base.  This will not include space for a leading sign
+ *		(use @MP_ISNEG@ to check that, or just add one on for luck);
+ *		neither will it add space for a terminating null.  In general
+ *		the answer will be an overestimate.
+ */
+
+extern size_t mptext_len(mp */*x*/, int /*r*/);
+
 /*----- File I/O ----------------------------------------------------------*/
 
 #include <stdio.h>
@@ -110,6 +140,26 @@ extern const mptext_ops mptext_fileops;
 extern mp *mp_readfile(mp */*m*/, FILE */*fp*/, int /*radix*/);
 extern int mp_writefile(mp */*m*/, FILE */*fp*/, int /*radix*/);
 
+#define MP_DOFPRINTFR(fp, args, m, r) do {				\
+  fprintf args;								\
+  if (m)								\
+    mp_writefile(m, fp, r);						\
+  else									\
+    fputs("<null>", fp);						\
+  fputc('\n', fp);							\
+} while (0)
+
+#define MP_DOFPRINTR(fp, name, m, r) 					\
+  MP_DOFPRINTFR(fp, (fp, "%s = ", name), m, r)
+
+#define MP_PRINT(name, m) MP_DOFPRINTR(stdout, name, m, 10)
+#define MP_EPRINT(name, m) MP_DOFPRINTR(stderr, name, m, 10)
+#define MP_PRINTX(name, m) MP_DOFPRINTR(stdout, name, m, 16)
+#define MP_EPRINTX(name, m) MP_DOFPRINTR(stderr, name, m, 16)
+
+#define MP_FPRINTF(fp, args, m) MP_DOFPRINTFR(fp, args, m, 10)
+#define MP_FPRINTFX(fp, args, m) MP_DOFPRINTFR(fp, args, m, 16)
+
 /*----- String I/O --------------------------------------------------------*/
 
 /* --- Context format --- */