--- parser3/src/classes/op.C 2002/10/14 13:53:20 1.112 +++ parser3/src/classes/op.C 2002/10/31 10:23:45 1.124 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Date: 2002/10/14 13:53:20 $"; +static const char* IDENT_OP_C="$Date: 2002/10/31 10:23:45 $"; #include "classes.h" #include "pa_common.h" @@ -25,16 +25,9 @@ static const char* IDENT_OP_C="$Date: 20 // class -class MOP : public Methoded { +class VClassMAIN: public VClass { public: - MOP(Pool& pool); -public: // Methoded - bool used_directly() { return true; } - void configure_user(Request& r); - -private: - String main_sql_name; - String main_sql_drivers_name; + VClassMAIN(Pool& apool); }; // methods @@ -102,18 +95,29 @@ static void _taint(Request& r, const Str static void _process(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - VStateless_class& self_class=*r.get_self()->get_class(); 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(params->size()-1, "body must be code"); + + VStateless_class *target_class=target_self.get_last_derived_class(); + if(!target_class) + throw Exception("parser.runtime", + &method_name, + "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); - // evaluate source to process - const String& source=r.process_to_string(params->as_junction(0, "body must be code")); // calculate pseudo file name of processed chars // would be something like "/some/file(4) process" char local_place[MAX_STRING]; @@ -137,18 +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( + 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, - &self_class); + 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); } @@ -185,7 +190,7 @@ static void _while(Request& r, const Str static void _use(Request& r, const String& method_name, MethodParams *params) { Value& vfile=params->as_no_junction(0, "file name must not be code"); - r.use_file(vfile.as_string()); + r.use_file(r.main_class, vfile.as_string()); } static void _for(Request& r, const String& method_name, MethodParams *params) { @@ -203,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); @@ -243,8 +248,12 @@ struct timeval mt[2]; 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(r.OP.name())); + 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)) { + protocol2driver_and_client=element->get_table(); + } + } #ifdef RESOURCES_DEBUG //measure:before @@ -577,11 +586,14 @@ 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(); @@ -594,10 +606,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); } @@ -635,10 +649,9 @@ static void _throw_operator(Request& r, // constructor -MOP::MOP(Pool& apool) : Methoded(apool, "OP"), - main_sql_name(apool, MAIN_SQL_NAME), - main_sql_drivers_name(apool, MAIN_SQL_DRIVERS_NAME) -{ +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); @@ -650,7 +663,7 @@ MOP::MOP(Pool& apool) : Methoded(apool, 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); @@ -696,16 +709,6 @@ MOP::MOP(Pool& apool) : Methoded(apool, // constructor & configurator -Methoded *MOP_create(Pool& pool) { - return new(pool) MOP(pool); -} - -void MOP::configure_user(Request& r) { - Pool& pool=r.pool(); - - // $MAIN:SQL.drivers - if(Value *sql=r.main_class->get_element(main_sql_name, r.main_class, false)) - if(Value *element=sql->get_element(main_sql_drivers_name, sql, false)) - if(Table *protocol2library=element->get_table()) - r.classes_conf.put(name(), protocol2library); +VClass& VClassMAIN_create(Pool& pool) { + return *new(pool) VClassMAIN(pool); }