--- parser3/src/classes/double.C	2001/03/27 16:35:52	1.18
+++ parser3/src/classes/double.C	2001/07/27 12:59:36	1.35
@@ -1,35 +1,50 @@
-/*
-	Parser
+/** @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.18 2001/03/27 16:35:52 paf Exp $
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
+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"
-#include "_double.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
-#include "_string.h"
 
-// global var
+// externs
+
+void _string_format(Request& r, const String& method_name, MethodParams *);
+
+// defines
 
-VStateless_class *double_class;
+#define DOUBLE_CLASS_NAME "double"
+
+// class
+
+class MDouble : public Methoded {
+public:
+	MDouble(Pool& pool);
+public: // Methoded
+	bool used_directly() { return true; }
+};
 
 // methods
 
-static void _int(Request& r, const String&, Array *) {
+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&, Array *) {
+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);
@@ -40,45 +55,86 @@ static void __mul(VDouble& vdouble, doub
 static void __div(VDouble& vdouble, double param) { vdouble.div(param); }
 static void __mod(VDouble& vdouble, double param) { vdouble.mod((int)param); }
 
-static void vdouble_op(Request& r, Array *params, 
+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(
-			*static_cast<Value *>(params->get(0)),
+			params->get(0),
 			0/*no name*/,
 			false/*don't intercept string*/).as_double():1/*used in inc/dec*/;
 	(*func)(*vdouble, param);
 }
 
-static void _inc(Request& r, const String&, Array *params) { vdouble_op(r, params, &__inc); }
-static void _dec(Request& r, const String&, Array *params) { vdouble_op(r, params, &__dec); }
-static void _mul(Request& r, const String&, Array *params) { vdouble_op(r, params, &__mul); }
-static void _div(Request& r, const String&, Array *params) { vdouble_op(r, params, &__div); }
-static void _mod(Request& r, const String&, Array *params) { vdouble_op(r, params, &__mod); }
+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); }
+
+// 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));
 
-// initialize
 
-void initialize_double_class(Pool& pool, VStateless_class& vclass) {
 	// ^double.int[]
-	vclass.add_native_method("int", _int, 0, 0);
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
 
 	// ^double.double[]
-	vclass.add_native_method("double", _double, 0, 0);
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
 	
 	// ^double.inc[] 
 	// ^double.inc[offset]
-	vclass.add_native_method("inc", _inc, 0, 1);
+	add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);
 	// ^double.dec[] 
 	// ^double.dec[offset]
-	vclass.add_native_method("dec", _dec, 0, 1);
+	add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1);
 	// ^double.mul[k] 
-	vclass.add_native_method("mul", _mul, 1, 1);
+	add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1);
 	// ^double.div[d]
-	vclass.add_native_method("div", _div, 1, 1);
+	add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1);
 	// ^double.mod[offset]
-	vclass.add_native_method("mod", _mod, 1, 1);
+	add_native_method("mod", Method::CT_DYNAMIC, _mod, 1, 1);
+
+	// ^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
+
+Methoded *double_class;
+
+// creator
 
-	// ^double.format[]
-	vclass.add_native_method("format", _string_format, 1, 1);
+Methoded *MDouble_create(Pool& pool) {
+	return double_class=new(pool) MDouble(pool);
 }