--- parser3/src/include/pa_table.h	2003/01/24 08:19:09	1.48.2.3
+++ parser3/src/include/pa_table.h	2012/03/16 09:24:11	1.64
@@ -1,17 +1,16 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
-static const char* IDENT_TABLE_H="$Date: 2003/01/24 08:19:09 $";
+#define IDENT_PA_TABLE_H "$Id: pa_table.h,v 1.64 2012/03/16 09:24:11 moko Exp $"
 
 #include "pa_types.h"
-#include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
 
@@ -29,76 +28,112 @@ static const char* IDENT_TABLE_H="$Date:
 	rows and strings stored are read-only. once stored they can be removed,
 	but not altered. that's handy for quick copying & co. see table:join
 */
-class Table: public Array<object_ptr<const Array<object_ptr<const String> > > > {
+class Table: public Array<ArrayString*> {
 public:
-	typedef object_ptr<const String> column_type;
-	typedef object_ptr<const String> value_type;
-
+	typedef ArrayString* columns_type;
 
 	Table(
-		ConstStringPtr aorigin_string,
-		object_ptr<const Array<column_type> > acolumns,
-		int initial_rows=3);
-	Table(const Table& src, int offset=0, int limit=0);
-
-	/// where this table came from, may be NULL
-	ConstStringPtr origin_string() { return forigin_string; }
+		columns_type acolumns,
+		size_t initial_rows=3);
+	Table(const Table& src, Action_options& options);
 
 	/// gets column names
-	object_ptr<const Array<column_type> > columns() { return fcolumns; }
+	columns_type columns() { return fcolumns; }
 
 	/// moves @a current pointer
-	void set_current(int acurrent) { fcurrent=acurrent; }
+	void set_current(size_t acurrent) {
+		assert(acurrent==0 || acurrent<count());
+
+		fcurrent=acurrent;
+	}
 	/// @return current pointer
-	int current() const { return fcurrent; }
+	size_t current() const { return fcurrent; }
 	void offset(bool absolute, int offset);
 
-	/** @return column index from @a column_name. '<0' if no such column
+ 	/** @return column index from @a column_name. '<0' if no such column
 		if no such - 'bark'
 	*/
-	int column_name2index(column_type column, bool bark) const;
+	int column_name2index(const String& column, bool bark) const;
 
 	/// @return item from @a column
-	value_type item(int column) const;
+	const String* item(size_t column);
 
 	/// @return item from @a column. '0' if no such column
-	value_type item(column_type column) const {
+	const String* item(const String& column) {
 		int index=column_name2index(column, false);
-		return index>=0?item(index):value_type(0);
+		return index>=0?item(index):0;
 	}
 
 	/// saves to text file
-	void save(bool nameless_save, object_ptr<const String> file_spec);
+	void save(bool nameless_save, const String& file_spec);
+
+	template<typename I>
+	void table_for_each(void (*func)(Table& self, I* info), I* info, Action_options& o) {
+		if(!o.adjust(count()))
+			return;
+
+		size_t saved_current=current();
+		size_t row=o.offset;
+		if(o.reverse) { // reverse
+			for(size_t i=0; i<o.limit; i++) {
+				set_current(row-i);
+				func(*this, info);
+			}
+		} else { // forward
+			for(size_t to=row+o.limit; row<to; row++) {
+				set_current(row);
+				func(*this, info);
+			}
+		}
+		set_current(saved_current);
+	}
 
-	bool locate(int column, value_type value);
-	bool locate(object_ptr<const String> column, value_type value);
+	template<typename I>
+	bool table_first_that(bool (*func)(Table& self, I info), I info, Action_options& o) {
+		if(!o.adjust(count()))
+			return false;
+
+		size_t saved_current=current();
+		size_t row=o.offset;
+		if(o.reverse) { // reverse
+			for(size_t i=0; i<o.limit; i++) {
+				set_current(row-i);
+
+				if(func(*this, info))
+					return true;
+			}
+		} else { // forward
+			for(size_t to=row+o.limit; row<to; row++) {
+				set_current(row);
+
+				if(func(*this, info))
+					return true;
+			}
+		}
+		set_current(saved_current);
 
-	element_type at(int index) const {
-		return get(index);
+		return false;
 	}
 
-private:
-	
-	// where this table came from, may be NULL
-	ConstStringPtr forigin_string;
 
-	// current row
-	int fcurrent;
+	bool locate(int column, const String& value, Action_options& options);
+	bool locate(const String& column, const String& value, Action_options& options);
 
-	// columns
-	object_ptr<const Array<column_type> > fcolumns;
+private:
+	
+	/// current row
+	size_t fcurrent;
 
-	// column names are already referenced in fcolumns, no need to doublecheck references here
-	// column name->number lookup table
-	typedef Hash<String, int> name2number_hash_class;
-	object_ptr<name2number_hash_class> name2number;
+	/// columns
+	columns_type fcolumns;
 
-	// we own columns?
+	/// column name->number lookup table
+	typedef HashString<int> name2number_hash_class;
+	name2number_hash_class* name2number;
 
-	bool valid(int index) const { return index>=0 && index<count(); }
+	/// is that @c index falid?
+	bool valid(size_t index) const { return index<count(); }
 
 };
 
-typedef object_ptr<Table> TablePtr;
-
 #endif