--- parser3/src/main/pa_table.C	2003/01/31 12:10:48	1.53.2.7
+++ parser3/src/main/pa_table.C	2026/04/25 13:38:46	1.79
@@ -1,83 +1,120 @@
 /** @file
 	Parser: table class.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
 */
 
-static const char* IDENT_TABLE_C="$Date: 2003/01/31 12:10:48 $";
-
 #include "pa_table.h"
-#include "pa_pool.h"
-#include "pa_exception.h"
 
-Table::Table(
-			 StringPtr aorigin_string,
-			 columns_type acolumns,
-			 int initial_rows):
-	Array<element_type>(initial_rows),
+volatile const char * IDENT_PA_TABLE_C="$Id: pa_table.C,v 1.79 2026/04/25 13:38:46 moko Exp $" IDENT_PA_TABLE_H;
 
-	forigin_string(aorigin_string),
-	fcurrent(0),
-	fcolumns(acolumns), 
-	name2number(object_ptr<name2number_hash_class>(new name2number_hash_class)) {
+#include "pa_exception.h"
 
-	if(fcolumns.get())
-		for(int i=0; i<fcolumns->count(); i++) {
-			const String& name=*fcolumns->get(i).get();
-			name2number->put(name, i+1);
+Table::Table(columns_type acolumns, size_t initial_rows): Array<element_type>(initial_rows), fcurrent(0), fcolumns(acolumns), name2number(NULL){
+	column_names_init();
+}
+
+void Table::column_names_init(){
+	if(fcolumns){
+		name2number = new name2number_hash_class;
+		size_t number=1;
+		for(ArrayString::Iterator i(*fcolumns); i; ) {
+			const String& name=*i.next();
+			name2number->put(name, number++);
 		}
+	}
+}
+
+static void append_row(Table& src, Table* dest) {
+	Table::element_type src_row(src[src.current()]);
+	Table::element_type row(new ArrayString(src_row->count()));
+	row->append(*src_row);
+	*dest+=row;
 }
 
-Table::Table(const Table& src, int offset, int limit) :
-	Array<element_type>(limit/*may be more than needed, no harm done*/),
+Table::Table(const Table& src, Action_options& options) :
+	Array<element_type>(options.limit > src.count() ? src.count() : options.limit),
 
-	forigin_string(src.forigin_string),
 	fcurrent(0),
 	fcolumns(src.fcolumns),
 	name2number(src.name2number) {
 
-	append(src, offset, limit);
+	((Table &)src).table_for_each(append_row, this, options);
 }
 
-int Table::column_name2index(StringPtr column_name, bool bark) const {
-	if(fcolumns.get()) {// named
-		int result=name2number->get(*column_name.get())-1; // -1 = column not found
+size_t Table::max_cells() const {
+	size_t result=0;
+	for(size_t i=0; i<count(); i++){
+		element_type row=get(i);
+		if(row->count()>result)
+			result=row->count();
+	}
+	return result;
+}
+
+int Table::column_name2index(const String& column_name, bool bark) const {
+	if(fcolumns) {// named
+		int result=name2number->get(column_name)-1; // -1 = column not found
 		if(bark && result<0)
-			throw Exception("parser.runtime",
-				column_name,
-				"column not found");
+			throw Exception(PARSER_RUNTIME, &column_name, "column not found");
 		return result;
 	} else // nameless
-		return column_name->as_int();
+		return column_name.as_int();
 }
 
-StringPtr Table::item(int column) {
+const String* Table::item(size_t column) {
 	if(valid(fcurrent)) {
 		element_type row=get(fcurrent);
-		if(column>=0 && column<row->count()) // proper index?
+		if(column<row->count()) // proper index?
 			return row->get(column);
 	}
 	return 0; // it's OK we don't have row|column, just return nothing
 }
 
-bool Table::locate(int column, StringPtr value) {
-	int scurrent=fcurrent;
-	for(fcurrent=0; fcurrent<count(); fcurrent++) {
-		StringPtr item_value=item(column);
-		if(item_value.get() == value.get())
-			return true;
+void Table::put_item(size_t column, const String* value) {
+	if(!valid(fcurrent)) {
+		throw Exception(PARSER_RUNTIME, 0, "invalid current row");
 	}
+	element_type row=get(fcurrent);
+	while(row->count()<=column){
+	    *row+=&String::Empty;
+	}
+	row->put(column, value);
+}
+
+void Table::remove_current(){
+	if(!valid(fcurrent)) {
+		throw Exception(PARSER_RUNTIME, 0, "invalid current row");
+	}
+	remove(fcurrent);
+	if(fcurrent>=count() && count()>0){
+	    fcurrent--;
+	}
+}
 
-	fcurrent=scurrent;
-	return false;
+#ifndef DOXYGEN
+struct Locate_int_string_info {
+	int column;
+	const String* value;
+};
+#endif
+bool locate_int_string(Table& self, Locate_int_string_info* info) {
+	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 table_first_that(locate_int_string, &info, options);
 }
 
-bool Table::locate(StringPtr column, StringPtr value) {
-	return locate(column_name2index(column, true), value);
+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();
+	// not +lcount, but "if either operand is unsigned, the other shall be converted to unsigned" C++ rule works here
+	if(size_t lcount=count())
+		fcurrent=((absolute?0:fcurrent)+offset+lcount)%lcount;
 }