--- parser3/src/classes/void.C	2001/06/28 07:44:17	1.3
+++ parser3/src/classes/void.C	2002/12/09 11:07:40	1.26
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b VOID parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: void.C,v 1.3 2001/06/28 07:44:17 parser Exp $"; 
+
+static const char* IDENT_VOID_C="$Date: 2002/12/09 11:07:40 $";
 
 #include "classes.h"
 #include "pa_request.h"
@@ -14,10 +14,6 @@ static const char *RCSId="$Id: void.C,v
 #include "pa_vvoid.h"
 #include "pa_sql_connection.h"
 
-// defines
-
-#define VOID_CLASS_NAME "void"
-
 // class
 
 class MVoid : public Methoded {
@@ -29,70 +25,87 @@ public: // Methoded
 
 // methods
 
-static void _int(Request& r, const String&, MethodParams *) {
+static void _length(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
-	VInt *vunknown=static_cast<VInt *>(r.self);
-	Value& value=*new(pool) VInt(pool, vunknown->as_int());
-	r.write_no_lang(value);
+	// always zero
+	r.write_no_lang(*new(pool) VInt(pool, 0));
 }
 
-static void _double(Request& r, const String&, MethodParams *) {
+static void _pos(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VInt *vunknown=static_cast<VInt *>(r.self);
-	Value& value=*new(pool) VDouble(pool, vunknown->as_double());
-	r.write_no_lang(value);
+
+	Value& substr=params->as_no_junction(0, "substr must not be code");
+	// never found
+	r.write_assign_lang(*new(pool) VInt(pool, -1));
 }
 
-static void _sql(Request& r, const String& method_name, MethodParams *params) {
+static void _int(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
+	VVoid *vvoid=static_cast<VVoid *>(r.get_self());
+	r.write_no_lang(*new(pool) VInt(pool, 
+		params->size()==0?vvoid->as_int():params->as_int(0, "default must be int", r)));
+}
 
-	if(!r.connection)
-		PTHROW(0, 0,
-			&method_name,
-			"without connect");
-
-	Value& statement=params->get_junction(0, "statement must be code");
+static void _double(Request& r, const String&, MethodParams *params) {
+	Pool& pool=r.pool();
+	VVoid *vvoid=static_cast<VVoid *>(r.get_self());
+	r.write_no_lang(*new(pool) VDouble(pool, 
+		params->size()==0?vvoid->as_double():params->as_double(0, "default must be double", r)));
+}
 
-	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
-	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
-	unsigned int sql_column_count; SQL_Driver::Cell *sql_columns;
-	unsigned long sql_row_count; SQL_Driver::Cell **sql_rows;
-	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
-		r.connection->query(
-			statement_cstr, 0, 0,
-			&sql_column_count, &sql_columns,
-			&sql_row_count, &sql_rows);
-	}
-	PCATCH(e) { // connect/process problem
-		rethrow_me=e;  need_rethrow=true;
+#ifndef DOXYGEN
+class Void_sql_event_handlers: public SQL_Driver_query_event_handlers {
+public:
+	Void_sql_event_handlers(Pool& apool, const String& astatement_string) :
+		pool(apool), statement_string(astatement_string) {
 	}
-	PEND_CATCH
-	if(need_rethrow)
-		PTHROW(rethrow_me.type(), rethrow_me.code(),
-			&statement_string, // setting more specific source [were url]
-			rethrow_me.comment());
-
-	// there are some result rows, which is wrong
-	if(sql_row_count)
-		PTHROW(0, 0,
+	void add_column(void *ptr, size_t size) { /* ignore */ }
+	void before_rows() {
+		// there are some result rows, which is wrong
+		throw SQL_Exception("parser.runtime",
 			&statement_string,
-			"must not return result");
-}
+			"must return nothing");
+	}
+	void add_row() { /* never */ }
+	void add_row_cell(void *ptr, size_t size) { /* never */ }
 
-// constructor
+private:
+	Pool& pool;
+	const String& statement_string;
+};
+#endif
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 
-MVoid::MVoid(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), VOID_CLASS_NAME));
+	Value& statement=params->as_junction(0, "statement must be code");
 
+	Temp_lang temp_lang(r, String::UL_SQL);
+	const String& statement_string=r.process_to_string(statement);
+	const char *statement_cstr=
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
+	Void_sql_event_handlers handlers(pool, statement_string);
+	r.connection(&method_name)->query(
+		statement_cstr, 0, 0,
+		handlers,
+		statement_string);
+}
 
-	// ^VOID.int[]
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
+// constructor
 
-	// ^VOID.double[]
-	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+MVoid::MVoid(Pool& apool) : Methoded(apool, "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]
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 1);