--- parser3/src/include/pa_table.h	2003/07/24 11:31:21	1.52
+++ parser3/src/include/pa_table.h	2009/05/14 11:27:23	1.63
@@ -1,14 +1,14 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001-2003 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)
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
-static const char* IDENT_TABLE_H="$Date: 2003/07/24 11:31:21 $";
+static const char * const IDENT_TABLE_H="$Date: 2009/05/14 11:27:23 $";
 
 #include "pa_types.h"
 #include "pa_hash.h"
@@ -75,8 +75,8 @@ public:
 		size_t saved_current=current();
 		size_t row=o.offset;
 		if(o.reverse) { // reverse
-			for(size_t to=row-o.limit; row>=to; --row) {
-				set_current(row);
+			for(size_t i=0; i<o.limit; i++) {
+				set_current(row-i);
 				func(*this, info);
 			}
 		} else { // forward
@@ -89,15 +89,15 @@ public:
 	}
 
 	template<typename I>
-	bool table_first_that(bool (*func)(Table& self, I* info), void* info, Action_options& o) {
+	bool table_first_that(bool (*func)(Table& self, I info), I info, Action_options& o) {
 		if(!o.adjust(count()))
 			return false;
 
 		size_t saved_current=current();
 		size_t row=o.offset;
 		if(o.reverse) { // reverse
-			for(size_t to=row-o.limit; row>=to; --row) {
-				set_current(row);
+			for(size_t i=0; i<o.limit; i++) {
+				set_current(row-i);
 
 				if(func(*this, info))
 					return true;
@@ -128,11 +128,11 @@ private:
 	columns_type fcolumns;
 
 	/// column name->number lookup table
-	typedef Hash<const StringBody, int> name2number_hash_class;
+	typedef HashString<int> name2number_hash_class;
 	name2number_hash_class* name2number;
 
 	/// is that @c index falid?
-	bool valid(size_t index) const { return index>=0 && index<count(); }
+	bool valid(size_t index) const { return index<count(); }
 
 };