--- parser3/src/classes/math.C 2002/08/01 11:26:44 1.22 +++ parser3/src/classes/math.C 2003/02/17 07:18:57 1.24.2.7 @@ -1,11 +1,13 @@ /** @file Parser: @b math 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) */ -static const char* IDENT_MATH_C="$Id: math.C,v 1.22 2002/08/01 11:26:44 paf Exp $"; +static const char* IDENT_MATH_C="$Date: 2003/02/17 07:18:57 $"; + +#include "pa_vmethod_frame.h" #include "pa_common.h" #include "pa_vint.h" @@ -24,36 +26,40 @@ static const char* IDENT_MATH_C="$Id: ma // defines -#define PI 3.1415926535 #define MAX_SALT 8 // class class MMath : public Methoded { public: - MMath(Pool& pool); + MMath(); void configure_admin(Request& r); public: // Methoded bool used_directly() { return false; } }; +// global variables + +MethodedPtr math_class(0); // fictive +MethodedPtr math_base_class(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, 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"); - double top=r.process_to_value(range).as_double(); + ValuePtr 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, + method_name, "top must be above 1(%g)", top); - r.write_no_lang(*new(pool) VInt(pool, _random(uint(top)))); + r.write_no_lang(ValuePtr(new VInt(_random(uint(top))))); } @@ -63,21 +69,20 @@ 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"); + ValuePtr 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(ValuePtr(new VDouble(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); @@ -93,20 +98,19 @@ 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"); + ValuePtr a=params.as_junction(0, "parameter must be expression"); + ValuePtr b=params.as_junction(1, "parameter must be expression"); - 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)); + double result=func( + r.process_to_value(a)->as_double(), + r.process_to_value(b)->as_double()); + r.write_no_lang(ValuePtr(new VDouble(result))); } #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); @@ -114,10 +118,10 @@ MATH2(pow); inline bool is_salt_body_char(int c) { return isalnum(c) || c == '.' || c=='/'; } -static size_t calc_prefix_size(const char *salt) { +static size_t calc_prefix_size(const char* salt) { if(size_t salt_size=strlen(salt)) { if(!is_salt_body_char(salt[0])) { // $... {... - const char *cur=salt+1; // skip + const char* cur=salt+1; // skip while(is_salt_body_char(*cur++)) // ...$ ...} ; return cur-salt; @@ -126,13 +130,13 @@ 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(); + CharPtr password=params.as_string(0, "password must be string")->cstr(); + CharPtr 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; + const char* normal_salt; char normalize_buf[MAX_STRING]; if(prefix_size==strlen(maybe_bodyless_salt)) { // bodyless? strncpy(normalize_buf, maybe_bodyless_salt, MAX_STRING-MAX_SALT-1); @@ -151,24 +155,25 @@ static void _crypt(Request& r, const Str */ 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); - pa_MD5Encode((const unsigned char *)password, + char *sample_buf=new(pool) char[sample_size]; + pa_MD5Encode((const unsigned char *)password.get(), (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, + 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(StringPtr(new String(pool.copy(static_sample_buf)))); #else throw Exception("parser.runtime", - &method_name, + method_name, "salt must start with '" PA_MD5PW_ID "'"); #endif } @@ -176,7 +181,7 @@ static void _crypt(Request& r, const Str // 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) @@ -219,19 +224,3 @@ void MMath::configure_admin(Request&) { if(!randomizer) randomizer=rand(); } - -// global variables - -Methoded *math_base_class; -Hash *math_consts; - -// creator - -Methoded *MMath_create(Pool& pool) { - math_consts=new(pool) Hash(pool); - math_consts->put( - *new(pool) String(pool, "PI"), - new(pool) VDouble(pool, PI)); - - return math_base_class=new(pool) MMath(pool); -}