--- parser3/src/include/pa_request.h	2010/05/25 03:58:17	1.201
+++ parser3/src/include/pa_request.h	2015/06/03 00:13:19	1.218
@@ -1,14 +1,14 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (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: 2010/05/25 03:58:17 $";
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.218 2015/06/03 00:13:19 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -18,11 +18,6 @@ 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>
-#endif
 
 // consts
 
@@ -39,13 +34,15 @@ class VForm;
 class VResponse;
 class VCookie;
 class VStateless_class;
+class VConsole;
 
 /// Main workhorse.
 class Request: public PA_Object {
 	friend class Temp_lang;
 	friend class Temp_connection;
-	friend class Request_context_saver;
 	friend class Temp_request_self;
+	friend class Temp_value_element;
+	friend class Request_context_saver;
 	friend class Exception_trace;
 
 public:
@@ -140,6 +137,8 @@ private:
 	Exception_trace exception_trace;
 public:
 
+	bool allow_class_replace;
+
 	//@{ request processing status
 	/// contexts
 	VMethodFrame* method_frame;
@@ -183,8 +182,7 @@ public:
 #endif	
 
 	Request(SAPI_Info& asapi_info, Request_info& arequest_info,
-		String::Language adefault_lang, ///< all tainted data default untainting lang
-		bool status_allowed ///<  status class allowed
+		String::Language adefault_lang ///< all tainted data default untainting lang
 	);
 	~Request();
 
@@ -206,7 +204,8 @@ public:
 	void execute(ArrayOperation& ops); // execute.C
 	void op_call(VMethodFrame &frame);
 	void op_call_write(VMethodFrame &frame);
-	void op_call(VMethodFrame &frame, bool constructing);
+	Value& construct(Value &class_value, const Method &method);
+
 	/// execute ops with anti-recoursion check
 	void recoursion_checked_execute(/*const String& name, */ArrayOperation& ops) {
 		// anti_endless_execute_recoursion
@@ -239,6 +238,7 @@ public:
 		int line_no_offset=0);
 
 	/// processes any code-junction there may be inside of @a value
+	StringOrValue process_getter(Junction& junction); // execute.C
 	StringOrValue process(Value& input_value, bool intercept_string=true); // execute.C
 	void process_write(Value& input_value); // execute.C
 	//@{ convinient helpers
@@ -263,7 +263,7 @@ public:
 	/// appending, sure of clean string inside
 	void write_no_lang(const String& astring) {
 		wcontext->write(astring, 
-			(String::Language)(String::L_CLEAN | flang&String::L_OPTIMIZE_BIT));
+			(String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) ));
 	}
 	/// appending sure value, that would be converted to clean string
 	void write_no_lang(Value& avalue) {
@@ -271,7 +271,7 @@ public:
 			wcontext->write(avalue);
 		else
 			wcontext->write(avalue, 
-				(String::Language)(String::L_CLEAN | flang&String::L_OPTIMIZE_BIT));
+				(String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) ));
 	}
 
 	/// appending string, passing language built into string being written
@@ -300,6 +300,9 @@ public:
 	/// returns an absolute @a path to relative @a name
 	const String& absolute(const String& relative_name);
 
+	/// returns the mime type of 'user_file_name'
+	const String& mime_type_of(const String* file_name);
+
 	/// returns the mime type of 'user_file_name_cstr'
 	const String& mime_type_of(const char* user_file_name_cstr);
 
@@ -363,11 +366,15 @@ public: // status read methods
 	}
 	*/
 
+	/// public for ^reflection:copy[]
+	void put_element(Value& ncontext, const String& name, Value* value);
+
 	/// for @main[]
 	const String* execute_virtual_method(Value& aself, const String& method_name);
 
-	/// for @postprocess[body]
-	StringOrValue execute_method(VMethodFrame& amethodFrame, const Method& method);
+	/// executes parser method, use op_call(frame) to execute native method
+	void execute_method(VMethodFrame& aframe);
+
 	//{ for @conf[filespec] and @auto[filespec] and parser://method/call
 	const String* execute_method(Value& aself, 
 		const Method& method, Value* optional_param,
@@ -413,7 +420,6 @@ private: // compile.C
 
 private: // execute.C
 
-	void put_element(Value& ncontext, const String& name, Value* value);
 	Value& get_element(Value& ncontext, const String& name);
 
 private: // defaults
@@ -534,6 +540,29 @@ public:
 	}
 };
 
+///	Auto-object used for temporary changing Request::allow_class_replace.
+class Temp_class_replace {
+	Request& frequest;
+public:
+	Temp_class_replace(Request& arequest, bool avalue) : frequest(arequest){
+		frequest.allow_class_replace=avalue;
+	}
+	~Temp_class_replace() {
+		frequest.allow_class_replace=false;
+	}
+};
+
+///	Auto-object used for temporarily substituting/removing elements
+class Temp_value_element {
+	Request& frequest;
+	Value& fwhere;
+	const String& fname;
+	Value* saved;
+public:
+	Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat);
+	~Temp_value_element();
+};
+
 // defines for externs
 
 #define EXCEPTION_HANDLED_PART_NAME "handled"
@@ -543,7 +572,6 @@ public:
 
 extern const String main_method_name;
 extern const String auto_method_name;
-extern const String body_name;
 
 extern const String exception_type_part_name;
 extern const String exception_source_part_name;