--- parser3/src/main/pa_table.C	2003/01/30 11:00:41	1.53.2.6
+++ parser3/src/main/pa_table.C	2003/04/14 11:22:53	1.55
@@ -5,79 +5,138 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_TABLE_C="$Date: 2003/01/30 11:00:41 $";
+static const char* IDENT_TABLE_C="$Date: 2003/04/14 11:22:53 $";
+
+//#include <stdlib.h>
 
 #include "pa_table.h"
 #include "pa_pool.h"
 #include "pa_exception.h"
 
-Table::Table(
-			 ConstStringPtr aorigin_string,
-			 columns_type acolumns,
-			 int initial_rows):
-	Array<element_type>(initial_rows),
+Table::Table(Pool& apool, 
+			 const String *aorigin_string,
+			 const Array *acolumns, 
+			 int initial_rows) :
+	Array(apool, initial_rows),
 
 	forigin_string(aorigin_string),
 	fcurrent(0),
 	fcolumns(acolumns), 
-	name2number(object_ptr<name2number_hash_class>(new name2number_hash_class)) {
+	name2number(*NEW Hash(pool())) {
 
-	if(fcolumns.get())
-		for(int i=0; i<fcolumns->count(); i++) {
-			const String& name=*fcolumns->get(i).get();
-			name2number->put(name, i+1);
+	if(fcolumns)
+		for(int i=0; i<fcolumns->size(); i++) {
+			const String& name=*fcolumns->get_string(i);
+			name2number.put(name, i+1);
 		}
 }
 
-Table::Table(const Table& src, int offset, int limit) :
-	Array<element_type>(limit/*may be more than needed, no harm done*/),
+Table::Table(Pool& apool, const Table& source, Action_options& options) :
+	Array(apool, options.limit/*may be more than needed, no harm done*/),
 
-	forigin_string(src.forigin_string),
+	forigin_string(source.forigin_string),
 	fcurrent(0),
-	fcolumns(src.fcolumns),
-	name2number(src.name2number) {
+	fcolumns(source.fcolumns),
+	name2number(source.name2number) {
 
-	append(src, offset, limit);
+	append_array(source, options.offset, options.limit, options.reverse);
 }
 
-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
+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_name,
 				"column not found");
 		return result;
-	} else // nameless
-		return column_name->as_int();
+	} 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;
+	}
 }
 
-ConstStringPtr Table::item(int column) {
+const String *Table::item(int column) const {
 	if(valid(fcurrent)) {
-		element_type row=get(fcurrent);
-		if(column>=0 && column<row->count()) // proper index?
-			return row->get(column);
+		const Array& row=at(fcurrent);
+		if(column>=0 && column<row.size()) // proper index?
+			return row.get_string(column);
 	}
 	return 0; // it's OK we don't have row|column, just return nothing
 }
 
-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;
+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(ConstStringPtr column, ConstStringPtr 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) {
-	if(count())
-		fcurrent=((absolute?0:fcurrent)+offset+count())%count();
+	if(size())
+		fcurrent=((absolute?0:fcurrent)+offset+size())%size();
 }