--- parser3/src/include/pa_array.h 2003/07/24 11:31:21 1.59 +++ parser3/src/include/pa_array.h 2005/08/09 08:14:49 1.65 @@ -1,14 +1,14 @@ /** @file Parser: Array & Array_iterator classes decls. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ #ifndef PA_ARRAY_H #define PA_ARRAY_H -static const char* IDENT_ARRAY_Y="$Date: 2003/07/24 11:31:21 $"; +static const char * const IDENT_ARRAY_Y="$Date: 2005/08/09 08:14:49 $"; // includes @@ -139,19 +139,19 @@ public: /// get index-element T get(size_t index) const { - assert(index>=0 && index=0 && index=0 && index void for_each_ref(void (*callback)(T&, I), I info) { + T *last=felements+fused; + for(T *current=felements; current T first_that(bool (*callback)(T, I), I info) const { T *last=felements+fused; @@ -226,39 +233,4 @@ public: } }; -/* -/** Nonconst array iterator, usage: - @code - // Array a; - for(Array_iterator i(a); i.has_next(); ) { - T& element=i.next(); - ... - } - @endcode -* / -template class Array_modifing_iterator { - - Array& farray; - T *fcurrent; - T *flast; - -public: - - Array_modifing_iterator(Array& aarray): farray(aarray) { - fcurrent=farray.felements; - flast=farray.felements+farray.count(); - } - - /// there are still elements - bool has_next() { - return fcurrent