--- parser3/src/classes/op.C 2001/06/27 14:23:21 1.28 +++ parser3/src/classes/op.C 2001/07/26 16:16:57 1.35 @@ -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.35 2001/07/26 16:16:57 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -29,10 +28,6 @@ #define SWITCH_DATA_NAME "SWITCH-DATA" #define DEFAULT_VALUE "DEFAULT" -// local variable - -static Methoded *OP; - // class class MOP : public Methoded { @@ -55,9 +50,9 @@ static void _if(Request& r, const String 0/*no name*/, false/*don't intercept string*/).as_bool(); if(condition) - r.write_pass_lang(r.process(params->get_junction(1, "'then' parameter must be code"))); + r.write_pass_lang(r.process(params->as_junction(1, "'then' parameter must be code"))); else if(params->size()==3) - r.write_pass_lang(r.process(params->get_junction(2, "'else' parameter must be code"))); + r.write_pass_lang(r.process(params->as_junction(2, "'else' parameter must be code"))); } static void _untaint(Request& r, const String& method_name, MethodParams *params) { @@ -72,7 +67,7 @@ static void _untaint(Request& r, const S "invalid untaint language"); { - Value& vbody=params->get_junction(1, "body must be code"); + Value& vbody=params->as_junction(1, "body must be code"); Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang @@ -97,7 +92,7 @@ static void _taint(Request& r, const Str } { - Value& vbody=params->get_no_junction(params->size()-1, "body must not be code"); + Value& vbody=params->as_no_junction(params->size()-1, "body must not be code"); String result(r.pool()); result.append( @@ -144,14 +139,14 @@ static void _process(Request& r, const S } static void _rem(Request& r, const String&, MethodParams *params) { - params->get_junction(0, "body must be code"); + params->as_junction(0, "body must be code"); } static void _while(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vcondition=params->get_junction(0, "condition must be expression"); - Value& body=params->get_junction(1, "body must be code"); + Value& vcondition=params->as_junction(0, "condition must be expression"); + Value& body=params->as_junction(1, "body must be code"); // while... int endless_loop_count=0; @@ -175,7 +170,7 @@ static void _while(Request& r, const Str } static void _use(Request& r, const String& method_name, MethodParams *params) { - Value& vfile=params->get_no_junction(0, "file name must not be code"); + Value& vfile=params->as_no_junction(0, "file name must not be code"); r.use_file(r.absolute(vfile.as_string())); } @@ -184,7 +179,7 @@ static void _for(Request& r, const Strin const String& var_name=r.process(params->get(0)).as_string(); int from=r.process(params->get(1)).as_int(); int to=r.process(params->get(2)).as_int(); - Value& body_code=params->get_junction(3, "body must be code"); + Value& body_code=params->as_junction(3, "body must be code"); Value *delim_code=params->size()==3+1+1?¶ms->get(3+1):0; bool need_delim=false; @@ -210,13 +205,13 @@ static void _for(Request& r, const Strin } static void _eval(Request& r, const String& method_name, MethodParams *params) { - Value& expr=params->get_junction(0, "need expression"); + Value& expr=params->as_junction(0, "need expression"); // evaluate expresion Value *result=r.process(expr, 0/*no name YET*/, true/*don't intercept string*/).as_expr_result(); if(params->size()==2) { - Value& fmt=params->get_no_junction(1, "fmt must not be code"); + Value& fmt=params->as_no_junction(1, "fmt must not be code"); Pool& pool=r.pool(); String& string=*new(pool) String(pool); @@ -228,57 +223,14 @@ 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(); - Value& url=params->get_no_junction(0, "url must not be code"); - Value& body_code=params->get_junction(1, "body must be code"); + Value& url=params->as_no_junction(0, "url must not be code"); + Value& body_code=params->as_junction(1, "body must be code"); Table *protocol2driver_and_client= - static_cast(r.classes_conf.get(OP->name())); + static_cast
(r.classes_conf.get(r.OP.name())); // connect SQL_Connection& connection=SQL_driver_manager->get_connection( @@ -334,7 +286,7 @@ static void _switch(Request& r, const St Switch_data data={&r.process(params->get(0))}; r.classes_conf.put(*switch_data_name, &data); - r.process(params->get_junction(1, "switch cases must be code")); // and ignore result + r.process(params->as_junction(1, "switch cases must be code")); // and ignore result r.classes_conf.put(*switch_data_name, backup); @@ -346,7 +298,7 @@ static void _case(Request& r, const Stri Switch_data& data=*static_cast(r.classes_conf.get(*switch_data_name)); int count=params->size(); - Value *code=¶ms->get_junction(--count, "case result must be code"); + Value *code=¶ms->as_junction(--count, "case result must be code"); for(int i=0; iget(i)); @@ -409,32 +361,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); @@ -450,7 +376,7 @@ MOP::MOP(Pool& apool) : Methoded(apool), // constructor & configurator Methoded *MOP_create(Pool& pool) { - return OP=new(pool) MOP(pool); + return new(pool) MOP(pool); }