--- parser3/src/classes/void.C	2005/08/09 08:14:48	1.35
+++ parser3/src/classes/void.C	2015/10/26 01:21:55	1.52
@@ -1,21 +1,19 @@
 /** @file
 	Parser: @b VOID parser class.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_VOID_C="$Date: 2005/08/09 08:14:48 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
 #include "pa_request.h"
-#include "pa_vint.h"
-#include "pa_vdouble.h"
 #include "pa_vvoid.h"
 #include "pa_sql_connection.h"
 
+volatile const char * IDENT_VOID_C="$Id: void.C,v 1.52 2015/10/26 01:21:55 moko Exp $";
+
 // externs
 
 extern String sql_bind_name;
@@ -25,40 +23,12 @@ extern String sql_bind_name;
 class MVoid: public Methoded {
 public:
 	MVoid();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
-// global variable
-
-DECLARE_CLASS_VAR(void, new MVoid, 0);
+// void is inherited from string, thus global variable declared in string.C
 
 // methods
 
-static void _length(Request& r, MethodParams&) {
-	// always zero
-	r.write_no_lang(*new VInt(0));
-}
-
-static void _pos(Request& r, MethodParams& params) {
-	// just checking for consistency
-	params.as_no_junction(0, "substr must not be code");
-	// never found
-	r.write_no_lang(*new VInt(-1));
-}
-
-static void _int(Request& r, MethodParams& params) {
-	VVoid& vvoid=GET_SELF(r, VVoid);
-	r.write_no_lang(*new VInt(
-		params.count()==0?vvoid.as_int():params.as_int(0, "default must be int", r)));
-}
-
-static void _double(Request& r, MethodParams& params) {
-	VVoid& vvoid=GET_SELF(r, VVoid);
-	r.write_no_lang(*new VDouble(
-		params.count()==0?vvoid.as_double():params.as_double(0, "default must be double", r)));
-}
-
 #ifndef DOXYGEN
 class Void_sql_event_handlers: public SQL_Driver_query_event_handlers {
 	const String& statement_string;
@@ -67,7 +37,7 @@ public:
 	bool add_column(SQL_Error& /*error*/, const char* /*str*/, size_t /*length*/) { /* ignore */ return false; }
 	bool before_rows(SQL_Error& error) {
 		// there are some result rows, which is wrong
-		error=SQL_Error("parser.runtime",
+		error=SQL_Error(PARSER_RUNTIME,
 			/*statement_string,*/
 			"must return nothing");
 		return true;
@@ -85,24 +55,16 @@ static void _sql(Request& r, MethodParam
 	Value& statement=params.as_junction(0, "statement must be code");
 
 	HashStringValue* bind=0;
-	if(params.count()>1) {
-		Value& voptions=params.as_no_junction(1, "options must be hash, not code");
-		if(!voptions.is_string())
-			if(HashStringValue* options=voptions.get_hash()) {
-				int valid_options=0;
-				if(Value* vbind=options->get(sql_bind_name)) {
-					valid_options++;
-					bind=vbind->get_hash();
-				}
-				if(valid_options!=options->count())
-					throw Exception("parser.runtime",
-						0,
-						"called with invalid option");
-			} else
-				throw Exception("parser.runtime",
-					0,
-					"options must be hash");
-	}
+	if(params.count()>1)
+		if(HashStringValue* options=params.as_hash(1, "sql options")) {
+			int valid_options=0;
+			if(Value* vbind=options->get(sql_bind_name)) {
+				valid_options++;
+				bind=vbind->get_hash();
+			}
+			if(valid_options!=options->count())
+				throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
+		}
 
 	SQL_Driver::Placeholder* placeholders=0;
 	uint placeholders_count=0;
@@ -111,13 +73,13 @@ 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, 
 		placeholders_count, placeholders,
-		0, 0,
+		0, SQL_NO_LIMIT,
 		handlers,
 		statement_string);
 
@@ -125,58 +87,11 @@ static void _sql(Request& r, MethodParam
 		unmarshal_bind_updates(*bind, placeholders_count, placeholders);
 }
 
-static void _left_right(Request& r, MethodParams& params) {
-	ssize_t sn=params.as_int(0, "n must be int", r);
-	if(sn<0)
-		throw Exception("parser.runtime",
-			0, 
-			"n(%d) must be >=0", sn);
-
-	// return nothing
-}
-
-static void _mid(Request& r, MethodParams& params) {
-	ssize_t sbegin=params.as_int(0, "p must be int", r);
-	if(sbegin<0)
-		throw Exception("parser.runtime",
-			0, 
-			"p(%d) must be >=0", sbegin);
-
-	if(params.count()>1) {
-		ssize_t sn=params.as_int(1, "n must be int", r);
-		if(sn<0)
-			throw Exception("parser.runtime",
-				0, 
-				"n(%d) must be >=0", sn);
-	}
-
-	// return nothing
-}
-
 // constructor
 
-MVoid::MVoid(): Methoded("void") {
-	// ^void.length[] 
-	add_native_method("length", Method::CT_DYNAMIC, _length, 0, 0);
-
-	// ^void.pos[substr]
-	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);
-
-	// ^void.int[]
-	// ^void.int(default)
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
-
-	// ^void.double[]
-	// ^void.double(default)
-	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
-
-	// ^sql[query]
+MVoid::MVoid(): Methoded("void", string_class) {
+	// ^void:sql{query}
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 
-	// ^void.left() ^void.right()
-	add_native_method("left", Method::CT_DYNAMIC, _left_right, 1, 1);
-	add_native_method("right", Method::CT_DYNAMIC, _left_right, 1, 1);
-
-	// ^void.mid(p;n)
-	add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);
+	// all other methods are inherinted from empty string
 }