--- parser3/src/classes/array.C 2024/10/26 00:21:02 1.24 +++ parser3/src/classes/array.C 2025/05/26 01:56:54 1.39 @@ -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 , Alexandr Petrosian */ @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.24 2024/10/26 00:21:02 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.39 2025/05/26 01:56:54 moko Exp $"; // class @@ -38,7 +38,7 @@ const char* const PARAM_INDEX = "index m // methods -static void _create_or_add(Request& r, MethodParams& params) { +static void _copy_or_add(Request& r, MethodParams& params) { if(params.count()) { Value& vsrc=params.as_no_junction(0, PARAM_ARRAY_OR_HASH); VArray& self=GET_SELF(r, VArray); @@ -53,7 +53,8 @@ static void _create_or_add(Request& r, M 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"); @@ -608,15 +609,21 @@ static void _count(Request& r, MethodPar r.write(*new VInt(array.used())); } -static void _append(Request& r, MethodParams& params) { +static void _create_or_append_or_push(Request& r, MethodParams& params) { ArrayValue& array=GET_SELF(r, VArray).array(); int count=params.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(); } @@ -646,9 +657,21 @@ static void _remove(Request& r, MethodPa array.invalidate(); } +static void _pop(Request& r, MethodParams&) { + ArrayValue& array=GET_SELF(r, VArray).array(); + Value *result=array.pop(); + if(result){ + r.write(*result); + array.change_used(-1); + } else { + r.write(*VVoid::get()); + } +} + static void _contains(Request& r, MethodParams& params) { VArray& self=GET_SELF(r, VArray); - bool result=self.contains(VArray::index(params.as_int(0, PARAM_INDEX, r))); + + bool result=self.contains(params[0].is_string() ? VArray::index(*params[0].get_string()) : VArray::index(params.as_int(0, PARAM_INDEX, r))); r.write(VBool::get(result)); } @@ -668,9 +691,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()){ + for(ArrayValue::RobustIterator i(array); i; i.next()){ if(key_var_name){ - VString* vkey=new VString(*new String(i.key(), String::L_TAINTED)); + VString* vkey=new VString(i.key()); r.put_element(caller, *key_var_name, vkey); } @@ -694,9 +717,9 @@ 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)); + VString* vkey=new VString(i.key()); r.put_element(caller, *key_var_name, vkey); } @@ -727,10 +750,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)); + VString* vkey=new VString(i.key()); r.put_element(caller, *key_var_name, vkey); } @@ -755,10 +778,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)); + VString* vkey=new VString(i.key()); r.put_element(caller, *key_var_name, vkey); } @@ -819,10 +842,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, new VString(i.key())); if(value_var) r.put_element(*context, *value_var, i.value()); @@ -856,7 +879,7 @@ static void _sort(Request& r, MethodPara for(pos=0; pos 1) { const String& stype=params.as_string(1, "type must be string"); @@ -890,44 +910,36 @@ static void _at(Request& r, MethodParams throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'"); } - Value& vwhence=params[0]; - if(vwhence.is_string()) { - const String& swhence=*vwhence.get_string(); - if(swhence == "last") - pos=count-1; - else if(swhence != "first") - throw Exception(PARSER_RUNTIME, &swhence, "whence must be 'first', 'last' or expression"); - } else { - pos=r.process(vwhence).as_int(); - if(pos < 0) - pos+=count; - } + int pos=params.as_index(0, count, r); if(count && pos >= 0 && (size_t)pos < count){ if(count == array.count()){ - switch(result_type) { +l1: switch(result_type) { case AtResultTypeKey: - r.write(*new VString(*new String(pa_uitoa(pos), String::L_TAINTED))); + r.write(*new VString(pa_uitoa(pos))); break; case AtResultTypeValue: - r.write(*array[pos]); + r.write(*array.get(pos)); break; case AtResultTypeHash: - r.write(SingleElementHash(pa_uitoa(pos), array[pos])); + r.write(SingleElementHash(String::Body::uitoa(pos), array.get(pos))); break; } + } else if((size_t)pos == count-1){ + pos=array.count()-1; + goto l1; } else { for(ArrayValue::Iterator i(array); i; i.next() ){ if(i.value() && !(pos--)){ switch(result_type) { case AtResultTypeKey: - r.write(*new VString(*new String(i.key(), String::L_TAINTED))); + r.write(*new VString(i.key())); 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; @@ -937,6 +949,33 @@ static void _at(Request& r, MethodParams } } +static void _set(Request& r, MethodParams& params) { + ArrayValue& array=GET_SELF(r, VArray).array(); + size_t count=array.used(); // not array.count() + + int pos=params.as_index(0, count, r); + + if(count && pos >= 0 && (size_t)pos < count){ + if(count == array.count()){ + array.put(pos, &r.process(params[1])); + return; + } else if((size_t)pos == count-1){ + array.put(array.count()-1, &r.process(params[1])); + return; + } else { + for(ArrayValue::Iterator i(array); i; i.next() ){ + if(i.value() && !(pos--)){ + array.put(i.index(), &r.process(params[1])); + return; + } + } + } + } + + if(count) + throw Exception(PARSER_RUNTIME, 0, "index '%d' is out of range 0..%d", pos, count-1); + throw Exception(PARSER_RUNTIME, 0, "index '%d' is out of range: array is empty", pos); +} extern String table_reverse_name; @@ -978,7 +1017,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, new VString(i.key())); if(value_var_name) r.put_element(caller, *value_var_name, value); @@ -995,10 +1034,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, new VString(i.key())); if(value_var_name) r.put_element(caller, *value_var_name, value); @@ -1044,7 +1083,9 @@ static void _compact(Request& r, MethodP compact_undef=true; } } - GET_SELF(r, VArray).array().compact(compact_undef); + ArrayValue& array=GET_SELF(r, VArray).array(); + array.compact(compact_undef); + array.confirm_all_used(); } @@ -1053,17 +1094,19 @@ static void _compact(Request& r, MethodP MArray::MArray(): Methoded(VARRAY_TYPE) { // ^array::copy[[copy_from]] - add_native_method("copy", Method::CT_DYNAMIC, _create_or_add, 0, 1); + add_native_method("copy", Method::CT_DYNAMIC, _copy_or_add, 0, 1); // ^array.add[add_from] - add_native_method("add", Method::CT_DYNAMIC, _create_or_add, 1, 1); + add_native_method("add", Method::CT_DYNAMIC, _copy_or_add, 1, 1); // ^array.join[join_from[;options]] add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2); - // ^array::create[value;value] - add_native_method("create", Method::CT_DYNAMIC, _append, 0, 10000); - // ^array.append[value;value] - add_native_method("append", Method::CT_DYNAMIC, _append, 1, 10000); - // ^array.insert[index;value...] + // ^array::create[value[;value...]] + add_native_method("create", Method::CT_DYNAMIC, _create_or_append_or_push, 0, 10000); + // ^array.append[value[;value...]] + add_native_method("append", Method::CT_DYNAMIC, _create_or_append_or_push, 1, 10000); + // ^array.push[value[;value...]] + add_native_method("push", Method::CT_DYNAMIC, _create_or_append_or_push, 1, 10000); + // ^array.insert(index)[value[;value...]] add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000); // ^array.left(n) @@ -1074,12 +1117,14 @@ 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); - // ^array.contains[index] + // ^array.contains(index) ^array.contains[index] add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1); // ^array::sql[query][options array] @@ -1110,9 +1155,13 @@ MArray::MArray(): Methoded(VARRAY_TYPE) add_native_method("compact", Method::CT_DYNAMIC, _compact, 0, 1); // ^array._at[first|last[;'key'|'value'|'hash']] - // ^array._at([-+]offset)[['key'|'value'|'hash']] + // ^array._at([-+]index)[['key'|'value'|'hash']] add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2); + // ^array.set[first|last;value] + // ^array.set([-+]index)[value] + add_native_method("set", Method::CT_DYNAMIC, _set, 2, 2); + #ifdef FEATURE_GET_ELEMENT4CALL // aliases without "_" add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1);