--- parser3/src/main/execute.C	2001/07/03 09:20:55	1.173
+++ parser3/src/main/execute.C	2001/07/24 15:43:56	1.181
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
-static const char *RCSId="$Id: execute.C,v 1.173 2001/07/03 09:20:55 parser Exp $"; 
+static const char *RCSId="$Id: execute.C,v 1.181 2001/07/24 15:43:56 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_array.h" 
@@ -34,7 +34,7 @@ char *opcode_name[]={
 	// actions
 	"WITH_SELF",	"WITH_ROOT",	"WITH_READ",	"WITH_WRITE",
 	"GET_CLASS",
-	"CONSTRUCT_VALUE",  "CONSTRUCT_DOUBLE",
+	"CONSTRUCT_VALUE",  "CONSTRUCT_EXPR",
 	"WRITE_VALUE",  "WRITE_EXPR_RESULT",  "STRING__WRITE",
 	"GET_ELEMENT",	"GET_ELEMENT__WRITE",
 	"CREATE_EWPOOL",	"REDUCE_EWPOOL",
@@ -69,7 +69,7 @@ void debug_printf(Pool& pool, const char
 }
 
 void debug_dump(Pool& pool, int level, const Array& ops) {
-	{
+/*	{
 		int size=ops.quick_size();
 		//debug_printf(pool, "size=%d\n", size);
 		for(int i=0; i<size; i++) {
@@ -77,7 +77,7 @@ void debug_dump(Pool& pool, int level, c
 			op.cast=ops.quick_get(i);
 			debug_printf(pool, "%8X\n", op.cast);
 		}
-	}
+	}*/
 
 	int size=ops.quick_size();
 	//debug_printf(pool, "size=%d\n", size);
@@ -253,6 +253,7 @@ void Request::execute(const Array& ops)
 				// maybe they do ^object.method[] call, remember the fact
 				wcontext->inc_somebody_entered_some_object();
 
+				//_asm int 3;
 				Value *value=get_element();
 				PUSH(value);
 				break;
@@ -372,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)
@@ -721,14 +724,14 @@ void Request::execute(const Array& ops)
 Value *Request::get_element() {
 	const String& name=POP_NAME();
 	Value *ncontext=POP();
-	Value *value;
-	if(Method* method=OP.get_method(name)) { // operator?
-		// as if that method were in self and we have normal dynamic method here
-		Junction& junction=*NEW Junction(pool(), 
-			*self, self->get_class(), method, 0,0,0,0);
-		value=NEW VJunction(junction);
-	} else
-		value=ncontext->get_element(name);
+	Value *value=ncontext->get_element(name);
+	if(!value)
+		if(Method* method=OP.get_method(name)) { // maybe operator?
+			// as if that method were in self and we have normal dynamic method here
+			Junction& junction=*NEW Junction(pool(), 
+				*self, self->get_class(), method, 0,0,0,0);
+			value=NEW VJunction(junction);
+		}
 	if(value)
 		value=&process(*value, &name); // process possible code-junction
 	else {
@@ -804,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);  
@@ -833,8 +837,9 @@ const String *Request::execute_method(Va
 	return result;
 }
 
-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) 
@@ -842,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;
+}