--- parser3/src/classes/void.C	2001/09/26 10:32:25	1.10
+++ parser3/src/classes/void.C	2002/08/01 11:41:13	1.21
@@ -1,12 +1,12 @@
 /** @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)
-
-	$Id: void.C,v 1.10 2001/09/26 10:32:25 parser Exp $
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_VOID_C="$Date: 2002/08/01 11:41:13 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vint.h"
@@ -14,10 +14,6 @@
 #include "pa_vvoid.h"
 #include "pa_sql_connection.h"
 
-// defines
-
-#define VOID_CLASS_NAME "void"
-
 // class
 
 class MVoid : public Methoded {
@@ -33,14 +29,14 @@ static void _int(Request& r, const Strin
 	Pool& pool=r.pool();
 	VVoid *vvoid=static_cast<VVoid *>(r.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);
 	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
@@ -52,7 +48,7 @@ public:
 	void add_column(void *ptr, size_t size) { /* ignore */ }
 	void before_rows() {
 		// there are some result rows, which is wrong
-		PTHROW(0, 0,
+		throw Exception("parser.runtime",
 			&statement_string,
 			"must return nothing");
 	}
@@ -67,40 +63,28 @@ 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(
+	try {
+		r.connection(&method_name)->query(
 			statement_cstr, 0, 0,
 			handlers);
+	} catch(const Exception& e) {
+		// more specific source [were url]
+		throw Exception("sql.execute", 
+			&statement_string, 
+			"%s", e.comment());
 	}
-	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());
 }
 
 // constructor
 
-MVoid::MVoid(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), VOID_CLASS_NAME));
-
-
+MVoid::MVoid(Pool& apool) : Methoded(apool, "void") {
 	// ^void.int[] 
 	// ^void.int(default)
 	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);