--- parser3/src/include/pa_table.h	2001/01/29 20:10:32	1.2
+++ parser3/src/include/pa_table.h	2003/01/23 16:08:01	1.48.2.2
@@ -1,49 +1,101 @@
-/*
-  $Id: pa_table.h,v 1.2 2001/01/29 20:10:32 paf Exp $
-*/
+/** @file
+	Parser: table class decl.
 
-/*
-	hence most of tables are "named", no need to uptimize unnamed onces
+	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/01/23 16:08:01 $";
+
 #include "pa_types.h"
 #include "pa_array.h"
 #include "pa_hash.h"
 #include "pa_string.h"
-#include "pa_request.h"
 
-class Table : public Array {
+/** 
+	VTable backend.
+
+	holds:
+	- column names[if any]
+	- data rows
+	- current row pointer
+
+	uses String for column names and data items
+
+	hence most of tables are "named", no need to uptimize nameless onces.
+	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> > > > {
 public:
+	typedef object_ptr<const String> column_type;
+	typedef object_ptr<const String> value_type;
 
-	// request I'm processed on
-	Request& request;
 
-	// the base origin of table data
-	Origin origin;
+	Table(
+		object_ptr<const String> 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
+	object_ptr<const String> origin_string() { return forigin_string; }
+
+	/// gets column names
+	object_ptr<const Array<column_type> > columns() { return fcolumns; }
+
+	/// moves @a current pointer
+	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'
+	*/
+	int column_name2index(column_type column, bool bark) const;
+
+	/// @return item from @a column
+	value_type item(int column) const;
+
+	/// @return item from @a column. '0' if no such column
+	value_type item(column_type column) const {
+		int index=column_name2index(column, false);
+		return index>=0?item(index):value_type(0);
+	}
+
+	/// saves to text file
+	void save(bool nameless_save, object_ptr<const String> file_spec);
+
+	bool locate(int column, value_type value);
+	bool locate(object_ptr<const String> column, value_type value);
+
+	element_type at(int index) const {
+		return get(index);
+	}
+
+private:
+	
+	// where this table came from, may be NULL
+	object_ptr<const String> forigin_string;
 
-	int current;
+	// current row
+	int fcurrent;
 
 	// columns
-	Array *columns;
-
-	Table(Request& request,
-		char *afile, uint aline,
-		Array *acolumns,
-		int initial_rows=CR_INITIAL_ROWS_DEFAULT);
-
-	char *item(int column_index);
-	char *item(String column_name);
-
-protected:
+	object_ptr<const Array<column_type> > fcolumns;
 
+	// column names are already referenced in fcolumns, no need to doublecheck references here
 	// column name->number lookup table
-	Hash name2number;
+	typedef Hash<String, int> name2number_hash_class;
+	object_ptr<name2number_hash_class> name2number;
+
+	// we own columns?
 
-	Array *at(int index);
+	bool valid(int index) const { return index>=0 && index<count(); }
 
 };