--- parser3/src/classes/math.C	2001/08/07 13:23:33	1.5
+++ parser3/src/classes/math.C	2002/04/10 09:53:14	1.17
@@ -1,13 +1,12 @@
 /** @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.17 2002/04/10 09:53:14 paf Exp $
 */
-static const char *RCSId="$Id: math.C,v 1.5 2001/08/07 13:23:33 parser Exp $"; 
 
-#include "pa_config_includes.h"
 #include "pa_common.h"
 #include "pa_vint.h"
 #include "pa_vmath.h"
@@ -30,7 +29,7 @@ public:
 	void configure_admin(Request& r);
 
 public: // Methoded
-	bool used_directly() { return true; }
+	bool used_directly() { return false; }
 };
 
 // methods
@@ -39,23 +38,20 @@ static void _random(Request& r, const St
 	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);
 	
 	Value& result=*new(pool) VInt(pool, (int)(
-		((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * (max + 1)));
+		((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * uint(top) ));
 	result.set_name(method_name);
 	r.write_no_lang(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; }
@@ -66,7 +62,7 @@ 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()));
+	Value& result=*new(pool) VDouble(pool, (*func)(r.process_to_value(param).as_double()));
 	result.set_name(method_name);
 	r.write_no_lang(result);
 }
@@ -99,8 +95,8 @@ static void math2(Request& r,
 	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()));
+		r.process_to_value(a).as_double(),
+		r.process_to_value(b).as_double()));
 	result.set_name(method_name);
 	r.write_no_lang(result);
 }
@@ -145,13 +141,13 @@ MMath::MMath(Pool& apool) : Methoded(apo
 void MMath::configure_admin(Request&) {
 	// setting seed
 	srand(
-		randomizer ^
+		randomizer
 #ifdef WIN32
-		GetCurrentThreadId() ^
+		^ GetCurrentThreadId()
 #else
-		getpid() ^
+		^ getpid()
 #endif
-		(unsigned int)time(NULL)
+		^ (unsigned int)time(NULL)
 	);
 	if(!randomizer)
 		randomizer=rand();