--- parser3/src/include/pa_table.h	2002/08/06 14:23:22	1.47
+++ parser3/src/include/pa_table.h	2003/01/23 15:38:06	1.48.2.1
@@ -1,14 +1,14 @@
 /** @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/06 14:23:22 $";
+static const char* IDENT_TABLE_H="$Date: 2003/01/23 15:38:06 $";
 
 #include "pa_types.h"
 #include "pa_array.h"
@@ -29,23 +29,20 @@ 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<object_ptr<const Array<object_ptr<const String> > > > {
 public:
 
-	Table(Pool& apool,
-		const String *aorigin,
-		const Array *acolumns,
-		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
-	Table(Pool& apool, const Table& source, int offset=0, int limit=0);
+	Table(
+		object_ptr<const String> aorigin_string,
+		object_ptr<const Array<const String> > 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; }
+	object_ptr<const String> origin_string() { return forigin_string; }
 
 	/// gets column names
-	const Array *columns() { return fcolumns; }
-
-	/// assignes column names
-	void set_columns(const Array *acolumns) { fcolumns=acolumns; }
+	object_ptr<const Array<const String> > columns() { return fcolumns; }
 
 	/// moves @a current pointer
 	void set_current(int acurrent) { fcurrent=acurrent; }
@@ -54,15 +51,15 @@ public:
 	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;
+	int column_name2index(object_ptr<const String> column, bool bark) const;
 
 	/// @return item from @a column
 	const String *item(int column) const;
 
 	/// @return item from @a column. '0' if no such column
-	const String *item(const String& column) const {
+	object_ptr<const String> item(object_ptr<const String> column) const {
 		int index=column_name2index(column, false);
 		return index>=0?item(index):0;
 	}
@@ -73,26 +70,29 @@ public:
 	bool locate(int 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)));
+	element_type at(int index) const {
+		return get(index);
 	}
 
 private:
 	
 	// where this table came from, may be NULL
-	const String *forigin_string;
-
-	// column name->number lookup table
-	Hash& name2number;
+	object_ptr<const String> forigin_string;
 
 	// current row
 	int fcurrent;
 
 	// columns
-	const Array *fcolumns;
+	object_ptr<const Array<const String> > fcolumns;
+
+	// 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;
+
+	// we own columns?
 
-	bool valid(int index) const { return index>=0 && index<size(); }
+	bool valid(int index) const { return index>=0 && index<count(); }
 
 };