--- parser3/src/classes/int.C 2023/09/26 20:49:06 1.71 +++ parser3/src/classes/int.C 2026/04/25 13:38:46 1.76 @@ -1,7 +1,7 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) Authors: Konstantin Morshnev , Alexandr Petrosian */ @@ -13,7 +13,7 @@ #include "pa_vint.h" #include "pa_vbool.h" -volatile const char * IDENT_INT_C="$Id: int.C,v 1.71 2023/09/26 20:49:06 moko Exp $" IDENT_PA_VINT_H; +volatile const char * IDENT_INT_C="$Id: int.C,v 1.76 2026/04/25 13:38:46 moko Exp $" IDENT_PA_VINT_H; // externs @@ -49,11 +49,11 @@ static void _bool(Request& r, MethodPara typedef void (*vint_op_func_ptr)(VInt& vint, double param); -static void __inc(VInt& vint, double param) { vint.inc((int)param); } -static void __dec(VInt& vint, double param) { vint.inc((int)-param); } +static void __inc(VInt& vint, double param) { vint.inc(param); } +static void __dec(VInt& vint, double param) { vint.inc(-param); } static void __mul(VInt& vint, double param) { vint.mul(param); } static void __div(VInt& vint, double param) { vint.div(param); } -static void __mod(VInt& vint, double param) { vint.mod((int)param); } +static void __mod(VInt& vint, double param) { vint.mod(clip2wint(param)); } static void vint_op(Request& r, MethodParams& params, vint_op_func_ptr func) { VInt& vint=GET_SELF(r, VInt); @@ -71,13 +71,13 @@ static void _mod(Request& r, MethodParam extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); static void _sql(Request& r, MethodParams& params) { - int val; + pa_wint val; Value* default_code=0; if(const String* string=sql_result_string(r, params, default_code)) - val=string->as_int(); + val=string->as_wint(); else if(default_code) - val=r.process(*default_code).as_int(); + val=r.process(*default_code).as_wint(); else { throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); }