--- parser3/src/classes/double.C 2016/03/31 21:46:19 1.69 +++ parser3/src/classes/double.C 2026/01/06 16:36:38 1.78 @@ -1,8 +1,8 @@ /** @file Parser: @b double parser class. - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "classes.h" @@ -13,7 +13,7 @@ #include "pa_vint.h" #include "pa_vbool.h" -volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.69 2016/03/31 21:46:19 moko Exp $" IDENT_PA_VDOUBLE_H; +volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.78 2026/01/06 16:36:38 moko Exp $" IDENT_PA_VDOUBLE_H; // externs @@ -34,17 +34,17 @@ DECLARE_CLASS_VAR(double, new MDouble); static void _int(Request& r, MethodParams&) { VDouble& vdouble=GET_SELF(r, VDouble); - r.write_no_lang(*new VInt(vdouble.as_int())); + r.write(*new VInt(vdouble.as_wint())); } static void _double(Request& r, MethodParams&) { VDouble& vdouble=GET_SELF(r, VDouble); - r.write_no_lang(*new VDouble(vdouble.as_double())); + r.write(*new VDouble(vdouble.as_double())); } static void _bool(Request& r, MethodParams&) { VDouble& vdouble=GET_SELF(r, VDouble); - r.write_no_lang(VBool::get(vdouble.as_bool())); + r.write(VBool::get(vdouble.as_bool())); } typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param); @@ -53,13 +53,11 @@ static void __inc(VDouble& vdouble, doub static void __dec(VDouble& vdouble, double param) { vdouble.inc(-param); } static void __mul(VDouble& vdouble, double param) { vdouble.mul(param); } static void __div(VDouble& vdouble, double param) { vdouble.div(param); } -static void __mod(VDouble& vdouble, double param) { vdouble.mod((int)param); } +static void __mod(VDouble& vdouble, double param) { vdouble.mod(param); } -static void vdouble_op(Request& r, MethodParams& params, - vdouble_op_func_ptr func) { +static void vdouble_op(Request& r, MethodParams& params, vdouble_op_func_ptr func) { VDouble& vdouble=GET_SELF(r, VDouble); - double param=params.count()? - params.as_double(0, "param must be double", r):1/*used in inc/dec*/; + double param=params.count() ? params.as_double(0, "param must be double", r) : 1/*used in inc/dec*/; (*func)(vdouble, param); } @@ -79,13 +77,11 @@ static void _sql(Request& r, MethodParam val=string->as_double(); else if(default_code) - val=r.process_to_value(*default_code).as_double(); + val=r.process(*default_code).as_double(); else { - throw Exception(PARSER_RUNTIME, - 0, - "produced no result, but no default option specified"); + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } - r.write_no_lang(*new VDouble(val)); + r.write(*new VDouble(val)); } // constructor