parser3/src/classes/array.C - diff

Return to array.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/array.C between versions 1.13 and 1.26

version 1.13, 2024/09/30 19:03:53	version 1.26, 2024/10/26 18:53:36
Line 38 const char* const PARAM_INDEX = "index m	Line 38 const char* const PARAM_INDEX = "index m

// methods	// methods

static void _create_or_add(Request& r, MethodParams& params) {	static void _copy_or_add(Request& r, MethodParams& params) {
if(params.count()) {	if(params.count()) {
Value& vsrc=params.as_no_junction(0, PARAM_ARRAY_OR_HASH);	Value& vsrc=params.as_no_junction(0, PARAM_ARRAY_OR_HASH);
VArray& self=GET_SELF(r, VArray);	VArray& self=GET_SELF(r, VArray);
Line 46 static void _create_or_add(Request& r, M	Line 46 static void _create_or_add(Request& r, M

if(VArray* src=dynamic_cast<VArray*>(&vsrc)) {	if(VArray* src=dynamic_cast<VArray*>(&vsrc)) {
if(src==&self)	if(src==&self)
throw Exception(PARSER_RUNTIME, 0, "source and destination are the same array");	return;
self_array.append(src->array());	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 {	} else {
HashStringValue* src_hash=vsrc.get_hash();	HashStringValue* src_hash=vsrc.as_hash("param must be array or");
if(!src_hash)	if(!src_hash)
return;	return;
for(HashStringValue::Iterator i(*src_hash); i; i.next()){	for(HashStringValue::Iterator i(*src_hash); i; i.next()){
self_array.put(VArray::index(i.key()), i.value());	self_array.put(VArray::index(i.key()), i.value());
}	}
}	}
self.invalidate();	self_array.invalidate();
}	}
}	}

Line 119 static void _join(Request& r, MethodPara	Line 126 static void _join(Request& r, MethodPara
}	}
}	}
} else {	} else {
HashStringValue* src_hash=vsrc.get_hash();	HashStringValue* src_hash=vsrc.as_hash("param must be array or");
if(!src_hash)	if(!src_hash)
return;	return;
if(o.defined){	if(o.defined){
Line 138 static void _join(Request& r, MethodPara	Line 145 static void _join(Request& r, MethodPara
}	}
}	}
}	}
self.invalidate();	self_array.invalidate();
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
Line 485 static void _sql(Request& r, MethodParam	Line 492 static void _sql(Request& r, MethodParam
const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());

VArray& self=GET_SELF(r, VArray);	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){	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);	r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string);
} else {	} 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);	r.connection()->query(statement_cstr, placeholders_count, placeholders, offset, limit, handlers, statement_string);
}	}

	array.confirm_all_used();

if(bind)	if(bind)
unmarshal_bind_updates(*bind, placeholders_count, placeholders);	unmarshal_bind_updates(*bind, placeholders_count, placeholders);
}	}



