X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b3f050848e5d285c2a1d7f8a4bea98984c201805..3884054be9261b4607f5f3a2d0b79695f65b851f:/mptext.h

diff --git a/mptext.h b/mptext.h
index e9e68a8..db4e591 100644
--- a/mptext.h
+++ b/mptext.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mptext.h,v 1.2 1999/12/10 23:29:48 mdw Exp $
+ * $Id: mptext.h,v 1.5 2000/10/08 12:04:58 mdw Exp $
  *
  * Textual representation of multiprecision numbers
  *
@@ -30,6 +30,16 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mptext.h,v $
+ * 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.
  *
@@ -56,7 +66,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 ------------------------------------------------*/
@@ -113,6 +123,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 --- */