--- parser3/src/main/execute.C	2001/07/13 10:58:03	1.175
+++ parser3/src/main/execute.C	2001/07/20 09:40:46	1.180
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: execute.C,v 1.175 2001/07/13 10:58:03 parser Exp $"; 
+static const char *RCSId="$Id: execute.C,v 1.180 2001/07/20 09:40:46 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -373,10 +373,12 @@ void Request::execute(const Array& ops)
 				PUSH(wcontext); 
 				
 				VStateless_class *called_class=frame->junction.self.get_class();
-				// not ^name.method call and
+				// 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->somebody_entered_some_object() && 
+				if(
+					!(wcontext->somebody_entered_some_object() &&
+					!wcontext->somebody_entered_some_class()) && 
 					read_class && read_class->is_or_derived_from(*called_class)) // yes
 					self=rcontext; // class dynamic call
 				else // no, not me or relative of mine (total stranger)
@@ -805,7 +807,8 @@ Value& Request::process(Value& value, co
 	return *result;
 }
 
-const String *Request::execute_method(Value& aself, const Method& method, bool return_cstr) {
+const String *Request::execute_method(Value& aself, const Method& method, 
+									  bool return_cstr) {
 	PUSH(self);  
 	PUSH(root);  
 	PUSH(rcontext);  
@@ -834,9 +837,9 @@ const String *Request::execute_method(Va
 	return result;
 }
 
-/// @test remove virtual @auto calls when initializing children
-const String *Request::execute_method(Value& aself, 
-							  const String& method_name, bool return_cstr) {
+const String *Request::execute_virtual_method(Value& aself, 
+											  const String& method_name, 
+											  bool return_cstr) {
 	if(Value *value=aself.get_element(method_name))
 		if(Junction *junction=value->get_junction())
 			if(const Method *method=junction->method) 
@@ -844,3 +847,12 @@ const String *Request::execute_method(Va
 
 	return 0;
 }
+
+const String *Request::execute_nonvirtual_method(VStateless_class& aclass, 
+												 const String& method_name, 
+												 bool return_cstr) {
+	if(const Method *method=aclass.get_method(method_name))
+		return execute_method(aclass, *method, return_cstr);
+
+	return 0;
+}