static void mid(Request& r, size_t offset=0, size_t limit=ARRAY_OPTION_LIMIT_ALL) {	static void mid(Request& r, size_t offset=0, size_t limit=ARRAY_OPTION_LIMIT_ALL) {
ArrayValue& array=GET_SELF(r, VArray).array();	ArrayValue& array=GET_SELF(r, VArray).array();
if(limit>0){	if(limit>0){
Line 518 static void mid(Request& r, size_t offse	Line 529 static void mid(Request& r, size_t offse
result_array+=i.value();	result_array+=i.value();
}	}
}	}
	result_array.confirm_all_used();
r.write(*result);	r.write(*result);
} else {	} else {
r.write(*new VArray);	r.write(*new VArray);
Line 534 static void _right(Request& r, MethodPar	Line 546 static void _right(Request& r, MethodPar

if(sn>0){	if(sn>0){
size_t used=GET_SELF(r, VArray).array().used();	size_t used=GET_SELF(r, VArray).array().used();
if(sn<used){	if((size_t)sn<used){
mid(r, used-sn, sn);	mid(r, used-sn, sn);
} else {	} else {
mid(r);	mid(r);
Line 545 static void _right(Request& r, MethodPar	Line 557 static void _right(Request& r, MethodPar
}	}

static void _mid(Request& r, MethodParams& params) {	static void _mid(Request& r, MethodParams& params) {
const String& string=GET_SELF(r, VString).string();

int begin=params.as_int(0, "p must be int", r);	int begin=params.as_int(0, "p must be int", r);

if(begin<0)	if(begin<0)
throw Exception(PARSER_RUNTIME, 0, "p(%d) must be >=0", begin);	throw Exception(PARSER_RUNTIME, 0, "p(%d) must be >=0", begin);

size_t end;
size_t length=0;

if(params.count()>1) {	if(params.count()>1) {
int n=params.as_int(1, "n must be int", r);	int n=params.as_int(1, "n must be int", r);
if(n<0)	if(n<0)
Line 600 static void _count(Request& r, MethodPar	Line 608 static void _count(Request& r, MethodPar
r.write(*new VInt(array.used()));	r.write(*new VInt(array.used()));
}	}

static void _append(Request& r, MethodParams& params) {	static void _create_or_append(Request& r, MethodParams& params) {
VArray& self=GET_SELF(r, VArray);	ArrayValue& array=GET_SELF(r, VArray).array();
ArrayValue& array=self.array();

int count=params.count();	int count=params.count();

for(int i=0; i<count; i++){	if(array.count()){
array+=&r.process(params[i]);	for(int i=0; i<count; i++)
	array+=&r.process(params[i]);
	array.invalidate();
	} else {
	for(int i=0; i<count; i++)
	array+=&r.process(params[i]);
	array.confirm_all_used();
}	}
self.invalidate();
}	}

static void _insert(Request& r, MethodParams& params) {	static void _insert(Request& r, MethodParams& params) {
VArray& self=GET_SELF(r, VArray);	ArrayValue& array=GET_SELF(r, VArray).array();
ArrayValue& array=self.array();

int count=params.count();	int count=params.count();
size_t index=VArray::index(params.as_int(0, PARAM_INDEX, r));	size_t index=VArray::index(params.as_int(0, PARAM_INDEX, r));
Line 622 static void _insert(Request& r, MethodPa	Line 633 static void _insert(Request& r, MethodPa
for(int i=1; i<count; i++){	for(int i=1; i<count; i++){
array.insert(index++, &r.process(params[i]));	array.insert(index++, &r.process(params[i]));
}	}
self.invalidate();	array.invalidate();
}	}

static void _delete(Request& r, MethodParams& params) {	static void _delete(Request& r, MethodParams& params) {
VArray& self=GET_SELF(r, VArray);	ArrayValue& array=GET_SELF(r, VArray).array();
if(params.count()>0)	if(params.count()>0)
self.array().clear(VArray::index(params.as_int(0, PARAM_INDEX, r)));	array.clear(VArray::index(params.as_int(0, PARAM_INDEX, r)));
else	else
self.array().clear();	array.clear();
self.invalidate();	array.invalidate();
}	}

static void _remove(Request& r, MethodParams& params) {	static void _remove(Request& r, MethodParams& params) {
VArray& self=GET_SELF(r, VArray);	ArrayValue& array=GET_SELF(r, VArray).array();
self.array().remove(VArray::index(params.as_int(0, PARAM_INDEX, r)));	array.remove(VArray::index(params.as_int(0, PARAM_INDEX, r)));
self.invalidate();	array.invalidate();
}	}

static void _contains(Request& r, MethodParams& params) {	static void _contains(Request& r, MethodParams& params) {
Line 850 static void _sort(Request& r, MethodPara	Line 861 static void _sort(Request& r, MethodPara
for(pos=0; pos<count; pos++)	for(pos=0; pos<count; pos++)
array+=seq[pos].array_data;	array+=seq[pos].array_data;

	array.confirm_all_used();
delete[] seq;	delete[] seq;
}	}

Line 859 enum AtResultType {	Line 871 enum AtResultType {
AtResultTypeHash = 2	AtResultTypeHash = 2
};	};

inline Value& SingleElementHash(String::Body akey, Value* avalue) {	static Value& SingleElementHash(String::Body akey, Value* avalue) {
Value& result=*new VHash;	Value& result=*new VHash;
result.put_element(*new String(akey, String::L_TAINTED), avalue);	result.put_element(*new String(akey, String::L_TAINTED), avalue);
return result;	return result;
}	}

static void _at(Request& r, MethodParams& params) {	static void _at(Request& r, MethodParams& params) {
VArray& self=GET_SELF(r, VArray);	ArrayValue& array=GET_SELF(r, VArray).array();
ArrayValue& array=self.array();
size_t count=array.used(); // not array.count()	size_t count=array.used(); // not array.count()

int pos=0;	int pos=0;
Line 897 static void _at(Request& r, MethodParams	Line 908 static void _at(Request& r, MethodParams
}	}

if(count && pos >= 0 && (size_t)pos < count){	if(count && pos >= 0 && (size_t)pos < count){
switch(result_type) {	if(count == array.count()){
case AtResultTypeKey:	switch(result_type) {
{	case AtResultTypeKey:
for(ArrayValue::Iterator i(array); i; i.next() ){	r.write(new VString(new String(pa_uitoa(pos), String::L_TAINTED)));
if(i.value() && !(pos--)){	break;
	case AtResultTypeValue:
	r.write(*array.get(pos));
	break;
	case AtResultTypeHash:
	r.write(SingleElementHash(pa_uitoa(pos), array.get(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)));	r.write(new VString(new String(i.key(), String::L_TAINTED)));
break;	break;
}	case AtResultTypeValue:
}
break;
}
case AtResultTypeValue:
{
for(ArrayValue::Iterator i(array); i; i.next() )
if(i.value() &&!(pos--)){
r.write(*i.value());	r.write(*i.value());
break;	break;
}	case AtResultTypeHash:
break;
}
case AtResultTypeHash:
{
for(ArrayValue::Iterator i(array); i; i.next() )
if(i.value() &&!(pos--)){
r.write(SingleElementHash(i.key(), i.value()));	r.write(SingleElementHash(i.key(), i.value()));
break;	break;
}	}
break;	break;
}	}
	}
}	}
}	}
}	}
Line 1010 static void _select(Request& r, MethodPa	Line 1021 static void _select(Request& r, MethodPa
}	}
}	}

	result_array.confirm_all_used();
r.write(*result);	r.write(*result);
}	}

static void _reverse(Request& r, MethodParams& params) {	static void _reverse(Request& r, MethodParams&) {
ArrayValue& source_array=GET_SELF(r, VArray).array();	ArrayValue& source_array=GET_SELF(r, VArray).array();

VArray& result=*new VArray(source_array.count());	VArray& result=*new VArray(source_array.count());
Line 1026 static void _reverse(Request& r, MethodP	Line 1038 static void _reverse(Request& r, MethodP
r.write(result);	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	// constructor

MArray::MArray(): Methoded(VARRAY_TYPE) {	MArray::MArray(): Methoded(VARRAY_TYPE) {

// ^array::create[[copy_from]]	// ^array::copy[[copy_from]]
add_native_method("create", Method::CT_DYNAMIC, _create_or_add, 0, 1);	add_native_method("copy", Method::CT_DYNAMIC, _copy_or_add, 0, 1);
// ^array.add[add_from]	// ^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]]	// ^array.join[join_from[;options]]
add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);	add_native_method("join", Method::CT_DYNAMIC, _join, 1, 2);

	// ^array::create[value;value]
	add_native_method("create", Method::CT_DYNAMIC, _create_or_append, 0, 10000);
	// ^array.append[value;value]
	add_native_method("append", Method::CT_DYNAMIC, _create_or_append, 1, 10000);
	// ^array.insert[index;value...]
	add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000);

// ^array.left(n)	// ^array.left(n)
add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);	add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
// ^array.right(n)	// ^array.right(n)
Line 1046 MArray::MArray(): Methoded(VARRAY_TYPE)	Line 1080 MArray::MArray(): Methoded(VARRAY_TYPE)
// ^array.mid(p;n)	// ^array.mid(p;n)
add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);	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]
add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1);	add_native_method("delete", Method::CT_DYNAMIC, _delete, 0, 1);
// ^array.remove[index]	// ^array.remove[index]
Line 1085 MArray::MArray(): Methoded(VARRAY_TYPE)	Line 1112 MArray::MArray(): Methoded(VARRAY_TYPE)
// ^array.reverse[]	// ^array.reverse[]
add_native_method("reverse", Method::CT_DYNAMIC, _reverse, 0, 0);	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[first\|last[;'key'\|'value'\|'hash']]
// ^array._at([-+]offset)[['key'\|'value'\|'hash']]	// ^array._at([-+]offset)[['key'\|'value'\|'hash']]
add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2);	add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2);
Line 1092 MArray::MArray(): Methoded(VARRAY_TYPE)	Line 1122 MArray::MArray(): Methoded(VARRAY_TYPE)
#ifdef FEATURE_GET_ELEMENT4CALL	#ifdef FEATURE_GET_ELEMENT4CALL
// aliases without "_"	// aliases without "_"
add_native_method("keys", Method::CT_DYNAMIC, _keys, 0, 1);	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);	add_native_method("at", Method::CT_DYNAMIC, _at, 1, 2);
#endif	#endif

E-mail:

Removed from v.1.13
changed lines
	Added in v.1.26