--- parser3/src/classes/double.C 2003/07/24 11:31:19 1.54 +++ parser3/src/classes/double.C 2007/02/03 18:08:38 1.60 @@ -1,11 +1,11 @@ /** @file Parser: @b double parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DOUBLE_C="$Date: 2003/07/24 11:31:19 $"; +static const char * const IDENT_DOUBLE_C="$Date: 2007/02/03 18:08:38 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -13,6 +13,7 @@ static const char* IDENT_DOUBLE_C="$Date #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" +#include "pa_vbool.h" // externs @@ -34,23 +35,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(*new VBool(vdouble.as_bool())); +} + typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param); static void __inc(VDouble& vdouble, double param) { vdouble.inc(param); } @@ -91,7 +101,6 @@ static void _sql(Request& r, MethodParam throw Exception("parser.runtime", 0, "produced no result, but no default option specified"); - val=0; //calm, compiler } r.write_no_lang(*new VDouble(val)); } @@ -104,6 +113,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]