--- parser3/src/include/pa_request.h	2001/03/16 09:26:42	1.55
+++ parser3/src/include/pa_request.h	2001/03/18 11:37:51	1.57
@@ -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.55 2001/03/16 09:26:42 paf Exp $
+	$Id: pa_request.h,v 1.57 2001/03/18 11:37:51 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -18,6 +18,8 @@
 #include "pa_vobject.h"
 #include "pa_venv.h"
 #include "pa_vform.h"
+#include "pa_vrequest.h"
+#include "pa_vresponse.h"
 
 #ifndef NO_STRING_ORIGIN
 #	define COMPILE_PARAMS  \
@@ -45,9 +47,9 @@ public:
 	struct Info {
 		const char *document_root;
 		const char *path_translated;
-		const char *request_method;
+		const char *method;
 		const char *query_string;
-		const char *request_uri;
+		const char *uri;
 		const char *content_type;
 		size_t content_length;
 	};
@@ -62,7 +64,7 @@ public:
 	Hash& classes() { return fclasses; }
 
 	// core request processing
-	char *core(
+	void core(Exception& system_exception,
 		const char *sys_auto_path1,
 		const char *sys_auto_path2);
 
@@ -117,11 +119,15 @@ public:
 	Info& info;
 
 	// default base
-	VClass root_class;
+	VClass ROOT;
 	// $env:fields here
-	VEnv env_class;
+	VEnv env;
 	// $form:elements here
-	VForm form_class;
+	VForm form;
+	// $request:elements here
+	VRequest request;
+	// $response:
+	VResponse response;
 
 	// contexts
 	Value *self, *root, *rcontext;
@@ -141,8 +147,10 @@ private: // compile.C
 
 private: // execute.C
 
-	char *execute_method(Value& aself, const Method& method, bool return_cstr=true);
-	char *execute_method(Value& aself, const String& method_name, bool return_cstr=true);
+	const String *execute_method(Value& aself, const Method& method, 
+		bool return_cstr=true);
+	const String *execute_method(Value& aself, const String& method_name, 
+		bool return_cstr=true);
 
 	Value *get_element();