--- parser3/src/classes/array.C	2024/10/28 00:18:25	1.31
+++ parser3/src/classes/array.C	2025/05/26 00:52:15	1.38
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b array 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>
 */
 
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.31 2024/10/28 00:18:25 moko Exp $";
+volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.38 2025/05/26 00:52:15 moko Exp $";
 
 // class
 
@@ -53,7 +53,8 @@ static void _copy_or_add(Request& r, Met
 						self_array.put(i.index(), i.value());
 				}
 			} else {
-				self_array.append(src->array());
+				self_array.copy(src->array());
+				return;
 			}
 		} else {
 			HashStringValue* src_hash=vsrc.as_hash("param must be array or");
@@ -656,7 +657,7 @@ static void _remove(Request& r, MethodPa
 	array.invalidate();
 }
 
-static void _pop(Request& r, MethodParams& params) {
+static void _pop(Request& r, MethodParams&) {
 	ArrayValue& array=GET_SELF(r, VArray).array();
 	Value *result=array.pop();
 	if(result){
@@ -690,7 +691,7 @@ static void _for(Request& r, MethodParam
 
 	if(delim_maybe_code){ // delimiter set
 		bool need_delim=false;
-		for(ArrayValue::Iterator i(array); i; i.next()){
+		for(ArrayValue::RobustIterator i(array); i; i.next()){
 			if(key_var_name){
 				VString* vkey=new VString(*new String(i.key(), String::L_TAINTED));
 				r.put_element(caller, *key_var_name, vkey);
@@ -716,7 +717,7 @@ static void _for(Request& r, MethodParam
 				break;
 		}
 	} else {
-		for(ArrayValue::Iterator i(array); i; i.next()){
+		for(ArrayValue::RobustIterator i(array); i; i.next()){
 			if(key_var_name){
 				VString* vkey=new VString(*new String(i.key(), String::L_TAINTED));
 				r.put_element(caller, *key_var_name, vkey);
@@ -749,7 +750,7 @@ static void _foreach(Request& r, MethodP
 
 	if(delim_maybe_code){ // delimiter set
 		bool need_delim=false;
-		for(ArrayValue::Iterator i(array); i; i.next()){
+		for(ArrayValue::RobustIterator i(array); i; i.next()){
 			if(i.value()){
 				if(key_var_name){
 					VString* vkey=new VString(*new String(i.key(), String::L_TAINTED));
@@ -777,7 +778,7 @@ static void _foreach(Request& r, MethodP
 			}
 		}
 	} else {
-		for(ArrayValue::Iterator i(array); i; i.next()){
+		for(ArrayValue::RobustIterator i(array); i; i.next()){
 			if(i.value()){
 				if(key_var_name){
 					VString* vkey=new VString(*new String(i.key(), String::L_TAINTED));
@@ -841,7 +842,7 @@ static void _sort(Request& r, MethodPara
 	int pos=0;
 	bool key_values_are_strings=true;
 
-	for(ArrayValue::Iterator i(array); i; i.next() ){
+	for(ArrayValue::RobustIterator i(array); i; i.next() ){
 		if(i.value()){
 			if(key_var)
 				r.put_element(*context, *key_var, new VString(*new String(i.key(), String::L_TAINTED)));
@@ -921,7 +922,7 @@ l1:			switch(result_type) {
 					r.write(*array.get(pos));
 					break;
 				case AtResultTypeHash:
-					r.write(SingleElementHash(pa_uitoa(pos), array.get(pos)));
+					r.write(SingleElementHash(String::Body::uitoa(pos), array.get(pos)));
 					break;
 			}
 		} else if((size_t)pos == count-1){
@@ -938,7 +939,7 @@ l1:			switch(result_type) {
 							r.write(*i.value());
 							break;
 						case AtResultTypeHash:
-							r.write(SingleElementHash(i.key(), i.value()));
+							r.write(SingleElementHash(String::Body::uitoa(i.index()), i.value()));
 							break;
 					}
 					break;
@@ -964,7 +965,7 @@ static void _set(Request& r, MethodParam
 		} else {
 			for(ArrayValue::Iterator i(array); i; i.next() ){
 				if(i.value() && !(pos--)){
-					array.put(pos, &r.process(params[1]));
+					array.put(i.index(), &r.process(params[1]));
 					return;
 				}
 			}
@@ -1033,7 +1034,7 @@ static void _select(Request& r, MethodPa
 				}
 			}
 		} else {
-			for(ArrayValue::Iterator i(source_array); i; i.next() ){
+			for(ArrayValue::RobustIterator i(source_array); i; i.next() ){
 				if(Value *value=i.value()){
 					if(key_var_name)
 						r.put_element(caller, *key_var_name, new VString(*new String(i.key(), String::L_TAINTED)));