--- parser3/src/include/pa_table.h	2002/08/01 11:41:16	1.46
+++ parser3/src/include/pa_table.h	2003/03/26 18:52:49	1.48.2.11.2.6
@@ -1,17 +1,16 @@
 /** @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)
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
-static const char* IDENT_TABLE_H="$Date: 2002/08/01 11:41:16 $";
+static const char* IDENT_TABLE_H="$Date: 2003/03/26 18:52:49 $";
 
 #include "pa_types.h"
-#include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
 
@@ -29,41 +28,34 @@ 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 {
+class Table: public Array<ArrayString*> {
 public:
+	typedef ArrayString* columns_type;
 
-	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);
-
-	/// where this table came from, may be NULL
-	const String *origin_string() { return forigin_string; }
+	Table(
+		columns_type acolumns,
+		int initial_rows=3);
+	Table(const Table& src, int offset=0, int limit=0);
 
 	/// gets column names
-	const Array *columns() { return fcolumns; }
-
-	/// assignes column names
-	void set_columns(const Array *acolumns) { fcolumns=acolumns; }
+	columns_type columns() { return fcolumns; }
 
 	/// moves @a current pointer
 	void set_current(int acurrent) { fcurrent=acurrent; }
 	/// @return current pointer
-	int current() { return fcurrent; }
+	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 colum conditionally 'bark'
+		if no such - 'bark'
 	*/
 	int column_name2index(const String& column, bool bark) const;
 
 	/// @return item from @a column
-	const String *item(int column) const;
+	const String* item(size_t column);
 
 	/// @return item from @a column. '0' if no such column
-	const String *item(const String& column) const {
+	const String* item(const String& column) {
 		int index=column_name2index(column, false);
 		return index>=0?item(index):0;
 	}
@@ -71,29 +63,25 @@ public:
 	/// saves to text file
 	void save(bool nameless_save, const String& file_spec);
 
-	bool locate(int column, const String& value);
+	bool locate(size_t column, const String& value);
 	bool locate(const String& column, const String& value);
 
-	const Array& at(int index) const {
-		// force @c const result
-		return *const_cast<const Array *>(static_cast<Array *>(get(index)));
-	}
-
 private:
 	
-	// where this table came from, may be NULL
-	const String *forigin_string;
-
-	// column name->number lookup table
-	Hash& name2number;
-
 	// current row
-	int fcurrent;
+	size_t fcurrent;
 
 	// columns
-	const Array *fcolumns;
+	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;
+
+	// we own columns?
 
-	bool valid(int index) const { return index>=0 && index<size(); }
+	bool valid(size_t index) const { return index>=0 && index<count(); }
 
 };