--- parser3/src/main/execute.C	2001/03/12 21:18:01	1.97
+++ parser3/src/main/execute.C	2001/03/13 14:06:55	1.102
@@ -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.97 2001/03/12 21:18:01 paf Exp $
+	$Id: execute.C,v 1.102 2001/03/13 14:06:55 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) 
@@ -302,16 +305,20 @@ void Request::execute(const Array& ops)
 				PUSH(rcontext);  
 				PUSH(wcontext); 
 				
-				VClass *called_class=frame->junction.self.get_class();
+				VStateless_class *called_class=frame->junction.self.get_class();
 				// is context object or class & is it my class or my parent's class?
-				VClass *read_class=rcontext->get_class();
+				VStateless_class *read_class=rcontext->get_class();
 				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 if(called_class->name()==ENV_CLASS_NAME)
+							self=NEW VEnv(pool());
 						else
 							self=NEW VObject(pool(), *called_class);
 						frame->write(*self, 
@@ -324,11 +331,10 @@ void Request::execute(const Array& ops)
 				root=rcontext=wcontext=frame;
 				{
 					// take object or class from any wrappers
-					VAliased *aliased=self->get_aliased();
-					// substitute class alias to the class they are called AS
-					Temp_alias temp_alias(*aliased, *frame->junction.vclass);
+					// and substitute class alias to the class they are called AS
+					Temp_alias temp_alias(*self->get_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());
@@ -645,34 +651,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;
 }