--- parser3/src/main/pa_table.C	2002/08/06 14:23:23	1.50
+++ parser3/src/main/pa_table.C	2003/03/19 16:28:09	1.53.2.10.2.2
@@ -1,84 +1,66 @@
 /** @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/06 14:23:23 $";
-
-//#include <stdlib.h>
+static const char* IDENT_TABLE_C="$Date: 2003/03/19 16:28:09 $";
 
 #include "pa_table.h"
-#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(columns_type acolumns, int initial_rows):
+	Array<element_type>(initial_rows),
 
-	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(*NEW Hash(pool())) {
+	name2number(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);
+		for(int i=0; i<fcolumns->count(); i++) {
+			const String& name=*fcolumns->get(i);
+			name2number->put(name, i+1);
 		}
 }
 
-Table::Table(Pool& apool, const Table& source, int offset, int limit) :
-	Array(apool, limit/*may be more than needed, no harm done*/),
+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) {
+	fcurrent(0),
+	fcolumns(src.fcolumns),
+	name2number(src.name2number) {
 
-	append_array(source, offset, limit);
+	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 result=name2number->get(column_name)-1; // -1 = column not found
 		if(bark && result<0)
 			throw Exception("parser.runtime",
 				&column_name,
 				"column not found");
 		return result;
-	} else { // nameless
-		char *error_pos;
-		const char *cstr=column_name.cstr();
-		int result=(int)strtol(cstr, &error_pos, 0);
-		if(*error_pos/*not EOS*/) {
-			result=-1;
-			if(bark)
-				throw Exception("parser.runtime",
-					&column_name,
-					"invalid column number");
-		}
-		return result;
-	}
+	} else // nameless
+		return column_name.as_int();
 }
 
-const String *Table::item(int column) const {
+const String* Table::item(int column) {
 	if(valid(fcurrent)) {
-		const Array& row=at(fcurrent);
-		if(column>=0 && column<row.size()) // proper index?
-			return row.get_string(column);
+		element_type row=get(fcurrent);
+		if(column>=0 && column<row->count()) // proper index?
+			return row->get(column);
 	}
 	return 0; // it's OK we don't have row|column, just return nothing
 }
 
 bool Table::locate(int column, const String& value) {
 	int scurrent=fcurrent;
-	for(fcurrent=0; fcurrent<size(); fcurrent++) {
-		const String *item_value=item(column);
-		if(item_value && *item_value==value)
+	for(fcurrent=0; fcurrent<count(); fcurrent++) {
+		const String* item_value=item(column);
+		if(*item_value == value)
 			return true;
 	}
 
@@ -91,6 +73,6 @@ bool Table::locate(const String& column,
 }
 
 void Table::offset(bool absolute, int offset) {
-	if(size())
-		fcurrent=((absolute?0:fcurrent)+offset+size())%size();
+	if(count())
+		fcurrent=((absolute?0:fcurrent)+offset+count())%count();
 }