--- parser3/src/classes/double.C 2010/10/21 15:06:27 1.63 +++ parser3/src/classes/double.C 2026/05/06 20:19:02 1.80 @@ -1,12 +1,10 @@ /** @file Parser: @b double parser class. - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ -static const char * const IDENT_DOUBLE_C="$Date: 2010/10/21 15:06:27 $"; - #include "classes.h" #include "pa_vmethod_frame.h" @@ -15,6 +13,8 @@ static const char * const IDENT_DOUBLE_C #include "pa_vint.h" #include "pa_vbool.h" +volatile const char * IDENT_DOUBLE_C="$Id: double.C,v 1.80 2026/05/06 20:19:02 moko Exp $" IDENT_PA_VDOUBLE_H; + // externs void _string_format(Request& r, MethodParams&); @@ -28,35 +28,23 @@ public: // global variable -DECLARE_CLASS_VAR(double, new MDouble, 0); +DECLARE_CLASS_VAR(double, new MDouble); // 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())); + r.write(*new VInt(vdouble.as_wint())); } -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())); + r.write(*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())); + r.write(VBool::get(vdouble.as_bool())); } typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param); @@ -65,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); } @@ -81,47 +67,61 @@ static void _mul(Request& r, MethodParam static void _div(Request& r, MethodParams& params) { vdouble_op(r, params, &__div); } static void _mod(Request& r, MethodParams& params) { vdouble_op(r, params, &__mod); } +static void _plus_plus(Request& r, MethodParams& params) { + VDouble& vdouble=GET_SELF(r, VDouble); + r.write(*new VDouble(vdouble)); + vdouble.inc(1); +} + +static void _minus_minus(Request& r, MethodParams& params) { + VDouble& vdouble=GET_SELF(r, VDouble); + r.write(*new VDouble(vdouble)); + vdouble.inc(-1); +} + // 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) - 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 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[] + + // ^double.inc[] // ^double.inc[offset] add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1); - // ^double.dec[] + // ^double.dec[] // ^double.dec[offset] add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1); - // ^double.mul[k] + + // ^double.++[] + add_native_method("++", Method::CT_DYNAMIC, _plus_plus, 0, 0); + // ^double.--[] + add_native_method("--", Method::CT_DYNAMIC, _minus_minus, 0, 0); + + // ^double.mul[k] add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1); // ^double.div[d] add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1); @@ -130,7 +130,7 @@ MDouble::MDouble(): Methoded("double") { // ^double.format{format} add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1); - + // ^sql[query] // ^sql[query][$.limit(1) $.offset(2) $.default(0.0)] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);