--- parser3/src/main/execute.C	2001/03/12 17:00:47	1.95
+++ parser3/src/main/execute.C	2001/03/13 12:37:05	1.99
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.95 2001/03/12 17:00:47 paf Exp $
+	$Id: execute.C,v 1.99 2001/03/13 12:37:05 paf Exp $
 */
 
 #include "pa_array.h" 
@@ -128,6 +128,9 @@ void Request::execute(const Array& ops)
 			}
 		case OP_GET_CLASS:
 			{
+				// maybe the do ^class:method[] call, remember the fact
+				wcontext->set_somebody_entered_some_class();
+
 				const String& name=POP_NAME();
 				VClass *vclass=static_cast<VClass *>(classes().get(name));
 				if(!vclass) 
@@ -308,8 +311,10 @@ void Request::execute(const Array& ops)
 				if(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)
-					if(wcontext->constructing()) {  // constructing?
-						// yes, constructor call: $some(^class:method(..))
+					if(
+						wcontext->constructing() && // constructing?
+						wcontext->somebody_entered_some_class()) { // ^class:method[..]?
+						// yes, this is a constructor call
 						if(called_class->name()==TABLE_CLASS_NAME)
 							self=NEW VTable(pool());
 						else
@@ -328,7 +333,7 @@ void Request::execute(const Array& ops)
 					// substitute class alias to the class they are called AS
 					Temp_alias temp_alias(*aliased, *frame->junction.vclass);
 
-					Method& method=*frame->junction.method;
+					const Method& method=*frame->junction.method;
 					if(method.native_code) { // native code?
 						method.check_actual_numbered_params(
 							frame->name(), frame->numbered_params());
@@ -360,7 +365,7 @@ void Request::execute(const Array& ops)
 		case OP_INV:
 			{
 				Value *operand=POP();
-				Value *value=NEW VDouble(pool(), ~static_cast<int>(operand->get_double()));
+				Value *value=NEW VDouble(pool(), ~(int)operand->get_double());
 				PUSH(value);
 				break;
 			}
@@ -426,8 +431,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) %
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() %
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -435,8 +440,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) &
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() &
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -444,8 +449,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) |
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() |
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -453,8 +458,8 @@ void Request::execute(const Array& ops)
 			{
 				Value *b=POP();  Value *a=POP();
 				Value *value=NEW VDouble(pool(), 
-					static_cast<int>(a->get_double()) ^
-					static_cast<int>(b->get_double()));
+					(int)a->get_double() ^
+					(int)b->get_double());
 				PUSH(value);
 				break;
 			}
@@ -645,34 +650,41 @@ Value& Request::process(Value& value, co
 	return *result;
 }
 
-char *Request::execute_static_method(VClass& vclass, String& method_name, bool return_cstr) {
-	if(const Method *method=vclass.get_method(method_name)) {
-		PUSH(self);  
-		PUSH(root);  
-		PUSH(rcontext);  
-		PUSH(wcontext);
-		
-		// initialize contexts
-		root=rcontext=self=&vclass;
-		wcontext=NEW WWrapper(pool(), &vclass, false /* not constructing */);
-		
-		// execute!	
-		execute(*method->parser_code);
-		
-		// result
-		char *result;
-		if(return_cstr)
-			result=wcontext->get_string()->cstr(); // chars
-		else
-			result=0; // ignore result
-		
-		wcontext=static_cast<WContext *>(POP());  
-		rcontext=POP();  
-		root=POP();  
-		self=static_cast<VAliased *>(POP());
-		
-		// return
-		return result;
-	}
+char *Request::execute_method(Value& aself, const Method& method, bool return_cstr) {
+	PUSH(self);  
+	PUSH(root);  
+	PUSH(rcontext);  
+	PUSH(wcontext);
+	
+	// initialize contexts
+	root=rcontext=self=&aself;
+	wcontext=NEW WWrapper(pool(), &aself, false /* not constructing */);
+	
+	// execute!	
+	execute(*method.parser_code);
+	
+	// result
+	char *result;
+	if(return_cstr)
+		result=wcontext->get_string()->cstr(); // chars
+	else
+		result=0; // ignore result
+	
+	wcontext=static_cast<WContext *>(POP());  
+	rcontext=POP();  
+	root=POP();  
+	self=static_cast<VAliased *>(POP());
+	
+	// return
+	return result;
+}
+
+char *Request::execute_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) 
+				return execute_method(aself, *method, return_cstr);
+
 	return 0;
 }