--- parser3/src/classes/array.C 2024/10/27 12:24:49 1.27 +++ parser3/src/classes/array.C 2024/10/27 13:53:08 1.29 @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.27 2024/10/27 12:24:49 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.29 2024/10/27 13:53:08 moko Exp $"; // class @@ -614,9 +614,10 @@ static void _create_or_append_or_push(Re int count=params.count(); if(array.count()){ - for(int i=0; i0) - array.clear(VArray::index(params.as_int(0, PARAM_INDEX, r))); - else + if(params.count()>0) { + if(params[0].is_string()) { + array.clear(VArray::index(*params[0].get_string())); + } else { + array.clear(VArray::index(params.as_int(0, PARAM_INDEX, r))); + } + } else array.clear(); array.invalidate(); } @@ -656,10 +661,10 @@ static void _pop(Request& r, MethodParam Value *result=array.pop(); if(result){ r.write(*result); + array.change_used(-1); } else { r.write(*VVoid::get()); } - array.invalidate(); } static void _contains(Request& r, MethodParams& params) { @@ -1093,9 +1098,9 @@ MArray::MArray(): Methoded(VARRAY_TYPE) // ^array.mid(p;n) add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2); - // ^array.delete[index] + // ^array.delete(index) or ^array.delete[index] add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1); - // ^array.remove[index] + // ^array.remove(index) add_native_method("remove", Method::CT_DYNAMIC, _remove, 1, 1); // ^array.pop[] add_native_method("pop", Method::CT_DYNAMIC, _pop, 0, 0);