--- parser3/src/classes/math.C	2001/07/07 16:38:01	1.3
+++ parser3/src/classes/math.C	2002/06/21 12:42:19	1.19
@@ -1,52 +1,56 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	$Id: math.C,v 1.19 2002/06/21 12:42:19 paf Exp $
 */
-static const char *RCSId="$Id: math.C,v 1.3 2001/07/07 16:38:01 parser Exp $"; 
 
-#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_vint.h"
 #include "pa_vmath.h"
 #include "pa_request.h"
+#include "pa_md5.h"
+
+#ifdef WIN32
+// for threadID
+#	include <windows.h>
+#endif
 
 // defines
 
 #define PI 3.1415926535
-#define MATH_CLASS_NAME "math"
 
 // class
 
 class MMath : public Methoded {
 public:
 	MMath(Pool& pool);
+	void configure_admin(Request& r);
+
 public: // Methoded
-	bool used_directly() { return true; }
+	bool used_directly() { return false; }
 };
 
 // methods
-
+static unsigned int randomizer=0;
 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");
-    uint max=(uint)r.process(range).as_double();
-    if(max<=1)
-		PTHROW(0, 0,
+    double top=r.process_to_value(range).as_double();
+    if(top<=1)
+		throw Exception("parser.runtime",
 			&method_name,
-			"bad range [0..%u]", max);
+			"top must be above 1 (%g)", top);
 	
-	r.write_no_lang(*new(pool) VInt(pool, rand()%max));
+	int result=(int)( ((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * uint(top) );
+	r.write_no_lang(*new(pool) VInt(pool, result));
 }
 
 
 typedef double (*math1_func_ptr)(double);
-static double round(double param) { return floor(param+0.5); }
-static double sign(double param) { return param > 0 ? 1 : ( param < 0 ? -1 : 0 ); }
-static double trunc(double param) { return param > 0? floor(param) : ceil(param); }
 static double frac(double param) { return param-trunc(param); }
 static double degrees(double param) { return param /PI *180; }
 static double radians(double param) { return param /180 *PI; }
@@ -57,9 +61,8 @@ static void math1(Request& r,
 	Pool& pool=r.pool();
 	Value& param=params->as_junction(0, "parameter must be expression");
 
-	Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).as_double()));
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	double result=(*func)(r.process_to_value(param).as_double());
+	r.write_no_lang(*new(pool) VDouble(pool, result));
 }
 
 #define MATH1(name) \
@@ -89,11 +92,10 @@ static void math2(Request& r,
 	Value& a=params->as_junction(0, "parameter must be expression");
 	Value& b=params->as_junction(1, "parameter must be expression");
 
-	Value& result=*new(pool) VDouble(pool, (*func)(
-		r.process(a).as_double(),
-		r.process(b).as_double()));
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	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));
 }
 
 #define MATH2(name) \
@@ -102,15 +104,28 @@ static void math2(Request& r,
 	}
 MATH2(pow);
 
-// constructor
+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 *salt=params->as_string(1, "salt must be string").cstr();
 
-MMath::MMath(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), MATH_CLASS_NAME));
+    /* FreeBSD style MD5 string 
+     */
+    if (strncmp(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,
+				 (const unsigned char *)salt, sample_buf, sample_size);
+		r.write_pass_lang(*new(pool) String(pool, sample_buf));
+    } else
+		throw Exception("parser.runtime",
+			&method_name,
+			"salt must start with '" PA_MD5PW_ID "'");
+}
 
+// constructor
 
-	// setting seed
-	srand(getpid()+time(NULL));  rand();
-	
+MMath::MMath(Pool& apool) : Methoded(apool, "math") {
 	// ^FUNC(expr)	
 #define ADD1(name) \
 	add_native_method(#name, Method::CT_STATIC, _##name, 1, 1)
@@ -132,6 +147,26 @@ MMath::MMath(Pool& apool) : Methoded(apo
 	// ^pow(x;y)
 	ADD2(pow);
 
+	// ^crypt[password;salt]
+	ADD2(crypt);
+}
+
+// in MSVC each thread has it's own pseudo-random sequence
+// in win32 apache each thread can handle multiple requests
+// so to get proper randoms we remember random generated in one thread
+void MMath::configure_admin(Request&) {
+	// setting seed
+	srand(
+		randomizer
+#ifdef WIN32
+		^ GetCurrentThreadId()
+#else
+		^ getpid()
+#endif
+		^ (unsigned int)time(NULL)
+	);
+	if(!randomizer)
+		randomizer=rand();
 }
 
 // global variables