--- parser3/src/classes/double.C	2001/07/27 12:59:36	1.35
+++ parser3/src/classes/double.C	2003/01/21 15:51:06	1.53
@@ -1,11 +1,11 @@
 /** @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)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: double.C,v 1.35 2001/07/27 12:59:36 parser Exp $"; 
+
+static const char* IDENT_DOUBLE_C="$Date: 2003/01/21 15:51:06 $";
 
 #include "classes.h"
 #include "pa_request.h"
@@ -16,10 +16,6 @@ static const char *RCSId="$Id: double.C,
 
 void _string_format(Request& r, const String& method_name, MethodParams *);
 
-// defines
-
-#define DOUBLE_CLASS_NAME "double"
-
 // class
 
 class MDouble : public Methoded {
@@ -31,19 +27,25 @@ public: // Methoded
 
 // methods
 
-static void _int(Request& r, const String& method_name, MethodParams *) {
+static void _int(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VDouble *vdouble=static_cast<VDouble *>(r.self);
+	// just checking (default) syntax validity, never really using it  here, just for string.int compatibility
+	if(params->size()>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());
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
-static void _double(Request& r, const String& method_name, MethodParams *) {
+static void _double(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VDouble *vdouble=static_cast<VDouble *>(r.self);
+	// just checking (default) syntax validity, never really using it  here, just for string.doube compatibility
+	if(params->size()>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());
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
@@ -57,12 +59,9 @@ 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);
+	VDouble *vdouble=static_cast<VDouble *>(r.get_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);
 }
 
@@ -74,40 +73,38 @@ static void _mod(Request& r, const Strin
 
 // from string.C
 extern 
-const String* sql_result_string(Request& r, const String& method_name, 
-								MethodParams *params);
+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;
-	if(const String *string=sql_result_string(r, method_name, params))
+	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(params->size()>1)
-			val=params->as_double(1, r);
+		if(default_code)
+			val=r.process_to_value(*default_code).as_double();
 		else {
-			PTHROW(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
-				"produced no result, but no default specified");
+				"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);
+	r.write_no_lang(result);
 }
 
 // constructor
 
-MDouble::MDouble(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
-
-
+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]
@@ -125,8 +122,8 @@ 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)
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0.0)]
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable