--- parser3/src/classes/double.C	2001/05/04 10:42:35	1.26
+++ parser3/src/classes/double.C	2013/07/29 15:02:17	1.67
@@ -1,49 +1,50 @@
 /** @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-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #include "classes.h"
+#include "pa_vmethod_frame.h"
+
 #include "pa_request.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "pa_vbool.h"
 
-// externs
-
-void _string_format(Request& r, const String& method_name, MethodParams *);
+volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.67 2013/07/29 15:02:17 moko Exp $" IDENT_PA_VDOUBLE_H;
 
-// defines
+// externs
 
-#define DOUBLE_CLASS_NAME "double"
+void _string_format(Request& r, MethodParams&);
 
 // class
 
-class MDouble : public Methoded {
+class MDouble: public Methoded {
 public:
-	MDouble(Pool& pool);
-public: // Methoded
-	bool used_directly() { return false; }
+	MDouble();
 };
 
+// global variable
+
+DECLARE_CLASS_VAR(double, new MDouble, 0);
+
 // methods
 
-static void _int(Request& r, const String&, 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);
+static void _int(Request& r, MethodParams&) {
+	VDouble& vdouble=GET_SELF(r, VDouble);
+	r.write_no_lang(*new VInt(vdouble.as_int()));
+}
+
+static void _double(Request& r, MethodParams&) {
+	VDouble& vdouble=GET_SELF(r, VDouble);
+	r.write_no_lang(*new VDouble(vdouble.as_double()));
 }
 
-static void _double(Request& r, const String&, 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);
+static void _bool(Request& r, MethodParams&) {
+	VDouble& vdouble=GET_SELF(r, VDouble);
+	r.write_no_lang(VBool::get(vdouble.as_bool()));
 }
 
 typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param);
@@ -54,33 +55,51 @@ 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, MethodParams *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(
-			params->get(0),
-			0/*no name*/,
-			false/*don't intercept string*/).as_double():1/*used in inc/dec*/;
-	(*func)(*vdouble, param);
+	VDouble& vdouble=GET_SELF(r, VDouble);
+	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, MethodParams& params) { vdouble_op(r, params, &__inc); }
+static void _dec(Request& r, MethodParams& params) { vdouble_op(r, params, &__dec); }
+static void _mul(Request& r, MethodParams& params) { vdouble_op(r, params, &__mul); }
+static void _div(Request& r, MethodParams& params) { vdouble_op(r, params, &__div); }
+static void _mod(Request& r, MethodParams& params) { vdouble_op(r, params, &__mod); }
+
+// from string.C
+extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code);
+
+static void _sql(Request& r, MethodParams& params) {
+	double val;
+	Value* default_code;
+	if(const String* string=sql_result_string(r, params, default_code))
+		val=string->as_double();
+	else
+		if(default_code)
+			val=r.process_to_value(*default_code).as_double();
+		else {
+			throw Exception(PARSER_RUNTIME,
+				0,
+				"produced no result, but no default option specified");
+		}
+	r.write_no_lang(*new VDouble(val));
+}
 
 // constructor
 
-MDouble::MDouble(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
-
+MDouble::MDouble(): Methoded("double") {
 	// ^double.int[]
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
-
+	// ^double.int[default for ^string.int compatibility]
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
 	// ^double.double[]
-	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+	// ^double.double[default for ^string.double compatibility]
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+	// ^double.bool[]
+	// ^double.bool[default for ^string.bool compatibility]
+	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 	
 	// ^double.inc[] 
 	// ^double.inc[offset]
@@ -97,13 +116,8 @@ MDouble::MDouble(Pool& apool) : Methoded
 
 	// ^double.format{format}
 	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
-}
-// global variable
-
-Methoded *double_class;
-
-// creator
-
-Methoded *MDouble_create(Pool& pool) {
-	return double_class=new(pool) MDouble(pool);
+	
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0.0)]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }