--- parser3/src/classes/hash.C	2016/10/04 13:23:45	1.133
+++ parser3/src/classes/hash.C	2016/10/26 15:44:49	1.136
@@ -17,7 +17,7 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.133 2016/10/04 13:23:45 moko Exp $";
+volatile const char * IDENT_HASH_C="$Id: hash.C,v 1.136 2016/10/26 15:44:49 moko Exp $";
 
 // class
 
@@ -332,9 +332,8 @@ static void _sql(Request& r, MethodParam
 	if(bind)
 		placeholders_count=marshal_binds(*bind, placeholders);
 
-	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(String::L_SQL, r.connection());
 
 	HashStringValue& hash=GET_SELF(r, VHashBase).hash();
 	hash.clear();	
@@ -400,7 +399,7 @@ static void _foreach(Request& r, MethodP
 	const String* key_var_name=&params.as_string(0, "key-var name must be string");
 	const String* value_var_name=&params.as_string(1, "value-var name must be string");
 	Value* body_code=&params.as_junction(2, "body must be code");
-	Value* delim_maybe_code=params.count()>3?params.get(3):0;
+	Value* delim_maybe_code=params.count()>3?&params[3]:0;
 	Value& caller=*r.get_method_frame()->caller();
 
 	if(key_var_name->is_empty()) key_var_name=0;
@@ -570,7 +569,7 @@ static void _at(Request& r, MethodParams
 			throw Exception(PARSER_RUNTIME, &stype, "type must be 'key', 'value' or 'hash'");
 	}
 
-	Value& vwhence=*params.get(0);
+	Value& vwhence=params[0];
 	if(vwhence.is_string()) {
 		const String& swhence=*vwhence.get_string();
 		if(swhence == "last")
@@ -591,15 +590,15 @@ static void _at(Request& r, MethodParams
 				{
 #ifdef HASH_ORDER
 					if(pos == 0) {
-						r.write_assign_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED)));
+						r.write_pass_lang(*new VString(*new String(hash.first_key(), String::L_TAINTED)));
 					} else if((size_t)pos == count-1) {
-						r.write_assign_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED)));
+						r.write_pass_lang(*new VString(*new String(hash.last_key(), String::L_TAINTED)));
 					} else
 #endif
 					{
 						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
 							if(!pos){
-								r.write_assign_lang(*new VString(*new String(i.key(), String::L_TAINTED)));
+								r.write_pass_lang(*new VString(*new String(i.key(), String::L_TAINTED)));
 								break;
 							}
 					}
@@ -609,15 +608,15 @@ static void _at(Request& r, MethodParams
 				{
 #ifdef HASH_ORDER
 					if(pos == 0) {
-						r.write_assign_lang(*hash.first_value());
+						r.write_pass_lang(*hash.first_value());
 					} else if((size_t)pos == count-1) {
-						r.write_assign_lang(*hash.last_value());
+						r.write_pass_lang(*hash.last_value());
 					} else
 #endif
 					{
 						for(HashStringValue::Iterator i(hash); i; i.next(), pos-- )
 							if(!pos){
-								r.write_assign_lang(*i.value());
+								r.write_pass_lang(*i.value());
 								break;
 							}
 					}