--- parser3/src/include/pa_array.h 2001/12/15 21:28:18 1.48 +++ parser3/src/include/pa_array.h 2002/02/08 07:27:42 1.52 @@ -1,10 +1,10 @@ /** @file Parser: Array & Array_iter classes decls. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_array.h,v 1.48 2001/12/15 21:28:18 paf Exp $ + $Id: pa_array.h,v 1.52 2002/02/08 07:27:42 paf Exp $ */ #ifndef PA_ARRAY_H @@ -45,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); @@ -60,6 +64,7 @@ public: public: Array(Pool& apool, int initial_rows=CR_INITIAL_ROWS_DEFAULT); + Array(const Array& source, int offset=0); /// size Array. how many items are in it int size() const { return fused_rows; } @@ -78,6 +83,7 @@ public: int get_int(int index) const { return reinterpret_cast(get(index)); } void put(int index, Item *item); + void put_int(int index, int value) { put(index, reinterpret_cast(value)); } /// convinient way to get strings from Array. I long for Array const String *get_string(int index) const { return const_cast(static_cast(get(index))); @@ -85,11 +91,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; @@ -98,6 +108,11 @@ public: private: + /// constructor helper + void construct_new(int initial_rows); + +private: + /// several record elements struct Chunk { int count; ///< the number of rows in chunk