X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/d4e0e50df63aaaae7f7c8770d09f8194e2239a82..a7f86da7e19ebf61011b313e107b17ae11fe7d5d:/darray.h

diff --git a/darray.h b/darray.h
index f2ebe1f..b8f17eb 100644
--- a/darray.h
+++ b/darray.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: darray.h,v 1.3 1999/11/05 14:32:43 mdw Exp $
+ * $Id: darray.h,v 1.5 2000/06/17 10:37:39 mdw Exp $
  *
  * Dynamically growing dense arrays
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: darray.h,v $
+ * Revision 1.5  2000/06/17 10:37:39  mdw
+ * Add support for arena management.
+ *
+ * Revision 1.4  1999/12/10 23:42:04  mdw
+ * Change header file guard names.
+ *
  * Revision 1.3  1999/11/05 14:32:43  mdw
  * Minor change in argument naming.
  *
@@ -41,8 +47,8 @@
  *
  */
 
-#ifndef DARRAY_H
-#define DARRAY_H
+#ifndef MLIB_DARRAY_H
+#define MLIB_DARRAY_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -54,11 +60,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifndef ALLOC_H
+#ifndef MLIB_ALLOC_H
 #  include "alloc.h"
 #endif
 
-#ifndef EXC_H
+#ifndef MLIB_EXC_H
 #  include "exc.h"
 #endif
 
@@ -101,6 +107,7 @@ typedef struct da_base {
   size_t len;				/* Length of useful portion */
   size_t off;				/* Offset of @v@ into space */
   unsigned push, unshift;		/* Pushes/unshifts since growth */
+  arena *a;				/* Pointer to allocation arena */
 } da_base;
 
 /* --- @DA_DECL@ --- *
@@ -116,7 +123,7 @@ typedef struct da_base {
 
 /*----- Initialization, creation and destruction --------------------------*/
 
-#define DA_INIT { { 0, 0, 0, 0, 0 }, 0 } /* Standard initializer */
+#define DA_INIT { { 0, 0, 0, 0, 0, &arena_stdlib }, 0 }
 
 /* --- @DA_CREATE@ --- *
  *
@@ -125,11 +132,12 @@ typedef struct da_base {
  * Use:		Initializes an array block.
  */
 
-#define DA_CREATE(a) do {						\
-  (a)->b.sz = (a)->b.len = 0;						\
-  (a)->b.off = 0;							\
-  (a)->b.push = (a)->b.unshift = 0;					\
-  (a)->v = 0;								\
+#define DA_CREATE(aa) do {						\
+  (aa)->b.sz = (aa)->b.len = 0;						\
+  (aa)->b.off = 0;							\
+  (aa)->b.push = (aa)->b.unshift = 0;					\
+  (aa)->b.a = &arena_stdlib;						\
+  (aa)->v = 0;								\
 } while (0)
 
 /* --- @DA_DESTROY@ --- *
@@ -139,10 +147,10 @@ typedef struct da_base {
  * Use:		Destroys an array.  The array is left valid but empty.
  */
 
-#define DA_DESTROY(a) do {						\
-  if ((a)->v)								\
-    free((a)->v - (a)->b.off);						\
-  DA_CREATE(a);								\
+#define DA_DESTROY(aa) do {						\
+  if ((aa)->v)								\
+    x_free((aa)->b.a, (aa)->v - (aa)->b.off);				\
+  DA_CREATE(aa);								\
 } while (0)
 
 /*----- Storage reservation -----------------------------------------------*/