--- parser3/src/main/pa_table.C	2001/03/28 08:01:42	1.21
+++ parser3/src/main/pa_table.C	2003/04/14 11:23:41	1.53.2.10.2.7
@@ -1,69 +1,89 @@
 /** @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.21 2001/03/28 08:01: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/04/14 11:23:41 $";
 
 #include "pa_table.h"
-#include "pa_pool.h"
 
-Table::Table(Pool& apool, 
-			 const String *aorigin_string,
-			 Array *acolumns, 
-			 int initial_rows) :
-	Array(apool, initial_rows),
+#include "pa_exception.h"
+
+Table::Table(columns_type acolumns, size_t initial_rows):
+	Array<element_type>(initial_rows),
 
-	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(pool(), false) {
+	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 fcolumns_count=fcolumns->count();
+		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& src, Action_options& options) :
+	Array<element_type>(options.limit==ARRAY_OPTION_LIMIT_ALL?0:options.limit/*may be more than needed, no harm done*/),
+
+	fcurrent(0),
+	fcolumns(src.fcolumns),
+	name2number(src.name2number) {
+
+	append(src, options.offset, options.limit, options.reverse);
 }
 
-int Table::column_name2index(const String& column_name) const {
-	int result;
-	if(fcolumns) { // named
-		int column_index=name2number.get_int(column_name);
-		if(column_index)
-			result=column_index-1;
-		else
-			THROW(0, 0,
-				&column_name, 
+int Table::column_name2index(const String& column_name, bool bark) const {
+	if(fcolumns) {// named
+		int result=name2number->get(column_name)-1; // -1 = column not found
+		if(bark && result<0)
+			throw Exception("parser.runtime",
+				&column_name,
 				"column not found");
-	} else { // nameless
-		result=atoi(column_name.cstr());
-	}
-	return result;
+		return result;
+	} else // nameless
+		return column_name.as_int();
 }
 
-const String *Table::item(int column_index) const {
+const String* Table::item(size_t column) {
 	if(valid(fcurrent)) {
-		const Array& row=at(fcurrent);
-		if(column_index>=0 && column_index<row.size()) // proper index?
-			return row.get_string(column_index);
+		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(const String& column, const String& value) const {
-	int key_index=column_name2index(column);
-	for(int fcurrent=0; fcurrent<size(); fcurrent++) {
-		const String *item_value=item(key_index);
-		if(item_value && *item_value==value)
-			return true;
-	}
+#ifndef DOXYGEN
+struct Locate_int_string_info {
+	int column;
+	const String* value;
+};
+#endif
+bool locate_int_string(Table& self, void* ainfo) {
+	Locate_int_string_info& info=*static_cast<Locate_int_string_info*>(ainfo);
+
+	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 locate(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);
+}
 
-	fcurrent=0;
-	return false;
+void Table::offset(bool absolute, int offset) {
+	if(size_t lcount=count())
+		fcurrent=((absolute?0:fcurrent)+offset+lcount)%lcount;
 }