--- parser3/src/include/pa_request.h	2016/10/05 18:41:54	1.232
+++ parser3/src/include/pa_request.h	2016/11/01 22:39:00	1.237
@@ -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.237 2016/11/01 22:39:00 moko Exp $"
 
 #include "pa_pool.h"
 #include "pa_hash.h"
@@ -192,8 +192,9 @@ public:
 
 	/// executes ops
 	void execute(ArrayOperation& ops); // execute.C
-	void op_call(VMethodFrame &frame);
-	void op_call_write(VMethodFrame &frame);
+	void call(VMethodFrame &frame);
+	void call_expression(VMethodFrame &frame);
+	void call_write(VMethodFrame &frame);
 	Value& construct(VStateless_class &class_value, const Method &method);
 
 	/// execute ops with anti-recoursion check
@@ -231,33 +232,20 @@ 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) ));
+		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) ));
+		wcontext->write_as_string(avalue);
 	}
 
 	/// appending string, passing language built into string being written
 	void write_pass_lang(const String& astring) {
-		wcontext->write(astring, String::L_PASS_APPENDED);
+		wcontext->write(astring);
 	}
 	/// 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); 
+		wcontext->write_as_string(avalue);
 	}
 
 	/// appending sure value
@@ -458,20 +446,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;