--- parser3/src/classes/double.C 2003/02/04 14:23:44 1.53.2.4 +++ parser3/src/classes/double.C 2003/02/26 11:29:54 1.53.2.8 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_DOUBLE_C="$Date: 2003/02/04 14:23:44 $"; +static const char* IDENT_DOUBLE_C="$Date: 2003/02/26 11:29:54 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -16,11 +16,11 @@ static const char* IDENT_DOUBLE_C="$Date // externs -void _string_format(Request& r, StringPtr method_name, MethodParams& /*params*/); +void _string_format(Request& r, StringPtr method_name, MethodParams* /*params*/); // class -class MDouble : public Methoded { +class MDouble: public Methoded { public: MDouble(); public: // Methoded @@ -29,23 +29,23 @@ public: // Methoded // global variable -MethodedPtr double_class(new MDouble); +DECLARE_CLASS_VAR(double, new MDouble, 0); // methods -static void _int(Request& r, StringPtr method_name, MethodParams& params) { +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"); + if(params->count()>0) + params->as_junction(0, "default must be int"); VDouble& vdouble=*static_cast(r.get_self().get()); r.write_no_lang(ValuePtr(new VInt(vdouble.as_int()))); } -static void _double(Request& r, StringPtr method_name, MethodParams& params) { +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"); + if(params->count()>0) + params->as_junction(0, "default must be double"); VDouble& vdouble=*static_cast(r.get_self().get()); r.write_no_lang(ValuePtr(new VDouble(vdouble.as_double()))); @@ -59,28 +59,28 @@ 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, +static void vdouble_op(Request& r, MethodParams* params, vdouble_op_func_ptr func) { VDouble& vdouble=*static_cast(r.get_self().get()); - 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); } -static void _inc(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__inc); } -static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__dec); } -static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__mul); } -static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__div); } -static void _mod(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__mod); } +static void _inc(Request& r, StringPtr /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__inc); } +static void _dec(Request& r, StringPtr /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__dec); } +static void _mul(Request& r, StringPtr /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__mul); } +static void _div(Request& r, StringPtr /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__div); } +static void _mod(Request& r, StringPtr /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__mod); } // from string.C extern -StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params, - HashStringValuePtr& options, ValuePtr& default_code); +StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams* params, + HashStringValue*& options, ValuePtr& default_code); -static void _sql(Request& r, StringPtr method_name, MethodParams& params) { +static void _sql(Request& r, StringPtr method_name, MethodParams* params) { double val; - HashStringValuePtr options; + HashStringValue* options; ValuePtr default_code; if(StringPtr string=sql_result_string(r, method_name, params, options, default_code)) val=string->as_double();