--- parser3/src/main/execute.C	2002/02/08 07:27:46	1.217
+++ parser3/src/main/execute.C	2002/02/20 12:40:24	1.221
@@ -2,9 +2,9 @@
 	Parser: executor part of request class.
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: execute.C,v 1.217 2002/02/08 07:27:46 paf Exp $
+	$Id: execute.C,v 1.221 2002/02/20 12:40:24 paf Exp $
 */
 
 #include "pa_opcode.h"
@@ -24,6 +24,14 @@
 #include "pa_wwrapper.h"
 
 //#define DEBUG_EXECUTE
+//#define DEBUG_STRING_APPENDS_VS_EXPANDS
+
+
+#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
+ulong wcontext_result_size=0;
+#endif
+
+
 
 const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500;
 
@@ -43,7 +51,7 @@ char *opcode_name[]={
   	"CREATE_SWPOOL",	"REDUCE_SWPOOL",
 	"GET_METHOD_FRAME",
 	"STORE_PARAM",
-	"PREPARE_TO_CONSTRUCT_OBJECT",	"CALL",
+	"PREPARE_TO_CONSTRUCT_OBJECT",	"PREPARE_TO_EXPRESSION", "CALL",
 
 	// expression ops: unary
 	"NEG", "INV", "NOT", "DEF", "IN", "FEXISTS", "DEXISTS",
@@ -213,6 +221,9 @@ void Request::execute(const Array& ops)
 			}
 		case OP_CONSTRUCT_EXPR:
 			{
+				// see OP_PREPARE_TO_EXPRESSION
+				wcontext->set_in_expression(false);
+
 				value=POP();
 				const String& name=POP_NAME();
 				Value *ncontext=POP();
@@ -263,6 +274,9 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WRITE_EXPR_RESULT:
 			{
+				// see OP_PREPARE_TO_EXPRESSION
+				wcontext->set_in_expression(false);
+
 				value=POP();
 				write_expr_result(*value->as_expr_result());
 				break;
@@ -376,6 +390,13 @@ void Request::execute(const Array& ops)
 				wcontext->set_constructing(true);
 				break;
 			}
+
+		case OP_PREPARE_TO_EXPRESSION:
+			{
+				wcontext->set_in_expression(true);
+				break;
+			}
+
 		case OP_CALL:
 			{
 #ifdef DEBUG_EXECUTE
@@ -426,6 +447,10 @@ void Request::execute(const Array& ops)
 				}
 
 				frame->set_self(*self);
+
+				// see OP_PREPARE_TO_EXPRESSION
+				frame->set_in_expression(wcontext->get_in_expression());
+				
 				rcontext=wcontext=frame;
 				{
 					// take object or class from any wrappers
@@ -479,6 +504,11 @@ void Request::execute(const Array& ops)
 				root=POP();  
 				self=static_cast<VAliased *>(POP());
 
+#ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
+				if(const String *s=value->get_string())
+					wcontext_result_size+=s->used_rows()*sizeof(String::Chunk::Row);
+#endif
+
 				PUSH(value);
 #ifdef DEBUG_EXECUTE
 				debug_printf(pool(), "<-returned");