--- parser3/src/classes/math.C	2003/11/20 16:34:23	1.36
+++ parser3/src/classes/math.C	2005/08/26 11:12:45	1.41
@@ -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 16:34:23 $";
+static const char * const IDENT_MATH_C="$Date: 2005/08/26 11:12:45 $";
 
 #include "pa_vmethod_frame.h"
 #include "pa_common.h"
@@ -164,8 +164,7 @@ 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",
 			0,
@@ -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));
 }
 
@@ -208,12 +206,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));
 }
 
@@ -227,10 +222,10 @@ inline bool is_salt_body_char(int c) {
 	return isalnum(c) || c == '.' || c=='/';
 }
 static size_t calc_prefix_size(const char* salt) {
-	if(size_t salt_size=strlen(salt)) {
-		if(!is_salt_body_char(salt[0])) { // $...  {...
+	if(strlen(salt)) {
+		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