--- parser3/src/classes/array.C	2024/11/04 03:53:25	1.35
+++ parser3/src/classes/array.C	2025/10/05 19:41:27	1.42
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.35 2024/11/04 03:53:25 moko Exp $";
+volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.42 2025/10/05 19:41:27 moko Exp $";
 
 // class
 
@@ -452,34 +452,26 @@ static void _sql(Request& r, MethodParam
 	Table2hash_value_type value_type=C_HASH;
 	if(params.count()>1)
 		if(HashStringValue* options=params.as_hash(1, "sql options")) {
-			int valid_options=0;
 			bool distinct_specified=false;
 			for(HashStringValue::Iterator i(*options); i; i.next() ){
 				String::Body key=i.key();
 				Value* value=i.value();
 				if(key == sql_bind_name) {
 					bind=value->get_hash();
-					valid_options++;
 				} else if(key == sql_limit_name) {
 					limit=(ulong)r.process(*value).as_double();
-					valid_options++;
 				} else if(key == sql_offset_name) {
 					offset=(ulong)r.process(*value).as_double();
-					valid_options++;
 				} else if (key == sql_distinct_name) {
 					distinct=r.process(*value).as_bool();
 					distinct_specified=true;
-					valid_options++;
 				} else if (key == sql_value_type_name) {
 					value_type=get_value_type(r.process(*value));
-					valid_options++;
 				} else if (key == "sparse") {
 					sparse=r.process(*value).as_bool();
-					valid_options++;
-				}
+				} else
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			}
-			if(valid_options!=options->count())
-				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			if(distinct_specified && !sparse)
 				throw Exception(PARSER_RUNTIME, 0, "'distinct' option can only be used when $.sparse(true) is specified");
 		}
@@ -588,7 +580,7 @@ static void _keys(Request& r, MethodPara
 	for(ArrayValue::Iterator i(array); i; i.next()){
 		if(i.value()){
 			Table::element_type row(new ArrayString(1));
-			*row+=new String(i.key(), String::L_TAINTED);
+			*row+=new String(pa_uitoa(i.index()));
 			*table+=row;
 		}
 	}
@@ -657,7 +649,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){
@@ -691,12 +683,9 @@ static void _for(Request& r, MethodParam
 
 	if(delim_maybe_code){ // delimiter set
 		bool need_delim=false;
-		for(ArrayValue::Iterator 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);
-			}
-
+		for(ArrayValue::RobustIterator i(array); i; i.next()){
+			if(key_var_name)
+				r.put_element(caller, *key_var_name, VString::uitoa(i.index()));
 			if(value_var_name)
 				r.put_element(caller, *value_var_name, i.value() ? i.value() : VVoid::get());
 
@@ -717,12 +706,9 @@ static void _for(Request& r, MethodParam
 				break;
 		}
 	} else {
-		for(ArrayValue::Iterator 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);
-			}
-
+		for(ArrayValue::RobustIterator i(array); i; i.next()){
+			if(key_var_name)
+				r.put_element(caller, *key_var_name, VString::uitoa(i.index()));
 			if(value_var_name)
 				r.put_element(caller, *value_var_name, i.value() ? i.value() : VVoid::get());
 
@@ -750,13 +736,10 @@ 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));
-					r.put_element(caller, *key_var_name, vkey);
-				}
-
+				if(key_var_name)
+					r.put_element(caller, *key_var_name, VString::uitoa(i.index()));
 				if(value_var_name)
 					r.put_element(caller, *value_var_name, i.value());
 
@@ -778,13 +761,10 @@ 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));
-					r.put_element(caller, *key_var_name, vkey);
-				}
-
+				if(key_var_name)
+					r.put_element(caller, *key_var_name, VString::uitoa(i.index()));
 				if(value_var_name)
 					r.put_element(caller, *value_var_name, i.value());
 
@@ -842,10 +822,10 @@ 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)));
+				r.put_element(*context, *key_var, VString::uitoa(i.index()));
 			if(value_var)
 				r.put_element(*context, *value_var, i.value());
 
@@ -916,13 +896,13 @@ static void _at(Request& r, MethodParams
 		if(count == array.count()){
 l1:			switch(result_type) {
 				case AtResultTypeKey:
-					r.write(*new VString(*new String(pa_uitoa(pos), String::L_TAINTED)));
+					r.write(*VString::uitoa(pos));
 					break;
 				case AtResultTypeValue:
 					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){
@@ -933,13 +913,13 @@ l1:			switch(result_type) {
 				if(i.value() && !(pos--)){
 					switch(result_type) {
 						case AtResultTypeKey:
-							r.write(*new VString(*new String(i.key(), String::L_TAINTED)));
+							r.write(*VString::uitoa(i.index()));
 							break;
 						case AtResultTypeValue:
 							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;
@@ -1017,7 +997,7 @@ static void _select(Request& r, MethodPa
 			for(ArrayValue::ReverseIterator i(source_array); i; ){
 				if(Value *value=i.prev()){ // here for correct i.key()
 					if(key_var_name)
-						r.put_element(caller, *key_var_name, new VString(*new String(i.key(), String::L_TAINTED)));
+						r.put_element(caller, *key_var_name, VString::uitoa(i.index()));
 					if(value_var_name)
 						r.put_element(caller, *value_var_name, value);
 
@@ -1034,10 +1014,10 @@ 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)));
+						r.put_element(caller, *key_var_name, VString::uitoa(i.index()));
 					if(value_var_name)
 						r.put_element(caller, *value_var_name, value);