--- parser3/src/main/pa_table.C	2001/04/05 16:30:42	1.26
+++ parser3/src/main/pa_table.C	2003/01/30 11:00:41	1.53.2.6
@@ -1,80 +1,83 @@
 /** @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.26 2001/04/05 16:30:42 paf Exp $
+	Copyright (c) 2001, 2003 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: 2003/01/30 11:00:41 $";
 
 #include "pa_table.h"
 #include "pa_pool.h"
 #include "pa_exception.h"
 
-Table::Table(Pool& apool, 
-			 const String *aorigin_string,
-			 Array *acolumns, 
-			 int initial_rows) :
-	Array(apool, initial_rows),
+Table::Table(
+			 ConstStringPtr aorigin_string,
+			 columns_type acolumns,
+			 int initial_rows):
+	Array<element_type>(initial_rows),
 
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(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).get();
+			name2number->put(name, i+1);
 		}
 }
 
-int Table::column_name2index(const String& column_name) const {
-	if(fcolumns) { // named
-		int column_number=name2number.get_int(column_name);
-		if(column_number)
-			return column_number-1;
-		else {
-			THROW(0, 0,
-				&column_name, 
+Table::Table(const Table& src, int offset, int limit) :
+	Array<element_type>(limit/*may be more than needed, no harm done*/),
+
+	forigin_string(src.forigin_string),
+	fcurrent(0),
+	fcolumns(src.fcolumns),
+	name2number(src.name2number) {
+
+	append(src, offset, limit);
+}
+
+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 not found");
-			return 0; // unreached
-		}
-	} else { // nameless
-		char *error_pos=0;
-		int result=(int)strtol(column_name.cstr(), &error_pos, 0);
-		if(error_pos && *error_pos)
-			THROW(0, 0,
-				&column_name,
-				"invalid column number");
 		return result;
-	}
+	} else // nameless
+		return column_name->as_int();
 }
 
-const String *Table::item(int column) const {
+ConstStringPtr 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) {
-	for(fcurrent=0; fcurrent<size(); fcurrent++) {
-		const String *item_value=item(column);
-		if(item_value && *item_value==value)
+bool Table::locate(int column, ConstStringPtr value) {
+	int scurrent=fcurrent;
+	for(fcurrent=0; fcurrent<count(); fcurrent++) {
+		ConstStringPtr item_value=item(column);
+		if(item_value.get() == value.get())
 			return true;
 	}
 
-	fcurrent=0;
+	fcurrent=scurrent;
 	return false;
 }
 
-void Table::shift(int offset) {
-	if(size())
-		fcurrent=(fcurrent+offset+size())%size();
+bool Table::locate(ConstStringPtr column, ConstStringPtr value) {
+	return locate(column_name2index(column, true), value);
+}
+
+void Table::offset(bool absolute, int offset) {
+	if(count())
+		fcurrent=((absolute?0:fcurrent)+offset+count())%count();
 }