--- parser3/src/classes/double.C 2005/08/09 08:14:47 1.58 +++ parser3/src/classes/double.C 2012/03/16 09:24:06 1.64 @@ -1,18 +1,19 @@ /** @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: 2005/08/09 08:14:47 $"; - #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 @@ -23,8 +24,6 @@ void _string_format(Request& r, MethodPa class MDouble: public Methoded { public: MDouble(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -34,23 +33,32 @@ DECLARE_CLASS_VAR(double, new MDouble, 0 // methods static void _int(Request& r, MethodParams& params) { - // just checking (default) syntax validity, never really using it here, just for string.int compatibility + // 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=GET_SELF(r, VDouble); r.write_no_lang(*new VInt(vdouble.as_int())); } static void _double(Request& r, MethodParams& params) { - // just checking (default) syntax validity, never really using it here, just for string.doube compatibility + // 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=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); static void __inc(VDouble& vdouble, double param) { vdouble.inc(param); } @@ -88,7 +96,7 @@ static void _sql(Request& r, MethodParam if(default_code) val=r.process_to_value(*default_code).as_double(); else { - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } @@ -103,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]