--- parser3/src/classes/math.C	2002/08/01 11:26:44	1.22
+++ parser3/src/classes/math.C	2003/02/04 14:12:42	1.24.2.4
@@ -1,11 +1,13 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright(c) 2001, 2002 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright(c) 2001-2003 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru>(http://paf.design.ru)
 */
 
-static const char* IDENT_MATH_C="$Id: math.C,v 1.22 2002/08/01 11:26:44 paf Exp $";
+static const char* IDENT_MATH_C="$Date: 2003/02/04 14:12:42 $";
+
+#include "pa_vmethod_frame.h"
 
 #include "pa_common.h"
 #include "pa_vint.h"
@@ -24,7 +26,6 @@ static const char* IDENT_MATH_C="$Id: ma
 
 // defines
 
-#define PI 3.1415926535
 #define MAX_SALT 8
 
 // class
@@ -43,10 +44,10 @@ static unsigned int randomizer=0;
 static inline int _random(uint top) {
 	return (int)(((double)((randomizer=rand())% RAND_MAX)) / RAND_MAX * top );
 }
-static void _random(Request& r, const String& method_name, MethodParams *params) {
+static void _random(Request& r, StringPtr method_name, MethodParams& params) {
 	Pool& pool=r.pool();
 
-	Value& range=params->as_junction(0, "range must be expression");
+	Value& range=params.as_junction(0, "range must be expression");
     double top=r.process_to_value(range).as_double();
     if(top<=1)
 		throw Exception("parser.runtime",
@@ -63,21 +64,21 @@ static double degrees(double param) { re
 static double radians(double param) { return param /180 *PI; }
 
 static void math1(Request& r, 
-				  const String& method_name, MethodParams *params,
+				  StringPtr method_name, MethodParams& params,
 				  math1_func_ptr func) {
 	Pool& pool=r.pool();
-	Value& param=params->as_junction(0, "parameter must be expression");
+	Value& param=params.as_junction(0, "parameter must be expression");
 
 	double result=(*func)(r.process_to_value(param).as_double());
 	r.write_no_lang(*new(pool) VDouble(pool, result));
 }
 
 #define MATH1(name) \
-	static void _##name(Request& r, const String& method_name, MethodParams *params) {\
+	static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\
 		math1(r, method_name, params, &name);\
 	}
 #define MATH1P(name_parser, name_c) \
-	static void _##name_parser(Request& r, const String& method_name, MethodParams *params) {\
+	static void _##name_parser(Request& r, StringPtr method_name, MethodParams& params) {\
 		math1(r, method_name, params, &name_c);\
 	}
 MATH1(round);	MATH1(floor);	MATH1P(ceiling, ceil);
@@ -93,11 +94,11 @@ MATH1(sqrt);
 
 typedef double (*math2_func_ptr)(double, double);
 static void math2(Request& r, 
-				  const String& method_name, MethodParams *params,
+				  StringPtr method_name, MethodParams& params,
 				  math2_func_ptr func) {
 	Pool& pool=r.pool();
-	Value& a=params->as_junction(0, "parameter must be expression");
-	Value& b=params->as_junction(1, "parameter must be expression");
+	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(),
@@ -106,7 +107,7 @@ static void math2(Request& r,
 }
 
 #define MATH2(name) \
-	static void _##name(Request& r, const String& method_name, MethodParams *params) {\
+	static void _##name(Request& r, StringPtr method_name, MethodParams& params) {\
 		math2(r, method_name, params, &name);\
 	}
 MATH2(pow);
@@ -114,10 +115,10 @@ MATH2(pow);
 inline bool is_salt_body_char(int c) {
 	return isalnum(c) || c == '.' || c=='/';
 }
-static size_t calc_prefix_size(const char *salt) {
+static size_t calc_prefix_size(const char* salt) {
 	if(size_t salt_size=strlen(salt)) {
 		if(!is_salt_body_char(salt[0])) { // $...  {...
-			const char *cur=salt+1; // skip
+			const char* cur=salt+1; // skip
 			while(is_salt_body_char(*cur++)) // ...$  ...}
 				;
 			return cur-salt;
@@ -126,13 +127,13 @@ static size_t calc_prefix_size(const cha
 	} else
 		return 0;
 }
-static void _crypt(Request& r, const String& method_name, MethodParams *params) {
+static void _crypt(Request& r, StringPtr method_name, MethodParams& params) {
 	Pool& pool=r.pool();
-	const char *password=params->as_string(0, "password must be string").cstr();
-	const char *maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr();
+	const char* password=params.as_string(0, "password must be string").cstr();
+	const char* maybe_bodyless_salt=params.as_string(1, "salt must be string").cstr();
 
 	size_t prefix_size=calc_prefix_size(maybe_bodyless_salt);
-	const char *normal_salt;
+	const char* normal_salt;
 	char normalize_buf[MAX_STRING];
 	if(prefix_size==strlen(maybe_bodyless_salt)) { // bodyless?
 		strncpy(normalize_buf, maybe_bodyless_salt, MAX_STRING-MAX_SALT-1);
@@ -157,7 +158,7 @@ static void _crypt(Request& r, const Str
 		r.write_pass_lang(*new(pool) String(pool, sample_buf));
     } else {
 #ifdef HAVE_CRYPT
-		const char *sample_buf=crypt(password, normal_salt);
+		const char* sample_buf=crypt(password, normal_salt);
 		if(!sample_buf  // nothing generated
 			|| !sample_buf[0] // generated nothing
 			|| strncmp(sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved
@@ -222,16 +223,10 @@ void MMath::configure_admin(Request&) {
 
 // global variables
 
-Methoded *math_base_class;
-Hash *math_consts;
+VStateless_classPtr math_base_class(???);
 
 // creator
 
 Methoded *MMath_create(Pool& pool) {
-	math_consts=new(pool) Hash(pool);
-	math_consts->put(
-		*new(pool) String(pool, "PI"), 
-		new(pool) VDouble(pool, PI));
-
 	return math_base_class=new(pool) MMath(pool);
 }