--- parser3/src/include/pa_request.h	2001/03/14 16:47:29	1.53
+++ parser3/src/include/pa_request.h	2001/03/18 14:45:26	1.59
@@ -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.53 2001/03/14 16:47:29 paf Exp $
+	$Id: pa_request.h,v 1.59 2001/03/18 14:45:26 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,16 +47,16 @@ 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;
 	};
 	
 	Request(Pool& apool,
 		Info& ainfo,
-		String::Untaint_lang alang
+		String::Untaint_lang adefault_lang
 	);
 	~Request() {}
 
@@ -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);
 
@@ -81,25 +83,33 @@ public:
 		const String *name=0,
 		bool intercept_string=true); // execute.C
 
+	// write(const) = clean
 	void write(const String& astring) {
-		wcontext->write(astring, String::Untaint_lang::NO);  // write(const) = clean
+		wcontext->write(astring, String::Untaint_lang::NO);
 	}
+	// appending, sure of clean string inside
 	void write_no_lang(String& astring) {
-		// appending, sure of clean string inside
 		wcontext->write(astring, String::Untaint_lang::NO);
 	}
-
+	// appending string, passing language built into string being written
+	void write_pass_lang(String& astring) {
+		wcontext->write(astring, String::Untaint_lang::PASS_APPEND); 
+	}
+	// appending possible string, assigning untaint language
 	void write_assign_lang(Value& avalue) {
-		// appending possible string, assigning untaint language
 		wcontext->write(avalue, flang); 
 	}
+	// appending possible string, passing language built into string being written
 	void write_pass_lang(Value& avalue) {
-		// appending possible string, passing language built into string being written
-		wcontext->write(avalue, String::Untaint_lang::PASS_APPENDED); 
+		wcontext->write(avalue, String::Untaint_lang::PASS_APPEND); 
 	}
+	// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
-		// appending sure value, no strings inside
-		wcontext->write(avalue, String::Untaint_lang::NO); 
+		wcontext->write(avalue, String::Untaint_lang::NO);
+	}
+	// appending sure value, not VString
+	void write_expr_result(Value& avalue) {
+		wcontext->write(avalue); 
 	}
 
 	void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg);
@@ -113,11 +123,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;
@@ -137,8 +151,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();
 
@@ -146,6 +162,11 @@ private: // lang&raw
 	
 	String::Untaint_lang flang;
 
+private: // defaults
+
+	const String::Untaint_lang fdefault_lang;
+	Value *fdefault_content_type;
+
 private: // lang manipulation
 
 	String::Untaint_lang set_lang(String::Untaint_lang alang) {
@@ -157,11 +178,9 @@ private: // lang manipulation
 		flang=alang;
 	}
 
-private: // web
-
-	const char *fdocument_root;
-	const char *fpage_filespec;
+private:
 
+	void output_result(const String& body_string);
 };
 
 class Temp_lang {