--- parser3/src/classes/math.C	2003/11/20 17:46:01	1.37
+++ parser3/src/classes/math.C	2007/04/24 08:40:12	1.48
@@ -1,14 +1,14 @@
 /** @file
 	Parser: @b math 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 <paf@design.ru>(http://paf.design.ru)
 
 	portions from gen_uuid.c,
 	Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
 */
 
-static const char * const IDENT_MATH_C="$Date: 2003/11/20 17:46:01 $";
+static const char * const IDENT_MATH_C="$Date: 2007/04/24 08:40:12 $";
 
 #include "pa_vmethod_frame.h"
 #include "pa_common.h"
@@ -164,10 +164,9 @@ static inline int _random(uint top) {
 }
 
 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();
+	double top=params.as_double(0, "range must be expression", r);
 	if(top<=0 || top>MAX_UINT)
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"top(%g) must be [1..%u]", top, MAX_UINT);
 	
@@ -181,9 +180,8 @@ static double degrees(double param) { re
 static double radians(double param) { return param /180 *PI; }
 
 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());
+	double param=params.as_double(0, "parameter must be expression", r);
+	double result=func(param);
 	r.write_no_lang(*new VDouble(result));
 }
 
@@ -198,7 +196,8 @@ static void math1(Request& r, MethodPara
 MATH1(round);	MATH1(floor);	MATH1P(ceiling, ceil);
 MATH1(trunc);	MATH1(frac);
 MATH1P(abs, fabs);	MATH1(sign);
-MATH1(exp);	MATH1(log);	
+MATH1(exp);	
+MATH1(log);	MATH1(log10);
 MATH1(sin);	MATH1(asin);	
 MATH1(cos);	MATH1(acos);	
 MATH1(tan);	MATH1(atan);
@@ -208,12 +207,9 @@ MATH1(sqrt);
 
 typedef double (*math2_func_ptr)(double, double);
 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(
-		r.process_to_value(a).as_double(),
-		r.process_to_value(b).as_double());
+	double a=params.as_double(0, "parameter must be expression", r);
+	double b=params.as_double(1, "parameter must be expression", r);
+	double result=func(a, b);
 	r.write_no_lang(*new VDouble(result));
 }
 
@@ -228,9 +224,9 @@ inline bool is_salt_body_char(int c) {
 }
 static size_t calc_prefix_size(const char* salt) {
 	if(strlen(salt)) {
-		if(!is_salt_body_char(salt[0])) { // $...  {...
+		if(!is_salt_body_char((unsigned char)salt[0])) { // $...  {...
 			const char* cur=salt+1; // skip
-			while(is_salt_body_char(*cur++)) // ...$  ...}
+			while(is_salt_body_char((unsigned char)*cur++)) // ...$  ...}
 				;
 			return cur-salt;
 		} else
@@ -273,40 +269,22 @@ static void _crypt(Request& r, MethodPar
 		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",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"crypt on this platform does not support '%.*s' salt prefix", prefix_size, normal_salt);
 		
 		r.write_pass_lang(String(pa_strdup(static_sample_buf)));
 #else
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"salt must start with '" PA_MD5PW_ID "'");
 #endif
 	}
 }
 
-static const char* hex_string(unsigned char* bytes, size_t size, bool upcase) {
-	char *bytes_hex=new(PointerFreeGC) char [size*2/*byte->hh*/+1/*for zero-teminator*/];
-	unsigned char *src=bytes;
-	unsigned char *end=bytes+size;
-	char *dest=bytes_hex;
-
-	static const char *hex=upcase?"0123456789ABCDEF":"0123456789abcdef";
-
-	for(; src<end; src++) {
-                *dest++=hex[*src/0x10];
-                *dest++=hex[*src%0x10];
-	}
-	*dest=0;
-
-	return bytes_hex;
-}
-
 static void _md5(Request& r, MethodParams& params) {
 	const char *string=params.as_string(0, "parameter must be string").cstr();
 
-
 	PA_MD5_CTX context;
 	unsigned char digest[16];
 	pa_MD5Init(&context);
@@ -367,6 +345,11 @@ static void _uid64(Request& r, MethodPar
 	r.write_pass_lang(*new String(hex_string(id, sizeof(id), true)));
 }
 
+static void _crc32(Request& r, MethodParams& params) {
+	const char *string=params.as_string(0, "parameter must be string").cstr();
+	r.write_no_lang(*new VInt(pa_crc32(string, strlen(string))));
+}
+
 // constructor
 
 MMath::MMath(): Methoded("math") {
@@ -380,7 +363,8 @@ MMath::MMath(): Methoded("math") {
 	ADD1(round);	ADD1(floor);	ADD1(ceiling);
 	ADD1(trunc);	ADD1(frac);
 	ADD1(abs);	ADD1(sign);
-	ADD1(exp);	ADD1(log);	
+	ADD1(exp);
+	ADD1(log);	ADD1(log10);
 	ADD1(sin);	ADD1(asin);	
 	ADD1(cos);	ADD1(acos);	
 	ADD1(tan);	ADD1(atan);
@@ -397,6 +381,8 @@ MMath::MMath(): Methoded("math") {
 	// ^md5[string]
 	ADD1(md5);
 
+	ADD1(crc32);
+
 	// ^uuid[]
 	ADD0(uuid);