--- parser3/src/main/execute.C	2002/04/22 09:20:29	1.238
+++ parser3/src/main/execute.C	2002/08/01 11:26:49	1.243
@@ -3,10 +3,10 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: execute.C,v 1.238 2002/04/22 09:20:29 paf Exp $
 */
 
+static const char* IDENT_EXECUTE_C="$Id: execute.C,v 1.243 2002/08/01 11:26:49 paf Exp $";
+
 #include "pa_opcode.h"
 #include "pa_array.h" 
 #include "pa_request.h"
@@ -961,29 +961,21 @@ StringOrValue Request::process(Value& in
 	return result;
 }
 
-const String *Request::execute_method(Value& aself, const Method& method,
-		bool return_cstr) {
+const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) {
 	PUSH(self);  
 	PUSH(root);  
 	PUSH(rcontext);  
 	PUSH(wcontext);
 	
 	// initialize contexts
-	root=rcontext=self=&aself;
-	WWrapper local(pool(), &aself);
-	wcontext=&local; 
+	root=rcontext=self=&amethodFrame;
+	wcontext=&amethodFrame;
 	
 	// execute!	
 	execute(*method.parser_code);
 	
 	// result
-	const String *result=0;
-	if(return_cstr) {
-		if(Value *result_var_value=wcontext->get_element(*result_var_name))
-			result=&result_var_value->as_string();
-		else
-			result=&wcontext->as_string();
-	}
+	const String& result=wcontext->result().as_string();
 	
 	wcontext=static_cast<WContext *>(POP());  
 	rcontext=POP();  
@@ -994,46 +986,72 @@ const String *Request::execute_method(Va
 	return result;
 }
 
-const String& Request::execute_method(VMethodFrame& amethodFrame, const Method& method) {
+void Request::execute_method(Value& aself, 
+							 const Method& method, VString *optional_param,
+							 const String **return_string) {
 	PUSH(self);  
 	PUSH(root);  
 	PUSH(rcontext);  
 	PUSH(wcontext);
 	
 	// initialize contexts
-	root=rcontext=self=&amethodFrame;
-	wcontext=&amethodFrame;
+	//root=rcontext=self=&aself;
+	self=&aself;	
+//	WWrapper local(pool(), &aself);
+//	wcontext=&local; 
+	Junction local_junction(pool(), *self, self->get_class(), &method, 0,0,0,0);
+	VMethodFrame local_frame(pool(), method.name, local_junction);
+	if(optional_param && local_frame.can_store_param()) {
+		local_frame.store_param(optional_param);
+		local_frame.fill_unspecified_params();
+	}
+	local_frame.set_self(*self);
+	root=rcontext=wcontext=&local_frame; 
 	
 	// execute!	
 	execute(*method.parser_code);
 	
 	// result
-	const String& result=wcontext->result().as_string();
+	const String *result=0;
+	if(return_string) {
+		/*if(Value *result_var_value=wcontext->get_element(*result_var_name))
+			*return_string=&result_var_value->as_string();
+		else
+			*return_string=&wcontext->as_string();*/
+		*return_string=&wcontext->result().as_string();
+	}
 	
 	wcontext=static_cast<WContext *>(POP());  
 	rcontext=POP();  
 	root=POP();  
 	self=static_cast<VAliased *>(POP());
-	
-	// return
-	return result;
+}
+
+void Request::execute_nonvirtual_method(VStateless_class& aclass, 
+												 const String& method_name, VString *optional_param,
+												 const String **return_string,
+												 const Method **return_method) {
+
+	const Method *method=aclass.get_method(method_name);
+	if(return_string)
+		*return_string=0;
+	if(return_method)
+		*return_method=method;
+
+	if(method)
+		execute_method(aclass, *method, optional_param, return_string);
 }
 
 const String *Request::execute_virtual_method(Value& aself, 
 											  const String& method_name) {
 	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, true /*return_cstr*/);
+			if(const Method *method=junction->method) {
+				const String *result;
+				execute_method(aself, *method, 0/*no params*/, &result);
+				return result;
+			}
 			
 	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;
-}