--- parser3/src/main/execute.C	2008/08/19 14:24:29	1.323
+++ parser3/src/main/execute.C	2009/04/24 06:30:58	1.327
@@ -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/19 14:24:29 $";
+static const char * const IDENT_EXECUTE_C="$Date: 2009/04/24 06:30:58 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -113,14 +113,6 @@ void Request::execute(ArrayOperation& op
 	debug_printf(sapi_info, "execution-------------------------\n");
 #endif
 	for(Array_iterator<Operation> i(ops); i.has_next(); ) {
-		if(get_skip())
-			return;
-		if(get_interrupted()) {
-			set_interrupted(false);
-			throw Exception("parser.interrupted",
-				0,
-				"execution stopped");
-		}
 		OP::OPCODE opcode=i.next().code;
 
 #ifdef DEBUG_EXECUTE
@@ -210,14 +202,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 +320,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 +353,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);
@@ -438,6 +438,15 @@ void Request::execute(ArrayOperation& op
 				debug_printf(sapi_info, "<-returned");
 #endif
 				//is_debug_junction=false;
+
+				if(get_skip())
+					return;
+				if(get_interrupted()) {
+					set_interrupted(false);
+					throw Exception("parser.interrupted",
+						0,
+						"execution stopped");
+				}
 				break;
 			}
 
@@ -459,14 +468,14 @@ void Request::execute(ArrayOperation& op
 		case OP::OP_NOT:
 			{
 				Value& a=stack.pop().value();
-				Value& value=*new VBool(!a.as_bool());
+				Value& value=VBool::get(!a.as_bool());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_DEF:
 			{
 				Value& a=stack.pop().value();
-				Value& value=*new VBool(a.is_defined());
+				Value& value=VBool::get(a.is_defined());
 				stack.push(value);
 				break;
 			}
@@ -474,21 +483,21 @@ void Request::execute(ArrayOperation& op
 			{
 				Value& a=stack.pop().value();
 				const String& path=a.as_string();
-				Value& value=*new VBool(request_info.uri && *request_info.uri && path.this_starts(request_info.uri));
+				Value& value=VBool::get(request_info.uri && *request_info.uri && path.this_starts(request_info.uri));
 				stack.push(value);
 				break;
 			}
 		case OP::OP_FEXISTS:
 			{
 				Value& a=stack.pop().value();
-				Value& value=*new VBool(file_exist(absolute(a.as_string())));
+				Value& value=VBool::get(file_exist(absolute(a.as_string())));
 				stack.push(value);
 				break;
 			}
 		case OP::OP_DEXISTS:
 			{
 				Value& a=stack.pop().value();
-				Value& value=*new VBool(dir_exists(absolute(a.as_string())));
+				Value& value=VBool::get(dir_exists(absolute(a.as_string())));
 				stack.push(value);
 				break;
 			}
@@ -624,7 +633,7 @@ void Request::execute(ArrayOperation& op
 					result=b.as_bool();
 				} else
 					result=false;
-				Value& value=*new VBool(result);
+				Value& value=VBool::get(result);
 				stack.push(value);
 				break;
 			}
@@ -639,14 +648,14 @@ void Request::execute(ArrayOperation& op
 					Value& b=stack.pop().value();
 					result=b.as_bool();
 				}
-				Value& value=*new VBool(result);
+				Value& value=VBool::get(result);
 				stack.push(value);
 				break;
 			}
 		case OP::OP_LOG_XOR:
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_bool() ^ b.as_bool());
+				Value& value=VBool::get(a.as_bool() ^ b.as_bool());
 				stack.push(value);
 				break;
 			}
@@ -654,7 +663,7 @@ void Request::execute(ArrayOperation& op
 			{
 				volatile double b_double=stack.pop().value().as_double();
 				volatile double a_double=stack.pop().value().as_double();
-				Value& value=*new VBool(a_double<b_double);
+				Value& value=VBool::get(a_double<b_double);
 				stack.push(value);
 				break;
 			}
@@ -662,7 +671,7 @@ void Request::execute(ArrayOperation& op
 			{
 				volatile double b_double=stack.pop().value().as_double();
 				volatile double a_double=stack.pop().value().as_double();
-				Value& value=*new VBool(a_double>b_double);
+				Value& value=VBool::get(a_double>b_double);
 				stack.push(value);
 				break;
 			}
@@ -670,7 +679,7 @@ void Request::execute(ArrayOperation& op
 			{
 				volatile double b_double=stack.pop().value().as_double();
 				volatile double a_double=stack.pop().value().as_double();
-				Value& value=*new VBool(a_double<=b_double);
+				Value& value=VBool::get(a_double<=b_double);
 				stack.push(value);
 				break;
 			}
@@ -678,7 +687,7 @@ void Request::execute(ArrayOperation& op
 			{
 				volatile double b_double=stack.pop().value().as_double();
 				volatile double a_double=stack.pop().value().as_double();
-				Value& value=*new VBool(a_double>=b_double);
+				Value& value=VBool::get(a_double>=b_double);
 				stack.push(value);
 				break;
 			}
@@ -686,7 +695,7 @@ void Request::execute(ArrayOperation& op
 			{
 				volatile double b_double=stack.pop().value().as_double();
 				volatile double a_double=stack.pop().value().as_double();
-				Value& value=*new VBool(a_double==b_double);
+				Value& value=VBool::get(a_double==b_double);
 				stack.push(value);
 				break;
 			}
@@ -694,56 +703,56 @@ void Request::execute(ArrayOperation& op
 			{
 				volatile double b_double=stack.pop().value().as_double();
 				volatile double a_double=stack.pop().value().as_double();
-				Value& value=*new VBool(a_double!=b_double);
+				Value& value=VBool::get(a_double!=b_double);
 				stack.push(value);
 				break;
 			}
 		case OP::OP_STR_LT: 
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_string() < b.as_string());
+				Value& value=VBool::get(a.as_string() < b.as_string());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_STR_GT: 
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_string() > b.as_string());
+				Value& value=VBool::get(a.as_string() > b.as_string());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_STR_LE: 
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_string() <= b.as_string());
+				Value& value=VBool::get(a.as_string() <= b.as_string());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_STR_GE: 
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_string() >= b.as_string());
+				Value& value=VBool::get(a.as_string() >= b.as_string());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_STR_EQ: 
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_string() == b.as_string());
+				Value& value=VBool::get(a.as_string() == b.as_string());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_STR_NE: 
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.as_string() != b.as_string());
+				Value& value=VBool::get(a.as_string() != b.as_string());
 				stack.push(value);
 				break;
 			}
 		case OP::OP_IS:
 			{
 				Value& b=stack.pop().value();  Value& a=stack.pop().value();
-				Value& value=*new VBool(a.is(b.as_string().cstr()));
+				Value& value=VBool::get(a.is(b.as_string().cstr()));
 				stack.push(value);
 				break;
 			}
@@ -842,8 +851,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 +885,7 @@ value_ready:
 	if(value)
 		value=&process_to_value(*value); // process possible code-junction
 	else
-		value=new VVoid;
+		value=VVoid::get();
 
 	return *value;
 }