--- parser3/src/classes/table.C	2024/11/16 02:57:05	1.372
+++ parser3/src/classes/table.C	2024/12/11 15:46:38	1.378
@@ -26,7 +26,7 @@
 #include "pa_array.h"
 #include "pa_varray.h"
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.372 2024/11/16 02:57:05 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.378 2024/12/11 15:46:38 moko Exp $";
 
 // class
 
@@ -404,7 +404,7 @@ static void skip_empty_lines( char** dat
 typedef void (*Skip_lines_action)(char** data_ref);
 
 static void _load(Request& r, MethodParams& params) {
-	const String&  first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);
+	const String&  first_param=params.as_file_name(0);
 	int filename_param_index=0;
 	bool nameless=first_param=="nameless";
 	if(nameless)
@@ -417,7 +417,7 @@ static void _load(Request& r, MethodPara
 		control_chars.load(*options);
 
 	// loading text
-	char *data=file_load_text(r, r.full_disk_path(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options);
+	char *data=file_load_text(r, r.full_disk_path(params.as_file_name(filename_param_index)), true, options);
 
 	Skip_lines_action skip_lines_action = (control_chars.separator=='#' || control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;
 
@@ -624,7 +624,7 @@ static void table_to_csv(String& result,
 
 
 static void _save(Request& r, MethodParams& params) {
-	const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);
+	const String& first_arg=params.as_string(0, PARAMETER_MUST_BE_STRING);
 	size_t param_index=1;
 
 	bool do_append=false;
@@ -638,7 +638,7 @@ static void _save(Request& r, MethodPara
 	else
 		--param_index;
 
-	const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);
+	const String& file_name=params.as_file_name(param_index++);
 	String file_spec=r.full_disk_path(file_name);
 
 	if(do_append && file_exist(file_spec))
@@ -683,7 +683,7 @@ static void _csv_string(Request& r, Meth
 	bool output_column_names=true;
 	size_t param_index=0;
 	if(params.count()>0 && params[0].is_string()) {
-		if(params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE)=="nameless") {
+		if(params.as_string(0, PARAM_MUST_NOT_BE_CODE)=="nameless") {
 			output_column_names=false;
 			param_index++;
 		} else {
@@ -1001,13 +1001,71 @@ static void _hash(Request& r, MethodPara
 	};
 	info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true));
 
-	self_table.for_each(table_row_to_hash, &info);
+	Temp_current tc(self_table);
+	for(Table::RobustIterator i(self_table); i; i.next()) {
+		table_row_to_hash(i.value(), &info);
+	}
 
 	result.extract_default();
 
 	r.write(result);
 }
 
+static void _array(Request& r, MethodParams& params) {
+	Table& table=GET_SELF(r, VTable).table();
+	VArray& result=*new VArray;
+	ArrayValue& array=result.array();
+
+	Table2hash_value_type value_type=C_HASH;
+	Array<int> value_fields;
+	Value* value_code=0;
+
+	if(params.count()>0) {
+		if(params[0].get_junction()){
+			value_type=C_CODE;
+			value_code=&params[0];
+		} else if(params[0].is_string()) {
+			const String &field_name=*params[0].get_string();
+			if(!field_name.is_empty()){
+				value_type=C_STRING;
+				value_fields+=table.column_name2index(field_name, true);
+			}
+		} else {
+			throw Exception(PARSER_RUNTIME, 0, "value field must be string or code or empty");
+		}
+	}
+
+	Temp_current tc(table);
+	for(Table::RobustIterator i(table); i; i.next()) {
+		switch(value_type) {
+			case C_STRING: {
+				size_t index=value_fields.get(0);
+				Table::element_type row=i.value();
+				array+=(index < row->count() ? new VString(*row->get(index)) : VString::empty());
+				break;
+			}
+			case C_HASH: {
+				VHash* vhash=new VHash;
+				HashStringValue& hash=vhash->hash();
+				Table::element_type row=i.value();
+				Table::columns_type columns=table.columns();
+				for(size_t index=0; index<row->count(); index++) {
+					hash.put(columns && index < columns->count() ? *columns->get(index) : String(pa_uitoa(index)), new VString(*row->get(index)));
+				}
+				array+=vhash;
+				break;
+			}
+			case C_CODE: {
+				table.set_current(i.index());
+				array+=&r.process(*value_code);
+				break;
+			}
+		}
+	}
+
+	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
@@ -1509,7 +1567,7 @@ static void _select(Request& r, MethodPa
 				if(r.check_skip_break())
 					break;
 
-				if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
+				if(condition && ++appended > (size_t)offset && source_table.valid(row)) // ...condition is true, adding to the result
 					result_table+=source_table[row];
 				if(row==0) break;
 			}
@@ -1522,7 +1580,7 @@ static void _select(Request& r, MethodPa
 				if(r.check_skip_break())
 					break;
 
-				if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result
+				if(condition && ++appended > (size_t)offset && source_table.valid(row)) // ...condition is true, adding to the result
 					result_table+=source_table[row];
 			}
 		}
@@ -1614,6 +1672,11 @@ 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.array[]
+	// ^table.array[string]
+	// ^table.array{code}
+	add_native_method("array", Method::CT_DYNAMIC, _array, 0, 1);
+
 	// ^table.cells[]
 	// ^table.cells(limit)
 	add_native_method("cells", Method::CT_DYNAMIC, _cells, 0, 1);