--- parser3/src/classes/hash.C	2024/12/23 18:30:55	1.169
+++ parser3/src/classes/hash.C	2025/05/26 00:52:15	1.171
@@ -18,7 +18,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.169 2024/12/23 18:30:55 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.171 2025/05/26 00:52:15 moko Exp $";
 
 // class
 
@@ -201,7 +201,7 @@ static void _create_or_add(Request& r, M
 		if(VArray* src=dynamic_cast<VArray*>(&vsrc)) {
 			for(ArrayValue::Iterator i(src->array()); i; i.next()){
 				if(i.value())
-					self_hash->put(i.key(), i.value());
+					self_hash->put(String::Body::uitoa(i.index()), i.value());
 			}
 			return;
 		} else if(VHashBase* src=dynamic_cast<VHashBase*>(&vsrc)) {
@@ -805,6 +805,35 @@ static void _rename(Request& r, MethodPa
 }
 
 
+static void _array(Request& r, MethodParams& params) {
+	HashStringValue& hash=GET_SELF(r, VHashBase).hash();
+
+	VArray& result=*new VArray;
+	ArrayValue& array=result.array();
+
+	if(params.count() > 0) {
+		const String& smode=params.as_string(0, "mode must be string");
+		if(smode == "keys"){
+			for(HashStringValue::Iterator i(hash); i; i.next()){
+				array+=new VString(*new String(i.key(), String::L_TAINTED));
+			}
+		} else if(smode == "values"){
+			for(HashStringValue::Iterator i(hash); i; i.next()){
+				array+=i.value();
+			}
+		} else {
+			throw Exception(PARSER_RUNTIME, &smode, "mode must be 'keys' or 'values'");
+		}
+	} else {
+		for(HashStringValue::Iterator i(hash); i; i.next()){
+			array.put(VArray::index(i.key()), i.value());
+		}
+	}
+
+	r.write(result);
+}
+
+
 // constructor
 
 MHash::MHash(): Methoded("hash") 
@@ -864,6 +893,9 @@ MHash::MHash(): Methoded("hash")
 	// ^hash.rename[ $.from[to] ... ]
 	add_native_method("rename", Method::CT_DYNAMIC, _rename, 1, 2);
 
+	// ^hash.array[[keys|values]]
+	add_native_method("array", Method::CT_DYNAMIC, _array, 0, 1);
+
 #ifdef FEATURE_GET_ELEMENT4CALL
 	// aliases without "_"
 	add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1);