--- parser3/src/main/execute.C	2002/10/15 14:28:57	1.284
+++ parser3/src/main/execute.C	2003/03/18 09:53:01	1.295.4.2
@@ -1,11 +1,11 @@
 /** @file
 	Parser: executor part of request class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/10/15 14:28:57 $";
+static const char* IDENT_EXECUTE_C="$Date: 2003/03/18 09:53:01 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -100,6 +100,7 @@ void debug_dump(Pool& pool, int level, c
 		case OP_OBJECT_POOL:  
 		case OP_STRING_POOL:
 		case OP_CALL:
+		case OP_CALL__WRITE:
 			const Array *local_ops=reinterpret_cast<const Array *>(i.next());
 			debug_dump(pool, level+1, *local_ops);
 		}
@@ -123,6 +124,11 @@ void Request::execute(const Array& ops)
 
 	Array_iter i(ops);
 	while(i.has_next()) {
+		if(interrupted())
+			throw Exception("parser.interrupted",
+				0,
+				"execution stopped");
+
 		Operation op;
 		op.cast=i.next();
 #ifdef DEBUG_EXECUTE
@@ -167,7 +173,7 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WITH_SELF: 
 			{
-				PUSH(self);
+				PUSH(get_self());
 				break;
 			}
 		case OP_WITH_READ: 
@@ -177,6 +183,11 @@ void Request::execute(const Array& ops)
 			}
 		case OP_WITH_WRITE: 
 			{
+				if(wcontext==method_frame)
+					throw Exception("parser.runtime",
+						0,
+						"$.name outside of $name[...]");
+
 				PUSH(wcontext);
 				break;
 			}
@@ -209,7 +220,7 @@ void Request::execute(const Array& ops)
 				debug_dump(pool(), 1, *local_ops);
 #endif				
 				Junction& j=*NEW Junction(pool(), 
-					*self, 0,
+					*get_self(), 0,
 					method_frame, 
 					rcontext, 
 					wcontext, 
@@ -347,7 +358,7 @@ void Request::execute(const Array& ops)
 				// in .process we would test that field 
 				// in decision "which wwrapper to use"
 				Junction& j=*NEW Junction(pool(), 
-					*self, 0,
+					*get_self(), 0,
 					method_frame, 
 					rcontext, 
 					op.code==OP_EXPR_CODE__STORE_PARAM?0:wcontext, 
@@ -376,6 +387,8 @@ void Request::execute(const Array& ops)
 		case OP_CALL:
 		case OP_CALL__WRITE:
 			{
+//				pool().collect_garbage();
+
 				Array *local_ops=static_cast<Array *>(i.next());
 #ifdef DEBUG_EXECUTE
 				debug_printf(pool(), " (%d)\n", local_ops->size());
@@ -411,12 +424,12 @@ void Request::execute(const Array& ops)
 					POP();
 				}
 				frame.fill_unspecified_params();
-				Value *saved_self=self; 
 				VMethodFrame *saved_method_frame=method_frame;
 				Value *saved_rcontext=rcontext;
 				WContext *saved_wcontext=wcontext;
 				
 				VStateless_class *called_class=frame.junction.self.get_class();
+				Value *new_self=get_self();
 				if(wcontext->get_constructing()) {
 					wcontext->set_constructing(false);
 					if(frame.junction.method->call_type!=Method::CT_STATIC) {
@@ -424,14 +437,14 @@ void Request::execute(const Array& ops)
 
 						if(Value *value=called_class->create_new_value(pool())) {
 							// some stateless_class creatable derivates
-							self=value;
+							new_self=value;
 						} else 
 							throw Exception("parser.runtime",
 								&frame.name(),
 								"is not a constructor, system class '%s' can be constructed only implicitly", 
 								called_class->name().cstr());
 
-						frame.write(*self, 
+						frame.write(*new_self, 
 							String::UL_CLEAN  // not used, always an object, not string
 						);
 					} else
@@ -439,9 +452,9 @@ void Request::execute(const Array& ops)
 							&frame.name(),
 							"method is static and can not be used as constructor");
 				} else
-					self=&frame.junction.self;
+					new_self=&frame.junction.self;
 
-				frame.set_self(*self);
+				frame.set_self(*new_self);
 
 				// see OP_PREPARE_TO_EXPRESSION
 				frame.set_in_expression(wcontext->get_in_expression());
@@ -450,11 +463,21 @@ void Request::execute(const Array& ops)
 				{
 					const Method& method=*frame.junction.method;
 					Method::Call_type call_type=
-						called_class==self ? Method::CT_STATIC : Method::CT_DYNAMIC;
+						called_class==new_self ? Method::CT_STATIC : Method::CT_DYNAMIC;
 					if(
 						method.call_type==Method::CT_ANY ||
 						method.call_type==call_type) { // allowed call type?
 						try {
+							{
+								char buf[MAX_STRING];
+								const String& name=frame.name();
+								snprintf(buf, MAX_STRING, "%s(%d): %s",
+									name.origin().file?name.origin().file:"unknown",
+									name.origin().line,
+									name.cstr());
+								pool().log_high_watermark(buf);
+							}
+
 							method_frame=&frame;
 							if(method.native_code) { // native code?
 								method.check_actual_numbered_params(
@@ -482,7 +505,6 @@ void Request::execute(const Array& ops)
 				wcontext=saved_wcontext;
 				rcontext=saved_rcontext;
 				method_frame=saved_method_frame;
-				self=saved_self;
 
 #ifdef DEBUG_STRING_APPENDS_VS_EXPANDS
 				if(const String *s=value->get_string())
@@ -820,14 +842,16 @@ void Request::execute(const Array& ops)
 	}
 }
 
-/// @test cache|prepare junctions 
+/**
+	@todo cache|prepare junctions
+	@bug ^superbase:method would dynamically call ^base:method if there is any
+*/
 Value *Request::get_element(const String *& remember_name, bool can_call_operator) {
 	const String& name=POP_NAME();  remember_name=&name;
 	Value *ncontext=POP();
 	Value *value=0;
 	if(can_call_operator) {
 		if(Method* method=main_class.get_method(name)) { // looking operator of that name FIRST
-			// as if that method were in self and we have normal dynamic method here
 			Junction& junction=*NEW Junction(pool(), 
 				main_class, method, 0,0,0,0);
 			value=NEW VJunction(junction);
@@ -839,18 +863,26 @@ Value *Request::get_element(const String
 			if(VStateless_class *called_class=ncontext->get_class())
 				if(VStateless_class *read_class=rcontext->get_class())
 					if(read_class->derived_from(*called_class)) // current derived from called
-						if(Value *base_object=self->base_object()) { // doing DYNAMIC call
-							Temp_derived temp_derived(*base_object, 0); // temporarily prevent go-back-down virtual calls
-							value=base_object->get_element(name, base_object, false); // virtual-up lookup starting from parent
-							goto _void;
+						if(Value *base=get_self()->base()) { // doing DYNAMIC call
+							Temp_derived temp_derived(*base, 0); // temporarily prevent go-back-down virtual calls
+							value=base->get_element(name, *base, false); // virtual-up lookup starting from parent
+							goto value_ready;
 						}
 	}
 	if(!value)
-		value=ncontext->get_element(name, ncontext, false);
+		value=ncontext->get_element(name, *ncontext, false);
 
-_void:
+	if(value && wcontext->get_constructing())
+		if(Junction *junction=value->get_junction()) {
+			if(junction->self.get_class()!=ncontext)
+				throw Exception("parser.runtime",
+					&name,
+					"constructor must be declared in class %s", ncontext->get_class()->name_cstr());
+		}
+
+value_ready:
 	if(value)
-			value=&process_to_value(*value); // process possible code-junction
+		value=&process_to_value(*value); // process possible code-junction
 	else
 		value=NEW VVoid(pool());
 
@@ -882,12 +914,10 @@ StringOrValue Request::process(Value& in
 				0,
 				"junction used outside of context");
 
-		Value *saved_self=self; 
 		VMethodFrame *saved_method_frame=method_frame;  
 		Value *saved_rcontext=rcontext;  
 		WContext *saved_wcontext=wcontext;
 		
-		self=&junction->self;
 		method_frame=junction->method_frame;
 		rcontext=junction->rcontext;
 
@@ -922,7 +952,6 @@ StringOrValue Request::process(Value& in
 		wcontext=saved_wcontext;
 		rcontext=saved_rcontext;
 		method_frame=saved_method_frame;
-		self=saved_self;
 		
 #ifdef DEBUG_EXECUTE
 		debug_printf(pool(), "<-ja returned");
@@ -934,13 +963,12 @@ StringOrValue Request::process(Value& in
 }
 
 const String& Request::execute_method(VMethodFrame& amethod_frame, const Method& method) {
-	Value *saved_self=self; 
 	VMethodFrame *saved_method_frame=method_frame;  
 	Value *saved_rcontext=rcontext;  
 	WContext *saved_wcontext=wcontext;
 	
 	// initialize contexts
-	self=rcontext=wcontext=method_frame=&amethod_frame;
+	rcontext=wcontext=method_frame=&amethod_frame;
 	
 	// execute!	
 	execute(*method.parser_code);
@@ -951,7 +979,6 @@ const String& Request::execute_method(VM
 	wcontext=saved_wcontext;
 	rcontext=saved_rcontext;
 	method_frame=saved_method_frame;
-	self=saved_self;
 	
 	// return
 	return result;
@@ -960,23 +987,17 @@ const String& Request::execute_method(VM
 void Request::execute_method(Value& aself, 
 							 const Method& method, VString *optional_param,
 							 const String **return_string) {
-	Value *saved_self=self; 
 	VMethodFrame *saved_method_frame=method_frame;  
 	Value *saved_rcontext=rcontext;  
 	WContext *saved_wcontext=wcontext;
 	
-	// initialize contexts
-	//method_frame=rcontext=self=&aself;
-	self=&aself;	
-//	WWrapper local(pool(), &aself, wcontext);
-//	wcontext=&local; 
-	Junction local_junction(pool(), *self, &method, 0,0,0,0);
+	Junction local_junction(pool(), aself, &method, 0,0,0,0);
 	VMethodFrame local_frame(pool(), method.name, local_junction, method_frame/*caller*/);
 	if(optional_param && local_frame.can_store_param()) {
 		local_frame.store_param(optional_param);
 		local_frame.fill_unspecified_params();
 	}
-	local_frame.set_self(*self);
+	local_frame.set_self(aself);
 	rcontext=wcontext=method_frame=&local_frame; 
 
 	// prevent non-string writes for better error reporting
@@ -994,7 +1015,6 @@ void Request::execute_method(Value& asel
 	wcontext=saved_wcontext;
 	rcontext=saved_rcontext;
 	method_frame=saved_method_frame;
-	self=saved_self;
 }
 
 void Request::execute_nonvirtual_method(VStateless_class& aclass, 
@@ -1014,7 +1034,7 @@ void Request::execute_nonvirtual_method(
 
 const String *Request::execute_virtual_method(Value& aself, 
 											  const String& method_name) {
-	if(Value *value=aself.get_element(method_name, &aself, false))
+	if(Value *value=aself.get_element(method_name, aself, false))
 		if(Junction *junction=value->get_junction())
 			if(const Method *method=junction->method) {
 				const String *result;