--- parser3/src/include/pa_request.h	2001/03/12 18:13:49	1.44
+++ parser3/src/include/pa_request.h	2001/03/13 13:53:36	1.47
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.44 2001/03/12 18:13:49 paf Exp $
+	$Id: pa_request.h,v 1.47 2001/03/13 13:53:36 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -16,6 +16,8 @@
 #include "pa_value.h"
 #include "pa_stack.h"
 #include "pa_vclass.h"
+#include "pa_vobject.h"
+#include "pa_venv.h"
 
 #define UNNAMED_NAME "unnamed"
 
@@ -30,16 +32,16 @@
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
 		const char *source, \
-		VClass *aclass, const String *name, \
-		VClass *base_class, \
+		VStateless_class *aclass, const String *name, \
+		VStateless_class *base_class, \
 		const char *file
 #	define COMPILE(source, aclass, name, base_class, file)  \
 		real_compile(source, aclass, name, base_class, file)
 #else
 #	define COMPILE_PARAMS  \
 		const char *source, \
-		VClass *aclass, const String *name, \
-		VClass *base_class
+		VStateless_class *aclass, const String *name, \
+		VStateless_class *base_class
 #	define COMPILE(source, aclass, name, base_class, file)  \
 		real_compile(source, aclass, name, base_class)
 #endif
@@ -62,14 +64,14 @@ public:
 
 	void execute(const Array& ops);
 
-	VClass *use_file(
+	VStateless_class *use_file(
 		const char *file, bool fail_on_read_problem=true,
-		VClass *aclass=0, const String *name=0, 
-		VClass *base_class=0); // core.C
-	VClass *use_buf(
+		const String *name=0, 
+		VStateless_class *base_class=0); // core.C
+	VStateless_class *use_buf(
 		const char *source, const char *file,
-		VClass *aclass=0, const String *name=0, 
-		VClass *base_class=0); // core.C
+		VStateless_class *aclass=0, const String *name=0, 
+		VStateless_class *base_class=0); // core.C
 	Value& process(
 		Value& value, 
 		const String *name=0,
@@ -98,7 +100,7 @@ public:
 	// default base
 	VClass root_class;
 	// $ENV:fields here
-	VClass env_class;
+	VEnv env_class;
 
 	// contexts
 	Value *self, *root, *rcontext;
@@ -113,17 +115,14 @@ private: // core data
 	// execution stack
 	Stack stack;
 
-private: // core.C
-
-	char *execute_MAIN();
-
 private: // compile.C
 
-	VClass& real_compile(COMPILE_PARAMS);
+	VStateless_class& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	char *execute_static_method(VClass& vclass, String& method_name, bool return_cstr);
+	char *execute_method(Value& aself, const Method& method, bool return_cstr);
+	char *execute_method(Value& aself, const String& method_name, bool return_cstr);
 
 	Value *get_element();