--- parser3/src/classes/table.C	2024/09/07 16:30:26	1.362
+++ parser3/src/classes/table.C	2024/11/13 17:37:41	1.371
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b table parser class.
 
-	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>
 */
 
@@ -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.362 2024/09/07 16:30:26 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.371 2024/11/13 17:37:41 moko Exp $";
 
 // class
 
@@ -69,19 +70,22 @@ static Table::Action_options get_action_
 				result.offset=source.current();
 			else
 				throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression");
-		} else 
-			result.offset=r.process(*voffset).as_int();
+		} else {
+			int offset=r.process(*voffset).as_int();
+			result.offset=offset < 0 ? 0 : offset;
+		}
 	}
 	if(Value* vlimit=options->get(sql_limit_name)) {
 		valid_options++;
-		result.limit=r.process(*vlimit).as_int();
+		int limit=r.process(*vlimit).as_int();
+		result.limit=limit < 0 ? 0: limit;
 	}
-	if(Value *vreverse=(Value *)options->get(table_reverse_name)) { 
+	if(Value *vreverse=(Value *)options->get(table_reverse_name)) {
 		valid_options++; 
 		result.reverse=r.process(*vreverse).as_bool(); 
 		if(result.reverse && !defined_offset) 
 			result.offset=source.count()-1; 
-	} 
+	}
 
 	if(valid_options!=options->count())
 		throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
@@ -256,9 +260,9 @@ static void _create(Request& r, MethodPa
 
 	if(params.count()>1) {
 		if(params[0].is_string()){ // can be nameless only
-			const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");
+			const String& snameless=params.as_string(0, "called with more than 1 param, first param may be only string 'nameless' or junction");
 			if(snameless!="nameless")
-				throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more then 1 param, first param may be only 'nameless'");
+				throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more than 1 param, first param may be only 'nameless'");
 			nameless=true;
 			data_param_index++;
 		}
@@ -580,9 +584,9 @@ static void table_to_csv(String& result,
 			if(int lsize=table.count()?table[0]->count():0)
 				for(int column=0; column<lsize; column++) {
 					if(control_chars.encloser) {
-						result<<*control_chars.sencloser<<String::Body::Format(column)<<*control_chars.sencloser;
+						result<<*control_chars.sencloser<<pa_uitoa(column)<<*control_chars.sencloser;
 					} else {
-						result<<String::Body::Format(column);
+						result<<pa_uitoa(column);
 					}
 					if(column<lsize-1){
 						result<<*control_chars.sseparator;
@@ -747,7 +751,7 @@ static void _offset(Request& r, MethodPa
 		    else if(whence=="set")
 				absolute=true;
 		    else
-				throw Exception(PARSER_RUNTIME, &whence, "is invalid whence, valid are 'cur' or 'set'");
+				throw Exception(PARSER_RUNTIME, &whence, "is an invalid whence, valid are 'cur' or 'set'");
 		}
 		
 		int offset=params.as_int(params.count()-1, "offset must be expression", r);
@@ -846,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);
@@ -980,7 +984,7 @@ static void _hash(Request& r, MethodPara
 			throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");
 
 		if(value_type==C_STRING && value_fields.count()>1)
-			throw Exception(PARSER_RUNTIME, 0, "you can't specify more then one value field with option $.type[string]");
+			throw Exception(PARSER_RUNTIME, 0, "you can't specify more than one value field with option $.type[string]");
 	}
 
 	Value* key_param=&params[0];
@@ -1007,6 +1011,30 @@ 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();
+	}
+
+	result_array.confirm_all_used();
+	r.write(result);
+}
+
 #ifndef DOXYGEN
 struct Table_seq_item : public PA_Allocated {
 	ArrayString* row;
@@ -1158,7 +1186,7 @@ static void _foreach(Request& r, MethodP
 			table.set_current(row);
 
 			if(rownum_var_name)
-				r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
+				r.put_element(*var_context, *rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN)));
 			if(value_var_name)
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
@@ -1183,7 +1211,7 @@ static void _foreach(Request& r, MethodP
 			table.set_current(row);
  
 			if(rownum_var_name)
-				r.put_element(*var_context, *rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));
+				r.put_element(*var_context, *rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN)));
 			if(value_var_name)
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
@@ -1524,7 +1552,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())
@@ -1534,7 +1562,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);
@@ -1592,6 +1620,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);