--- parser3/src/main/pa_table.C	2002/08/01 11:41:19	1.49
+++ parser3/src/main/pa_table.C	2003/01/23 15:38:06	1.53.2.1
@@ -1,11 +1,11 @@
 /** @file
 	Parser: table class.
 
-	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)
 */
 
-static const char* IDENT_TABLE_C="$Date: 2002/08/01 11:41:19 $";
+static const char* IDENT_TABLE_C="$Date: 2003/01/23 15:38:06 $";
 
 //#include <stdlib.h>
 
@@ -13,51 +13,41 @@ static const char* IDENT_TABLE_C="$Date:
 #include "pa_pool.h"
 #include "pa_exception.h"
 
-Table::Table(Pool& apool, 
-			 const String *aorigin_string,
-			 const Array *acolumns, 
-			 int initial_rows) :
-	Array(apool, initial_rows),
+Table::Table(
+			 object_ptr<const String> aorigin_string,
+			 object_ptr<const Array<const String> > acolumns,
+			 int initial_rows):
+	Array<element_type>(initial_rows),
 
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(*NEW Hash(pool())) {
+	name2number(object_ptr<name2number_hash_class>(new name2number_hash_class)) {
 
-	if(fcolumns)
-		for(int i=0; i<fcolumns->size(); i++) {
-			const String& name=*fcolumns->get_string(i);
-			name2number.put(name, i+1);
+	if(fcolumns.get())
+		for(int i=0; i<fcolumns->count(); i++) {
+			const String& name=fcolumns->get(i);
+			name2number->put(name, i+1);
 		}
 }
 
-Table::Table(const Table& source)  :
-	Array(source),
+Table::Table(const Table& src, int offset, int limit) :
+	Array<element_type>(limit/*may be more than needed, no harm done*/),
 
-	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) {
+	forigin_string(src.forigin_string),
+	fcurrent(0),
+	fcolumns(src.fcolumns),
+	name2number(src.name2number) {
 
-	append_array(source, offset);
+	append(src, offset, limit);
 }
 
-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
+int Table::column_name2index(object_ptr<const String> column_name, bool bark) const {
+	if(fcolumns.get()) {// named
+		int result=name2number->get(*column_name.get())-1; // -1 = column not found
 		if(bark && result<0)
 			throw Exception("parser.runtime",
-				&column_name,
+				column_name,
 				"column not found");
 		return result;
 	} else { // nameless