--- parser3/src/classes/array.C 2024/10/17 22:24:44 1.18 +++ parser3/src/classes/array.C 2026/04/25 13:38:46 1.43 @@ -1,7 +1,7 @@ /** @file Parser: @b array parser class. - Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://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.18 2024/10/17 22:24:44 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.43 2026/04/25 13:38:46 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"); @@ -63,7 +64,7 @@ static void _create_or_add(Request& r, M self_array.put(VArray::index(i.key()), i.value()); } } - self.invalidate(); + self_array.invalidate(); } } @@ -145,7 +146,7 @@ static void _join(Request& r, MethodPara } } } - self.invalidate(); + self_array.invalidate(); } #ifndef DOXYGEN @@ -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"); } @@ -494,7 +487,9 @@ static void _sql(Request& r, MethodParam VArray& self=GET_SELF(r, VArray); ArrayValue& array=self.array(); - array.clear(); self.invalidate(); // just in case if called as method + if(array.count()){ + array.clear(); array.invalidate(); // just in case if called as method + } if(sparse){ SparseArray_sql_event_handlers handlers(distinct, array, value_type); @@ -544,7 +539,7 @@ static void _right(Request& r, MethodPar if(sn>0){ size_t used=GET_SELF(r, VArray).array().used(); - if(sn=0", begin); - size_t end; - size_t length=0; - if(params.count()>1) { int n=params.as_int(1, "n must be int", r); if(n<0) @@ -589,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; } } @@ -610,49 +601,69 @@ static void _count(Request& r, MethodPar r.write(*new VInt(array.used())); } -static void _append(Request& r, MethodParams& params) { - VArray& self=GET_SELF(r, VArray); - ArrayValue& array=self.array(); +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) - self.array().clear(VArray::index(params.as_int(0, PARAM_INDEX, r))); - else - self.array().clear(); - self.invalidate(); + ArrayValue& array=GET_SELF(r, VArray).array(); + 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(); } static void _remove(Request& r, MethodParams& params) { - VArray& self=GET_SELF(r, VArray); - self.array().remove(VArray::index(params.as_int(0, PARAM_INDEX, r))); - self.invalidate(); + ArrayValue& array=GET_SELF(r, VArray).array(); + array.remove(VArray::index(params.as_int(0, PARAM_INDEX, r))); + 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)); } @@ -672,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()); @@ -698,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()); @@ -731,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()); @@ -759,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()); @@ -823,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()); @@ -860,7 +859,7 @@ static void _sort(Request& r, MethodPara for(pos=0; pos 1) { const String& stype=params.as_string(1, "type must be string"); @@ -894,53 +890,72 @@ 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){ - switch(result_type) { - case AtResultTypeKey: - { - for(ArrayValue::Iterator i(array); i; i.next() ){ - if(i.value() && !(pos--)){ - r.write(*new VString(*new String(i.key(), String::L_TAINTED))); - break; - } - } + if(count == array.count()){ +l1: switch(result_type) { + case AtResultTypeKey: + r.write(*VString::uitoa(pos)); break; - } - case AtResultTypeValue: - { - for(ArrayValue::Iterator i(array); i; i.next() ) - if(i.value() &&!(pos--)){ + case AtResultTypeValue: + r.write(*array.get(pos)); + break; + case AtResultTypeHash: + 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(*VString::uitoa(i.index())); + break; + case AtResultTypeValue: r.write(*i.value()); break; - } - break; - } - case AtResultTypeHash: - { - for(ArrayValue::Iterator i(array); i; i.next() ) - if(i.value() &&!(pos--)){ - r.write(SingleElementHash(i.key(), i.value())); + case AtResultTypeHash: + r.write(SingleElementHash(String::Body::uitoa(i.index()), i.value())); break; - } + } break; } + } } } } +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; @@ -982,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); @@ -999,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); @@ -1025,7 +1040,7 @@ static void _select(Request& r, MethodPa r.write(*result); } -static void _reverse(Request& r, MethodParams& params) { +static void _reverse(Request& r, MethodParams&) { ArrayValue& source_array=GET_SELF(r, VArray).array(); VArray& result=*new VArray(source_array.count()); @@ -1038,23 +1053,40 @@ static void _reverse(Request& r, MethodP r.write(result); } +static void _compact(Request& r, MethodParams& params) { + bool compact_undef=false; + if(params.count()>0){ + const String& what=params.as_string(0, PARAMETER_MUST_BE_STRING); + if(!what.is_empty()){ + if(what != "undef") + throw Exception(PARSER_RUNTIME, &what, "param must be empty or 'undef'"); + compact_undef=true; + } + } + ArrayValue& array=GET_SELF(r, VArray).array(); + array.compact(compact_undef); + array.confirm_all_used(); +} + // constructor 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) @@ -1065,12 +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] @@ -1097,10 +1131,17 @@ MArray::MArray(): Methoded(VARRAY_TYPE) // ^array.reverse[] add_native_method("reverse", Method::CT_DYNAMIC, _reverse, 0, 0); + // ^array.compact[[undef]] + 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);