--- parser3/src/classes/double.C	2001/05/04 10:42:35	1.26
+++ parser3/src/classes/double.C	2003/02/04 14:04:45	1.53.2.2
@@ -1,13 +1,12 @@
 /** @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)
-
-	$Id: double.C,v 1.26 2001/05/04 10:42:35 paf Exp $
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_DOUBLE_C="$Date: 2003/02/04 14:04:45 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vdouble.h"
@@ -15,11 +14,7 @@
 
 // externs
 
-void _string_format(Request& r, const String& method_name, MethodParams *);
-
-// defines
-
-#define DOUBLE_CLASS_NAME "double"
+void _string_format(Request& r, StringPtr method_name, MethodParams& );
 
 // class
 
@@ -27,23 +22,31 @@ 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, StringPtr method_name, MethodParams& params) {
 	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);
+	// just checking (default) syntax validity, never really using it  here, just for string.int compatibility
+	if(params.count()>0)
+		params.as_junction(0, "default must be int");
+
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
+	Value& result=*new(pool) VInt(pool, vdouble->as_int());
+	r.write_no_lang(result);
 }
 
-static void _double(Request& r, const String&, MethodParams *) {
+static void _double(Request& r, StringPtr method_name, MethodParams& params) {
 	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);
+	// just checking (default) syntax validity, never really using it  here, just for string.doube compatibility
+	if(params.count()>0)
+		params.as_junction(0, "default must be double");
+
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
+	Value& result=*new(pool) VDouble(pool, vdouble->as_double());
+	r.write_no_lang(result);
 }
 
 typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param);
@@ -56,31 +59,52 @@ static void __mod(VDouble& vdouble, doub
 
 static void vdouble_op(Request& r, MethodParams *params, 
 					   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*/;
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
+	double param=params.count()?
+			params.as_double(0, "param must be double", r):1/*used in inc/dec*/;
 	(*func)(*vdouble, param);
 }
 
-static void _inc(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__inc); }
-static void _dec(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__dec); }
-static void _mul(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__mul); }
-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); }
+static void _inc(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__inc); }
+static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__dec); }
+static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__mul); }
+static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__div); }
+static void _mod(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__mod); }
+
+// from string.C
+extern 
+const String* sql_result_string(Request& r, StringPtr method_name, MethodParams& params,
+								Hash *& options, Value *& default_code);
 
-// constructor
+static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
+	Pool& pool=r.pool();
 
-MDouble::MDouble(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
+	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_to_value(*default_code).as_double();
+		else {
+			throw Exception("parser.runtime",
+				&method_name,
+				"produced no result, but no default option specified");
+			val=0; //calm, compiler
+		}
+	VDouble& result=*new(pool) VDouble(pool, val);
+	r.write_no_lang(result);
+}
 
+// constructor
+
+MDouble::MDouble(Pool& apool) : Methoded(apool, "double") {
 	// ^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]
@@ -97,6 +121,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