--- parser3/src/include/pa_table.h	2023/09/26 20:49:08	1.73
+++ parser3/src/include/pa_table.h	2024/12/08 01:16:42	1.77
@@ -1,19 +1,21 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com)
 	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
 #ifndef PA_TABLE_H
 #define PA_TABLE_H
 
-#define IDENT_PA_TABLE_H "$Id: pa_table.h,v 1.73 2023/09/26 20:49:08 moko Exp $"
+#define IDENT_PA_TABLE_H "$Id: pa_table.h,v 1.77 2024/12/08 01:16:42 moko Exp $"
 
 #include "pa_types.h"
 #include "pa_hash.h"
 #include "pa_string.h"
 
+class Temp_current;
+
 /** 
 	VTable backend.
 
@@ -38,12 +40,11 @@ public:
 	/// gets column names
 	columns_type columns() { return fcolumns; }
 
-	/// moves @a current pointer
+	/// moves @a current pointer, can be out of range when restoring current in modified table
 	void set_current(size_t acurrent) {
-		assert(acurrent==0 || acurrent<count());
-
-		fcurrent=acurrent;
+		fcurrent=acurrent<count() ? acurrent : count()>0 ? count()-1 : 0;
 	}
+
 	/// @return current pointer
 	size_t current() const { return fcurrent; }
 	void offset(bool absolute, int offset);
@@ -77,25 +78,7 @@ public:
 	void save(bool nameless_save, const String& file_spec);
 
 	template<typename I>
-	void table_for_each(void (*func)(Table& self, I* info), I* info, Action_options& o) {
-		if(!o.adjust(count()))
-			return;
-
-		size_t saved_current=current();
-		size_t row=o.offset;
-		if(o.reverse) { // reverse
-			for(size_t i=0; i<o.limit; i++) {
-				set_current(row-i);
-				func(*this, info);
-			}
-		} else { // forward
-			for(size_t to=row+o.limit; row<to; row++) {
-				set_current(row);
-				func(*this, info);
-			}
-		}
-		set_current(saved_current);
-	}
+	void table_for_each(void (*func)(Table& self, I* info), I* info, Action_options& o);
 
 	template<typename I>
 	bool table_first_that(bool (*func)(Table& self, I info), I info, Action_options& o) {
@@ -119,8 +102,8 @@ public:
 					return true;
 			}
 		}
-		set_current(saved_current);
 
+		set_current(saved_current);
 		return false;
 	}
 
@@ -144,4 +127,34 @@ private:
 
 };
 
+/// Auto-object that temporarily saves and restores current
+class Temp_current {
+	Table& ftable;
+	size_t fcurrent;
+public:
+	Temp_current(Table& atable) : ftable(atable), fcurrent(atable.current()){}
+	~Temp_current(){
+		ftable.set_current(fcurrent);
+	}
+};
+
+template<typename I> void Table::table_for_each(void (*func)(Table& self, I* info), I* info, Action_options& o) {
+	if(!o.adjust(count()))
+		return;
+
+	Temp_current tc(*this);
+	size_t row=o.offset;
+	if(o.reverse) { // reverse
+		for(size_t i=0; i<o.limit; i++) {
+			set_current(row-i);
+			func(*this, info);
+		}
+	} else { // forward
+		for(size_t to=row+o.limit; row<to; row++) {
+			set_current(row);
+			func(*this, info);
+		}
+	}
+}
+
 #endif