--- parser3/src/classes/int.C 2004/02/11 15:33:12 1.53 +++ parser3/src/classes/int.C 2009/04/16 01:10:21 1.58 @@ -1,11 +1,11 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_INT_C="$Date: 2004/02/11 15:33:12 $"; +static const char * const IDENT_INT_C="$Date: 2009/04/16 01:10:21 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -13,6 +13,7 @@ static const char * const IDENT_INT_C="$ #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" +#include "pa_vbool.h" // externs @@ -34,23 +35,32 @@ DECLARE_CLASS_VAR(int, new MInt, 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); VInt& vint=GET_SELF(r, VInt); r.write_no_lang(*new VInt(vint.get_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); VInt& vint=GET_SELF(r, VInt); r.write_no_lang(*new VDouble(vint.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_bool(0, "default must be bool", r); + + VInt& vint=GET_SELF(r, VInt); + r.write_no_lang(VBool::get(vint.as_bool())); +} + typedef void (*vint_op_func_ptr)(VInt& vint, double param); static void __inc(VInt& vint, double param) { vint.inc((int)param); } @@ -86,7 +96,7 @@ static void _sql(Request& r, MethodParam if(default_code) val=r.process_to_value(*default_code).as_int(); else { - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } @@ -102,6 +112,9 @@ MInt::MInt(): Methoded("int") { // ^int.double[] add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); + // ^double.bool[] + add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); + // ^int.inc[] // ^int.inc[offset] add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);