--- parser3/src/main/execute.C	2001/05/17 15:20:15	1.159
+++ parser3/src/main/execute.C	2001/06/27 12:44:33	1.167
@@ -5,16 +5,15 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.159 2001/05/17 15:20:15 parser Exp $
+	$Id: execute.C,v 1.167 2001/06/27 12:44:33 parser Exp $
 */
 
-#include "pa_config_includes.h"
 #include "pa_opcode.h"
 #include "pa_array.h" 
 #include "pa_request.h"
 #include "pa_vstring.h"
 #include "pa_vhash.h"
-#include "pa_vunknown.h"
+#include "pa_vvoid.h"
 #include "pa_vcode_frame.h"
 #include "pa_vmethod_frame.h"
 #include "pa_vobject.h"
@@ -301,7 +300,7 @@ void Request::execute(const Array& ops)
 				if(string)
 					value=NEW VString(*string);
 				else
-					value=NEW VUnknown(pool());
+					value=NEW VVoid(pool());
 				wcontext=static_cast<WContext *>(POP());
 				rcontext=POP();
 				PUSH(value);
@@ -322,7 +321,7 @@ void Request::execute(const Array& ops)
 				if(string)
 					value=NEW VString(*string);
 				else
-					NEW VUnknown(pool());
+					NEW VVoid(pool());
 				wcontext=static_cast<WContext *>(POP());
 				PUSH(value);
 				break;
@@ -416,14 +415,14 @@ void Request::execute(const Array& ops)
 							method.check_actual_numbered_params(pool(),
 								frame->junction.self, 
 								frame->name(), frame->numbered_params());
-							(*method.native_code)(
+							method.native_code(
 								*this, 
 								frame->name(), frame->numbered_params()); // execute it
 						} else { // parser code
 							if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
 								anti_endless_execute_recoursion=0; // give @exception a chance
 								THROW(0, 0,
-									&method.name,
+									&frame->name(),
 									"endless recursion detected");
 							}
 							
@@ -706,14 +705,14 @@ Value *Request::get_element() {
 	if(value)
 		value=&process(*value, &name); // process possible code-junction
 	else {
-		value=NEW VUnknown(pool());
+		value=NEW VVoid(pool());
 		value->set_name(name);
 	}
 
 	return value;
 }
 
-/**	intercept_string:
+/**	@param intercept_string
 	- true:
 		they want result=string value, 
 		possible object result goes to wcontext