--- parser3/src/classes/table.C	2016/10/04 22:05:28	1.336
+++ parser3/src/classes/table.C	2016/11/01 23:10:41	1.338
@@ -22,7 +22,7 @@
 #define USE_STRINGSTREAM
 #endif
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.336 2016/10/04 22:05:28 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.338 2016/11/01 23:10:41 moko Exp $";
 
 // class
 
@@ -278,7 +278,6 @@ static void _create(Request& r, MethodPa
 	}
 
 	// data
-	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	StringSplitHelper sdata(r.process_to_string(params.as_junction(data_param_index, "body must be table or code")));
 	char *data=sdata.base;
 
@@ -712,13 +711,13 @@ static void _csv_string(Request& r, Meth
 
 	table_to_csv(ost, table, control_chars, output_column_names);
 
-	r.write_no_lang(*new VString(*new String(pa_strdup(ost.str().c_str()), String::L_CLEAN)));
+	r.write(*new VString(*new String(pa_strdup(ost.str().c_str()), String::L_CLEAN)));
 #else
 	String sdata;
 
 	table_to_csv(sdata, table, control_chars, output_column_names);
 
-	r.write_no_lang(*new VString(*new String(sdata.cstr(), String::L_CLEAN)));
+	r.write(*new VString(*new String(sdata.cstr(), String::L_CLEAN)));
 #endif
 }
 
@@ -738,12 +737,12 @@ static void _count(Request& r, MethodPar
 	} else
 		result = table.count();
 
-	r.write_no_lang(*new VInt(result));
+	r.write(*new VInt(result));
 }
 
 static void _line(Request& r, MethodParams&) {
 	int result=1+GET_SELF(r, VTable).table().current();
-	r.write_no_lang(*new VInt(result));
+	r.write(*new VInt(result));
 }
 
 static void _offset(Request& r, MethodParams& params) {
@@ -763,7 +762,7 @@ static void _offset(Request& r, MethodPa
 		int offset=params.as_int(params.count()-1, "offset must be expression", r);
 		table.offset(absolute, offset);
 	} else
-		r.write_no_lang(*new VInt(table.current()));
+		r.write(*new VInt(table.current()));
 }
 
 static void _menu(Request& r, MethodParams& params) {
@@ -787,12 +786,12 @@ static void _menu(Request& r, MethodPara
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
 				if(need_delim) // need delim & iteration produced string?
-					r.write_pass_lang(r.process(*delim_maybe_code));
+					r.write(r.process(*delim_maybe_code));
 				else
 					need_delim=true;
 			}
 
-			r.write_pass_lang(sv_processed);
+			r.write(sv_processed);
 
 			if(lskip==Request::SKIP_BREAK)
 				break;
@@ -1014,7 +1013,7 @@ static void _hash(Request& r, MethodPara
 			}
 		}
 	}
-	r.write_no_lang(result);
+	r.write(result);
 }
 
 #ifndef DOXYGEN
@@ -1125,7 +1124,7 @@ static void _locate(Request& r, MethodPa
 	bool result=params[0].get_junction() || (params.count() == 1) ?
 		_locate_expression(table, r, params) :
 		_locate_name_value(table, r, params);
-	r.write_no_lang(VBool::get(result));
+	r.write(VBool::get(result));
 }
 
 
@@ -1143,7 +1142,7 @@ static void _flip(Request& r, MethodPara
 				new_table+=new_row;
 			}
 
-	r.write_no_lang(*new VTable(&new_table));
+	r.write(*new VTable(&new_table));
 }
 
 static void _foreach(Request& r, MethodParams& params) {
@@ -1180,12 +1179,12 @@ static void _foreach(Request& r, MethodP
 			const String* s_processed=sv_processed.get_string();
 			if(s_processed && !s_processed->is_empty()) { // we have body
 				if(need_delim) // need delim & iteration produced string?
-					r.write_pass_lang(r.process(*delim_maybe_code));
+					r.write(r.process(*delim_maybe_code));
 				else
 					need_delim=true;
 			}
 
-			r.write_pass_lang(sv_processed);
+			r.write(sv_processed);
 
 			if(lskip==Request::SKIP_BREAK)
 				break;
@@ -1217,7 +1216,6 @@ inline Table::element_type row_from_stri
 	if(!param.is_string() && !param.get_junction())
 		throw Exception(PARSER_RUNTIME, 0, "row must be string, code or hash");
 
-	Temp_lang temp_lang(r, String::L_PASS_APPENDED);
 	const String& string=r.process_to_string(param);
 
 	// parse cells
@@ -1407,9 +1405,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());
 
 	Table_sql_event_handlers handlers;
 
@@ -1451,7 +1448,7 @@ static void _columns(Request& r, MethodP
 		}
 	}
 
-	r.write_no_lang(*new VTable(&result_table));
+	r.write(*new VTable(&result_table));
 }
 
 static void _select(Request& r, MethodParams& params) {
@@ -1514,7 +1511,7 @@ static void _select(Request& r, MethodPa
 		source_table.set_current(saved_current);
 	}
 
-	r.write_no_lang(*new VTable(&result_table));
+	r.write(*new VTable(&result_table));
 }
 
 // constructor