use of different buffers for scanner and concatenation

1 files changed, 24 insertions, 3 deletions

diff --git a/lzio.h b/lzio.h
index e7807ec3..f2fbad90 100644
--- a/lzio.h
+++ b/lzio.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lzio.h,v 1.12 2002/06/06 12:40:22 roberto Exp roberto $
+** $Id: lzio.h,v 1.13 2002/08/05 18:45:02 roberto Exp roberto $
 ** Buffered streams
 ** See Copyright Notice in lua.h
 */
@@ -13,7 +13,7 @@
 
 #define EOZ     (-1)                    /* end of stream */
 
-typedef struct zio ZIO;
+typedef struct Zio ZIO;
 
 #define zgetc(z)  (((z)->n--)>0 ? \
                         cast(int, cast(unsigned char, *(z)->p++)) : \
@@ -26,9 +26,30 @@ size_t luaZ_read (ZIO* z, void* b, size_t n);	/* read next n bytes */
 int luaZ_lookahead (ZIO *z);
 
 
+
+typedef struct Mbuffer {
+  char *buffer;
+  size_t buffsize;
+} Mbuffer;
+
+
+char *luaZ_openspace (lua_State *L, Mbuffer *buff, size_t n);
+
+#define luaZ_initbuffer(L, buff) ((buff)->buffer = NULL, (buff)->buffsize = 0)
+
+#define luaZ_sizebuffer(buff)   ((buff)->buffsize)
+#define luaZ_buffer(buff)       ((buff)->buffer)
+
+#define luaZ_resizebuffer(L, buff, size) \
+        (luaM_reallocvector(L, (buff)->buffer, (buff)->buffsize, size, char), \
+        (buff)->buffsize = size)
+
+#define luaZ_freebuffer(L, buff)        luaZ_resizebuffer(L, buff, 0)
+
+
 /* --------- Private Part ------------------ */
 
-struct zio {
+struct Zio {
   size_t n;                     /* bytes still unread */
   const char *p;                /* current position in buffer */
   lua_Chunkreader reader;