--- parser3/src/classes/int.C 2002/04/18 10:50:59 1.44 +++ parser3/src/classes/int.C 2026/04/25 13:38:46 1.76 @@ -1,106 +1,101 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) - - $Id: int.C,v 1.44 2002/04/18 10:50:59 paf Exp $ + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" +#include "pa_vbool.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 -void _string_format(Request& r, const String& method_name, MethodParams *); +void _string_format(Request& r, MethodParams&); // class -class MInt : public Methoded { +class MInt: public Methoded { public: - MInt(Pool& pool); -public: // Methoded - bool used_directly() { return true; } + MInt(); }; +// global variable + +DECLARE_CLASS_VAR(int, new MInt); + // methods -static void _int(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - // just checking (default) syntax validity, never really using it here, just for string.int compatibility - if(params->size()>0) - params->as_junction(0, "default must be int"); - - VInt *vint=static_cast(r.self); - r.write_no_lang(*new(pool) VInt(pool, vint->get_int())); -} - -static void _double(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - // just checking (default) syntax validity, never really using it here, just for string.doube compatibility - if(params->size()>0) - params->as_junction(0, "default must be double"); +static void _int(Request& r, MethodParams&) { + VInt& vint=GET_SELF(r, VInt); + r.write(*new VInt(vint.get_int())); +} + +static void _double(Request& r, MethodParams&) { + VInt& vint=GET_SELF(r, VInt); + r.write(*new VDouble(vint.as_double())); +} - VInt *vint=static_cast(r.self); - r.write_no_lang(*new(pool) VDouble(pool, vint->as_double())); +static void _bool(Request& r, MethodParams&) { + VInt& vint=GET_SELF(r, VInt); + r.write(VBool::get(vint.as_bool())); } 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=static_cast(r.self); - double param=params->size()?params->as_double(0, "param must be numerical", r):1; - (*func)(*vint, param); +static void vint_op(Request& r, MethodParams& params, vint_op_func_ptr func) { + VInt& vint=GET_SELF(r, VInt); + double param=params.count()?params.as_double(0, "param must be numerical", r):1; + (*func)(vint, param); } -static void _inc(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__inc); } -static void _dec(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__dec); } -static void _mul(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__mul); } -static void _div(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__div); } -static void _mod(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__mod); } +static void _inc(Request& r, MethodParams& params) { vint_op(r, params, &__inc); } +static void _dec(Request& r, MethodParams& params) { vint_op(r, params, &__dec); } +static void _mul(Request& r, MethodParams& params) { vint_op(r, params, &__mul); } +static void _div(Request& r, MethodParams& params) { vint_op(r, params, &__div); } +static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); } // from string.C -extern -const String* sql_result_string(Request& r, const String& method_name, MethodParams *params, - Hash *& options, Value *& default_code); - -static void _sql(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - - int val; - Hash *options; - Value *default_code; - if(const String *string=sql_result_string(r, method_name, params, options, default_code)) - val=string->as_int(); +extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code); + +static void _sql(Request& r, MethodParams& params) { + pa_wint val; + Value* default_code=0; + if(const String* string=sql_result_string(r, params, default_code)) + val=string->as_wint(); else if(default_code) - val=r.process_to_value(*default_code).as_int(); + val=r.process(*default_code).as_wint(); else { - throw Exception("parser.runtime", - &method_name, - "produced no result, but no default option specified"); - val=0; //calm, compiler + throw Exception(PARSER_RUNTIME, 0, "produced no result, but no default option specified"); } - r.write_no_lang(*new(pool) VInt(pool, val)); + r.write(*new VInt(val)); } // constructor -MInt::MInt(Pool& apool) : Methoded(apool, "int") { +MInt::MInt(): Methoded("int") { // ^int.int[] + // ^int.int[default for ^string.int compatibility] add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); - // ^int.double[] + // ^int.double[default for ^string.double compatibility] add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1); + // ^int.bool[] + // ^int.bool[default for ^string.bool compatibility] + add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1); // ^int.inc[] // ^int.inc[offset] @@ -123,12 +118,3 @@ MInt::MInt(Pool& apool) : Methoded(apool // ^sql[query][$.limit(1) $.offset(2) $.default(0)] add_native_method("sql", Method::CT_STATIC, _sql, 1, 2); } -// global variable - -Methoded *int_class; - -// creator - -Methoded *MInt_create(Pool& pool) { - return int_class=new(pool) MInt(pool); -}