--- parser3/src/classes/array.C 2024/09/28 14:15:13 1.11 +++ parser3/src/classes/array.C 2024/10/28 00:33:41 1.32 @@ -17,7 +17,7 @@ #include "pa_vbool.h" #include "pa_vmethod_frame.h" -volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.11 2024/09/28 14:15:13 moko Exp $"; +volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.32 2024/10/28 00:33:41 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); @@ -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 @@ -150,7 +157,7 @@ class SparseArray_sql_event_handlers: pu ArrayValue& result; Value* row_value; int column_index; - ArrayString& columns; + ArrayString* columns; bool one_bool_column; Table2hash_value_type value_type; int columns_count; @@ -162,7 +169,7 @@ public: result(aresult), row_value(0), column_index(0), - columns(*new ArrayString), + columns(new ArrayString), one_bool_column(false), value_type(avalue_type), empty(0) { @@ -170,7 +177,12 @@ public: bool add_column(SQL_Error& error, const char* str, size_t ) { try { - columns+=&STRING(str); + if(columns_count){ + // another query in multi_statements mode + columns=new ArrayString; + columns_count=0; + } + *columns+=&STRING(str); return false; } catch(...) { error=SQL_Error("exception occurred in Hash_sql_event_handlers::add_column"); @@ -179,25 +191,25 @@ public: } bool before_rows(SQL_Error& error) { - if(columns.count()<1) { + columns_count=columns->count(); + if(columns_count<1) { error=SQL_Error("no columns"); return true; } - if(columns.count()==1) { + if(columns_count==1) { one_bool_column=true; } else { switch(value_type){ case C_STRING: { - if(columns.count()>2){ - error=SQL_Error("only 2 columns allowed for $.type[string] and $.sparse(true)."); + if(columns_count>2){ + error=SQL_Error("only 2 columns allowed for $.type[string] and $.sparse(true)"); return true; } break; } case C_TABLE: { // create empty table which we'll copy later - empty=new Table(&columns); - columns_count=columns.count(); + empty=new Table(columns); break; } } @@ -212,6 +224,12 @@ public: bool add_row_cell(SQL_Error& error, const char *str, size_t ) { try { + if(column_index==columns_count){ + // should never happen, buggy driver case + error=SQL_Error("columns index exceed the columns count"); + return true; + } + bool duplicate=false; if(one_bool_column) { size_t index=str ? pa_atoui(str) : 0; @@ -248,6 +266,7 @@ public: ArrayString* row=new ArrayString(columns_count); *row+=&STRING(str); *vtable->get_table()+=row; + row_value=(Value*)row; break; } } @@ -255,7 +274,7 @@ public: const String& cell=STRING(str); switch(value_type) { case C_HASH: { - row_value->get_hash()->put(*columns[column_index], new VString(cell)); + row_value->get_hash()->put(*columns->get(column_index), new VString(cell)); break; } case C_STRING: { @@ -292,7 +311,7 @@ class Array_sql_event_handlers: public S ArrayValue& result; Value* row_value; int column_index; - ArrayString& columns; + ArrayString* columns; Table2hash_value_type value_type; int columns_count; public: @@ -302,14 +321,19 @@ public: result(aresult), row_value(0), column_index(0), - columns(*new ArrayString), + columns(new ArrayString), value_type(avalue_type), empty(0) { } bool add_column(SQL_Error& error, const char* str, size_t ) { try { - columns+=&STRING(str); + if(columns_count){ + // another query in multi_statements mode + columns=new ArrayString; + columns_count=0; + } + *columns+=&STRING(str); return false; } catch(...) { error=SQL_Error("exception occurred in Hash_sql_event_handlers::add_column"); @@ -318,22 +342,22 @@ public: } bool before_rows(SQL_Error& error) { - if(columns.count()<1) { + columns_count=columns->count(); + if(columns_count<1) { error=SQL_Error("no columns"); return true; } switch(value_type){ case C_STRING: { - if(columns.count()>1){ - error=SQL_Error("only one column allowed for $.type[string]."); + if(columns_count>1){ + error=SQL_Error("only one column allowed for $.type[string]"); return true; } break; } case C_TABLE: { // create empty table which we'll copy later - empty=new Table(&columns); - columns_count=columns.count(); + empty=new Table(columns); break; } } @@ -347,6 +371,12 @@ public: bool add_row_cell(SQL_Error& error, const char *str, size_t ) { try { + if(column_index==columns_count){ + // should never happen, buggy driver case + error=SQL_Error("columns index exceed the columns count"); + return true; + } + if(column_index==0) { switch(value_type){ case C_HASH: { @@ -365,10 +395,10 @@ public: // creating table of same structure as source Table::Action_options table_options(0, 0); VTable* vtable=new VTable(new Table(*empty, table_options/*no rows, just structure*/)); - result+=vtable; - ArrayString* row=new ArrayString(columns_count); *vtable->get_table()+=row; + row_value=(Value*)row; + result+=vtable; break; } } @@ -377,7 +407,7 @@ public: const String& cell=STRING(str); switch(value_type) { case C_HASH: { - row_value->get_hash()->put(*columns[column_index], new VString(cell)); + row_value->get_hash()->put(*columns->get(column_index), new VString(cell)); break; } case C_STRING: { @@ -422,6 +452,7 @@ static void _sql(Request& r, MethodParam 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(); @@ -436,17 +467,20 @@ static void _sql(Request& r, MethodParam 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) { - sparse=r.process(*value).as_bool(); + value_type=get_value_type(r.process(*value)); valid_options++; } else if (key == "sparse") { - value_type=get_value_type(r.process(*value)); + sparse=r.process(*value).as_bool(); valid_options++; } } 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"); } SQL_Driver::Placeholder* placeholders=0; @@ -458,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); - - self.array().clear(); self.invalidate(); // just in case if called as method + ArrayValue& array=self.array(); + + 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){ @@ -491,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); @@ -507,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) @@ -573,49 +608,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& params) { + 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)); } @@ -823,6 +878,7 @@ static void _sort(Request& r, MethodPara for(pos=0; pos 1) { const String& stype=params.as_string(1, "type must be string"); @@ -856,53 +909,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--)){ + if(count == array.count()){ +l1: switch(result_type) { + case AtResultTypeKey: + r.write(*new VString(*new String(pa_uitoa(pos), String::L_TAINTED))); + break; + case AtResultTypeValue: + r.write(*array.get(pos)); + break; + case AtResultTypeHash: + r.write(SingleElementHash(pa_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))); 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; } + } } } } +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; @@ -983,10 +1055,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()); @@ -999,18 +1072,42 @@ 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::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, _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, _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) add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1); // ^array.right(n) @@ -1019,19 +1116,14 @@ 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] + // ^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] @@ -1058,14 +1150,21 @@ 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); - 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