--- parser3/src/main/pa_table.C	2002/02/08 08:30:16	1.44
+++ parser3/src/main/pa_table.C	2003/04/14 11:22:53	1.55
@@ -1,13 +1,13 @@
 /** @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)
-
-	$Id: pa_table.C,v 1.44 2002/02/08 08:30:16 paf Exp $
 */
 
-#include <stdlib.h>
+static const char* IDENT_TABLE_C="$Date: 2003/04/14 11:22:53 $";
+
+//#include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
@@ -22,7 +22,7 @@ Table::Table(Pool& apool,
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(pool()) {
+	name2number(*NEW Hash(pool())) {
 
 	if(fcolumns)
 		for(int i=0; i<fcolumns->size(); i++) {
@@ -31,21 +31,22 @@ Table::Table(Pool& apool,
 		}
 }
 
-Table::Table(const Table& source)  :
-	Array(source),
+Table::Table(Pool& apool, const Table& source, Action_options& options) :
+	Array(apool, options.limit/*may be more than needed, no harm done*/),
 
 	forigin_string(source.forigin_string),
-	fcurrent(source.fcurrent),
+	fcurrent(0),
 	fcolumns(source.fcolumns),
 	name2number(source.name2number) {
 
+	append_array(source, 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
 		if(bark && result<0)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&column_name,
 				"column not found");
 		return result;
@@ -56,7 +57,7 @@ int Table::column_name2index(const Strin
 		if(*error_pos/*not EOS*/) {
 			result=-1;
 			if(bark)
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					&column_name,
 					"invalid column number");
 		}
@@ -73,20 +74,66 @@ const String *Table::item(int column) co
 	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;
+bool Table::locate(Table::locate_func func, void *info, Table::Action_options& o) {
+	int size=this->size();
+	int row=o.offset;
+	if(!size || !o.limit || row>=size)
+		return false;
+	// max(limit)
+	int m=o.reverse?
+		row
+		:size-row;
+	if(!m)
+		return false;
+	// fix o.limit
+	if(o.limit<0 || o.limit>m)
+		o.limit=m;
+
+	int saved_current=current();
+	if(o.reverse) { // reverse
+		int to=max(0, row-o.limit);
+		for(; row>=to; --row) {
+			set_current(row);
+
+			if(func(*this, info))
+				return true;
+		}
+	} else { // forward
+		int to=min(row+o.limit, size);
+		for(; row<to; row++) {
+			set_current(row);
+
+			if(func(*this, info))
+				return true;
+		}
 	}
+	set_current(saved_current);
 
-	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, 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);
 }
 
 void Table::offset(bool absolute, int offset) {