--- parser3/src/main/pa_table.C	2001/03/28 14:07:17	1.23
+++ parser3/src/main/pa_table.C	2003/04/11 15:00:05	1.54
@@ -1,28 +1,28 @@
 /** @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.23 2001/03/28 14:07:17 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/11 15:00:05 $";
+
+//#include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
+#include "pa_exception.h"
 
 Table::Table(Pool& apool, 
 			 const String *aorigin_string,
-			 Array *acolumns, 
+			 const Array *acolumns, 
 			 int initial_rows) :
 	Array(apool, initial_rows),
 
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(pool(), false) {
+	name2number(*NEW Hash(pool())) {
 
 	if(fcolumns)
 		for(int i=0; i<fcolumns->size(); i++) {
@@ -31,19 +31,38 @@ Table::Table(Pool& apool,
 		}
 }
 
-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(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(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("parser.runtime",
+				&column_name,
 				"column not found");
-			return 0; // unreached
+		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");
 		}
-	} else // nameless
-		return atoi(column_name.cstr());
+		return result;
+	}
 }
 
 const String *Table::item(int column) const {
@@ -55,18 +74,69 @@ 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) {
-	for(fcurrent=0; fcurrent<size(); fcurrent++) {
-		const String *item_value=item(column);
-		if(item_value && *item_value==value)
-			return true;
+void Table::set_current(int acurrent) { 
+	if(acurrent<0 || acurrent>size())
+		throw Exception(0,
+			0,
+			"table row (%d) out of range [0..%d]", acurrent, size()-1);
+	fcurrent=acurrent; 
+}
+bool Table::locate(Table::locate_func func, void *info, Table::Action_options& o) {
+	int size=this->size();
+	if(!size || !o.limit)
+		return false;
+	if(o.limit<0)
+		o.limit=size;
+	int row=o.offset;
+
+	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=0;
 	return false;
 }
 
-void Table::shift(int offset) {
+#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) {
 	if(size())
-		fcurrent=(fcurrent+offset+size())%size();
+		fcurrent=((absolute?0:fcurrent)+offset+size())%size();
 }