--- parser3/src/classes/array.C 2024/10/27 13:22:13 1.28 +++ parser3/src/classes/array.C 2025/10/05 19:41:27 1.42 @@ -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.28 2024/10/27 13:22:13 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.42 2025/10/05 19:41:27 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"); @@ -451,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"); } @@ -587,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; } } @@ -639,9 +632,13 @@ static void _insert(Request& r, MethodPa static void _delete(Request& r, MethodParams& params) { ArrayValue& array=GET_SELF(r, VArray).array(); - if(params.count()>0) - 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(); } @@ -652,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){ @@ -665,7 +662,8 @@ static void _pop(Request& r, MethodParam 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)); } @@ -685,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()); @@ -711,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()); @@ -744,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()); @@ -772,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()); @@ -836,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()); @@ -893,8 +879,6 @@ static void _at(Request& r, MethodParams ArrayValue& array=GET_SELF(r, VArray).array(); size_t count=array.used(); // not array.count() - int pos=0; - AtResultType result_type=AtResultTypeValue; if(params.count() > 1) { const String& stype=params.as_string(1, "type must be string"); @@ -906,44 +890,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(*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){ + 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(*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; @@ -953,6 +929,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; @@ -994,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); @@ -1011,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); @@ -1083,7 +1086,7 @@ MArray::MArray(): Methoded(VARRAY_TYPE) 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...]] + // ^array.insert(index)[value[;value...]] add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000); // ^array.left(n) @@ -1094,14 +1097,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] @@ -1132,9 +1135,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);