--- parser3/src/classes/double.C	2001/06/28 07:44:17	1.32
+++ parser3/src/classes/double.C	2001/09/26 10:32:25	1.37
@@ -2,10 +2,10 @@
 	Parser: @b double parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: double.C,v 1.37 2001/09/26 10:32:25 parser Exp $
 */
-static const char *RCSId="$Id: double.C,v 1.32 2001/06/28 07:44:17 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -74,13 +74,33 @@ static void _mod(Request& r, const Strin
 
 // from string.C
 extern 
-String& sql_result_string(Request& r, const String& method_name, MethodParams *params);
+const String* sql_result_string(Request& r, const String& method_name, 
+								MethodParams *params,
+								Hash *&options);
 
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	double val=sql_result_string(r, method_name, params).as_double();
-
+	double val;
+	Hash *options;
+	if(const String *string=sql_result_string(r, method_name, params, options))
+		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,
+				&method_name,
+				"produced no result, but no options (no default) specified");
+			val=0; //calm, compiler
+		}
 	VDouble& result=*new(pool) VDouble(pool, val);
 	result.set_name(method_name);
 	r.write_assign_lang(result);
@@ -114,8 +134,8 @@ MDouble::MDouble(Pool& apool) : Methoded
 	// ^double.format{format}
 	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
 	
-	// ^double:sql[query]
-	// ^double:sql[query](offset)
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0.0)]
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable