--- parser3/src/main/execute.C	2002/04/15 10:35:22	1.228
+++ parser3/src/main/execute.C	2002/04/16 08:41:05	1.232
@@ -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.228 2002/04/15 10:35:22 paf Exp $
+	$Id: execute.C,v 1.232 2002/04/16 08:41:05 paf Exp $
 */
 
 #include "pa_opcode.h"
@@ -23,7 +23,7 @@
 #include "pa_vimage.h"
 #include "pa_wwrapper.h"
 
-//#define DEBUG_EXECUTE
+#define DEBUG_EXECUTE
 //#define DEBUG_STRING_APPENDS_VS_EXPANDS
 
 
@@ -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();
@@ -833,9 +840,10 @@ Value *Request::get_element(bool can_cal
 		}
 	if(!value)
 		value=ncontext->get_element(name);
-	if(value)
-		value=&process_to_value(*value/* ++ name*/); // process possible code-junction
-	else {
+	if(value) {
+		value=&process_to_value(*value); // process possible code-junction
+		value->update_name(name);
+	} else {
 		value=NEW VVoid(pool());
 		value->set_name(name);
 	}
@@ -854,10 +862,7 @@ Value *Request::get_element(bool can_cal
 
     using the fact it's either string_ or value_ result requested to speed up checkes
 */
-StringOrValue Request::process(
-							   Value& input_value,
-							   bool intercept_string,
-							   void (*postexecute)(void *info), void *postexecute_info) {
+StringOrValue Request::process(Value& input_value, bool intercept_string) {
 	StringOrValue result;
 	Junction *junction=input_value.get_junction();
 	if(junction && junction->code) { // is it a code-junction?
@@ -887,14 +892,10 @@ StringOrValue Request::process(
 			// execute it
 			recoursion_checked_execute(0/*result_name*/, *junction->code);
 			
-			// maybe-postexecute something
-			if(postexecute)
-				postexecute(postexecute_info);
-		
 			// CodeFrame soul:
 			//   string writes were intercepted
 			//   returning them as the result of getting code-junction
-			result=wcontext->result();
+			result.set_string(*wcontext->get_string());
 		} else {
 			// plain wwrapper
 			WWrapper local(pool(), 0/*empty*/);
@@ -903,10 +904,6 @@ StringOrValue Request::process(
 			// execute it
 			recoursion_checked_execute(0/*result_name*/, *junction->code);
 		
-			// maybe-postexecute something
-			if(postexecute)
-				postexecute(postexecute_info);
-		
 			result=wcontext->result();
 		}