--- parser3/src/classes/op.C 2002/10/15 08:31:56 1.115 +++ parser3/src/classes/op.C 2003/04/04 09:59:56 1.128 @@ -1,11 +1,11 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Date: 2002/10/15 08:31:56 $"; +static const char* IDENT_OP_C="$Date: 2003/04/04 09:59:56 $"; #include "classes.h" #include "pa_common.h" @@ -96,26 +96,27 @@ static void _taint(Request& r, const Str static void _process(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); const Method *main_method; + Value& target_self=params->size()>1? + params->as_no_junction(0, "target must not be code") + :r.get_method_frame()->caller()->self(); { - Value& vjunction=params->as_junction(0, "body must be code"); + Value& vjunction=params->as_junction(params->size()-1, "body must be code"); - //VStateless_class& self_class=*r.get_self()->get_class(); - //make this param. with this: as default - VStateless_class *self_class=vjunction.get_junction()->self.get_class(); - if(!self_class) - throw Exception(0, + VStateless_class *target_class=target_self.get_last_derived_class(); + if(!target_class) + throw Exception("parser.runtime", &method_name, - "has no self class"); - + "no target class"); + // evaluate source to process const String& source=r.process_to_string(vjunction); // temporary remove language change Temp_lang temp_lang(r, String::UL_PASS_APPENDED); // temporary zero @main so to maybe-replace it in processed code - Temp_method temp_method_main(*self_class, r.main_method_name, 0); + Temp_method temp_method_main(*target_class, r.main_method_name, 0); // temporary zero @auto so it wouldn't be auto-called in Request::use_buf - Temp_method temp_method_auto(*self_class, *auto_method_name, 0); + Temp_method temp_method_auto(*target_class, *auto_method_name, 0); // calculate pseudo file name of processed chars // would be something like "/some/file(4) process" @@ -140,17 +141,19 @@ static void _process(Request& r, const S // process source code, append processed methods to 'self' class // maybe-define new @main - r.use_buf(*self_class, + r.use_buf(*target_class, source.cstr(String::UL_UNSPECIFIED, r.connection(0)), *new(pool) String(pool, heap_place, place_size, true /*tainted*/), heap_place); // main_method - main_method=self_class->get_method(r.main_method_name); + main_method=target_class->get_method(r.main_method_name); } // after restoring current-request-lang // maybe-execute @main[] if(main_method) { + // temporarily set method_frame's self to target_self + Temp_method_frame_self tmfs(*r.get_method_frame(), target_self); // execute! r.execute(*main_method->parser_code); } @@ -205,7 +208,7 @@ static void _for(Request& r, const Strin bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); - r.get_method_frame()->put_element(var_name, vint, false); + r.get_method_frame()->caller()->put_element(var_name, vint, false); for(int i=from; i<=to; i++) { vint->set_int(i); @@ -246,8 +249,8 @@ struct timeval mt[2]; Value& body_code=params->as_junction(1, "body must be code"); Table *protocol2driver_and_client=0; - if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), &r.main_class, false)) { - if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), sql, false)) { + if(Value *sql=r.main_class.get_element(*new(pool) String(pool, MAIN_SQL_NAME), r.main_class, false)) { + if(Value *element=sql->get_element(*new(pool) String(pool, MAIN_SQL_DRIVERS_NAME), *sql, false)) { protocol2driver_and_client=element->get_table(); } } @@ -399,9 +402,9 @@ static void locked_process_and_cache_put info.data->expires=0; // flag it so that could be easily checked by caller } const String *locked_process_and_cache_put(Request& r, - Value& body_code, - Cache_data& data, - const String& file_spec) { + Value& body_code, + Cache_data& data, + const String& file_spec) { Locked_process_and_cache_put_action_info info={ &r, &data, @@ -425,6 +428,7 @@ String *cache_get(Pool& pool, const Stri if(file_read(pool, file_spec, data, data_size, false/*as_text*/, + 0, 0, //no params&out_fields false/*fail_on_read_problem*/) && data_size/* ignore reads which are empty due to non-unary open+lockEX conflict with lockSH */) { @@ -583,16 +587,19 @@ static void _try_operator(Request& r, co Value& catch_code=params->as_junction(1, "catch_code must be code"); StringOrValue result; + // taking snapshot of try-context + Request_context_saver try_context(r); try { - Request_context_saver context_saved(r); // taking snapshot of request processing status, restoring it at } result=r.process(body_code); - context_saved.restore(); // manually restoring context } catch(const Exception& e) { + Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error] + try_context.restore(); // restoring try-context to perform catch-code + VHash& vhash=exception2vhash(pool, e); Junction *junction=catch_code.get_junction(); Value *method_frame=junction->method_frame; - Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, method_frame, false); + Value *saved_exception_var_value=method_frame->get_element(*exception_var_name, *method_frame, false); junction->method_frame->put_element(*exception_var_name, &vhash, false); result=r.process(catch_code); bool handled=false; @@ -600,10 +607,12 @@ static void _try_operator(Request& r, co handled=value->as_bool(); junction->method_frame->put_element(*exception_var_name, saved_exception_var_value, false); - if(!handled) + if(!handled) { + throw_context.restore(); // restoring throw-context [exception were not handled] throw(e); // rethrow + } } - // write it out + // write out result r.write_pass_lang(result); } @@ -642,6 +651,8 @@ static void _throw_operator(Request& r, // constructor VClassMAIN::VClassMAIN(Pool& apool): VClass(apool) { + set_name(*NEW String(pool(), MAIN_CLASS_NAME)); + // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} add_native_method("if", Method::CT_ANY, _if, 2, 3); @@ -653,7 +664,7 @@ VClassMAIN::VClassMAIN(Pool& apool): VCl add_native_method("taint", Method::CT_ANY, _taint, 1, 2); // ^process[code] - add_native_method("process", Method::CT_ANY, _process, 1, 1); + add_native_method("process", Method::CT_ANY, _process, 1, 2); // ^rem{code} add_native_method("rem", Method::CT_ANY, _rem, 1, 10000);