--- parser3/src/classes/double.C	2001/05/04 10:42:35	1.26
+++ parser3/src/classes/double.C	2001/11/05 11:46:20	1.41
@@ -2,10 +2,9 @@
 	Parser: @b double parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: double.C,v 1.26 2001/05/04 10:42:35 paf Exp $
+	$Id: double.C,v 1.41 2001/11/05 11:46:20 paf Exp $
 */
 
 #include "classes.h"
@@ -27,23 +26,25 @@ class MDouble : public Methoded {
 public:
 	MDouble(Pool& pool);
 public: // Methoded
-	bool used_directly() { return false; }
+	bool used_directly() { return true; }
 };
 
 // methods
 
-static void _int(Request& r, const String&, MethodParams *) {
+static void _int(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
-	Value& value=*new(pool) VInt(pool, (int)vdouble->as_double());
-	r.write_no_lang(value);
+	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&, MethodParams *) {
+static void _double(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
-	Value& value=*new(pool) VDouble(pool, vdouble->as_double());
-	r.write_no_lang(value);
+	Value& result=*new(pool) VDouble(pool, vdouble->as_double());
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
 typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param);
@@ -58,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);
 }
 
@@ -71,11 +69,39 @@ static void _mul(Request& r, const Strin
 static void _div(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__div); }
 static void _mod(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__mod); }
 
+// from string.C
+extern 
+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;
+	Value *default_code;
+	if(const String *string=sql_result_string(r, method_name, params, options, default_code))
+		val=string->as_double();
+	else
+		if(default_code)
+			val=r.process(*default_code).as_double();
+		else {
+			throw Exception(0, 0,
+				&method_name,
+				"produced no result, but no default option specified");
+			val=0; //calm, compiler
+		}
+	VDouble& result=*new(pool) VDouble(pool, val);
+	result.set_name(method_name);
+	r.write_assign_lang(result);
+}
+
 // constructor
 
 MDouble::MDouble(Pool& apool) : Methoded(apool) {
 	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
 
+
 	// ^double.int[]
 	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
 
@@ -97,6 +123,10 @@ MDouble::MDouble(Pool& apool) : Methoded
 
 	// ^double.format{format}
 	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
+	
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0.0)]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable