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.29 and 1.35

version 1.29, 2024/10/27 13:53:08	version 1.35, 2024/11/04 03:53:25
Line 1	Line 1
/** @file	/** @file
Parser: @b array parser class.	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 <moko@design.ru>, Alexandr Petrosian <paf@design.ru>	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
*/	*/

Line 53 static void _copy_or_add(Request& r, Met	Line 53 static void _copy_or_add(Request& r, Met
self_array.put(i.index(), i.value());	self_array.put(i.index(), i.value());
}	}
} else {	} else {
self_array.append(src->array());	self_array.copy(src->array());
	return;
}	}
} else {	} else {
HashStringValue* src_hash=vsrc.as_hash("param must be array or");	HashStringValue* src_hash=vsrc.as_hash("param must be array or");
Line 669 static void _pop(Request& r, MethodParam	Line 670 static void _pop(Request& r, MethodParam

static void _contains(Request& r, MethodParams& params) {	static void _contains(Request& r, MethodParams& params) {
VArray& self=GET_SELF(r, VArray);	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));	r.write(VBool::get(result));
}	}

Line 897 static void _at(Request& r, MethodParams	Line 899 static void _at(Request& r, MethodParams
ArrayValue& array=GET_SELF(r, VArray).array();	ArrayValue& array=GET_SELF(r, VArray).array();
size_t count=array.used(); // not array.count()	size_t count=array.used(); // not array.count()

int pos=0;

AtResultType result_type=AtResultTypeValue;	AtResultType result_type=AtResultTypeValue;
if(params.count() > 1) {	if(params.count() > 1) {
const String& stype=params.as_string(1, "type must be string");	const String& stype=params.as_string(1, "type must be string");
Line 910 static void _at(Request& r, MethodParams	Line 910 static void _at(Request& r, MethodParams
throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'");	throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'");
}	}

Value& vwhence=params[0];	int pos=params.as_index(0, count, r);
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;
}

if(count && pos >= 0 && (size_t)pos < count){	if(count && pos >= 0 && (size_t)pos < count){
if(count == array.count()){	if(count == array.count()){
switch(result_type) {	l1: switch(result_type) {
case AtResultTypeKey:	case AtResultTypeKey:
r.write(new VString(new String(pa_uitoa(pos), String::L_TAINTED)));	r.write(new VString(new String(pa_uitoa(pos), String::L_TAINTED)));
break;	break;
Line 936 static void _at(Request& r, MethodParams	Line 925 static void _at(Request& r, MethodParams
r.write(SingleElementHash(pa_uitoa(pos), array.get(pos)));	r.write(SingleElementHash(pa_uitoa(pos), array.get(pos)));
break;	break;
}	}
	} else if((size_t)pos == count-1){
	pos=array.count()-1;
	goto l1;
} else {	} else {
for(ArrayValue::Iterator i(array); i; i.next() ){	for(ArrayValue::Iterator i(array); i; i.next() ){
if(i.value() && !(pos--)){	if(i.value() && !(pos--)){
Line 957 static void _at(Request& r, MethodParams	Line 949 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;	extern String table_reverse_name;

Line 1087 MArray::MArray(): Methoded(VARRAY_TYPE)	Line 1106 MArray::MArray(): Methoded(VARRAY_TYPE)
add_native_method("append", Method::CT_DYNAMIC, _create_or_append_or_push, 1, 10000);	add_native_method("append", Method::CT_DYNAMIC, _create_or_append_or_push, 1, 10000);
// ^array.push[value[;value...]]	// ^array.push[value[;value...]]
add_native_method("push", Method::CT_DYNAMIC, _create_or_append_or_push, 1, 10000);	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);	add_native_method("insert", Method::CT_DYNAMIC, _insert, 2, 10000);

// ^array.left(n)	// ^array.left(n)
Line 1105 MArray::MArray(): Methoded(VARRAY_TYPE)	Line 1124 MArray::MArray(): Methoded(VARRAY_TYPE)
// ^array.pop[]	// ^array.pop[]
add_native_method("pop", Method::CT_DYNAMIC, _pop, 0, 0);	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);	add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1);

// ^array::sql[query][options array]	// ^array::sql[query][options array]
Line 1136 MArray::MArray(): Methoded(VARRAY_TYPE)	Line 1155 MArray::MArray(): Methoded(VARRAY_TYPE)
add_native_method("compact", Method::CT_DYNAMIC, _compact, 0, 1);	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([-+]index)[['key'\|'value'\|'hash']]
add_native_method("_at", Method::CT_DYNAMIC, _at, 1, 2);	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	#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);

E-mail:

Removed from v.1.29
changed lines
	Added in v.1.35