--- parser3/src/include/pa_table.h	2020/12/15 17:10:32	1.71
+++ parser3/src/include/pa_table.h	2024/12/11 15:46:38	1.78
@@ -1,19 +1,21 @@
 /** @file
 	Parser: table class decl.
 
-	Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	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.71 2020/12/15 17:10:32 moko Exp $"
+#define IDENT_PA_TABLE_H "$Id: pa_table.h,v 1.78 2024/12/11 15:46:38 moko Exp $"
 
 #include "pa_types.h"
 #include "pa_hash.h"
 #include "pa_string.h"
 
+class Temp_current;
+
 /** 
 	VTable backend.
 
@@ -32,24 +34,26 @@ class Table: public Array<ArrayString*>
 public:
 	typedef ArrayString* columns_type;
 
-	Table(
-		columns_type acolumns,
-		size_t initial_rows=3);
+	Table(columns_type acolumns, size_t initial_rows=3);
 	Table(const Table& src, Action_options& options);
 
 	/// gets column names
 	columns_type columns() { return fcolumns; }
 
-	/// moves @a current pointer
-	void set_current(size_t acurrent) {
-		assert(acurrent==0 || acurrent<count());
-
-		fcurrent=acurrent;
-	}
 	/// @return current pointer
 	size_t current() const { return fcurrent; }
+
+	/// sets @a current pointer, can be out of range when restoring current in modified table
+	void set_current(size_t acurrent) {
+		fcurrent=acurrent<count() ? acurrent : count()>0 ? count()-1 : 0;
+	}
+
+	/// sets or offsets @a current pointer, wrapping within the table
 	void offset(bool absolute, int offset);
 
+	/// is that @c index falid?
+	bool valid(size_t index) const { return index<count(); }
+
 	/// @return checks all rows to find maximum cells number
 	size_t max_cells() const;
 
@@ -58,6 +62,8 @@ public:
 	*/
 	int column_name2index(const String& column, bool bark) const;
 
+	void column_names_init();
+
 	/// @return item from @a column
 	const String* item(size_t column);
 
@@ -77,25 +83,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,12 +107,11 @@ public:
 					return true;
 			}
 		}
-		set_current(saved_current);
 
+		set_current(saved_current);
 		return false;
 	}
 
-
 	bool locate(int column, const String& value, Action_options& options);
 	bool locate(const String& column, const String& value, Action_options& options);
 
@@ -140,9 +127,37 @@ private:
 	typedef HashString<int> name2number_hash_class;
 	name2number_hash_class* name2number;
 
-	/// is that @c index falid?
-	bool valid(size_t index) const { return index<count(); }
 
 };
 
+/// 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