--- parser3/src/include/pa_table.h	2001/04/04 10:50:34	1.29
+++ parser3/src/include/pa_table.h	2002/08/01 11:26:48	1.45
@@ -1,16 +1,15 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_table.h,v 1.29 2001/04/04 10:50:34 paf Exp $
+	Copyright (c) 2001, 2002 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="$Id: pa_table.h,v 1.45 2002/08/01 11:26:48 paf Exp $";
+
 #include "pa_types.h"
 #include "pa_array.h"
 #include "pa_hash.h"
@@ -35,35 +34,45 @@ public:
 
 	Table(Pool& apool,
 		const String *aorigin,
-		Array *acolumns,
+		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; }
 
-	/// column names
+	/// gets column names
 	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; }
 	/// @return current pointer
 	int current() { return fcurrent; }
-	void shift(int offset);
+	void offset(bool absolute, int offset);
+
+	/** @return column index from @a column_name. '<0' if no such column
+		if no such colum conditionally 'bark'
+	*/
+	int column_name2index(const String& column, bool bark) const;
 
 	/// @return item from @a column
 	const String *item(int column) const;
-	/// @return item from @a column
-	const String *item(const String& column) const { 
-		return item(column_name2index(column)); 
+
+	/// @return item from @a column. '0' if no such column
+	const String *item(const String& column) const {
+		int index=column_name2index(column, false);
+		return index>=0?item(index):0;
 	}
 
 	/// 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) {
-		return locate(column_name2index(column), value);
-	}
+	bool locate(const String& column, const String& value);
 
 	const Array& at(int index) const {
 		// force @c const result
@@ -76,20 +85,16 @@ private:
 	const String *forigin_string;
 
 	// column name->number lookup table
-	Hash name2number;
+	Hash& name2number;
 
 	// current row
 	int fcurrent;
 
 	// columns
-	Array *fcolumns;
+	const Array *fcolumns;
 
 	bool valid(int index) const { return index>=0 && index<size(); }
 
-	/// @return column index from @a column_name
-	int column_name2index(const String& column) const;
-
-
 };
 
 #endif