--- parser3/src/classes/op.C 2001/07/03 09:20:55 1.31 +++ parser3/src/classes/op.C 2001/07/03 10:10:21 1.33 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: op.C,v 1.31 2001/07/03 09:20:55 parser Exp $"; +static const char *RCSId="$Id: op.C,v 1.33 2001/07/03 10:10:21 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -227,33 +227,6 @@ 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 math_one_op(Request& r, - const String& method_name, MethodParams *params, - math_one_double_op_func_ptr func) { - Pool& pool=r.pool(); - Value& param=params->get_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); -} - -#define _MATH(name) \ - static void _##name(Request& r, const String& method_name, MethodParams *params) {\ - math_one_op(r, method_name, params, &round);\ - } -_MATH(round); _MATH(floor); _MATH(ceiling); -_MATH(abs); _MATH(sign); -_MATH(exp); _MATH(log); -_MATH(sin); _MATH(asin); -_MATH(cos); _MATH(acos); -_MATH(tan); _MATH(atan); - - static void _connect(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); @@ -392,17 +365,6 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("eval", Method::CT_ANY, _eval, 1, 2); - // math functions - - // ^round(expr) - #define ADD_MATH(name) add_native_method(#name, Method::CT_ANY, _##name, 1, 1); - ADD_MATH(round); ADD_MATH(floor); ADD_MATH(ceiling); - ADD_MATH(abs); ADD_MATH(sign); - ADD_MATH(exp); ADD_MATH(log); - ADD_MATH(sin); ADD_MATH(asin); - ADD_MATH(cos); ADD_MATH(acos); - ADD_MATH(tan); ADD_MATH(atan); - // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2);