--- parser3/src/main/pa_table.C	2002/04/22 14:11:28	1.46
+++ parser3/src/main/pa_table.C	2005/08/09 08:14:52	1.61
@@ -1,106 +1,86 @@
 /** @file
 	Parser: table class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_table.C,v 1.46 2002/04/22 14:11:28 paf Exp $
 */
 
-#include <stdlib.h>
+static const char * const IDENT_TABLE_C="$Date: 2005/08/09 08:14:52 $";
 
 #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, size_t initial_rows):
+	Array<element_type>(initial_rows),
 
-	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(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);
+	if(fcolumns) {
+		size_t number=1;
+		for(Array_iterator<const String*> i(*fcolumns); i.has_next(); ) {
+			const String& name=*i.next();
+			name2number->put(name, number++);
 		}
+	}
 }
 
-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),
+Table::Table(const Table& src, Action_options& options) :
+	Array<element_type>(options.limit==ARRAY_OPTION_LIMIT_ALL?0:options.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);
+	append(src, options.offset, options.limit, options.reverse);
 }
 
 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(size_t 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<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)
-			return true;
-	}
-
-	fcurrent=scurrent;
-	return false;
-}
-
-bool Table::locate(const String& column, const String& value) {
-	return locate(column_name2index(column, true), value);
+#ifndef DOXYGEN
+struct Locate_int_string_info {
+	int column;
+	const String* value;
+};
+#endif
+bool locate_int_string(Table& self, Locate_int_string_info* info) {
+	const String *item_value=self.item(info->column);
+	return item_value && *item_value==*info->value;
+}
+
+bool Table::locate(int column, const String& value,
+		   Table::Action_options& options) {
+	Locate_int_string_info info={column, &value};
+	return table_first_that(locate_int_string, &info, options);
+}
+
+bool Table::locate(const String& column, const String& value, 
+		   Table::Action_options& options) {
+	return locate(column_name2index(column, true), value, options);
 }
 
 void Table::offset(bool absolute, int offset) {
-	if(size())
-		fcurrent=((absolute?0:fcurrent)+offset+size())%size();
+	if(size_t lcount=count())
+		fcurrent=((absolute?0:fcurrent)+offset+lcount)%lcount;
 }