--- parser3/src/classes/double.C	2001/08/07 13:54:13	1.36
+++ parser3/src/classes/double.C	2002/03/27 15:30:33	1.44
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b double parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	$Id: double.C,v 1.44 2002/03/27 15:30:33 paf Exp $
 */
-static const char *RCSId="$Id: double.C,v 1.36 2001/08/07 13:54:13 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -59,10 +59,7 @@ static void vdouble_op(Request& r, Metho
 					   vdouble_op_func_ptr func) {
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
 	double param=params->size()?
-		r.process(
-			params->get(0),
-			0/*no name*/,
-			false/*don't intercept string*/).as_double():1/*used in inc/dec*/;
+			params->as_double(0, "param must be double", r):1/*used in inc/dec*/;
 	(*func)(*vdouble, param);
 }
 
@@ -74,31 +71,24 @@ static void _mod(Request& r, const Strin
 
 // from string.C
 extern 
-const String* sql_result_string(Request& r, const String& method_name, 
-								MethodParams *params,
-								Hash *&options);
+const String* sql_result_string(Request& r, const String& method_name, MethodParams *params,
+								Hash *& options, Value *& default_code);
 
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
 	double val;
 	Hash *options;
-	if(const String *string=sql_result_string(r, method_name, params, options))
+	Value *default_code;
+	if(const String *string=sql_result_string(r, method_name, params, options, default_code))
 		val=string->as_double();
 	else
-		if(options) {
-			if(Value *vdefault=(Value *)options->get(*sql_default_name))
-				val=r.process(*vdefault).as_double();
-			else {
-				PTHROW(0, 0,
-					&method_name,
-					"produced no result, but no default option specified");
-				val=0; //calm, compiler
-			}
-		} else {
-			PTHROW(0, 0,
+		if(default_code)
+			val=r.process(*default_code).as_double();
+		else {
+			throw Exception("parser.runtime",
 				&method_name,
-				"produced no result, but no options (no default) specified");
+				"produced no result, but no default option specified");
 			val=0; //calm, compiler
 		}
 	VDouble& result=*new(pool) VDouble(pool, val);