--- parser3/src/classes/double.C 2007/04/23 10:30:09 1.61 +++ parser3/src/classes/double.C 2012/04/19 19:41:29 1.65 @@ -1,12 +1,10 @@ /** @file Parser: @b double parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_DOUBLE_C="$Date: 2007/04/23 10:30:09 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -15,6 +13,8 @@ static const char * const IDENT_DOUBLE_C #include "pa_vint.h" #include "pa_vbool.h" +volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.65 2012/04/19 19:41:29 moko Exp $" IDENT_PA_VDOUBLE_H; + // externs void _string_format(Request& r, MethodParams&); @@ -24,8 +24,6 @@ void _string_format(Request& r, MethodPa class MDouble: public Methoded { public: MDouble(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -58,7 +56,7 @@ static void _bool(Request& r, MethodPara params.as_double(0, "default must be bool", r); VDouble& vdouble=GET_SELF(r, VDouble); - r.write_no_lang(*new VBool(vdouble.as_bool())); + r.write_no_lang(VBool::get(vdouble.as_bool())); } typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param); @@ -84,15 +82,12 @@ static void _div(Request& r, MethodParam 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, - HashStringValue*& options, Value*& default_code); +extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); static void _sql(Request& r, MethodParams& params) { double val; - HashStringValue* options; Value* default_code; - if(const String* string=sql_result_string(r, params, options, default_code)) + if(const String* string=sql_result_string(r, params, default_code)) val=string->as_double(); else if(default_code)