--- parser3/src/classes/double.C 2012/03/16 09:24:06 1.64 +++ parser3/src/classes/double.C 2015/10/26 01:21:53 1.68 @@ -1,7 +1,7 @@ /** @file Parser: @b double parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -13,7 +13,7 @@ #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; +volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.68 2015/10/26 01:21:53 moko Exp $" IDENT_PA_VDOUBLE_H; // externs @@ -32,29 +32,17 @@ 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 - if(params.count()>0) - params.as_int(0, "default must be int", r); - +static void _int(Request& r, MethodParams&) { 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); - +static void _double(Request& r, MethodParams&) { 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); - +static void _bool(Request& r, MethodParams&) { VDouble& vdouble=GET_SELF(r, VDouble); r.write_no_lang(VBool::get(vdouble.as_bool())); } @@ -82,15 +70,12 @@ static void _div(Request& r, MethodParam static void _mod(Request& r, MethodParams& params) { vdouble_op(r, params, &__mod); } // from string.C -extern -const String* sql_result_string(Request& r, MethodParams& params, - HashStringValue*& options, Value*& default_code); +extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); static void _sql(Request& r, MethodParams& params) { double val; - HashStringValue* options; Value* default_code; - if(const String* string=sql_result_string(r, params, options, default_code)) + if(const String* string=sql_result_string(r, params, default_code)) val=string->as_double(); else if(default_code) @@ -107,12 +92,13 @@ static void _sql(Request& r, MethodParam MDouble::MDouble(): Methoded("double") { // ^double.int[] + // ^double.int[default for ^string.int compatibility] add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); - // ^double.double[] + // ^double.double[default for ^string.double compatibility] add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); - // ^double.bool[] + // ^double.bool[default for ^string.bool compatibility] add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); // ^double.inc[]