--- parser3/src/classes/math.C 2003/02/04 14:12:42 1.24.2.4 +++ parser3/src/classes/math.C 2003/04/14 14:59:29 1.26 @@ -1,13 +1,11 @@ /** @file Parser: @b math parser class. - Copyright(c) 2001-2003 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="$Date: 2003/02/04 14:12:42 $"; - -#include "pa_vmethod_frame.h" +static const char* IDENT_MATH_C="$Date: 2003/04/14 14:59:29 $"; #include "pa_common.h" #include "pa_vint.h" @@ -26,6 +24,7 @@ static const char* IDENT_MATH_C="$Date: // defines +#define PI 3.1415926535 #define MAX_SALT 8 // class @@ -44,15 +43,15 @@ 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) { +static void _random(Request& r, const String& 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) + Value& range=params->as_junction(0, "range must be expression"); + double top=r.process_to_value(range).as_double(); + if(top<=0) throw Exception("parser.runtime", &method_name, - "top must be above 1(%g)", top); + "top must be above 0(%g)", top); r.write_no_lang(*new(pool) VInt(pool, _random(uint(top)))); } @@ -64,21 +63,21 @@ static double degrees(double param) { re static double radians(double param) { return param /180 *PI; } static void math1(Request& r, - StringPtr method_name, MethodParams& params, + const String& 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, StringPtr method_name, MethodParams& params) {\ + static void _##name(Request& r, const String& method_name, MethodParams *params) {\ math1(r, method_name, params, &name);\ } #define MATH1P(name_parser, name_c) \ - static void _##name_parser(Request& r, StringPtr method_name, MethodParams& params) {\ + static void _##name_parser(Request& r, const String& method_name, MethodParams *params) {\ math1(r, method_name, params, &name_c);\ } MATH1(round); MATH1(floor); MATH1P(ceiling, ceil); @@ -94,11 +93,11 @@ MATH1(sqrt); typedef double (*math2_func_ptr)(double, double); static void math2(Request& r, - StringPtr method_name, MethodParams& params, + const String& 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(), @@ -107,7 +106,7 @@ static void math2(Request& r, } #define MATH2(name) \ - static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\ + static void _##name(Request& r, const String& method_name, MethodParams *params) {\ math2(r, method_name, params, &name);\ } MATH2(pow); @@ -115,10 +114,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; @@ -127,13 +126,13 @@ static size_t calc_prefix_size(const cha } else return 0; } -static void _crypt(Request& r, StringPtr method_name, MethodParams& params) { +static void _crypt(Request& r, const String& 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; + 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); @@ -154,11 +153,13 @@ static void _crypt(Request& r, StringPtr const size_t sample_size=120; char *sample_buf=(char *)pool.malloc(sample_size); pa_MD5Encode((const unsigned char *)password, - (const unsigned char *)normal_salt, sample_buf, sample_size); + (const unsigned char *)normal_salt, 1/*TRUE: mix in magic string*/, + sample_buf, sample_size, + 0, 0); r.write_pass_lang(*new(pool) String(pool, sample_buf)); } else { #ifdef HAVE_CRYPT - const char* sample_buf=crypt(password, normal_salt); + 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 @@ -175,6 +176,27 @@ static void _crypt(Request& r, StringPtr } } +static void _md5(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + const char *string=params->as_string(0, "parameter must be string").cstr(); + const size_t sample_size=120; + char sample_buf[sample_size]; + const int sample_bytes_count=12; + unsigned char sample_bytes[sample_bytes_count]; + pa_MD5Encode((const unsigned char *)string, + (const unsigned char *)"", 0/*FALSE: mix in magic string*/, + sample_buf, sample_size, + sample_bytes, sample_bytes_count); + char *sample_bytes_hex=(char *)pool.malloc(sample_bytes_count*2/*byte->hh*/+1/*for zero-teminator*/); + unsigned char *src=sample_bytes; + unsigned char *end=sample_bytes+sample_bytes_count; + char *dest=sample_bytes_hex; + while(srcput( + *new(pool) String(pool, "PI"), + new(pool) VDouble(pool, PI)); + return math_base_class=new(pool) MMath(pool); }