--- parser3/src/classes/op.C 2001/07/03 09:37:04 1.32 +++ parser3/src/classes/op.C 2001/10/10 12:52:13 1.52 @@ -2,10 +2,10 @@ Parser: parser @b operators. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: op.C,v 1.52 2001/10/10 12:52:13 parser 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" @@ -22,16 +22,6 @@ static const char *RCSId="$Id: op.C,v 1. #define OP_CLASS_NAME "OP" -#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; - // class class MOP : public Methoded { @@ -40,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; @@ -48,21 +39,21 @@ private: // methods static void _if(Request& r, const String&, MethodParams *params) { - Value& condition_code=params->get(0); + Value& condition_code=params->as_junction(0, "condition must be expression"); bool condition=r.process(condition_code, 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"))); - 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(1, "'then' parameter must be code"))); + else if(params->size()>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) { Pool& pool=r.pool(); - const String& lang_name=r.process(params->get(0)).as_string(); + const String& lang_name=params->as_string(0, "lang must be string"); String::Untaint_lang lang=static_cast( untaint_lang_name2enum->get_int(lang_name)); if(!lang) @@ -71,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 @@ -85,8 +76,7 @@ static void _taint(Request& r, const Str if(params->size()==1) lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set else { - const String& lang_name= - r.process(params->get(0)).as_string(); + const String& lang_name=params->as_string(0, "lang must be string"); lang=static_cast( untaint_lang_name2enum->get_int(lang_name)); if(!lang) @@ -96,7 +86,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( @@ -116,7 +106,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(); @@ -128,7 +118,7 @@ static void _process(Request& r, const S // evaluate source to process const String& source= - r.process(params->get(0)).as_string(); + r.process(params->as_no_junction(0, "body must be string")).as_string(); // process source code, append processed methods to 'self' class // maybe-define new @main @@ -143,14 +133,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,17 +164,17 @@ 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) { Pool& pool=r.pool(); - 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 *delim_code=params->size()==3+1+1?¶ms->get(3+1):0; + const String& var_name=params->as_string(0, "var name must be string"); + int from=params->as_int(1, "from must be int", r); + int to=params->as_int(2, "to must be int", r); + Value& body_code=params->as_junction(3, "body must be code"); + Value *delim_maybe_code=params->size()>4?¶ms->get(4):0; bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); @@ -195,13 +185,13 @@ static void _for(Request& r, const Strin &method_name, "endless loop detected"); vint->set_int(i); - r.root->put_element(var_name, vint); + r.self/*root*/->put_element(var_name, vint); Value& processed_body=r.process(body_code); - if(delim_code) { // delimiter set? + if(delim_maybe_code) { // delimiter set? const String *string=processed_body.get_string(); if(need_delim && string && string->size()) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_code)); + r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(processed_body); @@ -209,13 +199,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"); + if(params->size()>1) { + Value& fmt=params->as_no_junction(1, "fmt must not be code"); Pool& pool=r.pool(); String& string=*new(pool) String(pool); @@ -226,73 +216,28 @@ static void _eval(Request& r, const Stri r.write_no_lang(*result); } - -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) { +static void _error(Request& r, const String& method_name, MethodParams *params) { 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); + const String& serror=params->as_string(0, "message must be string"); + PTHROW(0, 0, + &method_name, + "%s", serror.cstr()); } -#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) { +static void _connect(Request& r, const String& method_name, MethodParams *params) { 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( - url.as_string(), protocol2driver_and_client); + url.as_string(), method_name, protocol2driver_and_client); Exception rethrow_me; // remember/set current connection @@ -330,21 +275,19 @@ static void _connect(Request& r, const S rethrow_me.comment()); } -static String *switch_data_name; -static String *default_value; - +#ifndef DOXYGEN struct Switch_data { Value *searching; Value *found; Value *_default; }; - +#endif 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.process(params->as_junction(1, "switch cases must be code")); // and ignore result r.classes_conf.put(*switch_data_name, backup); @@ -352,27 +295,33 @@ static void _switch(Request& r, const St 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)); +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->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)); - if(value.as_string() == *default_value) { - data._default=code; + 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(); + if(data->searching->is_string()) + matches=data->searching->as_string() == value.as_string(); else - matches=data.searching->as_double() == value.as_double(); + matches=data->searching->as_double() == value.as_double(); if(matches) { - data.found=code; + data->found=code; break; } } @@ -386,9 +335,6 @@ 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); @@ -403,7 +349,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, 1000); + add_native_method("rem", Method::CT_ANY, _rem, 1, 10000); // ^while(condition){code} add_native_method("while", Method::CT_ANY, _while, 2, 2); @@ -418,26 +364,8 @@ MOP::MOP(Pool& apool) : Methoded(apool), // ^eval(expr)[format] 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); + // ^error[msg] + add_native_method("error", Method::CT_ANY, _error, 1, 1); // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} @@ -449,16 +377,15 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("switch", Method::CT_ANY, _switch, 2, 2); // ^case[value]{code} - add_native_method("case", Method::CT_ANY, _case, 2, 1000); + add_native_method("case", Method::CT_ANY, _case, 2, 10000); } // constructor & configurator Methoded *MOP_create(Pool& pool) { - return OP=new(pool) MOP(pool); + return new(pool) MOP(pool); } - void MOP::configure_user(Request& r) { Pool& pool=r.pool();