--- parser3/src/main/execute.C	2008/08/15 15:26:14	1.322
+++ parser3/src/main/execute.C	2009/04/21 09:26:29	1.326
@@ -1,11 +1,11 @@
 /** @file
 	Parser: executor part of request class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_EXECUTE_C="$Date: 2008/08/15 15:26:14 $";
+static const char * const IDENT_EXECUTE_C="$Date: 2009/04/21 09:26:29 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -70,9 +70,9 @@ 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()) {
-		OPCODE opcode=i.next().code;
+		OP::OPCODE opcode=i.next().code;
 
-		if(opcode==OP_VALUE || opcode==OP_STRING__WRITE) {
+		if(opcode==OP::OP_VALUE || opcode==OP::OP_STRING__WRITE) {
 			Operation::Origin origin=i.next().origin;
 			Value& value=*i.next().value;
 			debug_printf(sapi_info, 
@@ -85,14 +85,14 @@ void debug_dump(SAPI_Info& sapi_info, in
 		debug_printf(sapi_info, "%*s%s", level*4, "", opcode_name[opcode]);
 
 		switch(opcode) {
-		case OP_CURLY_CODE__STORE_PARAM: 
-		case OP_EXPR_CODE__STORE_PARAM:
-		case OP_CURLY_CODE__CONSTRUCT:
-		case OP_NESTED_CODE:
-		case OP_OBJECT_POOL:  
-		case OP_STRING_POOL:
-		case OP_CALL:
-		case OP_CALL__WRITE:
+		case OP::OP_CURLY_CODE__STORE_PARAM: 
+		case OP::OP_EXPR_CODE__STORE_PARAM:
+		case OP::OP_CURLY_CODE__CONSTRUCT:
+		case OP::OP_NESTED_CODE:
+		case OP::OP_OBJECT_POOL:  
+		case OP::OP_STRING_POOL:
+		case OP::OP_CALL:
+		case OP::OP_CALL__WRITE:
 			if(ArrayOperation* local_ops=i.next().ops)
 				debug_dump(sapi_info, level+1, *local_ops);
 		}
@@ -210,14 +210,16 @@ void Request::execute(ArrayOperation& op
 #ifdef DEBUG_EXECUTE
 				debug_printf(sapi_info, " (%d)\n", local_ops.count());
 				debug_dump(sapi_info, 1, local_ops);
-#endif				
-				Value& value=*new VJunction(
+#endif
+				VJunction& value=*new VJunction(
 					get_self(), 0,
 					method_frame, 
 					rcontext, 
 					wcontext, 
 					&local_ops);
 
+				wcontext->attach_junction(&value);
+
 				const String& name=stack.pop().string();  debug_name=&name;
 				Value& ncontext=stack.pop().value();
 				if(const VJunction* vjunction=ncontext.put_element(ncontext, name, &value, false))
@@ -326,7 +328,7 @@ void Request::execute(ArrayOperation& op
 				if(const String* string=wcontext->get_string())
 					value=new VString(*string);
 				else
-					value=new VVoid;
+					value=VVoid::get();
 				stack.push(*value);
 
 				wcontext=saved_wcontext;
@@ -359,12 +361,18 @@ void Request::execute(ArrayOperation& op
 				// hence, we zero junction.wcontext here, and later
 				// in .process we would test that field 
 				// in decision "which wwrapper to use"
-				Value& value=*new VJunction(
+				VJunction& value=*new VJunction(
 					get_self(), 0,
 					method_frame, 
 					rcontext, 
 					opcode==OP::OP_EXPR_CODE__STORE_PARAM?0:wcontext, 
 					&local_ops);
+#ifdef USE_DESTRUCTORS
+				value.set_temporal(true);
+#else
+				if (opcode!=OP::OP_EXPR_CODE__STORE_PARAM)
+#endif
+				wcontext->attach_junction(&value);
 				// store param
 				// this op is executed from CALL local_ops only, so can not check method_frame_to_fill==0
 				frame.store_param(value);
@@ -842,8 +850,11 @@ WContext* Request::op_call(VMethodFrame&
 Value& Request::get_element(Value& ncontext, const String& name, bool can_call_operator) {
 	Value* value=0;
 	if(can_call_operator) {
-		if(Method* method=main_class.get_method(name)) // looking operator of that name FIRST
-			value=new VJunction(main_class, method);
+		if(Method* method=main_class.get_method(name)){ // looking operator of that name FIRST
+			if(!method->junction_template)
+				method->junction_template=new VJunction(main_class, method);
+			return *method->junction_template;
+		}
 	}
 	if(!value) {
 		if(!wcontext->get_constructing() // not constructing
@@ -873,7 +884,7 @@ value_ready:
 	if(value)
 		value=&process_to_value(*value); // process possible code-junction
 	else
-		value=new VVoid;
+		value=VVoid::get();
 
 	return *value;
 }