--- parser3/src/classes/double.C 2013/07/29 15:02:17 1.67 +++ parser3/src/classes/double.C 2016/10/08 18:35:26 1.71 @@ -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.67 2013/07/29 15:02:17 moko Exp $" IDENT_PA_VDOUBLE_H; +volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.71 2016/10/08 18:35:26 moko Exp $" IDENT_PA_VDOUBLE_H; // externs @@ -28,7 +28,7 @@ public: // global variable -DECLARE_CLASS_VAR(double, new MDouble, 0); +DECLARE_CLASS_VAR(double, new MDouble); // methods @@ -55,11 +55,9 @@ 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, - 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,11 +77,9 @@ 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)); }