--- parser3/src/classes/math.C	2001/12/15 21:28:17	1.11
+++ parser3/src/classes/math.C	2002/04/18 10:51:00	1.18
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: math.C,v 1.11 2001/12/15 21:28:17 paf Exp $
+	$Id: math.C,v 1.18 2002/04/18 10:51:00 paf Exp $
 */
 
 #include "pa_common.h"
@@ -19,7 +19,6 @@
 // defines
 
 #define PI 3.1415926535
-#define MATH_CLASS_NAME "math"
 
 // class
 
@@ -29,7 +28,7 @@ public:
 	void configure_admin(Request& r);
 
 public: // Methoded
-	bool used_directly() { return true; }
+	bool used_directly() { return false; }
 };
 
 // methods
@@ -38,16 +37,14 @@ 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)
-		throw Exception(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 ));
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	int result=(int)( ((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * uint(top) );
+	r.write_no_lang(*new(pool) VInt(pool, result));
 }
 
 
@@ -62,9 +59,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) \
@@ -94,11 +90,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) \
@@ -109,9 +104,7 @@ MATH2(pow);
 
 // constructor
 
-MMath::MMath(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), MATH_CLASS_NAME));
-	
+MMath::MMath(Pool& apool) : Methoded(apool, "math") {
 	// ^FUNC(expr)	
 #define ADD1(name) \
 	add_native_method(#name, Method::CT_STATIC, _##name, 1, 1)
@@ -141,13 +134,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();