--- parser3/src/classes/void.C	2001/08/09 06:44:04	1.6
+++ parser3/src/classes/void.C	2001/10/19 12:43:30	1.12
@@ -2,10 +2,10 @@
 	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.12 2001/10/19 12:43:30 parser Exp $
 */
-static const char *RCSId="$Id: void.C,v 1.6 2001/08/09 06:44:04 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -29,18 +29,18 @@ public: // Methoded
 
 // methods
 
-static void _int(Request& r, const String&, MethodParams *) {
+static void _int(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
 	VVoid *vvoid=static_cast<VVoid *>(r.self);
-	Value& value=*new(pool) VVoid(pool, vvoid->as_int());
-	r.write_no_lang(value);
+	r.write_no_lang(*new(pool) VInt(pool, 
+		params->size()==0?vvoid->as_int():params->as_int(0, "default must be int", r)));
 }
 
-static void _double(Request& r, const String&, MethodParams *) {
+static void _double(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
 	VVoid *vvoid=static_cast<VVoid *>(r.self);
-	Value& value=*new(pool) VDouble(pool, vvoid->as_double());
-	r.write_no_lang(value);
+	r.write_no_lang(*new(pool) VDouble(pool, 
+		params->size()==0?vvoid->as_double():params->as_double(0, "default must be double", r)));
 }
 
 #ifndef DOXYGEN
@@ -52,7 +52,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(0, 0,
 			&statement_string,
 			"must return nothing");
 	}
@@ -68,7 +68,7 @@ static void _sql(Request& r, const Strin
 	Pool& pool=r.pool();
 
 	if(!r.connection)
-		PTHROW(0, 0,
+		throw Exception(0, 0,
 			&method_name,
 			"without connect");
 
@@ -79,20 +79,16 @@ static void _sql(Request& r, const Strin
 	const char *statement_cstr=
 		statement_string.cstr(String::UL_UNSPECIFIED, r.connection);
 	Void_sql_event_handlers handlers(pool, statement_string);
-	bool need_rethrow=false; Exception rethrow_me;
-	PTRY {
+	try {
 		r.connection->query(
 			statement_cstr, 0, 0,
 			handlers);
+	} catch(const Exception& e) {
+		// more specific source [were url]
+		throw Exception(e.type(), e.code(),
+			&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
@@ -101,11 +97,13 @@ MVoid::MVoid(Pool& apool) : Methoded(apo
 	set_name(*NEW String(pool(), VOID_CLASS_NAME));
 
 
-	// ^VOID.int[]
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
-
-	// ^VOID.double[]
-	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+	// ^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);