--- parser3/src/include/pa_request.h	2006/04/09 13:38:47	1.181
+++ parser3/src/include/pa_request.h	2009/06/16 08:39:00	1.194
@@ -1,14 +1,14 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-static const char * const IDENT_REQUEST_H="$Date: 2006/04/09 13:38:47 $";
+static const char * const IDENT_REQUEST_H="$Date: 2009/06/16 08:39:00 $";
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -18,6 +18,7 @@ static const char * const IDENT_REQUEST_
 #include "pa_request_info.h"
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
+#include "pa_vconsole.h"
 
 #ifdef RESOURCES_DEBUG
 #include <sys/resource.h>
@@ -104,11 +105,11 @@ private:
 		element_type bottom_value() { return get(bottom_index()); }
 
 		void clear() {
-			ftop=fbottom=0;
+			fused=fbottom=0;
 		}
 
 		bool is_empty() {
-			return ftop==fbottom;
+			return fused==fbottom;
 		}
 
 		const element_type extract_origin(const String*& problem_source);
@@ -120,7 +121,7 @@ private:
 	HashStringValue fclasses;
 
 	/// already used files to avoid cyclic uses
-	Hash<const String::Body, bool> used_files;
+	HashString<bool> used_files;
 	/// list of all used files, Operation::file_no = index to it
 	Array<String::Body> file_list;
 
@@ -200,12 +201,15 @@ public:
 
 	/// executes ops
 	void execute(ArrayOperation& ops); // execute.C
+	void op_call(VMethodFrame &frame);
+	void op_call_write(VMethodFrame &frame);
+	void op_call(VMethodFrame &frame, bool constructing);
 	/// execute ops with anti-recoursion check
 	void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) {
 		// anti_endless_execute_recoursion
 		if(++anti_endless_execute_recoursion==ANTI_ENDLESS_EXECUTE_RECOURSION) {
 			anti_endless_execute_recoursion=0; // give @exception a chance
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0, //&name,
 				"call canceled - endless recursion detected");
 		}
@@ -229,6 +233,7 @@ public:
 
 	/// processes any code-junction there may be inside of @a value
 	StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C
+	void process_write(Value& input_value); // execute.C
 	//@{ convinient helpers
 	const String& process_to_string(Value& input_value) {
 		return process(input_value, true/*intercept_string*/).as_string();
@@ -293,7 +298,7 @@ public:
 	/// returns current SQL connection if any
 	SQL_Connection* connection(bool fail_on_error=true) { 
 		if(fail_on_error && !fconnection)
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"outside of 'connect' operator");
 
@@ -327,9 +332,11 @@ public:
 	VResponse& response;
 	/// $cookie:elements
 	VCookie& cookie;
+	/// $console
+	VConsole& console;
 
 	/// classes configured data
-	Hash<const String::Body, void*> classes_conf;
+	HashString<void*> classes_conf;
 
 public: // status read methods
 
@@ -352,7 +359,7 @@ public: // status read methods
 	StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method);
 	//{ for @conf[filespec] and @auto[filespec] and parser://method/call
 	const String* execute_method(Value& aself, 
-		const Method& method, VString* optional_param,
+		const Method& method, Value* optional_param,
 		bool do_return_string);
 	struct Execute_nonvirtual_method_result {
 		const String* string;
@@ -360,7 +367,8 @@ public: // status read methods
 		Execute_nonvirtual_method_result(): string(0), method(0) {}
 	};
 	Execute_nonvirtual_method_result execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name, VString* optional_param,
+		const String& method_name,
+		VString* optional_param,
 		bool do_return_string);
 	//}
 
@@ -387,15 +395,15 @@ private:
 
 private: // compile.C
 
-	VStateless_class& compile(VStateless_class* aclass, 
+	ArrayClass& compile(VStateless_class* aclass, 
 		const char* source, const String* main_alias, 
 		uint file_no,
 		int line_no_offset);
 
 private: // execute.C
 
-	void put_element(Value& ncontext, const String& name, Value& value);
-	Value& get_element(Value& ncontext, const String& name, bool can_call_operator);
+	void put_element(Value& ncontext, const String& name, Value* value);
+	Value& get_element(Value& ncontext, const String& name);
 
 private: // defaults
 
@@ -506,9 +514,12 @@ public:
 
 // defines for externs
 
+#define CONTENT_TRANSFER_ENCODING_NAME "content-transfer-encoding"
 #define CONTENT_DISPOSITION_NAME "content-disposition"
-#define CONTENT_DISPOSITION_VALUE "attachment"
+#define CONTENT_DISPOSITION_ATTACHMENT "attachment"
+#define CONTENT_DISPOSITION_INLINE "inline"
 #define CONTENT_DISPOSITION_FILENAME_NAME "filename"
+
 #define EXCEPTION_HANDLED_PART_NAME "handled"
 
 
@@ -517,8 +528,11 @@ public:
 extern const String main_method_name;
 extern const String auto_method_name;
 extern const String body_name;
+
+extern const String content_transfer_encoding_name;
 extern const String content_disposition_name;
-extern const String content_disposition_value;
+extern const String content_disposition_attachment;
+extern const String content_disposition_inline;
 extern const String content_disposition_filename_name;
 
 extern const String exception_type_part_name;