--- parser3/src/classes/op.C 2001/06/27 14:23:21 1.28 +++ parser3/src/classes/op.C 2001/07/03 10:10:21 1.33 @@ -4,9 +4,8 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (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.33 2001/07/03 10:10:21 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -228,49 +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 double_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); -} - -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); -} - -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); -} - -static void _sign(Request& r, const String& method_name, MethodParams *params) { - double_one_op(r, method_name, params, &sign); -} - -static void _log(Request& r, const String& method_name, MethodParams *params) { - double_one_op(r, method_name, params, &log); -} - -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(); @@ -409,32 +365,6 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("eval", Method::CT_ANY, _eval, 1, 2); - // 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); - - // ^ceiling(expr) - add_native_method("ceiling", Method::CT_ANY, _ceiling, 1, 1); - - // ^abs(expr) - add_native_method("abs", Method::CT_ANY, _abs, 1, 1); - - // ^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);