--- parser3/src/classes/int.C 2002/04/18 10:50:59 1.44 +++ parser3/src/classes/int.C 2003/02/04 14:12:42 1.49.2.3 @@ -1,50 +1,54 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 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 $ */ +static const char* IDENT_INT_C="$Date: 2003/02/04 14:12:42 $"; + #include "classes.h" +#include "pa_vmethod_frame.h" + #include "pa_request.h" #include "pa_vdouble.h" #include "pa_vint.h" // externs -void _string_format(Request& r, const String& method_name, MethodParams *); +void _string_format(Request& r, StringPtr method_name, MethodParams& /*params*/); // class class MInt : public Methoded { public: - MInt(Pool& pool); + MInt(); public: // Methoded bool used_directly() { return true; } }; -// methods +// global variable -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"); +MethodedPtr int_class(new MInt); - VInt *vint=static_cast(r.self); - r.write_no_lang(*new(pool) VInt(pool, vint->get_int())); -} +// methods -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, StringPtr method_name, MethodParams& params) { + // just checking (default) syntax validity, never really using it here, just for string.int compatibility + if(params.count()>0) + params.as_junction(0, "default must be int"); + + VInt& vint=*static_cast(r.get_self().get()); + r.write_no_lang(ValuePtr(new VInt(vint.get_int()))); +} + +static void _double(Request& r, StringPtr method_name, MethodParams& params) { + // just checking (default) syntax validity, never really using it here, just for string.doube compatibility + if(params.count()>0) + params.as_junction(0, "default must be double"); - VInt *vint=static_cast(r.self); - r.write_no_lang(*new(pool) VDouble(pool, vint->as_double())); + VInt& vint=*static_cast(r.get_self().get()); + r.write_no_lang(ValuePtr(new VDouble(vint.as_double()))); } typedef void (*vint_op_func_ptr)(VInt& vint, double param); @@ -55,47 +59,45 @@ static void __mul(VInt& vint, double par static void __div(VInt& vint, double param) { vint.div(param); } static void __mod(VInt& vint, double param) { vint.mod((int)param); } -static void vint_op(Request& r, MethodParams *params, +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); + VInt& vint=*static_cast(r.get_self().get()); + 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, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__inc); } +static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__dec); } +static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mul); } +static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__div); } +static void _mod(Request& r, StringPtr /*method_name*/, 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(); +StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params, + HashStringValuePtr& options, ValuePtr& default_code); +static void _sql(Request& r, StringPtr method_name, MethodParams& params) { int val; - Hash *options; - Value *default_code; - if(const String *string=sql_result_string(r, method_name, params, options, default_code)) + HashStringValuePtr options(0); + ValuePtr default_code(0); + if(StringPtr string=sql_result_string(r, method_name, params, options, default_code)) val=string->as_int(); else if(default_code) - val=r.process_to_value(*default_code).as_int(); + val=r.process_to_value(default_code)->as_int(); else { throw Exception("parser.runtime", - &method_name, + method_name, "produced no result, but no default option specified"); val=0; //calm, compiler } - r.write_no_lang(*new(pool) VInt(pool, val)); + r.write_no_lang(ValuePtr(new VInt(val))); } // constructor -MInt::MInt(Pool& apool) : Methoded(apool, "int") { +MInt::MInt(): Methoded("int") { // ^int.int[] add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1); @@ -123,12 +125,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); -}