X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/96c5fe33ccce96a8731f5ed680ec4096cb80f46b..ee9b1404a97247490a09fcf10af83a76a3d3d72d:/dstr.h

diff --git a/dstr.h b/dstr.h
index 3cbabc1..3ef27ea 100644
--- a/dstr.h
+++ b/dstr.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.5 1999/05/13 22:47:57 mdw Exp $
+ * $Id: dstr.h,v 1.8 1999/07/14 19:45:24 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,15 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.h,v $
+ * Revision 1.8  1999/07/14 19:45:24  mdw
+ * Prevent some macros from re-evaluating their arguments.
+ *
+ * Revision 1.7  1999/05/21 22:12:12  mdw
+ * Fix the bugs in the new macros.  (Whoops.)
+ *
+ * Revision 1.6  1999/05/21 08:38:14  mdw
+ * Add some more macros, particularly for creation and destruction.
+ *
  * Revision 1.5  1999/05/13 22:47:57  mdw
  * Misc documentation fixes.  Change `-ise' to `-ize' throughout.
  *
@@ -69,6 +78,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 /*----- Data structures ---------------------------------------------------*/
 
@@ -78,6 +88,8 @@ typedef struct dstr {
   size_t len;				/* Length of the string */
 } dstr;
 
+#define DSTR_INIT { 0, 0, 0 }		/* How to initialize one */
+
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @dstr_create@ --- *
@@ -91,6 +103,13 @@ typedef struct dstr {
 
 extern void dstr_create(dstr */*d*/);
 
+#define DCREATE(d) do {							\
+  dstr *_dd = (d);							\
+  _dd->buf = 0;								\
+  _dd->sz = 0;								\
+  _dd->len = 0;								\
+} while (0)
+
 /* --- @dstr_destroy@ --- *
  *
  * Arguments:	@dstr *d@ = pointer to a dynamic string block
@@ -102,6 +121,13 @@ extern void dstr_create(dstr */*d*/);
 
 extern void dstr_destroy(dstr */*d*/);
 
+#define DDESTROY(d) do {						\
+  dstr *_d = (d);							\
+  if (_d->buf)								\
+    free(_d->buf);							\
+  DCREATE(_d);								\
+} while (0)
+
 /* --- @dstr_reset@ --- *
  *
  * Arguments:	@dstr *d@ = pointer to a dynaimc string block
@@ -113,6 +139,8 @@ extern void dstr_destroy(dstr */*d*/);
 
 extern void dstr_reset(dstr */*d*/);
 
+#define DRESET(d) ((d)->len = 0)
+
 /* --- @dstr_ensure@ --- *
  *
  * Arguments:	@dstr *d@ = pointer to a dynamic string block
@@ -127,7 +155,9 @@ extern void dstr_reset(dstr */*d*/);
 extern void dstr_ensure(dstr */*d*/, size_t /*sz*/);
 
 #define DENSURE(d, rq) do {						\
-  if ((d)->len + (rq) > (d)->sz) dstr_ensure((d), (rq));		\
+  dstr *_dd = (d);							\
+  size_t _rq = (rq);							\
+  if (_dd->len + _rq > _dd->sz) dstr_ensure(_dd, _rq);			\
 } while (0)
 
 /* --- @dstr_putc@ --- *
@@ -143,8 +173,9 @@ extern void dstr_ensure(dstr */*d*/, size_t /*sz*/);
 extern void dstr_putc(dstr */*d*/, char /*ch*/);
 
 #define DPUTC(d, ch) do {						\
-  DENSURE((d), 1);							\
-  (d)->buf[(d)->len++] = (ch);						\
+  dstr *_d = (d);							\
+  DENSURE(_d, 1);							\
+  _d->buf[_d->len++] = (ch);						\
 } while (0)
 
 /* --- @dstr_putz@ --- *
@@ -161,8 +192,9 @@ extern void dstr_putc(dstr */*d*/, char /*ch*/);
 extern void dstr_putz(dstr */*d*/);
 
 #define DPUTZ(d) do {							\
-  DENSURE((d), 1);							\
-  (d)->buf[(d)->len] = 0;						\
+  dstr *_d = (d);							\
+  DENSURE(_d, 1);							\
+  _d->buf[_d->len] = 0;						\
 } while (0)
 
 /* --- @dstr_puts@ --- *
@@ -179,10 +211,12 @@ extern void dstr_putz(dstr */*d*/);
 extern void dstr_puts(dstr */*d*/, const char */*s*/);
 
 #define DPUTS(d, s) do {						\
-  size_t sz = strlen(s);						\
-  DENSURE((d), sz + 1);							\
-  memcpy((d)->buf + (d)->len, (s), sz + 1);				\
-  (d)->len += sz;							\
+  dstr *_d = (d);							\
+  const char *_s = (s);							\
+  size_t _sz = strlen(s);						\
+  DENSURE(_d, _sz + 1);							\
+  memcpy(_d->buf + _d->len, _s, _sz + 1);				\
+  _d->len += _sz;							\
 } while (0)
 
 /* --- @dstr_vputf@ --- *
@@ -229,10 +263,12 @@ extern int dstr_putf(dstr */*d*/, const char */*p*/, ...);
 extern void dstr_putd(dstr */*d*/, const dstr */*s*/);
 
 #define DPUTD(d, s) do {						\
-  DENSURE((d), (s)->len + 1);						\
-  memcpy((d)->buf + (d)->len, (s)->buf, (s)->len);			\
-  (d)->len += (s)->len;							\
-  (d)->buf[(d)->len] = 0;						\
+  dstr *_d = (d);							\
+  const dstr *_s = (s);							\
+  DENSURE(_d, _s->len + 1);						\
+  memcpy(_d->buf + _d->len, _s->buf, _s->len);				\
+  _d->len += _s->len;							\
+  _d->buf[_d->len] = 0;							\
 } while (0)
 
 /* --- @dstr_putm@ --- *
@@ -248,9 +284,11 @@ extern void dstr_putd(dstr */*d*/, const dstr */*s*/);
 extern void dstr_putm(dstr */*d*/, const void */*p*/, size_t /*sz*/);
 
 #define DPUTM(d, p, sz) do {						\
-  DENSURE((d), (sz));							\
-  memcpy((d)->buf + (d)->len, (p), (sz));				\
-  (d)->len += (sz);							\
+  dstr *_d = (d);							\
+  size_t _sz = (sz);							\
+  DENSURE(_d, _sz);							\
+  memcpy(_d->buf + _d->len, (p), _sz);					\
+  _d->len += _sz;							\
 } while (0)
 
 /* --- @dstr_tidy@ --- *
@@ -292,6 +330,8 @@ extern int dstr_putline(dstr */*d*/, FILE */*fp*/);
 
 extern size_t dstr_write(const dstr */*d*/, FILE */*fp*/);
 
+#define DWRITE(d, fp) fwrite((d)->buf, 1, (d)->len, (fp))
+
 /*----- That's all, folks -------------------------------------------------*/
 
 #ifdef __cplusplus