--- parser3/src/classes/array.C 2024/11/04 03:53:25 1.35 +++ parser3/src/classes/array.C 2025/05/26 00:52:15 1.38 @@ -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.38 2025/05/26 00:52:15 moko Exp $"; // class @@ -657,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){ @@ -691,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); @@ -717,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); @@ -750,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)); @@ -778,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)); @@ -842,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))); @@ -922,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){ @@ -939,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; @@ -1034,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)));