--- parser3/src/classes/double.C 2001/11/05 11:46:20 1.41 +++ parser3/src/classes/double.C 2012/04/19 19:41:29 1.65 @@ -1,50 +1,62 @@ /** @file Parser: @b double parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: double.C,v 1.41 2001/11/05 11:46:20 paf Exp $ + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" +#include "pa_vbool.h" -// externs - -void _string_format(Request& r, const String& method_name, MethodParams *); +volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.65 2012/04/19 19:41:29 moko Exp $" IDENT_PA_VDOUBLE_H; -// defines +// externs -#define DOUBLE_CLASS_NAME "double" +void _string_format(Request& r, MethodParams&); // class -class MDouble : public Methoded { +class MDouble: public Methoded { public: - MDouble(Pool& pool); -public: // Methoded - bool used_directly() { return true; } + MDouble(); }; +// global variable + +DECLARE_CLASS_VAR(double, new MDouble, 0); + // methods -static void _int(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - VDouble *vdouble=static_cast(r.self); - Value& result=*new(pool) VInt(pool, vdouble->as_int()); - result.set_name(method_name); - r.write_no_lang(result); +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); + + 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.double compatibility + if(params.count()>0) + 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 _double(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - VDouble *vdouble=static_cast(r.self); - Value& result=*new(pool) VDouble(pool, vdouble->as_double()); - result.set_name(method_name); - r.write_no_lang(result); +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); @@ -55,58 +67,50 @@ static void __mul(VDouble& vdouble, doub static void __div(VDouble& vdouble, double param) { vdouble.div(param); } static void __mod(VDouble& vdouble, double param) { vdouble.mod((int)param); } -static void vdouble_op(Request& r, MethodParams *params, +static void vdouble_op(Request& r, MethodParams& params, vdouble_op_func_ptr func) { - VDouble *vdouble=static_cast(r.self); - double param=params->size()? - params->as_double(0, "param must be double", r):1/*used in inc/dec*/; - (*func)(*vdouble, param); + VDouble& vdouble=GET_SELF(r, VDouble); + double param=params.count()? + params.as_double(0, "param must be double", r):1/*used in inc/dec*/; + (*func)(vdouble, param); } -static void _inc(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__inc); } -static void _dec(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__dec); } -static void _mul(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__mul); } -static void _div(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__div); } -static void _mod(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__mod); } +static void _inc(Request& r, MethodParams& params) { vdouble_op(r, params, &__inc); } +static void _dec(Request& r, MethodParams& params) { vdouble_op(r, params, &__dec); } +static void _mul(Request& r, MethodParams& params) { vdouble_op(r, params, &__mul); } +static void _div(Request& r, MethodParams& params) { vdouble_op(r, params, &__div); } +static void _mod(Request& r, MethodParams& params) { vdouble_op(r, params, &__mod); } // from string.C -extern -const String* sql_result_string(Request& r, const String& method_name, MethodParams *params, - Hash *& options, Value *& default_code); - -static void _sql(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); +extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); +static void _sql(Request& r, MethodParams& params) { double val; - Hash *options; - Value *default_code; - if(const String *string=sql_result_string(r, method_name, params, options, default_code)) + Value* default_code; + if(const String* string=sql_result_string(r, params, default_code)) val=string->as_double(); else if(default_code) - val=r.process(*default_code).as_double(); + val=r.process_to_value(*default_code).as_double(); else { - throw Exception(0, 0, - &method_name, + throw Exception(PARSER_RUNTIME, + 0, "produced no result, but no default option specified"); - val=0; //calm, compiler } - VDouble& result=*new(pool) VDouble(pool, val); - result.set_name(method_name); - r.write_assign_lang(result); + r.write_no_lang(*new VDouble(val)); } // constructor -MDouble::MDouble(Pool& apool) : Methoded(apool) { - set_name(*NEW String(pool(), DOUBLE_CLASS_NAME)); - - +MDouble::MDouble(): Methoded("double") { // ^double.int[] - add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0); + add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); // ^double.double[] - add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0); + 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] @@ -128,12 +132,3 @@ MDouble::MDouble(Pool& apool) : Methoded // ^sql[query][$.limit(1) $.offset(2) $.default(0.0)] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } -// global variable - -Methoded *double_class; - -// creator - -Methoded *MDouble_create(Pool& pool) { - return double_class=new(pool) MDouble(pool); -}