--- parser3/src/classes/void.C	2008/07/18 08:24:35	1.40
+++ parser3/src/classes/void.C	2010/10/21 15:06:29	1.47
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b VOID 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_VOID_C="$Date: 2008/07/18 08:24:35 $";
+static const char * const IDENT_VOID_C="$Date: 2010/10/21 15:06:29 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -26,8 +26,6 @@ extern String sql_bind_name;
 class MVoid: public Methoded {
 public:
 	MVoid();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
@@ -69,8 +67,7 @@ static void _double(Request& r, MethodPa
 
 static void _bool(Request& r, MethodParams& params) {
 	VVoid& vvoid=GET_SELF(r, VVoid);
-	r.write_no_lang(*new VBool(
-		params.count()==0?vvoid.as_bool():params.as_bool(0, "default must be bool", r)));
+	r.write_no_lang(VBool::get(params.count()==0?vvoid.as_bool():params.as_bool(0, "default must be bool", r)));
 }
 
 #ifndef DOXYGEN
@@ -109,13 +106,9 @@ static void _sql(Request& r, MethodParam
 					bind=vbind->get_hash();
 				}
 				if(valid_options!=options->count())
-					throw Exception(PARSER_RUNTIME,
-						0,
-						"called with invalid option");
+					throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
 			} else
-				throw Exception(PARSER_RUNTIME,
-					0,
-					"options must be hash");
+				throw Exception(PARSER_RUNTIME, 0, OPTIONS_MUST_BE_HASH);
 	}
 
 	SQL_Driver::Placeholder* placeholders=0;
@@ -125,8 +118,8 @@ static void _sql(Request& r, MethodParam
 
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+
 	Void_sql_event_handlers handlers(statement_string);
 	r.connection()->query(
 		statement_cstr, 
@@ -174,6 +167,7 @@ MVoid::MVoid(): Methoded("void") {
 	add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
 
 	// ^void.pos[substr]
+	// ^void.pos[substr](n)
 	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 2);
 
 	// ^void.int[]
@@ -188,7 +182,7 @@ MVoid::MVoid(): Methoded("void") {
 	// ^void.bool(default)
 	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 
-	// ^sql[query]
+	// ^void:sql{query}
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 
 	// ^void.left() ^void.right()