--- parser3/src/include/pa_request.h	2016/10/05 18:41:54	1.232
+++ parser3/src/include/pa_request.h	2016/11/29 14:32:32	1.243
@@ -8,7 +8,7 @@
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
-#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.232 2016/10/05 18:41:54 moko Exp $"
+#define IDENT_PA_REQUEST_H "$Id: pa_request.h,v 1.243 2016/11/29 14:32:32 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -123,7 +123,7 @@ private:
 	Array<String::Body> file_list;
 
 	/// endless execute(execute(... preventing counter
-	uint anti_endless_execute_recoursion;
+	int anti_endless_execute_recoursion;
 
 	///@}
 
@@ -192,8 +192,33 @@ public:
 
 	/// executes ops
 	void execute(ArrayOperation& ops); // execute.C
-	void op_call(VMethodFrame &frame);
-	void op_call_write(VMethodFrame &frame);
+
+	template<typename Frame> void call(Frame& frame){
+		VMethodFrame *saved_method_frame=method_frame;
+		Value* saved_rcontext=rcontext;
+		WContext *saved_wcontext=wcontext;
+
+		rcontext=wcontext=method_frame=&frame;
+
+		frame.call(*this);
+
+		wcontext=saved_wcontext;
+		rcontext=saved_rcontext;
+		method_frame=saved_method_frame;
+	}
+
+	template<typename Frame> void call_write(Frame& frame){
+		VMethodFrame *saved_method_frame=method_frame;
+		Value* saved_rcontext=rcontext;
+
+		rcontext=method_frame=&frame;
+
+		frame.call(*this);
+
+		rcontext=saved_rcontext;
+		method_frame=saved_method_frame;
+	}
+
 	Value& construct(VStateless_class &class_value, const Method &method);
 
 	/// execute ops with anti-recoursion check
@@ -211,7 +236,9 @@ public:
 
 	/// 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, Operation::Origin origin);
+
+	/// for @USE only, calls ^use (which may be user-defined)
+	void use_file(const String& file_name, const String* use_filespec, Operation::Origin origin);
 
 	/// compiles a @a source buffer
 	void use_buf(VStateless_class& aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset=0);
@@ -226,42 +253,22 @@ public:
 		return process(input_value).as_string();
 	}
 	//@}
-	const String* get_method_filename(const Method* method); // execute.C
-	const String* get_used_filename(uint file_no);
+	const String* get_method_filespec(const Method* method); // execute.C
+	const String* get_used_filespec(uint file_no);
 	
-	/// 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) ));
+	/// appending string with it's languages
+	inline void write(const String& astring) {
+		wcontext->write(astring);
 	}
-	/// appending sure value, that would be converted to clean string
-	void write_no_lang(Value& avalue) {
-		if(wcontext->get_in_expression())
-			wcontext->write(avalue);
-		else
-			wcontext->write(avalue, (String::Language)(String::L_CLEAN | (flang & String::L_OPTIMIZE_BIT) ));
-	}
-
-	/// appending string, passing language built into string being written
-	void write_pass_lang(const String& astring) {
-		wcontext->write(astring, String::L_PASS_APPENDED);
-	}
-	/// appending possible string, passing language built into string being written
-	void write_pass_lang(Value& avalue) {
-		wcontext->write(avalue, String::L_PASS_APPENDED);
-	}
-
-	/// appending possible string, assigning untaint language
-	void write_assign_lang(Value& avalue) {
-		wcontext->write(avalue, flang); 
-	}
-	/// appending string, assigning untaint language
-	void write_assign_lang(const String& astring) {
-		wcontext->write(astring, flang); 
+	
+	/// in [] and {} appending string if get_string is not null, else appending value
+	/// in () appending string if is_string, else appending value
+	inline void write(Value& avalue) {
+		wcontext->write_as_string(avalue);
 	}
 
-	/// appending sure value
-	void write_value(Value& avalue) {
+	/// allways appending value
+	inline void write_value(Value& avalue) {
 		wcontext->write(avalue);
 	}
 
@@ -333,9 +340,6 @@ public: // status read methods
 	/// for @main[]
 	const String* execute_virtual_method(Value& aself, const String& method_name);
 
-	/// 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, bool do_return_string);
 
@@ -458,20 +462,6 @@ public:
 	}
 };
 
-///	Auto-object used for temporary changing Request::flang.
-class Temp_lang {
-	Request& frequest;
-	String::Language saved_lang;
-public:
-	Temp_lang(Request& arequest, String::Language alang) :
-		frequest(arequest),
-		saved_lang(arequest.set_lang(alang)) {
-	}
-	~Temp_lang() {
-		frequest.restore_lang(saved_lang);
-	}
-};
-
 ///	Auto-object used for temporary changing Request::fconnection.
 class Temp_connection {
 	Request& frequest;