--- parser3/src/main/execute.C	2002/04/15 11:33:31	1.229
+++ parser3/src/main/execute.C	2002/04/16 14:33:18	1.235
@@ -4,7 +4,7 @@
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: execute.C,v 1.229 2002/04/15 11:33:31 paf Exp $
+	$Id: execute.C,v 1.235 2002/04/16 14:33:18 paf Exp $
 */
 
 #include "pa_opcode.h"
@@ -45,11 +45,11 @@ char *opcode_name[]={
 	"CONSTRUCT_VALUE", "CONSTRUCT_EXPR", "CURLY_CODE__CONSTRUCT",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
 	"GET_ELEMENT_OR_OPERATOR", "GET_ELEMENT",	"GET_ELEMENT__WRITE",
-	"OBJECT_POOL",	
-  	"STRING_POOL",
+	"OBJECT_POOL",	"STRING_POOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
-	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", "CALL",
+	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", 
+	"CALL", "CALL__WRITE",
 
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
@@ -266,19 +266,16 @@ void Request::execute(const Array& ops)
 			{
 				value=POP();
 				write_assign_lang(*value);
-
-				// forget the fact they've entered some ^object.method[].
-				// see OP_GET_ELEMENT
-				wcontext->set_somebody_entered_some_object(false);
 				break;
 			}
 		case OP_WRITE_EXPR_RESULT:
 			{
+				value=POP();
+				write_no_lang(*value->as_expr_result());
+
+				// must be after write(result) and 
 				// see OP_PREPARE_TO_EXPRESSION
 				wcontext->set_in_expression(false);
-
-				value=POP();
-				write_expr_result(*value->as_expr_result());
 				break;
 			}
 		case OP_STRING__WRITE:
@@ -402,6 +399,7 @@ void Request::execute(const Array& ops)
 			}
 
 		case OP_CALL:
+		case OP_CALL__WRITE:
 			{
 #ifdef DEBUG_EXECUTE
 				debug_printf(pool(), "->\n");
@@ -493,7 +491,7 @@ void Request::execute(const Array& ops)
 								call_type==Method::CT_STATIC?"statically":"dynamically");
 
 				}
-				value=&wcontext->result().as_value(); // todo CALL_WRITE & VString removal
+				StringOrValue result=wcontext->result();
 
 				wcontext=static_cast<WContext *>(POP());  
 				rcontext=POP();  
@@ -505,7 +503,15 @@ void Request::execute(const Array& ops)
 					wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row);
 #endif
 
-				PUSH(value);
+				if(op.code==OP_CALL__WRITE) {
+					write_assign_lang(result);
+					// forget the fact they've entered some ^object.method[].
+					// see OP_GET_ELEMENT
+					wcontext->set_somebody_entered_some_object(false);
+				} else { // OP_CALL
+					PUSH(&result.as_value());
+				}
+				
 #ifdef DEBUG_EXECUTE
 				debug_printf(pool(), "<-returned");
 #endif
@@ -820,6 +826,7 @@ void Request::execute(const Array& ops)
 	}
 }
 
+/// @test cache|prepare junctions 
 Value *Request::get_element(bool can_call_operator) {
 	const String& name=POP_NAME();
 	Value *ncontext=POP();
@@ -930,7 +937,13 @@ const String *Request::execute_method(Va
 	execute(*method.parser_code);
 	
 	// result
-	const String *result=return_cstr ? &wcontext->as_string() : 0;
+	const String *result=0;
+	if(return_cstr) {
+		if(Value *result_var_value=wcontext->get_element(*result_var_name))
+			result=&result_var_value->as_string();
+		else
+			result=&wcontext->as_string();
+	}
 	
 	wcontext=static_cast<WContext *>(POP());  
 	rcontext=POP();  
@@ -955,7 +968,7 @@ const String& Request::execute_method(VM
 	execute(*method.parser_code);
 	
 	// result
-	const String& result=wcontext->as_string();
+	const String& result=wcontext->result().as_string();
 	
 	wcontext=static_cast<WContext *>(POP());  
 	rcontext=POP();