--- parser3/src/include/pa_table.h	2003/03/26 18:52:49	1.48.2.11.2.6
+++ parser3/src/include/pa_table.h	2003/04/14 11:22:53	1.50
@@ -1,16 +1,17 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001-2003 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)
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
-static const char* IDENT_TABLE_H="$Date: 2003/03/26 18:52:49 $";
+static const char* IDENT_TABLE_H="$Date: 2003/04/14 11:22:53 $";
 
 #include "pa_types.h"
+#include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
 
@@ -28,34 +29,49 @@ 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<ArrayString*> {
+class Table : public Array {
 public:
-	typedef ArrayString* columns_type;
+	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(Pool& apool, const Table& source, Action_options& options);
 
-	Table(
-		columns_type acolumns,
-		int initial_rows=3);
-	Table(const Table& src, int offset=0, int limit=0);
+	/// where this table came from, may be NULL
+	const String *origin_string() { return forigin_string; }
 
 	/// gets column names
-	columns_type columns() { return fcolumns; }
+	const Array *columns() { return fcolumns; }
+
+	/// assignes column names
+	void set_columns(const Array *acolumns) { fcolumns=acolumns; }
 
 	/// moves @a current pointer
-	void set_current(int acurrent) { fcurrent=acurrent; }
+	void set_current(int acurrent) {  fcurrent=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
-		if no such - 'bark'
+		if no such colum conditionally 'bark'
 	*/
 	int column_name2index(const String& column, bool bark) const;
 
 	/// @return item from @a column
-	const String* item(size_t column);
+	const String *item(int column) const;
 
 	/// @return item from @a column. '0' if no such column
-	const String* item(const String& column) {
+	const String *item(const String& column) const {
 		int index=column_name2index(column, false);
 		return index>=0?item(index):0;
 	}
@@ -63,25 +79,31 @@ public:
 	/// saves to text file
 	void save(bool nameless_save, const String& file_spec);
 
-	bool locate(size_t 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
+		return *const_cast<const Array *>(static_cast<Array *>(get(index)));
+	}
 
 private:
 	
-	// current row
-	size_t fcurrent;
+	// where this table came from, may be NULL
+	const String *forigin_string;
 
-	// columns
-	columns_type fcolumns;
-
-	// column names are already referenced in fcolumns, no need to doublecheck references here
 	// column name->number lookup table
-	typedef Hash<const StringBody, int> name2number_hash_class;
-	name2number_hash_class* name2number;
+	Hash& name2number;
+
+	// current row
+	int fcurrent;
 
-	// we own columns?
+	// columns
+	const Array *fcolumns;
 
-	bool valid(size_t index) const { return index>=0 && index<count(); }
+	bool valid(int index) const { return index>=0 && index<size(); }
 
 };