--- parser3/src/classes/op.C 2001/05/08 06:07:47 1.16 +++ parser3/src/classes/op.C 2001/07/03 09:37:04 1.32 @@ -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.16 2001/05/08 06:07:47 paf Exp $ */ +static const char *RCSId="$Id: op.C,v 1.32 2001/07/03 09:37:04 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -15,6 +14,10 @@ #include "pa_vint.h" #include "pa_sql_connection.h" +// limits + +#define MAX_LOOPS 10000 + // defines #define OP_CLASS_NAME "OP" @@ -22,6 +25,9 @@ #define MAIN_SQL_NAME "SQL" #define MAIN_SQL_DRIVERS_NAME "drivers" +#define SWITCH_DATA_NAME "SWITCH-DATA" +#define DEFAULT_VALUE "DEFAULT" + // local variable static Methoded *OP; @@ -48,9 +54,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->get_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->get_junction(2, "'else' parameter must be code"))); } static void _untaint(Request& r, const String& method_name, MethodParams *params) { @@ -149,7 +155,7 @@ static void _while(Request& r, const Str // while... int endless_loop_count=0; while(true) { - if(++endless_loop_count>=1973) // endless loop? + if(++endless_loop_count>=MAX_LOOPS) // endless loop? PTHROW(0, 0, &method_name, "endless loop detected"); @@ -175,8 +181,8 @@ static void _use(Request& r, const Strin static void _for(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); const String& var_name=r.process(params->get(0)).as_string(); - int from=(int)r.process(params->get(1)).as_double(); - int to=(int)r.process(params->get(2)).as_double(); + 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 *delim_code=params->size()==3+1+1?¶ms->get(3+1):0; @@ -184,7 +190,7 @@ static void _for(Request& r, const Strin VInt *vint=new(pool) VInt(pool, 0); int endless_loop_count=0; for(int i=from; i<=to; i++) { - if(++endless_loop_count>=2001) // endless loop? + if(++endless_loop_count>=MAX_LOOPS) // endless loop? PTHROW(0, 0, &method_name, "endless loop detected"); @@ -221,14 +227,13 @@ 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) { +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"); @@ -237,25 +242,44 @@ static void double_one_op( r.write_no_lang(result); } -static void _round(Request& r, const String& method_name, MethodParams *params) { - double_one_op(r, method_name, params, &round); -} +#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); -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); -} +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"); -static void _abs(Request& r, const String& method_name, MethodParams *params) { - double_one_op(r, method_name, params, &fabs); + 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); } -static void _sign(Request& r, const String& method_name, MethodParams *params) { - double_one_op(r, method_name, params, &sign); -} +#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(); @@ -263,11 +287,12 @@ static void _connect(Request& r, const S Value& url=params->get_no_junction(0, "url must not be code"); Value& body_code=params->get_junction(1, "body must be code"); - Table *protocol2library=static_cast(r.classes_conf.get(OP->name())); + Table *protocol2driver_and_client= + static_cast
(r.classes_conf.get(OP->name())); // connect SQL_Connection& connection=SQL_driver_manager->get_connection( - url.as_string(), protocol2library); + url.as_string(), protocol2driver_and_client); Exception rethrow_me; // remember/set current connection @@ -305,6 +330,54 @@ static void _connect(Request& r, const S rethrow_me.comment()); } +static String *switch_data_name; +static String *default_value; + +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->get_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&, MethodParams *params) { + 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"); + for(int i=0; iget(i)); + + if(value.as_string() == *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), @@ -313,6 +386,9 @@ MOP::MOP(Pool& apool) : Methoded(apool), { set_name(*NEW String(pool(), OP_CLASS_NAME)); + switch_data_name=NEW String(pool(), SWITCH_DATA_NAME); + default_value=NEW String(pool(), DEFAULT_VALUE); + // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} add_native_method("if", Method::CT_ANY, _if, 2, 3); @@ -327,7 +403,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); @@ -345,27 +421,35 @@ MOP::MOP(Pool& apool) : Methoded(apool), // 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); + // ^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); - // ^ceiling(expr) - add_native_method("ceiling", Method::CT_ANY, _ceiling, 1, 1); +#define ADD_MATH2(name) \ + add_native_method(#name, Method::CT_ANY, _##name, 2, 2) - // ^abs(expr) - add_native_method("abs", Method::CT_ANY, _abs, 1, 1); + // ^pow(x;y) + ADD_MATH2(pow); - // ^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