--- parser3/src/classes/double.C	2001/09/26 10:32:25	1.37
+++ parser3/src/classes/double.C	2002/04/10 09:53:13	1.46
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b double 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)
 
-	$Id: double.C,v 1.37 2001/09/26 10:32:25 parser Exp $
+	$Id: double.C,v 1.46 2002/04/10 09:53:13 paf Exp $
 */
 
 #include "classes.h"
@@ -31,16 +31,22 @@ public: // Methoded
 
 // methods
 
-static void _int(Request& r, const String& method_name, MethodParams *) {
+static void _int(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
+	Value *default_code=params->size()>0?
+		default_code=&params->as_junction(0, "default must be int"):0; // (default)
+
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
 	Value& result=*new(pool) VInt(pool, vdouble->as_int());
 	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
-static void _double(Request& r, const String& method_name, MethodParams *) {
+static void _double(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
+	Value *default_code=params->size()>0?
+		default_code=&params->as_junction(0, "default must be double"):0; // (default)
+
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
 	Value& result=*new(pool) VDouble(pool, vdouble->as_double());
 	result.set_name(method_name);
@@ -59,10 +65,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 +77,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_to_value(*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);
@@ -113,10 +109,10 @@ MDouble::MDouble(Pool& apool) : Methoded
 
 
 	// ^double.int[]
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
 
 	// ^double.double[]
-	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
 	
 	// ^double.inc[] 
 	// ^double.inc[offset]