--- parser3/src/classes/array.C	2024/10/26 00:21:02	1.24
+++ parser3/src/classes/array.C	2024/10/27 17:50:59	1.30
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.24 2024/10/26 00:21:02 moko Exp $";
+volatile const char * IDENT_ARRAY_C="$Id: array.C,v 1.30 2024/10/27 17:50:59 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);
@@ -608,15 +608,21 @@ static void _count(Request& r, MethodPar
 	r.write(*new VInt(array.used()));
 }
 
-static void _append(Request& r, MethodParams& params) {
+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; i<count; i++){
-		array+=&r.process(params[i]);
+	if(array.count()){
+		for(int i=0; i<count; i++){
+			array+=&r.process(params[i]);
+			array.change_used(+1); // after each element, since an exception can occur
+		}
+	} else {
+		for(int i=0; i<count; i++)
+			array+=&r.process(params[i]);
+		array.confirm_all_used();
 	}
-	array.invalidate();
 }
 
 static void _insert(Request& r, MethodParams& params) {
@@ -627,15 +633,19 @@ static void _insert(Request& r, MethodPa
 
 	for(int i=1; i<count; i++){
 		array.insert(index++, &r.process(params[i]));
+		array.change_used(+1); // after each element, since an exception can occur
 	}
-	array.invalidate();
 }
 
 static void _delete(Request& r, MethodParams& params) {
 	ArrayValue& array=GET_SELF(r, VArray).array();
-	if(params.count()>0)
-		array.clear(VArray::index(params.as_int(0, PARAM_INDEX, r)));
-	else
+	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();
 }
@@ -646,6 +656,17 @@ static void _remove(Request& r, MethodPa
 	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)));
@@ -856,7 +877,7 @@ static void _sort(Request& r, MethodPara
 		for(pos=0; pos<count; pos++)
 			array+=seq[pos].array_data;
 
-	array.invalidate();
+	array.confirm_all_used();
 	delete[] seq;
 }
 
@@ -873,12 +894,9 @@ static Value& SingleElementHash(String::
 }
 
 static void _at(Request& r, MethodParams& params) {
-	VArray& self=GET_SELF(r, VArray);
-	ArrayValue& array=self.array();
+	ArrayValue& array=GET_SELF(r, VArray).array();
 	size_t count=array.used(); // not array.count()
 
-	int pos=0;
-
 	AtResultType result_type=AtResultTypeValue;
 	if(params.count() > 1) {
 		const String& stype=params.as_string(1, "type must be string");
@@ -890,18 +908,7 @@ 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){
 		if(count == array.count()){
@@ -910,10 +917,10 @@ static void _at(Request& r, MethodParams
 					r.write(*new VString(*new String(pa_uitoa(pos), String::L_TAINTED)));
 					break;
 				case AtResultTypeValue:
-					r.write(*array[pos]);
+					r.write(*array.get(pos));
 					break;
 				case AtResultTypeHash:
-					r.write(SingleElementHash(pa_uitoa(pos), array[pos]));
+					r.write(SingleElementHash(pa_uitoa(pos), array.get(pos)));
 					break;
 			}
 		} else {
@@ -1044,7 +1051,9 @@ static void _compact(Request& r, MethodP
 			compact_undef=true;
 		}
 	}
-	GET_SELF(r, VArray).array().compact(compact_undef);
+	ArrayValue& array=GET_SELF(r, VArray).array();
+	array.compact(compact_undef);
+	array.confirm_all_used();
 }
 
 
@@ -1053,17 +1062,19 @@ static void _compact(Request& r, MethodP
 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)
@@ -1074,10 +1085,12 @@ 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]
 	add_native_method("contains", Method::CT_DYNAMIC, _contains, 1, 1);