--- parser3/src/main/execute.C	2002/02/08 07:27:46	1.217
+++ parser3/src/main/execute.C	2002/03/27 15:30:35	1.223
@@ -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.223 2002/03/27 15:30:35 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",
@@ -171,7 +179,7 @@ void Request::execute(const Array& ops)
 				const String& name=POP_NAME();
 				value=static_cast<Value *>(classes().get(name));
 				if(!value) 
-					throw Exception(0,0,
+					throw Exception("parser.runtime",
 						&name,
 						"class is undefined"); 
 
@@ -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;
@@ -354,7 +368,7 @@ void Request::execute(const Array& ops)
 				//	not a code-junction
 				Junction *junction=value->get_junction();
 				if(!junction)
-					throw Exception(0, 0,
+					throw Exception("parser.runtime",
 						&value->name(),
 						"(%s) not a method or junction, can not call it",
 							value->type()); 
@@ -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
@@ -398,7 +419,7 @@ void Request::execute(const Array& ops)
 							// some stateless_class creatable derivates
 							self=value;
 						} else 
-							throw Exception(0, 0,
+							throw Exception("parser.runtime",
 								&frame->name(),
 								"is not a constructor, system class '%s' can be constructed only implicitly", 
 								called_class->name().cstr());
@@ -407,7 +428,7 @@ void Request::execute(const Array& ops)
 							String::UL_CLEAN  // not used, always an object, not string
 						);
 					} else
-						throw Exception(0, 0,
+						throw Exception("parser.runtime",
 							&frame->name(),
 							"method is static and can not be used as constructor");
 				} else {
@@ -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
@@ -452,7 +477,7 @@ void Request::execute(const Array& ops)
 								{ // anti_endless_execute_recoursion
 									if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
 										anti_endless_execute_recoursion=0; // give @exception a chance
-										throw Exception(0, 0,
+										throw Exception("parser.runtime",
 											&frame->name(),
 											"call canceled - endless recursion detected");
 									}
@@ -462,11 +487,11 @@ void Request::execute(const Array& ops)
 							}
 						} catch(...) {
 							// record it to stack trace
-							trace.push((void *)&frame->name());
+							exception_trace.push((void *)&frame->name());
 							/*re*/throw;
 						}
 					} else
-						throw Exception(0, 0,
+						throw Exception("parser.runtime",
 							&frame->name(),
 							"is not allowed to be called %s", 
 								call_type==Method::CT_STATIC?"statically":"dynamically");
@@ -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");
@@ -577,7 +607,7 @@ void Request::execute(const Array& ops)
 					if(!problem_source->origin().file)
 						problem_source=&b->name();
 #endif
-					throw Exception(0, 0,
+					throw Exception("number.zerodivision",
 						problem_source,
 						"Division by zero");
 				}
@@ -599,7 +629,7 @@ void Request::execute(const Array& ops)
 					if(!problem_source->origin().file)
 						problem_source=&b->name();
 #endif
-					throw Exception(0, 0,
+					throw Exception("number.zerodivision",
 						problem_source,
 						"Modulus by zero");
 				}
@@ -621,7 +651,7 @@ void Request::execute(const Array& ops)
 					if(!problem_source->origin().file)
 						problem_source=&b->name();
 #endif
-					throw Exception(0, 0,
+					throw Exception("number.zerodivision",
 						problem_source,
 						"Division by zero");
 				}
@@ -787,7 +817,7 @@ void Request::execute(const Array& ops)
 			}
 
 		default:
-			throw Exception(0,0,
+			throw Exception(0,
 				0,
 				"invalid opcode %d", op.code); 
 		}
@@ -862,7 +892,7 @@ Value& Request::process(Value& value, co
 		{ // anti_endless_execute_recoursion
 			if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
 				anti_endless_execute_recoursion=0; // give @exception a chance
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					name,
 					"junction evaluation canceled - endless recursion detected");
 			}