--- parser3/src/classes/op.C	2001/06/27 14:23:21	1.28
+++ parser3/src/classes/op.C	2001/07/03 09:37:04	1.32
@@ -4,9 +4,8 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: op.C,v 1.28 2001/06/27 14:23:21 parser Exp $
 */
+static const char *RCSId="$Id: op.C,v 1.32 2001/07/03 09:37:04 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_config_includes.h"
@@ -228,13 +227,13 @@ static void _eval(Request& r, const Stri
 }
 
 
-typedef double (*math_one_double_op_func_ptr)(double);
-static double round(double op) { return floor(op+0.5); }
-static double sign(double op) { return op > 0 ? 1 : ( op < 0 ? -1 : 0 ); }
-
-static void double_one_op(Request& r, 
-						  const String& method_name, MethodParams *params,
-						  math_one_double_op_func_ptr func) {
+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 void math1(Request& r, 
+				  const String& method_name, MethodParams *params,
+				  math1_func_ptr func) {
 	Pool& pool=r.pool();
 	Value& param=params->get_junction(0, "parameter must be expression");
 
@@ -243,33 +242,44 @@ static void double_one_op(Request& r,
 	r.write_no_lang(result);
 }
 
-static void _round(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&round);
-}
-
-static void _floor(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&floor);
-}
+#define MATH1(name) \
+	static void _##name(Request& r, const String& 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) {\
+		math1(r, method_name, params, &name_c);\
+	}
+MATH1(round);	MATH1(floor);	MATH1P(ceiling, ceil);
+MATH1P(abs, fabs);	MATH1(sign);
+MATH1(exp);	MATH1(log);	
+MATH1(sin);	MATH1(asin);	
+MATH1(cos);	MATH1(acos);	
+MATH1(tan);	MATH1(atan);
+MATH1(sqrt);
 
-static void _ceiling(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&ceil);
-}
 
-static void _abs(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&fabs);
-}
+typedef double (*math2_func_ptr)(double, double);
+static void math2(Request& r, 
+				  const String& method_name, MethodParams *params,
+				  math2_func_ptr func) {
+	Pool& pool=r.pool();
+	Value& a=params->get_junction(0, "parameter must be expression");
+	Value& b=params->get_junction(1, "parameter must be expression");
 
-static void _sign(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&sign);
+	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);
 }
 
-static void _log(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&log);
-}
+#define MATH2(name) \
+	static void _##name(Request& r, const String& method_name, MethodParams *params) {\
+		math2(r, method_name, params, &name);\
+	}
+MATH2(pow);
 
-static void _exp(Request& r, const String& method_name, MethodParams *params) {
-	double_one_op(r, method_name, params,	&exp);
-}
 
 static void _connect(Request& r, const String&, MethodParams *params) {
 	Pool& pool=r.pool();
@@ -411,29 +421,24 @@ MOP::MOP(Pool& apool) : Methoded(apool),
 
 	// math functions
 
-	// ^round(expr)	
-	add_native_method("round", Method::CT_ANY, _round, 1, 1);
-
-	// ^floor(expr)	
-	add_native_method("floor", Method::CT_ANY, _floor, 1, 1);
+	// ^FUNC(expr)	
+#define ADD_MATH1(name) \
+	add_native_method(#name, Method::CT_ANY, _##name, 1, 1)
+
+	ADD_MATH1(round);	ADD_MATH1(floor);	ADD_MATH1(ceiling);
+	ADD_MATH1(abs);	ADD_MATH1(sign);
+	ADD_MATH1(exp);	ADD_MATH1(log);	
+	ADD_MATH1(sin);	ADD_MATH1(asin);	
+	ADD_MATH1(cos);	ADD_MATH1(acos);	
+	ADD_MATH1(tan);	ADD_MATH1(atan);
+	ADD_MATH1(sqrt);
 
-	// ^ceiling(expr)	
-	add_native_method("ceiling", Method::CT_ANY, _ceiling, 1, 1);
+#define ADD_MATH2(name) \
+	add_native_method(#name, Method::CT_ANY, _##name, 2, 2)
 
-	// ^abs(expr)	
-	add_native_method("abs", Method::CT_ANY, _abs, 1, 1);
+	// ^pow(x;y)
+	ADD_MATH2(pow);
 
-	// ^sign(expr)
-	add_native_method("sign", Method::CT_ANY, _sign, 1, 1);
-
-	// ^log(expr)
-	add_native_method("log", Method::CT_ANY, _log, 1, 1);
-
-	// ^exp(expr)
-	add_native_method("exp", Method::CT_ANY, _exp, 1, 1);
-
-	
-	// connect
 
 	// ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s}
 	add_native_method("connect", Method::CT_ANY, _connect, 2, 2);