--- parser3/src/classes/int.C 2003/03/24 10:24:28 1.49.2.7.2.4 +++ parser3/src/classes/int.C 2005/08/09 08:14:48 1.54 @@ -1,11 +1,11 @@ /** @file Parser: @b int parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_INT_C="$Date: 2003/03/24 10:24:28 $"; +static const char * const IDENT_INT_C="$Date: 2005/08/09 08:14:48 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -16,7 +16,7 @@ static const char* IDENT_INT_C="$Date: 2 // externs -void _string_format(Request& r, MethodParams* /*params*/); +void _string_format(Request& r, MethodParams&); // class @@ -33,19 +33,19 @@ DECLARE_CLASS_VAR(int, new MInt, 0); // methods -static void _int(Request& r, MethodParams* params) { +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_junction(0, "default must be int"); + if(params.count()>0) + params.as_junction(0, "default must be int"); VInt& vint=GET_SELF(r, VInt); r.write_no_lang(*new VInt(vint.get_int())); } -static void _double(Request& r, MethodParams* params) { +static void _double(Request& r, 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"); VInt& vint=GET_SELF(r, VInt); r.write_no_lang(*new VDouble(vint.as_double())); @@ -59,24 +59,24 @@ 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=GET_SELF(r, VInt); - double param=params->count()?params->as_double(0, "param must be numerical", r):1; + double param=params.count()?params.as_double(0, "param must be numerical", r):1; (*func)(vint, param); } -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); } +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, MethodParams* params, +const String* sql_result_string(Request& r, MethodParams& params, HashStringValue*& options, Value*& default_code); -static void _sql(Request& r, MethodParams* params) { +static void _sql(Request& r, MethodParams& params) { int val; HashStringValue* options; Value* default_code=0; @@ -89,7 +89,6 @@ static void _sql(Request& r, MethodParam throw Exception("parser.runtime", 0, "produced no result, but no default option specified"); - val=0; //calm, compiler } r.write_no_lang(*new VInt(val)); }