--- parser3/src/include/pa_request.h	2013/08/21 12:11:14	1.212
+++ parser3/src/include/pa_request.h	2015/10/26 01:21:56	1.221
@@ -1,14 +1,14 @@
 /** @file
 	Parser: request class decl.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 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
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.212 2013/08/21 12:11:14 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.221 2015/10/26 01:21:56 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -18,7 +18,6 @@
 #include "pa_request_info.h"
 #include "pa_request_charsets.h"
 #include "pa_sapi.h"
-#include "pa_vconsole.h"
 
 // consts
 
@@ -35,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:
@@ -51,7 +52,6 @@ public:
 	public:
 		Trace(): fname(0) {}
 		void clear() { fname=0; }
-		operator bool() const { return fname!=0; }
 
 		Trace(const String* aname, const Operation::Origin aorigin):
 			fname(aname), forigin(aorigin) {}
@@ -107,8 +107,6 @@ private:
 		bool is_empty() {
 			return fused==fbottom;
 		}
-
-		const element_type extract_origin(const String*& problem_source);
 	};
 
 	///@{ core data
@@ -136,6 +134,8 @@ private:
 	Exception_trace exception_trace;
 public:
 
+	bool allow_class_replace;
+
 	//@{ request processing status
 	/// contexts
 	VMethodFrame* method_frame;
@@ -155,14 +155,10 @@ public:
 	uint register_file(String::Body file_spec);
 
 	struct Exception_details {
-		const Trace trace;
+		const Operation::Origin origin;
 		const String* problem_source;
 		VHash& vhash;
-
-		Exception_details(
-			const Trace atrace,
-			const String* aproblem_source,
-			VHash& avhash): trace(atrace), problem_source(aproblem_source), vhash(avhash) {}
+		Exception_details(const Operation::Origin aorigin, const String* aproblem_source, VHash& avhash): origin(aorigin), problem_source(aproblem_source), vhash(avhash) {}
 	};
 	Exception_details get_details(const Exception& e);
 	const char* get_exception_cstr(const Exception& e, Exception_details& details);
@@ -223,9 +219,8 @@ public:
 				bool fail_on_file_absence=true);
 				
 	/// compiles the file, maybe forcing it's class @a name and @a base_class.
-	void use_file(VStateless_class& aclass,
-		const String& file_name,
-		const String* use_filespec);
+	void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec);
+	void use_file(VStateless_class& aclass, const String& file_name, const String* use_filespec, Operation::Origin origin);
 
 	/// compiles a @a source buffer
 	void use_buf(VStateless_class& aclass,
@@ -260,7 +255,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) {
@@ -268,7 +263,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
@@ -418,6 +413,9 @@ private: // compile.C
 private: // execute.C
 
 	Value& get_element(Value& ncontext, const String& name);
+#ifdef FEATURE_GET_ELEMENT4CALL
+	Value& get_element4call(Value& ncontext, const String& name);
+#endif
 
 private: // defaults
 
@@ -537,6 +535,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"
@@ -546,7 +567,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;