--- parser3/src/main/pa_table.C	2001/09/26 10:32:26	1.38
+++ parser3/src/main/pa_table.C	2002/08/01 11:41:19	1.49
@@ -1,13 +1,13 @@
 /** @file
 	Parser: table class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_table.C,v 1.38 2001/09/26 10:32:26 parser Exp $
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#include <stdlib.h>
+static const char* IDENT_TABLE_C="$Date: 2002/08/01 11:41:19 $";
+
+//#include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
@@ -22,7 +22,7 @@ Table::Table(Pool& apool,
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(pool()) {
+	name2number(*NEW Hash(pool())) {
 
 	if(fcolumns)
 		for(int i=0; i<fcolumns->size(); i++) {
@@ -31,11 +31,32 @@ Table::Table(Pool& apool,
 		}
 }
 
+Table::Table(const Table& source)  :
+	Array(source),
+
+	forigin_string(source.forigin_string),
+	fcurrent(source.fcurrent),
+	fcolumns(source.fcolumns),
+	name2number(source.name2number) {
+
+}
+
+Table::Table(Pool& apool, const Table& source, int offset) :
+	Array(apool),
+
+	forigin_string(source.forigin_string),
+	fcurrent(source.fcurrent),
+	fcolumns(source.fcolumns),
+	name2number(source.name2number) {
+
+	append_array(source, offset);
+}
+
 int Table::column_name2index(const String& column_name, bool bark) const {
 	if(fcolumns) {// named
 		int result=name2number.get_int(column_name)-1; // -1 = column not found
 		if(bark && result<0)
-			THROW(0, 0,
+			throw Exception("parser.runtime",
 				&column_name,
 				"column not found");
 		return result;
@@ -46,7 +67,7 @@ int Table::column_name2index(const Strin
 		if(*error_pos/*not EOS*/) {
 			result=-1;
 			if(bark)
-				THROW(0, 0,
+				throw Exception("parser.runtime",
 					&column_name,
 					"invalid column number");
 		}
@@ -79,7 +100,7 @@ bool Table::locate(const String& column,
 	return locate(column_name2index(column, true), value);
 }
 
-void Table::shift(int offset) {
+void Table::offset(bool absolute, int offset) {
 	if(size())
-		fcurrent=(fcurrent+offset+size())%size();
+		fcurrent=((absolute?0:fcurrent)+offset+size())%size();
 }