--- parser3/src/include/pa_array.h 2001/04/02 09:29:17 1.33 +++ parser3/src/include/pa_array.h 2001/05/15 15:51:05 1.38 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_array.h,v 1.33 2001/04/02 09:29:17 paf Exp $ + $Id: pa_array.h,v 1.38 2001/05/15 15:51:05 parser Exp $ */ #ifndef PA_ARRAY_H @@ -39,6 +39,10 @@ public: /// Array item type typedef void Item; + /*/// for_each iterator function type, const info + typedef void (*For_each_func_const)(Item *value, const void *info); + */ + /// for_each iterator function type typedef void (*For_each_func)(Item *value, void *info); @@ -50,7 +54,7 @@ public: enum { CR_INITIAL_ROWS_DEFAULT=10, ///< default preallocated row count - CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded() + CR_GROW_COUNT=10 ///< each time the Array chunk_is_full() array expanded() }; public: @@ -77,9 +81,11 @@ public: int size() const { return fused_rows; } /// append Item to array Array& operator += (Item *src); + /// append int value to array + Array& operator += (int value) { return *this+=reinterpret_cast(value); } /// dirty hack to allow constant items storage. I long for Array - Array& operator += (const Item *src) { return *this+=const_cast(src); } + Array& operator += (const Item *src) { return *this+=const_cast(src); } /// append other Array portion to this one. starting from offset Array& append_array(const Array& src, int offset=0); @@ -104,11 +110,20 @@ public: } Item *get(int index) const; + int get_int(int index) const { return reinterpret_cast(get(index)); } + void put(int index, Item *item); /// 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))); } + const String *quick_get_string(int index) const { + return const_cast(static_cast(quick_get(index))); + } + + /*/// 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; @@ -121,26 +136,29 @@ public: private: + /// several record elements struct Chunk { - // the number of rows in chunk - int count; + int count; ///< the number of rows in chunk + /// item or a link to next chunk union union Row { Item *item; - Chunk *link; // link to the next chunk in chain + Chunk *link; ///< link to the next chunk in chain } rows[1]; // next rows are here } - *head; // the head chunk of the chunk chain + *head; ///< the head chunk of the chunk chain - // last allocated chunk - // helps appending Arrays + /** last allocated chunk + helps appending Arrays + */ Chunk *tail; - // next append would write to this record + /// next append would write to this record Chunk::Row *append_here; - // the address of place where lies address - // of the link to the next chunk to allocate + /** the address of place where lies address + of the link to the next chunk to allocate + */ Chunk::Row *link_row; private: