--- parser3/src/include/pa_array.h 2001/10/29 08:23:48 1.45 +++ parser3/src/include/pa_array.h 2002/01/21 12:10:07 1.49 @@ -2,15 +2,14 @@ Parser: Array & Array_iter classes decls. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_array.h,v 1.45 2001/10/29 08:23:48 paf Exp $ + $Id: pa_array.h,v 1.49 2002/01/21 12:10:07 paf Exp $ */ #ifndef PA_ARRAY_H #define PA_ARRAY_H -#include "pa_config_includes.h" #include "pa_pool.h" #include "pa_types.h" #include "pa_string.h" @@ -46,6 +45,10 @@ public: /// for_each iterator function type typedef void (*For_each_func)(Item *value, void *info); + /* + /// for_each iterator function type, passing item storage address + typedef void (*For_each_func_storage)(Item ** value, void *info); + */ /// first_that iterator function type, const info typedef void *(*Item_that_func_const)(Item *value, const void *info); @@ -86,11 +89,15 @@ public: /*/// iterate over all elements, const info void for_each(For_each_func_const func, const void *info=0) const; - /*/ + */ /// iterate over all elements void for_each(For_each_func func, void *info=0) const; + /*/// iterate over all elements, passing address of item storage + void for_each(For_each_func_storage func, void *info=0); + */ + /// iterate over all elements until condition, const info void* first_that(Item_that_func_const func, const void *info=0) const; @@ -129,9 +136,6 @@ private: // array size int fused_rows; - mutable int cache_chunk_base; - mutable Chunk *cache_chunk; - private: bool chunk_is_full() {