--- parser3/src/include/pa_request.h	2013/10/21 20:10:48	1.215
+++ parser3/src/include/pa_request.h	2015/09/28 22:26:13	1.219
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.215 2013/10/21 20:10:48 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.219 2015/09/28 22:26:13 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -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
@@ -421,6 +421,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
 
@@ -557,18 +560,10 @@ class Temp_value_element {
 	Request& frequest;
 	Value& fwhere;
 	const String& fname;
-	Value& saved;
+	Value* saved;
 public:
-	Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat) :
-		frequest(arequest),
-		fwhere(awhere),
-		fname(aname),
-		saved(frequest.get_element(awhere, aname)) {
-		frequest.put_element(fwhere, aname, awhat);
-	}
-	~Temp_value_element() { 
-		frequest.put_element(fwhere, fname, &saved);
-	}
+	Temp_value_element(Request& arequest, Value& awhere, const String& aname, Value* awhat);
+	~Temp_value_element();
 };
 
 // defines for externs
@@ -580,7 +575,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;