--- parser3/src/include/pa_array.h 2001/11/05 11:46:23 1.47 +++ parser3/src/include/pa_array.h 2002/02/07 11:16:27 1.50 @@ -4,13 +4,12 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_array.h,v 1.47 2001/11/05 11:46:23 paf Exp $ + $Id: pa_array.h,v 1.50 2002/02/07 11:16:27 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); @@ -79,6 +82,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))); @@ -86,11 +90,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;