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

diff --git a/dstr.h b/dstr.h
index 938378a..538dd33 100644
--- a/dstr.h
+++ b/dstr.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: dstr.h,v 1.6 1999/05/21 08:38:14 mdw Exp $
+ * $Id: dstr.h,v 1.11 2000/06/17 10:37:39 mdw Exp $
  *
  * Handle dynamically growing strings
  *
@@ -30,6 +30,21 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: dstr.h,v $
+ * Revision 1.11  2000/06/17 10:37:39  mdw
+ * Add support for arena management.
+ *
+ * Revision 1.10  1999/12/22 15:39:51  mdw
+ * Fix argument reuse in DPUTS.
+ *
+ * Revision 1.9  1999/12/10 23:42:04  mdw
+ * Change header file guard names.
+ *
+ * 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.
  *
@@ -51,8 +66,8 @@
  *
  */
 
-#ifndef DSTR_H
-#define DSTR_H
+#ifndef MLIB_DSTR_H
+#define MLIB_DSTR_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -74,15 +89,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifndef MLIB_ALLOC_H
+#  include "alloc.h"
+#endif
+
+#ifndef MLIB_ARENA_H
+#  include "arena.h"
+#endif
+
 /*----- Data structures ---------------------------------------------------*/
 
 typedef struct dstr {
   char *buf;				/* Pointer to string buffer */
   size_t sz;				/* Size of the buffer */
   size_t len;				/* Length of the string */
+  arena *a;				/* Pointer to arena */
 } dstr;
 
-#define DSTR_INIT = { 0, 0, 0 };	/* How to initialize one */
+#define DSTR_INIT { 0, 0, 0, &arena_stdlib } /* How to initialize one */
 
 /*----- Functions provided ------------------------------------------------*/
 
@@ -98,9 +122,11 @@ typedef struct dstr {
 extern void dstr_create(dstr */*d*/);
 
 #define DCREATE(d) do {							\
-  (d)->buf = 0;								\
-  (d)->sz = 0;								\
-  (d)->len = 0;								\
+  dstr *_dd = (d);							\
+  _dd->buf = 0;								\
+  _dd->sz = 0;								\
+  _dd->len = 0;								\
+  _dd->a = &arena_stdlib;						\
 } while (0)
 
 /* --- @dstr_destroy@ --- *
@@ -115,13 +141,15 @@ extern void dstr_create(dstr */*d*/);
 extern void dstr_destroy(dstr */*d*/);
 
 #define DDESTROY(d) do {						\
-  if ((d)->buf) free((d)->buf);						\
-  DCREATE(d);								\
+  dstr *_d = (d);							\
+  if (_d->buf)								\
+    x_free(_d->a, _d->buf);						\
+  DCREATE(_d);								\
 } while (0)
 
 /* --- @dstr_reset@ --- *
  *
- * Arguments:	@dstr *d@ = pointer to a dynaimc string block
+ * Arguments:	@dstr *d@ = pointer to a dynamic string block
  *
  * Returns:	---
  *
@@ -130,7 +158,7 @@ extern void dstr_destroy(dstr */*d*/);
 
 extern void dstr_reset(dstr */*d*/);
 
-#define DRESET(d) do (d)->len = 0; while (0)
+#define DRESET(d) ((d)->len = 0)
 
 /* --- @dstr_ensure@ --- *
  *
@@ -146,7 +174,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@ --- *
@@ -162,8 +192,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@ --- *
@@ -180,8 +211,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@ --- *
@@ -198,10 +230,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@ --- *
@@ -248,10 +282,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@ --- *
@@ -267,9 +303,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@ --- *