--- parser3/src/classes/void.C	2001/09/06 14:55:06	1.9
+++ parser3/src/classes/void.C	2002/12/09 12:19:16	1.27
@@ -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.9 2001/09/06 14:55:06 parser Exp $"; 
+
+static const char* IDENT_VOID_C="$Date: 2002/12/09 12:19:16 $";
 
 #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,35 +25,50 @@ public: // Methoded
 
 // methods
 
+static void _length(Request& r, const String&, MethodParams *params) {
+	Pool& pool=r.pool();
+	// always zero
+	r.write_no_lang(*new(pool) VInt(pool, 0));
+}
+
+static void _pos(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	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 _int(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
-	VVoid *vvoid=static_cast<VVoid *>(r.self);
+	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, r)/*default*/));
+		params->size()==0?vvoid->as_int():params->as_int(0, "default must be int", r)));
 }
 
 static void _double(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
-	VVoid *vvoid=static_cast<VVoid *>(r.self);
+	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, r)/*default*/));
+		params->size()==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 {
+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) {
 	}
-	void add_column(void *ptr, size_t size) { /* ignore */ }
-	void before_rows() {
+	bool add_column(SQL_Error& /*error*/, void *ptr, size_t size) { /* ignore */ return false; }
+	bool before_rows(SQL_Error& error) {
 		// there are some result rows, which is wrong
-		PTHROW(0, 0,
+		error=SQL_Error("parser.runtime",
 			&statement_string,
 			"must return nothing");
+		return true;
 	}
-	void add_row() { /* never */ }
-	void add_row_cell(void *ptr, size_t size) { /* never */ }
+	bool add_row(SQL_Error& /*error*/) { /* never */ return false; }
+	bool add_row_cell(SQL_Error& /*error*/, void *ptr, size_t size) { /* never */ return false; }
 
 private:
 	Pool& pool;
@@ -67,39 +78,27 @@ private:
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	if(!r.connection)
-		PTHROW(0, 0,
-			&method_name,
-			"without connect");
-
 	Value& statement=params->as_junction(0, "statement must be code");
 
 	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
+	const String& statement_string=r.process_to_string(statement);
 	const char *statement_cstr=
-		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
+		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Void_sql_event_handlers handlers(pool, statement_string);
-	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
-		r.connection->query(
-			statement_cstr, 0, 0,
-			handlers);
-	}
-	PCATCH(e) {
-		rethrow_me=e;  need_rethrow=true;
-	}
-	PEND_CATCH
-	if(need_rethrow)
-		PTHROW(rethrow_me.type(), rethrow_me.code(),
-			&statement_string, // setting more specific source [were url]
-			rethrow_me.comment());
+	r.connection(&method_name)->query(
+		statement_cstr, 0, 0,
+		handlers,
+		statement_string);
 }
 
 // constructor
 
-MVoid::MVoid(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), VOID_CLASS_NAME));
+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)