--- parser3/src/main/execute.C	2002/08/12 10:32:52	1.248
+++ parser3/src/main/execute.C	2002/08/13 15:55:42	1.252
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_EXECUTE_C="$Date: 2002/08/12 10:32:52 $";
+static const char* IDENT_EXECUTE_C="$Date: 2002/08/13 15:55:42 $";
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -231,7 +231,7 @@ void Request::execute(const Array& ops)
 				value=POP();
 				const String& name=POP_NAME();
 				Value *ncontext=POP();
-				ncontext->put_element(name, value);
+				ncontext->put_element(name, value, false);
 				break;
 			}
 		case OP_CONSTRUCT_EXPR:
@@ -242,7 +242,7 @@ void Request::execute(const Array& ops)
 				value=POP();
 				const String& name=POP_NAME();
 				Value *ncontext=POP();
-				ncontext->put_element(name, value->as_expr_result());
+				ncontext->put_element(name, value->as_expr_result(), false);
 				break;
 			}
 		case OP_CURLY_CODE__CONSTRUCT:
@@ -263,7 +263,7 @@ void Request::execute(const Array& ops)
 				value=NEW VJunction(j);
 				const String& name=POP_NAME();
 				Value *ncontext=POP();
-				ncontext->put_element(name, value);
+				ncontext->put_element(name, value, false);
 				break;
 			}
 		case OP_NESTED_CODE:
@@ -304,9 +304,6 @@ void Request::execute(const Array& ops)
 			
 		case OP_GET_ELEMENT_OR_OPERATOR:
 			{
-				// maybe they do ^object.method[] call, remember the fact
-				wcontext->set_somebody_entered_some_object(true);
-
 				//_asm int 3;
 				value=get_element(last_get_element_name, true);
 				PUSH(value);
@@ -314,9 +311,6 @@ void Request::execute(const Array& ops)
 			}
 		case OP_GET_ELEMENT:
 			{
-				// maybe they do ^object.method[] call, remember the fact
-				wcontext->set_somebody_entered_some_object(true);
-
 				//_asm int 3;
 				value=get_element(last_get_element_name, false);
 				PUSH(value);
@@ -482,20 +476,8 @@ void Request::execute(const Array& ops)
 						throw Exception("parser.runtime",
 							&frame.name(),
 							"method is static and can not be used as constructor");
-				} else {
-					// this is not constructor call
-
-					// not ^name.method call, name:method call; and
-					// is context object or class & is it my class or my parent's class and?
-					VStateless_class *read_class=rcontext->get_class();
-					if(
-						!(wcontext->get_somebody_entered_some_object() &&
-						!wcontext->get_somebody_entered_some_class()) && 
-						read_class && read_class->is_or_derived_from(*called_class)) // yes
-						self=rcontext; // dynamic call
-					else // no, not me or relative of mine (=total stranger)
-						self=&frame.junction.self; // static call
-				}
+				} else
+					self=&frame.junction.self;
 
 				frame.set_self(*self);
 
@@ -550,9 +532,6 @@ void Request::execute(const Array& ops)
 
 				if(op.code==OP_CALL__WRITE) {
 					write_assign_lang(result, last_get_element_name);
-					// 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());
 				}
@@ -863,15 +842,30 @@ Value *Request::get_element(const String
 	const String& name=POP_NAME();  remember_name=&name;
 	Value *ncontext=POP();
 	Value *value=0;
-	if(can_call_operator)
+	if(can_call_operator) {
 		if(Method* method=OP.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(), 
 				*root, self->get_class(), method, 0,0,0,0);
 			value=NEW VJunction(junction);
 		}
+	}
+	if(!value) {
+		if(!wcontext->get_constructing() // not constructing
+			&& wcontext->get_somebody_entered_some_class() ) // ^class:method
+			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(*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)
-		value=ncontext->get_element(name);
+		value=ncontext->get_element(name, ncontext, false);
+
+_void:
 	if(value)
 		value=&process_to_value(*value); // process possible code-junction
 	else
@@ -1038,7 +1032,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))
+	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;