--- parser3/src/classes/op.C 2001/04/06 10:32:16 1.2 +++ parser3/src/classes/op.C 2001/04/15 14:40:53 1.7 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: op.C,v 1.2 2001/04/06 10:32:16 paf Exp $ + $Id: op.C,v 1.7 2001/04/15 14:40:53 paf Exp $ */ #include "pa_config_includes.h" @@ -17,34 +17,22 @@ #include "pa_vint.h" #include "pa_sql_connection.h" -static void _if(Request& r, const String& method_name, Array *params) { - Value& condition_code=*static_cast(params->get(0)); - // forcing ^if(this param type) - r.fail_if_junction_(false, condition_code, - method_name, "condition must be expression"); +static void _if(Request& r, const String&, MethodParams *params) { + Value& condition_code=params->get(0); bool condition=r.process(condition_code, 0/*no name*/, false/*don't intercept string*/).as_bool(); - if(condition) { - Value& then_code=*static_cast(params->get(1)); - // forcing ^if{this param type} - r.fail_if_junction_(false, then_code, - method_name, "then-parameter must be code"); - r.write_pass_lang(r.process(then_code)); - } else if(params->size()==3) { - Value& else_code=*static_cast(params->get(2)); - // forcing ^if{this param type} - r.fail_if_junction_(false, else_code, - method_name, "else-parameter must be code"); - r.write_pass_lang(r.process(else_code)); - } + if(condition) + r.write_pass_lang(r.process(params->get(1))); + else if(params->size()==3) + r.write_pass_lang(r.process(params->get(2))); } -static void _untaint(Request& r, const String& method_name, Array *params) { +static void _untaint(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& lang_name=r.process(*static_cast(params->get(0))).as_string(); + const String& lang_name=r.process(params->get(0)).as_string(); String::Untaint_lang lang=static_cast( untaint_lang_name2enum->get_int(lang_name)); if(!lang) @@ -53,36 +41,32 @@ static void _untaint(Request& r, const S "invalid untaint language"); { - Value *vbody=static_cast(params->get(1)); - // forcing ^untaint[]{this param type} - r.fail_if_junction_(false, *vbody, - method_name, "body must be code"); + Value& vbody=params->get_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 + r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang } } -static void _taint(Request& r, const String& method_name, Array *params) { +static void _taint(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); String::Untaint_lang lang; if(params->size()==1) lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set else { - const String& lang_name=r.process(*static_cast(params->get(0))).as_string(); + const String& lang_name= + r.process(params->get(0)).as_string(); lang=static_cast( untaint_lang_name2enum->get_int(lang_name)); if(!lang) PTHROW(0, 0, - &lang_name, - "invalid taint language"); + &lang_name, + "invalid taint language"); } { - Value& vbody=*static_cast(params->get(params->size()-1)); - // forcing [this param type] - r.fail_if_junction_(true, vbody, method_name, "body must not be code"); + Value& vbody=params->get_no_junction(params->size()-1, "body must not be code"); String result(r.pool()); result.append( @@ -92,7 +76,7 @@ static void _taint(Request& r, const Str } } -static void _process(Request& r, const String& method_name, Array *params) { +static void _process(Request& r, const String& method_name, MethodParams *params) { // calculate pseudo file name of processed chars // would be something like "/some/file(4) process" char place[MAX_STRING]; @@ -114,7 +98,7 @@ static void _process(Request& r, const S // evaluate source to process const String& source= - r.process(*static_cast(params->get(0))).as_string(); + r.process(params->get(0)).as_string(); // process source code, append processed methods to 'self' class // maybe-define new @main @@ -128,24 +112,15 @@ static void _process(Request& r, const S } } -static void _rem(Request& r, const String& method_name, Array *params) { - // forcing ^rem{this param type} - r.fail_if_junction_(false, *static_cast(params->get(0)), - method_name, "body must be code"); +static void _rem(Request& r, const String&, MethodParams *params) { + params->get_junction(0, "body must be code"); } -static void _while(Request& r, const String& method_name, Array *params) { +static void _while(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - Value& vcondition=*static_cast(params->get(0)); - // forcing ^while(this param type){} - r.fail_if_junction_(false, vcondition, - method_name, "condition must be expression"); - - Value& body=*static_cast(params->get(1)); - // forcing ^while(){this param type} - r.fail_if_junction_(false, body, - method_name, "body must be code"); + Value& vcondition=params->get_junction(0, "condition must be expression"); + Value& body=params->get_junction(1, "body must be code"); // while... int endless_loop_count=0; @@ -168,27 +143,19 @@ static void _while(Request& r, const Str } } -static void _use(Request& r, const String& method_name, Array *params) { - Value& vfile=*static_cast(params->get(0)); - // forcing ^rem{this param type} - r.fail_if_junction_(true, vfile, - method_name, "file name must not be code"); - +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())); } -static void _for(Request& r, const String& method_name, Array *params) { - // ^for[i;from-number;to-number-inclusive]{code}[delim] - +/// ^for[i;from-number;to-number-inclusive]{code}[delim] +static void _for(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& var_name=r.process(*static_cast(params->get(0))).as_string(); - int from=(int)r.process(*static_cast(params->get(1))).as_double(); - int to=(int)r.process(*static_cast(params->get(2))).as_double(); - Value& body_code=*static_cast(params->get(3)); - // forcing ^menu{this param type} - r.fail_if_junction_(false, body_code, - method_name, "body must be code"); - Value *delim_code=params->size()==3+1+1?static_cast(params->get(3+1)):0; + 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(); + Value& body_code=params->get_junction(3, "body must be code"); + Value *delim_code=params->size()==3+1+1?¶ms->get(3+1):0; bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); @@ -199,7 +166,7 @@ static void _for(Request& r, const Strin &method_name, "endless loop detected"); vint->set_int(i); - r.wcontext->put_element(var_name, vint); + r.root->put_element(var_name, vint); Value& processed_body=r.process(body_code); if(delim_code) { // delimiter set? @@ -212,19 +179,14 @@ static void _for(Request& r, const Strin } } -static void _eval(Request& r, const String& method_name, Array *params) { - Value& expr=*static_cast(params->get(0)); - r.fail_if_junction_(false, expr, - method_name, "need expression"); +static void _eval(Request& r, const String&, MethodParams *params) { + Value& expr=params->get_junction(0, "need expression"); // evaluate expresion Value *result=r.process(expr, 0/*no name*/, true/*don't intercept string*/).as_expr_result(); if(params->size()==2) { - Value& fmt=*static_cast(params->get(1)); - // forcing ^format[this param type] - r.fail_if_junction_(true, fmt, - method_name, "fmt must not be code"); + Value& fmt=params->get_no_junction(1, "fmt must not be code"); Pool& pool=r.pool(); String& string=*new(pool) String(pool); @@ -241,54 +203,41 @@ static double sign(double op) { return o static void double_one_op( Request& r, - const String& method_name, Array *params, + const String& method_name, MethodParams *params, math_one_double_op_func_ptr func) { Pool& pool=r.pool(); - Value& param=*static_cast(params->get(0)); - - // forcing ^round(this param type) - r.fail_if_junction_(false, param, - method_name, "parameter must be expression"); + Value& param=params->get_junction(0, "parameter must be expression"); Value& result=*new(pool) VDouble(pool, (*func)(r.process(param).as_double())); r.write_no_lang(result); } -static void _round(Request& r, const String& method_name, Array *params) { +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, Array *params) { +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, Array *params) { +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, Array *params) { +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, Array *params) { +static void _sign(Request& r, const String& method_name, MethodParams *params) { double_one_op(r, method_name, params, &sign); } /// ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} -/** - @test make params not Array but something with useful method for extracting, - with typecast and junction/not test -*/ -static void _connect(Request& r, const String& method_name, Array *params) { +static void _connect(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - Value& url=*static_cast(params->get(0)); - r.fail_if_junction_(true, url, - method_name, "url must not be code"); - - Value& body_code=*static_cast(params->get(1)); - r.fail_if_junction_(false, body_code, - method_name, "body must be code"); + Value& url=params->get_no_junction(0, "url must not be code"); + Value& body_code=params->get_junction(1, "body must be code"); // connect SQL_Connection& connection=SQL_driver_manager->get_connection(