--- parser3/src/classes/bool.C 2009/04/16 01:10:21 1.2 +++ parser3/src/classes/bool.C 2013/03/09 22:58:50 1.5 @@ -1,12 +1,10 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001-2009 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_INT_C="$Date: 2009/04/16 01:10:21 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -15,6 +13,8 @@ static const char * const IDENT_INT_C="$ #include "pa_vint.h" #include "pa_vbool.h" +volatile const char * IDENT_BOOL_C="$Id: bool.C,v 1.5 2013/03/09 22:58:50 moko Exp $" IDENT_PA_VBOOL_H; + // externs void _string_format(Request& r, MethodParams&); @@ -24,8 +24,6 @@ void _string_format(Request& r, MethodPa class MBool: public Methoded { public: MBool(); -public: // Methoded - bool used_directly() { return true; } }; // global variable @@ -35,47 +33,29 @@ DECLARE_CLASS_VAR(bool, new MBool, 0); // methods 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_int(0, "default must be int", r); - VBool& vbool=GET_SELF(r, VBool); r.write_no_lang(*new VInt(vbool.as_bool())); } 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_double(0, "default must be double", r); - VBool& vbool=GET_SELF(r, VBool); r.write_no_lang(*new VDouble(vbool.as_bool())); } 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); - r.write_no_lang(GET_SELF(r, VBool)); } -//typedef void (*vbool_op_func_ptr)(VBool& vbool, double param); - -//static void vbool_op(Request& r, MethodParams& params, -// vbool_op_func_ptr func) { -// VBool& vbool=GET_SELF(r, VBool); -// double param=params.count()?params.as_bool(0, "param must be bool", r):1; -// (*func)(vbool, param); -//} - // constructor MBool::MBool(): Methoded("bool") { // ^bool.int[] + // ^bool.int[default for ^string.int compatibility] add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); // ^bool.double[] + // ^bool.double[default for ^string.double compatibility] add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); // ^bool.bool[] + // ^bool.bool[default for ^string.bool compatibility] add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); }