--- parser3/src/include/pa_request.h	2002/06/12 14:09:49	1.138
+++ parser3/src/include/pa_request.h	2002/08/01 11:41:15	1.142
@@ -3,13 +3,13 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_request.h,v 1.138 2002/06/12 14:09:49 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
+static const char* IDENT_REQUEST_H="$Date: 2002/08/01 11:41:15 $";
+
 #include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -20,6 +20,7 @@
 #include "pa_venv.h"
 #include "pa_vstatus.h"
 #include "pa_vform.h"
+#include "pa_vmail.h"
 #include "pa_vmath.h"
 #include "pa_vrequest.h"
 #include "pa_vresponse.h"
@@ -81,6 +82,7 @@ public:
 		const char *content_type;
 		size_t content_length;
 		const char *cookie;
+		bool mail_received;
 	};
 	
 	Request(Pool& apool,
@@ -126,7 +128,7 @@ public:
 		VStateless_class *base_class=0); // core.C
 	/// compiles a @a source buffer
 	VStateless_class *use_buf(
-		const char *source, const char *file,
+		const char *source, const String& filespec, const char *filespec_cstr,
 		VStateless_class *aclass=0, const String *name=0, 
 		VStateless_class *base_class=0); // core.C
 
@@ -238,6 +240,8 @@ public:
 	VStatus status;
 	/// $form:elements
 	VForm form;
+	/// $mail
+	VMail mail;
 	/// $math:constants
 	VMath math;
 	/// $request:elements
@@ -290,14 +294,19 @@ private: // compile.C
 
 private: // execute.C
 
-	void execute_method(Value& aself, const Method& method,
-		const String **return_string);
+	/// for @postprocess[body]
 	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
-	const String *execute_virtual_method(Value& aself, const String& method_name);
+	//{ for @conf[filespec] and @auto[filespec]
+	void execute_method(Value& aself, 
+		const Method& method, VString *optional_param,
+		const String **return_string);
 	void execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name,
+		const String& method_name, VString *optional_param,
 		const String **return_string,
 		const Method **return_method=0);
+	//}
+	/// for @main[]
+	const String *execute_virtual_method(Value& aself, const String& method_name);
 
 	Value *get_element(const String *& remember_name, bool can_call_operator);