--- parser3/src/classes/table.C	2024/09/28 14:37:53	1.365
+++ parser3/src/classes/table.C	2024/10/20 13:29:37	1.368
@@ -24,8 +24,9 @@
 #include "pa_sql_connection.h"
 #include "pa_vbool.h"
 #include "pa_array.h"
+#include "pa_varray.h"
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.365 2024/09/28 14:37:53 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.368 2024/10/20 13:29:37 moko Exp $";
 
 // class
 
@@ -849,11 +850,11 @@ static void table_row_to_hash(Table::ele
 				for(Array_iterator<int> i(*info->value_fields); i; ) {
 					size_t value_field=i.next();
 					if(value_field<row->count())
-						hash.put(columns ? *columns->get(value_field) : String(format(value_field, 0)), new VString(*row->get(value_field)));
+						hash.put(columns ? *columns->get(value_field) : String(pa_uitoa(value_field)), new VString(*row->get(value_field)));
 				}
 			} else { // all fields
 				for(size_t index=0; index<row->count(); index++) {
-					hash.put(columns && index < columns->count() ? *columns->get(index) : String(format(index, 0)), new VString(*row->get(index)));
+					hash.put(columns && index < columns->count() ? *columns->get(index) : String(pa_uitoa(index)), new VString(*row->get(index)));
 				}
 			}
 			exist=info->hash->put_dont_replace(*key, vhash);
@@ -1010,6 +1011,28 @@ static void _hash(Request& r, MethodPara
 	r.write(result);
 }
 
+static void _cells(Request& r, MethodParams& params) {
+	Table& self_table=GET_SELF(r, VTable).table();
+	size_t row_size=self_table[self_table.current()]->count(); // number of columns in current row
+
+	if(params.count()){
+		int limit=params.as_int(params.count()-1, "offset must be expression", r);
+		if(limit<0)
+			limit=0;
+		if((size_t)limit<row_size)
+			row_size=limit;
+	}
+
+	VArray& result=*new VArray(row_size);
+	ArrayValue& result_array=result.array();
+
+	for(size_t index=0; index<row_size; index++){
+		const String* column_item=self_table.item(index);
+		result_array+=column_item ? new VString(*column_item) : VString::empty();
+	}
+	r.write(result);
+}
+
 #ifndef DOXYGEN
 struct Table_seq_item : public PA_Allocated {
 	ArrayString* row;
@@ -1527,7 +1550,7 @@ static void _rename(Request& r, MethodPa
 	Table& table=GET_SELF(r, VTable).table();
 	if(Table::columns_type columns=table.columns()) {
 		if(names){
-			for(int i=0; i<columns->count(); i++) {
+			for(size_t i=0; i<columns->count(); i++) {
 				const String *column = columns->get(i);
 				if(Value* vto=names->get(*column)){
 					if(const String *sto=vto->get_string())
@@ -1537,7 +1560,7 @@ static void _rename(Request& r, MethodPa
 				}
 			}
 		} else if(name_from){
-			for(int i=0; i<columns->count(); i++) {
+			for(size_t i=0; i<columns->count(); i++) {
 				const String *column = columns->get(i);
 				if(*column == *name_from)
 					columns->put(i, name_to);
@@ -1595,6 +1618,10 @@ MTable::MTable(): Methoded("table") {
 	// ^table.hash[key field name][value field name(s) string/table]
 	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);
 
+	// ^table.cells[]
+	// ^table.cells(limit)
+	add_native_method("cells", Method::CT_DYNAMIC, _cells, 0, 1);
+
 	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc|asc]
 	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc|asc]
 	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);