--- parser3/src/include/pa_array.h 2001/04/23 15:49:58 1.35 +++ parser3/src/include/pa_array.h 2001/05/17 10:22:24 1.41 @@ -5,14 +5,13 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_array.h,v 1.35 2001/04/23 15:49:58 paf Exp $ + $Id: pa_array.h,v 1.41 2001/05/17 10:22:24 parser Exp $ */ #ifndef PA_ARRAY_H #define PA_ARRAY_H -#include - +#include "pa_config_includes.h" #include "pa_pool.h" #include "pa_types.h" #include "pa_string.h" @@ -53,8 +52,8 @@ public: typedef bool (*First_that_func)(Item *value, void *info); enum { - CR_INITIAL_ROWS_DEFAULT=10, ///< default preallocated row count - CR_GROW_PERCENT=60 ///< each time the Array chunk_is_full() array expanded() + CR_INITIAL_ROWS_DEFAULT=3, ///< default preallocated row count + CR_GROW_COUNT=3 ///< each time the Array chunk_is_full() array expanded() }; public: @@ -81,9 +80,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); @@ -108,6 +109,8 @@ 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 { @@ -132,26 +135,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: