--- parser3/src/classes/math.C 2003/02/04 15:15:02 1.24.2.5 +++ parser3/src/classes/math.C 2003/03/24 13:43:40 1.24.2.12.2.7 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MATH_C="$Date: 2003/02/04 15:15:02 $"; +static const char* IDENT_MATH_C="$Date: 2003/03/24 13:43:40 $"; #include "pa_vmethod_frame.h" @@ -20,8 +20,12 @@ static const char* IDENT_MATH_C="$Date: # include #endif -#ifdef HAVE_CRYPT_H -#include +#ifdef HAVE_CRYPT +# ifdef HAVE_CRYPT_H +# include +# endif +#else + extern char *crypt(const char* , const char* ); #endif // defines @@ -30,31 +34,33 @@ static const char* IDENT_MATH_C="$Date: // class -class MMath : public Methoded { +class MMath: public Methoded { public: - MMath(Pool& pool); + MMath(); void configure_admin(Request& r); public: // Methoded bool used_directly() { return false; } }; +// global variables + +DECLARE_CLASS_VAR(math, 0 /*fictive*/, new MMath); + // methods 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, StringPtr method_name, MethodParams& params) { - Pool& pool=r.pool(); - - Value& range=params.as_junction(0, "range must be expression"); - double top=r.process_to_value(range).as_double(); - if(top<=1) +static void _random(Request& r, MethodParams* params) { + 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", - method_name, + 0, "top must be above 1(%g)", top); - r.write_no_lang(*new(pool) VInt(pool, _random(uint(top)))); + r.write_no_lang(*new VInt(_random(uint(top)))); } @@ -63,23 +69,20 @@ static double frac(double param) { retur static double degrees(double param) { return param /PI *180; } static double radians(double param) { return param /180 *PI; } -static void math1(Request& r, - StringPtr method_name, MethodParams& params, - math1_func_ptr func) { - Pool& pool=r.pool(); - Value& param=params.as_junction(0, "parameter must be expression"); +static void math1(Request& r, MethodParams* params, math1_func_ptr func) { + 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)); + double result=func(r.process_to_value(param).as_double()); + r.write_no_lang(*new VDouble(result)); } #define MATH1(name) \ - static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\ - math1(r, method_name, params, &name);\ + static void _##name(Request& r, MethodParams* params) {\ + math1(r, params, &name);\ } #define MATH1P(name_parser, name_c) \ - static void _##name_parser(Request& r, StringPtr method_name, MethodParams& params) {\ - math1(r, method_name, params, &name_c);\ + static void _##name_parser(Request& r, MethodParams* params) {\ + math1(r, params, &name_c);\ } MATH1(round); MATH1(floor); MATH1P(ceiling, ceil); MATH1(trunc); MATH1(frac); @@ -93,22 +96,19 @@ MATH1(sqrt); typedef double (*math2_func_ptr)(double, double); -static void math2(Request& r, - 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"); +static void math2(Request& r, MethodParams* params, math2_func_ptr func) { + Value& a=params->as_junction(0, "parameter must be expression"); + Value& b=params->as_junction(1, "parameter must be expression"); - double result=(*func)( + double result=func( r.process_to_value(a).as_double(), r.process_to_value(b).as_double()); - r.write_no_lang(*new(pool) VDouble(pool, result)); + r.write_no_lang(*new VDouble(result)); } #define MATH2(name) \ - static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\ - math2(r, method_name, params, &name);\ + static void _##name(Request& r, MethodParams* params) {\ + math2(r, params, &name);\ } MATH2(pow); @@ -127,10 +127,9 @@ static size_t calc_prefix_size(const cha } else return 0; } -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(); +static void _crypt(Request& r, MethodParams* params) { + 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; @@ -152,24 +151,25 @@ static void _crypt(Request& r, StringPtr */ if(strncmp(normal_salt, PA_MD5PW_ID, PA_MD5PW_IDLEN) == 0) { const size_t sample_size=120; - char *sample_buf=(char *)pool.malloc(sample_size); + char *sample_buf=new(PointerFreeGC) char[sample_size]; pa_MD5Encode((const unsigned char *)password, (const unsigned char *)normal_salt, sample_buf, sample_size); - r.write_pass_lang(*new(pool) String(pool, sample_buf)); + String sample(sample_buf); + r.write_pass_lang(sample); } else { #ifdef HAVE_CRYPT - const char* sample_buf=crypt(password, normal_salt); - if(!sample_buf // nothing generated - || !sample_buf[0] // generated nothing - || strncmp(sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved + const char* static_sample_buf=crypt(password, normal_salt); + if(!static_sample_buf // nothing generated + || !static_sample_buf[0] // generated nothing + || strncmp(static_sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved throw Exception("parser.runtime", method_name, "on this platform does not support '%.*s' salt prefix", prefix_size, normal_salt); - r.write_pass_lang(*new(pool) String(pool, sample_buf)); + r.write_pass_lang(String(pool.copy(static_sample_buf))); #else throw Exception("parser.runtime", - method_name, + 0, "salt must start with '" PA_MD5PW_ID "'"); #endif } @@ -177,7 +177,7 @@ static void _crypt(Request& r, StringPtr // constructor -MMath::MMath(Pool& apool) : Methoded(apool, "math") { +MMath::MMath(): Methoded("math") { // ^FUNC(expr) #define ADD1(name) \ add_native_method(#name, Method::CT_STATIC, _##name, 1, 1) @@ -220,13 +220,3 @@ void MMath::configure_admin(Request&) { if(!randomizer) randomizer=rand(); } - -// global variables - -VStateless_classPtr math_base_class(???); - -// creator - -Methoded *MMath_create(Pool& pool) { - return math_base_class=new(pool) MMath(pool); -}