--- parser3/src/classes/double.C	2003/02/17 17:05:01	1.53.2.6
+++ parser3/src/classes/double.C	2012/03/16 09:24:06	1.64
@@ -1,54 +1,62 @@
 /** @file
 	Parser: @b double parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DOUBLE_C="$Date: 2003/02/17 17:05:01 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
 #include "pa_request.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "pa_vbool.h"
+
+volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.64 2012/03/16 09:24:06 moko Exp $" IDENT_PA_VDOUBLE_H;
 
 // externs
 
-void _string_format(Request& r, StringPtr method_name, MethodParams& /*params*/);
+void _string_format(Request& r, MethodParams&);
 
 // class
 
 class MDouble: public Methoded {
 public:
 	MDouble();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
 
-MethodedPtr double_class(new MDouble);
+DECLARE_CLASS_VAR(double, new MDouble, 0);
 
 // methods
 
-static void _int(Request& r, StringPtr method_name, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it  here, just for string.int compatibility
+static void _int(Request& r, MethodParams& params) {
+	// 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");
+		params.as_int(0, "default must be int", r);
 
-	VDouble& vdouble=*static_cast<VDouble *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VInt(vdouble.as_int())));
+	VDouble& vdouble=GET_SELF(r, VDouble);
+	r.write_no_lang(*new VInt(vdouble.as_int()));
 }
 
-static void _double(Request& r, StringPtr method_name, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it  here, just for string.doube compatibility
+static void _double(Request& r, MethodParams& params) {
+	// just checking (default) syntax validity, never really using it here, just for string.double compatibility
 	if(params.count()>0)
-		params.as_junction(0, "default must be double");
+		params.as_double(0, "default must be double", r);
 
-	VDouble& vdouble=*static_cast<VDouble *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VDouble(vdouble.as_double())));
+	VDouble& vdouble=GET_SELF(r, VDouble);
+	r.write_no_lang(*new VDouble(vdouble.as_double()));
+}
+
+static void _bool(Request& r, MethodParams& params) {
+	// just checking (default) syntax validity, never really using it here, just for string.bool compatibility
+	if(params.count()>0)
+		params.as_double(0, "default must be bool", r);
+
+	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);
@@ -61,39 +69,38 @@ 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.get_self().get());
+	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, 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); }
+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 
-StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params,
-							HashStringValue*& options, ValuePtr& default_code);
+const String* sql_result_string(Request& r, MethodParams& params,
+				HashStringValue*& options, Value*& default_code);
 
-static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
+static void _sql(Request& r, MethodParams& params) {
 	double val;
 	HashStringValue* options;
-	ValuePtr default_code;
-	if(StringPtr string=sql_result_string(r, method_name, params, options, default_code))
+	Value* default_code;
+	if(const String* string=sql_result_string(r, params, options, default_code))
 		val=string->as_double();
 	else
 		if(default_code)
-			val=r.process_to_value(default_code)->as_double();
+			val=r.process_to_value(*default_code).as_double();
 		else {
-			throw Exception("parser.runtime",
-				method_name,
+			throw Exception(PARSER_RUNTIME,
+				0,
 				"produced no result, but no default option specified");
-			val=0; //calm, compiler
 		}
-	r.write_no_lang(ValuePtr(new VDouble(val)));
+	r.write_no_lang(*new VDouble(val));
 }
 
 // constructor
@@ -104,6 +111,9 @@ MDouble::MDouble(): Methoded("double") {
 
 	// ^double.double[]
 	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+
+	// ^double.bool[]
+	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 	
 	// ^double.inc[] 
 	// ^double.inc[offset]