--- parser3/src/main/execute.C	2023/11/17 19:12:34	1.417
+++ parser3/src/main/execute.C	2024/09/18 22:24:17	1.421
@@ -19,9 +19,10 @@
 #include "pa_vtable.h"
 #include "pa_vfile.h"
 #include "pa_vimage.h"
+#include "pa_varray.h"
 #include "pa_wwrapper.h"
 
-volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.417 2023/11/17 19:12:34 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H;
+volatile const char * IDENT_EXECUTE_C="$Id: execute.C,v 1.421 2024/09/18 22:24:17 moko Exp $" IDENT_PA_OPCODE_H IDENT_PA_OPERATION_H IDENT_PA_VCODE_FRAME_H IDENT_PA_WWRAPPER_H;
 
 //#define DEBUG_EXECUTE
 
@@ -34,7 +35,7 @@ const char *opcode_name[]={
 	// actions
 	"WITH_ROOT",	"WITH_SELF",	"WITH_READ",	"WITH_WRITE",
 	"VALUE__GET_CLASS", "VALUE__GET_BASE_CLASS",
-	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
+	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT", "CONSTRUCT_ARRAY",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
 	"VALUE__GET_ELEMENT_OR_OPERATOR",
@@ -128,8 +129,7 @@ void debug_printf(SAPI_Info& sapi_info,
 }
 
 void debug_dump(SAPI_Info& sapi_info, int level, ArrayOperation& ops) {
-	Array_iterator<Operation> i(ops);
-	while(i.has_next()) {
+	for(Array_iterator<Operation> i(ops); i;) {
 		OP::OPCODE opcode=i.next().code;
 
 #if defined(OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT) || defined(OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT)
@@ -220,6 +220,7 @@ void debug_dump(SAPI_Info& sapi_info, in
 		case OP::OP_NESTED_CODE:
 		case OP::OP_OBJECT_POOL:
 		case OP::OP_STRING_POOL:
+		case OP::OP_CONSTRUCT_ARRAY:
 		case OP::OP_CALL:
 		case OP::OP_CALL__WRITE:
 			if(ArrayOperation* local_ops=i.next().ops)
@@ -245,7 +246,7 @@ void debug_dump(SAPI_Info& sapi_info, in
 // Request
 
 void Request::execute(ArrayOperation& ops) {
-	register Stack<StackItem>& stack=this->stack; // helps a lot on MSVC: 'esi'
+	Stack<StackItem>& stack=this->stack; // helps a lot on MSVC: 'esi'
 
 	const String* debug_name=0;  Operation::Origin debug_origin={0, 0, 0};
 	try{
@@ -254,7 +255,7 @@ void Request::execute(ArrayOperation& op
 	debug_dump(sapi_info, 0, ops);
 	debug_printf(sapi_info, "execution-------------------------\n");
 #endif
-	for(Array_iterator<Operation> i(ops); i.has_next(); ) {
+	for(Array_iterator<Operation> i(ops); i; ) {
 		OP::OPCODE opcode=i.next().code;
 
 #ifdef DEBUG_EXECUTE
@@ -446,6 +447,32 @@ void Request::execute(ArrayOperation& op
 
 				break;
 			}
+
+		case OP::OP_CONSTRUCT_ARRAY:
+			{
+				ArrayOperation* local_ops=i.next().ops;
+
+				DEBUG_PRINT_OPS(local_ops)
+				DEBUG_PRINT_STR("->\n")
+
+				size_t first = stack.top_index();
+				execute(*local_ops);
+				Value *value=new VArray(stack.top_index()-first, (Value**)stack.ptr(first));
+				stack.set_top_index(first);
+
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT
+				const String& name=stack.pop().string();  debug_name=&name;
+				Value& ncontext=stack.pop().value();
+#else
+				const String& name=stack.pop().string();  debug_name=&name;
+				Value& ncontext=stack.pop().value();
+#endif
+				put_element(ncontext, name, value);
+
+				DEBUG_PRINT_STR("<-returned")
+				goto check_skip;
+			}
+
 		case OP::OP_NESTED_CODE:
 			{
 				ArrayOperation& local_ops=*i.next().ops;
@@ -759,7 +786,7 @@ void Request::execute(ArrayOperation& op
 
 				Junction* junction=value.get_junction();
 				if(!junction) {
-					if(value.is("void"))
+					if(dynamic_cast<VVoid*>(&value))
 						throw Exception(PARSER_RUNTIME, 0, "undefined method");
 					else
 						throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, can not call it", value.type());
@@ -790,7 +817,7 @@ void Request::execute(ArrayOperation& op
 
 				Junction* junction=value.get_junction();
 				if(!junction) {
-					if(value.is("void"))
+					if(dynamic_cast<VVoid*>(&value))
 						throw Exception(PARSER_RUNTIME, 0, "undefined method");
 					else
 						throw Exception(PARSER_RUNTIME, 0, "is '%s', not a method or junction, can not call it", value.type());
@@ -1496,8 +1523,7 @@ const Operation::Origin Request::get_met
 
 	if(ArrayOperation* code=method->parser_code)
 		if(code){
-			Array_iterator<Operation> i(*code);
-			while( i.has_next() ){
+			for(Array_iterator<Operation> i(*code); i; ){
 				switch( i.next().code ){
 					case OP::OP_CURLY_CODE__STORE_PARAM: 
 					case OP::OP_EXPR_CODE__STORE_PARAM: