--- parser3/src/classes/array.C 2024/09/30 19:03:53 1.13 +++ parser3/src/classes/array.C 2024/10/23 23:53:06 1.23 @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.13 2024/09/30 19:03:53 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.23 2024/10/23 23:53:06 moko Exp $"; // class @@ -46,17 +46,24 @@ static void _create_or_add(Request& r, M if(VArray* src=dynamic_cast(&vsrc)) { if(src==&self) - throw Exception(PARSER_RUNTIME, 0, "source and destination are the same array"); - self_array.append(src->array()); + return; + if(self_array.count()){ + for(ArrayValue::Iterator i(src->array()); i; i.next()){ + if(i.value()) + self_array.put(i.index(), i.value()); + } + } else { + self_array.append(src->array()); + } } else { - HashStringValue* src_hash=vsrc.get_hash(); + HashStringValue* src_hash=vsrc.as_hash("param must be array or"); if(!src_hash) return; for(HashStringValue::Iterator i(*src_hash); i; i.next()){ self_array.put(VArray::index(i.key()), i.value()); } } - self.invalidate(); + self_array.invalidate(); } } @@ -119,7 +126,7 @@ static void _join(Request& r, MethodPara } } } else { - HashStringValue* src_hash=vsrc.get_hash(); + HashStringValue* src_hash=vsrc.as_hash("param must be array or"); if(!src_hash) return; if(o.defined){ @@ -138,7 +145,7 @@ static void _join(Request& r, MethodPara } } } - self.invalidate(); + self_array.invalidate(); } #ifndef DOXYGEN @@ -485,23 +492,27 @@ static void _sql(Request& r, MethodParam const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection()); VArray& self=GET_SELF(r, VArray); + ArrayValue& array=self.array(); - self.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, self.array(), value_type); + SparseArray_sql_event_handlers handlers(distinct, array, value_type); r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string); } else { - Array_sql_event_handlers handlers(self.array(), value_type); + Array_sql_event_handlers handlers(array, value_type); r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string); } + array.confirm_all_used(); + if(bind) unmarshal_bind_updates(*bind, placeholders_count, placeholders); } - static void mid(Request& r, size_t offset=0, size_t limit=ARRAY_OPTION_LIMIT_ALL) { ArrayValue& array=GET_SELF(r, VArray).array(); if(limit>0){ @@ -518,6 +529,7 @@ static void mid(Request& r, size_t offse result_array+=i.value(); } } + result_array.confirm_all_used(); r.write(*result); } else { r.write(*new VArray); @@ -534,7 +546,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) @@ -601,20 +609,18 @@ static void _count(Request& r, MethodPar } static void _append(Request& r, MethodParams& params) { - VArray& self=GET_SELF(r, VArray); - ArrayValue& array=self.array(); + 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))); + array.clear(VArray::index(params.as_int(0, PARAM_INDEX, r))); else - self.array().clear(); - self.invalidate(); + 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 _contains(Request& r, MethodParams& params) { @@ -850,6 +856,7 @@ static void _sort(Request& r, MethodPara for(pos=0; pos= 0 && (size_t)pos < count){ - switch(result_type) { - case AtResultTypeKey: - { - for(ArrayValue::Iterator i(array); i; i.next() ){ - if(i.value() && !(pos--)){ + if(count == array.count()){ + switch(result_type) { + case AtResultTypeKey: + r.write(*new VString(*new String(pa_uitoa(pos), String::L_TAINTED))); + break; + case AtResultTypeValue: + r.write(*array[pos]); + break; + case AtResultTypeHash: + r.write(SingleElementHash(pa_uitoa(pos), array[pos])); + break; + } + } 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))); break; - } - } - break; - } - case AtResultTypeValue: - { - for(ArrayValue::Iterator i(array); i; i.next() ) - if(i.value() &&!(pos--)){ + case AtResultTypeValue: r.write(*i.value()); break; - } - break; - } - case AtResultTypeHash: - { - for(ArrayValue::Iterator i(array); i; i.next() ) - if(i.value() &&!(pos--)){ + case AtResultTypeHash: r.write(SingleElementHash(i.key(), i.value())); break; - } + } break; } + } } } } @@ -1010,10 +1017,11 @@ static void _select(Request& r, MethodPa } } + result_array.confirm_all_used(); 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()); @@ -1026,18 +1034,29 @@ static void _reverse(Request& r, MethodP r.write(result); } +static void _compact(Request& r, MethodParams&) { + GET_SELF(r, VArray).array().compact(); +} + // constructor MArray::MArray(): Methoded(VARRAY_TYPE) { - // ^array::create[[copy_from]] - add_native_method("create", Method::CT_DYNAMIC, _create_or_add, 0, 1); + // ^array::copy[[copy_from]] + add_native_method("copy", Method::CT_DYNAMIC, _create_or_add, 0, 1); // ^array.add[add_from] add_native_method("add", Method::CT_DYNAMIC, _create_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...] + add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000); + // ^array.left(n) add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1); // ^array.right(n) @@ -1046,13 +1065,6 @@ MArray::MArray(): Methoded(VARRAY_TYPE) // ^array.mid(p;n) add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2); - // ^array::new[value;value] - add_native_method("new", Method::CT_DYNAMIC, _append, 0, 10000); - // ^array.append[value;value] - add_native_method("append", Method::CT_DYNAMIC, _append, 1, 10000); - // ^array.insert[index;value...] - add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000); - // ^array.delete[index] add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1); // ^array.remove[index] @@ -1085,6 +1097,9 @@ MArray::MArray(): Methoded(VARRAY_TYPE) // ^array.reverse[] add_native_method("reverse", Method::CT_DYNAMIC, _reverse, 0, 0); + // ^array.compact[] + add_native_method("compact", Method::CT_DYNAMIC, _compact, 0, 0); + // ^array._at[first|last[;'key'|'value'|'hash']] // ^array._at([-+]offset)[['key'|'value'|'hash']] add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2); @@ -1092,7 +1107,7 @@ MArray::MArray(): Methoded(VARRAY_TYPE) #ifdef FEATURE_GET_ELEMENT4CALL // aliases without "_" add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1); - add_native_method("count", Method::CT_DYNAMIC, _count, 0, 0); + add_native_method("count", Method::CT_DYNAMIC, _count, 0, 1); add_native_method("at", Method::CT_DYNAMIC, _at, 1, 2); #endif