--- parser3/src/classes/math.C 2003/01/31 12:34:27 1.24.2.2 +++ parser3/src/classes/math.C 2003/02/04 14:04:46 1.24.2.3 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MATH_C="$Date: 2003/01/31 12:34:27 $"; +static const char* IDENT_MATH_C="$Date: 2003/02/04 14:04:46 $"; #include "pa_common.h" #include "pa_vint.h" @@ -42,10 +42,10 @@ static unsigned int randomizer=0; static inline int _random(uint top) { return (int)(((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * top ); } -static void _random(Request& r, const String& method_name, MethodParams *params) { +static void _random(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - Value& range=params->as_junction(0, "range must be expression"); + Value& range=params.as_junction(0, "range must be expression"); double top=r.process_to_value(range).as_double(); if(top<=1) throw Exception("parser.runtime", @@ -62,21 +62,21 @@ static double degrees(double param) { re static double radians(double param) { return param /180 *PI; } static void math1(Request& r, - const String& method_name, MethodParams *params, + StringPtr method_name, MethodParams& params, math1_func_ptr func) { Pool& pool=r.pool(); - Value& param=params->as_junction(0, "parameter must be expression"); + Value& param=params.as_junction(0, "parameter must be expression"); double result=(*func)(r.process_to_value(param).as_double()); r.write_no_lang(*new(pool) VDouble(pool, result)); } #define MATH1(name) \ - static void _##name(Request& r, const String& method_name, MethodParams *params) {\ + static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\ math1(r, method_name, params, &name);\ } #define MATH1P(name_parser, name_c) \ - static void _##name_parser(Request& r, const String& method_name, MethodParams *params) {\ + static void _##name_parser(Request& r, StringPtr method_name, MethodParams& params) {\ math1(r, method_name, params, &name_c);\ } MATH1(round); MATH1(floor); MATH1P(ceiling, ceil); @@ -92,11 +92,11 @@ MATH1(sqrt); typedef double (*math2_func_ptr)(double, double); static void math2(Request& r, - const String& method_name, MethodParams *params, + StringPtr method_name, MethodParams& params, math2_func_ptr func) { Pool& pool=r.pool(); - Value& a=params->as_junction(0, "parameter must be expression"); - Value& b=params->as_junction(1, "parameter must be expression"); + Value& a=params.as_junction(0, "parameter must be expression"); + Value& b=params.as_junction(1, "parameter must be expression"); double result=(*func)( r.process_to_value(a).as_double(), @@ -105,7 +105,7 @@ static void math2(Request& r, } #define MATH2(name) \ - static void _##name(Request& r, const String& method_name, MethodParams *params) {\ + static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\ math2(r, method_name, params, &name);\ } MATH2(pow); @@ -125,10 +125,10 @@ static size_t calc_prefix_size(const cha } else return 0; } -static void _crypt(Request& r, const String& method_name, MethodParams *params) { +static void _crypt(Request& r, StringPtr method_name, MethodParams& params) { Pool& pool=r.pool(); - const char* password=params->as_string(0, "password must be string").cstr(); - const char* maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr(); + const char* password=params.as_string(0, "password must be string").cstr(); + const char* maybe_bodyless_salt=params.as_string(1, "salt must be string").cstr(); size_t prefix_size=calc_prefix_size(maybe_bodyless_salt); const char* normal_salt;