--- parser3/src/classes/table.C	2008/09/03 14:29:17	1.246
+++ parser3/src/classes/table.C	2009/04/16 01:10:21	1.249
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b table parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_TABLE_C="$Date: 2008/09/03 14:29:17 $";
+static const char * const IDENT_TABLE_C="$Date: 2009/04/16 01:10:21 $";
 
 #ifndef NO_STRINGSTREAM
 #include <sstream>
@@ -344,7 +344,7 @@ static void _load(Request& r, MethodPara
 	}
 
 	// loading text
-	char *data=file_read_text(r.charsets,
+	char *data=file_load_text(r,
 		r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
 		true,
 		options
@@ -951,7 +951,7 @@ static void _locate(Request& r, MethodPa
 	bool result=params[0].get_junction()?
 		_locate_expression(table, o, r, params) :
 		_locate_name_value(table, o, r, params);
-	r.write_no_lang(*new VBool(result));
+	r.write_no_lang(VBool::get(result));
 }
 
 
@@ -1107,7 +1107,7 @@ void unmarshal_bind_updates(HashStringVa
 		if(ph->were_updated) {
 			Value* value;
 			if(ph->is_null)
-				value=new VVoid();
+				value=VVoid::get();
 			else
 				if(ph->value)
 					value=new VString(*new String(ph->value, 0, true/*tainted*/));