--- parser3/src/classes/op.C 2001/05/21 17:17:11 1.23 +++ parser3/src/classes/op.C 2001/09/05 09:02:52 1.40 @@ -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.23 2001/05/21 17:17:11 parser Exp $ */ +static const char *RCSId="$Id: op.C,v 1.40 2001/09/05 09:02:52 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -23,13 +22,6 @@ #define OP_CLASS_NAME "OP" -#define MAIN_SQL_NAME "SQL" -#define MAIN_SQL_DRIVERS_NAME "drivers" - -// local variable - -static Methoded *OP; - // class class MOP : public Methoded { @@ -38,6 +30,7 @@ public: public: // Methoded bool used_directly() { return true; } void configure_user(Request& r); + private: String main_sql_name; String main_sql_drivers_name; @@ -52,9 +45,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(1))); + 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(2))); + 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) { @@ -69,7 +62,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 @@ -94,7 +87,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( @@ -114,7 +107,7 @@ static void _process(Request& r, const S origin.file, 1+origin.line, method_name.cstr()); #else - strncpy(place, MAX_STRING, method_name.cstr()); + strncpy(place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0; #endif VStateless_class& self_class=*r.self->get_class(); @@ -141,14 +134,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; @@ -172,8 +165,8 @@ 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"); - r.use_file(r.absolute(vfile.as_string())); + Value& vfile=params->as_no_junction(0, "file name must not be code"); + r.use_file(vfile.as_string()); } static void _for(Request& r, const String& method_name, MethodParams *params) { @@ -181,7 +174,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; @@ -207,13 +200,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); @@ -225,49 +218,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 _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( @@ -309,6 +267,57 @@ static void _connect(Request& r, const S rethrow_me.comment()); } +struct Switch_data { + Value *searching; + Value *found; + Value *_default; +}; + +static void _switch(Request& r, const String&, MethodParams *params) { + void *backup=r.classes_conf.get(*switch_data_name); + Switch_data data={&r.process(params->get(0))}; + r.classes_conf.put(*switch_data_name, &data); + + r.process(params->as_junction(1, "switch cases must be code")); // and ignore result + + r.classes_conf.put(*switch_data_name, backup); + + if(Value *code=data.found ? data.found : data._default) + r.write_pass_lang(r.process(*code)); +} + +static void _case(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); + if(!data) + PTHROW(0, 0, + &method_name, + "without switch"); + + int count=params->size(); + Value *code=¶ms->as_junction(--count, "case result must be code"); + for(int i=0; iget(i)); + + if(value.as_string() == *case_default_value) { + data->_default=code; + break; + } + + bool matches; + if(data->searching->is_string()) + matches=data->searching->as_string() == value.as_string(); + else + matches=data->searching->as_double() == value.as_double(); + + if(matches) { + data->found=code; + break; + } + } +} + // constructor MOP::MOP(Pool& apool) : Methoded(apool), @@ -331,7 +340,7 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("process", Method::CT_ANY, _process, 1, 1); // ^rem{code} - add_native_method("rem", Method::CT_ANY, _rem, 1, 1); + add_native_method("rem", Method::CT_ANY, _rem, 1, 1000); // ^while(condition){code} add_native_method("while", Method::CT_ANY, _while, 2, 2); @@ -347,35 +356,22 @@ 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); - - - // connect - // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2); + // switch + + // ^switch[value]{cases} + add_native_method("switch", Method::CT_ANY, _switch, 2, 2); + + // ^case[value]{code} + add_native_method("case", Method::CT_ANY, _case, 2, 1000); } // constructor & configurator Methoded *MOP_create(Pool& pool) { - return OP=new(pool) MOP(pool); + return new(pool) MOP(pool); }