--- parser3/src/classes/op.C 2001/07/03 09:37:04 1.32 +++ parser3/src/classes/op.C 2001/07/26 16:16:57 1.35 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: op.C,v 1.32 2001/07/03 09:37:04 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" @@ -28,10 +28,6 @@ static const char *RCSId="$Id: op.C,v 1. #define SWITCH_DATA_NAME "SWITCH-DATA" #define DEFAULT_VALUE "DEFAULT" -// local variable - -static Methoded *OP; - // class class MOP : public Methoded { @@ -54,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) { @@ -71,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 @@ -96,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( @@ -143,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; @@ -174,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())); } @@ -183,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; @@ -209,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); @@ -227,68 +223,14 @@ static void _eval(Request& r, const Stri } -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"); - - Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).as_double())); - result.set_name(method_name); - r.write_no_lang(result); -} - -#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); - - -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"); - - 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); -} - -#define MATH2(name) \ - static void _##name(Request& r, const String& method_name, MethodParams *params) {\ - math2(r, method_name, params, &name);\ - } -MATH2(pow); - - 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( @@ -344,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); @@ -356,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)); @@ -419,27 +361,6 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("eval", Method::CT_ANY, _eval, 1, 2); - // math functions - - // ^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); - -#define ADD_MATH2(name) \ - add_native_method(#name, Method::CT_ANY, _##name, 2, 2) - - // ^pow(x;y) - ADD_MATH2(pow); - - // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2); @@ -455,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); }