--- parser3/src/classes/double.C	2001/04/28 08:43:47	1.22
+++ parser3/src/classes/double.C	2001/07/27 12:59:36	1.35
@@ -4,9 +4,8 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: double.C,v 1.22 2001/04/28 08:43:47 paf Exp $
 */
+static const char *RCSId="$Id: double.C,v 1.35 2001/07/27 12:59:36 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -26,23 +25,26 @@ void _string_format(Request& r, const St
 class MDouble : public Methoded {
 public:
 	MDouble(Pool& pool);
+public: // Methoded
 	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);
@@ -70,11 +72,37 @@ 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);
+
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+
+	double val;
+	if(const String *string=sql_result_string(r, method_name, params))
+		val=string->as_double();
+	else
+		if(params->size()>1)
+			val=params->as_double(1, r);
+		else {
+			PTHROW(0, 0,
+				&method_name,
+				"produced no result, but no default 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);
 
@@ -96,6 +124,10 @@ 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](default)
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable