--- parser3/src/include/pa_table.h	2002/04/22 14:11:28	1.43
+++ parser3/src/include/pa_table.h	2003/04/11 15:00:05	1.49
@@ -1,15 +1,15 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_table.h,v 1.43 2002/04/22 14:11:28 paf Exp $
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
+static const char* IDENT_TABLE_H="$Date: 2003/04/11 15:00:05 $";
+
 #include "pa_types.h"
 #include "pa_array.h"
 #include "pa_hash.h"
@@ -31,13 +31,20 @@
 */
 class Table : public Array {
 public:
+	struct Action_options {
+	     int offset;
+	     int limit; //< negative limit means 'all'. zero limit means 'nothing'
+	     bool reverse;
+	     bool defined;
+
+	     Action_options(): offset(0), limit(-1), reverse(false), defined(false) {}
+	};
 
 	Table(Pool& apool,
 		const String *aorigin,
 		const Array *acolumns,
 		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
-	Table(const Table& source);
-	Table(Pool& apool, const Table& source, int offset=0);
+	Table(Pool& apool, const Table& source, Action_options& options);
 
 	/// where this table came from, may be NULL
 	const String *origin_string() { return forigin_string; }
@@ -49,9 +56,8 @@ public:
 	void set_columns(const Array *acolumns) { fcolumns=acolumns; }
 
 	/// moves @a current pointer
-	void set_current(int acurrent) { fcurrent=acurrent; }
-	/// @return current pointer
-	int current() { return fcurrent; }
+	void set_current(int acurrent);	/// @return current pointer
+	int current() const { return fcurrent; }
 	void offset(bool absolute, int offset);
 
 	/** @return column index from @a column_name. '<0' if no such column
@@ -71,8 +77,10 @@ public:
 	/// saves to text file
 	void save(bool nameless_save, const String& file_spec);
 
-	bool locate(int column, const String& value);
-	bool locate(const String& column, const String& value);
+	typedef bool (*locate_func)(Table& self, void* info);
+	bool locate(locate_func func, void* info, Action_options& options);
+	bool locate(int column, const String& value, Action_options& options);
+	bool locate(const String& column, const String& value, Action_options& options);
 
 	const Array& at(int index) const {
 		// force @c const result
@@ -85,7 +93,7 @@ private:
 	const String *forigin_string;
 
 	// column name->number lookup table
-	Hash name2number;
+	Hash& name2number;
 
 	// current row
 	int fcurrent;